Merge branch 'master' into ui

Conflicts: Gemfile.lock core/config/locales/en.yml settings/app/views/refinery/admin/settings/_settings.html.erb
resolve · Sep 3, 2011 · 4621322 · 4621322
2 parents 41e2be7 + a4cdc42
commit 4621322
Show file tree

Hide file tree

Showing 113 changed files with 791 additions and 579 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -10,7 +10,5 @@ rvm:
   - 1.8.7
   - 1.9.2
   - 1.9.3
-  - rbx
   - rbx-2.0
-  - ree
   - jruby
diff --git a/Gemfile b/Gemfile
@@ -48,11 +48,11 @@ group :development, :test do
     gem 'guard-spork'
 
     unless ENV['TRAVIS']
-      if Config::CONFIG['target_os'] =~ /darwin/i
+      if RbConfig::CONFIG['target_os'] =~ /darwin/i
         gem 'rb-fsevent', '>= 0.3.9'
         gem 'growl',      '~> 1.0.3'
       end
-      if Config::CONFIG['target_os'] =~ /linux/i
+      if RbConfig::CONFIG['target_os'] =~ /linux/i
         gem 'rb-inotify', '>= 0.5.1'
         gem 'libnotify',  '~> 0.1.3'
       end
@@ -61,10 +61,10 @@ group :development, :test do
 
   platforms :jruby do
     unless ENV['TRAVIS']
-      if Config::CONFIG['target_os'] =~ /darwin/i
+      if RbConfig::CONFIG['target_os'] =~ /darwin/i
         gem 'growl',      '~> 1.0.3'
       end
-      if Config::CONFIG['target_os'] =~ /linux/i
+      if RbConfig::CONFIG['target_os'] =~ /linux/i
         gem 'rb-inotify', '>= 0.5.1'
         gem 'libnotify',  '~> 0.1.3'
       end

diff --git a/Gemfile.lock b/Gemfile.lock
@@ -1,13 +1,13 @@
 GIT
   remote: git://github.com/collectiveidea/awesome_nested_set.git
-  revision: 3f19d9ae9f02877dce3342f91d9be36dc3b7ab2f
+  revision: 99ddcfa45d038336c53ece0ca122cc89e5e73388
   specs:
-    awesome_nested_set (2.0.1)
+    awesome_nested_set (2.0.2)
       activerecord (>= 3.0.0)
 
 GIT
   remote: git://github.com/parndt/refinerycms-i18n
-  revision: 7548b3be85baba5edc5a57429db05740afce8062
+  revision: 9393bfcc7d27ef95802cb3920936c608501ac8a7
   specs:
     refinerycms-i18n (2.0.0)
       refinerycms-core (~> 2.0.0)
@@ -34,18 +34,18 @@ PATH
     refinerycms-core (2.0.0)
       acts_as_indexed (~> 0.7)
       awesome_nested_set (~> 2.0)
-      coffee-rails (>= 3.1.0.rc.6)
+      coffee-rails (~> 3.1.0)
       friendly_id_globalize3 (~> 3.2.1)
       globalize3 (~> 0.2.0.beta3)
       jquery-rails
-      kaminari (~> 0.12)
-      rails (>= 3.1.0.rc6)
+      rails (~> 3.1.0)
       refinerycms-base (= 2.0.0)
       refinerycms-generators (= 2.0.0)
       refinerycms-settings (= 2.0.0)
-      sass-rails (>= 3.1.0.rc.6)
+      sass-rails (~> 3.1.0)
       truncate_html (~> 0.5)
       uglifier
+      will_paginate (~> 3.0)
     refinerycms-dashboard (2.0.0)
       refinerycms-core (= 2.0.0)
     refinerycms-generators (2.0.0)
@@ -80,40 +80,40 @@ PATH
 GEM
   remote: http://rubygems.org/
   specs:
-    actionmailer (3.1.0.rc6)
-      actionpack (= 3.1.0.rc6)
+    actionmailer (3.1.0)
+      actionpack (= 3.1.0)
       mail (~> 2.3.0)
-    actionpack (3.1.0.rc6)
-      activemodel (= 3.1.0.rc6)
-      activesupport (= 3.1.0.rc6)
+    actionpack (3.1.0)
+      activemodel (= 3.1.0)
+      activesupport (= 3.1.0)
       builder (~> 3.0.0)
       erubis (~> 2.7.0)
       i18n (~> 0.6)
       rack (~> 1.3.2)
-      rack-cache (~> 1.0.2)
-      rack-mount (~> 0.8.1)
-      rack-test (~> 0.6.0)
-      sprockets (~> 2.0.0.beta.12)
-    activemodel (3.1.0.rc6)
-      activesupport (= 3.1.0.rc6)
-      bcrypt-ruby (~> 2.1.4)
+      rack-cache (~> 1.0.3)
+      rack-mount (~> 0.8.2)
+      rack-test (~> 0.6.1)
+      sprockets (~> 2.0.0)
+    activemodel (3.1.0)
+      activesupport (= 3.1.0)
+      bcrypt-ruby (~> 3.0.0)
       builder (~> 3.0.0)
       i18n (~> 0.6)
-    activerecord (3.1.0.rc6)
-      activemodel (= 3.1.0.rc6)
-      activesupport (= 3.1.0.rc6)
+    activerecord (3.1.0)
+      activemodel (= 3.1.0)
+      activesupport (= 3.1.0)
       arel (~> 2.2.1)
       tzinfo (~> 0.3.29)
-    activeresource (3.1.0.rc6)
-      activemodel (= 3.1.0.rc6)
-      activesupport (= 3.1.0.rc6)
-    activesupport (3.1.0.rc6)
+    activeresource (3.1.0)
+      activemodel (= 3.1.0)
+      activesupport (= 3.1.0)
+    activesupport (3.1.0)
       multi_json (~> 1.0)
     acts_as_indexed (0.7.3)
     addressable (2.2.6)
     arel (2.2.1)
     babosa (0.3.5)
-    bcrypt-ruby (2.1.4)
+    bcrypt-ruby (3.0.0)
     builder (3.0.0)
     capybara (1.0.1)
       mime-types (>= 1.16)
@@ -122,31 +122,31 @@ GEM
       rack-test (>= 0.5.4)
       selenium-webdriver (~> 2.0)
       xpath (~> 0.1.4)
-    capybara-webkit (0.6.0)
+    capybara-webkit (0.6.1)
       capybara (~> 1.0.0)
-    childprocess (0.2.1)
+    childprocess (0.2.2)
       ffi (~> 1.0.6)
-    coffee-rails (3.1.0.rc.6)
+    coffee-rails (3.1.0)
       coffee-script (>= 2.2.0)
       railties (~> 3.1.0.rc1)
     coffee-script (2.2.0)
       coffee-script-source
       execjs
     coffee-script-source (1.1.2)
     database_cleaner (0.6.7)
-    devise (1.4.2)
-      bcrypt-ruby (~> 2.1.2)
+    devise (1.4.4)
+      bcrypt-ruby (~> 3.0)
       orm_adapter (~> 0.0.3)
       warden (~> 1.0.3)
-    diff-lcs (1.1.2)
+    diff-lcs (1.1.3)
     dragonfly (0.9.5)
       rack
     erubis (2.7.0)
     execjs (1.2.4)
       multi_json (~> 1.0)
-    factory_girl (2.0.4)
+    factory_girl (2.0.5)
     ffi (1.0.9)
-    friendly_id_globalize3 (3.2.1.4)
+    friendly_id_globalize3 (3.2.1.5)
       babosa (~> 0.3.0)
     fuubar (0.0.6)
       rspec (~> 2.0)
@@ -157,9 +157,9 @@ GEM
       activerecord (>= 3.0.0)
       paper_trail (~> 2)
     growl (1.0.3)
-    guard (0.6.2)
+    guard (0.6.3)
       thor (~> 0.14.6)
-    guard-rspec (0.4.2)
+    guard-rspec (0.4.3)
       guard (>= 0.4.0)
     guard-spork (0.2.1)
       guard (>= 0.2.2)
@@ -169,9 +169,8 @@ GEM
     jquery-rails (1.0.13)
       railties (~> 3.0)
       thor (~> 0.14)
-    json_pure (1.5.3)
-    kaminari (0.12.4)
-      rails (>= 3.0.0)
+    json_pure (1.5.4)
+      spruz (~> 0.2.8)
     launchy (2.0.5)
       addressable (~> 2.2.6)
     mail (2.3.0)
@@ -183,39 +182,39 @@ GEM
     mysql2 (0.3.7)
     nokogiri (1.5.0)
     orm_adapter (0.0.5)
