casbin-ruby 1.0.4 → 1.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 52a08bf07cc4d7925f0e23993f1745f1cf69585ba941138c12f88ca3498705b1
-  data.tar.gz: 1db55f6ab3c6e853ae2f84271b08f1c67d795ea5c86afb9e7b84d94091dd9ddc
+  metadata.gz: 52748f22fb42a7b98e526eb475ed1826028679e2c85396cb6951bf2f007c082d
+  data.tar.gz: 40f1e3d7ad0cf3d49fd21fe4cb2b5312416bbba7b9d8e23001674d9dbebefff4
 SHA512:
-  metadata.gz: 3eaa9572203f449d6b653d725a05ef7c59f42bc9cd34d3ee7ef55afe63f1a933951934a63131aa0b7eb4d117b524f105561ce84e805a9617df976e35a3894ab4
-  data.tar.gz: dcc181227a68e920b78b705eb018a0b23a69417e8408c6014a2c22c05243ac08787a518efa73918e4266291c3a8f6b52dbd3ad2ce4ffb4b40743cdd0e0e0a2dd
+  metadata.gz: d714d3c773d7d65df64051133979f5c099baa5c683d46323e63c4855c8e612ffc010cc0f3c8b28bab8dec1de1e1d3c052c94212ed4a889664eb75ec935dbb6ca
+  data.tar.gz: a1c09f4287fbd1244fa189efc539a115f5c32c34fef9e9ab310b41800600d9913567a63bccc9ac36166cdbf7a479efe7cccd379a371d096b2703fc86734a846f

data/README.md

@@ -8,6 +8,7 @@ at: http://casbin.org/editor/
 
 Casbin is a powerful and efficient open-source access control library for Ruby projects. It provides support for
 enforcing authorization based on various [access control models](https://en.wikipedia.org/wiki/Computer_security_model).
+Ruby version is ported & [supported by Evrone](https://evrone.com/?utm_campaign=casbinruby). More information you can find in articles [in English](https://evrone.com/casbin-ruby?utm_campaign=casbinruby).
 
 ## All the languages supported by Casbin:
 
@@ -130,7 +131,7 @@ What Casbin does NOT do:
 ## Installation
 
 ```
-gem 'casbin', github: 'evrone/casbin-ruby'
+gem 'casbin-ruby'
 ```
 
 ## Documentation
@@ -151,7 +152,7 @@ https://casbin.org/docs/en/tutorials
 
 ```ruby
 # TODO: correct `require`
-require 'casbin'
+require 'casbin-ruby'
 enforcer = Casbin::Enforcer.new("path/to/model.conf", "path/to/policy.csv")
 ```
 
@@ -186,8 +187,8 @@ See [Policy management APIs](#policy-management) for more usage.
 
 Casbin provides two sets of APIs to manage permissions:
 
-- [Management API](https://github.com/casbin/casbin/blob/master/management_api.go): the primitive API that provides full support for Casbin policy management. See [here](https://github.com/casbin/casbin/blob/master/management_api_test.go) for examples.
-- [RBAC API](https://github.com/casbin/casbin/blob/master/rbac_api.go): a more friendly API for RBAC. This API is a subset of Management API. The RBAC users could use this API to simplify the code. See [here](https://github.com/casbin/casbin/blob/master/rbac_api_test.go) for examples.
+- [Management API](https://github.com/casbin/casbin/blob/main/management_api.go): the primitive API that provides full support for Casbin policy management. See [here](https://github.com/casbin/casbin/blob/main/management_api_test.go) for examples.
+- [RBAC API](https://github.com/casbin/casbin/blob/main/rbac_api.go): a more friendly API for RBAC. This API is a subset of Management API. The RBAC users could use this API to simplify the code. See [here](https://github.com/casbin/casbin/blob/main/rbac_api_test.go) for examples.
 
 We also provide a web-based UI for model management and policy management:
 
@@ -211,17 +212,17 @@ https://casbin.org/docs/en/benchmark
 
 Model | Model file | Policy file
 ----|------|----
-ACL | [basic_model.conf](https://github.com/casbin/casbin/blob/master/examples/basic_model.conf) | [basic_policy.csv](https://github.com/casbin/casbin/blob/master/examples/basic_policy.csv)
-ACL with superuser | [basic_model_with_root.conf](https://github.com/casbin/casbin/blob/master/examples/basic_with_root_model.conf) | [basic_policy.csv](https://github.com/casbin/casbin/blob/master/examples/basic_policy.csv)
-ACL without users | [basic_model_without_users.conf](https://github.com/casbin/casbin/blob/master/examples/basic_without_users_model.conf) | [basic_policy_without_users.csv](https://github.com/casbin/casbin/blob/master/examples/basic_without_users_policy.csv)
-ACL without resources | [basic_model_without_resources.conf](https://github.com/casbin/casbin/blob/master/examples/basic_without_resources_model.conf) | [basic_policy_without_resources.csv](https://github.com/casbin/casbin/blob/master/examples/basic_without_resources_policy.csv)
-RBAC | [rbac_model.conf](https://github.com/casbin/casbin/blob/master/examples/rbac_model.conf)  | [rbac_policy.csv](https://github.com/casbin/casbin/blob/master/examples/rbac_policy.csv)
-RBAC with resource roles | [rbac_model_with_resource_roles.conf](https://github.com/casbin/casbin/blob/master/examples/rbac_with_resource_roles_model.conf)  | [rbac_policy_with_resource_roles.csv](https://github.com/casbin/casbin/blob/master/examples/rbac_with_resource_roles_policy.csv)
-RBAC with domains/tenants | [rbac_model_with_domains.conf](https://github.com/casbin/casbin/blob/master/examples/rbac_with_domains_model.conf)  | [rbac_policy_with_domains.csv](https://github.com/casbin/casbin/blob/master/examples/rbac_with_domains_policy.csv)
-ABAC | [abac_model.conf](https://github.com/casbin/casbin/blob/master/examples/abac_model.conf)  | N/A
-RESTful | [keymatch_model.conf](https://github.com/casbin/casbin/blob/master/examples/keymatch_model.conf)  | [keymatch_policy.csv](https://github.com/casbin/casbin/blob/master/examples/keymatch_policy.csv)
-Deny-override | [rbac_model_with_deny.conf](https://github.com/casbin/casbin/blob/master/examples/rbac_with_deny_model.conf)  | [rbac_policy_with_deny.csv](https://github.com/casbin/casbin/blob/master/examples/rbac_with_deny_policy.csv)
-Priority | [priority_model.conf](https://github.com/casbin/casbin/blob/master/examples/priority_model.conf)  | [priority_policy.csv](https://github.com/casbin/casbin/blob/master/examples/priority_policy.csv)
+ACL | [basic_model.conf](https://github.com/casbin/casbin/blob/main/examples/basic_model.conf) | [basic_policy.csv](https://github.com/casbin/casbin/blob/main/examples/basic_policy.csv)
+ACL with superuser | [basic_model_with_root.conf](https://github.com/casbin/casbin/blob/main/examples/basic_with_root_model.conf) | [basic_policy.csv](https://github.com/casbin/casbin/blob/main/examples/basic_policy.csv)
+ACL without users | [basic_model_without_users.conf](https://github.com/casbin/casbin/blob/main/examples/basic_without_users_model.conf) | [basic_policy_without_users.csv](https://github.com/casbin/casbin/blob/main/examples/basic_without_users_policy.csv)
+ACL without resources | [basic_model_without_resources.conf](https://github.com/casbin/casbin/blob/main/examples/basic_without_resources_model.conf) | [basic_policy_without_resources.csv](https://github.com/casbin/casbin/blob/main/examples/basic_without_resources_policy.csv)
+RBAC | [rbac_model.conf](https://github.com/casbin/casbin/blob/main/examples/rbac_model.conf)  | [rbac_policy.csv](https://github.com/casbin/casbin/blob/main/examples/rbac_policy.csv)
+RBAC with resource roles | [rbac_model_with_resource_roles.conf](https://github.com/casbin/casbin/blob/main/examples/rbac_with_resource_roles_model.conf)  | [rbac_policy_with_resource_roles.csv](https://github.com/casbin/casbin/blob/main/examples/rbac_with_resource_roles_policy.csv)
+RBAC with domains/tenants | [rbac_model_with_domains.conf](https://github.com/casbin/casbin/blob/main/examples/rbac_with_domains_model.conf)  | [rbac_policy_with_domains.csv](https://github.com/casbin/casbin/blob/main/examples/rbac_with_domains_policy.csv)
+ABAC | [abac_model.conf](https://github.com/casbin/casbin/blob/main/examples/abac_model.conf)  | N/A
+RESTful | [keymatch_model.conf](https://github.com/casbin/casbin/blob/main/examples/keymatch_model.conf)  | [keymatch_policy.csv](https://github.com/casbin/casbin/blob/main/examples/keymatch_policy.csv)
+Deny-override | [rbac_model_with_deny.conf](https://github.com/casbin/casbin/blob/main/examples/rbac_with_deny_model.conf)  | [rbac_policy_with_deny.csv](https://github.com/casbin/casbin/blob/main/examples/rbac_with_deny_policy.csv)
+Priority | [priority_model.conf](https://github.com/casbin/casbin/blob/main/examples/priority_model.conf)  | [priority_policy.csv](https://github.com/casbin/casbin/blob/main/examples/priority_policy.csv)
 
 ## Middlewares
 
@@ -233,6 +234,15 @@ In process
 
 ## Contributors
 
+## Sponsors
+
+<p>
+  <a href="https://evrone.com/?utm_source=github&utm_campaign=casbin-ruby">
+    <img src="https://camo.githubusercontent.com/433f193098927e4e7229c229c8920f77898282063d4fc3cbafb04ea3d24d73df/68747470733a2f2f6576726f6e652e636f6d2f6c6f676f2f6576726f6e652d73706f6e736f7265642d6c6f676f2e706e67"
+      alt="Sponsored by Evrone" width="210">
+  </a>
+</p>
+
 ## License
 
 ## Contact

data/lib/casbin-ruby/management_enforcer.rb

@@ -130,7 +130,7 @@ module Casbin
       if params.size == 1 && params[0].is_a?(Array)
         parent_add_policy('p', ptype, params[0])
       else
-        parent_add_policy('p', ptype, [params])
+        parent_add_policy('p', ptype, params)
       end
     end
 

data/lib/casbin-ruby/model/policy.rb

@@ -114,7 +114,8 @@ module Casbin
 
       # removes policy rules based on field filters from the model.
       def remove_filtered_policy(sec, ptype, field_index, *field_values)
-        return false unless model.key?(sec) && model[sec].include?(ptype)
+        return false unless model.key?(sec)
+        return false unless model[sec].include?(ptype)
 
         state = { tmp: [], res: false }
         model[sec][ptype].policy.each do |rule|
@@ -142,12 +143,8 @@ module Casbin
       private
 
       def filtered_rule(state, rule, field_values, field_index)
-        matched = true
-
         field_values.each_with_index do |field_value, index|
-          next matched = false if field_value != '' && field_value != rule[field_index + index]
-
-          if matched
+          if field_value == '' || rule[field_index + index] == field_value
             state[:res] = true
           else
             state[:tmp] << rule

data/lib/casbin-ruby/util.rb

@@ -68,7 +68,7 @@ module Casbin
 
       # joins a string and a slice into a new slice.
       def join_slice(a, *b)
-        Array.new(a).concat b
+        Array(a).concat b
       end
 
       # returns the elements in `a` that aren't in `b`.

data/lib/casbin-ruby/util/thread_lock.rb

@@ -1,12 +1,15 @@
 # frozen_string_literal: true
 
 require 'singleton'
+require 'forwardable'
 
 class ThreadLock
   include Singleton
 
   class << self
-    delegate :thread=, :lock?, to: :instance
+    extend Forwardable
+
+    def_delegators :instance, :thread=, :lock?
   end
 
   attr_accessor :thread

data/lib/casbin-ruby/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Casbin
-  VERSION = '1.0.4'
+  VERSION = '1.0.8'
 end

data/spec/casbin/enforcer_spec.rb

@@ -28,6 +28,26 @@ describe Casbin::Enforcer do
       enf.load_model
       expect(enf.model).not_to be_nil
     end
+
+    it '#remove_filtered_policy' do
+      expect(enf.enforce('alice', 'data1', 'read')).to be_truthy
+      enf.remove_filtered_policy(1, 'data1')
+      expect(enf.enforce('alice', 'data1', 'read')).to be_falsey
+
+      expect(enf.enforce('bob', 'data2', 'write')).to be_truthy
+      enf.remove_filtered_policy(2, 'write')
+      expect(enf.enforce('bob', 'data2', 'write')).to be_falsey
+    end
+
+    it '#add_policy' do
+      expect(enf.enforce('alice', 'data3', 'read')).to be_falsey
+      enf.add_policy('alice', 'data3', 'read')
+      enf.add_policy('alice', 'data4', 'read')
+      enf.add_policy(%w[alice data5 read])
+      expect(enf.enforce('alice', 'data3', 'read')).to be_truthy
+      expect(enf.enforce('alice', 'data4', 'read')).to be_truthy
+      expect(enf.enforce('alice', 'data5', 'read')).to be_truthy
+    end
   end
 
   describe 'basic without spaces' do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: casbin-ruby
 version: !ruby/object:Gem::Version
-  version: 1.0.4
+  version: 1.0.8
 platform: ruby
 authors:
 - Igor Kutyavin
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-05-13 00:00:00.000000000 Z
+date: 2021-08-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: keisan
@@ -140,12 +140,12 @@ signing_key:
 specification_version: 4
 summary: Casbin in Ruby
 test_files:
-- spec/casbin/core_enforcer_spec.rb
-- spec/casbin/enforcer_spec.rb
-- spec/casbin/model/function_map_spec.rb
+- spec/support/model_helper.rb
 - spec/casbin/rbac/default_role_manager/role_spec.rb
 - spec/casbin/rbac/default_role_manager/role_manager_spec.rb
-- spec/casbin/config/config_spec.rb
+- spec/casbin/enforcer_spec.rb
 - spec/casbin/util/builtin_operators_spec.rb
 - spec/casbin/util_spec.rb
-- spec/support/model_helper.rb
+- spec/casbin/core_enforcer_spec.rb
+- spec/casbin/config/config_spec.rb
+- spec/casbin/model/function_map_spec.rb