role_model 0.6.0 → 0.7.0

data/Gemfile

@@ -0,0 +1,7 @@
+source 'http://rubygems.org'
+
+group :development do
+  gem 'jeweler',       '>=1.5.2'
+  gem 'rspec',         '~> 2'
+  gem 'autotest'
+end

data/Gemfile.lock

@@ -0,0 +1,29 @@
+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)

data/Rakefile

@@ -1,40 +1,43 @@
 require 'rubygems'
+require 'bundler'
+begin
+  Bundler.setup(:default, :development)
+rescue Bundler::BundlerError => e
+  $stderr.puts e.message
+  $stderr.puts "Run `bundle install` to install missing gems"
+  exit e.status_code
+end
 require 'rake'
 
-begin
-  require 'jeweler'
-  Jeweler::Tasks.new do |gem|
-    gem.name = "role_model"
-    gem.summary = %Q{Declare, assign and query roles with ease}
-    gem.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.}
-    gem.email = "martin.rehfeld@glnetworks.de"
-    gem.homepage = "http://github.com/martinrehfeld/role_model"
-    gem.authors = ["Martin Rehfeld"]
-    gem.add_development_dependency "rspec", ">= 1.2.9"
-    # gem is a Gem::Specification... see http://www.rubygems.org/read/chapter/20 for additional settings
-  end
-  Jeweler::GemcutterTasks.new
-rescue LoadError
-  puts "Jeweler (or a dependency) not available. Install it with: gem install jeweler"
+require 'jeweler'
+Jeweler::Tasks.new do |gem|
+  # gem is a Gem::Specification... see http://docs.rubygems.org/read/chapter/20 for more options
+  gem.name = "role_model"
+  gem.homepage = "http://github.com/martinrehfeld/role_model"
+  gem.license = "MIT"
+  gem.summary = %Q{Declare, assign and query roles with ease}
+  gem.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.}
+  gem.email = "martin.rehfeld@glnetworks.de"
+  gem.authors = ["Martin Rehfeld"]
+  # Include your dependencies below. Runtime dependencies are required when using your 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"
 end
+Jeweler::RubygemsDotOrgTasks.new
 
-require 'spec/rake/spectask'
-Spec::Rake::SpecTask.new(:spec) do |spec|
-  spec.libs << 'lib' << 'spec'
-  spec.spec_files = FileList['spec/**/*_spec.rb']
+require 'rspec/core'
+require 'rspec/core/rake_task'
+RSpec::Core::RakeTask.new(:spec) do |spec|
+  spec.pattern = FileList['spec/**/*_spec.rb']
 end
 
-Spec::Rake::SpecTask.new(:rcov) do |spec|
-  spec.libs << 'lib' << 'spec'
+RSpec::Core::RakeTask.new(:rcov) do |spec|
   spec.pattern = 'spec/**/*_spec.rb'
   spec.rcov = true
-  spec.rcov_opts.concat ['--exclude', 'rcov.rb']
-  spec.rcov_opts.concat ['--exclude', '.*_spec.rb']
-  spec.rcov_opts.concat ['--exclude', 'spec_helper.rb']
 end
 
-task :spec => :check_dependencies
-
 task :default => :spec
 
 require 'rake/rdoctask'

data/VERSION

@@ -1 +1 @@
-0.6.0
+0.7.0

data/lib/role_model.rb

@@ -15,6 +15,7 @@ module RoleModel
         attr_accessor(*::RoleModel::INHERITABLE_CLASS_ATTRIBUTES)
       end
       roles_attribute :roles_mask # set default bitmask attribute
+      self.valid_roles = []
     end
   end
 

data/lib/role_model/class_methods.rb

@@ -18,17 +18,6 @@ module RoleModel
       self.roles_attribute_name = name.to_sym
     end
 
-    # :call-seq:
-    #   roles(:role_1, ..., :role_n)
-    #   roles('role_1', ..., 'role_n')
-    #   roles([:role_1, ..., :role_n])
-    #   roles(['role_1', ..., 'role_n'])
-    #
-    # declare valid roles
-    def roles(*roles)
-      self.valid_roles = Array[*roles].flatten.map { |r| r.to_sym }
-    end
-
     def mask_for(*roles)
       (Array[*roles].map {|r|
         r.respond_to?(:each) ? r.to_a : r
@@ -40,5 +29,18 @@ module RoleModel
         sum + bitvalue
       } || 0
     end
+    
+    protected
+
+    # :call-seq:
+    #   roles(:role_1, ..., :role_n)
+    #   roles('role_1', ..., 'role_n')
+    #   roles([:role_1, ..., :role_n])
+    #   roles(['role_1', ..., 'role_n'])
+    #
+    # declare valid roles
+    def roles(*roles)
+      self.valid_roles = Array[*roles].flatten.map { |r| r.to_sym }
+    end
   end
 end

data/role_model.gemspec

@@ -1,64 +1,73 @@
 # Generated by jeweler
 # DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in Rakefile, and run the gemspec command
+# Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
   s.name = %q{role_model}
-  s.version = "0.6.0"
+  s.version = "0.7.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Martin Rehfeld"]
-  s.date = %q{2010-10-10}
+  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.extra_rdoc_files = [
     "LICENSE",
-     "README.rdoc"
+    "README.rdoc"
   ]
   s.files = [
     ".document",
-     ".gitignore",
-     "LICENSE",
-     "README.rdoc",
-     "Rakefile",
-     "VERSION",
-     "lib/role_model.rb",
-     "lib/role_model/class_methods.rb",
-     "lib/role_model/implementation.rb",
-     "lib/role_model/roles.rb",
-     "role_model.gemspec",
-     "spec/custom_matchers.rb",
-     "spec/custom_matchers_spec.rb",
-     "spec/role_model_spec.rb",
-     "spec/roles_spec.rb",
-     "spec/spec.opts",
-     "spec/spec_helper.rb"
+    ".rspec",
+    "Gemfile",
+    "Gemfile.lock",
+    "LICENSE",
+    "README.rdoc",
+    "Rakefile",
+    "VERSION",
+    "lib/role_model.rb",
+    "lib/role_model/class_methods.rb",
+    "lib/role_model/implementation.rb",
+    "lib/role_model/roles.rb",
+    "role_model.gemspec",
+    "spec/custom_matchers.rb",
+    "spec/custom_matchers_spec.rb",
+    "spec/role_model_spec.rb",
+    "spec/roles_spec.rb",
+    "spec/spec_helper.rb"
   ]
   s.homepage = %q{http://github.com/martinrehfeld/role_model}
-  s.rdoc_options = ["--charset=UTF-8"]
+  s.licenses = ["MIT"]
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.7}
+  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"
+    "spec/custom_matchers_spec.rb",
+    "spec/role_model_spec.rb",
+    "spec/roles_spec.rb",
+    "spec/spec_helper.rb"
   ]
 
   if s.respond_to? :specification_version then
-    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_development_dependency(%q<rspec>, [">= 1.2.9"])
+      s.add_development_dependency(%q<jeweler>, [">= 1.5.2"])
+      s.add_development_dependency(%q<rspec>, ["~> 2"])
+      s.add_development_dependency(%q<autotest>, [">= 0"])
+      s.add_development_dependency(%q<rspec>, ["~> 2"])
     else
-      s.add_dependency(%q<rspec>, [">= 1.2.9"])
+      s.add_dependency(%q<jeweler>, [">= 1.5.2"])
+      s.add_dependency(%q<rspec>, ["~> 2"])
+      s.add_dependency(%q<autotest>, [">= 0"])
+      s.add_dependency(%q<rspec>, ["~> 2"])
     end
   else
-    s.add_dependency(%q<rspec>, [">= 1.2.9"])
+    s.add_dependency(%q<jeweler>, [">= 1.5.2"])
+    s.add_dependency(%q<rspec>, ["~> 2"])
+    s.add_dependency(%q<autotest>, [">= 0"])
+    s.add_dependency(%q<rspec>, ["~> 2"])
   end
 end
 

data/spec/role_model_spec.rb

@@ -33,7 +33,6 @@ describe RoleModel do
 
   describe ".roles" do
     subject { model_class.new }
-
     it "should define the valid roles" do
       subject.roles = %w(foo bar baz)
       subject.roles.should include(:foo, :bar)
@@ -225,7 +224,46 @@ describe RoleModel do
         subject.should have(0).roles
       end
     end
+  end
+
+  describe "#-=" do
+    subject { model_class.new }
+
+    context "with roles :foo and :bar already assigned" do
+      before(:each) do
+        subject.roles = [:foo, :bar]
+      end
+
+      it "should delete a existing role given as a symbol" do
+        subject.roles -= [:foo]
+        subject.roles.should_not include(:foo)
+        subject.should have(1).roles
+      end
+
+      it "should delete a existing role given as a string" do
+        subject.roles -= ['foo']
+        subject.roles.should_not include(:foo)
+        subject.should have(1).roles
+      end
+
+      it "should not change anything if a non existing role is given" do
+        subject.roles -= [:third]
+        subject.roles.should include(:foo, :bar)
+        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 -= [:foo]
+        subject.should have(0).roles
+      end
 
+      it "should have 0 roles if a role is given as a string" do
+        subject.roles -= ['foo']
+        subject.should have(0).roles
+      end
+    end
   end
 
   context "query for an individual role" do
@@ -294,10 +332,60 @@ describe RoleModel do
     end
   end
 
+  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
+            attr_accessor :custom_roles_mask
+            include RoleModel
+          end
+        end
+        
+        
+        subject { model_class_without_roles.new }
+
+        it "should return false when a role was assigned" do
+          subject.roles = :foo
+          subject.send(check_role_assignment_method, :foo).should be_false
+        end
+
+        it "should return false when no role was assigned" do
+          subject.send(check_role_assignment_method, :foo).should be_false
+        end
+
+      end
+    end
+  end
+
+  context "ClassMethods" do
+    
+    subject { model_class }
+    
+    describe ".roles" do
+      it "should not allow public access to set roles" do
+        lambda do
+          subject.roles :foo, :quux
+        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
+      end.should raise_exception(NoMethodError, /protected method.*roles.*called/)
+    end
 
     it "should not alter the superclass behaviour" do
       inherited_model_class.instance_eval do
@@ -369,41 +457,30 @@ describe RoleModel do
   describe ".mask_for" do
     subject { model_class.new }
 
-    before(:each) do
-      model_class.instance_eval do
-        attr_accessor :roles_mask
-        attr_accessor :custom_roles_mask
-        include RoleModel
-        roles :foo, :bar, :third
-      end
+    it "should return the role mask of a role" do
+      subject.class.mask_for(:foo).should == 1
+      subject.class.mask_for(:bar).should == 2
+      subject.class.mask_for(:third).should == 4
     end
 
-    context "passing" do
-      it "should return the role mask of a role" do
-        subject.class.mask_for(:foo).should == 1
-        subject.class.mask_for(:bar).should == 2
-        subject.class.mask_for(:third).should == 4
-      end
-
-      it "should return the role mask of an array of roles" do
-        subject.class.mask_for(:foo, :bar).should == 3
-        subject.class.mask_for(:foo, :third).should == 5
-        subject.class.mask_for(:foo, :bar, :third).should == 7
-      end
+    it "should return the role mask of an array of roles" do
+      subject.class.mask_for(:foo, :bar).should == 3
+      subject.class.mask_for(:foo, :third).should == 5
+      subject.class.mask_for(:foo, :bar, :third).should == 7
+    end
 
-      it "should return the role mask of a string array of roles" do
-        subject.class.mask_for("foo").should == 1
-        subject.class.mask_for("foo", "bar").should == 3
-        subject.class.mask_for("foo", "third").should == 5
-      end
+    it "should return the role mask of a string array of roles" do
+      subject.class.mask_for("foo").should == 1
+      subject.class.mask_for("foo", "bar").should == 3
+      subject.class.mask_for("foo", "third").should == 5
+    end
 
-      it "should return the role mask of the existing roles" do
-        subject.class.mask_for(:foo, :quux).should == 1
-      end
+    it "should return the role mask of the existing roles" do
+      subject.class.mask_for(:foo, :quux).should == 1
+    end
 
-      it "should return 0 when a role that does not exist is passed" do
-        subject.class.mask_for(:quux).should == 0
-      end
+    it "should return 0 when a role that does not exist is passed" do
+      subject.class.mask_for(:quux).should == 0
     end
   end
 

data/spec/spec_helper.rb

@@ -1,10 +1,14 @@
 $LOAD_PATH.unshift(File.dirname(__FILE__))
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
+require 'rspec'
+require File.dirname(__FILE__) + '/custom_matchers'
 require 'role_model'
-require 'spec'
-require 'spec/autorun'
-require File.dirname(__FILE__) + "/custom_matchers"
 
-Spec::Runner.configure do |config|
+RSpec.configure do |config|
   config.include(CustomMatchers)
+  config.mock_with :rspec
 end
+
+# Requires supporting ruby files with custom matchers and macros, etc,
+# in spec/support/ and its subdirectories.
+Dir[File.join(File.dirname(__FILE__), 'support/**/*.rb')].each {|f| require f}

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: role_model
 version: !ruby/object:Gem::Version 
-  hash: 7
-  prerelease: false
+  hash: 3
+  prerelease: 
   segments: 
   - 0
-  - 6
+  - 7
   - 0
-  version: 0.6.0
+  version: 0.7.0
 platform: ruby
 authors: 
 - Martin Rehfeld
@@ -15,25 +15,66 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-10-10 00:00:00 +02:00
-default_executable: 
+date: 2011-05-01 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: rspec
-  prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 13
+        hash: 7
         segments: 
         - 1
+        - 5
         - 2
-        - 9
-        version: 1.2.9
-  type: :development
+        version: 1.5.2
   version_requirements: *id001
+  name: jeweler
+  prerelease: false
+  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
+  type: :development
+- !ruby/object:Gem::Dependency 
+  requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  version_requirements: *id003
+  name: autotest
+  prerelease: false
+  type: :development
+- !ruby/object:Gem::Dependency 
+  requirement: &id004 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        hash: 7
+        segments: 
+        - 2
+        version: "2"
+  version_requirements: *id004
+  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.
 email: martin.rehfeld@glnetworks.de
 executables: []
@@ -45,7 +86,9 @@ extra_rdoc_files:
 - README.rdoc
 files: 
 - .document
-- .gitignore
+- .rspec
+- Gemfile
+- Gemfile.lock
 - LICENSE
 - README.rdoc
 - Rakefile
@@ -59,15 +102,13 @@ files:
 - spec/custom_matchers_spec.rb
 - spec/role_model_spec.rb
 - spec/roles_spec.rb
-- spec/spec.opts
 - spec/spec_helper.rb
-has_rdoc: true
 homepage: http://github.com/martinrehfeld/role_model
-licenses: []
-
+licenses: 
+- MIT
 post_install_message: 
-rdoc_options: 
-- --charset=UTF-8
+rdoc_options: []
+
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
@@ -91,7 +132,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.7.2
 signing_key: 
 specification_version: 3
 summary: Declare, assign and query roles with ease

data/.gitignore

@@ -1,21 +0,0 @@
-## MAC OS
-.DS_Store
-
-## TEXTMATE
-*.tmproj
-tmtags
-
-## EMACS
-*~
-\#*
-.\#*
-
-## VIM
-*.swp
-
-## PROJECT::GENERAL
-coverage
-rdoc
-pkg
-
-## PROJECT::SPECIFIC