role_model 0.8.1 → 0.8.2

checksums.yaml

@@ -0,0 +1,15 @@
+---
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    NGIyYzhiNTFlOTRkZGZjOWQyMTVlM2I0Y2Y0Yjc3ZmU2MzYxY2M4OQ==
+  data.tar.gz: !binary |-
+    MDI3MjlhODc2NzJiNDVmNDZkNWM2MjU1YTc3NTJiZmY0ZTk3ZWY3Mg==
+SHA512:
+  metadata.gz: !binary |-
+    NjgyZDdkNzE3ZDAzMjA0Mjg1YWUxMmFhYTEzZjg2OGQ5Y2NiYjhhOGJlOGUx
+    NDY2YzExNzNlMzIyODVjZTYyMjJkMDFlMDViNDlhMTFjYzRiMzQwOWY3Yzc2
+    OWUzOWYxYjJmY2UwNDVkNmYzMmFjNWYxZjA2YTVhNmU2ZmEzNTU=
+  data.tar.gz: !binary |-
+    YTAxNDA3NGVjNWNjMjcxOTUzM2NmYmNmMTIwNmJlNjRiZGUzNWJiMzA2NDli
+    YTFhZTIxMmNkYTNjYzIwZWQ2NDk0NGNiM2MzOWEzZmYyZjVjOWFkYmQxOTM1
+    ZDRmNjlkYjdmYTIyOWZkYTUyZTYxM2ZjNTJmOWYzM2VhMzI0NzU=

data/.travis.yml

@@ -1,7 +1,8 @@
 rvm:
-  - 1.8.7
   - 1.9.2
   - 1.9.3
+  - 2.0.0
+  - 2.1.1
   - jruby
 notifications:
   recipients:

data/README.rdoc

@@ -2,7 +2,7 @@
 
 RoleModel is the framework agnostic, efficient and declarative way to do
 (user) roles. Assigned roles will be efficiently stored as a bitmask
-directly into your model within an configurable attribute.
+directly into your model within a configurable attribute.
 
 It works like this:
 
@@ -12,7 +12,7 @@ It works like this:
   
   class User
     attr_accessor :roles_mask   # just for demo purposes
-    # in real life this would usuallt be a persistent attribute,
+    # in real life this would usually be a persistent attribute,
     # e.g. if your User model is persisted in a SQL-DB add an integer
     # column named roles_mask to your users table -- just remove/replace
     # above attr_accessor line with whatever is needed for your

data/Rakefile

@@ -23,7 +23,7 @@ Jeweler::Tasks.new do |gem|
   # and development dependencies are only needed for development (ie running rake tasks, tests, etc)
   #  gem.add_runtime_dependency 'jabber4r', '> 0.1'
   #  gem.add_development_dependency 'rspec', '> 1.2.3'
-  gem.add_development_dependency "rspec", "~> 2"
+  # gem.add_development_dependency "rspec", "~> 2"
 end
 Jeweler::RubygemsDotOrgTasks.new
 

data/VERSION

@@ -1 +1 @@
-0.8.1
+0.8.2

data/lib/role_model/class_methods.rb

@@ -23,7 +23,11 @@ module RoleModel
 
       (valid_roles & sanitized_roles).inject(0) { |sum, role| sum + 2**valid_roles.index(role) }
     end
-    
+
+    def roles_from_mask(mask)
+      valid_roles.reject { |role| (mask.to_i & 2**valid_roles.index(role)).zero? }
+    end
+
     protected
 
     # :call-seq:

data/lib/role_model/roles.rb

@@ -14,10 +14,15 @@ module RoleModel
       model_instance.roles = roles if model_instance
       self
     end
+
     alias_method :<<, :add
 
     def delete(role)
-      model_instance.roles = super(role.to_sym)
+      if role.is_a? Array
+        model_instance.roles = subtract(role)
+      else
+        model_instance.roles = super(role.to_sym)
+      end
       self
     end
 

data/role_model.gemspec

@@ -2,14 +2,16 @@
 # DO NOT EDIT THIS FILE DIRECTLY
 # Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
+# stub: role_model 0.8.2 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "role_model"
-  s.version = "0.8.1"
+  s.version = "0.8.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
+  s.require_paths = ["lib"]
   s.authors = ["Martin Rehfeld"]
-  s.date = "2012-10-29"
+  s.date = "2015-02-12"
   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 = [
@@ -38,32 +40,28 @@ Gem::Specification.new do |s|
   ]
   s.homepage = "http://github.com/martinrehfeld/role_model"
   s.licenses = ["MIT"]
-  s.require_paths = ["lib"]
-  s.rubygems_version = "1.8.23"
+  s.rubygems_version = "2.2.2"
   s.summary = "Declare, assign and query roles with ease"
 
   if s.respond_to? :specification_version then
-    s.specification_version = 3
+    s.specification_version = 4
 
     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
 end
 

data/spec/role_model_spec.rb

@@ -51,6 +51,31 @@ describe RoleModel do
     end
   end
 
+  describe '.roles_from_mask(mask)' do
+    subject { model_class.roles_from_mask(mask) }
+
+    before do
+      model_class.instance_eval do
+        include RoleModel
+        roles :foo, :bar, :third
+      end
+    end
+
+    context 'when roles_mask is 0' do
+      let(:mask) { 0 }
+      it 'returns empty set' do
+        subject.should eq  []
+      end
+    end
+
+    context 'when valid roles_mask' do
+      let(:mask) { 3 }
+      it 'returns the list of roles associated with a roles_mask' do
+        subject.should eq  [:foo, :bar]
+      end
+    end
+  end
+
   [:roles, :role_symbols].each do |role_query_method|
     describe "##{role_query_method}" do
       let(:model) { model_class.new }
@@ -216,6 +241,18 @@ describe RoleModel do
         subject.should have(1).roles
       end
 
+      it "should delete existing roles given as an array of symbols" do
+        subject.roles.delete [:foo, :bar]
+        expect(subject.roles).not_to include([:foo, :bar])
+        expect(subject).to have(0).roles
+      end
+
+      it "should delete existing roles given as an array of strings" do
+        subject.roles.delete %w(foo bar)
+        expect(subject.roles).not_to include([:foo, :bar])
+        expect(subject).to have(0).roles
+      end
+
       it "should not change anything if a non existing role is given" do
         subject.roles.delete(:third)
         subject.roles.should include(:foo, :bar)
@@ -487,7 +524,7 @@ describe RoleModel do
   end
 
   context "inheritance" do
-    let(:superclass_instance) {  model_class.new }
+    let(:superclass_instance) { model_class.new }
     let(:inherited_model_class) { Class.new(model_class) }
     subject { inherited_model_class.new }
 
@@ -538,7 +575,7 @@ describe RoleModel do
   end
 
   context "independent usage" do
-    let(:model_instance) {  model_class.new }
+    let(:model_instance) { model_class.new }
     let(:other_model_class) { Class.new }
     before(:each) do
       other_model_class.instance_eval do

metadata

@@ -1,106 +1,81 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: role_model
-version: !ruby/object:Gem::Version 
-  hash: 61
-  prerelease: 
-  segments: 
-  - 0
-  - 8
-  - 1
-  version: 0.8.1
+version: !ruby/object:Gem::Version
+  version: 0.8.2
 platform: ruby
-authors: 
+authors:
 - Martin Rehfeld
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2012-10-29 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
-  requirement: &id001 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 7
-        segments: 
-        - 1
-        - 5
-        - 2
-        version: 1.5.2
-  version_requirements: *id001
+date: 2015-02-12 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: jeweler
-  prerelease: false
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.5.2
   type: :development
-- !ruby/object:Gem::Dependency 
-  requirement: &id002 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 7
-        segments: 
-        - 2
-        version: "2"
-  version_requirements: *id002
-  name: rspec
   prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.5.2
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '2'
   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
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '2'
+- !ruby/object:Gem::Dependency
+  name: rdoc
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 2.4.2
   type: :development
-- !ruby/object:Gem::Dependency 
-  requirement: &id004 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  version_requirements: *id004
-  name: autotest
   prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 2.4.2
+- !ruby/object:Gem::Dependency
+  name: autotest
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-- !ruby/object:Gem::Dependency 
-  requirement: &id005 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 7
-        segments: 
-        - 2
-        version: "2"
-  version_requirements: *id005
-  name: rspec
   prerelease: false
-  type: :development
-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.
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+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.
 email: martin.rehfeld@glnetworks.de
 executables: []
-
 extensions: []
-
-extra_rdoc_files: 
+extra_rdoc_files:
 - LICENSE
 - README.rdoc
-files: 
+files:
 - .document
 - .rspec
 - .travis.yml
@@ -120,37 +95,27 @@ files:
 - spec/roles_spec.rb
 - spec/spec_helper.rb
 homepage: http://github.com/martinrehfeld/role_model
-licenses: 
+licenses:
 - MIT
+metadata: {}
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
-  none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
-  none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+required_ruby_version: !ruby/object:Gem::Requirement
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 2.2.2
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Declare, assign and query roles with ease
 test_files: []
-