roles_mongoid_zhd 0.4.8 → 0.4.8.1

data/README.textile

@@ -1,4 +1,4 @@
-h1.fork info
+h1. Fork Info
 
 Update Mongoid to 2.0.2 support.
 
@@ -30,13 +30,13 @@ Embedded Role
 
 h2. Install
 
-<code>gem install roles_mongoid</code>
+<code>gem install roles_mongoid_zhd</code>
 
 h3. Install in Rails app
 
 Insert in Gemfile:
 
-<code>gem 'roles_mongoid'</code>
+<code>gem 'roles_mongoid_zhd'</code>
 
 Run <code>$ bundle install</code> from terminal
 
@@ -48,7 +48,7 @@ Example: _role_string_ strategy
 
 <pre>class User
   include Mongoid::Document  
-  include Roles::Mongoid 
+  include Mongoid::Roles 
 
   strategy :one_role
   valid_roles_are :admin, :guest, :user
@@ -59,7 +59,7 @@ Example: _one_role_ strategy
 
 <pre>class User
   include Mongoid::Document  
-  include Roles::Mongoid 
+  include Mongoid::Roles
 
   strategy :one_role
   valid_roles_are :admin, :guest, :user

data/VERSION

@@ -1 +1 @@
-0.0.0
+0.4.8.1

data/lib/roles_mongoid/base.rb

@@ -4,8 +4,8 @@ module Roles::Base
   end
 end
 
-module Roles
-  module Mongoid  
+module Mongoid
+  module Roles 
     def self.included(base) 
       base.extend Roles::Base
       base.extend ClassMethods

data/lib/roles_mongoid/strategy/multi.rb

@@ -1,6 +1,6 @@
 require 'roles_mongoid/strategy/shared'
 
-module Roles::Mongoid
+module Mongoid::Roles
   module Strategy
     module Multi     
       # assign multiple roles

data/lib/roles_mongoid/strategy/multi/embed_many_roles.rb

@@ -30,7 +30,7 @@ module RoleStrategy::Mongoid
     end
 
     module Implementation
-      include Roles::Mongoid::Strategy::Multi
+      include Mongoid::Roles::Strategy::Multi
 
       def set_role role
         raise ArgumentError, "#set_role only takes a single role as argument, not #{role}" if role.kind_of?(Array)

data/lib/roles_mongoid/strategy/multi/many_roles.rb

@@ -31,7 +31,7 @@ module RoleStrategy::Mongoid
     end
 
     module Implementation
-      include Roles::Mongoid::Strategy::Multi
+      include Mongoid::Roles::Strategy::Multi
 
       def has_roles?(*roles_names)
         compare_roles = extract_roles(roles_names.flat_uniq)

data/lib/roles_mongoid/strategy/multi/role_strings.rb

@@ -29,7 +29,7 @@ module RoleStrategy::Mongoid
     end
     
     module Implementation 
-      include Roles::Mongoid::Strategy::Multi
+      include Mongoid::Roles::Strategy::Multi
       
       def new_roles *roles
         ::Set.new select_valid_roles(roles)

data/lib/roles_mongoid/strategy/multi/roles_mask.rb

@@ -37,7 +37,7 @@ module RoleStrategy::Mongoid
     end
 
     module Implementation 
-      include Roles::Mongoid::Strategy::Multi
+      include Mongoid::Roles::Strategy::Multi
 
       class Roles < ::Set # :nodoc:
         attr_reader :model_instance

data/lib/roles_mongoid/strategy/shared.rb

@@ -1,4 +1,4 @@
-module Roles::Mongoid
+module Mongoid::Roles
   module Strategy
     module Shared
       def set_role role

data/lib/roles_mongoid/strategy/single.rb

@@ -6,7 +6,7 @@ class Symbol
   end
 end
 
-module Roles::Mongoid
+module Mongoid::Roles
   module Strategy
     module Single
       include Shared            

data/lib/roles_mongoid/strategy/single/admin_flag.rb

@@ -26,7 +26,7 @@ module RoleStrategy::Mongoid
     end
 
     module Implementation
-      include Roles::Mongoid::Strategy::Single
+      include Mongoid::Roles::Strategy::Single
 
       def new_role role
         role = role.kind_of?(Array) ? role.flatten.first : role

data/lib/roles_mongoid/strategy/single/embed_one_role.rb

@@ -34,7 +34,7 @@ module RoleStrategy::Mongoid
     end
 
     module Implementation  
-      include Roles::Mongoid::Strategy::Single 
+      include Mongoid::Roles::Strategy::Single 
 
       def set_role role
         raise ArgumentError, "#set_role only takes a single role as argument, not #{role}" if role.kind_of?(Array)

data/lib/roles_mongoid/strategy/single/one_role.rb

@@ -36,7 +36,7 @@ module RoleStrategy::Mongoid
     end
 
     module Implementation  
-      include Roles::Mongoid::Strategy::Single 
+      include Mongoid::Roles::Strategy::Single 
       
       def new_role role
         role_class.find_role(extract_role role)        

data/lib/roles_mongoid/strategy/single/role_string.rb

@@ -30,7 +30,7 @@ module RoleStrategy::Mongoid
 
     
     module Implementation   
-      include Roles::Mongoid::Strategy::Single
+      include Mongoid::Roles::Strategy::Single
 
       def new_role role
         role = role.kind_of?(Array) ? role.first : role

data/roles_mongoid.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{roles_mongoid_zhd}
-  s.version = "0.4.8"
+  s.version = "0.4.8.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = [%q{ZhangHanDong}]

