cream 0.7.3 → 0.7.5

data/Changelog.txt

@@ -1,3 +1,8 @@
+Nov 25, 2010
+---
+Updated CanCan-Permits dependency to use the latest version 0.3.2.
+Updated the Cream Permits Config generator to use the new cancan:permits and cancan:licenses generators.
+
 September 17, 2010
 ---
 * Renamed 'auth-assistant' to 'cream'

data/Gemfile

@@ -3,19 +3,19 @@ source 'http://gems.github.com/'
 
 group :default do
   gem "devise-links",      "~> 0.1.4"    
-  gem "cancan-rest-links", ">= 0.1.3" 
-  gem "cancan-permits",    ">= 0.2.6" 
+  gem "cancan-rest-links", ">= 0.1.5" 
+  gem "cancan-permits",    ">= 0.3.2" 
 
   gem "require_all",       "~> 1.2.0"    
 
   gem "devise",            ">= 1.2.0"    
-  gem "cancan",            "~> 1.4.0" 
-  gem "rails",             "~> 3.0"
+  gem "cancan",            ">= 1.4.0" 
+  gem "rails",             ">= 3.0.1"
 
   gem "rails3_artifactor", "~> 0.3.0"
   gem 'logging_assist',    "~> 0.1.6"
 
-  gem "r3_plugin_toolbox", ">= 0.3.14" 
+  gem "r3_plugin_toolbox", ">= 0.4.0" 
   gem "sugar-high",        "~> 0.3.0"      
 end
 

data/README.markdown

@@ -1,8 +1,8 @@
 # Cream
 
 This project aims to assist you in setting up a complete user login and role permission system for your Rails 3 app.
-It targets [Devise](http://github.com/plataformatec/devise) as the Session system, [CanCan](http://github.com/ryanb/cancan) as the permission system and 
-[Roles](http://github.com/kristianmandrup/roles_generic) as the user Roles system. 
+
+It targets [Devise](http://github.com/plataformatec/devise) as the Authentication system, [CanCan](http://github.com/ryanb/cancan) with Permits and Licenses as the Authorization system and [Roles Generic](http://github.com/kristianmandrup/roles_generic) as the user Roles system. 
 
 The objective of this project is to 
 * Integrate all these sub-systems
@@ -19,11 +19,19 @@ that demonstrates what a final Rails 3 app using Cream will look like. I plan to
 Mongo Mapper as the ORM and default arguments, the generartor should generate a "mirror image" of this template project. You are most welcome to help me in this effort
 or provide suggestions etc. The README of the template project will contain a recipe with the steps to be taken to produce it ;)
 
-NOTE: I have renamed the old 'auth-assistant' project to this project called 'cream'. 
+### Update Nov 25, 2010
+
+Cream dependency to *cancan-permits* updated to use version 0.3.2.
+Cream Permits Config generator uses new *cancan:permits* and *cancan:licenses* generators.
+
+Currently to activate Cream in a rails app, insert this line in a Rails initializer.
+<code>
+  require 'cream/configure/rails'  
+</code>
 
-## Session systems
+## Authentication systems
 
-Cream targets [Devise](http://github.com/plataformatec/devise) as the Session system of choice
+Cream targets [Devise](http://github.com/plataformatec/devise) as the Authentication system of choice
 
 * [devise](http://github.com/plataformatec/devise) 
 
@@ -45,6 +53,8 @@ The Roles Generic API has been implemented for the following ORMs
 * [Roles DataMapper](http://github.com/kristianmandrup/roles_data_mapper)
 * [Roles MongoMapper](http://github.com/kristianmandrup/roles_mongo_mapper)
 * [Roles Mongoid](http://github.com/kristianmandrup/roles_for_mongoid)
+* [Roles Mongoid](http://github.com/kristianmandrup/roles_for_mongoid)
+* [Roles Simply Stored](https://github.com/kristianmandrup/roles_simply_stored)
 
 _Role Groups_
 Document DBs such as *Mongo* and *Riak* are good for modeling a role-group hierarchical relationship. 
@@ -52,7 +62,10 @@ Role-Group support is planned as a future add-on for the roles strategies integr
 
 _Note:_
 You are most welcome to provide "plugins" for any other role frameworks. Please follow the API conventions of Roles generic.
-Update: Currently in the process of expanding the API a little (add, remove, exhange roles) while making it more generic and flexible.
+
+_Update:_
+Roles Generic has recently been upgraded with a better API, architecture, framework for testing and more and better functionality. It should also now be more DRY and
+easier/simpler to add more strategies and Datastore adapters.
 
 ## Permission systems 
 
@@ -70,6 +83,7 @@ In general, it should now finally be pretty easy to set up a Rails 3 app, with a
 * Data Mapper
 * Mongo Mapper
 * Mongoid
+* Couch DB
 
 These ORMs are also supported for the Roles strategy system. The Permission system should not have any ORM dependency.
 There are plans to create a top-level generator which sets up your project with all these systems for a given ORM.
@@ -97,6 +111,12 @@ Role strategies can be set up using the [Roles Generic](http://github.com/kristi
 * Data Mapper
 * Mongo Mapper
 * Mongoid
+* Couch DB
+
+### Update
+
+The Role systems for Active Record, Mongoid and MongoMapper have recently been upgraded to take advantage of the new Roles Generic API and archictecture. 
+I hope to soon have time to also upgrade the remaining ORM Role adapters.
 
 ## Permission system 
 
@@ -118,7 +138,11 @@ Currently CanCan is supported as the permission system. I have added the concept
 Check out [Cancan permits](http://github.com/kristianmandrup/cancan-permits) for more info for how to use Permits.
 
 Cream has ben updated to support my the version of *Cancan permits*, which now support all the ORMs that both Cream and Roles Generic support.
-The various players are starting to play together nice! 
+
+For more advanced role/permission scenarios you can create Licenses placed in '/app/licenses/', which are 'permission sets' that can be reused across multiple Permits.
+Note: The gem *cancan-permits* comes with both a *permits* and a *licenses* generator.
+
+See [CanCan permits demo app](https://github.com/kristianmandrup/cancan-permits-demo) for an example of how to use cancan-permits and licenses.
 
 ## Generators
 

data/Rakefile

@@ -9,24 +9,24 @@ begin
     gem.authors = ["Kristian Mandrup"]
 
     gem.add_development_dependency "rspec",             ">= 2.0.0" 
-    gem.add_development_dependency "generator-spec",    "~> 0.6.5" 
+    gem.add_development_dependency "generator-spec",    ">= 0.7.0" 
     gem.add_development_dependency "rspec-action_view", ">= 0.3.1"     
     gem.add_development_dependency "rails-app-spec",    ">= 0.3.0"
 
     gem.add_dependency "require_all",       "~> 1.2.0"
     
-    gem.add_dependency "devise-links",      ">= 0.1.4"
-    gem.add_dependency "cancan-rest-links", ">= 0.1.4" 
-    gem.add_dependency "cancan-permits",    ">= 0.2.6" 
+    gem.add_dependency "devise-links",      ">= 0.2.0"
+    gem.add_dependency "cancan-rest-links", ">= 0.2.0" 
+    gem.add_dependency "cancan-permits",    ">= 0.3.2" 
 
-    gem.add_dependency "devise",            "~> 1.2.0"
-    gem.add_dependency "cancan",            "~> 1.4.0" 
-    gem.add_dependency "rails",             "~> 3.0"
+    gem.add_dependency "devise",            ">= 1.2.0"
+    gem.add_dependency "cancan",            ">= 1.4.0" 
+    gem.add_dependency "rails",             ">= 3.0.1"
 
-    gem.add_dependency "rails3_artifactor", "~> 0.3.0"
+    gem.add_dependency "rails3_artifactor", "~> 0.3.1"
     gem.add_dependency 'logging_assist',    "~> 0.1.6"
 
-    gem.add_dependency "r3_plugin_toolbox", ">= 0.3.14" 
+    gem.add_dependency "r3_plugin_toolbox", ">= 0.4.0" 
     gem.add_dependency "sugar-high",        "~> 0.3.0"
            
     # gem is a Gem::Specification... see http://www.rubygems.org/read/chapter/20 for additional settings

data/VERSION

@@ -1 +1 @@
-0.7.3
+0.7.5

data/config/locales/cream.en.yml

@@ -0,0 +1,16 @@
+en:
+  cream:
+    confirm: 'Are you sure?'
+    actions:
+      rest:  
+        index: "Index"
+        new: "New"
+        edit: "Edit"
+        delete: "Delete"
+        show: "Show"
+      auth:
+        sign_in: "Sign in"
+        sign_out: "Sign out"
+        sign_up: "Sign up"
+        edit_registration: "Edit registration"
+      

data/cream.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{cream}
-  s.version = "0.7.3"
+  s.version = "0.7.5"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Kristian Mandrup"]
-  s.date = %q{2010-10-21}
+  s.date = %q{2010-11-26}
   s.description = %q{Provides assistance for setting up Session, Role and Permission systems for a Rails 3 app. Support for multiple ORMs}
   s.email = %q{kmandrup@gmail.com}
   s.extra_rdoc_files = [
@@ -30,7 +30,7 @@ Gem::Specification.new do |s|
      "app/views/auth_assist/menu/_admin_login_items.html.erb",
      "app/views/auth_assist/menu/_login_items.html.erb",
      "app/views/auth_assist/menu/_registration_items.html.erb",
-     "config/locales/en.yml",
+     "config/locales/cream.en.yml",
      "cream.gemspec",
      "features/FEATURE_NOTES.txt",
      "features/permission/adds_permission.feature",
@@ -41,7 +41,6 @@ Gem::Specification.new do |s|
      "lib/cream/configure/after_init/role_config.rb",
      "lib/cream/configure/rails.rb",
      "lib/cream/controller/ability.rb",
-     "lib/cream/helper/authlabels.rb",
      "lib/cream/helper/host.rb",
      "lib/cream/helper/role.rb",
      "lib/cream/namespaces.rb",
@@ -64,7 +63,6 @@ Gem::Specification.new do |s|
      "log/development.log",
      "sandbox/test.rb",
      "spec/configure_helper.rb",
-     "spec/cream/configure/cream_setup_spec.rb",
      "spec/cream/configure/rails_custom_roles_spec.rb",
      "spec/cream/configure/rails_role_spec.rb",
      "spec/cream/configure/rails_user_roles_spec.rb",
@@ -98,7 +96,6 @@ Gem::Specification.new do |s|
   s.summary = %q{Integrates Devise, Roles and CanCan with Permits for a Rails 3 app}
   s.test_files = [
     "spec/configure_helper.rb",
-     "spec/cream/configure/cream_setup_spec.rb",
      "spec/cream/configure/rails_custom_roles_spec.rb",
      "spec/cream/configure/rails_role_spec.rb",
      "spec/cream/configure/rails_user_roles_spec.rb",
@@ -124,52 +121,52 @@ Gem::Specification.new do |s|
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_development_dependency(%q<rspec>, [">= 2.0.0"])
-      s.add_development_dependency(%q<generator-spec>, ["~> 0.6.5"])
+      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_runtime_dependency(%q<require_all>, ["~> 1.2.0"])
-      s.add_runtime_dependency(%q<devise-links>, [">= 0.1.4"])
-      s.add_runtime_dependency(%q<cancan-rest-links>, [">= 0.1.4"])
-      s.add_runtime_dependency(%q<cancan-permits>, [">= 0.2.6"])
-      s.add_runtime_dependency(%q<devise>, ["~> 1.2.0"])
-      s.add_runtime_dependency(%q<cancan>, ["~> 1.4.0"])
-      s.add_runtime_dependency(%q<rails>, ["~> 3.0"])
-      s.add_runtime_dependency(%q<rails3_artifactor>, ["~> 0.3.0"])
+      s.add_runtime_dependency(%q<devise-links>, [">= 0.2.0"])
+      s.add_runtime_dependency(%q<cancan-rest-links>, [">= 0.2.0"])
+      s.add_runtime_dependency(%q<cancan-permits>, [">= 0.3.2"])
+      s.add_runtime_dependency(%q<devise>, [">= 1.2.0"])
+      s.add_runtime_dependency(%q<cancan>, [">= 1.4.0"])
+      s.add_runtime_dependency(%q<rails>, [">= 3.0.1"])
+      s.add_runtime_dependency(%q<rails3_artifactor>, ["~> 0.3.1"])
       s.add_runtime_dependency(%q<logging_assist>, ["~> 0.1.6"])
-      s.add_runtime_dependency(%q<r3_plugin_toolbox>, [">= 0.3.14"])
+      s.add_runtime_dependency(%q<r3_plugin_toolbox>, [">= 0.4.0"])
       s.add_runtime_dependency(%q<sugar-high>, ["~> 0.3.0"])
     else
       s.add_dependency(%q<rspec>, [">= 2.0.0"])
-      s.add_dependency(%q<generator-spec>, ["~> 0.6.5"])
+      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<require_all>, ["~> 1.2.0"])
-      s.add_dependency(%q<devise-links>, [">= 0.1.4"])
-      s.add_dependency(%q<cancan-rest-links>, [">= 0.1.4"])
-      s.add_dependency(%q<cancan-permits>, [">= 0.2.6"])
-      s.add_dependency(%q<devise>, ["~> 1.2.0"])
-      s.add_dependency(%q<cancan>, ["~> 1.4.0"])
-      s.add_dependency(%q<rails>, ["~> 3.0"])
-      s.add_dependency(%q<rails3_artifactor>, ["~> 0.3.0"])
+      s.add_dependency(%q<devise-links>, [">= 0.2.0"])
+      s.add_dependency(%q<cancan-rest-links>, [">= 0.2.0"])
+      s.add_dependency(%q<cancan-permits>, [">= 0.3.2"])
+      s.add_dependency(%q<devise>, [">= 1.2.0"])
+      s.add_dependency(%q<cancan>, [">= 1.4.0"])
+      s.add_dependency(%q<rails>, [">= 3.0.1"])
+      s.add_dependency(%q<rails3_artifactor>, ["~> 0.3.1"])
       s.add_dependency(%q<logging_assist>, ["~> 0.1.6"])
-      s.add_dependency(%q<r3_plugin_toolbox>, [">= 0.3.14"])
+      s.add_dependency(%q<r3_plugin_toolbox>, [">= 0.4.0"])
       s.add_dependency(%q<sugar-high>, ["~> 0.3.0"])
     end
   else
     s.add_dependency(%q<rspec>, [">= 2.0.0"])
-    s.add_dependency(%q<generator-spec>, ["~> 0.6.5"])
+    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<require_all>, ["~> 1.2.0"])
-    s.add_dependency(%q<devise-links>, [">= 0.1.4"])
-    s.add_dependency(%q<cancan-rest-links>, [">= 0.1.4"])
-    s.add_dependency(%q<cancan-permits>, [">= 0.2.6"])
-    s.add_dependency(%q<devise>, ["~> 1.2.0"])
-    s.add_dependency(%q<cancan>, ["~> 1.4.0"])
-    s.add_dependency(%q<rails>, ["~> 3.0"])
-    s.add_dependency(%q<rails3_artifactor>, ["~> 0.3.0"])
+    s.add_dependency(%q<devise-links>, [">= 0.2.0"])
+    s.add_dependency(%q<cancan-rest-links>, [">= 0.2.0"])
+    s.add_dependency(%q<cancan-permits>, [">= 0.3.2"])
+    s.add_dependency(%q<devise>, [">= 1.2.0"])
+    s.add_dependency(%q<cancan>, [">= 1.4.0"])
+    s.add_dependency(%q<rails>, [">= 3.0.1"])
+    s.add_dependency(%q<rails3_artifactor>, ["~> 0.3.1"])
     s.add_dependency(%q<logging_assist>, ["~> 0.1.6"])
-    s.add_dependency(%q<r3_plugin_toolbox>, [">= 0.3.14"])
+    s.add_dependency(%q<r3_plugin_toolbox>, [">= 0.4.0"])
     s.add_dependency(%q<sugar-high>, ["~> 0.3.0"])
   end
 end

data/lib/cream/configure/rails.rb

@@ -7,20 +7,20 @@ Rails3::Plugin::Extender.new do
   extend_rails :controller do
     extend_from_module Cream, :role
     extend_from_module Cream::Controller, :ability
-    extend_from_module Cream::Helper, :role, :host, :auth_label
+    extend_from_module Cream::Helper, :role, :host
   end  
 
   # extend action_view with methods from some modules
   extend_rails :view do
     extend_from_module Cream::View, :role, :host, :user_action_menu
-    extend_from_module Cream::Helper, :role, :auth_label
+    extend_from_module Cream::Helper, :role
   end  
   
   after :initialize do   
     require_all File.dirname(__FILE__) + '/after_init'
 
-    Rails3.with_configuration do
-      load_paths += %W(#{Rails.root}/app/permits)
-    end
+    # Rails3.with_configuration do
+    #   load_paths += %W(#{Rails.root}/app/permits)
+    # end
   end
 end

data/lib/cream/role.rb

@@ -7,18 +7,44 @@ module Cream
     def self.available
       return Cream.available_roles if Cream.available_roles.present?
       return Cream.roles if Cream.roles.present?
-      if defined? ::Role
-        ::Role.all.map(&:name).to_symbols
-      elsif defined? ::User
-        ::User.roles.to_symbols
-      else
-        raise %q{Available roles could not be determined. Please do either of the following:\n
+
+      puts "Cream didn't have available roles configured, now trying alternatives: User and Role"
+
+      return try_role if try_role
+      return try_user if try_user
+            
+      raise %q{Available roles could not be determined. Please do either of the following:\n
 1) Create a Cream.setup block
 2) Set Cream.available_roles explicitly
 3) Create Role instances and ensure a call to Role.all returns them
 4) Set User.roles explicitly
 }          
+    end
+
+    protected
+
+    def self.try_user 
+      if !defined? ::User
+        puts "No User defined"
+        return nil 
       end
+
+      puts "User has roles available?"       
+      return ::User.roles.to_symbols if ::User.respond_to?(:roles)             
+      puts "User didn't have a #roles class method"
+      nil
     end
+
+    def self.try_role
+      if !defined? ::Role
+        puts "No Role defined"
+        return nil 
+      end
+
+      puts "Role has roles available?"       
+      return ::Role.all.map(&:name).to_symbols if ::Role.respond_to?(:all)        
+      puts "Role didn't have an #all class method"
+      nil
+    end      
   end
 end

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

@@ -143,7 +143,7 @@ module Cream
       end
 
       def cream_locale
-        src = File.expand_path "config/locales/en.yml".path.up(2)
+        src = File.expand_path "config/locales/cream.en.yml".path.up(2)
         # src = "config/locales/en.yml"
         logger.debug "configure_locale, copy from: #{src}"            
         copy_file src, "config/locales/cream.en.yml"

data/lib/generators/cream/views/views_generator.rb

@@ -4,7 +4,7 @@ require 'generators/views/haml_util'
 module Cream
   module Generators
     class ViewsGenerator < Rails::Generators::Base
-      desc "Copies all AuthAssist views to your application."
+      desc "Copies all Cream views to your application."
   
       argument :scope, :required => false, :default => nil, :desc => "The scope to copy views to"
   

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

@@ -22,7 +22,8 @@ module Permits
 		    permits_gems if gems?
 
         # Run permits generator to generate permit for each role
-        rgen "permits --roles #{roles} --orm #{orm}"
+        rgen "cancan:permits --roles #{roles} --orm #{orm}"
+        rgen "cancan:licenses"
       end           
 
       protected        

data/spec/cream/configure/rails_custom_roles_spec.rb

@@ -1,4 +1,5 @@
 require 'configure_helper'
+require 'cream/configure/rails'
 
 Cream.available_roles = [:guest, :admin]
 
@@ -7,7 +8,7 @@ describe "Rails extension" do
     it "should extend Action View with Roles helper instance_methods and specific role methods" do
       after_init :view do
         :view.should be_extended_with Cream::View,    :role, :host, :user_action_menu
-        :view.should be_extended_with Cream::Helper,  :role, :auth_label
+        :view.should be_extended_with Cream::Helper,  :role
       end
       
       init_app_railties :minimal, :view
@@ -17,7 +18,7 @@ describe "Rails extension" do
       after_init :controller do
         :controller.should be_extended_with Cream, :role
         :controller.should be_extended_with Cream::Controller, :ability
-        :controller.should be_extended_with Cream::Helper, :role, :host, :auth_label
+        :controller.should be_extended_with Cream::Helper, :role, :host
       end            
       
       init_app_railties :minimal, :view

data/spec/cream/configure/rails_role_spec.rb

@@ -1,6 +1,6 @@
 require 'configure_helper'
 
-require 'cream/configure'
+require 'cream/configure/rails'
 
 class Role  
   attr_accessor :name
@@ -19,7 +19,7 @@ describe "Rails extension" do
     it "should extend Action View with Roles helper instance_methods and specific role methods" do
       after_init :view do
         :view.should be_extended_with Cream::View,    :role, :host, :user_action_menu
-        :view.should be_extended_with Cream::Helper,  :role, :auth_label
+        :view.should be_extended_with Cream::Helper,  :role
       end
       
       init_app_railties :minimal, :view
@@ -29,7 +29,7 @@ describe "Rails extension" do
       after_init :controller do
         :controller.should be_extended_with Cream, :role
         :controller.should be_extended_with Cream::Controller, :ability
-        :controller.should be_extended_with Cream::Helper, :role, :host, :auth_label
+        :controller.should be_extended_with Cream::Helper, :role, :host
       end            
       
       init_app_railties :minimal, :view

data/spec/cream/configure/rails_user_roles_spec.rb

@@ -1,4 +1,5 @@
 require 'configure_helper'
+require 'cream/configure/rails'
 
 class User
   def self.roles
@@ -11,7 +12,7 @@ describe "Rails extension" do
     it "should extend Action View with Roles helper instance_methods and specific role methods" do
       after_init :view do
         :view.should be_extended_with Cream::View,    :role, :host, :user_action_menu
-        :view.should be_extended_with Cream::Helper,  :role, :auth_label
+        :view.should be_extended_with Cream::Helper,  :role
       end
       
       init_app_railties :minimal, :view
@@ -21,7 +22,7 @@ describe "Rails extension" do
       after_init :controller do
         :controller.should be_extended_with Cream, :role
         :controller.should be_extended_with Cream::Controller, :ability
-        :controller.should be_extended_with Cream::Helper, :role, :host, :auth_label
+        :controller.should be_extended_with Cream::Helper, :role, :host
       end            
       
       init_app_railties :minimal, :view

data/spec/cream/helper/host_spec.rb

@@ -11,7 +11,7 @@ describe Cream::Helper::Host do
       request = stub()
       request.stubs(:host).returns 'localhost'        
       
-      with_engine do |e, view|
+      view_engine do |e, view|
         view.stubs(:request).returns request
 
         res = e.run_template do 
@@ -25,7 +25,7 @@ describe Cream::Helper::Host do
       request = stub()
       request.stubs(:host).returns '127.0.0.1'        
 
-      with_engine do |e, view|
+      view_engine do |e, view|
         view.stubs(:request).returns request
 
         res = e.run_template do 
@@ -41,7 +41,7 @@ describe Cream::Helper::Host do
       request = stub()
       request.stubs(:host).returns 'localhost'        
 
-      with_engine do |e, view|
+      view_engine do |e, view|
         view.stubs(:request).returns request
 
         res = e.run_template do 
@@ -55,7 +55,7 @@ describe Cream::Helper::Host do
       request = stub()
       request.stubs(:host).returns '214.353.343.222'        
 
-      with_engine do |e, view|
+      view_engine do |e, view|
         view.stubs(:request).returns request
 
         res = e.run_template do 

data/spec/cream/helper/role_spec.rb

@@ -9,7 +9,7 @@ describe Cream::Helper::Role do
     describe '#guest_area' do              
 
       # it "should execute an Admin guarded block for :admin" do        
-      #   with_engine do |e, view|
+      #   view_engine do |e, view|
       #     view.stubs(:has_role?).with([:admin]).returns true
       # 
       #     res = e.run_template do 
@@ -20,7 +20,7 @@ describe Cream::Helper::Role do
       # end
       #   
       # it "should not execute an Admin guarded block for user not :admin" do        
-      #   with_engine do |e, view|
+      #   view_engine do |e, view|
       #     view.stubs(:has_role?).with([:admin]).returns false
       # 
       #     res = e.run_template do 
@@ -35,7 +35,7 @@ describe Cream::Helper::Role do
   context 'admin user' do  
     describe '#for_roles' do                    
       it "display an :admin only block" do        
-        with_engine do |e, view|
+        view_engine do |e, view|
           view.stubs(:has_role?).with([:admin]).returns true
 
           res = e.run_template do 
@@ -46,7 +46,7 @@ describe Cream::Helper::Role do
       end
       
       it "should not display a :guest only block" do
-        with_engine do |e, view|
+        view_engine do |e, view|
           view.stubs(:has_role?).with([:guest]).returns false
 
           res = e.run_template do 
@@ -59,7 +59,7 @@ describe Cream::Helper::Role do
   
     describe '#not_for_roles' do              
       it "should not display a block not for :admin" do        
-        with_engine do |e, view|
+        view_engine do |e, view|
           view.stubs(:has_role?).with([:admin]).returns true
 
           res = e.run_template do 
@@ -70,7 +70,7 @@ describe Cream::Helper::Role do
       end
     
       it "should display a div block not for :guest" do        
-        with_engine do |e, view|
+        view_engine do |e, view|
           view.stubs(:has_role?).with([:guest]).returns false
 
           res = e.run_template do 
@@ -88,7 +88,7 @@ describe Cream::Helper::Role do
         user = stub()
         user.stubs(:has_role?).with([:admin]).returns true
 
-        with_engine do |e, view|
+        view_engine do |e, view|
           view.stubs(:current_user).returns user
 
           res = e.run_template do 
@@ -102,7 +102,7 @@ describe Cream::Helper::Role do
         user = stub()
         user.stubs(:has_role?).with([:guest]).returns false
 
-        with_engine do |e, view|
+        view_engine do |e, view|
           view.stubs(:current_user).returns user
           res = e.run_template do 
             %{<%= has_role?(:guest) %> }
@@ -119,7 +119,7 @@ describe Cream::Helper::Role do
         user = stub()
         user.stubs(:has_roles?).with([:admin, :guest]).returns true
 
-        with_engine do |e, view|
+        view_engine do |e, view|
           view.stubs(:current_user).returns user
           res = e.run_template do 
             %{<%= has_roles?(:admin, :guest) %> }
@@ -132,7 +132,7 @@ describe Cream::Helper::Role do
         user = stub()
         user.stubs(:has_roles?).with([:unknown, :guest]).returns false
 
-        with_engine do |e, view|
+        view_engine do |e, view|
           view.stubs(:current_user).returns user
           res = e.run_template do 
             %{<%= has_roles?(:unknown, :guest) %> }
@@ -147,7 +147,7 @@ describe Cream::Helper::Role do
     it "should return false, since the user is NOT the owner of the post, but an other user" do
       user = stub()
       other_user = stub()
-      with_engine do |e, view|
+      view_engine do |e, view|
         view.stubs(:current_user).returns user
         @post.stubs(:owner).returns other_user
         
@@ -160,7 +160,7 @@ describe Cream::Helper::Role do
 
     it "should return true, since the user is the owner of the post (default :owner relation)" do
       user = stub()
-      with_engine do |e, view|
+      view_engine do |e, view|
         view.stubs(:current_user).returns user
         @post.stubs(:owner).returns user
         
@@ -173,7 +173,7 @@ describe Cream::Helper::Role do
 
     it "should return true, since the user is the owner of the post using custom ownership relation :maker" do
       user = stub()
-      with_engine do |e, view|
+      view_engine do |e, view|
         view.stubs(:current_user).returns user
         @post.stubs(:maker).returns user
         

data/spec/cream/view/host_area_spec.rb

@@ -10,7 +10,7 @@ describe Cream::View::Host do
   
   describe '#for_localhost' do
     it "should display localhost guarded content for localhost browser agent" do
-      with_engine do |e, view|
+      view_engine do |e, view|
         view.stubs(:localhost?).returns true
 
         res = e.run_template do 
@@ -24,7 +24,7 @@ describe Cream::View::Host do
     end
 
     it "should NOT display localhost guarded content for NON-localhost browser agent" do
-      with_engine do |e, view|
+      view_engine do |e, view|
         view.stubs(:localhost?).returns false
     
         res = e.run_template do 
@@ -37,7 +37,7 @@ describe Cream::View::Host do
 
   describe '#for_public' do
     it "should display public content for public browser agent" do
-      with_engine do |e, view|
+      view_engine do |e, view|
         view.stubs(:publichost?).returns true
   
         res = e.run_template do 
@@ -48,7 +48,7 @@ describe Cream::View::Host do
     end
   
     it "should display public content for public browser agent" do
-      with_engine do |e, view|
+      view_engine do |e, view|
         view.stubs(:publichost?).returns false
     
         res = e.run_template do 

data/spec/cream/view/role_area_spec.rb

@@ -12,7 +12,7 @@ describe Cream::View::Role do
   
   describe '#area' do
     it "should display the div with hello" do
-      with_engine do |e, view|
+      view_engine do |e, view|
 
         res = e.run_template do 
           %{<%= area :class => 'red' do %>
@@ -25,7 +25,7 @@ describe Cream::View::Role do
     end
 
     it "should display the div with hello when localhost block nested inside" do
-      with_engine do |e, view|
+      view_engine do |e, view|
         view.stubs(:localhost?).returns true
         
         res = e.run_template do 
@@ -39,7 +39,7 @@ describe Cream::View::Role do
     end
 
     it "should display the div with hello when nested within localhost block" do
-      with_engine do |e, view|
+      view_engine do |e, view|
         view.stubs(:localhost?).returns true
         
         res = e.run_template do 
@@ -58,7 +58,7 @@ describe Cream::View::Role do
   
   describe '#area_for_roles' do              
     it "should display an area for :admin" do        
-      with_engine do |e, view|
+      view_engine do |e, view|
         view.stubs(:has_role?).with([:admin]).returns true
 
         res = e.run_template do 
@@ -69,7 +69,7 @@ describe Cream::View::Role do
     end
   
     it "should not display an area for user not :admin" do        
-      with_engine do |e, view|
+      view_engine do |e, view|
         view.stubs(:has_role?).with([:admin]).returns false
 
         res = e.run_template do 
@@ -82,7 +82,7 @@ describe Cream::View::Role do
 
   describe '#area_not_for_roles' do              
     it "should not display an area for user :admin" do        
-      with_engine do |e, view|
+      view_engine do |e, view|
         view.stubs(:has_role?).with([:admin]).returns true
         res = e.run_template do 
           %{<%= area_not_for_roles(:admin) { 'hello' } %>}
@@ -92,7 +92,7 @@ describe Cream::View::Role do
     end
   
     it "should display an area for user not :admin" do        
-      with_engine do |e, view|
+      view_engine do |e, view|
         # he is not admin    
         view.stubs(:has_role?).with([:admin]).returns false
 
@@ -107,7 +107,7 @@ describe Cream::View::Role do
   # context 'method auto-generated when Rails initialize based on registered roles' do
   #   describe '#guest_area' do              
   #     it "should display an Admin area for :admin" do        
-  #       with_engine do |e, view|
+  #       view_engine do |e, view|
   #         view.stubs(:has_role?).with([:admin]).returns true
   # 
   #         res = e.run_template do 
@@ -118,7 +118,7 @@ describe Cream::View::Role do
   #     end
   # 
   #     it "should not display a Admin area for user not :admin" do        
-  #       with_engine do |e, view|
+  #       view_engine do |e, view|
   #         view.stubs(:has_role?).with([:admin]).returns false
   # 
   #         res = e.run_template do 

data/wiki/ROLE_STRATEGIES.txt

@@ -1,4 +1,4 @@
-*Auth assistant* supports single and multiple role strategies. Currently groups are not supported. 
+*Cream* supports single and multiple role strategies. Currently groups are not supported. 
 
 Note: Maybe roles support could be integrated in the future using an existing solution for roles and groups? 
 

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 7
-  - 3
-  version: 0.7.3
+  - 5
+  version: 0.7.5
 platform: ruby
 authors: 
 - Kristian Mandrup
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-10-21 00:00:00 +02:00
+date: 2010-11-26 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -38,13 +38,13 @@ dependencies:
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version 
         segments: 
         - 0
-        - 6
-        - 5
-        version: 0.6.5
+        - 7
+        - 0
+        version: 0.7.0
   type: :development
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
@@ -102,9 +102,9 @@ dependencies:
       - !ruby/object:Gem::Version 
         segments: 
         - 0
-        - 1
-        - 4
-        version: 0.1.4
+        - 2
+        - 0
+        version: 0.2.0
   type: :runtime
   version_requirements: *id006
 - !ruby/object:Gem::Dependency 
@@ -117,9 +117,9 @@ dependencies:
       - !ruby/object:Gem::Version 
         segments: 
         - 0
-        - 1
-        - 4
-        version: 0.1.4
+        - 2
+        - 0
+        version: 0.2.0
   type: :runtime
   version_requirements: *id007
 - !ruby/object:Gem::Dependency 
@@ -132,9 +132,9 @@ dependencies:
       - !ruby/object:Gem::Version 
         segments: 
         - 0
+        - 3
         - 2
-        - 6
-        version: 0.2.6
+        version: 0.3.2
   type: :runtime
   version_requirements: *id008
 - !ruby/object:Gem::Dependency 
@@ -143,7 +143,7 @@ dependencies:
   requirement: &id009 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version 
         segments: 
         - 1
@@ -158,7 +158,7 @@ dependencies:
   requirement: &id010 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version 
         segments: 
         - 1
@@ -173,12 +173,13 @@ dependencies:
   requirement: &id011 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version 
         segments: 
         - 3
         - 0
-        version: "3.0"
+        - 1
+        version: 3.0.1
   type: :runtime
   version_requirements: *id011
 - !ruby/object:Gem::Dependency 
@@ -192,8 +193,8 @@ dependencies:
         segments: 
         - 0
         - 3
-        - 0
-        version: 0.3.0
+        - 1
+        version: 0.3.1
   type: :runtime
   version_requirements: *id012
 - !ruby/object:Gem::Dependency 
@@ -221,9 +222,9 @@ dependencies:
       - !ruby/object:Gem::Version 
         segments: 
         - 0
-        - 3
-        - 14
-        version: 0.3.14
+        - 4
+        - 0
+        version: 0.4.0
   type: :runtime
   version_requirements: *id014
 - !ruby/object:Gem::Dependency 
@@ -264,7 +265,7 @@ files:
 - app/views/auth_assist/menu/_admin_login_items.html.erb
 - app/views/auth_assist/menu/_login_items.html.erb
 - app/views/auth_assist/menu/_registration_items.html.erb
-- config/locales/en.yml
+- config/locales/cream.en.yml
 - cream.gemspec
 - features/FEATURE_NOTES.txt
 - features/permission/adds_permission.feature
@@ -275,7 +276,6 @@ files:
 - lib/cream/configure/after_init/role_config.rb
 - lib/cream/configure/rails.rb
 - lib/cream/controller/ability.rb
-- lib/cream/helper/authlabels.rb
 - lib/cream/helper/host.rb
 - lib/cream/helper/role.rb
 - lib/cream/namespaces.rb
@@ -298,7 +298,6 @@ files:
 - log/development.log
 - sandbox/test.rb
 - spec/configure_helper.rb
-- spec/cream/configure/cream_setup_spec.rb
 - spec/cream/configure/rails_custom_roles_spec.rb
 - spec/cream/configure/rails_role_spec.rb
 - spec/cream/configure/rails_user_roles_spec.rb
@@ -358,7 +357,6 @@ specification_version: 3
 summary: Integrates Devise, Roles and CanCan with Permits for a Rails 3 app
 test_files: 
 - spec/configure_helper.rb
-- spec/cream/configure/cream_setup_spec.rb
 - spec/cream/configure/rails_custom_roles_spec.rb
 - spec/cream/configure/rails_role_spec.rb
 - spec/cream/configure/rails_user_roles_spec.rb

data/config/locales/en.yml

@@ -1,14 +0,0 @@
-en:
-  cream:
-    confirm: 'Are you sure?'
-    actions:  
-      index: "Index"
-      new: "New"
-      edit: "Edit"
-      delete: "Delete"
-      show: "Show"
-      sign_in: "Sign in"
-      sign_out: "Sign out"      
-      sign_up: "Sign up"  
-      edit_registration: "Edit registration"        
-      

data/lib/cream/helper/authlabels.rb

@@ -1,19 +0,0 @@
-module Cream::Helper
-  module AuthLabel          
-    def auth_labels
-      @auth_labels ||= translate_labels
-    end
-
-    protected
-
-    def translate_labels
-      ns_actions = 'cream.actions'
-      labels = {}
-      %w{new edit delete show sign_in sign_out sign_up edit_registration}.each do |action|     
-        labels[action.to_sym] = t "#{ns_actions}.#{action}"
-      end 
-      labels[:confirm] = t 'cream.confirm'
-      labels           
-    end    
-  end
-end

data/spec/cream/configure/cream_setup_spec.rb

@@ -1,7 +0,0 @@
-require 'spec_helper'
-
-Cream.setup do |config|
-  # ==> Mailer Configuration
-  # Configure the e-mail address which will be shown in DeviseMailer.
-  config.roles = [:guest, :admin]
-end