refinerycms 0.9.9.6 → 0.9.9.7

data/Gemfile

@@ -53,5 +53,5 @@ end
 # gem 'refinerycms-page-images,   '~> 1.0
 
 # Add i18n support (optional, you can remove this if you really want to).
-gem 'refinerycms-i18n',         '~> 0.9.9.11'
+gem 'refinerycms-i18n',         '~> 0.9.9.12'
 # END USER DEFINED

data/Gemfile.lock

@@ -1,47 +1,47 @@
 PATH
   remote: .
   specs:
-    refinerycms (0.9.9.5)
-      bundler (~> 1.0.10)
-      refinerycms-authentication (~> 0.9.9.5)
-      refinerycms-base (~> 0.9.9.5)
-      refinerycms-core (~> 0.9.9.5)
-      refinerycms-dashboard (~> 0.9.9.5)
-      refinerycms-images (~> 0.9.9.5)
-      refinerycms-pages (~> 0.9.9.5)
-      refinerycms-resources (~> 0.9.9.5)
-      refinerycms-settings (~> 0.9.9.5)
-    refinerycms-authentication (0.9.9.5)
+    refinerycms (0.9.9.7)
+      bundler (~> 1.0)
+      refinerycms-authentication (~> 0.9.9.7)
+      refinerycms-base (~> 0.9.9.7)
+      refinerycms-core (~> 0.9.9.7)
+      refinerycms-dashboard (~> 0.9.9.7)
+      refinerycms-images (~> 0.9.9.7)
+      refinerycms-pages (~> 0.9.9.7)
+      refinerycms-resources (~> 0.9.9.7)
+      refinerycms-settings (~> 0.9.9.7)
+    refinerycms-authentication (0.9.9.7)
       devise (~> 1.1)
-      refinerycms-core (~> 0.9.9.5)
-    refinerycms-base (0.9.9.5)
-    refinerycms-core (0.9.9.5)
+      refinerycms-core (~> 0.9.9.7)
+    refinerycms-base (0.9.9.7)
+    refinerycms-core (0.9.9.7)
       acts_as_indexed (~> 0.7)
       friendly_id_globalize3 (~> 3.2.1)
       globalize3 (>= 0.1.0.beta)
       moretea-awesome_nested_set (= 1.4.3.1)
       rails (~> 3.0.5)
       rdoc (>= 2.5.11)
-      refinerycms-base (~> 0.9.9.5)
+      refinerycms-base (~> 0.9.9.7)
       refinerycms-generators (~> 0.9.9.3)
-      refinerycms-settings (~> 0.9.9.5)
+      refinerycms-settings (~> 0.9.9.7)
       truncate_html (~> 0.5)
       will_paginate (~> 3.0.pre)
-    refinerycms-dashboard (0.9.9.5)
-      refinerycms-core (~> 0.9.9.5)
-    refinerycms-images (0.9.9.5)
+    refinerycms-dashboard (0.9.9.7)
+      refinerycms-core (~> 0.9.9.7)
+    refinerycms-images (0.9.9.7)
       dragonfly (~> 0.8.2)
       rack-cache (>= 0.5.3)
-      refinerycms-core (~> 0.9.9.5)
-    refinerycms-pages (0.9.9.5)
-      refinerycms-core (~> 0.9.9.5)
-    refinerycms-resources (0.9.9.5)
+      refinerycms-core (~> 0.9.9.7)
+    refinerycms-pages (0.9.9.7)
+      refinerycms-core (~> 0.9.9.7)
+    refinerycms-resources (0.9.9.7)
       dragonfly (~> 0.8.2)
       rack-cache (>= 0.5.3)
-      refinerycms-core (~> 0.9.9.5)
-    refinerycms-settings (0.9.9.5)
-      refinerycms-base (~> 0.9.9.5)
-    refinerycms-testing (0.9.9.5)
+      refinerycms-core (~> 0.9.9.7)
+    refinerycms-settings (0.9.9.7)
+      refinerycms-base (~> 0.9.9.7)
+    refinerycms-testing (0.9.9.7)
       autotest
       autotest-notification
       autotest-rails
@@ -54,7 +54,7 @@ PATH
       json_pure
       launchy
       rack-test (~> 0.5.6)
-      refinerycms-core (~> 0.9.9.5)
+      refinerycms-core (~> 0.9.9.7)
       rspec-rails (~> 2.5)
 
 GEM
@@ -121,7 +121,7 @@ GEM
     cucumber-rails (0.3.2)
       cucumber (>= 0.8.0)
     culerity (0.2.15)
-    database_cleaner (0.6.4)
+    database_cleaner (0.6.5)
     devise (1.1.7)
       bcrypt-ruby (~> 2.1.2)
       warden (~> 1.0.2)
@@ -179,7 +179,7 @@ GEM
     rake (0.8.7)
     rdoc (3.5.3)
     refinerycms-generators (0.9.9.6)
-    refinerycms-i18n (0.9.9.11)
+    refinerycms-i18n (0.9.9.12)
       refinerycms (>= 0.9.8)
       routing-filter (>= 0.2.3)
     routing-filter (0.2.3)
@@ -221,6 +221,6 @@ PLATFORMS
 
 DEPENDENCIES
   refinerycms!
-  refinerycms-i18n (~> 0.9.9.11)
+  refinerycms-i18n (~> 0.9.9.12)
   refinerycms-testing (~> 0.9.9.5)
   sqlite3

data/bin/refinerycms

@@ -28,17 +28,18 @@ module Refinery
       # Default options
       @input = input
       @options = {
+        :confirm => false,
         :database => {
           :adapter => 'sqlite3',
           :ident => false,
+          :password => nil,
           :username => 'root',
-          :password => nil
+          :skip => false
         },
-        :force => false,
-        :heroku => false,
         :duostack => false,
-        :confirm => false,
-        :gems => []
+        :force => false,
+        :gems => [],
+        :heroku => false
       }
 
       @optparse = OptionParser.new do |opts|
@@ -77,6 +78,10 @@ module Refinery
           @options[:database][:password] = password
         end
 
+        opts.on('--skip-db', "Skip any database creation or migration tasks") do
+          @options[:database][:skip] = true
+        end
+
         opts.on("-g", "--gems gem1,gem2,gem3", Array, "Additional gems to install") do |gems|
           @options[:gems] = gems.reject {|g| g.to_s =~ /^refinerycms/}.map {|g| "gem '#{g.to_s}'"}
         end
@@ -122,27 +127,29 @@ module Refinery
       # Bundle the application which activates Refinery CMS
       bundle!
 
-      # Ensure the database exists so that queries like .table_exists? don't fail.
-      puts "\nCreating a new database.."
-      # Warn about incorrect username or password.
-      unless @options[:database][:adapter] == 'sqlite3'
-        if @options[:database][:ident]
-          note = "NOTE: If ident authentication fails then the installer will stall or fail here.\n\n"
-        else
-          note = "NOTE: if your database username is not '#{@options[:database][:username]}'"
-          note << " or your password is not '#{@options[:database][:password]}' then the installer will stall here.\n\n"
+      unless @options[:database][:skip]
+        # Ensure the database exists so that queries like .table_exists? don't fail.
+        puts "\nCreating a new database.."
+        # Warn about incorrect username or password.
+        unless @options[:database][:adapter] == 'sqlite3'
+          if @options[:database][:ident]
+            note = "NOTE: If ident authentication fails then the installer will stall or fail here.\n\n"
+          else
+            note = "NOTE: if your database username is not '#{@options[:database][:username]}'"
+            note << " or your password is not '#{@options[:database][:password]}' then the installer will stall here.\n\n"
+          end
+          puts note
         end
-        puts note
+        run_command("rake -f \"#{@app_path.join('Rakefile')}\" db:create", {
+          :fail => "Unable to create the application's database"
+        })
+
+        # Run the newly activated Refinery CMS generator.
+        run_command("rails generate refinerycms", {
+          :cd => true,
+          :fail => "Could not run the refinerycms generator successfully."
+        })
       end
-      run_command("rake -f \"#{@app_path.join('Rakefile')}\" db:create", {
-        :fail => "Unable to create the application's database"
-      })
-
-      # Run the newly activated Refinery CMS generator.
-      run_command("rails generate refinerycms", {
-        :cd => true,
-        :fail => "Could not run the refinerycms generator successfully."
-      })
 
       # Output helpful messages to user
       output!
@@ -283,8 +290,10 @@ module Refinery
     end
 
     def output!
-      puts "\n\nSetting up your development database..\n"
-      run_command("rake -f \"#{@app_path.join('Rakefile')}\" db:migrate")
+      unless @options[:database][:skip]
+        puts "\n\nSetting up your development database..\n"
+        run_command("rake -f \"#{@app_path.join('Rakefile')}\" db:migrate")
+      end
 
       # Deploy to Heroku
       hosting = nil
@@ -310,21 +319,33 @@ module Refinery
       end
       # End automation
 
-      # Output helpful messages
-      puts "\n=== ACTION REQUIRED ==="
-      puts "Now you can launch your webserver using:"
-      puts "\ncd #{@app_path}"
-      puts "rails server"
-      puts "\nThis will launch the built-in webserver at port 3000."
-      puts "You can now see your site running in your browser at http://localhost:3000"
+      # Construct helpful output messages
+      note = ["\n=== ACTION REQUIRED ==="]
+      if @options[:database][:skip]
+        note << "Because you elected to skip database creation and migration in the installer"
+        note << "you will need to run the following tasks manually to maintain correct operation:"
+        note << "\ncd #{@app_path}"
+        note << "rake db:create"
+        note << "rails generate refinerycms"
+        note << "rake db:migrate"
+        note << "\n---------\n"
+      end
+      note << "Now you can launch your webserver using:"
+      note << "\ncd #{@app_path}"
+      note << "rails server"
+      note << "\nThis will launch the built-in webserver at port 3000."
+      note << "You can now see your site running in your browser at http://localhost:3000"
 
       if @options[:heroku]
-        puts "\nIf you want files and images to work on heroku, you will need setup S3:"
-        puts "heroku config:add S3_BUCKET=XXXXXXXXX S3_KEY=XXXXXXXXX S3_SECRET=XXXXXXXXXX"
+        note << "\nIf you want files and images to work on heroku, you will need setup S3:"
+        note << "heroku config:add S3_BUCKET=XXXXXXXXX S3_KEY=XXXXXXXXX S3_SECRET=XXXXXXXXXX"
       end
 
-      puts "\nThanks for installing Refinery, enjoy creating your new application!"
-      puts "---------\n\n"
+      note << "\nThanks for installing Refinery, enjoy creating your new application!"
+      note << "---------\n\n"
+
+      # finally, output.
+      puts note.join("\n")
     end
 
     private :validate!, :generate!, :bundle!, :output!

data/changelog.md

@@ -1,3 +1,18 @@
+## 0.9.9.7 [10 March 2011]
+
+* Added `:per_page` option to `crudify` for overriding the number of items to display per page with will_paginate. [Josef Šimánek](https://github.com/simi)
+* Deprecated `rake refinery:update` in favour of rails `generate refinerycms --update`. [Philip Arndt](https://github.com/parndt)
+* Added `--skip-db` option to `bin/refinerycms` installer which doesn't automate any database creation/migration and skips the `rails generate refinerycms` generator. [Philip Arndt](https:/github.com/parndt)
+* Exchanged (help) links for the information.png 'refinery icon'. This will happen automatically if you used `refinery_help_tag`. [Philip Arndt](https://github.com/parndt)
+* Added xhr_paging as an option in crudify which handles the server-side usage of the HTML5 History API. [Philip Arndt](https://github.com/parndt)
+* Looser Bundler dependency (now `~> 1.0`). [Terence Lee](https://github.com/hone)
+* [See full list](https://github.com/resolve/refinerycms/compare/0.9.9.6...0.9.9.7)
+
+## 0.9.9.6 [7 March 2011]
+
+* Fixed an issue that caused the installer to fail on some systems. [Philip Arndt](https://github.com/parndt)
+* [See full list](https://github.com/resolve/refinerycms/compare/0.9.9.5...0.9.9.6)
+
 ## 0.9.9.5 [7 March 2011]
 
 * Added `<div class='inner'>` to `_content_page` for better control over CSS for each section. Please see [086abfcae2c83330346e28d1e40004cff8a27720](https://github.com/resolve/refinerycms/commit/086abfcae2c83330346e28d1e40004cff8a27720) for what changed if this affects you. [Stefan Mielke](https://github.com/caplod)

data/lib/refinerycms.rb

@@ -1,3 +1,3 @@
 require 'refinerycms-base'
 
-require File.expand_path('../refinerycms/all', __FILE__) unless defined?(REFINERYCMS_INSTALLER)
+require File.expand_path('../refinerycms/all', __FILE__) unless defined?(REFINERYCMS_INSTALLER)

data/refinerycms.gemspec

@@ -2,9 +2,9 @@
 
 Gem::Specification.new do |s|
   s.name              = %q{refinerycms}
-  s.version           = %q{0.9.9.6}
+  s.version           = %q{0.9.9.7}
   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{2011-03-08}
+  s.date              = %q{2011-03-10}
   s.summary           = %q{A Ruby on Rails CMS that supports Rails 3}
   s.email             = %q{info@refinerycms.com}
   s.homepage          = %q{http://refinerycms.com}
@@ -15,17 +15,17 @@ Gem::Specification.new do |s|
   s.executables       = %w(refinerycms)
 
   # Bundler
-  s.add_dependency    'bundler',                    '~> 1.0.10'
+  s.add_dependency    'bundler',                    '~> 1.0'
 
   # Refinery CMS
-  s.add_dependency    'refinerycms-authentication', '~> 0.9.9.5'
-  s.add_dependency    'refinerycms-base',           '~> 0.9.9.5'
-  s.add_dependency    'refinerycms-core',           '~> 0.9.9.5'
-  s.add_dependency    'refinerycms-dashboard',      '~> 0.9.9.5'
-  s.add_dependency    'refinerycms-images',         '~> 0.9.9.5'
-  s.add_dependency    'refinerycms-pages',          '~> 0.9.9.5'
-  s.add_dependency    'refinerycms-resources',      '~> 0.9.9.5'
-  s.add_dependency    'refinerycms-settings',       '~> 0.9.9.5'
+  s.add_dependency    'refinerycms-authentication', '~> 0.9.9.7'
+  s.add_dependency    'refinerycms-base',           '~> 0.9.9.7'
+  s.add_dependency    'refinerycms-core',           '~> 0.9.9.7'
+  s.add_dependency    'refinerycms-dashboard',      '~> 0.9.9.7'
+  s.add_dependency    'refinerycms-images',         '~> 0.9.9.7'
+  s.add_dependency    'refinerycms-pages',          '~> 0.9.9.7'
+  s.add_dependency    'refinerycms-resources',      '~> 0.9.9.7'
+  s.add_dependency    'refinerycms-settings',       '~> 0.9.9.7'
 
   s.files             = [
     '.gitignore',
@@ -64,7 +64,6 @@ Gem::Specification.new do |s|
     'lib/refinerycms.rb',
     'license.md',
     'license.md',
-    'public',
     'readme.md',
     'readme.md',
     'refinerycms.gemspec',

metadata

@@ -2,7 +2,7 @@
 name: refinerycms
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.9.9.6
+  version: 0.9.9.7
 platform: ruby
 authors: 
 - Resolve Digital
@@ -13,7 +13,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-03-08 00:00:00 +13:00
+date: 2011-03-10 00:00:00 +13:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -24,7 +24,7 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        version: 1.0.10
+        version: "1.0"
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
@@ -35,7 +35,7 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        version: 0.9.9.5
+        version: 0.9.9.7
   type: :runtime
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
@@ -46,7 +46,7 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        version: 0.9.9.5
+        version: 0.9.9.7
   type: :runtime
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
@@ -57,7 +57,7 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        version: 0.9.9.5
+        version: 0.9.9.7
   type: :runtime
   version_requirements: *id004
 - !ruby/object:Gem::Dependency 
@@ -68,7 +68,7 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        version: 0.9.9.5
+        version: 0.9.9.7
   type: :runtime
   version_requirements: *id005
 - !ruby/object:Gem::Dependency 
@@ -79,7 +79,7 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        version: 0.9.9.5
+        version: 0.9.9.7
   type: :runtime
   version_requirements: *id006
 - !ruby/object:Gem::Dependency 
@@ -90,7 +90,7 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        version: 0.9.9.5
+        version: 0.9.9.7
   type: :runtime
   version_requirements: *id007
 - !ruby/object:Gem::Dependency 
@@ -101,7 +101,7 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        version: 0.9.9.5
+        version: 0.9.9.7
   type: :runtime
   version_requirements: *id008
 - !ruby/object:Gem::Dependency 
@@ -112,7 +112,7 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        version: 0.9.9.5
+        version: 0.9.9.7
   type: :runtime
   version_requirements: *id009
 description: A Ruby on Rails CMS that supports Rails 3. It's easy to extend and sticks to 'the Rails way' where possible.
@@ -176,7 +176,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: refinerycms
-rubygems_version: 1.6.0
+rubygems_version: 1.6.1
 signing_key: 
 specification_version: 3
 summary: A Ruby on Rails CMS that supports Rails 3