data/spec/roles_mongoid/generators/roles_generator_spec.rb

@@ -32,7 +32,7 @@ describe 'role strategy generator: admin_flag' do
         g.run_generator arguments.args
         root_dir.should have_model_file :user do |clazz|
           clazz.should include_module 'Mongoid::Document'
-          clazz.should include_module 'Roles::Mongoid'
+          clazz.should include_module 'Mongoid::Roles'
           puts "clazz: #{clazz}"        
           clazz.should have_call :valid_roles_are, :args => ':admin, :guest, :user'
           clazz.should have_call :strategy, :args => ":admin_flag"        
@@ -55,7 +55,7 @@ describe 'role strategy generator: admin_flag' do
         
         root_dir.should have_model_file :user do |clazz|
           clazz.should include_module 'Mongoid::Document'
-          clazz.should include_module 'Roles::Mongoid'
+          clazz.should include_module 'Mongoid::Roles'
           puts "clazz: #{clazz}"        
           clazz.should have_call :valid_roles_are, :args => ':admin, :guest, :user'
           clazz.should have_call :strategy, :args => ":one_role"        

data/spec/roles_mongoid/strategy/multi/embed_many_roles_spec.rb

@@ -2,7 +2,7 @@ require 'spec_helper'
 
 class User
   include Mongoid::Document  
-  include Roles::Mongoid 
+  include Mongoid::Roles 
   
   strategy :embed_many_roles, :role_class => :role #, :config => :default
   valid_roles_are :admin, :guest, :user

data/spec/roles_mongoid/strategy/multi/many_roles_old_spec.rb

@@ -8,7 +8,7 @@ end
 
 class User
   include Mongoid::Document  
-  include Roles::Mongoid 
+  include Mongoid::Roles 
   
   strategy :many_roles_old
   valid_roles_are :admin, :guest, :user

data/spec/roles_mongoid/strategy/multi/many_roles_spec.rb

@@ -5,7 +5,7 @@ end
 
 class User
   include Mongoid::Document  
-  include Roles::Mongoid 
+  include Mongoid::Roles 
   
   strategy :many_roles
   valid_roles_are :admin, :guest, :user

data/spec/roles_mongoid/strategy/multi/role_strings_spec.rb

@@ -2,7 +2,7 @@ require 'spec_helper'
 
 class User
   include Mongoid::Document  
-  include Roles::Mongoid 
+  include Mongoid::Roles 
   
   strategy :role_strings
   valid_roles_are :admin, :guest, :user

data/spec/roles_mongoid/strategy/multi/roles_mask_spec.rb

@@ -4,7 +4,7 @@ use_roles_strategy :roles_mask
 
 class User
   include Mongoid::Document  
-  include Roles::Mongoid 
+  include Mongoid::Roles 
   
   strategy :roles_mask
   valid_roles_are :admin, :guest, :user
@@ -18,21 +18,3 @@ load 'roles_mongoid/strategy/api_examples.rb'
 
 
 
-# require 'spec_helper'
-# use_roles_strategy :roles_mask
-# 
-# class User 
-#   include Mongoid::Document  
-#   include Roles::Mongoid 
-#   
-#   strategy :roles_mask, :default
-#   valid_roles_are :admin, :guest   
-# 
-#   field :name, :type => String 
-# end
-# 
-# describe "Roles for Mongoid: :roles_mask strategy" do  
-#   load "roles_mongoid/user_setup"
-#   load "roles_generic/rspec/api"
-# end
-# 

data/spec/roles_mongoid/strategy/single/admin_flag_spec.rb

@@ -3,7 +3,7 @@ use_roles_strategy :admin_flag
 
 class User 
   include Mongoid::Document  
-  include Roles::Mongoid 
+  include Mongoid::Roles 
   
   strategy :admin_flag
   valid_roles_are :admin, :guest  

data/spec/roles_mongoid/strategy/single/embed_one_role_spec.rb

@@ -4,7 +4,7 @@ use_roles_strategy :embed_one_role
 
 class User
   include Mongoid::Document  
-  include Roles::Mongoid 
+  include Mongoid::Roles 
   
   strategy :embed_one_role, :role_class => :role #, :config => :default
   valid_roles_are :admin, :guest, :user

data/spec/roles_mongoid/strategy/single/one_role_spec.rb

@@ -5,7 +5,7 @@ end
 
 class User
   include Mongoid::Document  
-  include Roles::Mongoid 
+  include Mongoid::Roles 
   
   strategy :one_role
   valid_roles_are :admin, :guest, :user

data/spec/roles_mongoid/strategy/single/role_string_spec.rb

@@ -4,7 +4,7 @@ use_roles_strategy :role_string
 
 class User
   include Mongoid::Document  
-  include Roles::Mongoid 
+  include Mongoid::Roles 
   
   strategy :role_string
   valid_roles_are :admin, :guest, :user

data/tmp/rails/app/models/user.rb

@@ -1,6 +1,6 @@
 class User
   include Mongoid::Document
-    include Roles::Mongoid 
+  include Mongoid::Roles 
   strategy :admin_flag
 
   valid_roles_are :admin, :guest, :user

metadata

@@ -1,13 +1,14 @@
 --- !ruby/object:Gem::Specification 
 name: roles_mongoid_zhd
 version: !ruby/object:Gem::Version 
-  hash: 31
+  hash: 77
   prerelease: 
   segments: 
   - 0
   - 4
   - 8
-  version: 0.4.8
+  - 1
+  version: 0.4.8.1
 platform: ruby
 authors: 
 - ZhangHanDong