refinerycms 0.9.9.4 → 0.9.9.5

data/.gitignore

@@ -56,6 +56,9 @@ nbproject
 # RubyMine
 .idea
 
+# E-texteditor
+.eprj
+
 # Backup
 *~
 

data/Gemfile

@@ -29,10 +29,10 @@ end
 # REFINERY CMS ================================================================
 # Anything you put in here will be overridden when the app gets updated.
 
-# gem 'refinerycms', '~> 0.9.9.1'
+# gem 'refinerycms', '~> 0.9.9.5'
 
 group :development, :test do
-  gem 'refinerycms-testing',    '~> 0.9.9.1'
+  gem 'refinerycms-testing',    '~> 0.9.9.5'
 end
 
 # END REFINERY CMS ============================================================
@@ -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.9'
+gem 'refinerycms-i18n',         '~> 0.9.9.11'
 # END USER DEFINED

data/Gemfile.lock

@@ -1,47 +1,47 @@
 PATH
   remote: .
   specs:
-    refinerycms (0.9.9.4)
+    refinerycms (0.9.9.5)
       bundler (~> 1.0.10)
-      refinerycms-authentication (~> 0.9.9.4)
-      refinerycms-base (~> 0.9.9.4)
-      refinerycms-core (~> 0.9.9.4)
-      refinerycms-dashboard (~> 0.9.9.4)
-      refinerycms-images (~> 0.9.9.4)
-      refinerycms-pages (~> 0.9.9.4)
-      refinerycms-resources (~> 0.9.9.4)
-      refinerycms-settings (~> 0.9.9.4)
-    refinerycms-authentication (0.9.9.4)
+      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)
       devise (~> 1.1)
-      refinerycms-core (~> 0.9.9.4)
-    refinerycms-base (0.9.9.4)
-    refinerycms-core (0.9.9.4)
+      refinerycms-core (~> 0.9.9.5)
+    refinerycms-base (0.9.9.5)
+    refinerycms-core (0.9.9.5)
       acts_as_indexed (~> 0.7)
-      friendly_id_globalize3 (~> 3.2.0)
+      friendly_id_globalize3 (~> 3.2.1)
       globalize3 (>= 0.1.0.beta)
       moretea-awesome_nested_set (= 1.4.3.1)
-      rails (~> 3.0.3)
+      rails (~> 3.0.5)
       rdoc (>= 2.5.11)
-      refinerycms-base (~> 0.9.9.4)
+      refinerycms-base (~> 0.9.9.5)
       refinerycms-generators (~> 0.9.9.3)
-      refinerycms-settings (~> 0.9.9.4)
+      refinerycms-settings (~> 0.9.9.5)
       truncate_html (~> 0.5)
       will_paginate (~> 3.0.pre)
-    refinerycms-dashboard (0.9.9.4)
-      refinerycms-core (~> 0.9.9.4)
-    refinerycms-images (0.9.9.4)
+    refinerycms-dashboard (0.9.9.5)
+      refinerycms-core (~> 0.9.9.5)
+    refinerycms-images (0.9.9.5)
       dragonfly (~> 0.8.2)
       rack-cache (>= 0.5.3)
-      refinerycms-core (~> 0.9.9.4)
-    refinerycms-pages (0.9.9.4)
-      refinerycms-core (~> 0.9.9.4)
-    refinerycms-resources (0.9.9.4)
+      refinerycms-core (~> 0.9.9.5)
+    refinerycms-pages (0.9.9.5)
+      refinerycms-core (~> 0.9.9.5)
+    refinerycms-resources (0.9.9.5)
       dragonfly (~> 0.8.2)
       rack-cache (>= 0.5.3)
-      refinerycms-core (~> 0.9.9.4)
-    refinerycms-settings (0.9.9.4)
-      refinerycms-base (~> 0.9.9.4)
-    refinerycms-testing (0.9.9.4)
+      refinerycms-core (~> 0.9.9.5)
+    refinerycms-settings (0.9.9.5)
+      refinerycms-base (~> 0.9.9.5)
+    refinerycms-testing (0.9.9.5)
       autotest
       autotest-notification
       autotest-rails
@@ -54,7 +54,7 @@ PATH
       json_pure
       launchy
       rack-test (~> 0.5.6)
-      refinerycms-core (~> 0.9.9.4)
+      refinerycms-core (~> 0.9.9.5)
       rspec-rails (~> 2.5)
 
 GEM
@@ -62,12 +62,12 @@ GEM
   specs:
     ZenTest (4.5.0)
     abstract (1.0.0)
-    actionmailer (3.0.4)
-      actionpack (= 3.0.4)
+    actionmailer (3.0.5)
+      actionpack (= 3.0.5)
       mail (~> 2.2.15)
-    actionpack (3.0.4)
-      activemodel (= 3.0.4)
-      activesupport (= 3.0.4)
+    actionpack (3.0.5)
+      activemodel (= 3.0.5)
+      activesupport (= 3.0.5)
       builder (~> 2.1.2)
       erubis (~> 2.6.6)
       i18n (~> 0.4)
@@ -75,21 +75,21 @@ GEM
       rack-mount (~> 0.6.13)
       rack-test (~> 0.5.7)
       tzinfo (~> 0.3.23)
-    activemodel (3.0.4)
-      activesupport (= 3.0.4)
+    activemodel (3.0.5)
+      activesupport (= 3.0.5)
       builder (~> 2.1.2)
       i18n (~> 0.4)
-    activerecord (3.0.4)
-      activemodel (= 3.0.4)
-      activesupport (= 3.0.4)
+    activerecord (3.0.5)
+      activemodel (= 3.0.5)
+      activesupport (= 3.0.5)
       arel (~> 2.0.2)
       tzinfo (~> 0.3.23)
-    activeresource (3.0.4)
-      activemodel (= 3.0.4)
-      activesupport (= 3.0.4)
-    activesupport (3.0.4)
+    activeresource (3.0.5)
+      activemodel (= 3.0.5)
+      activesupport (= 3.0.5)
+    activesupport (3.0.5)
     acts_as_indexed (0.7.1)
-    arel (2.0.8)
+    arel (2.0.9)
     autotest (4.4.6)
       ZenTest (>= 4.4.1)
     autotest-notification (2.3.1)
@@ -143,7 +143,7 @@ GEM
     i18n (0.5.0)
     json (1.4.6)
     json_pure (1.5.1)
-    launchy (0.3.7)
+    launchy (0.4.0)
       configuration (>= 0.0.5)
       rake (>= 0.8.1)
     mail (2.2.15)
@@ -163,23 +163,23 @@ GEM
       rack (>= 1.0.0)
     rack-test (0.5.7)
       rack (>= 1.0)
-    rails (3.0.4)
-      actionmailer (= 3.0.4)
-      actionpack (= 3.0.4)
-      activerecord (= 3.0.4)
-      activeresource (= 3.0.4)
-      activesupport (= 3.0.4)
+    rails (3.0.5)
+      actionmailer (= 3.0.5)
+      actionpack (= 3.0.5)
+      activerecord (= 3.0.5)
+      activeresource (= 3.0.5)
+      activesupport (= 3.0.5)
       bundler (~> 1.0)
