role_making 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bf61b0f58790e176d8bf301c390a8cd980557950
-  data.tar.gz: a4ec93e882f235453a84922fc897a15cbeadeb7c
+  metadata.gz: dd9101daa11496c2da12496ccfdd22d85a6837c2
+  data.tar.gz: d937f52f786591f66c289b143e48555aced4cc00
 SHA512:
-  metadata.gz: e221d282dec866b9b1262a6888b9f399ff06d929ed553a205aaf8ff27ccfa86b22a30c473ee971668166a469912256dba6c6d811f879dcdba087f9a8801844f8
-  data.tar.gz: 642148d06df463a1ca139c9c5fd67a9a1d4e3e3bf19ee3ce8f619cb10e56de78b87d7514502f97f0ccabca8a078a0cb07bfa45a059d987f6e0c661da9f18533f
+  metadata.gz: 64fd8e1222ae4be4f936203d89862873b16df5976192bad03173861197ebe2f7288435577016c416287e38ae2122b0e4a8a7cb167beca7ad39c85c8ff7a93d00
+  data.tar.gz: 8ec78bcdd31367726287854b5a2c6ab810674df26c822593fd6be10e2dd3ea61184dd4415ce55dcc0c1fd8382eaeb81720a527ff58b6d1980f499d0e0d91908e

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 )

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

@@ -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}"
+        join_table = [name.tableize,role_cname.tableize].sort.join("_")
         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
+<<-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
@@ -93,62 +95,66 @@ module RoleMaking
         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
+<<-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.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]
 

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,22 @@ 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)
+        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.3"
+  VERSION = "0.0.4"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: role_making
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - javy_liu
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-09 00:00:00.000000000 Z
+date: 2015-10-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cancancan