i_am_i_can 3.0.0 → 3.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2cda6740e5fdc39a1bf281df8ec61425d001171a
-  data.tar.gz: 263b17f70ce6ff0fdfdfff8338a85b798e43b500
+  metadata.gz: 56545e764dcd1ae9cae7fc388f12df0db09c7628
+  data.tar.gz: c8dc0126bdd98e472472cb6a105442979a19ef86
 SHA512:
-  metadata.gz: b6d4f29d6565b394bce3d01ddab46f2532d307b093318b5a9cc01e8ce1746edbc3dbe0616403a9a1ab96b05403ac02b933fb90c0f089d99e0746d9efb1040897
-  data.tar.gz: a545727532511dbb469b0057b5160764442896f9c10d0705a43ce13b40b1bb4c55d3b40be3579449804b653a904cbf5e48ecbcbb6d38472f0ff8bde4d6f45497
+  metadata.gz: fea3768f4b9d4391cb2fb7b0c2be7dfe7f553ead20e004bfdea97ad1a50366b85eb02ebbf905a9d85b72dab2fe4c344c1db58ba23e67bb71ee2d80bbe0c3ddc2
+  data.tar.gz: aa61ca4f7801fc754cb9b3516a1168de3779ad5c9a6205eb2f18f52acca4d10d0686d71e4e9907553ac50d54e5e4dc612478b07b8f5bb82903cd12473947d27c

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    i_am_i_can (3.0.0)
+    i_am_i_can (3.0.1)
       activerecord
       activesupport
       railties

data/README.md

@@ -136,7 +136,7 @@ Resource.that_allow(user).to(:manage) # => Active::Relation
       has_and_belongs_to_many :stored_roles,
                               join_table: 'users_and_user_roles', foreign_key: 'user_role_id', class_name: 'UserRole', association_foreign_key: 'user_id'
    
-      act_as_subject
+      acts_as_subject
     end
     ```
 

data/lib/generators/i_am_i_can/setup_generator.rb

@@ -55,12 +55,14 @@ module IAmICan
       end
 
       def tips
-        puts "    Add the code below to #{name_c}:".green
+        puts "\nAdd the code below to #{name_c}:".green
         puts <<~TIPS
-          has_and_belongs_to_many :stored_roles,
-                                  join_table: '#{subj_role_tb}', foreign_key: '#{role_u}_id', class_name: '#{role_c}', association_foreign_key: '#{name_u}_id'
-
-          act_as_subject
+          |
+          |  has_and_belongs_to_many :stored_roles,
+          |                          join_table: '#{subj_role_tb}', foreign_key: '#{role_u}_id', class_name: '#{role_c}', association_foreign_key: '#{name_u}_id'
+          |
+          |  acts_as_subject
+          |
         TIPS
       end
 
@@ -85,9 +87,9 @@ module IAmICan
       def permission_up; @ii_opts[:permission_class].underscore.pluralize end
 
       def subj_role_tb; name_up + '_and_' + role_up end
-      def group_role_tb; group_up + '_and_' + role_up end
+      def group_role_tb; group_up + '_and_' + role_up rescue nil end
       def role_pms_tb; role_up + '_and_' + permission_up end
-      def group_pms_tb; group_up + '_and_' + permission_up end
+      def group_pms_tb; group_up + '_and_' + permission_up rescue nil end
     end
   end
 end

data/lib/generators/i_am_i_can/templates/initializers/i_am_i_can.erb

@@ -3,6 +3,6 @@ IAmICan::Configs.set_for(subject: '<%= name_c %>',
                          permission: '<%= @ii_opts[:permission_class] %>'<% unless @ii_opts[:without_group] %>,
                          role_group: '<%= @ii_opts[:role_group_class] %>'<% end %>) do |config|
 <% @ii_opts.except(:role_class, :permission_class, :role_group_class).each do |k, v| %>
-  <%= "config.#{k} = " %><%= v %>
+    <%= "config.#{k} = " %><%= v %>
 <% end %>
 end

data/lib/generators/i_am_i_can/templates/migrations/i_am_i_can.erb

@@ -7,8 +7,9 @@ class <%= name_c %>Am<%= name_c %>Can < ActiveRecord::Migration::Current
       t.timestamps
     end
 
-    add_index :<%= role_up %>, :name,
-              unique: true, name: '<%= role_up %>_unique_index', using: :btree
+    add_index :<%= role_up %>, :name, unique: true, name: '<%= role_up %>_unique_index'
+
+    # === end of role table ===
 <% unless @ii_opts[:without_group] %>
     create_table :<%= group_up %>, force: :cascade do |t|
       t.string  :name, null: false
@@ -17,8 +18,10 @@ class <%= name_c %>Am<%= name_c %>Can < ActiveRecord::Migration::Current
       t.timestamps
     end
 
-    add_index :<%= group_up %>, :name,
-              unique: true, name: '<%= group_up %>_unique_index', using: :btree
+    add_index :<%= group_up %>, :name, unique: true, name: '<%= group_up %>_unique_index'
+
+    # === end of role group table ===
+
 <% end %>
     create_table :<%= permission_up %>, force: :cascade do |t|
       t.string  :pred,     null: false
@@ -29,8 +32,11 @@ class <%= name_c %>Am<%= name_c %>Can < ActiveRecord::Migration::Current
       t.timestamps
     end
 
-    add_index :<%= permission_up %>, %i[ pred obj_type obj_id ],
-              unique: true, name: '<%= permission_up %>_unique_index', using: :btree
+    add_index :<%= permission_up %>, %i[ pred obj_type obj_id ], unique: true, name: '<%= permission_up %>_unique_index'
+    ### Open below if you want to use `Resource.that_allow` frequently
+    # add_index :<%= permission_up %>, %i[ pred obj_type ], name: '<%= permission_up %>_resource_search_index'
+
+    # === end of permission table ===
 
     create_table :<%= subj_role_tb %>, id: false, force: :cascade do |t|
       t.belongs_to :<%= name_u %>, null: false#, index: false
@@ -41,6 +47,8 @@ class <%= name_c %>Am<%= name_c %>Can < ActiveRecord::Migration::Current
     # add_index :<%= subj_role_tb %>, :<%= role_u %>_id, name: ':<%= subj_role_tb %>_index2'
     add_index :<%= subj_role_tb %>, [ :<%= name_u %>_id, :<%= role_u %>_id ],
               unique: true, name: '<%= subj_role_tb %>_uniq_index'
+
+    # === end of subject-role table ===
 <% unless @ii_opts[:without_group] %>
     create_table :<%= group_role_tb %>, id: false, force: :cascade do |t|
       t.belongs_to :<%= group_u %>, null: false#, index: false
@@ -52,6 +60,8 @@ class <%= name_c %>Am<%= name_c %>Can < ActiveRecord::Migration::Current
     add_index :<%= group_role_tb %>, [ :<%= group_u %>_id, :<%= role_u %>_id ],
               unique: true, name: '<%= group_role_tb %>_uniq_index'
 
+    # === end of group-role table ===
+
 <% end %>
     create_table :<%= role_pms_tb %>, id: false, force: :cascade do |t|
       t.belongs_to :<%= role_u %>, null: false#, index: false
@@ -62,6 +72,8 @@ class <%= name_c %>Am<%= name_c %>Can < ActiveRecord::Migration::Current
     # add_index :<%= role_pms_tb %>, :<%= permission_u %>_id, name: '<%= role_pms_tb %>_index2'
     add_index :<%= role_pms_tb %>, [ :<%= role_u %>_id, :<%= permission_u %>_id ],
               unique: true, name: '<%= role_pms_tb %>_uniq_index'
+
+    # === end of role-permission table ===
 <% unless @ii_opts[:without_group] %>
     create_table :<%= group_pms_tb %>, id: false, force: :cascade do |t|
       t.belongs_to :<%= group_u %>, null: false#, index: false
@@ -73,6 +85,8 @@ class <%= name_c %>Am<%= name_c %>Can < ActiveRecord::Migration::Current
     add_index :<%= group_pms_tb %>, [ :<%= group_u %>_id, :<%= permission_u %>_id ],
               unique: true, name: '<%= group_pms_tb %>_uniq_index'
 
+    # === end of group-permission table ===
+
 <% end %>
   end
 end

data/lib/generators/i_am_i_can/templates/models/permission.erb

@@ -5,7 +5,7 @@ class <%= permission_c %> < ActiveRecord::Base
   has_and_belongs_to_many :related_role_groups,
                           join_table: '<%= group_pms_tb %>', foreign_key: :<%= group_u %>_id, class_name: '<%= group_c %>', association_foreign_key: :<%= permission_u %>_id
 <% end %>
-  act_as_permission
+  acts_as_permission
 end
 
 __END__

data/lib/generators/i_am_i_can/templates/models/role.erb

@@ -8,7 +8,7 @@ class <%= role_c %> < ActiveRecord::Base
   has_and_belongs_to_many :stored_permissions,
                           join_table: '<%= role_pms_tb %>', foreign_key: :<%= permission_u %>_id, class_name: '<%= permission_c %>', association_foreign_key: :<%= role_u %>_id
 
-  act_as_role
+  acts_as_role
 
   # default_scope { with_stored_permissions }
 end

data/lib/generators/i_am_i_can/templates/models/role_group.erb

@@ -5,7 +5,7 @@ class RoleGroup < ActiveRecord::Base
   has_and_belongs_to_many :members,
                           join_table: '<%= group_role_tb %>', foreign_key: :<%= role_u %>_id, class_name: '<%= role_c %>', association_foreign_key: :<%= group_u %>_id
 
-  act_as_role_group
+  acts_as_role_group
 
   # default_scope { with_members.with_stored_permissions) }
 end

data/lib/i_am_i_can/resource.rb

@@ -22,7 +22,7 @@ module IAmICan
     def to(pred)
       roles = Configs.take.subject_model._roles
       permissions = Configs.take.role_model._permissions
-      allowed_ids = subject.send(roles).send(permissions).where(pred: pred, obj_type: records.name).pluck(:obj_id)
+      allowed_ids = subject.send(roles).send(permissions).where(pred: pred, obj_type: records.name).pluck(:obj_id).uniq
       records.where(id: allowed_ids)
     end
   end

data/lib/i_am_i_can/version.rb

@@ -1,3 +1,3 @@
 module IAmICan
-  VERSION = '3.0.0'
+  VERSION = '3.0.1'
 end

data/lib/i_am_i_can.rb

@@ -12,7 +12,7 @@ require 'i_am_i_can/subject'
 require 'i_am_i_can/resource'
 
 module IAmICan
-  def act_as_subject
+  def acts_as_subject
     i_am_i_can.act = :subject
     include Subject
 
@@ -27,7 +27,7 @@ module IAmICan
     instance_exec(%i[ role ], &DynamicGenerate.assignment_helpers)
   end
 
-  def act_as_role
+  def acts_as_role
     i_am_i_can.act = :role
     include Role
 
@@ -40,7 +40,7 @@ module IAmICan
     instance_exec(%i[ permission ], &DynamicGenerate.assignment_helpers)
   end
 
-  def act_as_role_group
+  def acts_as_role_group
     i_am_i_can.act = :role_group
     include Role
 
@@ -53,7 +53,7 @@ module IAmICan
     instance_exec(%i[ role permission ], &DynamicGenerate.assignment_helpers)
   end
 
-  def act_as_permission
+  def acts_as_permission
     i_am_i_can.act = :permission
     include Permission
 
@@ -62,7 +62,7 @@ module IAmICan
     instance_exec(&DynamicGenerate.class_reflections)
   end
 
-  def act_as_allowed_resource
+  def acts_as_allowed_resource
     include Resource
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: i_am_i_can
 version: !ruby/object:Gem::Version
-  version: 3.0.0
+  version: 3.0.1
 platform: ruby
 authors:
 - zhandao
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-10-23 00:00:00.000000000 Z
+date: 2018-10-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler