refinerycms 0.9.9.21 → 0.9.9.22

data/.gitignore

@@ -78,7 +78,6 @@ capybara-*html
 # Always keep this section at the bottom.
 
 config/database.yml
-config/amazon_s3.yml
 config/rackspace_cloudfiles.yml
 your_*.*
 db/schema.rb

data/Gemfile

@@ -26,17 +26,17 @@ gem 'mysql2', '~> 0.2.7'
 # gem 'ruby-debug19'
 
 # For Heroku/s3:
-# gem 'aws-s3', :require => 'aws/s3'
+# gem 'fog'
 
 # REFINERY CMS ================================================================
 # Anything you put in here will be overridden when the app gets updated.
 
-# gem 'refinerycms', '~> 0.9.9.21'
+# gem 'refinerycms', '~> 0.9.9.22'
 
 group :development, :test do
   # To use refinerycms-testing, uncomment it (if it's commented out) and run 'bundle install'
   # Then, run 'rails generate refinerycms_testing' which will copy its support files.
-  gem 'refinerycms-testing',    '~> 0.9.9.21'
+  gem 'refinerycms-testing',    '~> 0.9.9.22'
 end
 
 # END REFINERY CMS ============================================================
@@ -48,7 +48,7 @@ end
 # USER DEFINED
 
 # Specify additional Refinery CMS Engines here (all optional):
-# gem 'refinerycms-inquiries',    '~> 0.9'
+# gem 'refinerycms-inquiries',    '~> 1.0'
 # gem 'refinerycms-news',         '~> 1.0'
 # gem 'refinerycms-portfolio',    '~> 0.9.9'
 # gem 'refinerycms-theming',      '~> 1.0'

data/Gemfile.lock

@@ -1,51 +1,51 @@
 PATH
   remote: .
   specs:
-    refinerycms (0.9.9.21)
+    refinerycms (0.9.9.22)
       bundler (~> 1.0)
-      refinerycms-authentication (= 0.9.9.21)
-      refinerycms-base (= 0.9.9.21)
-      refinerycms-core (= 0.9.9.21)
-      refinerycms-dashboard (= 0.9.9.21)
-      refinerycms-images (= 0.9.9.21)
-      refinerycms-pages (= 0.9.9.21)
-      refinerycms-resources (= 0.9.9.21)
-      refinerycms-settings (= 0.9.9.21)
-    refinerycms-authentication (0.9.9.21)
+      refinerycms-authentication (= 0.9.9.22)
+      refinerycms-base (= 0.9.9.22)
+      refinerycms-core (= 0.9.9.22)
+      refinerycms-dashboard (= 0.9.9.22)
+      refinerycms-images (= 0.9.9.22)
+      refinerycms-pages (= 0.9.9.22)
+      refinerycms-resources (= 0.9.9.22)
+      refinerycms-settings (= 0.9.9.22)
+    refinerycms-authentication (0.9.9.22)
       devise (~> 1.3.0)
       friendly_id_globalize3 (~> 3.2.1)
-      refinerycms-core (= 0.9.9.21)
-    refinerycms-base (0.9.9.21)
-    refinerycms-core (0.9.9.21)
+      refinerycms-core (= 0.9.9.22)
+    refinerycms-base (0.9.9.22)
+    refinerycms-core (0.9.9.22)
       acts_as_indexed (~> 0.7)
+      awesome_nested_set (~> 2.0)
       friendly_id_globalize3 (~> 3.2.1)
-      globalize3 (>= 0.1.0.beta)
-      moretea-awesome_nested_set (~> 1.4)
+      globalize3 (>= 0.1.0.beta2)
       rails (~> 3.0.7)
-      refinerycms-base (= 0.9.9.21)
+      refinerycms-base (= 0.9.9.22)
       refinerycms-generators (~> 1.0)
-      refinerycms-settings (= 0.9.9.21)
+      refinerycms-settings (= 0.9.9.22)
       truncate_html (~> 0.5)
       will_paginate (~> 3.0.pre)
-    refinerycms-dashboard (0.9.9.21)
-      refinerycms-core (= 0.9.9.21)
-    refinerycms-images (0.9.9.21)
-      dragonfly (~> 0.8.4)
+    refinerycms-dashboard (0.9.9.22)
+      refinerycms-core (= 0.9.9.22)
+    refinerycms-images (0.9.9.22)
+      dragonfly (~> 0.9.0)
       rack-cache (>= 0.5.3)
-      refinerycms-core (= 0.9.9.21)
-    refinerycms-pages (0.9.9.21)
+      refinerycms-core (= 0.9.9.22)
+    refinerycms-pages (0.9.9.22)
+      awesome_nested_set (~> 2.0)
       friendly_id_globalize3 (~> 3.2.1)