-    paper_trail (2.3.1)
+    paper_trail (2.3.2)
       rails (~> 3)
     pjax-rails (0.1.4)
       jquery-rails
     polyglot (0.3.2)
     rack (1.3.2)
-    rack-cache (1.0.2)
+    rack-cache (1.0.3)
       rack (>= 0.4)
-    rack-mount (0.8.2)
+    rack-mount (0.8.3)
       rack (>= 1.0.0)
     rack-ssl (1.3.2)
       rack
     rack-test (0.6.1)
       rack (>= 1.0)
-    rails (3.1.0.rc6)
-      actionmailer (= 3.1.0.rc6)
-      actionpack (= 3.1.0.rc6)
-      activerecord (= 3.1.0.rc6)
-      activeresource (= 3.1.0.rc6)
-      activesupport (= 3.1.0.rc6)
+    rails (3.1.0)
+      actionmailer (= 3.1.0)
+      actionpack (= 3.1.0)
+      activerecord (= 3.1.0)
+      activeresource (= 3.1.0)
+      activesupport (= 3.1.0)
       bundler (~> 1.0)
-      railties (= 3.1.0.rc6)
-    railties (3.1.0.rc6)
-      actionpack (= 3.1.0.rc6)
-      activesupport (= 3.1.0.rc6)
+      railties (= 3.1.0)
+    railties (3.1.0)
+      actionpack (= 3.1.0)
+      activesupport (= 3.1.0)
       rack-ssl (~> 1.3.2)
       rake (>= 0.8.7)
       rdoc (~> 3.4)
       thor (~> 0.14.6)
     rake (0.9.2)
     rb-fsevent (0.4.3.1)
     rcov (0.9.10)
-    rdoc (3.9.2)
+    rdoc (3.9.4)
     routing-filter (0.2.4)
       actionpack
     rspec (2.6.0)
@@ -235,11 +234,11 @@ GEM
     ruby-progressbar (0.0.10)
     rubyzip (0.9.4)
     sass (3.1.7)
-    sass-rails (3.1.0.rc.6)
-      actionpack (~> 3.1.0.rc6)
-      railties (~> 3.1.0.rc6)
+    sass-rails (3.1.0)
+      actionpack (~> 3.1.0)
+      railties (~> 3.1.0)
       sass (>= 3.1.4)
-    selenium-webdriver (2.4.0)
+    selenium-webdriver (2.5.0)
       childprocess (>= 0.2.1)
       ffi (>= 1.0.7)
       json_pure
@@ -250,23 +249,25 @@ GEM
       simplecov-html (~> 0.4.4)
     simplecov-html (0.4.5)
     spork (0.9.0.rc9)
-    sprockets (2.0.0.beta.14)
+    sprockets (2.0.0)
       hike (~> 1.2)
       rack (~> 1.0)
-      tilt (~> 1.1, != 1.3.0)
+      tilt (!= 1.3.0, ~> 1.1)
+    spruz (0.2.13)
     sqlite3 (1.3.4)
     thor (0.14.6)
-    tilt (1.3.2)
+    tilt (1.3.3)
     treetop (1.4.10)
       polyglot
       polyglot (>= 0.3.1)
     truncate_html (0.5.1)
     tzinfo (0.3.29)
-    uglifier (1.0.1)
+    uglifier (1.0.2)
       execjs (>= 0.3.0)
       multi_json (>= 1.0.2)
     warden (1.0.5)
       rack (>= 1.0)
+    will_paginate (3.0.0)
     xpath (0.1.4)
       nokogiri (~> 1.3)
 

diff --git a/authentication/app/models/refinery/user.rb b/authentication/app/models/refinery/user.rb
@@ -11,7 +11,7 @@ class User < ActiveRecord::Base
     # Include default devise modules. Others available are:
     # :token_authenticatable, :confirmable, :lockable and :timeoutable
     if self.respond_to?(:devise)
-      devise :database_authenticatable, :registerable, :recoverable, :rememberable, :trackable, :validatable
+      devise :database_authenticatable, :registerable, :recoverable, :rememberable, :trackable, :validatable, :authentication_keys => [:login]
     end
 
     # Setup accessible (or protected) attributes for your model

