troles 0.5.2 → 0.6.0

data/spec/troles/common/config/schema_spec.rb

@@ -0,0 +1,5 @@
+require 'troles_spec_helper'
+
+describe Troles::Common::Config::Schema do
+  
+end

data/spec/troles/common/multi_roles_spec.rb

@@ -14,7 +14,7 @@ shared_examples_for "Common Write API for multiple roles" do
       user.has_role?(:admin).should be_true
       user.has_role?(:user).should be_false
       user.has_any_role?(:admin, :editor).should be_true
-      user.has_any_role?(:user).should be_false
+      user.has_any_role?(:publisher, :user).should be_false
       user.has_all_roles?(:admin, :editor, :blogger).should be_true      
     end
 
@@ -23,7 +23,7 @@ shared_examples_for "Common Write API for multiple roles" do
       user.has_role?(:admin).should be_true
       user.has_role?(:user).should be_false
       user.has_any_role?(:admin, :editor).should be_true
-      user.has_any_role?(:user).should be_false
+      user.has_any_role?(:publisher, :user).should be_false
       user.has_all_roles?(:admin, :editor, :blogger).should be_true      
     end
   end

data/spec/troles/marshaller/bitmask_spec.rb

@@ -1,14 +1,20 @@
+def migrate_up
+  migrate :bit_many
+end
+
+require 'active_record_helper'
 require 'troles_spec'
+
 User.troles_strategy :bit_many
 User.valid_roles = [:user, :admin, :blogger]
 
-describe Troles::Marshaller::Bitmask do
+describe Troles::Common::Marshaller::Bitmask do
   let(:kris)    { Factory.create :user, :troles => 4}
-  let(:bitmask) { Troles::Marshaller::Bitmask.new kris }  
+  let(:bitmask) { Troles::Common::Marshaller::Bitmask.new kris }  
 
   subject { bitmask }
+
   specify { bitmask.read.should == [:blogger] }    
-    specify { bitmask.write(:admin).should == 2 }
-    specify { bitmask.write(:user, :admin).should == 3 }    
-    
+  specify { bitmask.write(:admin).should == 2 }
+  specify { bitmask.write(:user, :admin).should == 3 }  
 end

data/spec/troles/marshaller/generic_spec.rb

@@ -0,0 +1,17 @@
+def migrate_up
+  migrate :string_many
+end
+
+require 'active_record_helper'
+require 'troles_spec'
+
+User.troles_strategy :string_many
+User.valid_roles = [:user, :admin, :blogger]
+
+describe Troles::Common::Marshaller::Generic do
+  let(:kris)    { Factory.create :user, :troles => 4}
+  let(:marshaller) { Troles::Common::Marshaller::Generic.new kris }  
+
+  specify { marshaller.role_subject.should == kris }    
+  specify { marshaller.valid_roles.should == [:user, :admin, :blogger] }
+end

data/spec/troles/storage/bit_many_spec.rb

@@ -0,0 +1,20 @@
+def migrate_up
+  migrate :bit_many
+end
+
+require 'active_record_helper'
+require 'troles_spec'
+
+User.troles_strategy :bit_many do |c|
+	c.valid_roles = [:user, :admin, :blogger]
+end.configure!
+
+describe Troles::Storage::BitMany do
+  let(:kris)    { Factory.create :user, :troles => 4}
+  subject 		{ Troles::Storage::BitMany.new kris }
+
+  it 'should set roles' do 
+  	subject.set_roles 'blogger'
+  	subject.display_roles.should == [:blogger]
+  end
+end

data/spec/troles/storage/ref_many_spec.rb

@@ -0,0 +1,20 @@
+def migrate_up
+  migrate :ref_many
+end
+
+require 'active_record_helper'
+require 'troles_spec'
+
+User.troles_strategy :ref_many do |c|
+	c.valid_roles = [:user, :admin, :blogger]
+end.configure!
+
+describe Troles::Storage::RefMany do
+  let(:kris)    { Factory.create :user }
+  subject 		{ Troles::Storage::RefMany.new kris }
+
+  it 'should set roles' do 
+  	subject.set_roles 'blogger', 'admin'
+  	subject.display_roles.should == [:blogger, :admin]
+  end
+end

data/spec/troles/storage/string_many_spec.rb

@@ -0,0 +1,19 @@
+def migrate_up
+  migrate :string_many
+end
+
+require 'active_record_helper'
+require 'troles_spec'
+
+User.troles_strategy :string_many
+User.valid_roles = [:user, :admin, :blogger]
+
+describe Troles::Storage::StringMany do
+  let(:kris)    { Factory.create :user, :troles => 'user' }
+  subject 		{ Troles::Storage::StringMany.new kris }
+
+  it 'should set roles' do 
+  	subject.set_roles 'blogger', 'admin'
+  	subject.display_roles.should == [:blogger, :admin]
+  end
+end

data/spec/troles/strategies/string_many_spec.rb

@@ -4,7 +4,7 @@ User.troles_strategy :string_many do |c|
   c.valid_roles = [:user, :admin, :blogger, :editor]
 end.configure!
 
-User.valid_roles = [:user, :admin, :blogger, :editor]
+# User.valid_roles = [:user, :admin, :blogger, :editor]
 
 module UserSetup
   def create_no_roles_user

data/troles.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "troles"
-  s.version = "0.5.2"
+  s.version = "0.6.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Kristian Mandrup"]
-  s.date = "2011-10-01"
+  s.date = "2011-10-12"
   s.description = "Ruby roles solution that has an easy to extend API, configuration and nice Adapter interface to ORMs and data stores"
   s.email = "kmandrup@gmail.com"
   s.extra_rdoc_files = [
@@ -120,9 +120,9 @@ Gem::Specification.new do |s|
     "lib/troles/common/api/validation.rb",
     "lib/troles/common/api/write.rb",
     "lib/troles/common/config.rb",
+    "lib/troles/common/config/class_methods.rb",
     "lib/troles/common/config/schema.rb",
     "lib/troles/common/config/schema/helpers.rb",
-    "lib/troles/common/config/schema/role_helpers.rb",
     "lib/troles/common/config/static_roles.rb",
     "lib/troles/common/config/valid_roles.rb",
     "lib/troles/common/dependencies.rb",
@@ -280,7 +280,7 @@ Gem::Specification.new do |s|
     "spec/trole_groups/generic/models.rb",
     "spec/trole_groups/generic/models/role_group.rb",
     "spec/trole_groups/generic/models/user.rb",
-    "spec/trole_groups/strategies/ref_many.rb",
+    "spec/trole_groups/strategies/ref_many_spec.rb",
     "spec/trole_groups/strategy_helper.rb",
     "spec/trole_groups_spec.rb",
     "spec/trole_spec.rb",
@@ -301,12 +301,17 @@ Gem::Specification.new do |s|
     "spec/troles/common/api/validation_api_spec.rb",
     "spec/troles/common/api/write_api_spec.rb",
     "spec/troles/common/api_spec.rb",
+    "spec/troles/common/config/schema_spec.rb",
     "spec/troles/common/config_spec.rb",
     "spec/troles/common/multi_roles_spec.rb",
     "spec/troles/marshaller/bitmask_spec.rb",
+    "spec/troles/marshaller/generic_spec.rb",
     "spec/troles/operations/read_ops_spec.rb",
     "spec/troles/operations/write_ops_spec.rb",
     "spec/troles/playbox/shared_examples.rb",
+    "spec/troles/storage/bit_many_spec.rb",
+    "spec/troles/storage/ref_many_spec.rb",
+    "spec/troles/storage/string_many_spec.rb",
     "spec/troles/strategies/bit_many_spec.rb",
     "spec/troles/strategies/embed_many_spec.rb",
     "spec/troles/strategies/ref_many_spec.rb",
@@ -325,38 +330,22 @@ Gem::Specification.new do |s|
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<sugar-high>, [">= 0.4.4"])
-      s.add_runtime_dependency(%q<sweetloader>, [">= 0.1.0"])
-      s.add_runtime_dependency(%q<require_all>, ["~> 1.2.0"])
-      s.add_development_dependency(%q<yard>, ["> 0.6.1"])
-      s.add_development_dependency(%q<rails>, [">= 3.0.1"])
-      s.add_development_dependency(%q<rspec-rails>, [">= 2.4.0"])
-      s.add_development_dependency(%q<sqlite3>, [">= 0"])
-      s.add_development_dependency(%q<capybara>, ["> 0.4.0"])
-      s.add_development_dependency(%q<shoulda>, [">= 0"])
-      s.add_development_dependency(%q<factory_girl_rails>, [">= 0"])
-      s.add_development_dependency(%q<mocha>, [">= 0"])
-      s.add_development_dependency(%q<database_cleaner>, ["~> 0.6.8"])
-      s.add_development_dependency(%q<rake>, ["~> 0.9.0"])
+      s.add_runtime_dependency(%q<sugar-high>, [">= 0.6.0"])
+      s.add_runtime_dependency(%q<sweetloader>, [">= 0.1.1"])
+      s.add_runtime_dependency(%q<schemaker>, [">= 0.1.4"])
+      s.add_development_dependency(%q<rake>, [">= 0.9.0"])
+      s.add_development_dependency(%q<rspec>, [">= 2.4"])
       s.add_development_dependency(%q<bundler>, [">= 1"])
       s.add_development_dependency(%q<jeweler>, [">= 1.6"])
       s.add_development_dependency(%q<rdoc>, [">= 3.6"])
       s.add_development_dependency(%q<rcov>, [">= 0"])
       s.add_development_dependency(%q<yard>, ["> 0.6.1"])
     else
-      s.add_dependency(%q<sugar-high>, [">= 0.4.4"])
-      s.add_dependency(%q<sweetloader>, [">= 0.1.0"])
-      s.add_dependency(%q<require_all>, ["~> 1.2.0"])
-      s.add_dependency(%q<yard>, ["> 0.6.1"])
-      s.add_dependency(%q<rails>, [">= 3.0.1"])
-      s.add_dependency(%q<rspec-rails>, [">= 2.4.0"])
-      s.add_dependency(%q<sqlite3>, [">= 0"])
-      s.add_dependency(%q<capybara>, ["> 0.4.0"])
-      s.add_dependency(%q<shoulda>, [">= 0"])
-      s.add_dependency(%q<factory_girl_rails>, [">= 0"])
-      s.add_dependency(%q<mocha>, [">= 0"])
-      s.add_dependency(%q<database_cleaner>, ["~> 0.6.8"])
-      s.add_dependency(%q<rake>, ["~> 0.9.0"])
+      s.add_dependency(%q<sugar-high>, [">= 0.6.0"])
+      s.add_dependency(%q<sweetloader>, [">= 0.1.1"])
+      s.add_dependency(%q<schemaker>, [">= 0.1.4"])
+      s.add_dependency(%q<rake>, [">= 0.9.0"])
+      s.add_dependency(%q<rspec>, [">= 2.4"])
       s.add_dependency(%q<bundler>, [">= 1"])
       s.add_dependency(%q<jeweler>, [">= 1.6"])
       s.add_dependency(%q<rdoc>, [">= 3.6"])
@@ -364,19 +353,11 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<yard>, ["> 0.6.1"])
     end
   else
-    s.add_dependency(%q<sugar-high>, [">= 0.4.4"])
-    s.add_dependency(%q<sweetloader>, [">= 0.1.0"])
-    s.add_dependency(%q<require_all>, ["~> 1.2.0"])
-    s.add_dependency(%q<yard>, ["> 0.6.1"])
-    s.add_dependency(%q<rails>, [">= 3.0.1"])
-    s.add_dependency(%q<rspec-rails>, [">= 2.4.0"])
-    s.add_dependency(%q<sqlite3>, [">= 0"])
-    s.add_dependency(%q<capybara>, ["> 0.4.0"])
-    s.add_dependency(%q<shoulda>, [">= 0"])
-    s.add_dependency(%q<factory_girl_rails>, [">= 0"])
-    s.add_dependency(%q<mocha>, [">= 0"])
-    s.add_dependency(%q<database_cleaner>, ["~> 0.6.8"])
-    s.add_dependency(%q<rake>, ["~> 0.9.0"])
+    s.add_dependency(%q<sugar-high>, [">= 0.6.0"])
+    s.add_dependency(%q<sweetloader>, [">= 0.1.1"])
+    s.add_dependency(%q<schemaker>, [">= 0.1.4"])
+    s.add_dependency(%q<rake>, [">= 0.9.0"])
+    s.add_dependency(%q<rspec>, [">= 2.4"])
     s.add_dependency(%q<bundler>, [">= 1"])
     s.add_dependency(%q<jeweler>, [">= 1.6"])
     s.add_dependency(%q<rdoc>, [">= 3.6"])

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: troles
 version: !ruby/object:Gem::Version