-      globalize3 (>= 0.1.0.beta)
-      moretea-awesome_nested_set (~> 1.4)
-      refinerycms-core (= 0.9.9.21)
-      seo_meta (~> 1.0.5)
-    refinerycms-resources (0.9.9.21)
-      dragonfly (~> 0.8.4)
+      globalize3 (>= 0.1.0.beta2)
+      refinerycms-core (= 0.9.9.22)
+      seo_meta (~> 1.1)
+    refinerycms-resources (0.9.9.22)
+      dragonfly (~> 0.9.0)
       rack-cache (>= 0.5.3)
-      refinerycms-core (= 0.9.9.21)
-    refinerycms-settings (0.9.9.21)
-      refinerycms-base (= 0.9.9.21)
-    refinerycms-testing (0.9.9.21)
+      refinerycms-core (= 0.9.9.22)
+    refinerycms-settings (0.9.9.22)
+      refinerycms-base (= 0.9.9.22)
+    refinerycms-testing (0.9.9.22)
       autotest
       autotest-notification
       autotest-rails
@@ -58,8 +58,8 @@ PATH
       json_pure
       launchy
       rack-test (~> 0.5.6)
-      refinerycms-core (= 0.9.9.21)
-      rspec-rails (~> 2.5)
+      refinerycms-core (= 0.9.9.22)
+      rspec-rails (~> 2.6)
 
 GEM
   remote: http://rubygems.org/
@@ -93,14 +93,16 @@ GEM
       activesupport (= 3.0.7)
     activesupport (3.0.7)
     acts_as_indexed (0.7.2)
-    arel (2.0.9)
+    arel (2.0.10)
     autotest (4.4.6)
       ZenTest (>= 4.4.1)
     autotest-notification (2.3.1)
       autotest (~> 4.3)
     autotest-rails (4.1.0)
       ZenTest
-    babosa (0.3.3)
+    awesome_nested_set (2.0.0)
+      activerecord (>= 3.0.0)
+    babosa (0.3.4)
     bcrypt-ruby (2.1.4)
     builder (2.1.2)
     capybara (0.4.1.2)
@@ -113,7 +115,7 @@ GEM
       selenium-webdriver (>= 0.0.27)
       xpath (~> 0.1.3)
     celerity (0.8.9)
-    childprocess (0.1.8)
+    childprocess (0.1.9)
       ffi (~> 1.0.6)
     configuration (1.2.0)
     cucumber (0.10.2)
@@ -133,18 +135,17 @@ GEM
       orm_adapter (~> 0.0.3)
       warden (~> 1.0.3)
     diff-lcs (1.1.2)
-    dragonfly (0.8.4)
+    dragonfly (0.9.2)
       rack
     erubis (2.6.6)
       abstract (>= 1.0.0)
     factory_girl (1.3.3)
-    ffi (1.0.7)
-      rake (>= 0.8.7)
+    ffi (1.0.8)
     friendly_id_globalize3 (3.2.1.3)
       babosa (~> 0.3.0)
-    gherkin (2.3.6)
+    gherkin (2.3.8)
       json (>= 1.4.6)
-    globalize3 (0.1.0.beta)
+    globalize3 (0.1.0.beta2)
       activemodel (>= 3.0.0)
       activerecord (>= 3.0.0)
     i18n (0.5.0)
@@ -159,14 +160,12 @@ GEM
       mime-types (~> 1.16)
       treetop (~> 1.4.8)
     mime-types (1.16)
-    moretea-awesome_nested_set (1.4.3.1)
-      activerecord (~> 3.0.0)
     mysql2 (0.2.7)
     nokogiri (1.4.4)
-    orm_adapter (0.0.4)
+    orm_adapter (0.0.5)
     polyglot (0.3.1)
     rack (1.2.2)
-    rack-cache (1.0.1)
+    rack-cache (1.0.2)
       rack (>= 0.4)
     rack-mount (0.6.14)
       rack (>= 1.0.0)
@@ -192,26 +191,26 @@ GEM
       routing-filter (>= 0.2.3)
     routing-filter (0.2.3)
       actionpack
-    rspec (2.5.0)
-      rspec-core (~> 2.5.0)
-      rspec-expectations (~> 2.5.0)
-      rspec-mocks (~> 2.5.0)
-    rspec-core (2.5.1)
-    rspec-expectations (2.5.0)
+    rspec (2.6.0)
+      rspec-core (~> 2.6.0)
+      rspec-expectations (~> 2.6.0)
+      rspec-mocks (~> 2.6.0)
+    rspec-core (2.6.1)
+    rspec-expectations (2.6.0)
       diff-lcs (~> 1.1.2)
-    rspec-mocks (2.5.0)
-    rspec-rails (2.5.0)
+    rspec-mocks (2.6.0)
+    rspec-rails (2.6.0)
       actionpack (~> 3.0)
       activesupport (~> 3.0)
       railties (~> 3.0)