diff --git a/authentication/app/views/refinery/admin/users/_users.html.erb b/authentication/app/views/refinery/admin/users/_users.html.erb
@@ -1,4 +1,4 @@
-<%= paginate @users %>
+<%= will_paginate @users %>
 <ul>
   <%= render :partial => "user", :collection => @users %>
-</ul>
+</ul>
diff --git a/authentication/refinerycms-authentication.gemspec b/authentication/refinerycms-authentication.gemspec
@@ -6,7 +6,7 @@ Gem::Specification.new do |s|
   s.version           = %q{2.0.0}
   s.summary           = %q{Authentication engine for Refinery CMS}
   s.description       = %q{The default authentication engine for Refinery CMS}
-  s.date              = %q{2011-08-18}
+  s.date              = %q{2011-08-31}
   s.email             = %q{info@refinerycms.com}
   s.homepage          = %q{http://refinerycms.com}
   s.rubyforge_project = %q{refinerycms}

diff --git a/authentication/spec/models/refinery/user_spec.rb b/authentication/spec/models/refinery/user_spec.rb
@@ -3,8 +3,8 @@
 module Refinery
   describe User do
 
-    let(:user) { Factory(:user) }
-    let(:refinery_user) { Factory(:refinery_user) }
+    let(:user) { FactoryGirl.create(:user) }
+    let(:refinery_user) { FactoryGirl.create(:refinery_user) }
 
     context "Roles" do
       context "add_role" do
@@ -78,9 +78,9 @@ module Refinery
     end
 
     describe "#can_delete?" do
-      let(:user_not_persisted) { Factory.build(:refinery_user) }
+      let(:user_not_persisted) { FactoryGirl.build(:refinery_user) }
       let(:super_user) do
-        super_user = Factory(:refinery_user)
+        super_user = FactoryGirl.create(:refinery_user)
         super_user.add_role(:superuser)
         super_user
       end

diff --git a/authentication/spec/requests/lost_password_spec.rb b/authentication/spec/requests/lost_password_spec.rb
@@ -3,7 +3,7 @@
 module Refinery
   module Users
     describe "password recovery" do
-      let!(:user) { Factory(:refinery_user, :email => "refinery@refinerycms.com") }
+      let!(:user) { FactoryGirl.create(:refinery_user, :email => "refinery@refinerycms.com") }
 
       it "asks user to specify email address" do
         visit new_refinery_user_session_url

diff --git a/authentication/spec/requests/manage_users_spec.rb b/authentication/spec/requests/manage_users_spec.rb
@@ -34,7 +34,7 @@
   end
 
   describe "destroy" do
-    let!(:user) { Factory(:user, :username => "ugisozols") }
+    let!(:user) { FactoryGirl.create(:user, :username => "ugisozols") }
 
     it "allows to destroy only regular user" do
       visit refinery_admin_users_path

diff --git a/authentication/spec/requests/sign_in_spec.rb b/authentication/spec/requests/sign_in_spec.rb
@@ -2,7 +2,7 @@
 
 describe "sign in" do
   before(:each) do
-    Factory(:refinery_user, :username => "ugisozols",
+    FactoryGirl.create(:refinery_user, :username => "ugisozols",
                             :password => "123456",
                             :password_confirmation => "123456")
     visit new_refinery_user_session_path

diff --git a/base/db/migrate/20100913234706_create_refinerycms_core_schema.rb b/base/db/migrate/20100913234706_create_refinerycms_core_schema.rb
@@ -3,7 +3,7 @@ def self.up
     create_table ::Slug.table_name, :force => true do |t|
       t.string   "name"
       t.integer  "sluggable_id"
-      t.integer  "sequence",                     :default => 1, :null => false
+      t.integer  "sequence",       :default => 1, :null => false
       t.string   "sluggable_type", :limit => 40
       t.string   "scope",          :limit => 40
       t.datetime "created_at"

diff --git a/base/refinerycms-base.gemspec b/base/refinerycms-base.gemspec
@@ -6,7 +6,7 @@ Gem::Specification.new do |s|
   s.version           = %q{2.0.0}
   s.summary           = %q{Base engine for Refinery CMS}
   s.description       = %q{This provides a base for Refinery CMS which handles things like settings on the Refinery namespace.}
-  s.date              = %q{2011-08-18}
+  s.date              = %q{2011-08-31}
   s.email             = %q{info@refinerycms.com}
   s.homepage          = %q{http://refinerycms.com}
   s.rubyforge_project = %q{refinerycms}