-  version: 0.5.2
+  version: 0.6.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,154 +9,66 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-10-01 00:00:00.000000000Z
+date: 2011-10-12 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sugar-high
-  requirement: &2157032640 !ruby/object:Gem::Requirement
+  requirement: &2159201640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.4.4
+        version: 0.6.0
   type: :runtime
   prerelease: false
-  version_requirements: *2157032640
+  version_requirements: *2159201640
 - !ruby/object:Gem::Dependency
   name: sweetloader
-  requirement: &2157030940 !ruby/object:Gem::Requirement
+  requirement: &2159200900 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.1.0
+        version: 0.1.1
   type: :runtime
   prerelease: false
-  version_requirements: *2157030940
+  version_requirements: *2159200900
 - !ruby/object:Gem::Dependency
-  name: require_all
-  requirement: &2157029520 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 1.2.0
-  type: :runtime
-  prerelease: false
-  version_requirements: *2157029520
-- !ruby/object:Gem::Dependency
-  name: yard
-  requirement: &2157028400 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>'
-      - !ruby/object:Gem::Version
-        version: 0.6.1
-  type: :development
-  prerelease: false
-  version_requirements: *2157028400
-- !ruby/object:Gem::Dependency
-  name: rails
-  requirement: &2157027080 !ruby/object:Gem::Requirement
+  name: schemaker
+  requirement: &2159200220 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 3.0.1
-  type: :development
-  prerelease: false
-  version_requirements: *2157027080
-- !ruby/object:Gem::Dependency
-  name: rspec-rails
-  requirement: &2157022920 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 2.4.0
-  type: :development
-  prerelease: false
-  version_requirements: *2157022920
-- !ruby/object:Gem::Dependency
-  name: sqlite3
-  requirement: &2157020760 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: *2157020760
-- !ruby/object:Gem::Dependency
-  name: capybara
-  requirement: &2157017620 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>'
-      - !ruby/object:Gem::Version
-        version: 0.4.0
-  type: :development
-  prerelease: false
-  version_requirements: *2157017620
-- !ruby/object:Gem::Dependency
-  name: shoulda
-  requirement: &2157014480 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
+        version: 0.1.4
+  type: :runtime
   prerelease: false
-  version_requirements: *2157014480
+  version_requirements: *2159200220
 - !ruby/object:Gem::Dependency
-  name: factory_girl_rails
-  requirement: &2157012320 !ruby/object:Gem::Requirement
+  name: rake
+  requirement: &2159199540 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.9.0
   type: :development
   prerelease: false
-  version_requirements: *2157012320
+  version_requirements: *2159199540
 - !ruby/object:Gem::Dependency
-  name: mocha
-  requirement: &2157010400 !ruby/object:Gem::Requirement
+  name: rspec
+  requirement: &2159198800 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: *2157010400
-- !ruby/object:Gem::Dependency
-  name: database_cleaner
-  requirement: &2157005000 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 0.6.8
-  type: :development
-  prerelease: false
-  version_requirements: *2157005000
-- !ruby/object:Gem::Dependency
-  name: rake
-  requirement: &2157003680 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 0.9.0
+        version: '2.4'
   type: :development
   prerelease: false
-  version_requirements: *2157003680
+  version_requirements: *2159198800
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &2157002360 !ruby/object:Gem::Requirement
+  requirement: &2159198100 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -164,10 +76,10 @@ dependencies:
         version: '1'
   type: :development
   prerelease: false
-  version_requirements: *2157002360
+  version_requirements: *2159198100
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &2157001420 !ruby/object:Gem::Requirement
+  requirement: &2159197500 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -175,10 +87,10 @@ dependencies:
         version: '1.6'
   type: :development
   prerelease: false
-  version_requirements: *2157001420
+  version_requirements: *2159197500
 - !ruby/object:Gem::Dependency
   name: rdoc
-  requirement: &2157000420 !ruby/object:Gem::Requirement
+  requirement: &2159196660 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -186,10 +98,10 @@ dependencies:
         version: '3.6'
   type: :development
   prerelease: false
-  version_requirements: *2157000420
+  version_requirements: *2159196660
 - !ruby/object:Gem::Dependency
   name: rcov
-  requirement: &2156998280 !ruby/object:Gem::Requirement
+  requirement: &2159195820 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -197,10 +109,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2156998280
+  version_requirements: *2159195820
 - !ruby/object:Gem::Dependency
   name: yard
-  requirement: &2156979800 !ruby/object:Gem::Requirement
+  requirement: &2159195120 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>'
@@ -208,7 +120,7 @@ dependencies:
         version: 0.6.1
   type: :development
   prerelease: false
-  version_requirements: *2156979800
+  version_requirements: *2159195120
 description: Ruby roles solution that has an easy to extend API, configuration and
   nice Adapter interface to ORMs and data stores
 email: kmandrup@gmail.com
@@ -321,9 +233,9 @@ files:
 - lib/troles/common/api/validation.rb
 - lib/troles/common/api/write.rb
 - lib/troles/common/config.rb
+- lib/troles/common/config/class_methods.rb
 - lib/troles/common/config/schema.rb
 - lib/troles/common/config/schema/helpers.rb
-- lib/troles/common/config/schema/role_helpers.rb
 - lib/troles/common/config/static_roles.rb
 - lib/troles/common/config/valid_roles.rb
 - lib/troles/common/dependencies.rb
@@ -481,7 +393,7 @@ files:
 - spec/trole_groups/generic/models.rb
 - spec/trole_groups/generic/models/role_group.rb
 - spec/trole_groups/generic/models/user.rb
-- spec/trole_groups/strategies/ref_many.rb
+- spec/trole_groups/strategies/ref_many_spec.rb
 - spec/trole_groups/strategy_helper.rb
 - spec/trole_groups_spec.rb
 - spec/trole_spec.rb
@@ -502,12 +414,17 @@ files:
 - spec/troles/common/api/validation_api_spec.rb
 - spec/troles/common/api/write_api_spec.rb
 - spec/troles/common/api_spec.rb
+- spec/troles/common/config/schema_spec.rb
 - spec/troles/common/config_spec.rb
 - spec/troles/common/multi_roles_spec.rb
 - spec/troles/marshaller/bitmask_spec.rb
+- spec/troles/marshaller/generic_spec.rb
 - spec/troles/operations/read_ops_spec.rb
 - spec/troles/operations/write_ops_spec.rb
 - spec/troles/playbox/shared_examples.rb
+- spec/troles/storage/bit_many_spec.rb
+- spec/troles/storage/ref_many_spec.rb
+- spec/troles/storage/string_many_spec.rb
 - spec/troles/strategies/bit_many_spec.rb
 - spec/troles/strategies/embed_many_spec.rb
 - spec/troles/strategies/ref_many_spec.rb
@@ -530,7 +447,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1589838240922141588
+      hash: -769748593526627633
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:

data/lib/troles/common/config/schema/role_helpers.rb

@@ -1,27 +0,0 @@
-module Troles::Common
-  class Config
-    module Schema
-      module RoleHelpers
-        def subject_class_name
-          subject_class.to_s
-        end
-
-        def subject_key options = {}
-          make_key subject_class_name, options
-        end
-
-        def join_class_name
-          role_join_model.to_s
-        end
-
-        def join_key options = {}
-          make_key join_class_name, options
-        end
-
-        def object_class_name
-          object_model.to_s
-        end
-      end
-    end
-  end
-end