role_making 0.0.2.next1 → 0.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 8f7d437e91d318c7c0cba0319e7d5423edefddf7
-  data.tar.gz: 04b37ad153193005fb9a10a8b7ed995292652f10
+SHA256:
+  metadata.gz: d023f18da13dc8704eb3b5824648222f37557cb7ce2621a8e5d78c5197b3fecf
+  data.tar.gz: d87dc8b1348d8d4ff34312e292d4658346ee254c441a9b6b1966a0e294e6d8af
 SHA512:
-  metadata.gz: ab18b5e6c3bcde0775735f114d54a8e5f2b0d317842e0170cc800ddbb184b0b9548ef7e2b32fc99d044ae92611ec53d0676449cb9d3e86c403bf37c81a5f6b9b
-  data.tar.gz: 52a48cf43847b5a2f37b1a031e7e3f49ed47d671b9a71f3333e37cd2fef0d6f406a2c61d4a97b8c5b170fbc9b17ca4dccaec903ab0974f986920042b2193dad4
+  metadata.gz: 7e7fc6214685e1ac7f66942a22e8eba654563c42cedd95e8fd02206f7b4f03624cfe3748710a85238e0d0f744ca46c11a7dcd8d882eb9006b47f411ed3fd66fc
+  data.tar.gz: de0889f852fdc41f69d04d2f9de383749987b5aed2cef9506fa02463408a5d8be31234e3ceee2f360b4bedfb5d9b0d8d1728b031458b9b28ddbde14062cfdeca

data/Gemfile

@@ -1,4 +1,4 @@
-source 'https://rubygems.org'
+source 'https://gems.ruby-china.com/'
 
 # Specify your gem's dependencies in role_making.gemspec
 gemspec

data/README.md

@@ -59,11 +59,43 @@ Or install it yourself as:
 
   This will create:
 
-    db/migrate/201506250001_role_making_create_roles_create.rb
+    db/migrate/201506250001_role_making_create_roles.rb
     db/migrate/201506250002_role_making_create_role_resources.rb
     app/models/role.rb
     app/models/role_resource.rb
     add "role_making" to user.rb
+
+  Define resource
+  ```ruby
+  #with block condition
+  group :kefu do
+    resource [:read,:update,:destroy], Post do |user,post|
+      admin != user
+    end
+
+    resource :create,User
+
+  end
+ 
+  
+  #with hash condition
+  group :kefu do
+    resource :edit, Post , type: 3 
+  end
+  
+  #if the condition need eval,you can do like this
+  group :kefu do
+    resource :edit, Post , con: {user_id: 'user.id'} 
+  end
+
+
+  #with customize resource name
+
+  group :kefu do
+    resource :edit, Post , res_name: 'Edit Post'
+  end
+
+
 ## Contributing
 
 1. Fork it ( https://github.com/javyliu/role_making/fork )
@@ -71,3 +103,7 @@ Or install it yourself as:
 3. Commit your changes (`git commit -am 'Add some feature'`)
 4. Push to the branch (`git push origin my-new-feature`)
 5. Create a new Pull Request
+6.发布 gem
+rake build
+rake release
+

data/lib/generators/USAGE

@@ -30,7 +30,7 @@ Example:
   rails generate role_making user
 
     This will create:
-      db/migrate/201506250001_role_making_create_roles_create.rb
+      db/migrate/201506250001_role_making_create_roles.rb
       db/migrate/201506250002_role_making_create_role_resources.rb
       app/models/role.rb
       app/models/role_resource.rb

data/lib/generators/role_making_generator.rb

@@ -12,7 +12,7 @@ module RoleMaking
       def inject_user_class
         model_path = File.join("app", "models", "#{name.underscore}.rb")
 
-        insert_into_file(model_path,after: "ActiveRecord::Base\n") do
+        insert_into_file(model_path,after: "ApplicationRecord\n") do
           "  role_making role_cname: '#{role_cname.classify}'\n"
         end
 
@@ -35,28 +35,29 @@ module RoleMaking
         Rails::Generators.invoke "cancan:ability",["-s"],behavior: behavior
         model_path = File.join("app", "models", "ability.rb")
         insert_into_file(model_path, after: "    #   end\n") do
-          <<-EOF
-    #{role_cname.classify}.all_without_reserved.each do |role|
-      next unless user.has_role?(role.name)
+        #可以通过对该用户的每个角色来初始化权限，而不用通过轮循所有角色
+        <<-EOF
+    ##{role_cname.classify}.all_without_reserved.each do |role|
+    #  next unless user.has_role?(role.name)
+    user.roles.each do |role|
       role.role_resources.each do |res|
-        resource = Resource.find_by_name(res.resource_name)
+        resource = Resource.find_by_name(res.resource_name) rescue next
         if block = resource.behavior
           can resource.verb,resource.object do |obj|
             block.call(user,obj)
           end
-        elsif resource.hash
-          eval_con = resource.hash.delete(:con).try(:inject,{}) do |r,(k,v)|
+        elsif resource.hashs
+          eval_con = resource.hashs.delete(:con).try(:inject,{}) do |r,(k,v)|
             r[k] = eval(v)
             r
-          end
-          can resource[:verb],resource[:object],resource[:hash].merge(eval_con)
+          end || {}
+          can resource[:verb],resource[:object],resource[:hashs].except(:con).merge(eval_con)
         else
           can resource[:verb],resource[:object]
         end
       end
     end \n
-          EOF
-
+        EOF
 
         end if behavior == :invoke
 
@@ -74,16 +75,17 @@ module RoleMaking
         model_path = File.join("app", "models", "#{role_cname.underscore}.rb")
 
         join_table = "#{name.tableize}_#{role_cname.tableize}"
-        insert_into_file(model_path,after: "ActiveRecord::Base\n") do
-          <<-EOF
-            RESERVED = [:admin,:guest]
-            has_and_belongs_to_many :#{name}, join_table: :#{join_table}
-            has_many :role_resources, dependent: :destroy
-
-            def self.all_with_reserved
-              self.all.where("name not in ?",RESERVED)
-            end
-          EOF
+        join_table = [name.tableize,role_cname.tableize].sort.join("_")
+        insert_into_file(model_path,after: "ApplicationRecord\n") do
+<<-EOF
+  RESERVED = [:admin,:guest]
+  has_and_belongs_to_many :#{name.tableize}, join_table: :#{join_table}
+  has_many :role_resources, dependent: :destroy
+
+  def self.all_without_reserved
+    where("name not in (?)",RESERVED)
+  end
+EOF
         end
 
       end
@@ -92,63 +94,67 @@ module RoleMaking
       def inject_role_resource_class
         model_path = File.join("app", "models", "role_resource.rb")
 
-        insert_into_file(model_path,after: "ActiveRecord::Base\n") do
-          <<-EOF
-            validates_uniqueness_of :resource_name, scope: :#{role_cname.underscore}_id
+        insert_into_file(model_path,after: "ApplicationRecord\n") do
+<<-EOF
+  validates_uniqueness_of :resource_name, scope: :#{role_cname.underscore}_id
 
-            belongs_to :#{role_cname.underscore}
-          EOF
+  belongs_to :#{role_cname.underscore}
+EOF
         end
       end
 
 
       def create_migration
-        role_table = role_cname.tableize
-        join_table = "#{name.tableize}_#{role_table}"
-        user_reference = name.underscore
-        role_reference = role_cname.underscore
-        role_file = "db/migrate/201506250001_role_making_create_#{role_table}.rb"
-        role_resource_file = "db/migrate/201506250002_role_making_create_role_resources.rb"
-
-        create_file role_file do
-          <<-EOF
-          class RoleMakingCreate#{role_table.camelize} < ActiveRecord::Migration
-            def change
-              create_table(:#{role_table}) do |t|
-                t.string :name
-                t.string :display_name
-
-                t.timestamps
-              end
-
-              create_table(:#{join_table}, :id => false) do |t|
-                t.references :#{user_reference}
-                t.references :#{role_reference}
-              end
-
-              add_index(:#{role_table}, :name)
-              add_index(:#{join_table}, [ :#{user_reference}_id, :#{role_reference}_id ])
-            end
-          end
-          EOF
-
-        end
-        create_file role_resource_file do
-          <<-EOF
-          class RoleMakingCreateRoleResources < ActiveRecord::Migration
-            def change
-              create_table(:role_resources) do |t|
-                t.references :#{role_reference}
-                t.string :resource_name
-
-                t.timestamps
-              end
-
-              add_index(:role_resources, :#{role_reference}_id)
-            end
-          end
-          EOF
-      end
+        #role_name = role_cname.underscore
+        #join_table = "#{name.underscore}_#{role_name}"
+        #user_reference = name.underscore
+        #role_reference = role_cname.underscore
+        #role_file = "db/migrate/201506250001_role_making_create_#{role_table}.rb"
+        #role_resource_file = "db/migrate/201506250002_role_making_create_role_resources.rb"
+
+#        create_file role_file do
+#          <<-EOF
+#class RoleMakingCreate#{role_table.camelize} < ActiveRecord::Migration
+#  def change
+#    create_table(:#{role_table}) do |t|
+#      t.string :name
+#      t.string :display_name
+#
+#      t.timestamps
+#    end
+#
+#    create_table(:#{join_table}, :id => false) do |t|
+#      t.references :#{user_reference}
+#      t.references :#{role_reference}
+#    end
+#
+#    add_index(:#{role_table}, :name)
+#    add_index(:#{join_table}, [ :#{user_reference}_id, :#{role_reference}_id ])
+#  end
+#end
+#          EOF
+#
+#        end
+
+        Rails::Generators.invoke "migration",["create_#{role_cname.tableize}","name:string{20}:index","display_name:string{30}","created_at:datetime","updated_at:datetime"], behavior: behavior
+        Rails::Generators.invoke "migration",["create_user_join_table","#{name.tableize}","#{role_cname.tableize}:uniq"], behavior: behavior
+        Rails::Generators.invoke "migration",["create_role_resource","#{role_cname.underscore}_id:integer:index","resource_name:string{50}:index","created_at:datetime","updated_at:datetime"], behavior: behavior
+#        create_file role_resource_file do
+#          <<-EOF
+#class RoleMakingCreateRoleResources < ActiveRecord::Migration
+#  def change
+#    create_table(:role_resources) do |t|
+#      t.references :#{role_reference}
+#      t.string :resource_name
+#
+#      t.timestamps
+#    end
+#
+#    add_index(:role_resources, :#{role_reference}_id)
+#  end
+#end
+#          EOF
+#      end
       end
 
 

data/lib/generators/templates/resource.rb

@@ -15,4 +15,9 @@ class Resource
   #  resource [:update,:destroy,:create],Post
   #end
 
+  ##with hashs
+  #group :post do
+  #  resource :read,Post
+  #  resource [:update,:destroy,:create],Post,con: {user_id: 'user.leader_data'}
+  #end
 end

data/lib/role_making/resourcing.rb

@@ -6,7 +6,16 @@ module RoleMaking
       @groups = []
       @current_group = nil
       @resources = []
-      Res = Struct.new(:name,:group,:verb,:hash,:object,:behavior)
+      Res = Struct.new(:name,:group,:verb,:hashs,:object,:behavior,:action_scope,:res_scope)
+      #need set locale yml file
+      class Res
+        def human_name
+          action,res = self.name.split("@")
+          ac = I18n.t(action,scope: (self.action_scope || 'actions'),throw: true) rescue action
+          _res = I18n.t(res,scope: (self.res_scope || 'activerecord.models'),throw: true) rescue res
+          "#{ac}#{_res}"
+        end
+      end
     end
 
     module ClassMethods
@@ -18,18 +27,23 @@ module RoleMaking
         block.call
       end
 
-      def resource(verb_or_verbs,object,hash=nil,&block)
+
+
+      def resource(verb_or_verbs,object,hashs=nil,&block)
         raise "Need define group first" if @current_group.nil?
         group = @current_group
         behavior = block
         Array.wrap(verb_or_verbs).each do |verb|
-          add_resource(group,verb,object,hash,behavior)
+          add_resource(group,verb,object,hashs.try(:dup),behavior)
         end
       end
 
-      def add_resource(group,verb,object,hash,behavior)
-        name = "#{verb}_#{object.to_s.underscore}"
-        resource = Res.new(name,group,verb,hash,object,behavior)
+      def add_resource(group,verb,object,hashs,behavior)
+        name = "#{verb}@#{hashs.try(:delete,:res_name) || object.to_s.underscore}"
+        action_scope =  hashs.try(:delete,:action_scope)
+        res_scope = hashs.try(:delete,:res_scope)
+        hashs = nil if hashs.blank?
+        resource = Res.new(name,group,verb,hashs,object,behavior,action_scope,res_scope)
         @resources << resource
       end
 

data/lib/role_making/role.rb

@@ -13,12 +13,14 @@ module RoleMaking
     alias_method :grant, :add_role
 
     def has_role?(role_name)
-      role_array = if new_record?
-                     self.roles.detect { |r| r.name.to_s == role_name.to_s }
-                   else
-                     self.roles.exists?( name: role_name)
-                   end
-      !!role_array
+     # role_array = if new_record?
+     #                self.roles.detect { |r| r.name.to_s == role_name.to_s }
+     #              else
+     #                #self.respond_to?(:cache_roles) ? self.cache_roles.detect{|it| it.name == role_name.to_s} : self.roles.exists?( name: role_name)
+     #                self.roles.detect {||}
+     #              end
+      !!self.roles.detect { |r| r.name.to_s == role_name.to_s }
+      #!!role_array
     end
 
     def has_all_roles?(*args)
@@ -39,7 +41,8 @@ module RoleMaking
     alias_method :revoke, :remove_role
 
     def roles_name
-      self.roles.select(:name).map { |r| r.name }
+      #self.roles.select(:name).map { |r| r.name }
+      self.roles.map { |r| r.display_name }
     end
 
   end

data/lib/role_making/version.rb

@@ -1,3 +1,3 @@
 module RoleMaking
-  VERSION = "0.0.2.next1"
+  VERSION = "0.2.3"
 end

data/lib/role_making.rb

@@ -13,7 +13,7 @@ module RoleMaking
     self.role_cname = options[:role_cname]
     self.role_table_name = self.role_cname.tableize.gsub(/\//, "_")
 
-    default_join_table = "#{self.to_s.tableize.gsub(/\//, "_")}_#{self.role_table_name}"
+    default_join_table = [self.to_s.tableize.gsub(/\//, "_"),self.role_table_name].sort.join("_")
     options.reverse_merge!({:role_join_table_name => default_join_table})
     self.role_join_table_name = options[:role_join_table_name]
 
@@ -21,12 +21,9 @@ module RoleMaking
     rolify_options.merge!({ :join_table => self.role_join_table_name })
     rolify_options.merge!(options.reject{ |k,v| ![ :before_add, :after_add, :before_remove, :after_remove ].include? k.to_sym })
 
-    has_and_belongs_to_many :roles, rolify_options
+    has_and_belongs_to_many :roles, **rolify_options
+    #has_and_belongs_to_many :roles, class_name: 'role', join_table: 'roles_users'
 
     #load_dynamic_methods if RoleMaking.dynamic_shortcuts
   end
-
-
-
-
 end

data/role_making.gemspec

@@ -18,7 +18,7 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
-  spec.add_dependency 'cancancan', '~> 1.10','>= 1.10.1'
-  spec.add_development_dependency "bundler", "~> 1.7"
-  spec.add_development_dependency "rake", "~> 10.0"
+  spec.add_dependency 'cancancan'#, '~> 1.10','>= 1.10.1'
+  spec.add_development_dependency "bundler", "~> 2.2"
+  spec.add_development_dependency "rake", "~> 13.0"
 end

metadata

@@ -1,63 +1,57 @@
 --- !ruby/object:Gem::Specification
 name: role_making
 version: !ruby/object:Gem::Version
-  version: 0.0.2.next1
+  version: 0.2.3
 platform: ruby
 authors:
 - javy_liu
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2015-07-09 00:00:00.000000000 Z
+date: 2021-10-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cancancan
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.10'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.10.1
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.10'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.10.1
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.7'
+        version: '2.2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.7'
+        version: '2.2'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '13.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '13.0'
 description: A gem for resource manage based on role
 email:
 - javy_liu@163.com
@@ -84,7 +78,7 @@ homepage: https://github.com/javyliu/role_making
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -95,14 +89,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.4.6
-signing_key: 
+rubygems_version: 3.2.3
+signing_key:
 specification_version: 4
 summary: for custom defined role to manage the resources
 test_files: []
-has_rdoc: