i_am_i_can 4.3.3 → 4.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bc8efa706ad5886dd1188273bfed33bf80c80fbf
-  data.tar.gz: f1449022f144128db5ed05e85c5d973b08ded6d5
+  metadata.gz: ab915220af5d95373eaa8b8a57563d311a7f2903
+  data.tar.gz: ea007c8d5b61f511dcbfd799432d5221dd666804
 SHA512:
-  metadata.gz: 0f809fa65dc6c707f40bae254e048103dc0ad3614831447228046f79586b188e46f4257221849243f2b6bed41d997f3f0d048b3b5a52df1aa263f007fe2512ed
-  data.tar.gz: 9ff64d80f81f29e1e549bc8af7016c8ae64b43d41225aa63c39ba9fc5952678d7978f388fa1ab81173b93d97eb68826c05738483f0c121e005e64732b2976a72
+  metadata.gz: dd645226ade084917ddc64405009d1c7c6f2b8ead5c69544be10e296264a963ab38ab2f851ac46633cbb36c45d052330a1899e3381b1517bc1804c83fb7dbf26
+  data.tar.gz: 0e7ecdb8a56621234a9f52dc9c3f8a6131b55ea0674fe7c78a5c1f84c66305f0ce80a7137d2d3e0a109cae2260cd9cf4f23e8de257906be08aa9f9f843180462

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 IAmICan::Configs.set_for(subject: '<%= name_c %>',
                          role: '<%= @ii_opts[:role_class] %>',
                          permission: '<%= @ii_opts[:permission_class] %>'<% unless @ii_opts[:without_group] %>,

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class <%= permission_c %> < ActiveRecord::Base
   has_and_belongs_to_many :related_roles,
                           join_table: '<%= role_pms_tb %>', foreign_key: :<%= permission_u %>_id,

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class <%= role_c %> < ActiveRecord::Base
   has_and_belongs_to_many :related_users,
                           join_table: '<%= subj_role_tb %>', foreign_key: :<%= role_u %>_id,

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class RoleGroup < ActiveRecord::Base
   has_and_belongs_to_many :permissions,
                           join_table: '<%= group_pms_tb %>', foreign_key: :<%= group_u %>_id,

data/lib/i_am_i_can/configs/config.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module IAmICan
   module Configs
     class Config

data/lib/i_am_i_can/configs/configs.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'i_am_i_can/configs/config'
 
 module IAmICan

data/lib/i_am_i_can/helpers/dynamic.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module IAmICan
   module Dynamic
     extend self
@@ -8,9 +10,20 @@ module IAmICan
       #
       # scope :with_stored_roles, -> { includes(:stored_roles) }
       #
+      # Usage:
+      #   User.with_stored_roles(role_id = 1)
+      #   User.with_stored_roles?(role_id = 1)
       proc do |keys|
         keys.each do |k|
-          scope :"with_#{_reflect_of(k)}", ->  { includes(_reflect_of(k)) }
+          scope :"with_#{_reflect_of(k)}", -> (ids = nil) do
+            break includes(_reflect_of(k)) unless ids
+            includes(_reflect_of(k)).where(
+                i_am_i_can.send("#{k}_class").underscore.pluralize => { id: ids })
+          end
+
+          define_singleton_method :"with_#{_reflect_of(k)}?" do |ids|
+            send(:"with_#{_reflect_of(k)}", ids).present?
+          end
         end
       end
     end

data/lib/i_am_i_can/helpers/result_of.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module IAmICan
   module ResultOf
     module Role

data/lib/i_am_i_can/permission/assignment.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module IAmICan
   module Permission
     module Assignment

data/lib/i_am_i_can/permission/definition.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module IAmICan
   module Permission
     module Definition

data/lib/i_am_i_can/permission.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'i_am_i_can/permission/definition'
 require 'i_am_i_can/permission/assignment'
 

data/lib/i_am_i_can/resource.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module IAmICan
   module Resource
     extend ActiveSupport::Concern

data/lib/i_am_i_can/role/assignment.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module IAmICan
   module Role
     module Assignment

data/lib/i_am_i_can/role/definition.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module IAmICan
   module Role
     module Definition

data/lib/i_am_i_can/role/grouping.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module IAmICan
   module Role
     module Grouping

data/lib/i_am_i_can/role.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'i_am_i_can/role/definition'
 require 'i_am_i_can/role/assignment'
 require 'i_am_i_can/role/grouping'
@@ -15,6 +17,11 @@ module IAmICan
       def names
         self.pluck(:name).map(&:to_sym)
       end
+
+      def can?(action, obj)
+        send("with_#{_reflect_of('permission')}?",
+             i_am_i_can.permission_model.matched(action, obj).ids)
+      end
     end
 
     included do

data/lib/i_am_i_can/role_group/definition.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module IAmICan
   module RoleGroup
     module Definition

data/lib/i_am_i_can/subject/permission_querying.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module IAmICan
   module Subject
     module PermissionQuerying
@@ -40,12 +42,12 @@ module IAmICan
       alias can_every! can_each!
 
       def temporarily_can? action, obj
-        return false if temporary_roles.blank?
-        valid_temporary_roles._permissions.matched?(action, obj)
+        return false if try(:temporary_roles).blank?
+        valid_temporary_roles.can?(action, obj)
       end
 
       def stored_can? action, obj
-        _roles._permissions.matched?(action, obj)
+        _roles.can?(action, obj)
       end
 
       def group_can? action, obj, without_group = false

data/lib/i_am_i_can/subject/role_querying.rb

@@ -1,48 +1,58 @@
+# frozen_string_literal: true
+
 module IAmICan
   module Subject
     module RoleQuerying
 
       # === Role Querying ===
 
-      def is? role_name
-        roles.find_by(name: role_name).present?
+      def is? role_name, with_tmp: true
+        role_id = i_am_i_can.role_model.find_by(name: role_name)&.id
+        return false unless role_id
+        get_roles(with_tmp: with_tmp).exists?(id: role_id)
       end
 
       alias is_role?  is?
       alias has_role? is?
 
-      def isnt? role
-      !is? role
+      def isnt? role_name, with_tmp: true
+      !is? role_name, with_tmp: with_tmp
       end
 
-      def is! role
-        raise VerificationFailed if isnt? role
+      def is! role_name, with_tmp: true
+        raise VerificationFailed if isnt? role_name, with_tmp: with_tmp
         true
       end
 
       alias is_role!  is!
       alias has_role! is!
 
-      def is_one_of? *role_names
-        roles.where(name: role_names).present?
+      def is_one_of? *role_names, with_tmp: true
+        role_ids = i_am_i_can.role_model.where(name: role_names).ids
+        return false if role_ids.blank?
+        get_roles(with_tmp: with_tmp).exists?(id: role_ids)
       end
 
       alias is_one_of_roles? is_one_of?
 
-      def is_one_of! *roles
-        raise VerificationFailed unless is_one_of? *roles
+      def is_one_of! *role_names, with_tmp: true
+        raise VerificationFailed unless is_one_of? *role_names, with_tmp: with_tmp
+        true
       end
 
       alias is_one_of_roles! is_one_of!
 
-      def is_every? *role_names
-        roles.where(name: role_names).count == role_names.count
+      def is_every? *role_names, with_tmp: true
+        role_ids = i_am_i_can.role_model.where(name: role_names).ids
+        return false if role_ids.size != role_names.size
+        get_roles(with_tmp: with_tmp).where(id: role_ids).size == role_names.size
       end
 
       alias is_every_role_in? is_every?
 
-      def is_every! *roles
-        roles.each { |role| is! role } && true
+      def is_every! *role_names, with_tmp: true
+        raise VerificationFailed unless is_every?(*role_names, with_tmp: true)
+        true
       end
 
       alias is_every_role_in! is_every!
@@ -51,7 +61,7 @@ module IAmICan
 
       def is_in_role_group? name
         group_members = i_am_i_can.role_group_model.find_by!(name: name)._roles.names
-        (roles.names & group_members).present?
+        (get_roles.names & group_members).present?
       end
 
       alias in_role_group? is_in_role_group?

data/lib/i_am_i_can/subject.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'i_am_i_can/subject/role_querying'
 require 'i_am_i_can/subject/permission_querying'
 
@@ -15,6 +17,14 @@ module IAmICan
                        Class.new(ActiveRecord::Base)
       has_many :"assoc_with_#{__roles}", -> { where('expire_at IS NULL OR expire_at > ?', Time.current) },
                class_name: role_assoc_class
+
+      def get_roles(with_tmp: true)
+        if with_tmp && (tmp_ids = try(:temporary_roles)&.map(&:id)).present?
+          i_am_i_can.role_model.where(id: (tmp_ids + _roles.ids).uniq)
+        else
+          _roles
+        end
+      end
     end
   end
 end

data/lib/i_am_i_can/support/association_class_methods.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module IAmICan
   module Association_ClassMethods
     def has_many_temporary_roles(name: nil)
@@ -11,12 +13,6 @@ module IAmICan
         i_am_i_can.role_model.where(id: temporary_roles.map(&:id))
       end
 
-      raise "Do not set the role association name to `roles` in #{self.class.name} model" if respond_to?(:roles)
-      define_method :roles do
-        ids = (temporary_roles.map(&:id) + _roles.ids).uniq
-        i_am_i_can.role_model.where(id: ids)
-      end
-
       define_method :temporary_role_names do
         temporary_roles.map(&:name).map(&:to_sym)
       end

data/lib/i_am_i_can/support/configurable.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'i_am_i_can/configs/configs'
 
 module IAmICan

data/lib/i_am_i_can/support/reflection.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module IAmICan
   module Reflection
     extend ActiveSupport::Concern

data/lib/i_am_i_can/version.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module IAmICan
-  VERSION = '4.3.3'
+  VERSION = '4.4.0'
 end

data/lib/i_am_i_can.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'active_record'
 require 'active_support/core_ext/object/inclusion'
 require 'active_support/core_ext/hash/deep_merge'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: i_am_i_can
 version: !ruby/object:Gem::Version
-  version: 4.3.3
+  version: 4.4.0
 platform: ruby
 authors:
 - zhandao
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-01-12 00:00:00.000000000 Z
+date: 2019-02-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler