casbin-ruby 1.0.5 → 1.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 28a62b747911baa032114d99d6ac547a5e10a6661e9c73dddb756db0331dd8d9
-  data.tar.gz: dc9c0f3b7651fdff49f5effa17282139c083eac30f176b3544cb75aabe174a38
+  metadata.gz: d406ef1efa717c0be3eabc7dfe52876fee6abc4e1376fd40a470f21ff66c8db5
+  data.tar.gz: 29ebed777ab1fa73e59673f1c59ece907a42008d0627eb4e7bd3be1f62ccfad9
 SHA512:
-  metadata.gz: 23a694c48da847813dd0632fef4bdebf5f1a982a7610489453bf7b545edd429b26f125d085879dcd2dc5f3737e8b167c6678bf1e3b9bb2afba951ecdfe920c54
-  data.tar.gz: 4a2dc386dac66769e86836c3ab84ce687e53c7e0f6962dc2f4e136cf8d16d21d1554e7b355c8913a6c7f4b4c35b9d94a66102b5ce9ef5817ec8ced25f02a1240
+  metadata.gz: ba5605585f491b75c06eeeb6f7ded2c6236366e650dc186bf9ec0ff11ab4084ddd22d6731011f11f197a06259feb9d2ec01a0c5694f3ba9bc67ba08dc03fe3ee
+  data.tar.gz: f41d01708fa751dac161f87fe91a20dca70d23cdfb1dad8673437c262763c7883ea96785efa5fd0043b21c7132be5eede5e7fdf83107654919ef34f0d49d547d

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:
 
@@ -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/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,14 +1,12 @@
 # frozen_string_literal: true
 
 require 'singleton'
-require 'forwardable'
 
 class ThreadLock
   include Singleton
 
   class << self
-    extend Forwardable
-    def_delegators :instance, :thread=, :thread, :lock?
+    delegate :thread=, :lock?, to: :instance
   end
 
   attr_accessor :thread
@@ -16,6 +14,6 @@ class ThreadLock
   def lock?
     return false unless thread
 
-    thread.alive?
+    thread.active?
   end
 end

data/lib/casbin-ruby/version.rb

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

data/spec/casbin/enforcer_spec.rb

@@ -28,6 +28,16 @@ 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
   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.5
+  version: 1.0.6
 platform: ruby
 authors:
 - Igor Kutyavin
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-05-14 00:00:00.000000000 Z
+date: 2021-06-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: keisan
@@ -113,7 +113,6 @@ files:
 - spec/casbin/rbac/default_role_manager/role_manager_spec.rb
 - spec/casbin/rbac/default_role_manager/role_spec.rb
 - spec/casbin/util/builtin_operators_spec.rb
-- spec/casbin/util/thread_lock_spec.rb
 - spec/casbin/util_spec.rb
 - spec/support/model_helper.rb
 homepage: https://github.com/evrone/casbin-ruby
@@ -141,13 +140,12 @@ signing_key:
 specification_version: 4
 summary: Casbin in Ruby
 test_files:
+- spec/support/model_helper.rb
 - spec/casbin/core_enforcer_spec.rb
-- spec/casbin/enforcer_spec.rb
-- spec/casbin/model/function_map_spec.rb
-- spec/casbin/rbac/default_role_manager/role_spec.rb
 - spec/casbin/rbac/default_role_manager/role_manager_spec.rb
+- spec/casbin/rbac/default_role_manager/role_spec.rb
 - spec/casbin/config/config_spec.rb
-- spec/casbin/util/thread_lock_spec.rb
-- spec/casbin/util/builtin_operators_spec.rb
+- spec/casbin/model/function_map_spec.rb
 - spec/casbin/util_spec.rb
-- spec/support/model_helper.rb
+- spec/casbin/util/builtin_operators_spec.rb
+- spec/casbin/enforcer_spec.rb

data/spec/casbin/util/thread_lock_spec.rb

@@ -1,17 +0,0 @@
-# frozen_string_literal: true
-
-require 'casbin-ruby/util/thread_lock'
-
-describe ThreadLock do
-  it '#lock? with no thread' do
-    expect(described_class).not_to be_lock
-  end
-
-  it '#lock? with thread' do
-    described_class.thread = Thread.new { loop }
-    expect(described_class).to be_lock
-    described_class.thread.exit
-    sleep 0.001 # waiting exit
-    expect(described_class).not_to be_lock
-  end
-end