-      railties (= 3.0.4)
-    railties (3.0.4)
-      actionpack (= 3.0.4)
-      activesupport (= 3.0.4)
+      railties (= 3.0.5)
+    railties (3.0.5)
+      actionpack (= 3.0.5)
+      activesupport (= 3.0.5)
       rake (>= 0.8.7)
       thor (~> 0.14.4)
     rake (0.8.7)
     rdoc (3.5.3)
-    refinerycms-generators (0.9.9.5)
-    refinerycms-i18n (0.9.9.9)
+    refinerycms-generators (0.9.9.6)
+    refinerycms-i18n (0.9.9.11)
       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.9)
-  refinerycms-testing (~> 0.9.9.1)
+  refinerycms-i18n (~> 0.9.9.11)
+  refinerycms-testing (~> 0.9.9.5)
   sqlite3

data/bin/refinerycms

@@ -10,8 +10,10 @@ rescue LoadError
   exit(1)
 end
 
-# Load refinerycms
+# Let the application have a constant it can detect installation with.
+REFINERYCMS_INSTALLER = true
 
+# Load refinerycms
 require Pathname.new(File.expand_path(File.dirname(__FILE__) << "/..")).join('lib', 'refinery')
 
 # Load other required libraries
@@ -28,14 +30,13 @@ module Refinery
       @options = {
         :database => {
           :adapter => 'sqlite3',
+          :ident => false,
           :username => 'root',
-          :password => ''
+          :password => nil
         },
-        :from_version => '0.9.8',
         :force => false,
         :heroku => false,
         :duostack => false,
-        :update => false,
         :confirm => false,
         :gems => []
       }
@@ -47,12 +48,27 @@ module Refinery
         opts.separator ""
         opts.separator "Specific Options:"
 
+        # Bail out if --update is specified.
+        opts.on('--update') do |update|
+          puts "\nYou specified --update which is a command that has been removed."
+          puts "To update your application:"
+          puts "- Change the version of the 'refinerycms' gem in your Gemfile."
+          puts "- Run bundle install"
+          puts "- Run rails generate refinerycms --update"
+          puts "\n"
+          exit(1)
+        end
+
         # 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][:adapter] = db
         end
 
+        opts.on("--ident", "Use ident database authentication (for mysql or postgresql)") do
+          @options[:database][:ident] = true
+        end
+
         opts.on("-u USERNAME", '--database-username USERNAME', String, "Set the database username", '  (default root)') do |username|
           @options[:database][:username] = username
         end
@@ -69,10 +85,6 @@ module Refinery
           @options[:force] = true
         end
 
-        opts.on("--from-version VERSION", String, "Set the version that we are updating from, incase there are special files that need to change", "  (default '0.9.8')") do |version|
-          @options[:from_version] = version
-        end
-
         opts.on("--heroku [APP_NAME]", "Set up and deploy to Heroku") do |app_name|
           @options[:heroku] = app_name || ''
         end
@@ -81,10 +93,6 @@ module Refinery
           @options[:duostack] = app_name
         end
 
-        opts.on("--update", "--update", "Migrate the database instead of rebuilding it") do
-           @options[:update] = true
-        end
-
         opts.on("-c", "--confirm", "Confirm any prompts that require input") do
           @options[:confirm] = true
         end
@@ -108,39 +116,34 @@ module Refinery
       # Grab input and ensure that the path doesn't exist already and other checks.
       validate!
 
-      unless @options[:update]
-        # Generate a Refinery CMS application
-        generate!
+      # Generate a Refinery CMS application
+      generate!
 
-        # Bundle the application which activates Refinery CMS
-        bundle!
+      # 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'
+      # 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 stop working here.\n\n"
-          puts note
+          note << " or your password is not '#{@options[:database][:password]}' then the installer will stall here.\n\n"
         end
-        run_command("rake -f \"#{@app_path.join('Rakefile')}\" db:create", {:fail => "Unable to create the application's database"})
-      else
-        # Update the current application.
-        update!
-
-        # Bundle the application which activates Refinery CMS
-        bundle!
+        puts note
       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#{' --update' if @options[:update]}", {
+      run_command("rails generate refinerycms", {
         :cd => true,
         :fail => "Could not run the refinerycms generator successfully."
       })
 
-      # Run the update task if we're updating
-      run_command("rake refinery:update", {:cd => true, :fail => "refinery:update rake task failed."}) if @options[:update]
-
       # Output helpful messages to user
       output!
     end
@@ -180,10 +183,9 @@ module Refinery
         puts "Please choose another name for your new project."
         puts "\n"
         exit(1)
-      elsif @app_path.directory? && !@options[:force] && !@options[:update]
+      elsif @app_path.directory? && !@options[:force]
         puts "\nThe directory '#{@app_path}' that you specified already exists."
         puts "Use --force to overwrite an existing directory."
-        puts "Use --update to replace any Refinery CMS files in an existing installation."
         puts "\n"
         exit(1)
       elsif @options[:heroku]
@@ -209,32 +211,9 @@ module Refinery
             exit(1)
           end
         end
-      elsif @app_path.join('.git').directory? && @options[:update] && !@options[:confirm]
-        git_status = run_command('git status --porcelain', {:puts => false, :ruby => false})
-        if git_status.to_s.strip.length > 0
-          puts "\nYou have uncommitted changes or untracked files. Please remove or commit them, or:"
-          puts "Use --confirm to have Refinery proceed anyway. "
-          puts "Untracked files will be removed, and uncommitted changes may be lost."
-          puts "\n"
-          exit(1)
-        end
-      end
-
-      if @options[:update]
-        puts "Please ensure you have a backup of your project and its database."
-        puts "Type 'yes' to continue (anything other than 'yes' will cancel)"
-        unless $stdin.gets.strip == 'yes'
-          puts "Cancelling..."
-          exit
-        end
       end
     end
 
-    def update!
-      # Handle acts_as_indexed changes.
-      FileUtils::rm_r @app_path.join('tmp', 'index') if @app_path.join('tmp', 'index').directory?
-    end
-
     def generate!(rails_command = nil)
       if rails_command.to_s.length == 0
         # Generate a rails application
@@ -255,8 +234,13 @@ module Refinery
         end
 
         # Override 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]}")
+        if @options[:database][:ident]
+          find_and_replace('config/database.yml', %r{username:}, '#username:')
+          find_and_replace('config/database.yml', %r{password:}, '#password:')
+        else
+          find_and_replace('config/database.yml', %r{username:.*}, "username: #{@options[:database][:username]}")
+          find_and_replace('config/database.yml', %r{password:.*}, "password: #{@options[:database][:password]}")
+        end
 
         puts "\n---------"
         puts "Refinery successfully installed in '#{@app_path}'!\n\n"
