cream 0.8.4 → 0.8.5

data/VERSION

@@ -1 +1 @@
-0.8.4
+0.8.5

data/cream.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{cream}
-  s.version = "0.8.4"
+  s.version = "0.8.5"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Kristian Mandrup"]
-  s.date = %q{2011-01-02}
+  s.date = %q{2011-01-03}
   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/roles/config/config_generator.rb

@@ -19,6 +19,10 @@ module Roles
       
       def configure_roles
       	logger.add_logfile :logfile => logfile if logfile
+
+        # make the artifactor model methods behave according to selected orm! - this is a macro
+      	self.class.use_orm :"#{orm}"
+
         roles_gems if gems?
         create_roles
         use_roles_strategy
@@ -93,7 +97,7 @@ module Roles
         if initializer_file? :cream
           if read_model(:user) =~ /valid_roles_are/
             replace_in_model :user, :where => /valid_roles_are\s+[(.*)]/, :with => 'valid_roles_are Cream.roles'
-          else
+          else            
             insert_into_model :user do
               "valid_roles_are Cream::Role.available"
             end
@@ -108,11 +112,11 @@ module Roles
       end
 
       def use_roles_strategy
-        user_exist?        
+        # user_exist?        
         
-        unless read_model(:user) =~ /use_roles_strategy/
-          inject_into_file model_file(:user), "use_roles_strategy :#{strategy}\n\n", :before => "class"
-        end        
+        # unless read_model(:user) =~ /use_roles_strategy/
+        #   inject_into_file model_file(:user), "use_roles_strategy :#{strategy}\n\n", :before => "class"
+        # end        
       end
 
       def default_roles

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 8
-  - 4
-  version: 0.8.4
+  - 5
+  version: 0.8.5
 platform: ruby
 authors: 
 - Kristian Mandrup
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-01-02 00:00:00 +01:00
+date: 2011-01-03 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency