role_core 0.0.25 → 0.0.26

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 588687072ceb69fb165d2c7f86d8bb0dae0c814d33049221466dc4c0adcacfb0
-  data.tar.gz: 2c0cf9515890e0389246d4fb4f570b3f39aae95781ad616d0c6306917df25a55
+  metadata.gz: 37317c08fd473381f65f6d583ad90c3cc36ee2f79a27461d037d25c4a618a89d
+  data.tar.gz: 216d88ad8ae195f935b3096c156d4fe9490fb9c2491982fc36b7791af341ea26
 SHA512:
-  metadata.gz: 1c1419d298d3664ea384f88d68db83fd4209bda7827e826ede86c5720d170b3d83874e8df9650917a5ca93dac0ff79c4bda3a5f1e7d67c1cc292396ef46d6a14
-  data.tar.gz: 83d4392b01a8766946f8c1e8fd1695d481f351d24628feab71724982c0c7d883b5b691ea961e29e73809ff73974fbcaab4c1158772a392ebd8d5ae56aecf3f52
+  metadata.gz: ec5646dfdc2648120ebb8b5fe8f300b97a3edf3e4ba613a38becf5a7b311ce77778afcdc55c1346f2271581835ba8046a785fec3cd90798570c6d9f7fc5082e8
+  data.tar.gz: b9dc82258bd777cc26996941e91c97b3750d81bd1e0040acf229f7a933d1385a2f68d3694fdc0ddcd4f4dde893e2435986ee3b209de59d725fb1afdc4ff12674

data/Rakefile

@@ -16,12 +16,12 @@ RDoc::Task.new(:rdoc) do |rdoc|
   rdoc.rdoc_files.include("lib/**/*.rb")
 end
 
-APP_RAKEFILE = File.expand_path("../test/dummy/Rakefile", __FILE__)
+APP_RAKEFILE = File.expand_path("test/dummy/Rakefile", __dir__)
 load "rails/tasks/engine.rake"
 
 load "rails/tasks/statistics.rake"
 
-require "bundler/gem_tasks"
+# require "bundler/gem_tasks"
 
 require "rake/testtask"
 

data/lib/generators/role_core/config/config_generator.rb

@@ -3,7 +3,7 @@
 module RoleCore
   module Generators
     class ConfigGenerator < Rails::Generators::Base
-      source_root File.expand_path("../templates", __FILE__)
+      source_root File.expand_path("templates", __dir__)
 
       def generate_config
         copy_file "role_core.rb", "config/initializers/role_core.rb"

data/lib/generators/role_core/model/model_generator.rb

@@ -3,7 +3,7 @@
 module RoleCore
   module Generators
     class ModelGenerator < Rails::Generators::Base
-      source_root File.expand_path("../templates", __FILE__)
+      source_root File.expand_path("templates", __dir__)
 
       def generate_model
         copy_file "role.rb", "app/models/role.rb"

data/lib/role_core.rb

@@ -17,9 +17,7 @@ module RoleCore
     end
 
     def permission_set_class=(klass)
-      unless klass && klass < PermissionSet
-        raise ArgumentError, "#{klass} should be sub-class of #{PermissionSet}."
-      end
+      raise ArgumentError, "#{klass} should be sub-class of #{PermissionSet}." unless klass && klass < PermissionSet
 
       @permission_set_class = klass.derive "Global"
     end
@@ -29,9 +27,7 @@ module RoleCore
     end
 
     def permission_class=(klass)
-      unless klass && klass < Permission
-        raise ArgumentError, "#{klass} should be sub-class of #{Permission}."
-      end
+      raise ArgumentError, "#{klass} should be sub-class of #{Permission}." unless klass && klass < Permission
 
       @permission_class = klass
     end

data/lib/role_core/computed_permissions.rb

@@ -26,9 +26,9 @@ module RoleCore
 
     private
 
-    def regroup!
-      @permissions.uniq!
-      @permissions.sort_by!(&:priority)
-    end
+      def regroup!
+        @permissions.uniq!
+        @permissions.sort_by!(&:priority)
+      end
   end
 end

data/lib/role_core/concerns/models/role.rb

@@ -15,7 +15,7 @@ module RoleCore::Concerns
       end
 
       def permissions_attributes=(value)
-        permissions.update_attributes value
+        self[:permissions].replace value
       end
     end
   end

data/lib/role_core/mapper.rb

@@ -2,7 +2,7 @@
 
 module RoleCore
   class Mapper
-    def initialize(set, **constraints) #:nodoc:
+    def initialize(set, constraints = {}) #:nodoc:
       @constraints = constraints
       @constraints[:_namespace] ||= []
       @set = set
