role_model 0.3.0 → 0.3.1

data/README.rdoc

@@ -32,7 +32,7 @@ Assigned roles will be stored as a bitmask in an configurable attribute
   => #<User ...>
 
   # role assignment
-  >> u.roles = [:admin] # ['admin'] works as well
+  >> u.roles = [:admin]  # ['admin'] works as well
   => [:admin]
 
   # adding roles
@@ -48,7 +48,7 @@ Assigned roles will be stored as a bitmask in an configurable attribute
   # ... check for individual roles
   >> u.has_role? :author
   => false
-  >> u.has_role? :admin
+  >> u.is_a? :admin  # has_role? is aliased as is_a?
   => true
 
   # see the internal bitmask representation (3 = 0b0011)

data/VERSION

@@ -1 +1 @@
-0.3.0
+0.3.1

data/lib/role_model/roles.rb

@@ -1,5 +1,7 @@
+require 'set'
+
 module RoleModel
-  class Roles < Array
+  class Roles < ::Set
     attr_reader :model_instance
 
     def initialize(sender, *roles)
@@ -8,7 +10,8 @@ module RoleModel
     end
 
     def <<(role)
-      model_instance.roles = super
+      model_instance.roles = super.to_a
+      self
     end
   end
 end

data/lib/role_model.rb

@@ -28,6 +28,7 @@ module RoleModel
     def has_role?(role)
       roles.include?(role.to_sym)
     end
+    alias is_a? has_role?
   end
 
   module ClassMethods

data/role_model.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{role_model}
-  s.version = "0.3.0"
+  s.version = "0.3.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Martin Rehfeld"]
@@ -26,6 +26,7 @@ Gem::Specification.new do |s|
      "lib/role_model.rb",
      "lib/role_model/roles.rb",
      "role_model.gemspec",
+     "spec/custom_matchers.rb",
      "spec/role_model_spec.rb",
      "spec/roles_spec.rb",
      "spec/spec.opts",
@@ -37,7 +38,8 @@ Gem::Specification.new do |s|
   s.rubygems_version = %q{1.3.6}
   s.summary = %q{Declare, assign and query roles with ease}
   s.test_files = [
-    "spec/role_model_spec.rb",
+    "spec/custom_matchers.rb",
+     "spec/role_model_spec.rb",
      "spec/roles_spec.rb",
      "spec/spec_helper.rb"
   ]

data/spec/custom_matchers.rb

@@ -0,0 +1,24 @@
+module CustomMatchers
+  class ArrayIncludingMatcher
+    def initialize(*expected)
+      @expected = Array[*expected]
+    end
+
+    def ==(actual)
+      @expected.each do | value |
+        return false unless actual.include?(value)
+      end
+      true
+    rescue NoMethodError => ex
+      return false
+    end
+
+    def description
+      "array_including(#{@expected.inspect.sub(/^\[/,"").sub(/\]$/,"")})"
+    end
+  end
+
+  def array_including(*args)
+    ArrayIncludingMatcher.new(*args)  
+  end
+end

data/spec/role_model_spec.rb

@@ -148,6 +148,10 @@ describe RoleModel do
         subject.roles.should include(:foo, :bar, :third)
         subject.should have(3).roles
       end
+
+      it "should not show a role twice in the return value" do
+        (subject.roles << :foo).should have(2).roles
+      end
     end
 
     context "without any previouly assigned roles" do
@@ -168,34 +172,36 @@ describe RoleModel do
         subject.roles.should include(:foo, :bar)
         subject.should have(2).roles
       end
-    end
 
-    it "should silently ignore undefined roles" do
-      subject.roles << :baz
-      subject.roles.should be_empty
+      it "should silently ignore undefined roles" do
+        subject.roles << :baz
+        subject.roles.should be_empty
+      end
     end
   end
 
-  describe "#has_role?" do
-    subject { model_class.new }
+  [:has_role?, :is_a?].each do |check_role_assignment_method|
+    describe "##{check_role_assignment_method}" do
+      subject { model_class.new }
 
-    it "should return true when the given role was assigned" do
-      subject.roles = :foo
-      subject.should have_role(:foo)
-    end
+      it "should return true when the given role was assigned" do
+        subject.roles = :foo
+        subject.send(check_role_assignment_method, :foo).should be_true
+      end
 
-    it "should return false when the given role was not assigned" do
-      subject.roles = :bar
-      subject.should_not have_role(:foo)
-    end
+      it "should return false when the given role was not assigned" do
+        subject.roles = :bar
+        subject.send(check_role_assignment_method, :foo).should be_false
+      end
 
-    it "should return false when no role was assigned" do
-      subject.should_not have_role(:foo)
-      subject.should_not have_role(:bar)
-    end
+      it "should return false when no role was assigned" do
+        subject.send(check_role_assignment_method, :foo).should be_false
+        subject.send(check_role_assignment_method, :bar).should be_false
+      end
 
-    it "should return false when asked for an undefined role" do
-      subject.should_not have_role(:baz)
+      it "should return false when asked for an undefined role" do
+        subject.send(check_role_assignment_method, :baz).should be_false
+      end
     end
   end
 

data/spec/roles_spec.rb

@@ -6,15 +6,13 @@ describe RoleModel::Roles do
   let(:array) { [:foo, :bar] }
   subject { RoleModel::Roles.new(model_instance, array) }
 
-  its(:model_instance) { should == model_instance }
+  its(:model_instance) { should equal(model_instance) }
   it { should include(:foo, :bar) }
-  it { should be_kind_of(Array) }
+  it { should respond_to(:each) }
 
   describe "#<<" do
-    let(:roles_of_model_instance) { [:one, :two] }
-
     it "should add the given element to the model_instance.roles by re-assigning all roles" do
-      model_instance.should_receive(:roles=).with([:foo, :bar, :baz])
+      model_instance.should_receive(:roles=).with(array_including(:foo, :bar, :baz))
       subject << :baz
     end
   end

data/spec/spec_helper.rb

@@ -3,7 +3,8 @@ $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 require 'role_model'
 require 'spec'
 require 'spec/autorun'
+require File.dirname(__FILE__) + "/custom_matchers"
 
 Spec::Runner.configure do |config|
-  
+  config.include(CustomMatchers)
 end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 3
-  - 0
-  version: 0.3.0
+  - 1
+  version: 0.3.1
 platform: ruby
 authors: 
 - Martin Rehfeld
@@ -50,6 +50,7 @@ files:
 - lib/role_model.rb
 - lib/role_model/roles.rb
 - role_model.gemspec
+- spec/custom_matchers.rb
 - spec/role_model_spec.rb
 - spec/roles_spec.rb
 - spec/spec.opts
@@ -85,6 +86,7 @@ signing_key:
 specification_version: 3
 summary: Declare, assign and query roles with ease
 test_files: 
+- spec/custom_matchers.rb
 - spec/role_model_spec.rb
 - spec/roles_spec.rb
 - spec/spec_helper.rb