role_model 0.8.0 → 0.8.1

data/README.rdoc

@@ -52,7 +52,7 @@ It works like this:
   => [:admin, :manager, :author]
   
   # ... retrieve all assigned roles
-  >> u.roles # aliased to role_symbols for DeclarativeAuthorization
+  >> u.roles # also: u.role_symbols for DeclarativeAuthorization compatibility
   => [:admin, :manager]
   
   # ... check for individual roles

data/VERSION

@@ -1 +1 @@
-0.8.0
+0.8.1

data/lib/role_model/implementation.rb

@@ -10,7 +10,12 @@ module RoleModel
     def roles
       Roles.new(self, self.class.valid_roles.reject { |r| ((self.send(self.class.roles_attribute_name) || 0) & 2**self.class.valid_roles.index(r)).zero? })
     end
-    alias_method :role_symbols, :roles
+
+    # query assigned roles returning an Array for the
+    # declarative_authorization gem
+    def role_symbols
+      roles.to_a
+    end
 
     # :call-seq:
     #   has_all_roles?(:role)

data/role_model.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = "role_model"
-  s.version = "0.8.0"
+  s.version = "0.8.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Martin Rehfeld"]

data/spec/role_model_spec.rb

@@ -53,16 +53,22 @@ describe RoleModel do
 
   [:roles, :role_symbols].each do |role_query_method|
     describe "##{role_query_method}" do
-      subject { model_class.new }
+      let(:model) { model_class.new }
+      subject { model.send(role_query_method) }
 
       it "should return the assigned roles as symbols" do
-        subject.roles = [:foo, :bar]
-        subject.send(role_query_method).should include(:foo, :bar)
-        subject.send(role_query_method).should have(2).elements
+        model.roles = [:foo, :bar]
+        subject.should include(:foo, :bar)
+        subject.should have(2).elements
+      end
+
+      it "should be empty when no roles have been assigned" do
+        subject.should be_empty
       end
 
-      it "should return an empty array when no roles have been assigned" do
-        subject.send(role_query_method).should be_empty
+      if role_query_method == :role_symbols
+        # DeclarativeAuthorization specifically wants an Array
+        it { should be_an(Array) }
       end
     end
   end
@@ -296,10 +302,10 @@ describe RoleModel do
       end
     end
   end
-  
+
   describe "dynamically query for an individual role" do
     subject { model_class.new }
-    
+
     it "should return true when the given role was assigned" do
       subject.roles = :foo
       subject.is_foo?.should be_true
@@ -321,7 +327,7 @@ describe RoleModel do
       lambda { subject.baz? }.should raise_error(NoMethodError)
       lambda { subject.is_baz? }.should raise_error(NoMethodError)
     end
-    
+
     it "should not define dynamic finders when opting out" do
       non_dynamic_klass = Class.new do
         attr_accessor :roles_mask
@@ -329,41 +335,41 @@ describe RoleModel do
         include RoleModel
         roles :foo, :bar, :third, :dynamic => false
       end
-      
+
       model = non_dynamic_klass.new
       lambda { model.is_foo? }.should raise_error(NoMethodError)
       lambda { model.bar? }.should raise_error(NoMethodError)
     end
-    
+
     it "should be able to override the default dynamic query methods and call super" do
       klass = Class.new do
         def bar?
           return false
         end
-        
+
         attr_accessor :roles_mask
         attr_accessor :custom_roles_mask
         include RoleModel
         roles :foo, :bar, :baz
-        
+
         def is_baz?
           return false
         end
-        
+
         def foo?
           ret = super
           !ret
         end
       end
-      
+
       model = klass.new
       model.roles = [:foo, :bar, :baz]
-      
+
       model.foo?.should be_false
-      
+
       model.bar?.should be_false
       model.is_bar?.should be_true
-      
+
       model.is_baz?.should be_false
       model.baz?.should be_true
     end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: role_model
 version: !ruby/object:Gem::Version 
-  hash: 63
+  hash: 61
   prerelease: 
   segments: 
   - 0
   - 8
-  - 0
-  version: 0.8.0
+  - 1
+  version: 0.8.1
 platform: ruby
 authors: 
 - Martin Rehfeld