roles_generic 0.2.7 → 0.3.3

data/lib/roles_generic/rspec/api/write_api.rb

@@ -0,0 +1,50 @@
+class Role
+end
+
+describe 'Roles Generic API : WRITE' do
+  before :each do
+    default_user_setup    
+  end
+  
+  describe '#roles=' do
+    it "should set user role to :admin" do
+      @guest_user.roles = :admin      
+      @guest_user.has_role?(:admin).should be_true      
+      @guest_user.roles = :guest            
+    end    
+  end
+  
+  describe '#exchange_roles' do
+    it "should exchange user role :user with role :admin" do
+      @guest_user.exchange_role :guest, :with => :admin      
+      @guest_user.has?(:guest).should be_false
+      @guest_user.has?(:admin).should be_true
+    end    
+  
+    it "should exchange user role :admin with roles :user and :guest" do
+      case @admin_user.class.role_strategy.multiplicity
+      when :single     
+        lambda { @admin_user.exchange_role :admin, :with => [:user, :guest] }.should raise_error
+      when :multi
+        @admin_user.exchange_role :admin, :with => [:user, :guest]
+        @admin_user.has_role?(:user).should be_true
+        @admin_user.has_role?(:guest).should be_true
+        @admin_user.has?(:admin).should be_false        
+      end
+    end    
+  end 
+  
+  describe '#remove_roles' do
+    it "should remove user role :admin using #remove_roles" do
+      @admin_user.remove_roles :admin
+      @admin_user.has_role?(:admin).should_not be_true
+    end    
+  
+    it "should remove user role :admin using #remove_role" do
+      @guest_user.add_role :admin
+      @guest_user.has_role?(:admin).should be_true
+      @guest_user.remove_role :admin
+      @guest_user.has_role?(:admin).should_not be_true
+    end  
+  end
+end

data/lib/roles_generic/rspec/test_it.rb

@@ -0,0 +1,2 @@
+require "roles_generic/rspec/user_setup"    
+require "roles_generic/rspec/api/full"

data/lib/roles_generic/rspec/user_setup.rb

@@ -0,0 +1,6 @@
+def default_user_setup
+  @admin_user   = User.new 'Admin user',  :admin
+  @normal_user  = User.new 'Normal user', :user, :guest    
+  @guest_user   = User.new 'Guest user',  :guest   
+end
+

data/lib/roles_generic/strategy/multi/many_roles.rb

@@ -4,26 +4,19 @@ module RoleStrategy::Generic
       :many_roles
     end
 
-    module Implementation      
-      # assign roles
-      def roles=(*_roles)          
-        _roles = get_roles(_roles)
-        return nil if !_roles || _roles.empty?        
-        role_relations = role_class.find_roles(_roles)
-        role_relations.each do |role_relation| 
-          self.send("#{role_attribute}=", role_relation) if role_relation.kind_of?(role_class)
-        end      
-      end
-
-      # query assigned roles
-      def roles
-        self.send(role_attribute)
-      end
+    module Implementation
+      include Roles::Generic::User::Implementation::Multi
+      
+      def new_roles *role_names   
+        role_class.find_roles(extract_roles role_names)        
+      end            
 
-      def roles_list
-        _roles = [roles].flatten.compact
-        return [] if _roles.empty?
-        _roles.map{|r| r.name }.compact
+      def present_roles roles_names
+        roles_names.to_a.map{|role| role.name.to_s.to_sym}        
+      end            
+      
+      def set_empty_roles
+        self.send("#{role_attribute}=", [])
       end
     end
 

data/lib/roles_generic/strategy/multi/role_strings.rb

@@ -5,20 +5,23 @@ module RoleStrategy::Generic
     end    
     
     module Implementation      
-      # assign roles
-      def roles=(*roles)
-        new_roles = roles.flatten.map{|r| r.to_s if valid_role?(r)}.compact
-        self.send("#{role_attribute}=", ::Set.new(new_roles)) if new_roles && new_roles.not.empty?
-      end
-
-      # query assigned roles
-      def roles
-        self.send(role_attribute).map{|r| r.to_sym}
-      end
+      include Roles::Generic::User::Implementation::Multi
       
-      def roles_list     
-        [roles].flatten
+      def new_roles *roles
+        ::Set.new select_valid_roles(roles)
       end      
+
+      def select_valid_roles *roles
+        roles.flat_uniq.select{|role| valid_role? role }.map(&:to_sym)
+      end                 
+      
+      def set_empty_roles
+        self.send("#{role_attribute}=", [])
+      end   
+
+      def present_roles roles_names
+        roles_names.to_a
+      end
     end
 
     extend Roles::Generic::User::Configuration

data/lib/roles_generic/strategy/multi/roles_mask.rb

@@ -5,6 +5,8 @@ module RoleStrategy::Generic
     end
 
     module Implementation 
+      include Roles::Generic::User::Implementation::Multi
+      
       class Roles < ::Set # :nodoc:
         attr_reader :model_instance
 
@@ -16,29 +18,31 @@ module RoleStrategy::Generic
         def <<(role)
           model_instance.roles = super.to_a
           self
-        end
-      end
-
-      # assign roles
-      def roles=(*roles)
-        self.send("#{role_attribute}=", (roles.flatten.map { |r| r.to_sym } & strategy_class.valid_roles).map { |r| calc_index(r) }.inject { |sum, bitvalue| sum + bitvalue })
+        end 
       end
-      alias_method :role=, :roles=
-
-      # query assigned roles
-      def roles
-        strategy_class::Roles.new(self, strategy_class.valid_roles.reject { |r| ((self.send(role_attribute) || 0) & calc_index(r)).zero? })
-      end
-
-      def roles_list
-        roles.to_a
-      end        
 
       protected
 
       def calc_index(r)
         2**strategy_class.valid_roles.index(r)
       end
+
+      def get_roles
+        strategy_class::Roles.new(self, strategy_class.valid_roles.reject { |r| ((get_role || 0) & calc_index(r)).zero? })        
+      end
+      
+      def new_roles *role_names
+        role_names = role_names.flatten.map{ |r| r.to_sym } & strategy_class.valid_roles
+        role_names.map { |r| calc_index(r) }.inject { |sum, bitvalue| sum + bitvalue }
+      end
+
+      def set_empty_roles
+        self.send("#{role_attribute}=", 0)
+      end
+      
+      def present_roles *role_names
+        role_names.to_a.to_symbols
+      end
     end    
     
     extend Roles::Generic::User::Configuration

data/lib/roles_generic/strategy/multi/roles_string.rb

@@ -4,19 +4,22 @@ module RoleStrategy::Generic
       :roles_string
     end
 
-    module Implementation           
-      # assign roles
-      def roles=(*roles)
-        roles_str = roles.flatten.map{|r| r.to_s if valid_role?(r)}.compact.uniq.join(',')
-        self.send("#{role_attribute}=", roles_str) if roles_str && roles_str.not.empty?
-      end 
-      alias_method :role=, :roles=
+    module Implementation
+      include Roles::Generic::User::Implementation::Multi
+      
+      protected
 
-      # query assigned roles
-      def roles
-        self.send(role_attribute).split(',').uniq.map{|r| r.to_sym}
+      def new_roles *roles
+        roles.flatten.map{|r| r.to_s}.join(',')        
+      end
+      
+      def present_roles role_names
+        role_names.split(',').uniq.map{|r| r.to_sym}        
+      end      
+
+      def set_empty_roles
+        self.send("#{role_attribute}=", "")      
       end
-      alias_method :roles_list, :roles
     end
     
     extend Roles::Generic::User::Configuration

data/lib/roles_generic/strategy/single/admin_flag.rb

@@ -3,25 +3,36 @@ module RoleStrategy::Generic
     def self.default_role_attribute
       :admin_flag
     end
+                
+    module Implementation            
+      protected
 
-    module Implementation        
-      # assign roles
-      def roles=(*new_roles)                                 
-        first_role = new_roles.flatten.first
-        self.send("#{role_attribute}=", new_roles.flatten.first.admin?) if valid_role? first_role
+      def new_role role
+        role.admin?
       end
-
-      # query assigned roles
-      def roles
-        role = self.send(role_attribute) ? strategy_class.admin_role_key : strategy_class.default_role_key
-        [role]
+      
+      def new_roles *roles
+        new_role roles.flatten.first
+      end      
+      
+      def get_role
+        self.send(role_attribute) ? strategy_class.admin_role_key : strategy_class.default_role_key
+      end 
+      
+      def present_roles *roles
+        roles.map{|role| role ? :admin : :guest}
       end
-      alias_method :roles_list, :roles
-
+      alias_method :present_role, :present_roles
+      
+      def set_empty_role
+        self.send("#{role_attribute}=", false)
+      end      
     end # Implementation
-    
+
     extend Roles::Generic::User::Configuration
     configure :num => :single
+    
+    include Roles::Generic::User::Implementation::Single    
   end   
 end
 

data/lib/roles_generic/strategy/single/one_role.rb

@@ -4,27 +4,26 @@ module RoleStrategy::Generic
       :one_role
     end
 
-    module Implementation       
-      # assign roles
-      def roles=(*_roles)      
-        _roles = get_roles(_roles)
-        return nil if !_roles || _roles.empty?        
+    module Implementation      
+      include Roles::Generic::User::Implementation::Single
+      
+      protected
 
-        first_role = _roles.flatten.first
-        role_relation = role_class.find_role(first_role)
-        if role_relation && role_relation.kind_of?(role_class)
-          self.send("#{role_attribute}=", role_relation)
-        end        
-      end
+      def new_role role
+        role_class.find_role(role)        
+      end  
       
-      # query assigned roles
-      def roles
-        [self.send(role_attribute).name.to_sym]
-      end
+      def new_roles *roles
+        new_role roles.flatten.first
+      end     
       
-      def roles_list
-        self.roles.to_a
-      end      
+      def present_roles *roles
+        roles.map{|role| extract_role role}
+      end                 
+      
+      def set_empty_role
+        self.send("#{role_attribute}=", nil)
+      end
     end
 
     extend Roles::Generic::User::Configuration
@@ -33,5 +32,7 @@ module RoleStrategy::Generic
     def self.included(base)
       base.extend Roles::Generic::Role::ClassMethods
     end      
+    
+    include Roles::Generic::User::Implementation::Single
   end  
 end

data/lib/roles_generic/strategy/single/role_string.rb

@@ -5,20 +5,25 @@ module RoleStrategy::Generic
     end
     
     module Implementation
-      # assign roles
-      def roles=(*roles)
-        first_role = roles.flatten.first.to_s                                    
-        if valid_role? first_role
-          self.send("#{role_attribute}=", first_role) 
-        end
+      include Roles::Generic::User::Implementation::Single
+      
+      def new_role role
+        role.to_s
       end
-      alias_method :role=, :roles=
 
-      # query assigned roles
-      def roles
-        [self.send(role_attribute).to_sym]
+      def new_roles *roles
+        new_role roles.flatten.first
       end
-      alias_method :roles_list, :roles
+      
+      def present_role role
+        role.split(',').map(&:to_sym)
+      end
+
+      def set_empty_role
+        self.send("#{role_attribute}=", "")
+      end
+
+      alias_method :present_roles, :present_role
     end
 
     extend Roles::Generic::User::Configuration

data/lib/roles_generic.rb

@@ -1,6 +1,7 @@
 require 'require_all'
 require 'active_support/inflector'
 require 'sugar-high/not'
+require 'sugar-high/array'
 require 'set'
 require 'roles_generic/namespaces'
 require 'roles_generic/base'

data/roles_generic.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{roles_generic}
-  s.version = "0.2.7"
+  s.version = "0.3.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Kristian Mandrup"]
-  s.date = %q{2010-09-23}
+  s.date = %q{2010-11-20}
   s.description = %q{Generic role strategies sharing the same API. Easy to insert in any model}
   s.email = %q{kmandrup@gmail.com}
   s.extra_rdoc_files = [
@@ -24,18 +24,29 @@ Gem::Specification.new do |s|
      "README.markdown",
      "Rakefile",
      "VERSION",
-     "lib/generators/roles_model/roles/roles_generator.rb",
+     "lib/generators/roles_generic/roles/roles_generator.rb",
      "lib/roles_generic.rb",
      "lib/roles_generic/admin.rb",
      "lib/roles_generic/base.rb",
      "lib/roles_generic/generic.rb",
      "lib/roles_generic/generic/role.rb",
+     "lib/roles_generic/generic/role_util.rb",
      "lib/roles_generic/generic/user.rb",
      "lib/roles_generic/generic/user/class_methods.rb",
      "lib/roles_generic/generic/user/configuration.rb",
      "lib/roles_generic/generic/user/implementation.rb",
+     "lib/roles_generic/generic/user/multi_impl.rb",
+     "lib/roles_generic/generic/user/single_impl.rb",
      "lib/roles_generic/namespaces.rb",
      "lib/roles_generic/role.rb",
+     "lib/roles_generic/rspec/api/completeness.rb",
+     "lib/roles_generic/rspec/api/full.rb",
+     "lib/roles_generic/rspec/api/read_api.rb",
+     "lib/roles_generic/rspec/api/simple_check.rb",
+     "lib/roles_generic/rspec/api/user_class_api.rb",
+     "lib/roles_generic/rspec/api/write_api.rb",
+     "lib/roles_generic/rspec/test_it.rb",
+     "lib/roles_generic/rspec/user_setup.rb",
      "lib/roles_generic/strategy.rb",
      "lib/roles_generic/strategy/multi/many_roles.rb",
      "lib/roles_generic/strategy/multi/role_strings.rb",
@@ -46,20 +57,20 @@ Gem::Specification.new do |s|
      "lib/roles_generic/strategy/single/role_string.rb",
      "roles_generic.gemspec",
      "spec/generator_spec_helper.rb",
-     "spec/generators/admin_flag_generator_spec.rb",
-     "spec/generators/many_roles_generator_spec.rb",
-     "spec/generators/one_role_generator_spec.rb",
-     "spec/generators/role_string_generator_spec.rb",
-     "spec/generators/role_strings_generator_spec.rb",
-     "spec/generators/roles_mask_generator_spec.rb",
-     "spec/generators/roles_string_generator_spec.rb",
-     "spec/roles_generic/admin_flag_spec.rb",
-     "spec/roles_generic/many_roles_spec.rb",
-     "spec/roles_generic/one_role_spec.rb",
-     "spec/roles_generic/role_string_spec.rb",
-     "spec/roles_generic/role_strings_spec.rb",
-     "spec/roles_generic/roles_mask_spec.rb",
-     "spec/roles_generic/roles_string_spec.rb",
+     "spec/roles_generic/generators/admin_flag_generator_spec.rb",
+     "spec/roles_generic/generators/many_roles_generator_spec.rb",
+     "spec/roles_generic/generators/one_role_generator_spec.rb",
+     "spec/roles_generic/generators/role_string_generator_spec.rb",
+     "spec/roles_generic/generators/role_strings_generator_spec.rb",
+     "spec/roles_generic/generators/roles_mask_generator_spec.rb",
+     "spec/roles_generic/generators/roles_string_generator_spec.rb",
+     "spec/roles_generic/strategy/multi/many_roles_spec.rb",
+     "spec/roles_generic/strategy/multi/role_strings_spec.rb",
+     "spec/roles_generic/strategy/multi/roles_mask_spec.rb",
+     "spec/roles_generic/strategy/multi/roles_string_spec.rb",
+     "spec/roles_generic/strategy/single/admin_flag_spec.rb",
+     "spec/roles_generic/strategy/single/one_role_spec.rb",
+     "spec/roles_generic/strategy/single/role_string_spec.rb",
      "spec/spec_helper.rb",
      "wiki/strategies/admin_flag.textile",
      "wiki/strategies/many_roles.textile",
@@ -76,20 +87,20 @@ Gem::Specification.new do |s|
   s.summary = %q{Generic role strategies sharing the same API}
   s.test_files = [
     "spec/generator_spec_helper.rb",
-     "spec/generators/admin_flag_generator_spec.rb",
-     "spec/generators/many_roles_generator_spec.rb",
-     "spec/generators/one_role_generator_spec.rb",
-     "spec/generators/role_string_generator_spec.rb",
-     "spec/generators/role_strings_generator_spec.rb",
-     "spec/generators/roles_mask_generator_spec.rb",
-     "spec/generators/roles_string_generator_spec.rb",
-     "spec/roles_generic/admin_flag_spec.rb",
-     "spec/roles_generic/many_roles_spec.rb",
-     "spec/roles_generic/one_role_spec.rb",
-     "spec/roles_generic/role_string_spec.rb",
-     "spec/roles_generic/role_strings_spec.rb",
-     "spec/roles_generic/roles_mask_spec.rb",
-     "spec/roles_generic/roles_string_spec.rb",
+     "spec/roles_generic/generators/admin_flag_generator_spec.rb",
+     "spec/roles_generic/generators/many_roles_generator_spec.rb",
+     "spec/roles_generic/generators/one_role_generator_spec.rb",
+     "spec/roles_generic/generators/role_string_generator_spec.rb",
+     "spec/roles_generic/generators/role_strings_generator_spec.rb",
+     "spec/roles_generic/generators/roles_mask_generator_spec.rb",
+     "spec/roles_generic/generators/roles_string_generator_spec.rb",
+     "spec/roles_generic/strategy/multi/many_roles_spec.rb",
+     "spec/roles_generic/strategy/multi/role_strings_spec.rb",
+     "spec/roles_generic/strategy/multi/roles_mask_spec.rb",
+     "spec/roles_generic/strategy/multi/roles_string_spec.rb",
+     "spec/roles_generic/strategy/single/admin_flag_spec.rb",
+     "spec/roles_generic/strategy/single/one_role_spec.rb",
+     "spec/roles_generic/strategy/single/role_string_spec.rb",
      "spec/spec_helper.rb"
   ]
 
@@ -98,27 +109,30 @@ 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.0.0.beta.22"])
-      s.add_development_dependency(%q<generator-spec>, ["~> 0.6.5"])
+      s.add_development_dependency(%q<rspec>, [">= 2.0.0"])
+      s.add_development_dependency(%q<generator-spec>, [">= 0.7"])
       s.add_runtime_dependency(%q<require_all>, ["~> 1.2.0"])
-      s.add_runtime_dependency(%q<activesupport>, ["~> 3.0.0"])
-      s.add_runtime_dependency(%q<sugar-high>, ["~> 0.2.10"])
-      s.add_runtime_dependency(%q<rails3_artifactor>, ["~> 0.2.5"])
+      s.add_runtime_dependency(%q<activesupport>, [">= 3.0"])
+      s.add_runtime_dependency(%q<sugar-high>, ["~> 0.3.0"])
+      s.add_runtime_dependency(%q<rails3_artifactor>, ["~> 0.3.1"])
+      s.add_runtime_dependency(%q<logging_assist>, [">= 0.1.6"])
     else
-      s.add_dependency(%q<rspec>, ["~> 2.0.0.beta.22"])
-      s.add_dependency(%q<generator-spec>, ["~> 0.6.5"])
+      s.add_dependency(%q<rspec>, [">= 2.0.0"])
+      s.add_dependency(%q<generator-spec>, [">= 0.7"])
       s.add_dependency(%q<require_all>, ["~> 1.2.0"])
-      s.add_dependency(%q<activesupport>, ["~> 3.0.0"])
-      s.add_dependency(%q<sugar-high>, ["~> 0.2.10"])
-      s.add_dependency(%q<rails3_artifactor>, ["~> 0.2.5"])
+      s.add_dependency(%q<activesupport>, [">= 3.0"])
+      s.add_dependency(%q<sugar-high>, ["~> 0.3.0"])
+      s.add_dependency(%q<rails3_artifactor>, ["~> 0.3.1"])
+      s.add_dependency(%q<logging_assist>, [">= 0.1.6"])
     end
   else
-    s.add_dependency(%q<rspec>, ["~> 2.0.0.beta.22"])
-    s.add_dependency(%q<generator-spec>, ["~> 0.6.5"])
+    s.add_dependency(%q<rspec>, [">= 2.0.0"])
+    s.add_dependency(%q<generator-spec>, [">= 0.7"])
     s.add_dependency(%q<require_all>, ["~> 1.2.0"])
-    s.add_dependency(%q<activesupport>, ["~> 3.0.0"])
-    s.add_dependency(%q<sugar-high>, ["~> 0.2.10"])
-    s.add_dependency(%q<rails3_artifactor>, ["~> 0.2.5"])
+    s.add_dependency(%q<activesupport>, [">= 3.0"])
+    s.add_dependency(%q<sugar-high>, ["~> 0.3.0"])
+    s.add_dependency(%q<rails3_artifactor>, ["~> 0.3.1"])
+    s.add_dependency(%q<logging_assist>, [">= 0.1.6"])
   end
 end
 

data/spec/generator_spec_helper.rb

@@ -1,5 +1,5 @@
 require 'rspec/core'
-require 'generator_spec'
+require 'generator-spec'
 require 'roles_generic'
 
 RSpec::Generator.configure do |config|

data/spec/{generators → roles_generic/generators}/admin_flag_generator_spec.rb

@@ -31,9 +31,8 @@ describe 'role strategy generator: admin_flag' do
         g.run_generator arguments.args
         g.should generate_model :user do |clazz|
           clazz.should include_module 'Roles::Generic'
-          puts "clazz: #{clazz}"        
-          clazz.should have_call :roles, :args => ':admin, :user'
-          clazz.should have_call :role_strategy, :args => ":#{strategy}"        
+          clazz.should have_call :valid_roles_are, :args => ':admin, :user'
+          clazz.should have_call :strategy, :args => ":#{strategy}"        
         end
       end
     end

data/spec/{generators → roles_generic/generators}/many_roles_generator_spec.rb

@@ -28,8 +28,9 @@ describe 'helper_generator' do
       g.run_generator arguments.args
       g.should generate_model :user do |clazz|
         clazz.should include_module 'RoleModels::Generic'
-        clazz.should have_call :roles, :args => ':admin, :user'
-        clazz.should have_call :role_strategy, :args => ":#{strategy}"        
+        clazz.should have_call :valid_roles_are, :args => ':admin, :user'
+        clazz.should have_call :role_class, :args => ':role'        
+        clazz.should have_call :strategy, :args => ":#{strategy}"        
       end
     end
   end

data/spec/{generators → roles_generic/generators}/one_role_generator_spec.rb

@@ -28,8 +28,9 @@ describe 'helper_generator' do
       g.run_generator arguments.args
       g.should generate_model :user do |clazz|
         clazz.should include_module 'RoleModels::Generic'
-        clazz.should have_call :roles, :args => ':admin, :user'
-        clazz.should have_call :role_strategy, :args => ":#{strategy}"        
+        clazz.should have_call :role_class, :args => ':role'
+        clazz.should have_call :valid_roles_are, :args => ':admin, :user'
+        clazz.should have_call :strategy, :args => ":#{strategy}"        
       end
     end
   end

data/spec/{generators → roles_generic/generators}/role_string_generator_spec.rb

@@ -28,8 +28,8 @@ describe 'helper_generator' do
       g.run_generator arguments.args
       g.should generate_model :user do |clazz|
         clazz.should include_module 'RoleModels::Generic'
-        clazz.should have_call :roles, :args => ':admin, :user'
-        clazz.should have_call :role_strategy, :args => ":#{strategy}"        
+        clazz.should have_call :valid_roles_are, :args => ':admin, :user'
+        clazz.should have_call :strategy, :args => ":#{strategy}"        
       end
     end
   end

data/spec/{generators → roles_generic/generators}/role_strings_generator_spec.rb

@@ -28,8 +28,8 @@ describe 'helper_generator' do
       g.run_generator arguments.args
       g.should generate_model :user do |clazz|
         clazz.should include_module 'RoleModels::Generic'
-        clazz.should have_call :roles, :args => ':admin, :user'
-        clazz.should have_call :role_strategy, :args => ":#{strategy}"        
+        clazz.should have_call :valid_roles_are, :args => ':admin, :user'
+        clazz.should have_call :strategy, :args => ":#{strategy}"        
       end
     end
   end

data/spec/{generators → roles_generic/generators}/roles_mask_generator_spec.rb

@@ -28,8 +28,8 @@ describe 'helper_generator' do
       g.run_generator arguments.args
       g.should generate_model :user do |clazz|
         clazz.should include_module 'RoleModels::Generic'
-        clazz.should have_call :roles, :args => ':admin, :user'
-        clazz.should have_call :role_strategy, :args => ":#{strategy}"        
+        clazz.should have_call :valid_roles_are, :args => ':admin, :user'
+        clazz.should have_call :strategy, :args => ":#{strategy}"        
       end
     end
   end

data/spec/{generators → roles_generic/generators}/roles_string_generator_spec.rb

@@ -28,8 +28,8 @@ describe 'helper_generator' do
       g.run_generator arguments.args
       g.should generate_model :user do |clazz|
         clazz.should include_module 'RoleModels::Generic'
-        clazz.should have_call :roles, :args => ':admin, :user'
-        clazz.should have_call :role_strategy, :args => ":#{strategy}"        
+        clazz.should have_call :valid_roles_are, :args => ':admin, :user'
+        clazz.should have_call :strategy, :args => ":#{strategy}"        
       end
     end
   end