@@ -13,7 +13,7 @@ module RoleCore
       self
     end
 
-    def group(name, **constraints, &block)
+    def group(name, constraints = {}, &block)
       raise ArgumentError, "`name` can't be blank" if name.blank?
       raise ArgumentError, "must provide a block" unless block_given?
 
@@ -21,7 +21,7 @@ module RoleCore
       constraints[:_namespace] << name
 
       sub_permission_set_class =
-        if @set.nested_classes.has_key?(name)
+        if @set.nested_classes.key?(name)
           @set.nested_classes[name]
         else
           klass_name = constraints[:_namespace].map { |n| n.to_s.classify }.join("::")

data/lib/role_core/permission.rb

@@ -4,25 +4,21 @@ module RoleCore
   class Permission
     attr_reader :name, :namespace, :priority, :callable
 
-    def initialize(name, _namespace: [], _priority: 0, _callable: false, **options, &block)
+    def initialize(name, _namespace: [], _priority: 0, _callable: false, **_options, &_block)
       @name = name
       @namespace = _namespace
       @priority = _priority
       @callable = _callable
     end
 
-    def call(context, *)
+    def call(_context, *)
       raise NotImplementedError
     end
 
-    def hash
-      instance_values.hash
-    end
+    delegate :hash, to: :instance_values
 
     def ==(other)
-      unless other.is_a?(RoleCore::Permission)
-        return false
-      end
+      return false unless other.is_a?(RoleCore::Permission)
 
       instance_values == other.instance_values
     end

data/lib/role_core/permission_set.rb

@@ -8,9 +8,7 @@ module RoleCore
 
     def computed_permissions(include_nesting: true)
       permissions = self.class.registered_permissions.slice(*permitted_permission_names).values
-      if include_nesting && nested_attributes.any?
-        permissions.concat nested_attributes.values.map(&:computed_permissions).flatten!
-      end
+      permissions.concat nested_attributes.values.map(&:computed_permissions).flatten! if include_nesting && nested_attributes.any?
 
       ComputedPermissions.new(permissions)
     end
@@ -29,17 +27,13 @@ module RoleCore
       end
 
       def permission_class=(klass)
-        unless klass && klass < Permission
-          raise ArgumentError, "#{klass} should be sub-class of #{Permission}."
-        end
+        raise ArgumentError, "#{klass} should be sub-class of #{Permission}." unless klass && klass < Permission
 
         @permission_class = klass
       end
 
-      def draw(**constraints, &block)
-        unless block_given?
-          raise ArgumentError, "must provide a block"
-        end
+      def draw(constraints = {}, &block)
+        raise ArgumentError, "must provide a block" unless block_given?
 
         Mapper.new(self, constraints).instance_exec(&block)
 
@@ -50,11 +44,16 @@ module RoleCore
         @registered_permissions ||= ActiveSupport::HashWithIndifferentAccess.new
       end
 
-      def register_permission(name, default = false, **options, &block)
+      def register_permission(name, default = false, options = {}, &block)
         raise ArgumentError, "`name` can't be blank" if name.blank?
 
         attribute name, :boolean, default: default
-        registered_permissions[name] = permission_class.new name, options, &block
+        registered_permissions[name] = permission_class.new name, **options, &block
+      end
+
+      PERMITTED_ATTRIBUTE_CLASSES = [Symbol].freeze
+      def permitted_attribute_classes
+        PERMITTED_ATTRIBUTE_CLASSES
       end
     end
   end

data/lib/role_core/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module RoleCore
-  VERSION = "0.0.25"
+  VERSION = "0.0.26"
 end

metadata

@@ -1,55 +1,55 @@
 --- !ruby/object:Gem::Specification
 name: role_core
 version: !ruby/object:Gem::Version
-  version: 0.0.25
+  version: 0.0.26
 platform: ruby
 authors:
 - jasl
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-04-14 00:00:00.000000000 Z
+date: 2019-12-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: rails
+  name: options_model
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '5'
+        version: 0.0.15
     - - "<"
       - !ruby/object:Gem::Version
-        version: '7'
+        version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '5'
+        version: 0.0.15
     - - "<"
       - !ruby/object:Gem::Version
-        version: '7'
+        version: '1.0'
 - !ruby/object:Gem::Dependency
-  name: options_model
+  name: rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.0.12
+        version: '5'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '7'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.0.12
+        version: '5'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '7'
 description: RoleCore is a Rails engine which could provide essential industry of
   Role-based access control.
 email:
@@ -100,7 +100,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: RoleCore is a Rails engine which could provide essential industry of Role-based