cream 0.8.9.3 → 0.9.0

data/Changelog.txt

@@ -1,3 +1,8 @@
+0.9.0 - May 6, 2011
+-----
+* Updated and fixed dependencies
+* Fixed generators (BasicLogger dependency bug)
+
 0.8.7 - Jan 9, 2011
 -----
 Added devise:customize generator, cleaned up design and fixed some bugs!

data/Gemfile

@@ -2,27 +2,25 @@ source :rubygems
 source 'http://gems.github.com/'
 
 group :default do
-  gem "devise-links",      ">= 0.2.0"    
-  gem "cancan-rest-links", ">= 0.2.0" 
-  gem "cancan-permits",    ">= 0.3.4" 
+  gem "devise-links",      ">= 0.2.1"    
+  gem "cancan-rest-links", ">= 0.2.1" 
+  gem "cancan-permits",    ">= 0.3.11" 
 
   gem "require_all",       "~> 1.2.0"    
 
-  gem "colorize",          ">= 0.5.8"
   gem "devise",            ">= 1.1.5"    
   gem "cancan",            ">= 1.4.0" 
   gem "rails",             ">= 3.0.1"
 
-  gem "rails3_artifactor", ">= 0.3.2"
-  # gem 'logging_assist',    ">= 0.2.0"
+  gem "rails_artifactor", ">= 0.3.3"
 
-  gem "r3_plugin_toolbox", ">= 0.4.0" 
-  gem "sugar-high",        "~> 0.3.1"      
+  gem "r3_plugin_toolbox", "~> 0.4.0" 
+  gem "sugar-high",        "~> 0.4.0"      
 end
 
 group :test do    
-  gem 'ffaker',            '~> 0.4.0',    :git => 'http://github.com/kematzy/ffaker.git'
-  gem "rspec",             ">= 2.0.0" 
+  # gem 'ffaker',            '~> 0.4.0',    :git => 'http://github.com/kematzy/ffaker.git'
+  gem "rspec",             ">= 2.0.1" 
   gem "generator-spec",    ">= 0.6.0" 
   gem "rspec-action_view", ">= 0.3.1"     
   gem "rails-app-spec",    "~> 0.3.0"

data/Rakefile

@@ -20,17 +20,16 @@ begin
     
     gem.add_dependency "devise-links",      ">= 0.2.1"
     gem.add_dependency "cancan-rest-links", ">= 0.2.1" 
-    gem.add_dependency "cancan-permits",    ">= 0.3.10" 
+    gem.add_dependency "cancan-permits",    ">= 0.3.11" 
 
     gem.add_dependency "devise",            ">= 1.1.5"
     gem.add_dependency "cancan",            ">= 1.4.1" 
     gem.add_dependency "rails",             ">= 3.0.1"
 
-    gem.add_dependency "rails3_artifactor", "~> 0.3.2"
-    # gem.add_dependency 'logging_assist',    ">= 0.2.0"  # only required if logging is on
+    gem.add_dependency "rails_artifactor",  "~> 0.3.3"
 
     gem.add_dependency "r3_plugin_toolbox", ">= 0.4.0" 
-    gem.add_dependency "sugar-high",        ">= 0.3.1"
+    gem.add_dependency "sugar-high",        ">= 0.4.0"
            
     # gem is a Gem::Specification... see http://www.rubygems.org/read/chapter/20 for additional settings
     

data/VERSION

@@ -1 +1 @@
-0.8.9.2
+0.9.0

data/cream.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{cream}
-  s.version = "0.8.9.3"
+  s.version = "0.9.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.authors = ["Kristian Mandrup"]
-  s.date = %q{2011-03-04}
+  s.authors = [%q{Kristian Mandrup}]
+  s.date = %q{2011-05-06}
   s.description = %q{An integrated Authentication, Authorization and Roles solution for your Rails 3 app with support for multiple ORMs}
   s.email = %q{kmandrup@gmail.com}
   s.extra_rdoc_files = [
@@ -105,8 +105,8 @@ Gem::Specification.new do |s|
     "wiki/How to gollum wiki.txt"
   ]
   s.homepage = %q{http://github.com/kristianmandrup/cream}
-  s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.6.1}
+  s.require_paths = [%q{lib}]
+  s.rubygems_version = %q{1.8.0}
   s.summary = %q{Integrates Devise, CanCan with permits and Roles generic for multiple ORMs}
   s.test_files = [
     "spec/configure_helper.rb",
@@ -133,48 +133,90 @@ Gem::Specification.new do |s|
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_development_dependency(%q<rspec>, [">= 2.4.1"])
+      s.add_runtime_dependency(%q<devise-links>, [">= 0.2.1"])
+      s.add_runtime_dependency(%q<cancan-rest-links>, [">= 0.2.1"])
+      s.add_runtime_dependency(%q<cancan-permits>, [">= 0.3.11"])
+      s.add_runtime_dependency(%q<require_all>, ["~> 1.2.0"])
+      s.add_runtime_dependency(%q<devise>, [">= 1.1.5"])
+      s.add_runtime_dependency(%q<cancan>, [">= 1.4.0"])
+      s.add_runtime_dependency(%q<rails>, [">= 3.0.1"])
+      s.add_runtime_dependency(%q<rails_artifactor>, [">= 0.3.3"])
+      s.add_runtime_dependency(%q<r3_plugin_toolbox>, ["~> 0.4.0"])
+      s.add_runtime_dependency(%q<sugar-high>, ["~> 0.4.0"])
+      s.add_development_dependency(%q<rspec>, [">= 2.0.1"])
+      s.add_development_dependency(%q<generator-spec>, [">= 0.7.0"])
+      s.add_development_dependency(%q<rspec-action_view>, [">= 0.3.1"])
+      s.add_development_dependency(%q<rails-app-spec>, [">= 0.3.0"])
       s.add_development_dependency(%q<devise-spec>, [">= 0.1.3"])
       s.add_development_dependency(%q<roles-spec>, [">= 0.1.3"])
       s.add_runtime_dependency(%q<require_all>, ["~> 1.2.0"])
       s.add_runtime_dependency(%q<colorize>, [">= 0.5.8"])
-      s.add_runtime_dependency(%q<devise-links>, [">= 0.2.3"])
-      s.add_runtime_dependency(%q<cancan-rest-links>, [">= 0.2.3"])
+      s.add_runtime_dependency(%q<devise-links>, [">= 0.2.1"])
+      s.add_runtime_dependency(%q<cancan-rest-links>, [">= 0.2.1"])
+      s.add_runtime_dependency(%q<cancan-permits>, [">= 0.3.11"])
       s.add_runtime_dependency(%q<devise>, [">= 1.1.5"])
       s.add_runtime_dependency(%q<cancan>, [">= 1.4.1"])
       s.add_runtime_dependency(%q<rails>, [">= 3.0.1"])
       s.add_runtime_dependency(%q<rails_artifactor>, ["~> 0.3.3"])
-      s.add_runtime_dependency(%q<r3_plugin_toolbox>, [">= 0.4.1"])
-      s.add_runtime_dependency(%q<sugar-high>, ["~> 0.4.0"])
+      s.add_runtime_dependency(%q<r3_plugin_toolbox>, [">= 0.4.0"])
+      s.add_runtime_dependency(%q<sugar-high>, [">= 0.4.0"])
     else
-      s.add_dependency(%q<rspec>, [">= 2.4.1"])
+      s.add_dependency(%q<devise-links>, [">= 0.2.1"])
+      s.add_dependency(%q<cancan-rest-links>, [">= 0.2.1"])
+      s.add_dependency(%q<cancan-permits>, [">= 0.3.11"])
+      s.add_dependency(%q<require_all>, ["~> 1.2.0"])
+      s.add_dependency(%q<devise>, [">= 1.1.5"])
+      s.add_dependency(%q<cancan>, [">= 1.4.0"])
+      s.add_dependency(%q<rails>, [">= 3.0.1"])
+      s.add_dependency(%q<rails_artifactor>, [">= 0.3.3"])
+      s.add_dependency(%q<r3_plugin_toolbox>, ["~> 0.4.0"])
+      s.add_dependency(%q<sugar-high>, ["~> 0.4.0"])
+      s.add_dependency(%q<rspec>, [">= 2.0.1"])
+      s.add_dependency(%q<generator-spec>, [">= 0.7.0"])
+      s.add_dependency(%q<rspec-action_view>, [">= 0.3.1"])
+      s.add_dependency(%q<rails-app-spec>, [">= 0.3.0"])
       s.add_dependency(%q<devise-spec>, [">= 0.1.3"])
       s.add_dependency(%q<roles-spec>, [">= 0.1.3"])
       s.add_dependency(%q<require_all>, ["~> 1.2.0"])
       s.add_dependency(%q<colorize>, [">= 0.5.8"])
-      s.add_dependency(%q<devise-links>, [">= 0.2.3"])
-      s.add_dependency(%q<cancan-rest-links>, [">= 0.2.3"])
+      s.add_dependency(%q<devise-links>, [">= 0.2.1"])
+      s.add_dependency(%q<cancan-rest-links>, [">= 0.2.1"])
+      s.add_dependency(%q<cancan-permits>, [">= 0.3.11"])
       s.add_dependency(%q<devise>, [">= 1.1.5"])
       s.add_dependency(%q<cancan>, [">= 1.4.1"])
       s.add_dependency(%q<rails>, [">= 3.0.1"])
       s.add_dependency(%q<rails_artifactor>, ["~> 0.3.3"])
-      s.add_dependency(%q<r3_plugin_toolbox>, [">= 0.4.1"])
-      s.add_dependency(%q<sugar-high>, ["~> 0.4.0"])
+      s.add_dependency(%q<r3_plugin_toolbox>, [">= 0.4.0"])
+      s.add_dependency(%q<sugar-high>, [">= 0.4.0"])
     end
   else
-    s.add_dependency(%q<rspec>, [">= 2.4.1"])
+    s.add_dependency(%q<devise-links>, [">= 0.2.1"])
+    s.add_dependency(%q<cancan-rest-links>, [">= 0.2.1"])
+    s.add_dependency(%q<cancan-permits>, [">= 0.3.11"])
+    s.add_dependency(%q<require_all>, ["~> 1.2.0"])
+    s.add_dependency(%q<devise>, [">= 1.1.5"])
+    s.add_dependency(%q<cancan>, [">= 1.4.0"])
+    s.add_dependency(%q<rails>, [">= 3.0.1"])
+    s.add_dependency(%q<rails_artifactor>, [">= 0.3.3"])
+    s.add_dependency(%q<r3_plugin_toolbox>, ["~> 0.4.0"])
+    s.add_dependency(%q<sugar-high>, ["~> 0.4.0"])
+    s.add_dependency(%q<rspec>, [">= 2.0.1"])
+    s.add_dependency(%q<generator-spec>, [">= 0.7.0"])
+    s.add_dependency(%q<rspec-action_view>, [">= 0.3.1"])
+    s.add_dependency(%q<rails-app-spec>, [">= 0.3.0"])
     s.add_dependency(%q<devise-spec>, [">= 0.1.3"])
     s.add_dependency(%q<roles-spec>, [">= 0.1.3"])
     s.add_dependency(%q<require_all>, ["~> 1.2.0"])
     s.add_dependency(%q<colorize>, [">= 0.5.8"])
-    s.add_dependency(%q<devise-links>, [">= 0.2.3"])
-    s.add_dependency(%q<cancan-rest-links>, [">= 0.2.3"])
+    s.add_dependency(%q<devise-links>, [">= 0.2.1"])
+    s.add_dependency(%q<cancan-rest-links>, [">= 0.2.1"])
+    s.add_dependency(%q<cancan-permits>, [">= 0.3.11"])
     s.add_dependency(%q<devise>, [">= 1.1.5"])
     s.add_dependency(%q<cancan>, [">= 1.4.1"])
     s.add_dependency(%q<rails>, [">= 3.0.1"])
     s.add_dependency(%q<rails_artifactor>, ["~> 0.3.3"])
-    s.add_dependency(%q<r3_plugin_toolbox>, [">= 0.4.1"])
-    s.add_dependency(%q<sugar-high>, ["~> 0.4.0"])
+    s.add_dependency(%q<r3_plugin_toolbox>, [">= 0.4.0"])
+    s.add_dependency(%q<sugar-high>, [">= 0.4.0"])
   end
 end
 

data/lib/generators/cancan/config/config_generator.rb

@@ -1,7 +1,7 @@
 require 'sugar-high/file'
 require 'sugar-high/module'
 require 'cream'
-require 'rails3_artifactor'
+require 'rails_artifactor'
 require 'generators/cream/helpers/all'
 
 module Cancan
@@ -20,8 +20,7 @@ module Cancan
 
   	  protected
 
-      include Rails3::Assist::BasicLogger
-      extend Rails3::Assist::UseMacro 
+      extend  RailsAssist::UseMacro 
       include Cream::GeneratorHelper      
 
       use_helpers :controller, :app      

data/lib/generators/cream/app/app_generator.rb

@@ -1,7 +1,7 @@
 require 'sugar-high/file'
 require 'sugar-high/module'
 require 'cream'
-require 'rails3_artifactor'
+require 'rails_artifactor'
 require 'generators/cream/helpers/all'
 
 module Cream
@@ -31,8 +31,7 @@ module Cream
       protected
 
       include Cream::GeneratorHelper
-      include Rails3::Assist::BasicLogger
-      extend Rails3::Assist::UseMacro
+      extend  RailsAssist::UseMacro
       use_helpers :app, :special, :file, :view, :model
 
       def app_orm        

data/lib/generators/cream/core_ext.rb

@@ -1,5 +1,5 @@
 # TODO: 
-# model_file_name and similar methods in rails3_assist and rails3_artifaftor should be fixed to always call underscore on filenames
+# model_file_name and similar methods in rails_assist and rails_artifaftor should be fixed to always call underscore on filenames
 
 class String
   def as_filename

data/lib/generators/cream/full_config/full_config_generator.rb

@@ -1,7 +1,7 @@
 require 'sugar-high/file'
 require 'sugar-high/module'
 require 'cream'
-require 'rails3_artifactor'
+require 'rails_artifactor'
 require 'active_support'
 require 'generators/cream/helpers/all'
 
@@ -53,8 +53,7 @@ module Cream
       # -----------------
       protected
 
-      include Rails3::Assist::BasicLogger
-      extend Rails3::Assist::UseMacro
+      extend  RailsAssist::UseMacro
 
       include Cream::GeneratorHelper
 

data/lib/generators/cream/helpers/all.rb

@@ -5,11 +5,18 @@ module Cream
   module GeneratorHelper
     def logit!  
       if logging?
-        require 'logging_assist'
+        add_logger
         logger.add_logfile :logfile => logfile
       end
     end
 
+    def add_logger
+      require 'logging_assist'
+      class_eval do
+        send :include, RailsAssist::BasicLogger
+      end
+    end
+
     def debug! msg
       logger.debug msg if logging?
     end

data/lib/generators/devise/config/config_generator.rb

@@ -1,7 +1,7 @@
 require 'sugar-high/file'
 require 'sugar-high/module'
 require 'cream'
-require 'rails3_artifactor'
+require 'rails_artifactor'
 require 'generators/cream/helpers/all'
 
 # include helpers
@@ -31,8 +31,7 @@ module Devise
 
       protected
 
-      include Rails3::Assist::BasicLogger
-      extend Rails3::Assist::UseMacro
+      extend  RailsAssist::UseMacro
 
       include Cream::GeneratorHelper
 

data/lib/generators/devise/customize/customize_generator.rb

@@ -1,7 +1,7 @@
 require 'sugar-high/file'
 require 'sugar-high/module'
 require 'cream'
-require 'rails3_artifactor'
+require 'rails_artifactor'
 require 'generators/cream/helpers/all'
 
 require_all File.dirname(__FILE__) # + '/helpers'
@@ -31,7 +31,6 @@ module Devise
       protected
 
       include Cream::GeneratorHelper
-      include Rails3::Assist::BasicLogger
             
       def login_attribute
         att = options[:login_attribute] || 'generic'

data/lib/generators/devise/customize/helpers/username_helper.rb

@@ -4,8 +4,8 @@ module Devise
   module Customizers
     class UserName 
       include Cream::GeneratorHelper        
-      extend Rails3::Assist::UseMacro
-      include Rails3::Assist::BasicLogger      
+      extend  RailsAssist::UseMacro
+      
       use_helpers :app, :special, :file, :model
 
       attr_accessor :orm, :user_class, :login_attribute
@@ -114,8 +114,8 @@ module Devise
 
       class AuthenticationKeys
         include Cream::GeneratorHelper
-        extend Rails3::Assist::UseMacro
-        include Rails3::Assist::BasicLogger
+        extend  RailsAssist::UseMacro
+        
         use_helpers :app, :special, :file
 
         attr_accessor :login_attribute

data/lib/generators/devise/users/users_generator.rb

@@ -1,7 +1,7 @@
 require 'sugar-high/file'
 require 'sugar-high/module'
 require 'cream'
-require 'rails3_artifactor'
+require 'rails_artifactor'
 require 'generators/cream/helpers/all'
 
 # include helpers
@@ -65,8 +65,7 @@ module Devise
 
       protected
 
-      extend Rails3::Assist::UseMacro
-      include Rails3::Assist::BasicLogger  
+      extend  RailsAssist::UseMacro
 
       include Cream::GeneratorHelper
       

data/lib/generators/permits/config/config_generator.rb

@@ -1,7 +1,7 @@
 require 'sugar-high/file'
 require 'sugar-high/module'
 require 'cream'
-require 'rails3_artifactor'
+require 'rails_artifactor'
 require 'generators/cream/helpers/all'
 
 module Permits
@@ -27,11 +27,9 @@ module Permits
         # Run permits generator to generate permit for each role
         rgen "cancan:permits --roles #{roles_list} --orm #{orm}"
         rgen "cancan:licenses"
-      end           
+      end
 
-      protected        
-      
-      include Rails3::Assist::BasicLogger
+      protected
 
       include Cream::GeneratorHelper
       

data/lib/generators/roles/config/config_generator.rb

@@ -1,7 +1,7 @@
 require 'sugar-high/file'
 require 'sugar-high/module'
 require 'cream'
-require 'rails3_artifactor'
+require 'rails_artifactor'
 require 'generators/cream/helpers/all'
 
 module Roles
@@ -25,10 +25,7 @@ module Roles
       class_option :gems,               :type => :boolean,  :default => true,               :desc => "Add gems to gemfile?"       
       
       def configure_roles
-        if logging_on?
-          require 'logging_assist'
-      	  
-    	  end
+        logit!
 
         # make the artifactor model methods behave according to selected orm! - this is a macro
         set_orm      	
@@ -44,9 +41,7 @@ module Roles
 
       protected
 
-      include Rails3::Assist::BasicLogger
-      extend Rails3::Assist::UseMacro
-
+      extend  RailsAssist::UseMacro
       include Cream::GeneratorHelper
       
       use_helpers :model, :file

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cream
 version: !ruby/object:Gem::Version
-  version: 0.8.9.3
+  version: 0.9.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,23 +9,165 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-03-04 00:00:00.000000000 +01:00
-default_executable: 
+date: 2011-05-06 00:00:00.000000000Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: devise-links
+  requirement: &2157585740 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.2.1
+  type: :runtime
+  prerelease: false
+  version_requirements: *2157585740
+- !ruby/object:Gem::Dependency
+  name: cancan-rest-links
+  requirement: &2157584900 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.2.1
+  type: :runtime
+  prerelease: false
+  version_requirements: *2157584900
+- !ruby/object:Gem::Dependency
+  name: cancan-permits
+  requirement: &2157584060 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.3.11
+  type: :runtime
+  prerelease: false
+  version_requirements: *2157584060
+- !ruby/object:Gem::Dependency
+  name: require_all
+  requirement: &2157583120 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.2.0
+  type: :runtime
+  prerelease: false
+  version_requirements: *2157583120
+- !ruby/object:Gem::Dependency
+  name: devise
+  requirement: &2157582240 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.1.5
+  type: :runtime
+  prerelease: false
+  version_requirements: *2157582240
+- !ruby/object:Gem::Dependency
+  name: cancan
+  requirement: &2157580920 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.4.0
+  type: :runtime
+  prerelease: false
+  version_requirements: *2157580920
+- !ruby/object:Gem::Dependency
+  name: rails
+  requirement: &2157580160 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 3.0.1
+  type: :runtime
+  prerelease: false
+  version_requirements: *2157580160
+- !ruby/object:Gem::Dependency
+  name: rails_artifactor
+  requirement: &2157579440 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.3.3
+  type: :runtime
+  prerelease: false
+  version_requirements: *2157579440
+- !ruby/object:Gem::Dependency
+  name: r3_plugin_toolbox
+  requirement: &2157578780 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.4.0
+  type: :runtime
+  prerelease: false
+  version_requirements: *2157578780
+- !ruby/object:Gem::Dependency
+  name: sugar-high
+  requirement: &2157578020 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.4.0
+  type: :runtime
+  prerelease: false
+  version_requirements: *2157578020
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &2157843900 !ruby/object:Gem::Requirement
+  requirement: &2157572480 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 2.0.1
+  type: :development
+  prerelease: false
+  version_requirements: *2157572480
+- !ruby/object:Gem::Dependency
+  name: generator-spec
+  requirement: &2157571860 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 2.4.1
+        version: 0.7.0
   type: :development
   prerelease: false
-  version_requirements: *2157843900
+  version_requirements: *2157571860
+- !ruby/object:Gem::Dependency
+  name: rspec-action_view
+  requirement: &2157571100 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.3.1
+  type: :development
+  prerelease: false
+  version_requirements: *2157571100
+- !ruby/object:Gem::Dependency
+  name: rails-app-spec
+  requirement: &2157570440 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.3.0
+  type: :development
+  prerelease: false
+  version_requirements: *2157570440
 - !ruby/object:Gem::Dependency
   name: devise-spec
-  requirement: &2157843300 !ruby/object:Gem::Requirement
+  requirement: &2157569800 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -33,10 +175,10 @@ dependencies:
         version: 0.1.3
   type: :development
   prerelease: false
-  version_requirements: *2157843300
+  version_requirements: *2157569800
 - !ruby/object:Gem::Dependency
   name: roles-spec
-  requirement: &2157842600 !ruby/object:Gem::Requirement
+  requirement: &2157568940 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -44,10 +186,10 @@ dependencies:
         version: 0.1.3
   type: :development
   prerelease: false
-  version_requirements: *2157842600
+  version_requirements: *2157568940
 - !ruby/object:Gem::Dependency
   name: require_all
-  requirement: &2157841560 !ruby/object:Gem::Requirement
+  requirement: &2157568240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -55,10 +197,10 @@ dependencies:
         version: 1.2.0
   type: :runtime
   prerelease: false
-  version_requirements: *2157841560
+  version_requirements: *2157568240
 - !ruby/object:Gem::Dependency
   name: colorize
-  requirement: &2157840860 !ruby/object:Gem::Requirement
+  requirement: &2157567440 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -66,32 +208,43 @@ dependencies:
         version: 0.5.8
   type: :runtime
   prerelease: false
-  version_requirements: *2157840860
+  version_requirements: *2157567440
 - !ruby/object:Gem::Dependency
   name: devise-links
-  requirement: &2157840360 !ruby/object:Gem::Requirement
+  requirement: &2157566480 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.2.3
+        version: 0.2.1
   type: :runtime
   prerelease: false
-  version_requirements: *2157840360
+  version_requirements: *2157566480
 - !ruby/object:Gem::Dependency
   name: cancan-rest-links
-  requirement: &2157839720 !ruby/object:Gem::Requirement
+  requirement: &2157565660 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.2.1
+  type: :runtime
+  prerelease: false
+  version_requirements: *2157565660
+- !ruby/object:Gem::Dependency
+  name: cancan-permits
+  requirement: &2157562340 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.2.3
+        version: 0.3.11
   type: :runtime
   prerelease: false
-  version_requirements: *2157839720
+  version_requirements: *2157562340
 - !ruby/object:Gem::Dependency
   name: devise
-  requirement: &2157839120 !ruby/object:Gem::Requirement
+  requirement: &2157561600 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -99,10 +252,10 @@ dependencies:
         version: 1.1.5
   type: :runtime
   prerelease: false
-  version_requirements: *2157839120
+  version_requirements: *2157561600
 - !ruby/object:Gem::Dependency
   name: cancan
-  requirement: &2157838520 !ruby/object:Gem::Requirement
+  requirement: &2157560760 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -110,10 +263,10 @@ dependencies:
         version: 1.4.1
   type: :runtime
   prerelease: false
-  version_requirements: *2157838520
+  version_requirements: *2157560760
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &2157837980 !ruby/object:Gem::Requirement
+  requirement: &2157560020 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -121,10 +274,10 @@ dependencies:
         version: 3.0.1
   type: :runtime
   prerelease: false
-  version_requirements: *2157837980
+  version_requirements: *2157560020
 - !ruby/object:Gem::Dependency
   name: rails_artifactor
-  requirement: &2157837280 !ruby/object:Gem::Requirement
+  requirement: &2157559300 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -132,29 +285,29 @@ dependencies:
         version: 0.3.3
   type: :runtime
   prerelease: false
-  version_requirements: *2157837280
+  version_requirements: *2157559300
 - !ruby/object:Gem::Dependency
   name: r3_plugin_toolbox
-  requirement: &2157836520 !ruby/object:Gem::Requirement
+  requirement: &2157558440 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.4.1
+        version: 0.4.0
   type: :runtime
   prerelease: false
-  version_requirements: *2157836520
+  version_requirements: *2157558440
 - !ruby/object:Gem::Dependency
   name: sugar-high
-  requirement: &2157835760 !ruby/object:Gem::Requirement
+  requirement: &2157557760 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 0.4.0
   type: :runtime
   prerelease: false
-  version_requirements: *2157835760
+  version_requirements: *2157557760
 description: An integrated Authentication, Authorization and Roles solution for your
   Rails 3 app with support for multiple ORMs
 email: kmandrup@gmail.com
@@ -250,7 +403,6 @@ files:
 - spec/spec_helper.rb
 - wiki/Cream-generators-overview.textile
 - wiki/How to gollum wiki.txt
-has_rdoc: true
 homepage: http://github.com/kristianmandrup/cream
 licenses: []
 post_install_message: 
@@ -271,7 +423,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.6.1
+rubygems_version: 1.8.0
 signing_key: 
 specification_version: 3
 summary: Integrates Devise, CanCan with permits and Roles generic for multiple ORMs