cream 0.8.2 → 0.8.3

data/VERSION

@@ -1 +1 @@
-0.8.2
+0.8.3

data/cream.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{cream}
-  s.version = "0.8.2"
+  s.version = "0.8.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Kristian Mandrup"]
-  s.date = %q{2010-12-18}
+  s.date = %q{2010-12-20}
   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 = [

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

@@ -86,7 +86,7 @@ module Cream
 
       def run_devise
         # rgen "devise:config --orm #{orm} --no-gems"
-        rgen "devise:config --orm #{orm}"
+        rgen "devise:config --orm #{orm} #{admin_user_option}"
         rgen "devise:users --orm #{orm} #{admin_user_option} --no-gems"
       end
 
@@ -95,11 +95,11 @@ module Cream
       end
 
       def run_roles
-        rgen "roles:config --orm #{orm} --roles #{roles.join(' ')} --strategy #{strategy}"
+        rgen "roles:config --orm #{orm} --roles #{roles_list} --strategy #{strategy}"
       end
 
       def run_permits
-        rgen "permits:config --orm #{orm} --roles #{roles.join(' ')} --no-gems"
+        rgen "permits:config --orm #{orm} --roles #{roles_list} --no-gems"
       end
 
       def admin_user_option
@@ -115,7 +115,7 @@ module Cream
       end
 
       def orm
-        @orm ||= get_orm options[:orm].underscore.to_sym
+        @orm ||= get_orm options[:orm].to_s.underscore.to_sym
       end
 
       def valid_orms
@@ -146,6 +146,10 @@ module Cream
         options[:default_roles]
       end
 
+      def roles_list
+        roles.join(' ')
+      end
+
       def roles         
         defaults = default_roles? ? ['guest', 'admin'] : [] 
         options[:roles] + defaults

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

@@ -10,9 +10,10 @@ module Devise
       desc "Configure Devise"
 
       # ORM to use
-      class_option :orm,     :type => :string,   :default => 'active_record',   :desc => "ORM to use"
-      class_option :logfile, :type => :string,   :default => nil,               :desc => "Logfile location" 
-      class_option :gems,    :type => :boolean,  :default => true,              :desc => "Add gems to gemfile?"       
+      class_option :orm,          :type => :string,   :default => 'active_record',   :desc => "ORM to use"
+      class_option :logfile,      :type => :string,   :default => nil,               :desc => "Logfile location" 
+      class_option :gems,         :type => :boolean,  :default => true,              :desc => "Add gems to gemfile?"
+      class_option :admin_user,   :type => :boolean,  :default => false,             :desc => "Setup for admin user"  
 
       def configure_devise
       	logger.add_logfile :logfile => logfile if logfile	        
@@ -23,7 +24,7 @@ module Devise
     	  end
          
 		    devise_install
-        [:orm, :mailer, :protection].each{|m| send(:"#{m}_configure!", orm) }
+        [:orm, :mailer, :protection, :routes].each{|m| send(:"#{m}_configure!", orm) }
       end
 
       protected
@@ -120,6 +121,22 @@ module Devise
         end
       end 
 
+      def routes_configure!
+        insert_into_routes do
+          "devise_for #{model_routes}"
+        end
+      end
+
+      def admin_user?
+        options[:admin_user]
+      end
+
+      def model_routes
+        return ':users, :admins' if admin_user?
+        ':users'
+      end
+        
+
       def protection_configure! orm
         logger.debug "Configuring: devise authentication filter"
         ## Add Devise protection to Application controller:

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

@@ -22,7 +22,7 @@ module Permits
 		    permits_gems if gems?
 
         # Run permits generator to generate permit for each role
-        rgen "cancan:permits --roles #{roles} --orm #{orm}"
+        rgen "cancan:permits --roles #{roles_list} --orm #{orm}"
         rgen "cancan:licenses"
       end           
 
@@ -55,6 +55,10 @@ module Permits
         options[:roles]
       end
 
+      def roles_list
+        roles.join(' ')
+      end
+
       def orm
         options[:orm]
       end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 8
-  - 2
-  version: 0.8.2
+  - 3
+  version: 0.8.3
 platform: ruby
 authors: 
 - Kristian Mandrup
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-12-18 00:00:00 +01:00
+date: 2010-12-20 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency