Increased version number to 0.9.8.8 to address an issue where Refiner…

…ySetting would try to access its table when the table didn't exist which wreaks havoc on any settings loaded during the initialisation process. Also incremented rspec version to ~> 2.3

Gemfile

@@ -56,7 +56,7 @@ gem 'refinerycms-i18n',         '~> 0.9'
 
 group :test do
   # RSpec
-  gem 'rspec-rails',                  (RSPEC_VERSION = '~> 2.2')
+  gem 'rspec-rails',                  '~> 2.3'
   # Cucumber
   gem 'capybara'
   gem 'database_cleaner'

Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    refinerycms (0.9.8.6)
+    refinerycms (0.9.8.8)
       acts_as_indexed (~> 0.6.6)
       authlogic (~> 2.1.6)
       bundler (~> 1.0.0)
@@ -139,19 +139,19 @@ GEM
       filters_spam (~> 0.2)
     routing-filter (0.1.7)
       actionpack
-    rspec (2.2.0)
-      rspec-core (~> 2.2)
-      rspec-expectations (~> 2.2)
-      rspec-mocks (~> 2.2)
-    rspec-core (2.2.1)
-    rspec-expectations (2.2.0)
+    rspec (2.3.0)
+      rspec-core (~> 2.3.0)
+      rspec-expectations (~> 2.3.0)
+      rspec-mocks (~> 2.3.0)
+    rspec-core (2.3.0)
+    rspec-expectations (2.3.0)
       diff-lcs (~> 1.1.2)
-    rspec-mocks (2.2.0)
-    rspec-rails (2.2.1)
+    rspec-mocks (2.3.0)
+    rspec-rails (2.3.0)
       actionpack (~> 3.0)
       activesupport (~> 3.0)
       railties (~> 3.0)
-      rspec (~> 2.2.0)
+      rspec (~> 2.3.0)
     ruby-prof (0.9.2)
     rubyzip (0.9.4)
     selenium-webdriver (0.1.1)
@@ -192,7 +192,7 @@ DEPENDENCIES
   refinerycms!
   refinerycms-i18n (~> 0.9)
   refinerycms-inquiries (~> 0.9)
-  rspec-rails (~> 2.2)
+  rspec-rails (~> 2.3)
   ruby-prof
   spork
   sqlite3-ruby

refinerycms.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name              = %q{refinerycms}
-  s.version           = %q{0.9.8.7}
+  s.version           = %q{0.9.8.8}
   s.description       = %q{A Ruby on Rails CMS that supports Rails 3. It's easy to extend and sticks to 'the Rails way' where possible.}
   s.date              = %q{2010-12-15}
   s.summary           = %q{A Ruby on Rails CMS that supports Rails 3}

vendor/refinerycms/refinery.rb

@@ -28,7 +28,7 @@ class Version
     @major = 0
     @minor = 9
     @tiny  = 8
-    @build = 7
+    @build = 8
 
     class << self
       attr_reader :major, :minor, :tiny, :build

vendor/refinerycms/settings/app/models/refinery_setting.rb

@@ -66,13 +66,13 @@ def rewrite_cache
       Rails.cache.delete(self.cache_key)
 
       # generate new cache
-      result = self.to_cache(RefinerySetting.all)
+      result = (self.to_cache(self.all) if self.table_exists?)
 
       # write cache
       Rails.cache.write(self.cache_key, result)
 
-      # return cache
-      result
+      # return cache, or lack thereof.
+      result ||= []
     end
 
     def cache_key
@@ -108,6 +108,8 @@ def get(name, options = {})
     alias :[] :get
 
     def set(name, value)
+      return value unless self.table_exists?
+
       scoping = (value[:scoping] if value.is_a?(Hash) and value.has_key?(:scoping))
       setting = find_or_initialize_by_name_and_scoping(:name => name.to_s, :scoping => scoping)