role_model 0.7.0 → 0.7.1

data/.travis.yml

@@ -0,0 +1,7 @@
+rvm:
+  - 1.8.7
+  - 1.9.2
+  - jruby
+notifications:
+  recipients:
+      - martin.rehfeld@glnetworks.de

data/Gemfile

@@ -3,5 +3,6 @@ source 'http://rubygems.org'
 group :development do
   gem 'jeweler',       '>=1.5.2'
   gem 'rspec',         '~> 2'
+  gem 'rdoc',          '>=2.4.2'
   gem 'autotest'
 end

data/Rakefile

@@ -40,8 +40,8 @@ end
 
 task :default => :spec
 
-require 'rake/rdoctask'
-Rake::RDocTask.new do |rdoc|
+require 'rdoc/task'
+RDoc::Task.new do |rdoc|
   version = File.exist?('VERSION') ? File.read('VERSION') : ""
 
   rdoc.rdoc_dir = 'rdoc'

data/VERSION

@@ -1 +1 @@
-0.7.0
+0.7.1

data/lib/role_model/class_methods.rb

@@ -19,15 +19,9 @@ module RoleModel
     end
 
     def mask_for(*roles)
-      (Array[*roles].map {|r|
-        r.respond_to?(:each) ? r.to_a : r
-      }.flatten.map { |r|
-        r.to_sym
-      } & valid_roles).map { |r|
-        2**valid_roles.index(r)
-      }.inject { |sum, bitvalue|
-        sum + bitvalue
-      } || 0
+      sanitized_roles = roles.map { |role| Array(role) }.flatten.map(&:to_sym)
+
+      (valid_roles & sanitized_roles).inject(0) { |sum, role| sum + 2**valid_roles.index(role) }
     end
     
     protected
@@ -40,7 +34,7 @@ module RoleModel
     #
     # declare valid roles
     def roles(*roles)
-      self.valid_roles = Array[*roles].flatten.map { |r| r.to_sym }
+      self.valid_roles = roles.flatten.map(&:to_sym)
     end
   end
 end

data/lib/role_model/implementation.rb

@@ -20,10 +20,10 @@ module RoleModel
     #   has_all_roles?([:role_1, ..., :role_n])
     #   has_all_roles?(['role_1', ..., 'role_n'])
     #
-    # check if ALL of the given roles have been assigned 
+    # check if ALL of the given roles have been assigned
     # this method is aliased as #is? and #has_roles?
     def has_all_roles?(*roles)
-      roles.flatten.map { |r| r.to_sym }.all? { |r| self.roles.include?(r) }
+      roles.flatten.map(&:to_sym).all? { |r| self.roles.include?(r) }
     end
     alias_method :is?, :has_all_roles?
     alias_method :has_roles?, :has_all_roles?
@@ -39,7 +39,7 @@ module RoleModel
     # check if any (at least ONE) of the given roles have been assigned
     # this method is aliased as #is_any_of? and #has_role?
     def has_any_role?(*roles)
-      roles.flatten.map { |r| r.to_sym }.any? { |r| self.roles.include?(r) }
+      roles.flatten.map(&:to_sym).any? { |r| self.roles.include?(r) }
     end
     alias_method :is_any_of?, :has_any_role?
     alias_method :has_role?, :has_any_role?

data/role_model.gemspec

@@ -4,14 +4,14 @@
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
-  s.name = %q{role_model}
-  s.version = "0.7.0"
+  s.name = "role_model"
+  s.version = "0.7.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Martin Rehfeld"]
-  s.date = %q{2011-05-01}
-  s.description = %q{Ever needed to assign roles to a model, say a User, and build conditional behaviour on top of that? Enter RoleModel -- roles have never been easier! Just declare your roles and you are done. Assigned roles will be stored as a bitmask.}
-  s.email = %q{martin.rehfeld@glnetworks.de}
+  s.date = "2012-05-13"
+  s.description = "Ever needed to assign roles to a model, say a User, and build conditional behaviour on top of that? Enter RoleModel -- roles have never been easier! Just declare your roles and you are done. Assigned roles will be stored as a bitmask."
+  s.email = "martin.rehfeld@glnetworks.de"
   s.extra_rdoc_files = [
     "LICENSE",
     "README.rdoc"
@@ -19,8 +19,8 @@ Gem::Specification.new do |s|
   s.files = [
     ".document",
     ".rspec",
+    ".travis.yml",
     "Gemfile",
-    "Gemfile.lock",
     "LICENSE",
     "README.rdoc",
     "Rakefile",
@@ -36,18 +36,11 @@ Gem::Specification.new do |s|
     "spec/roles_spec.rb",
     "spec/spec_helper.rb"
   ]
-  s.homepage = %q{http://github.com/martinrehfeld/role_model}
+  s.homepage = "http://github.com/martinrehfeld/role_model"
   s.licenses = ["MIT"]
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.7.2}
-  s.summary = %q{Declare, assign and query roles with ease}
-  s.test_files = [
-    "spec/custom_matchers.rb",
-    "spec/custom_matchers_spec.rb",
-    "spec/role_model_spec.rb",
-    "spec/roles_spec.rb",
-    "spec/spec_helper.rb"
-  ]
+  s.rubygems_version = "1.8.23"
+  s.summary = "Declare, assign and query roles with ease"
 
   if s.respond_to? :specification_version then
     s.specification_version = 3
@@ -55,17 +48,20 @@ Gem::Specification.new do |s|
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_development_dependency(%q<jeweler>, [">= 1.5.2"])
       s.add_development_dependency(%q<rspec>, ["~> 2"])
+      s.add_development_dependency(%q<rdoc>, [">= 2.4.2"])
       s.add_development_dependency(%q<autotest>, [">= 0"])
       s.add_development_dependency(%q<rspec>, ["~> 2"])
     else
       s.add_dependency(%q<jeweler>, [">= 1.5.2"])
       s.add_dependency(%q<rspec>, ["~> 2"])
+      s.add_dependency(%q<rdoc>, [">= 2.4.2"])
       s.add_dependency(%q<autotest>, [">= 0"])
       s.add_dependency(%q<rspec>, ["~> 2"])
     end
   else
     s.add_dependency(%q<jeweler>, [">= 1.5.2"])
     s.add_dependency(%q<rspec>, ["~> 2"])
+    s.add_dependency(%q<rdoc>, [">= 2.4.2"])
     s.add_dependency(%q<autotest>, [">= 0"])
     s.add_dependency(%q<rspec>, ["~> 2"])
   end

data/spec/custom_matchers_spec.rb

@@ -2,10 +2,10 @@ require 'spec_helper'
 
 module CustomMatchers
   describe ArrayIncludingMatcher do
-  
+
     it "should describe itself properly" do
       ArrayIncludingMatcher.new(:a, :b).description.should == "array_including(:a, :b)"
-    end      
+    end
 
     describe "passing" do
       it "should match the same array" do
@@ -15,7 +15,7 @@ module CustomMatchers
       it "should match a array with extra stuff" do
         array_including(:a).should == [:a, :b]
       end
-    
+
       it "should match a array regardless of element position" do
         array_including(:a, :b).should == [:b, :a]
       end
@@ -38,7 +38,7 @@ module CustomMatchers
         end
       end
     end
-  
+
     describe "failing" do
       it "should not match a non-array" do
         array_including(:a).should_not == :a
@@ -47,7 +47,7 @@ module CustomMatchers
       it "should not match a array with a missing element" do
         array_including(:a).should_not == [:b]
       end
-    
+
       it "should not match an empty array with a given key" do
         array_including(:a).should_not == []
       end

data/spec/role_model_spec.rb

@@ -39,6 +39,10 @@ describe RoleModel do
       subject.roles.should_not include(:baz)
     end
 
+    it "should accept an argument list with roles" do
+
+    end
+
     it "should define the bitvalue of each role by position" do
       subject.roles = :foo
       subject.roles_mask.should == 1
@@ -212,7 +216,7 @@ describe RoleModel do
         subject.should have(2).roles
       end
     end
-    
+
     context "without roles assigned" do
       it "should have 0 roles if a role is given as a symbol" do
         subject.roles.delete(:foo)
@@ -335,9 +339,9 @@ describe RoleModel do
   context "query for roles when none defined in model" do
     [:has_any_role?, :is_any_of?, :has_role?, :has_all_roles?, :is?, :has_roles?].each do |check_role_assignment_method|
       describe "##{check_role_assignment_method}" do
-        
+
         let(:model_class_without_roles) { Class.new }
-        
+
         before(:each) do
           model_class_without_roles.instance_eval do
             attr_accessor :roles_mask
@@ -345,8 +349,8 @@ describe RoleModel do
             include RoleModel
           end
         end
-        
-        
+
+
         subject { model_class_without_roles.new }
 
         it "should return false when a role was assigned" do
@@ -363,9 +367,9 @@ describe RoleModel do
   end
 
   context "ClassMethods" do
-    
+
     subject { model_class }
-    
+
     describe ".roles" do
       it "should not allow public access to set roles" do
         lambda do
@@ -373,14 +377,14 @@ describe RoleModel do
         end.should raise_exception(NoMethodError, /protected method.*roles.*called/)
       end
     end
-    
+
   end
 
   context "inheritance" do
     let(:superclass_instance) {  model_class.new }
     let(:inherited_model_class) { Class.new(model_class) }
     subject { inherited_model_class.new }
-    
+
     it "should not allow public access to set roles" do
       lambda do
         inherited_model_class.roles :foo, :quux

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: role_model
 version: !ruby/object:Gem::Version 
-  hash: 3
+  hash: 1
   prerelease: 
   segments: 
   - 0
   - 7
-  - 0
-  version: 0.7.0
+  - 1
+  version: 0.7.1
 platform: ruby
 authors: 
 - Martin Rehfeld
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-05-01 00:00:00 Z
+date: 2012-05-13 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   requirement: &id001 !ruby/object:Gem::Requirement 
@@ -49,6 +49,22 @@ dependencies:
   type: :development
 - !ruby/object:Gem::Dependency 
   requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 27
+        segments: 
+        - 2
+        - 4
+        - 2
+        version: 2.4.2
+  version_requirements: *id003
+  name: rdoc
+  prerelease: false
+  type: :development
+- !ruby/object:Gem::Dependency 
+  requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -57,12 +73,12 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  version_requirements: *id003
+  version_requirements: *id004
   name: autotest
   prerelease: false
   type: :development
 - !ruby/object:Gem::Dependency 
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -71,7 +87,7 @@ dependencies:
         segments: 
         - 2
         version: "2"
-  version_requirements: *id004
+  version_requirements: *id005
   name: rspec
   prerelease: false
   type: :development
@@ -87,8 +103,8 @@ extra_rdoc_files:
 files: 
 - .document
 - .rspec
+- .travis.yml
 - Gemfile
-- Gemfile.lock
 - LICENSE
 - README.rdoc
 - Rakefile
@@ -132,13 +148,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.7.2
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: Declare, assign and query roles with ease
-test_files: 
-- spec/custom_matchers.rb
-- spec/custom_matchers_spec.rb
-- spec/role_model_spec.rb
-- spec/roles_spec.rb
-- spec/spec_helper.rb
+test_files: []
+

data/Gemfile.lock

@@ -1,29 +0,0 @@
-GEM
-  remote: http://rubygems.org/
-  specs:
-    ZenTest (4.5.0)
-    autotest (4.4.6)
-      ZenTest (>= 4.4.1)
-    diff-lcs (1.1.2)
-    git (1.2.5)
-    jeweler (1.5.2)
-      bundler (~> 1.0.0)
-      git (>= 1.2.5)
-      rake
-    rake (0.8.7)
-    rspec (2.5.0)
-      rspec-core (~> 2.5.0)
-      rspec-expectations (~> 2.5.0)
-      rspec-mocks (~> 2.5.0)
-    rspec-core (2.5.1)
-    rspec-expectations (2.5.0)
-      diff-lcs (~> 1.1.2)
-    rspec-mocks (2.5.0)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  autotest
-  jeweler (>= 1.5.2)
-  rspec (~> 2)