cream 0.7.2 → 0.7.3

data/Gemfile

@@ -3,26 +3,26 @@ 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.3" 
+  gem "cancan-rest-links", ">= 0.1.3" 
+  gem "cancan-permits",    ">= 0.2.6" 
 
   gem "require_all",       "~> 1.2.0"    
 
-  gem "devise",            ">= 1.1.2"    
+  gem "devise",            ">= 1.2.0"    
   gem "cancan",            "~> 1.4.0" 
-  gem "rails",             "~> 3.0.0"
+  gem "rails",             "~> 3.0"
 
-  gem "rails3_artifactor", "~> 0.2.5"
-  gem 'logging_assist',    "~> 0.1.3"
+  gem "rails3_artifactor", "~> 0.3.0"
+  gem 'logging_assist',    "~> 0.1.6"
 
-  gem "r3_plugin_toolbox", "~> 0.3.6" 
-  gem "sugar-high",        "~> 0.2.10"      
+  gem "r3_plugin_toolbox", ">= 0.3.14" 
+  gem "sugar-high",        "~> 0.3.0"      
 end
 
 group :test do    
   gem 'ffaker',            '~> 0.4.0',    :git => 'http://github.com/kematzy/ffaker.git'
-  gem "rspec",             ">= 2.0.0.rc" 
-  gem "generator-spec",    "~> 0.6.5" 
-  gem "rspec-action_view", "~> 0.3.1"     
-  gem "rails-app-spec",    "~> 0.2.14"
+  gem "rspec",             ">= 2.0.0" 
+  gem "generator-spec",    ">= 0.6.0" 
+  gem "rspec-action_view", ">= 0.3.1"     
+  gem "rails-app-spec",    "~> 0.3.0"
 end

data/README.markdown

@@ -52,13 +52,12 @@ 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.
 
 ## Permission systems 
 
 There is support for the [CanCan](http://github.com/ryanb/cancan) permission system. 
-I have created a [Cancan permits](http://github.com/kristianmandrup/cancan-permits) gem that adds the concept of Permits for each role (see below)
-
-I'm considering supporting [Canable](http://github.com/jnunemaker/canable) as well (but only if requested by the community!)
+I have created a [Cancan permits](http://github.com/kristianmandrup/cancan-permits) gem that adds the concept of Permits for each role (see below).
 
 _Note:_
 You are most welcome to provide "plugins" for other permission frameworks!
@@ -112,41 +111,37 @@ The *config* generator will generate a set of Permit files which are placed in '
 
 The project [CanCan REST links](http://github.com/kristianmandrup/cancan-rest-links) provides a convenient way to handle CanCan REST links, using a flexible API.
 
-### Canable
-
-In [Canable](http://github.com/jnunemaker/canable) the permissions are by default defined in the models. 
-I plan to tweak this behavior to enable the same or a similar central permission setup as I use for CanCan.
-In my (somewhat old and degenerate) fork of *Canable*, I have generators to setup the models and user with a *Canable* config. 
-
-_Note_: These generators should be updated to take advantage of my latest generator-spec and other supporting generator assitant gems!
-
-More to follow in the future...
-
 ## Permits
 
-Currently CanCan is supported as the permission system. I have added the concept of Permits linked to Roles. 
+Currently CanCan is supported as the permission system. I have added the concept of Permits (and optionally Licenses) linked to Roles. 
 
 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 latest version of *Cancan permits*, which now support all the ORMs which cream aims to support and which Roles Generic supports.
+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! 
 
 ## Generators
 
 The following generators are currently available 
 
-* cream:config    - Configure Rails 3 application with Cream
-* cream:users     - Configure Rails 3 application with Cream
-* cream:views     - Generate partials for menu items
+* cream:config    - Configure Rails 3 application with Cream (master generator)
 
-* permits:config  - Configures app with CanCan Permits
+Sub-generators
+
+* cream:views     - Generates partials for menu items
+* devise:config   - Configure Rails 3 application with Devise
+* devise:users    - Configure Rails 3 application with Devise users
 * cancan:config   - Configures app with CanCan
+* permits:config  - Configures app with CanCan Permits
 * roles:config    - Configures app with Roles
 
 All the above generators now have specs to show how to use them. 
-Note: They have still not been tested in all scenarios with all ORMs, role strategies etc.
+Note: These generators have still not been tested in all scenarios with all ORMs, role strategies etc.
 I am sure there are still some issues... so please help uncover these!
 
+In general, the cream:config generator can be seen as a kind of "super generator", in that it should call all the sub-generators in succession to attempt to fully configure
+and applicaiton in one go. 
+
 Cream will support these ORMs:
 
 * Active Record
@@ -156,21 +151,26 @@ Cream will support these ORMs:
 
 ### Config Generator ###
 
-*Deprecated*
+Master cream generator which calls the sub-generators in succession.
 
-In the future this should be a master generator which calls the other generators in turn.
-
-<code>rails g cream::config --strategy ROLE_STRATEGY [--init-devise] [--admin_user] [--orm] [--roles]</code>
+<code>rails g cream::config --strategy ROLE_STRATEGY [--admin_user] [--orm ORM] [--roles ROLE1 ROLE2] [--logfile LOGFILE]</code>
 
 * --strategy      : role strategy to use (see *roles_generic* gem)
-* --init-devise   : run devise generator to create devise Users with session/auth strategies
 * --admin-user    : create admin user model with separate devise configuration
 * --orm           : orm to be used
-* --roles         : list of valid roles to use
+* --roles         : list of valid roles and permits to use
 
 Example
 
-<code>rails g cream:config admin_flag --devise --admin --orm AR</code>
+<code>rails g cream:config --strategy admin_flag --admin-user --orm AR</code>
+
+By default creates :guest and :admin roles.
+
+## Sub generators
+
+To view the run options of any of the sub generators, simply type $ rails g [GENERATOR_NAME]
+
+Example: <code>rails g permits:config</code>
 
 ### Views Generator ###
 

data/Rakefile

@@ -10,24 +10,24 @@ begin
 
     gem.add_development_dependency "rspec",             ">= 2.0.0" 
     gem.add_development_dependency "generator-spec",    "~> 0.6.5" 
-    gem.add_development_dependency "rspec-action_view", "~> 0.3.1"     
-    gem.add_development_dependency "rails-app-spec",    "~> 0.2.14"
+    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.4" 
+    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",            ">= 1.1.2"
+    gem.add_dependency "devise",            "~> 1.2.0"
     gem.add_dependency "cancan",            "~> 1.4.0" 
-    gem.add_dependency "rails",             "~> 3.0.0"
+    gem.add_dependency "rails",             "~> 3.0"
 
-    gem.add_dependency "rails3_artifactor", "~> 0.2.8"
-    gem.add_dependency 'logging_assist',    "~> 0.1.3"
+    gem.add_dependency "rails3_artifactor", "~> 0.3.0"
+    gem.add_dependency 'logging_assist',    "~> 0.1.6"
 
-    gem.add_dependency "r3_plugin_toolbox", "~> 0.3.6" 
-    gem.add_dependency "sugar-high",        "~> 0.2.11"
+    gem.add_dependency "r3_plugin_toolbox", ">= 0.3.14" 
+    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.2
+0.7.3

data/cream.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{cream}
-  s.version = "0.7.2"
+  s.version = "0.7.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Kristian Mandrup"]
-  s.date = %q{2010-10-17}
+  s.date = %q{2010-10-21}
   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 = [
@@ -125,52 +125,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<rspec-action_view>, ["~> 0.3.1"])
-      s.add_development_dependency(%q<rails-app-spec>, ["~> 0.2.14"])
+      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.4"])
-      s.add_runtime_dependency(%q<devise>, [">= 1.1.2"])
+      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.0"])
-      s.add_runtime_dependency(%q<rails3_artifactor>, ["~> 0.2.8"])
-      s.add_runtime_dependency(%q<logging_assist>, ["~> 0.1.3"])
-      s.add_runtime_dependency(%q<r3_plugin_toolbox>, ["~> 0.3.6"])
-      s.add_runtime_dependency(%q<sugar-high>, ["~> 0.2.11"])
+      s.add_runtime_dependency(%q<rails>, ["~> 3.0"])
+      s.add_runtime_dependency(%q<rails3_artifactor>, ["~> 0.3.0"])
+      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<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<rspec-action_view>, ["~> 0.3.1"])
-      s.add_dependency(%q<rails-app-spec>, ["~> 0.2.14"])
+      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.4"])
-      s.add_dependency(%q<devise>, [">= 1.1.2"])
+      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.0"])
-      s.add_dependency(%q<rails3_artifactor>, ["~> 0.2.8"])
-      s.add_dependency(%q<logging_assist>, ["~> 0.1.3"])
-      s.add_dependency(%q<r3_plugin_toolbox>, ["~> 0.3.6"])
-      s.add_dependency(%q<sugar-high>, ["~> 0.2.11"])
+      s.add_dependency(%q<rails>, ["~> 3.0"])
+      s.add_dependency(%q<rails3_artifactor>, ["~> 0.3.0"])
+      s.add_dependency(%q<logging_assist>, ["~> 0.1.6"])
+      s.add_dependency(%q<r3_plugin_toolbox>, [">= 0.3.14"])
+      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<rspec-action_view>, ["~> 0.3.1"])
-    s.add_dependency(%q<rails-app-spec>, ["~> 0.2.14"])
+    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.4"])
-    s.add_dependency(%q<devise>, [">= 1.1.2"])
+    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.0"])
-    s.add_dependency(%q<rails3_artifactor>, ["~> 0.2.8"])
-    s.add_dependency(%q<logging_assist>, ["~> 0.1.3"])
-    s.add_dependency(%q<r3_plugin_toolbox>, ["~> 0.3.6"])
-    s.add_dependency(%q<sugar-high>, ["~> 0.2.11"])
+    s.add_dependency(%q<rails>, ["~> 3.0"])
+    s.add_dependency(%q<rails3_artifactor>, ["~> 0.3.0"])
+    s.add_dependency(%q<logging_assist>, ["~> 0.1.6"])
+    s.add_dependency(%q<r3_plugin_toolbox>, [">= 0.3.14"])
+    s.add_dependency(%q<sugar-high>, ["~> 0.3.0"])
   end
 end
 

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 7
-  - 2
-  version: 0.7.2
+  - 3
+  version: 0.7.3
 platform: ruby
 authors: 
 - Kristian Mandrup
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-10-17 00:00:00 +02:00
+date: 2010-10-21 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -53,7 +53,7 @@ dependencies:
   requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version 
         segments: 
         - 0
@@ -68,13 +68,13 @@ dependencies:
   requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version 
         segments: 
         - 0
-        - 2
-        - 14
-        version: 0.2.14
+        - 3
+        - 0
+        version: 0.3.0
   type: :development
   version_requirements: *id004
 - !ruby/object:Gem::Dependency 
@@ -98,7 +98,7 @@ dependencies:
   requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version 
         segments: 
         - 0
@@ -113,7 +113,7 @@ dependencies:
   requirement: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version 
         segments: 
         - 0
@@ -128,13 +128,13 @@ dependencies:
   requirement: &id008 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version 
         segments: 
         - 0
         - 2
-        - 4
-        version: 0.2.4
+        - 6
+        version: 0.2.6
   type: :runtime
   version_requirements: *id008
 - !ruby/object:Gem::Dependency 
@@ -143,13 +143,13 @@ dependencies:
   requirement: &id009 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
         segments: 
         - 1
-        - 1
         - 2
-        version: 1.1.2
+        - 0
+        version: 1.2.0
   type: :runtime
   version_requirements: *id009
 - !ruby/object:Gem::Dependency 
@@ -178,8 +178,7 @@ dependencies:
         segments: 
         - 3
         - 0
-        - 0
-        version: 3.0.0
+        version: "3.0"
   type: :runtime
   version_requirements: *id011
 - !ruby/object:Gem::Dependency 
@@ -192,9 +191,9 @@ dependencies:
       - !ruby/object:Gem::Version 
         segments: 
         - 0
-        - 2
-        - 8
-        version: 0.2.8
+        - 3
+        - 0
+        version: 0.3.0
   type: :runtime
   version_requirements: *id012
 - !ruby/object:Gem::Dependency 
@@ -208,8 +207,8 @@ dependencies:
         segments: 
         - 0
         - 1
-        - 3
-        version: 0.1.3
+        - 6
+        version: 0.1.6
   type: :runtime
   version_requirements: *id013
 - !ruby/object:Gem::Dependency 
@@ -218,13 +217,13 @@ dependencies:
   requirement: &id014 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version 
         segments: 
         - 0
         - 3
-        - 6
-        version: 0.3.6
+        - 14
+        version: 0.3.14
   type: :runtime
   version_requirements: *id014
 - !ruby/object:Gem::Dependency 
@@ -237,9 +236,9 @@ dependencies:
       - !ruby/object:Gem::Version 
         segments: 
         - 0
-        - 2
-        - 11
-        version: 0.2.11
+        - 3
+        - 0
+        version: 0.3.0
   type: :runtime
   version_requirements: *id015
 description: Provides assistance for setting up Session, Role and Permission systems for a Rails 3 app. Support for multiple ORMs