-      rspec (~> 2.5.0)
+      rspec (~> 2.6.0)
     rubyzip (0.9.4)
     selenium-webdriver (0.2.0)
       childprocess (>= 0.1.7)
       ffi (>= 1.0.7)
       json_pure
       rubyzip
-    seo_meta (1.0.5)
+    seo_meta (1.1.1)
       refinerycms-generators (~> 1.0.1)
     sqlite3 (1.3.3)
     term-ansicolor (1.0.5)
@@ -220,8 +219,8 @@ GEM
       polyglot (>= 0.3.1)
     truncate_html (0.5.1)
     tzinfo (0.3.27)
-    warden (1.0.3)
-      rack (>= 1.0.0)
+    warden (1.0.4)
+      rack (>= 1.0)
     will_paginate (3.0.pre2)
     xpath (0.1.4)
       nokogiri (~> 1.3)
@@ -233,5 +232,5 @@ DEPENDENCIES
   mysql2 (~> 0.2.7)
   refinerycms!
   refinerycms-i18n (~> 1.0.0)
-  refinerycms-testing (~> 0.9.9.21)
+  refinerycms-testing (~> 0.9.9.22)
   sqlite3

data/bin/refinerycms

@@ -284,9 +284,8 @@ module Refinery
       src = Refinery.version !~ /\.pre$/ ? "'= #{Refinery.version}'" : ":git => 'git://github.com/resolve/refinerycms'"
       find_and_replace('Gemfile', %r{gem 'refinerycms',.*}, "gem 'refinerycms',              #{src}")
 
-      # Add in AWS-S3 for Heroku
-      find_and_replace('Gemfile', "# gem 'aws-s3', :require => 'aws/s3'",
-                        "gem 'aws-s3', :require => 'aws/s3'") if @options[:heroku]
+      # Add in fog gem for Heroku
+      find_and_replace('Gemfile', "# gem 'fog'", "gem 'fog'") if @options[:heroku]
 
       # Automate
       # TODO: Check exit codes to see whether or not these worked
@@ -317,7 +316,7 @@ module Refinery
         run_command("git push #{hosting.downcase} master", :ruby => false)
 
         puts "\n\nSetting up the #{hosting} database..\n"
-        run_command("#{hosting.downcase} rake db:setup")
+        run_command("#{hosting.downcase} rake db:migrate")
 
         if @options[:heroku]
           puts "\n\nRestarting servers...\n"
@@ -345,7 +344,7 @@ module Refinery
 
       if @options[:heroku]
         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"
+        note << "heroku config:add S3_BUCKET=XXXXXXXXX S3_KEY=XXXXXXXXX S3_SECRET=XXXXXXXXXX S3_REGION=XXXXXXXXXX"
       end
 
       note << "\nThanks for installing Refinery, enjoy creating your new application!"
@@ -374,7 +373,7 @@ module Refinery
 
       if Refinery::WINDOWS
         to_run = ['"'] + to_run + ['"']
-        to_run = %w(cmd /c) | to_run.map{|c| c.gsub(/\//m, '\\')}
+        to_run = %w(cmd /c) + to_run.map{|c| c.gsub(/\//m, '\\')}
       end
 
       to_run = to_run.join(' ')

data/changelog.md

@@ -1,8 +1,19 @@
+## 0.9.9.22 [22 May 2011]
+
+* Fixed issue introduced with `rake 0.9.0`. [Philip Arndt](https://github.com/parndt)
+* Improved menu performance again including update to `awesome_nested_set 2.0`. [Philip Arndt](https://github.com/parndt) and [Mark Haylock](https://github.com/mhaylock)
+* Supporting the new Google Analytics 'site speed' feature. [David Jones](https://github.com/djones)
+* Implemented `:translator` role which allows a particular user access only to translate pages. [Philip Arndt](https://github.com/parndt)
+* Added support for `Dragonfly 0.9.0` which uses the 'fog' gem. [Jesper Hvirring Henriksen](https://github.com/hvirring)
+* Updated all `refinery/admin.js` functions to make use of 'initialised'. [Mark Haylock](https://github.com/mhaylock)
+* Using SEO form from `seo_meta` inside pages' advanced options rather than having it duplicated in the RefineryCMS codebase too. [Uģis Ozols](https://github.com/ugisozols)
+* [See full list](https://github.com/resolve/refinerycms/compare/0.9.9.21...0.9.9.22)
+
 ## 0.9.9.21 [03 May 2011]
 
 * Fixed issue with MySQL2 gem complaining about us being on Rails 3 by specifying `'~> 0.2.7'` in the Gemfile of a generated application. [Philip Arndt](https://github.com/parndt)
 * `/registrations` is now `/users`. [Philip Arndt](https://github.com/parndt)
-* Added Finnish translation. [https://github.com/veeti](Veeti Paananen)
+* Added Finnish translation. [Veeti Paananen](https://github.com/veeti)
 * Allowed `data` and `data-` attributes in WYMeditor tags using HTML view. [Philip Arndt](https://github.com/parndt)
 * [See full list](https://github.com/resolve/refinerycms/compare/0.9.9.20...0.9.9.21)
 

data/readme.md

@@ -85,7 +85,7 @@ Wanna see Refinery for yourself? [Try the demo](http://demo.refinerycms.com/refi
 
 * Manage who can access Refinery.
 * Control which engines each user has access to.
-* Uses the popular [authlogic](http://github.com/binarylogic/authlogic).
+* Uses the popular [devise](http://github.com/plataformatec/devise).
 
 ### ...Want more? [Extend with Engines](http://github.com/resolve/refinerycms/blob/master/doc/engines.md#readme)
 

data/refinerycms.gemspec

@@ -2,9 +2,9 @@
 
 Gem::Specification.new do |s|
   s.name              = %q{refinerycms}
-  s.version           = %q{0.9.9.21}
+  s.version           = %q{0.9.9.22}
   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-05-03}
+  s.date              = %q{2011-05-22}
   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'
 
   # Refinery CMS
-  s.add_dependency    'refinerycms-authentication', '= 0.9.9.21'
-  s.add_dependency    'refinerycms-base',           '= 0.9.9.21'
-  s.add_dependency    'refinerycms-core',           '= 0.9.9.21'
-  s.add_dependency    'refinerycms-dashboard',      '= 0.9.9.21'
-  s.add_dependency    'refinerycms-images',         '= 0.9.9.21'
-  s.add_dependency    'refinerycms-pages',          '= 0.9.9.21'
-  s.add_dependency    'refinerycms-resources',      '= 0.9.9.21'
-  s.add_dependency    'refinerycms-settings',       '= 0.9.9.21'
+  s.add_dependency    'refinerycms-authentication', '= 0.9.9.22'
+  s.add_dependency    'refinerycms-base',           '= 0.9.9.22'
+  s.add_dependency    'refinerycms-core',           '= 0.9.9.22'
+  s.add_dependency    'refinerycms-dashboard',      '= 0.9.9.22'
+  s.add_dependency    'refinerycms-images',         '= 0.9.9.22'
+  s.add_dependency    'refinerycms-pages',          '= 0.9.9.22'
+  s.add_dependency    'refinerycms-resources',      '= 0.9.9.22'
+  s.add_dependency    'refinerycms-settings',       '= 0.9.9.22'
 
   s.files             = [
     '.gitignore',

metadata

@@ -2,7 +2,7 @@
 name: refinerycms
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.9.9.21
+  version: 0.9.9.22
 platform: ruby
 authors: 
 - Resolve Digital
@@ -13,7 +13,8 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-05-03 00:00:00 Z
+date: 2011-05-22 00:00:00 +12:00
+default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: bundler
@@ -34,7 +35,7 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        version: 0.9.9.21
+        version: 0.9.9.22
   type: :runtime
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
@@ -45,7 +46,7 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        version: 0.9.9.21
+        version: 0.9.9.22
   type: :runtime
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
@@ -56,7 +57,7 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        version: 0.9.9.21
+        version: 0.9.9.22
   type: :runtime
   version_requirements: *id004
 - !ruby/object:Gem::Dependency 
@@ -67,7 +68,7 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        version: 0.9.9.21
+        version: 0.9.9.22
   type: :runtime
   version_requirements: *id005
 - !ruby/object:Gem::Dependency 
@@ -78,7 +79,7 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        version: 0.9.9.21
+        version: 0.9.9.22
   type: :runtime
   version_requirements: *id006
 - !ruby/object:Gem::Dependency 
@@ -89,7 +90,7 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        version: 0.9.9.21
+        version: 0.9.9.22
   type: :runtime
   version_requirements: *id007
 - !ruby/object:Gem::Dependency 
@@ -100,7 +101,7 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        version: 0.9.9.21
+        version: 0.9.9.22
   type: :runtime
   version_requirements: *id008
 - !ruby/object:Gem::Dependency 
@@ -111,7 +112,7 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        version: 0.9.9.21
+        version: 0.9.9.22
   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.
@@ -152,6 +153,7 @@ files:
 - refinerycms.gemspec
 - spec/rcov.opts
 - spec/spec_helper.rb
+has_rdoc: true
 homepage: http://refinerycms.com
 licenses: 
 - MIT
@@ -175,10 +177,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: refinerycms
-rubygems_version: 1.7.2
+rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: A Ruby on Rails CMS that supports Rails 3
 test_files: []
 
-has_rdoc: