refinerycms 0.9.8.7 → 0.9.8.8

data/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'

data/bin/refinerycms

@@ -25,7 +25,11 @@ module Refinery
       # Default options
       @input = input
       @options = {
-        :database => 'sqlite3',
+        :database => {
+          :adapter => 'sqlite3',
+          :username => 'root',
+          :password => ''
+        },
         :force => false,
         :heroku => false,
         :gems => []
@@ -41,7 +45,15 @@ module Refinery
         # Rails supports more options, but Refinery is only tested on these three
         databases = %w(mysql postgresql sqlite3)
         opts.on("-d DATABASE", "--database DATABASE", databases, "Select the database (default sqlite3)", "  #{databases.join('/')}") do |db|
-          @options[:database] = db
+          @options[:database][:adapter] = db
+        end
+
+        opts.on("-u USERNAME", '--database-username USERNAME', String, "Set the database username", '  (default root)') do |username|
+          @options[:database][:username] = username
+        end
+
+        opts.on("-p PASSWORD", '--database-password PASSWORD', String, "Set the database password", "  (default '')") do |password|
+          @options[:database][:password] = password
         end
 
         opts.on("-g", "--gems gem1,gem2,gem3", Array, "Additional gems to install") do |gems|
@@ -119,7 +131,7 @@ module Refinery
     def generate!
       # Generate a rails application
       rails_command = "rails new \"#{@app_path}\""
-      rails_command << " --database #{@options[:database]}"
+      rails_command << " --database #{@options[:database][:adapter]}"
       rails_command << " --force" if @options[:force]
       rails_command << " --skip-test-unit --skip-prototype"
       run_command(rails_command, {:cd => false})
@@ -160,6 +172,10 @@ module Refinery
         f.write "\n" + refinery_gems + "\n\n# USER DEFINED\n" + @options[:gems].join("\n") + "\n# END USER DEFINED"
       end
 
+      # Override database username and password
+      find_and_replace('config/database.yml', %r{username:.*}, "username: #{@options[:database][:username]}")
+      find_and_replace('config/database.yml', %r{password:.*}, "password: #{@options[:database][:password]}")
+
       # Specify the correct version of the Refinery CMS gem (may be git source).
       src = Refinery.version !~ /\.pre$/ ? "'~> #{Refinery.version}'" : ":git => 'git://github.com/resolve/refinerycms.git'"
       find_and_replace('Gemfile', "gem 'refinerycms',              :path => '.'",
@@ -194,9 +210,11 @@ module Refinery
       puts "Installing gem requirements using bundler..\n"
       run_command("bundle install")
 
+      # sqlite3 requires we use 'db:migrate' etc instead of 'db:setup'
       puts "\n\nSetting up your development database..\n"
-      %w(db:drop db:create db:migrate db:seed).each do |db|
-        run_command("rake -f \"#{@app_path.join('Rakefile')}\" #{db}")
+      tasks = @options[:database][:adapter] == 'sqlite3' ? %w(db:migrate db:seed) : %w(db:setup)
+      tasks.each do |task|
+        run_command("rake -f \"#{@app_path.join('Rakefile')}\" #{task}")
       end
 
       # Deploy to Heroku

data/changelog.md

@@ -1,3 +1,8 @@
+## 0.9.8.8 [16 December 2010]
+* Prevented RefinerySetting from accessing its database table before it is created. [Philip Arndt](https://github.com/parndt)
+* Added more options to ``bin/refinerycms`` like ability to specify database username and password. [Philip Arndt](https://github.com/parndt)
+* [See full list](https://github.com/resolve/refinerycms/compare/0.9.8.7...0.9.8.8)
+
 ## 0.9.8.7 [15 December 2010]
 * Fixed a problem with migration number clashes. [Philip Arndt](https://github.com/parndt)
 * Fixed problems with ``db:migrate`` for a new app on Postgres. [Jacob Buys](https://github.com/wjbuys)

data/vendor/refinerycms/refinery.rb

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

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

@@ -66,13 +66,13 @@ class RefinerySetting < ActiveRecord::Base
       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 @@ class RefinerySetting < ActiveRecord::Base
     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)
 

metadata

@@ -6,8 +6,8 @@ version: !ruby/object:Gem::Version
   - 0
   - 9
   - 8
-  - 7
-  version: 0.9.8.7
+  - 8
+  version: 0.9.8.8
 platform: ruby
 authors: 
 - Resolve Digital
@@ -17,7 +17,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-12-15 00:00:00 +13:00
+date: 2010-12-16 00:00:00 +13:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency