ingress 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5f6fadfe0fa815422092e415f66fd83dc1915ce0cec8852544d877b1adb763f0
-  data.tar.gz: 731ff12c70dcbfbe16e1b6abb1c2162cd86aee4c4c4e643077280e1b8f90cab3
+  metadata.gz: a8f17e43cf5bacf92bc38048ec7e9eb8588e46567d2ac14a86b64664c369c57e
+  data.tar.gz: ffebe86e57b6539ccee3bf4265e4d9dc103a88260e16354f4e4e1a8280600f00
 SHA512:
-  metadata.gz: fb49bb4e9cae990a081babb2be38d814c443a6e7d60b2abf0c1eeb2d508e02f5a136e6ec4201f70555938adfe5a31f93216fd1aafba903f0f4d6016bdc263948
-  data.tar.gz: a92d7ae6f9246b5c0457744d1644fd0fc338c83b333cef0993f064fff8ee609098b7d9c841c6b71cbbdb97e5e7aff83bd131445ef22a901e86e13d1f6d440d63
+  metadata.gz: 22e432bad1f93dad170bb773cb259558ed95bebbd5bfd4cb885498609e3b9912136fbb159dd5dfb3af9c6c99350a5ccf9a3582937a9b7443f66aa9a3dfd1668c
+  data.tar.gz: 9e27effdf8b6f8a222c50c8f7d05fed65447fa22dd8a9e8cffb3bfa25cd67437917377bf57ce57fca0c547ff623545a447af758f451158b475af4439d717baf3

data/ingress.gemspec

@@ -12,6 +12,10 @@ Gem::Specification.new do |spec|
   spec.summary       = %q{Simple role based authorization for Ruby applications}
   spec.homepage      = ""
   spec.license       = "MIT"
+  spec.metadata      = {
+                         "bug_tracker_uri" => "https://github.com/skorks/ingress/issues",
+                         "source_code_uri" => "https://github.com/skorks/ingress",
+                       }
 
   spec.files         = `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
   spec.bindir        = "bin"

data/lib/ingress/permission_rule.rb

@@ -13,11 +13,11 @@ module Ingress
       @allows
     end
 
-    def match?(given_action, given_subject, user)
+    def match?(given_action, given_subject, user, options = {})
       return false unless action_matches?(given_action)
       return false unless subject_matches?(given_subject)
 
-      conditions_match?(user, given_subject)
+      conditions_match?(user, given_subject, options)
     end
 
     private
@@ -35,9 +35,13 @@ module Ingress
         "*" == subject
     end
 
-    def conditions_match?(user, given_subject)
+    def conditions_match?(user, given_subject, options)
       conditions.all? do |condition|
-        condition.call(user, given_subject)
+        if condition.arity == 2
+          condition.call(user, given_subject)
+        else
+          condition.call(user, given_subject, options)
+        end
       end
     rescue => e
       log_error(e)

data/lib/ingress/permissions.rb

@@ -42,17 +42,17 @@ module Ingress
       @user = user
     end
 
-    def can?(action, subject)
+    def can?(action, subject, options = {})
       user_role_identifiers.any? do |role_identifier|
         rules = self.class.permissions_repository.rules_for(role_identifier, action, subject)
 
         cannot_match = rules.reject(&:allows?).any? do |rule|
-          rule.match?(action, subject, user)
+          rule.match?(action, subject, user, options)
         end
         break false if cannot_match
 
         rules.select(&:allows?).any? do |rule|
-          rule.match?(action, subject, user)
+          rule.match?(action, subject, user, options)
         end
       end
     end

data/lib/ingress/version.rb

@@ -1,3 +1,3 @@
 module Ingress
-  VERSION = "0.2.0"
+  VERSION = "0.3.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ingress
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Alan Skorkin
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-07-02 00:00:00.000000000 Z
+date: 2019-11-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -87,7 +87,9 @@ files:
 homepage: ''
 licenses:
 - MIT
-metadata: {}
+metadata:
+  bug_tracker_uri: https://github.com/skorks/ingress/issues
+  source_code_uri: https://github.com/skorks/ingress
 post_install_message: 
 rdoc_options: []
 require_paths: