roles_generic 0.3.9 → 0.5.0

data/Gemfile

@@ -1,12 +1,18 @@
 source :rubygems
 
 gem "require_all",        "~> 1.2.0"
-gem "activesupport",      ">= 3.0.1"    
-gem 'sugar-high',         "~> 0.4.0" 
-gem 'rails_artifactor',   '~> 0.3.3'
-# gem 'logging_assist',    '>= 0.2.0'
+gem "activesupport",      ">= 3.0.1"
+gem 'sugar-high',         ">= 0.5.0"
+gem 'rails_artifactor',   '>= 0.4.0'
 
 group :test do
-  gem "rspec",           ">= 2.4.1"
-  gem "generator-spec",  ">= 0.7.3"
-end
+  gem "rspec",           ">= 2.5.0"
+  gem "generator-spec",  ">= 0.7.5"
+end
+
+group :development do
+  gem "jeweler",  ">= 1.6.4"
+  gem "bundler",  ">= 1.0.10"
+  gem "rdoc"
+end
+

data/README.textile

@@ -8,6 +8,13 @@ Each ORM Roles implementation should have its own generator suited for that part
 
 Since Jan. 2011, Roles now includes a Group API that allows ordering roles into groups (see below).  
 
+h2. You need help?
+
+Please post questions in the "rails-roles":http://groups.google.com/group/rails-roles group. 
+If you have issues or bug reports, please post these as Issues on the github. 
+I recommend you try to fix any problems you might encounter by forking the project, implement the fix by writing specs
+and make a pull request to integrate it into my master. Thanks! 
+
 h2. Roles ORM implementations
 
 The following ORM specific Roles implementations are currently available

data/Rakefile

@@ -1,27 +1,48 @@
+# encoding: utf-8
+
+require 'rubygems'
+require 'bundler'
 begin
-  require 'jeweler'
-  Jeweler::Tasks.new do |gem|
-    gem.name = "roles_generic"
-    gem.summary = %Q{Generic role strategies sharing the same API}
-    gem.description = %Q{Generic role strategies sharing the same API. Easy to insert in any model}
-    gem.email = "kmandrup@gmail.com"
-    gem.homepage = "http://github.com/kristianmandrup/roles_generic"
-    gem.authors = ["Kristian Mandrup"]
-    gem.rubygems_version = '1.5.0'
-        
-    # See Gemfile for regular dependencies
-    gem.add_development_dependency "rspec",             '>= 2.4.1'
-    gem.add_development_dependency "generator-spec",    '>= 0.7.3'
-
-    # COMMENTED OUT TO AVOID DUPLICATION WITH GEMFILE:
-    #   https://github.com/technicalpickles/jeweler/issues#issue/152
-    gem.add_dependency 'require_all',   '~> 1.2.0'
-    gem.add_dependency 'activesupport', '>= 3.0.1'
-    gem.add_dependency 'sugar-high',    '~> 0.4.0'
-
-    # 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"
+  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'
+
+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 = "roles_generic"
+  gem.summary = %Q{Generic role strategies sharing the same API}
+  gem.description = %Q{Generic role strategies sharing the same API. Easy to insert in any model}
+  gem.email = "kmandrup@gmail.com"
+  gem.homepage = "http://github.com/kristianmandrup/roles_generic"
+  gem.email = "kmandrup@gmail.com"
+  gem.authors = ["Kristian Mandrup"]
+  # dependencies defined in Gemfile
+end
+Jeweler::RubygemsDotOrgTasks.new
+
+require 'rake/testtask'
+Rake::TestTask.new(:test) do |test|
+  test.libs << 'lib' << 'test'
+  test.pattern = 'test/**/test_*.rb'
+  test.verbose = true
+end
+
+task :default => :test
+
+require 'rake/rdoctask'
+Rake::RDocTask.new do |rdoc|
+  version = File.exist?('VERSION') ? File.read('VERSION') : ""
+
+  rdoc.rdoc_dir = 'rdoc'
+  rdoc.title = "roles_generic #{version}"
+  rdoc.rdoc_files.include('README*')
+  rdoc.rdoc_files.include('lib/**/*.rb')
 end
+
+
+

data/VERSION

@@ -1 +1 @@
-0.3.9
+0.5.0

data/lib/roles_generic.rb

@@ -2,6 +2,7 @@ require 'require_all'
 require 'active_support/inflector'
 require 'sugar-high/not'
 require 'sugar-high/array'
+require 'sugar-high/kind_of'
 require 'set'
 require 'roles_generic/namespaces'
 require 'roles_generic/base'

data/lib/roles_generic/generic.rb

@@ -26,10 +26,29 @@ module Roles
         :embed_one_role     => "attr_accessor :one_role"        
       }
 
-      attr_accessor :role_groups
+      attr_accessor :role_groups, :valid_role_groups
+
       def role_groups
         @role_groups ||= {}
       end
+
+      def valid_role_groups
+        @valid_role_groups ||= Set.new
+      end
+
+      def valid_role_groups= *group
+        group = group.flatten.compact
+        raise ArgumentError, "Must be a list of Symbols" if !group.only_labels?
+        @valid_role_groups = group.to_symbols
+      end
+      
+      def valid_role_groups_are *group
+        valid_role_groups = group        
+      end
+
+      def valid_role_group? name
+        valid_role_groups.include? name.to_sym
+      end
       
       def strategy name, options = {}
         strategy_name = name.to_sym
@@ -64,9 +83,10 @@ module Roles
         raise ArgumentError, '#add_role_group must be a Hash with a single key value pair' if group_hash.size > 1
 
         # first key/value pair?
-        group = group_hash.keys.first # see sugar_high
-
+        group = group_hash.keys.first
         raise ArgumentError, "Role group identifier must be a String or Symbol " if !group.kind_of_label?      
+        raise ArgumentError, "Role group is not valid, must be one of: #{valid_role_groups}"if !valid_role_group? group
+
         role_list = group_hash.values.first
         hash = {group.to_sym => [role_list].flat_uniq.to_symbols}
 

data/lib/roles_generic/generic/user/implementation.rb

@@ -50,6 +50,7 @@ module Roles::Generic::User
       # puts "roles_list: #{roles_list}"
       !(group_roles & roles_list).empty?
     end
+    alias_method :is_member_of?, :is_in_group?
 
     # is_in_groups? :editor, :admin, 
     def is_in_groups? *groups

data/roles_generic.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{roles_generic}
-  s.version = "0.3.9"
+  s.version = "0.5.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = [%q{Kristian Mandrup}]
-  s.date = %q{2011-05-10}
+  s.date = %q{2011-08-17}
   s.description = %q{Generic role strategies sharing the same API. Easy to insert in any model}
   s.email = %q{kmandrup@gmail.com}
   s.extra_rdoc_files = [
@@ -87,26 +87,8 @@ Gem::Specification.new do |s|
   ]
   s.homepage = %q{http://github.com/kristianmandrup/roles_generic}
   s.require_paths = [%q{lib}]
-  s.rubygems_version = %q{1.8.0}
+  s.rubygems_version = %q{1.8.8}
   s.summary = %q{Generic role strategies sharing the same API}
-  s.test_files = [
-    "spec/generator_spec_helper.rb",
-    "spec/roles_generic/generators/admin_flag_generator_spec.rb",
-    "spec/roles_generic/generators/many_roles_generator_spec.rb",
-    "spec/roles_generic/generators/one_role_generator_spec.rb",
-    "spec/roles_generic/generators/role_string_generator_spec.rb",
-    "spec/roles_generic/generators/role_strings_generator_spec.rb",
-    "spec/roles_generic/generators/roles_mask_generator_spec.rb",
-    "spec/roles_generic/generators/roles_string_generator_spec.rb",
-    "spec/roles_generic/strategy/multi/many_roles_spec.rb",
-    "spec/roles_generic/strategy/multi/role_strings_spec.rb",
-    "spec/roles_generic/strategy/multi/roles_mask_spec.rb",
-    "spec/roles_generic/strategy/multi/roles_string_spec.rb",
-    "spec/roles_generic/strategy/single/admin_flag_spec.rb",
-    "spec/roles_generic/strategy/single/one_role_spec.rb",
-    "spec/roles_generic/strategy/single/role_string_spec.rb",
-    "spec/spec_helper.rb"
-  ]
 
   if s.respond_to? :specification_version then
     s.specification_version = 3
@@ -114,34 +96,28 @@ Gem::Specification.new do |s|
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<require_all>, ["~> 1.2.0"])
       s.add_runtime_dependency(%q<activesupport>, [">= 3.0.1"])
-      s.add_runtime_dependency(%q<sugar-high>, ["~> 0.4.0"])
-      s.add_runtime_dependency(%q<rails_artifactor>, ["~> 0.3.3"])
-      s.add_development_dependency(%q<rspec>, [">= 2.4.1"])
-      s.add_development_dependency(%q<generator-spec>, [">= 0.7.3"])
-      s.add_runtime_dependency(%q<require_all>, ["~> 1.2.0"])
-      s.add_runtime_dependency(%q<activesupport>, [">= 3.0.1"])
-      s.add_runtime_dependency(%q<sugar-high>, ["~> 0.4.0"])
+      s.add_runtime_dependency(%q<sugar-high>, [">= 0.5.0"])
+      s.add_runtime_dependency(%q<rails_artifactor>, [">= 0.4.0"])
+      s.add_development_dependency(%q<jeweler>, [">= 1.6.4"])
+      s.add_development_dependency(%q<bundler>, [">= 1.0.10"])
+      s.add_development_dependency(%q<rdoc>, [">= 0"])
     else
       s.add_dependency(%q<require_all>, ["~> 1.2.0"])
       s.add_dependency(%q<activesupport>, [">= 3.0.1"])
-      s.add_dependency(%q<sugar-high>, ["~> 0.4.0"])
-      s.add_dependency(%q<rails_artifactor>, ["~> 0.3.3"])
-      s.add_dependency(%q<rspec>, [">= 2.4.1"])
-      s.add_dependency(%q<generator-spec>, [">= 0.7.3"])
-      s.add_dependency(%q<require_all>, ["~> 1.2.0"])
-      s.add_dependency(%q<activesupport>, [">= 3.0.1"])
-      s.add_dependency(%q<sugar-high>, ["~> 0.4.0"])
+      s.add_dependency(%q<sugar-high>, [">= 0.5.0"])
+      s.add_dependency(%q<rails_artifactor>, [">= 0.4.0"])
+      s.add_dependency(%q<jeweler>, [">= 1.6.4"])
+      s.add_dependency(%q<bundler>, [">= 1.0.10"])
+      s.add_dependency(%q<rdoc>, [">= 0"])
     end
   else
     s.add_dependency(%q<require_all>, ["~> 1.2.0"])
     s.add_dependency(%q<activesupport>, [">= 3.0.1"])
-    s.add_dependency(%q<sugar-high>, ["~> 0.4.0"])
-    s.add_dependency(%q<rails_artifactor>, ["~> 0.3.3"])
-    s.add_dependency(%q<rspec>, [">= 2.4.1"])
-    s.add_dependency(%q<generator-spec>, [">= 0.7.3"])
-    s.add_dependency(%q<require_all>, ["~> 1.2.0"])
-    s.add_dependency(%q<activesupport>, [">= 3.0.1"])
-    s.add_dependency(%q<sugar-high>, ["~> 0.4.0"])
+    s.add_dependency(%q<sugar-high>, [">= 0.5.0"])
+    s.add_dependency(%q<rails_artifactor>, [">= 0.4.0"])
+    s.add_dependency(%q<jeweler>, [">= 1.6.4"])
+    s.add_dependency(%q<bundler>, [">= 1.0.10"])
+    s.add_dependency(%q<rdoc>, [">= 0"])
   end
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: roles_generic
 version: !ruby/object:Gem::Version
-  version: 0.3.9
+  version: 0.5.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-05-10 00:00:00.000000000Z
+date: 2011-08-17 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: require_all
-  requirement: &2158411500 !ruby/object:Gem::Requirement
+  requirement: &2156083460 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: 1.2.0
   type: :runtime
   prerelease: false
-  version_requirements: *2158411500
+  version_requirements: *2156083460
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &2158410820 !ruby/object:Gem::Requirement
+  requirement: &2156081880 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,84 +32,62 @@ dependencies:
         version: 3.0.1
   type: :runtime
   prerelease: false
-  version_requirements: *2158410820
+  version_requirements: *2156081880
 - !ruby/object:Gem::Dependency
   name: sugar-high
-  requirement: &2158410180 !ruby/object:Gem::Requirement
+  requirement: &2156076120 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.4.0
+        version: 0.5.0
   type: :runtime
   prerelease: false
-  version_requirements: *2158410180
+  version_requirements: *2156076120
 - !ruby/object:Gem::Dependency
   name: rails_artifactor
-  requirement: &2158409600 !ruby/object:Gem::Requirement
+  requirement: &2156073720 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.3.3
+        version: 0.4.0
   type: :runtime
   prerelease: false
-  version_requirements: *2158409600
+  version_requirements: *2156073720
 - !ruby/object:Gem::Dependency
-  name: rspec
-  requirement: &2158409080 !ruby/object:Gem::Requirement
+  name: jeweler
+  requirement: &2156070960 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 2.4.1
+        version: 1.6.4
   type: :development
   prerelease: false
-  version_requirements: *2158409080
+  version_requirements: *2156070960
 - !ruby/object:Gem::Dependency
-  name: generator-spec
-  requirement: &2158408540 !ruby/object:Gem::Requirement
+  name: bundler
+  requirement: &2156066900 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.7.3
+        version: 1.0.10
   type: :development
   prerelease: false
-  version_requirements: *2158408540
-- !ruby/object:Gem::Dependency
-  name: require_all
-  requirement: &2158403860 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 1.2.0
-  type: :runtime
-  prerelease: false
-  version_requirements: *2158403860
+  version_requirements: *2156066900
 - !ruby/object:Gem::Dependency
-  name: activesupport
-  requirement: &2158403140 !ruby/object:Gem::Requirement
+  name: rdoc
+  requirement: &2156063960 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 3.0.1
-  type: :runtime
-  prerelease: false
-  version_requirements: *2158403140
-- !ruby/object:Gem::Dependency
-  name: sugar-high
-  requirement: &2158402520 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 0.4.0
-  type: :runtime
+        version: '0'
+  type: :development
   prerelease: false
-  version_requirements: *2158402520
+  version_requirements: *2156063960
 description: Generic role strategies sharing the same API. Easy to insert in any model
 email: kmandrup@gmail.com
 executables: []
@@ -197,6 +175,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: -2069952262275566965
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -205,24 +186,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.0
+rubygems_version: 1.8.8
 signing_key: 
 specification_version: 3
 summary: Generic role strategies sharing the same API
-test_files:
-- spec/generator_spec_helper.rb
-- spec/roles_generic/generators/admin_flag_generator_spec.rb
-- spec/roles_generic/generators/many_roles_generator_spec.rb
-- spec/roles_generic/generators/one_role_generator_spec.rb
-- spec/roles_generic/generators/role_string_generator_spec.rb
-- spec/roles_generic/generators/role_strings_generator_spec.rb
-- spec/roles_generic/generators/roles_mask_generator_spec.rb
-- spec/roles_generic/generators/roles_string_generator_spec.rb
-- spec/roles_generic/strategy/multi/many_roles_spec.rb
-- spec/roles_generic/strategy/multi/role_strings_spec.rb
-- spec/roles_generic/strategy/multi/roles_mask_spec.rb
-- spec/roles_generic/strategy/multi/roles_string_spec.rb
-- spec/roles_generic/strategy/single/admin_flag_spec.rb
-- spec/roles_generic/strategy/single/one_role_spec.rb
-- spec/roles_generic/strategy/single/role_string_spec.rb
-- spec/spec_helper.rb
+test_files: []