@@ -269,19 +253,16 @@ module Refinery
       refinery_gems = refinery_gemfile_contents.match(/# REFINERY CMS =+.*# END REFINERY CMS =+/m)[0]
       refinery_gems.gsub!("# gem 'refinerycms'", "gem 'refinerycms'") # Enable refinerycms
       refinery_gems.gsub!("gem 'refinerycms-testing'", "# gem 'refinerycms-testing'") # Disable testing
-      unless @options[:update]
-        app_gemfile = @app_path.join('Gemfile')
-        FileUtils::cp app_gemfile, "#{app_gemfile}.backup"
-        refinery_user_defined_gems = refinery_gemfile_contents.match(/# USER DEFINED(.*)# END USER DEFINED/m)
-        refinery_user_defined_gems = refinery_user_defined_gems[1] unless refinery_user_defined_gems.nil?
-        app_gemfile.open('a') do |f|
-          f.write "\n#{refinery_gems}\n"
-          @options[:gems] = ([refinery_user_defined_gems] | [@options[:gems]]).flatten.compact
-
-          f.write "\n# USER DEFINED\n#{@options[:gems].join("\n")}\n# END USER DEFINED" if @options[:gems].any?
-        end
-      else
-        find_and_replace(@app_path.join('Gemfile'), /# REFINERY CMS =+.*# END REFINERY CMS =+/m, refinery_gems)
+
+      app_gemfile = @app_path.join('Gemfile')
+      FileUtils::cp app_gemfile, "#{app_gemfile}.backup"
+      refinery_user_defined_gems = refinery_gemfile_contents.match(/# USER DEFINED(.*)# END USER DEFINED/m)
+      refinery_user_defined_gems = refinery_user_defined_gems[1] unless refinery_user_defined_gems.nil?
+      app_gemfile.open('a') do |f|
+        f.write "\n#{refinery_gems}\n"
+        @options[:gems] = ([refinery_user_defined_gems] | [@options[:gems]]).flatten.compact
+
+        f.write "\n# USER DEFINED\n#{@options[:gems].join("\n")}\n# END USER DEFINED" if @options[:gems].any?
       end
 
 
@@ -297,17 +278,12 @@ module Refinery
       # TODO: Check exit codes to see whether or not these worked
       puts "Installing gem requirements using bundler..\n"
 
-      # Ensure RefineryCMS is up to date if we're updating
-      if @options[:update]
-        run_command("bundle update refinerycms refinerycms-generators", {:fail => "Unable to update core gems"})
-      end
-
       # Install!
       run_command("bundle install", {:fail => "Unable to install necessary gems"})
     end
 
     def output!
-      puts "\n\n#{@options[:update] ? "Migrating" : "Setting up"} your development database..\n"
+      puts "\n\nSetting up your development database..\n"
       run_command("rake -f \"#{@app_path.join('Rakefile')}\" db:migrate")
 
       # Deploy to Heroku

data/changelog.md

@@ -1,6 +1,16 @@
+## 0.9.9.5 [Not Released]
+
+* 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)
+* Menu performance improvements. [David Reese](https://github.com/whatcould)
+* Removed `--update` from `bin/refinerycms` because it's no longer relevant. [Philip Arndt](https://github.com/parndt)
+* Added support for --ident in the installation task which uses ident authentication at the database level by commenting out the username and password credentials. [Philip Arndt](https://github.com/parndt)
+* Changed the default `cache_store` to `:file_store` for better thread safety with passenger. [Philip Arndt](https://github.com/parndt)
+* WYMeditor Internet Explorer improvements. [Philip Arndt](https://github.com/parndt)
+* [See full list](https://github.com/resolve/refinerycms/compare/0.9.9.4...0.9.9.5)
+
 ## 0.9.9.4 [24 February 2011]
 
-* Added ``doc/guides`` for textile based guides that power http://refinerycms.com/guides. [Steven Heidel](https://github.com/stevenheidel) and [Philip Arndt](https://github.com/parndt)
+* Added `doc/guides` for textile based guides that power [the guides at refinerycms.com/guides](http://refinerycms.com/guides). [Steven Heidel](https://github.com/stevenheidel) and [Philip Arndt](https://github.com/parndt)
 * Allowed multiple resource pickers on one form. [Phil Spitler](https://github.com/philspitler)
 * Solved YAML parsing issues introduced by change to Psych. [Aaron Patterson](https://github.com/tenderlove) and [Uģis Ozols](https://github.com/ugisozols)
 * Updated page to use a localized cache key if frontend translations are enabled. [Bryan Mahoney](https://github.com/DynamoMTL)
@@ -15,19 +25,19 @@
 
 ## 0.9.9.2 [17 February 2011]
 
-* Removed ``activesupport`` requirement from ``bin/refinerycms``. [Philip Arndt](https://github.com/parndt)
+* Removed `activesupport` requirement from `bin/refinerycms`. [Philip Arndt](https://github.com/parndt)
 * Fixed an issue in some browsers with a particular jQuery selector. [Philip Arndt](https://github.com/parndt)
 * Modified some existing migrations to behave better when creating new applications. [Philip Arndt](https://github.com/parndt)
-* Fixed ``-u`` and ``-p`` support for ``bin/refinerycms``. [Philip Arndt](https://github.com/parndt)
+* Fixed `-u` and `-p` support for `bin/refinerycms`. [Philip Arndt](https://github.com/parndt)
 * [See full list](https://github.com/resolve/refinerycms/compare/0.9.9.1...0.9.9.2)
 
 ## 0.9.9.1 [15 February 2011]
 
 * Fixed Firefox issue with WYMeditor. [Amanda Wagener](https:/github.com/awagener)
-* Gracefully exit ``bin/refinerycms`` on error. [Alexandre Girard](https://github.com/alx) and [Brian Stevens](https://github.com/bdstevens) and [Philip Arndt](https://github.com/parndt)
+* Gracefully exit `bin/refinerycms` on error. [Alexandre Girard](https://github.com/alx) and [Brian Stevens](https://github.com/bdstevens) and [Philip Arndt](https://github.com/parndt)
 * Added basic single table inheritance support to crudify. [Ken Nordquist](https://github.com/kenphused)
-* Removed most of the 0.9.8.9 specific ``--update`` logic in ``bin/refinerycms``. [Philip Arndt](https://github.com/parndt)
-* Added ``refinerycms-testing`` engine which reduces the main Gemfile complexity. [Philip Arndt](https://github.com/parndt)
+* Removed most of the 0.9.8.9 specific `--update` logic in `bin/refinerycms`. [Philip Arndt](https://github.com/parndt)
+* Added `refinerycms-testing` engine which reduces the main Gemfile complexity. [Philip Arndt](https://github.com/parndt)
 * Split the project into 10 separately released gems that include their own dependencies. [Philip Arndt](https://github.com/parndt)
 * New Vietnamese translation files added. [Alex Nguyen](https://github.com/tiendung) and Stefan N and Mario Nguyen
 * Improved JRuby support as well as the way that commands run in any ruby implementation. [Hiro Asari](https://github.com/BanzaiMan)
@@ -36,40 +46,40 @@
 ## 0.9.9 [27 January 2011]
 
 * Better, more semantic HTML5. [Joe Sak](https://github.com/joemsak)
-* Added ``role`` selection for ``admin/users#edit``. [Hez Ronningen](https://github.com/hez)
+* Added `role` selection for `admin/users#edit`. [Hez Ronningen](https://github.com/hez)
 * Fixed WYMeditor bug regarding adding links, helped with persistent testing by [Marko Hriberšek](https://github.com/markoh). [Philip Arndt](https://github.com/parndt)
-* Better ``RSpec`` coverage [Joe Sak](https://github.com/joemsak) and [Philip Arndt](https://github.com/parndt) and [Uģis Ozols](https://github.com/ugisozols) and [PeRo ICT Solutions](https://github.com/pero-ict)
+* Better `RSpec` coverage [Joe Sak](https://github.com/joemsak) and [Philip Arndt](https://github.com/parndt) and [Uģis Ozols](https://github.com/ugisozols) and [PeRo ICT Solutions](https://github.com/pero-ict)
 * Superusers now get access to all backend tabs by default. [Philip Arndt](https://github.com/parndt)
 * Introduced LOLcat translation (yes, seriously) as an easter egg. [Steven Heidel](https://github.com/stevenheidel)
 * Fixed several missing translations. [Johan Bruning](https://github.com/GidoGeek)
 * Solved several i18n inconsistencies. [Jonas Hartmann](https://github.com/ionas)
-* Made ``UserPlugin`` dependent on ``User`` which solves a data redundancy proble.m [Maarten Hoogendoorn](https://github.com/moretea)
-* Fixed issue with finding where engines are located on the disk using ``Plugin::pathname``. [Lele](https://github.com/leleintercom)
-* Add ``rescue_not_found`` option to turn on/off 404 rendering. [Ryan Bigg](https://github.com/radar)
+* Made `UserPlugin` dependent on `User` which solves a data redundancy proble.m [Maarten Hoogendoorn](https://github.com/moretea)
+* Fixed issue with finding where engines are located on the disk using `Plugin::pathname`. [Lele](https://github.com/leleintercom)
+* Add `rescue_not_found` option to turn on/off 404 rendering. [Ryan Bigg](https://github.com/radar)
 * Full review of the French translations. [Jérémie Horhant](https://github.com/Titinux)
-* Now using ``mail()`` to send emails. [J. Edward Dewyea](https://github.com/commuter)
+* Now using `mail()` to send emails. [J. Edward Dewyea](https://github.com/commuter)
 * Refactored backend HTML & CSS, reduced complexity and added a loading animation when you click Save on forms. [Philip Arndt](https://github.com/parndt)
 * Improved the speed of the menu especially related to scaling through reusing collections rather then revisiting the database. [Amanda Wagener](https://github.com/awagener)
-* Implemented an API for the ``pages`` form's tabs. [David Jones](https://github.com/djones)
-* Use the rails naming convention for translations that contain html markup. Escaping translations not marked as ``html_safe`` in the ``refinery_help_tag`` helper. [Jérémie Horhant](https://github.com/Titinux)
+* Implemented an API for the `pages` form's tabs. [David Jones](https://github.com/djones)
+* Use the rails naming convention for translations that contain html markup. Escaping translations not marked as `html_safe` in the `refinery_help_tag` helper. [Jérémie Horhant](https://github.com/Titinux)
 * Full review of the Italian translations. [Mirco Veltri](https://github.com/indaco)
-* Deprecated ``/admin`` in favour of ``/refinery`` and put in a message to display to the user when they use it. [Philip Arndt](https://github.com/parndt)
+* Deprecated `/admin` in favour of `/refinery` and put in a message to display to the user when they use it. [Philip Arndt](https://github.com/parndt)
 * Full review of the Russian translations as well as work with articles / genders in grammar. [Semyon Perepelitsa](https://github.com/semaperepelitsa)
 * Full review of routes and the Latvian translations. [Uģis Ozols](https://github.com/ugisozols)
-* Implemented better support for ``rails.js``, using standard ``:method`` and ``:confirm`` ``link_to`` options. [Semyon Perepelitsa](https://github.com/semaperepelitsa)
+* Implemented better support for `rails.js`, using standard `:method` and `:confirm` `link_to` options. [Semyon Perepelitsa](https://github.com/semaperepelitsa)
 * Locked jQuery to 1.4.2 and jQuery UI to 1.8.5, fixed errors with dialogues and tested. [Philip Arndt](https://github.com/parndt) and [Phillip Miller](https://github.com/philmill) and [Sam Beam](https://github.com/sbeam)
 * Added multiple file upload for images and resources using HTML5. [Philip Arndt](https://github.com/parndt)
-* Deprecated ``content_for :head`` in favour of ``content_for :meta``, ``content_for :stylesheets`` and ``content_for :javascripts``. [Philip Arndt](https://github.com/parndt)
+* Deprecated `content_for :head` in favour of `content_for :meta`, `content_for :stylesheets` and `content_for :javascripts`. [Philip Arndt](https://github.com/parndt)
 * Improved client-side responsiveness of backend and frontend. [Philip Arndt](https://github.com/parndt)
 * No more RMagick dependency [Philip Arndt](https://github.com/parndt)
-* Added ``rake refinery:override stylesheet=somefile`` and ``rake refinery:override javascript=somefile`` commands to override stylesheets and javascripts. [Oliver Ponder](https://github.com/oponder)
-* Restructed the project to remove ``vendor/refinerycms`` and put all engines in the application root. [Kamil K. Lemański](https://github.com/kml)
+* Added `rake refinery:override stylesheet=somefile` and `rake refinery:override javascript=somefile` commands to override stylesheets and javascripts. [Oliver Ponder](https://github.com/oponder)
+* Restructed the project to remove `vendor/refinerycms` and put all engines in the application root. [Kamil K. Lemański](https://github.com/kml)
 * Force no resource caching on non-writable file systems (like Heroku). [Philip Arndt](https://github.com/parndt)
-* Refinery can now attach itself to a Rails application simply by including the refinerycms gem in the ``Gemfile``. [Philip Arndt](https://github.com/parndt)
-* Added core support for ``globalize3`` so that pages can be translated into multiple languages. [Philip Arndt](https://github.com/parndt) and [Maarten Hoogendoorn](https://github.com/moretea)
-* Refactored ``group_by_date`` into a helper method which is called in the view layer and not in the controller because it is entirely presentation. [Philip Arndt](https://github.com/parndt)
+* Refinery can now attach itself to a Rails application simply by including the refinerycms gem in the `Gemfile`. [Philip Arndt](https://github.com/parndt)
+* Added core support for `globalize3` so that pages can be translated into multiple languages. [Philip Arndt](https://github.com/parndt) and [Maarten Hoogendoorn](https://github.com/moretea)
+* Refactored `group_by_date` into a helper method which is called in the view layer and not in the controller because it is entirely presentation. [Philip Arndt](https://github.com/parndt)
 * Applied HTML5 history pagination to all core engines. [Philip Arndt](https://github.com/parndt)
-* Converted translate calls to use ``:scope``. [Uģis Ozols](https://github.com/ugisozols)
+* Converted translate calls to use `:scope`. [Uģis Ozols](https://github.com/ugisozols)
 * Fixed issues where errors would only show up in English for some models and updated Russian translations. [Semyon Perepelitsa](https://github.com/semaperepelitsa)
 * Converted to devise for authentication, requiring password resets. [Philip Arndt](https://github.com/parndt) and [Uģis Ozols](https://github.com/ugisozols)
 * Sped up WYMeditor load times. [Philip Arndt](https://github.com/parndt)
@@ -80,32 +90,32 @@
 ## 0.9.8.9 [21 December 2010]
 
 * Fixed error in the inquiries engine seeds. [Philip Arndt](https://github.com/parndt)
-* Separate each error message into its own ``<li>``. [Uģis Ozols](https://github.com/ugisozols)
-* Add ``rescue_not_found`` option to turn on/off 404 rendering. [Ryan Bigg](https://github.com/radar)
-* Add ``:from`` key to ``UserMailer`` for password reset. [Earle Clubb](https://github.com/eclubb)
+* Separate each error message into its own `<li>`. [Uģis Ozols](https://github.com/ugisozols)
+* Add `rescue_not_found` option to turn on/off 404 rendering. [Ryan Bigg](https://github.com/radar)
+* Add `:from` key to `UserMailer` for password reset. [Earle Clubb](https://github.com/eclubb)
 * [See full list](https://github.com/resolve/refinerycms/compare/0.9.8.8...0.9.8.9)
 
 ## 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)
+* 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)
+* Fixed problems with `db:migrate` for a new app on Postgres. [Jacob Buys](https://github.com/wjbuys)
 * Back-ported the changes made to the images dialogue which speed it up significantly. [Philip Arndt](https://github.com/parndt)
-* Sort file names in the ``refinery_engine`` generator so attribute types don't get changed before ``_form.html.erb`` generation. [Phil Spitler](https://github.com/philspitler)
-* Added ``approximate_ascii`` setting, defaulted to true, for pages so that characters won't appear strangely in the address bar of some web browsers. [Uģis Ozols](https://github.com/ugisozols)
+* Sort file names in the `refinery_engine` generator so attribute types don't get changed before `_form.html.erb` generation. [Phil Spitler](https://github.com/philspitler)
+* Added `approximate_ascii` setting, defaulted to true, for pages so that characters won't appear strangely in the address bar of some web browsers. [Uģis Ozols](https://github.com/ugisozols)
 * [See full list](https://github.com/resolve/refinerycms/compare/0.9.8.6...0.9.8.7)
 
 ## 0.9.8.6 [3 December 2010]
 
 * Backported lots of functionality from 0.9.9 and later like:
 * Fixed reordering for trees and non-trees [Philip Arndt](https://github.com/parndt)
-* Better ``RSpec`` coverage [Joe Sak](https://github.com/joemsak) and [Philip Arndt](https://github.com/parndt) and [Uģis Ozols](https://github.com/ugisozols) and [PeRo ICT Solutions](https://github.com/pero-ict)
-* Fixed issue with finding where engines are located on the disk using ``Plugin::pathname``. [Lele](https://github.com/leleintercom)
+* Better `RSpec` coverage [Joe Sak](https://github.com/joemsak) and [Philip Arndt](https://github.com/parndt) and [Uģis Ozols](https://github.com/ugisozols) and [PeRo ICT Solutions](https://github.com/pero-ict)
+* Fixed issue with finding where engines are located on the disk using `Plugin::pathname`. [Lele](https://github.com/leleintercom)
 * Improved the speed of the menu especially related to scaling through reusing collections rather then revisiting the database. [Amanda Wagener](https://github.com/awagener)
 * No more RMagick dependency [Philip Arndt](https://github.com/parndt)
 * Added helper methods to expose some of the options in crud. [David Jones](https://github.com/djones)
@@ -113,11 +123,11 @@
 
 ## 0.9.8.5 [21 September 2010](https://github.com/parndt)
 
-* Fixed an issue with the engine generator that was putting a comma in the wrong place breaking the call to ``crudify``. [Maarten Hoogendoorn](https://github.com/moretea)
+* Fixed an issue with the engine generator that was putting a comma in the wrong place breaking the call to `crudify`. [Maarten Hoogendoorn](https://github.com/moretea)
 * Made the delete messages consistent. [Uģis Ozols](https://github.com/ugisozols)
-* ``zh-CN`` was overriding en locale in core locale file, fixed. [Philip Arndt](https://github.com/parndt)
+* `zh-CN` was overriding en locale in core locale file, fixed. [Philip Arndt](https://github.com/parndt)
 * Changed verbiage from created to added, create to add as it describes it better for things like images. [Philip Arndt](https://github.com/parndt)
-* ``image_fu`` no longer gives you the width and height of the image due to performance problems. [Philip Arndt](https://github.com/parndt) and [David Jones](https://github.com/djones)
+* `image_fu` no longer gives you the width and height of the image due to performance problems. [Philip Arndt](https://github.com/parndt) and [David Jones](https://github.com/djones)
 * Implemented a standardised API for the engine generator. The core now includes a standard engine install generator. Engines generate a readme file explaining how to build an engine as a gem. [David Jones](https://github.com/djones)
 * [See full list](https://github.com/resolve/refinerycms/compare/0.9.8.4...0.9.8.5)
 
@@ -125,41 +135,41 @@
 
 * Recursive deletion of page parts. [primerano](https://github.com/primerano)
 * Move around the default pages. [Philip Arndt](https://github.com/parndt)
-* Extraction of windows check to ``Refinery::WINDOWS``. [Steven Heidel](https://github.com/stevenheidel)
+* Extraction of windows check to `Refinery::WINDOWS`. [Steven Heidel](https://github.com/stevenheidel)
 * Updated the changelog for several previous releases. [Steven Heidel](https://github.com/stevenheidel)
 * Made the menu more flexible so that it can be used in many places in your layout without caching over the top of itself. [Philip Arndt](https://github.com/parndt)
 * Added search feature to Refinery Settings. [Matt McMahand](https://github.com/invalidusrname)
-* Ensure that in ``crudify`` that we use ``:per_page`` properly for ``will_paginate``. [Philip Arndt](https://github.com/parndt)
-* Reduce the number of routes that we respond to in the ``pages`` engine as they were unused. [Philip Arndt](https://github.com/parndt)
-* Fixed a case where page links weren't generating properly when inside an engine such as the news engine which made use of ``params[:id]``. Took a lot of perserverance on the part of Hez - thank you very much Hez! [Hez Ronningen](https://github.com/hez) and [Philip Arndt](https://github.com/parndt)
+* Ensure that in `crudify` that we use `:per_page` properly for `will_paginate`. [Philip Arndt](https://github.com/parndt)
+* Reduce the number of routes that we respond to in the `pages` engine as they were unused. [Philip Arndt](https://github.com/parndt)
+* Fixed a case where page links weren't generating properly when inside an engine such as the news engine which made use of `params[:id]`. Took a lot of perserverance on the part of Hez - thank you very much Hez! [Hez Ronningen](https://github.com/hez) and [Philip Arndt](https://github.com/parndt)
 * [See full list](https://github.com/resolve/refinerycms/compare/0.9.8.3...0.9.8.4)
 
 ## 0.9.8.3 [14 September 2010]
 * German translation improvements. [Andre Lohan](https://github.com/dc5ala)
-* Fix bug with ``bin/refinerycms`` and windows commands. [Philip Arndt](https://github.com/parndt)
-* DRY up ``crudify`` and also switch to ARel. [Philip Arndt](https://github.com/parndt)
+* Fix bug with `bin/refinerycms` and windows commands. [Philip Arndt](https://github.com/parndt)
+* DRY up `crudify` and also switch to ARel. [Philip Arndt](https://github.com/parndt)
 * Several fixes to make things much easier on windows. [Philip Arndt](https://github.com/parndt)
 * [See full list](https://github.com/resolve/refinerycms/compare/0.9.8.2...0.9.8.3)
 
 ## 0.9.8.2 [13 September 2010]
-* Update ``readme.md`` [David Jones](https://github.com/djones)
+* Update `readme.md` [David Jones](https://github.com/djones)
 * Speed improvements to menu with nested_set. [Maarten Hoogendoorn](https://github.com/moretea)
 * More speed improvements by optimising slugs. [Philip Arndt](https://github.com/parndt)
-* Fix ``-h`` flag on ``bin/refinerycms`` to display the help. [Steven Heidel](https://github.com/stevenheidel)
+* Fix `-h` flag on `bin/refinerycms` to display the help. [Steven Heidel](https://github.com/stevenheidel)
 * [See full list](https://github.com/resolve/refinerycms/compare/0.9.8.1...0.9.8.2)
 
 ## 0.9.8.1 [9 September 2010]
-* Convert to ``awesome_nested_set``. [Maarten Hoogendoorn](https://github.com/moretea) and [Philip Arndt](https://github.com/parndt)
-* Allow passing ``-g`` to the bin task for extra gems. [Tomás Senart](https://github.com/tsenart)
+* Convert to `awesome_nested_set`. [Maarten Hoogendoorn](https://github.com/moretea) and [Philip Arndt](https://github.com/parndt)
+* Allow passing `-g` to the bin task for extra gems. [Tomás Senart](https://github.com/tsenart)
 * Update documentation for engines, not plugins. [David Jones](https://github.com/djones)
 * Several more documentation fixes. [Steven Heidel](https://github.com/stevenheidel)
 * Better use of dragonfly resizing. [Philip Arndt](https://github.com/parndt)
 * Partial Latvian translation. [Uģis Ozols](https://github.com/ugisozols)
 * Review Portugese translation. [Kivanio Barbosa](https://github.com/kivanio)
 * Bugfix with wymeditor in the engine generator. [Karmen Blake](https://github.com/kblake)
-* Split ``application_helper`` into smaller, more usable files. [Philip Arndt](https://github.com/parndt)
+* Split `application_helper` into smaller, more usable files. [Philip Arndt](https://github.com/parndt)
 * Move features and specs to each engine directory. [Philip Arndt](https://github.com/parndt)
-* Bugfixes to ensure that reordering works under ``awesome_nested_set``. [Maarten Hoogendoorn](https://github.com/moretea) and [Philip Arndt](https://github.com/parndt)
+* Bugfixes to ensure that reordering works under `awesome_nested_set`. [Maarten Hoogendoorn](https://github.com/moretea) and [Philip Arndt](https://github.com/parndt)
 * Update engines to not have a special :require in the Gemfile. [Johan Bruning](https://github.com/GidoGeek)
 * Make cache sweepers work. [Philip Arndt](https://github.com/parndt)
 * [See full list](https://github.com/resolve/refinerycms/compare/0.9.8...0.9.8.1)
@@ -192,14 +202,14 @@
 * Smoothed the sortable list in the admin UI. [Joe Sak](https://github.com/joemsak)
 * Binding link dialogue URL checker to paste action. [Joe Sak](https://github.com/joemsak)
 * Kill hidden overflow on dialogues for smaller browser windows. [Joe Sak](https://github.com/joemsak) and [Philip Arndt](https://github.com/parndt)
-* Refactored the ``parse_branch`` method to speed up reordering on the server. [Joshua Davey](https://github.com/jgdavey)
-* Running ``refinerycms`` with ``-v`` or ``--version`` will now output the version number. [Steven Heidel](https://github.com/stevenheidel)
-* Made the core codebase not rely so heavily on ``@page[:body]`` by adding ``Page.default_parts`` and using ``.first`` on that instead. [Philip Arndt](https://github.com/parndt)
+* Refactored the `parse_branch` method to speed up reordering on the server. [Joshua Davey](https://github.com/jgdavey)
+* Running `refinerycms` with `-v` or `--version` will now output the version number. [Steven Heidel](https://github.com/stevenheidel)
+* Made the core codebase not rely so heavily on `@page[:body]` by adding `Page.default_parts` and using `.first` on that instead. [Philip Arndt](https://github.com/parndt)
 * [See full list](https://github.com/resolve/refinerycms/compare/0.9.7.11...0.9.7.12)
 
 ## 0.9.7.11 [07 August 2010]
 
-* Removed ``app/controllers/application.rb`` due to its serious deprecation. Fixed deprecations in how we use acts_as_indexed. [Philip Arndt](https://github.com/parndt)
+* Removed `app/controllers/application.rb` due to its serious deprecation. Fixed deprecations in how we use acts_as_indexed. [Philip Arndt](https://github.com/parndt)
 * Added passing cucumber features for search for: [Uģis Ozols](https://github.com/ugisozols)
   - Images
   - Files
@@ -215,7 +225,7 @@
 * Lots of fixes for translations. [Uģis Ozols](https://github.com/ugisozols)
 * Fix XSS vulnerability on page meta information by escaping the relevant fields properly [David Jones](https://github.com/djones)
 * Ensure that the generator script grabs the first attribute that is a string, not just the first attribute, when choosing the field for Dashboard activity. [Joe Sak](https://github.com/joemsak)
-* Updated ``json-pure`` to ``1.4.5``, now using the actual gem [Philip Arndt](https://github.com/parndt)
+* Updated `json-pure` to `1.4.5`, now using the actual gem [Philip Arndt](https://github.com/parndt)
 * [See full list](https://github.com/resolve/refinerycms/compare/0.9.7.10...0.9.7.11)
 
 
@@ -231,13 +241,13 @@
 ## 0.9.7.9 [30 July 2010]
 
 * Added a theme generator to create the basic file structure of a new theme. [David Jones](https://github.com/djones) and [Levi Cole](https://github.com/levicole)
-* Renamed ``script/generate refinery`` to ``script/generate refinery_plugin``. [David Jones](https://github.com/djones)
-* Add deprecation notice to ``script/generate refinery``. [David Jones](https://github.com/djones)
+* Renamed `script/generate refinery` to `script/generate refinery_plugin`. [David Jones](https://github.com/djones)
+* Add deprecation notice to `script/generate refinery`. [David Jones](https://github.com/djones)
 * Updated documentation to reflect new generator changes. [David Jones](https://github.com/djones)
 * Added tests for both plugin and theme generators. [David Jones](https://github.com/djones) and [Levi Cole](https://github.com/levicole)
-* Refactored the ``refinerycms`` & ``refinery-upgrade-097-to-097`` tasks to make better use of Pathname. [Philip Arndt](https://github.com/parndt)
+* Refactored the `refinerycms` & `refinery-upgrade-097-to-097` tasks to make better use of Pathname. [Philip Arndt](https://github.com/parndt)
 * Added more cucumber features and tagged existing ones. [Philip Arndt](https://github.com/parndt), [James Fiderlick](https://github.com/jamesfid) and [Steven Heidel](https://github.com/stevenheidel)
-* Removed mysterious ``page_translations`` table if you had it. [Philip Arndt](https://github.com/parndt)
+* Removed mysterious `page_translations` table if you had it. [Philip Arndt](https://github.com/parndt)
 * Added workaround for tests that involve dialogues. [Uģis Ozols](https://github.com/ugisozols)
 * Added as default the ability for forms to know whether they are inside a modal / dialog. [Philip Arndt](https://github.com/parndt)
 * [See full list](https://github.com/resolve/refinerycms/compare/0.9.7.8...0.9.7.9)
@@ -263,14 +273,14 @@
 * Bugfixes, some IE compatibility. [Philip Arndt](https://github.com/parndt)
 * Fix syntax errors in existing resource dialog. [David Jones](https://github.com/djones)
 * Identified and fixed a positioning bug in dialogues [Joe Sak](https://github.com/joemsak) and [Philip Arndt](https://github.com/parndt)
-* Fixed issue that was causing Refinery to load in rake tasks twice if they lived under ``"#{Rails.root}/vendor/plugins"``. [David Jones](https://github.com/djones) and [Philip Arndt](https://github.com/parndt)
+* Fixed issue that was causing Refinery to load in rake tasks twice if they lived under `"#{Rails.root}/vendor/plugins"`. [David Jones](https://github.com/djones) and [Philip Arndt](https://github.com/parndt)
 * [See full list](https://github.com/resolve/refinerycms/compare/0.9.7.6...0.9.7.7)
 
 ## 0.9.7.6 [15 July 2010]
 
 * Bugfixes, fixed some failing tests. [Philip Arndt](https://github.com/parndt)
 * More pt-BR translation keys translated. [Kivanio Barbosa](https://github.com/kivanio)
-* Locked gems using ``Gemfile.lock``. [David Jones](https://github.com/djones)
+* Locked gems using `Gemfile.lock`. [David Jones](https://github.com/djones)
 * Changed 'refinery' task to 'refinerycms' as that is our gem's name. [Steven Heidel](https://github.com/stevenheidel)
 * Fixed bug where settings were still considered restricted if NULL. [Steven Heidel](https://github.com/stevenheidel)
 * Ensures that bundler is available before creating an application from a gem. [Philip Arndt](https://github.com/parndt)

data/config/database.yml.mysql

@@ -1,5 +1,5 @@
 login: &login
-  adapter: mysql
+  adapter: mysql2
   host: localhost
   username: root
   password:
@@ -13,7 +13,7 @@ test: &test
   <<: *login
 
 production: &production
-  adapter: mysql
+  adapter: mysql2
   host: localhost
   database: your_production_database
   username: your_production_database_login

data/lib/refinerycms.rb

@@ -1,3 +1,3 @@
-%w(base core settings authentication dashboard images pages resources).each do |engine|
-  require "refinerycms-#{engine}"
-end
+require 'refinerycms-base'
+
+require File.expand_path('../refinerycms/all', __FILE__) unless defined?(REFINERYCMS_INSTALLER)

data/lib/refinerycms/all.rb

@@ -0,0 +1,3 @@
+%w(base core settings authentication dashboard images pages resources).each do |engine|
+  require "refinerycms-#{engine}"
+end

data/readme.md

@@ -33,7 +33,7 @@ Unlike other content managers, Refinery is truly __aimed at the end user__ makin
 ### For developers
 
 * Easily customise the look to suit the business.
-* __[Extend with custom engines](http://github.com/resolve/refinerycms/blob/master/core/engines.md#readme)__ to do anything Refinery doesn't do out of the box.
+* __[Extend with custom engines](https://github.com/resolve/refinerycms/blob/master/doc/engines.md#readme)__ to do anything Refinery doesn't do out of the box.
 * Sticks to __"the Rails way"__ as much as possible; we don't force you to learn new templating languages.
 * Uses [jQuery](http://jquery.com/) for fast and concise Javascript.
 
@@ -50,16 +50,16 @@ Wanna see Refinery for yourself? [Try the demo](http://demo.refinerycms.com/refi
 * [GitHub repository](http://github.com/resolve/refinerycms)
 * [Developer/API documentation](http://api.refinerycms.org)
 * [Twitter Account](http://twitter.com/refinerycms)
-* Documentation about: [Pages](http://github.com/resolve/refinerycms/blob/master/pages/readme.md#readme), [Images](http://github.com/resolve/refinerycms/blob/master/images/readme.md#readme), [Files](http://github.com/resolve/refinerycms/blob/master/resources/readme.md#readme), [Inquiries](http://github.com/resolve/refinerycms-inquiries/blob/master/readme.md#readme), [Settings](http://github.com/resolve/refinerycms/blob/master/settings/readme.md#readme), [Dashboard](http://github.com/resolve/refinerycms/blob/master/dashboard/readme.md#readme), [Authentication & Users](http://github.com/resolve/refinerycms/blob/master/authentication/readme.md#readme), [Extending with Engines](http://github.com/resolve/refinerycms/blob/master/core/engines.md#readme).
+* Documentation about: [Pages](https://github.com/resolve/refinerycms/blob/master/doc/pages.md#readme), [Images](http://github.com/resolve/refinerycms/blob/master/doc/images.md#readme), [Files](http://github.com/resolve/refinerycms/blob/master/doc/resources.md#readme), [Inquiries](http://github.com/resolve/refinerycms-inquiries/blob/master/readme.md#readme), [Settings](http://github.com/resolve/refinerycms/blob/master/doc/settings.md#readme), [Dashboard](http://github.com/resolve/refinerycms/blob/master/doc/dashboard.md#readme), [Authentication & Users](http://github.com/resolve/refinerycms/blob/master/doc/authentication.md#readme), [Extending with Engines](http://github.com/resolve/refinerycms/blob/master/doc/engines.md#readme).
 
 ## Features
 
-### [Pages](http://github.com/resolve/refinerycms/blob/master/pages/readme.md#readme)
+### [Pages](http://github.com/resolve/refinerycms/blob/master/doc/pages.md#readme)
 
 * Easily edit and manage pages with a [WYSIWYG visual editor](http://www.wymeditor.org/).
 * Manage you site's structure.
 
-### [Images](http://github.com/resolve/refinerycms/blob/master/images/readme.md#readme) & [Files](http://github.com/resolve/refinerycms/blob/master/resources/readme.md#readme)
+### [Images](http://github.com/resolve/refinerycms/blob/master/doc/images.md#readme) & [Files](http://github.com/resolve/refinerycms/blob/master/doc/resources.md#readme)
 
 * Easily upload and insert images.
 * Upload and link to resources such as PDF documents.
@@ -72,28 +72,28 @@ Wanna see Refinery for yourself? [Try the demo](http://demo.refinerycms.com/refi
 * Manage your inquiries and be notified when new ones come in.
 * Checks new inquiries for spam.
 
-### [Settings](http://github.com/resolve/refinerycms/blob/master/settings/readme.md#readme)
+### [Settings](http://github.com/resolve/refinerycms/blob/master/doc/settings.md#readme)
 
 * Manage the behaviour of Refinery
 * Easily integrate with [Google Analytics](https://www.google.com/analytics/)
 
-### [Dashboard](http://github.com/resolve/refinerycms/blob/master/dashboard/readme.md#readme)
+### [Dashboard](http://github.com/resolve/refinerycms/blob/master/doc/dashboard.md#readme)
 
 * Get an overview of what has been updated recently and see recent inquiries.
 
-### [Authentication & Users](http://github.com/resolve/refinerycms/blob/master/authentication/readme.md#readme)
+### [Authentication & Users](http://github.com/resolve/refinerycms/blob/master/doc/authentication.md#readme)
 
 * Manage who can access Refinery.
 * Control which engines each user has access to.
 * Uses the popular [authlogic](http://github.com/binarylogic/authlogic).
 
-### ...Want more? [Extend with Engines](http://github.com/resolve/refinerycms/blob/master/core/engines.md#readme)
+### ...Want more? [Extend with Engines](http://github.com/resolve/refinerycms/blob/master/doc/engines.md#readme)
 
 Extend Refinery easily by running the Refinery engine generator
 
     rails generate refinery_engine
 
-to get help on how to use that. Or read the full documentation on [writing engines for Refinery](http://github.com/resolve/refinerycms/blob/master/core/engines.md#readme)
+to get help on how to use that. Or read the full documentation on [writing engines for Refinery](http://github.com/resolve/refinerycms/blob/master/docengines.md#readme)
 
 ### Popular Engines
 

data/refinerycms.gemspec

@@ -2,9 +2,9 @@
 
 Gem::Specification.new do |s|
   s.name              = %q{refinerycms}
-  s.version           = %q{0.9.9.4}
+  s.version           = %q{0.9.9.5}
   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-02-24}
+  s.date              = %q{2011-03-08}
   s.summary           = %q{A Ruby on Rails CMS that supports Rails 3}
   s.email             = %q{info@refinerycms.com}
   s.homepage          = %q{http://refinerycms.com}
@@ -18,14 +18,14 @@ Gem::Specification.new do |s|
   s.add_dependency    'bundler',                    '~> 1.0.10'
 
   # Refinery CMS
-  s.add_dependency    'refinerycms-authentication', '~> 0.9.9.4'
-  s.add_dependency    'refinerycms-base',           '~> 0.9.9.4'
-  s.add_dependency    'refinerycms-core',           '~> 0.9.9.4'
-  s.add_dependency    'refinerycms-dashboard',      '~> 0.9.9.4'
-  s.add_dependency    'refinerycms-images',         '~> 0.9.9.4'
-  s.add_dependency    'refinerycms-pages',          '~> 0.9.9.4'
-  s.add_dependency    'refinerycms-resources',      '~> 0.9.9.4'
-  s.add_dependency    'refinerycms-settings',       '~> 0.9.9.4'
+  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.files             = [
     '.gitignore',
@@ -59,9 +59,12 @@ Gem::Specification.new do |s|
     'config.ru',
     'lib',
     'lib/refinery.rb',
+    'lib/refinerycms',
+    'lib/refinerycms/all.rb',
     'lib/refinerycms.rb',
     'license.md',
     'license.md',
+    'public',
     'readme.md',
     'readme.md',
     'refinerycms.gemspec',

data/spec/spec_helper.rb

@@ -35,8 +35,7 @@ end
 
 require 'rubygems'
 # If spork is available in the Gemfile it'll be used but we don't force it.
-unless RbConfig::CONFIG["host_os"] =~ %r!(msdos|mswin|djgpp|mingw)! or (begin; require 'spork'; rescue LoadError; nil end).nil?
-  require 'spork'
+unless (begin; require 'spork'; rescue LoadError; nil end).nil?
 
   Spork.prefork do
     # Loading more in this block will cause your tests to run faster. However,

metadata

@@ -2,7 +2,7 @@
 name: refinerycms
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.9.9.4
+  version: 0.9.9.5
 platform: ruby
 authors: 
 - Resolve Digital
@@ -13,7 +13,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-02-24 00:00:00 +13:00
+date: 2011-03-08 00:00:00 +13:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -35,7 +35,7 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        version: 0.9.9.4
+        version: 0.9.9.5
   type: :runtime
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
@@ -46,7 +46,7 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        version: 0.9.9.4
+        version: 0.9.9.5
   type: :runtime
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
@@ -57,7 +57,7 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        version: 0.9.9.4
+        version: 0.9.9.5
   type: :runtime
   version_requirements: *id004
 - !ruby/object:Gem::Dependency 
@@ -68,7 +68,7 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        version: 0.9.9.4
+        version: 0.9.9.5
   type: :runtime
   version_requirements: *id005
 - !ruby/object:Gem::Dependency 
@@ -79,7 +79,7 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        version: 0.9.9.4
+        version: 0.9.9.5
   type: :runtime
   version_requirements: *id006
 - !ruby/object:Gem::Dependency 
@@ -90,7 +90,7 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        version: 0.9.9.4
+        version: 0.9.9.5
   type: :runtime
   version_requirements: *id007
 - !ruby/object:Gem::Dependency 
@@ -101,7 +101,7 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        version: 0.9.9.4
+        version: 0.9.9.5
   type: :runtime
   version_requirements: *id008
 - !ruby/object:Gem::Dependency 
@@ -112,7 +112,7 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        version: 0.9.9.4
+        version: 0.9.9.5
   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.
@@ -145,6 +145,7 @@ files:
 - config/settings.rb
 - config.ru
 - lib/refinery.rb
+- lib/refinerycms/all.rb
 - lib/refinerycms.rb
 - license.md
 - readme.md
@@ -175,7 +176,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: refinerycms
-rubygems_version: 1.5.2
+rubygems_version: 1.6.0
 signing_key: 
 specification_version: 3
 summary: A Ruby on Rails CMS that supports Rails 3