i_am_i_can 2.1.0 → 3.0.0pre

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA256:
-  metadata.gz: 5552a6adc5472f8c56efe657bb014182a539540556e04d28c8ab860a0a64b357
-  data.tar.gz: 7491c05645c20f700640b6c5997da5b2de0dc9c4b40951b533b07ec0fa0cef6e
+SHA1:
+  metadata.gz: 8a7c648cdb9a60d42ca538e28735070ef9644325
+  data.tar.gz: 4a5ee5a0a56967049baeeddafc944fe6fc548479
 SHA512:
-  metadata.gz: a933b064c9db820e5a4e2d4a8f8bb24a2261594af0452f4466698a470e5881bf3c7019fa9c7b4f218e7d72da81d59596d8be8758c80bd21dc61ffbf131097221
-  data.tar.gz: 8c08000f4f73dbf53b75e99e97a9d9e5cc1aae73c3eef96edc84c2f630324e2a0be6146d79f3fd1bb51b45b12d32fd4bae3345f376ea64734fd8140a1ee82cd3
+  metadata.gz: f684f54b656c925ff293706fec374eee0592b7ad91df3502e4fa031255f17f96cac95c22c8ee9e0426786453539ec6d26400b6fb8c9afe11d10dfa1b306d4343
+  data.tar.gz: a855e8ebc30a47548b42be4f43ef07d4ec90816418369962e9562b3e773e878c7a2c748501911c41f77d891cd4f85562ec5491a7dec7c44e699510954c8c9bba

data/.github/issue_template.md

@@ -0,0 +1,15 @@
+### Steps to reproduce
+
+### Expected behavior
+Tell us what should happen
+
+### Actual behavior
+Tell us what happens instead
+
+### System configuration
+
+**Rails version**:
+
+**Ruby version**:
+
+**Database**:

data/.github/pull_request_template.md

@@ -0,0 +1,8 @@
+### Summary
+
+### Check List
+
+- [ ] documentation
+    - [ ] README
+    - [ ] CHANGELOG
+- [ ] unit test

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    i_am_i_can (2.1.0)
+    i_am_i_can (3.0.0pre)
       activerecord
       activesupport
       railties
@@ -35,6 +35,7 @@ GEM
       tzinfo (~> 1.1)
     arel (9.0.0)
     builder (3.2.3)
+    coderay (1.1.2)
     concurrent-ruby (1.0.5)
     crass (1.0.4)
     database_cleaner (1.7.0)
@@ -52,7 +53,9 @@ GEM
     minitest (5.11.3)
     nokogiri (1.8.4)
       mini_portile2 (~> 2.3.0)
-    pg (1.0.0)
+    pry (0.11.3)
+      coderay (~> 1.1.0)
+      method_source (~> 0.9.0)
     rack (2.0.5)
     rack-test (1.1.0)
       rack (>= 1.0, < 3)
@@ -106,11 +109,11 @@ DEPENDENCIES
   bundler (~> 1.16)
   database_cleaner
   i_am_i_can!
-  pg
+  pry
   rake (~> 10.0)
   rspec (~> 3.0)
   rspec-rails
   simplecov
 
 BUNDLED WITH
-   1.16.1
+   1.16.6

data/README.md

@@ -1,4 +1,4 @@
-# IAmICan [PostgreSQL only currently]
+# IAmICan
 
 [![Build Status](https://travis-ci.org/zhandao/i_am_i_can.svg?branch=master)](https://travis-ci.org/zhandao/i_am_i_can)
 [![Maintainability](https://api.codeclimate.com/v1/badges/27b664da01b6cc7180e3/maintainability)](https://codeclimate.com/github/zhandao/i_am_i_can/maintainability)

data/i_am_i_can.gemspec

@@ -26,8 +26,8 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "rspec", "~> 3.0"
   spec.add_development_dependency 'rspec-rails'
   spec.add_development_dependency 'database_cleaner'
-  spec.add_development_dependency 'pg'
   spec.add_development_dependency 'simplecov'
+  spec.add_development_dependency 'pry'
 
 
   spec.add_dependency 'activerecord'

data/lib/generators/i_am_i_can/setup_generator.rb

@@ -44,8 +44,8 @@ module IAmICan
 
       def tip
         options = ' ' + @ii_opts.to_s[2..-2].gsub('=>', ': ').gsub(', :', ', ') if @ii_opts.keys.present?
-        puts 'Please add this line to your subject model:'.red
-        puts "    act_as_i_am_i_can#{options}".red
+        puts 'Please add this line to your subject model:'.green
+        puts "    act_as_i_am_i_can#{options}".green
       end
 
       def self.next_migration_number(dirname)

data/lib/i_am_i_can/permission/definition.rb

@@ -6,8 +6,8 @@ module IAmICan
     module Definition
       include Helpers::Cls
 
-      def which(name:)
-        find_by!(name: name)
+      def which(name:, **conditions)
+        find_by!(name: name, **conditions)
       end
 
       def have_permission *preds, obj: nil, desc: nil, save: config.default_save

data/lib/i_am_i_can/permission/helpers.rb

@@ -6,7 +6,8 @@ module IAmICan
           prefix = 'Permission Definition Done'
           fail_msg = prefix + ", but #{failed_items} have been defined" if failed_items.present?
           raise Error, fail_msg if  config.strict_mode && fail_msg
-          fail_msg ? fail_msg : prefix
+          puts fail_msg || prefix unless ENV['ITEST']
+          prefix.present?
         end
 
         def _to_store_permission(pred, obj, **options)
@@ -30,11 +31,12 @@ module IAmICan
       module Ins
         def _pms_assignment_result(preds, obj, not_defined_items, covered_items = nil, strict_mode = false)
           prefix = 'Permission Assignment Done'
-          msg1 = "#{not_defined_items} have not been defined" if not_defined_items.present?
+          msg1 = "#{not_defined_items} have not been defined or have been repeatedly assigned" if not_defined_items.present?
           msg2 = "#{covered_items} have been covered" if covered_items.present?
           fail_msg = prefix + ', but ' + [msg1, msg2].compact.join(', ') if msg1 || msg2
           raise Error, fail_msg if (strict_mode || config.strict_mode) && fail_msg
-          fail_msg ? fail_msg : prefix
+          puts fail_msg || prefix unless ENV['ITEST']
+          prefix.present?
         end
 
         def pms_matched?(pms_name, plist)

data/lib/i_am_i_can/permission.rb

@@ -6,8 +6,8 @@ module IAmICan
       PArray.new(options[:in]).matched?(pms_name || naming(pred, obj))
     end
 
-    def which(pred:, obj: nil)
-      find_by!(pred: pred, **deconstruct_obj(obj))
+    def which(pred:, obj: nil, **conditions)
+      find_by!(pred: pred, **deconstruct_obj(obj), **conditions)
     end
 
     def naming(pred, obj)
@@ -25,7 +25,7 @@ module IAmICan
       elsif obj.respond_to?(:attributes)
         { obj_type: obj.class.name, obj_id: obj.id }
       else
-        { obj_type: obj.to_s }
+        { obj_type: obj.to_s, obj_id: nil }
       end
     end
 

data/lib/i_am_i_can/role/assignment.rb

@@ -10,7 +10,7 @@ module IAmICan
         self.class.have_roles *roles, which_can: which_can, obj: obj, save: save if should_define_role
         failed_items = [ ]
 
-        roles.each do |role|
+        roles.map(&__role).each do |role|
           if save
             failed_items << role unless stored_roles_add(role)
           else

data/lib/i_am_i_can/role/helpers.rb

@@ -3,7 +3,7 @@ module IAmICan
     module Helpers
       module Cls
         def _to_store_role name, **options
-          return false if ii_config.role_model.exists?(name: name) || ii_config.role_group_model.exists?(name: name)
+          return false if ii_config.role_model.exists?(name: name) || ii_config.role_group_model&.exists?(name: name)
           ii_config.role_model.create!(name: name, **options)
         end
 
@@ -11,16 +11,26 @@ module IAmICan
           prefix = 'Role Definition Done'
           fail_msg = prefix + ", but name #{failed_items} have been used by other role or group" if failed_items.present?
           raise Error, fail_msg if ii_config.strict_mode && fail_msg
-          fail_msg ? fail_msg : prefix
+          puts fail_msg || prefix unless ENV['ITEST']
+          prefix.present?
         end
       end
 
       module Ins
         def _role_assignment_result(names, failed_items)
           prefix = 'Role Assignment Done'
-          fail_msg = prefix + ", but #{failed_items} have not been defined" if failed_items.present?
+          fail_msg = prefix + ", but #{failed_items} have not been defined or have been repeatedly assigned" if failed_items.present?
           raise Error, fail_msg if ii_config.strict_mode && fail_msg
-          fail_msg ? fail_msg : prefix
+          puts fail_msg || prefix unless ENV['ITEST']
+          prefix.present?
+        end
+
+        def __role
+          proc do |role|
+            next role.to_sym if role.is_a?(String) || role.is_a?(Symbol)
+            next role.name if role.is_a?(ii_config.role_model)
+            # raise error
+          end
         end
       end
     end

data/lib/i_am_i_can/version.rb

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

data/lib/i_am_i_can.rb

@@ -3,7 +3,6 @@ require 'active_support/core_ext/object/inclusion'
 require 'active_support/core_ext/hash/deep_merge'
 
 require 'i_am_i_can/version'
-require 'i_am_i_can/has_an_array_of'
 require 'i_am_i_can/config'
 require 'i_am_i_can/role/definition'
 require 'i_am_i_can/role/assignment'
@@ -14,8 +13,6 @@ require 'i_am_i_can/subject/role_querying'
 require 'i_am_i_can/subject/permission_querying'
 
 module IAmICan
-  include HasAnArrayOf
-
   def act_as_i_am_i_can role_model: "#{name}Role".constantize,
                         role_group_model: ("#{name}RoleGroup".constantize rescue nil),
                         permission_model: "#{name}Permission".constantize, **options
@@ -40,17 +37,18 @@ module IAmICan
     role_group_model&.extend  IAmICan::Permission::Definition
     role_group_model&.include IAmICan::Permission::Assignment
                  self.include IAmICan::Subject::PermissionQuerying
+  end
+
+  def act_as_role
+    #
+  end
+
+  def act_as_role_group
+    #
+  end
 
-    opts = {
-        attrs: { name: :to_sym },
-        located_by: :name,
-        prefix: :stored,
-        cache_expires_in: options[:cache_expires_in] || 15.minutes
-    }
-                 self.has_an_array_of :roles, model: role_model.name, for_related_name: name.underscore, **opts
-    role_group_model&.has_an_array_of :members, model: role_model.name, for_related_name: 'role_group', **opts.except(:prefix)
-           role_model.has_an_array_of :permissions, model: permission_model.name, for_related_name: 'role', **opts.except(:attrs, :located_by)
-    role_group_model&.has_an_array_of :permissions, model: permission_model.name, for_related_name: 'role_group', **opts.except(:attrs, :located_by)
+  def act_as_permission
+    #
   end
 
   class Error < StandardError;          end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: i_am_i_can
 version: !ruby/object:Gem::Version
-  version: 2.1.0
+  version: 3.0.0pre
 platform: ruby
 authors:
 - zhandao
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-10-02 00:00:00.000000000 Z
+date: 2018-10-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -81,7 +81,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: pg
+  name: simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -95,7 +95,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: simplecov
+  name: pry
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -158,6 +158,8 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/issue_template.md"
+- ".github/pull_request_template.md"
 - ".gitignore"
 - ".rspec"
 - ".travis.yml"
@@ -181,7 +183,6 @@ files:
 - lib/generators/i_am_i_can/templates/models/role_group.erb
 - lib/i_am_i_can.rb
 - lib/i_am_i_can/config.rb
-- lib/i_am_i_can/has_an_array_of.rb
 - lib/i_am_i_can/permission.rb
 - lib/i_am_i_can/permission/assignment.rb
 - lib/i_am_i_can/permission/definition.rb
@@ -208,12 +209,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.3
+rubygems_version: 2.6.12
 signing_key: 
 specification_version: 4
 summary: Concise and Natural DSL for `Subject - Role(Role Group) - Permission` Management.

data/lib/i_am_i_can/has_an_array_of.rb

@@ -1,75 +0,0 @@
-module IAmICan
-  module HasAnArrayOf
-    def has_an_array_of obj, model: nil, field: nil,
-                        prefix: nil, attrs: [ ], located_by: nil, cache_expires_in: nil, for_related_name: nil
-      obj_model = model.constantize || obj.to_s.singularize.camelize.constantize
-      field = field || :"#{obj.to_s.singularize}_ids"
-      prefix = "#{prefix}_" if prefix
-
-      # User.where(..).stored_roles
-      define_singleton_method "#{prefix}#{obj}" do
-        obj_ids = self.all.map(&field).flatten.uniq
-        obj_model.where(id: obj_ids)
-      end
-
-      # user.stored_roles
-      define_method "#{prefix}#{obj}" do
-        obj_model.where(id: send(field))
-      end
-
-      # cached_stored_roles
-      define_method "cached_#{prefix}#{obj}" do |**options|
-        Rails.cache.fetch("#{self.class.name}/#{id}/#{obj}", expires_in: cache_expires_in, **options) do
-          obj_model.where(id: send(field))
-        end
-      end
-
-      # stored_roles_add
-      define_method "#{prefix}#{obj}_add" do |locate_vals = nil, check_size: nil, **condition|
-        condition = { located_by => locate_vals } if locate_vals
-        obj_ids = obj_model.where(condition)&.pluck(:id)
-        # will return false if it does nothing
-        return false if obj_ids.blank? || (check_size && obj_ids != check_size)
-        (send(field).concat(obj_ids)).uniq!
-        save!
-      end
-
-      # stored_roles_rmv
-      define_method "#{prefix}#{obj}_rmv" do |locate_vals = nil, check_size: nil, **condition|
-        condition = { located_by => locate_vals } if locate_vals
-        obj_ids = obj_model.where(condition)&.pluck(:id)
-        # will return false if it does nothing
-        return false if obj_ids.blank? || (check_size && obj_ids != check_size)
-        send("#{field}=", send(field) - obj_ids)
-        save!
-      end
-
-      attrs.each do |(attr_name, attr_type)|
-        # User.where(..).stored_role_names
-        define_singleton_method "#{prefix}#{obj.to_s.singularize}_#{attr_name.to_s.pluralize}" do
-          res = send("#{prefix}#{obj}").pluck(attr_name)
-          attr_type ? res.map(&attr_type) : res
-        end
-
-        # user.stored_role_names
-        define_method "#{prefix}#{obj.to_s.singularize}_#{attr_name.to_s.pluralize}" do
-          res = send("#{prefix}#{obj}").pluck(attr_name)
-          attr_type ? res.map(&attr_type) : res
-        end
-      end
-
-      # === actions for object model ===
-      obj_model.class_exec(for_related_name, self, field) do |subject_name, subject_model, related_field|
-        # roles.related_users
-        define_singleton_method "related_#{(subject_name || subject_model.name).underscore.pluralize}" do
-          subject_model.where("#{related_field} @> ARRAY[?]::integer[]", ids)
-        end
-
-        # role.related_users
-        define_method "related_#{(subject_name || subject_model.name).underscore.pluralize}" do
-          subject_model.where("? = ANY (#{related_field})", self.id)
-        end
-      end
-    end
-  end
-end