ingress 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 06ab79a2f02f52156f88da841da4a010386ad71f
-  data.tar.gz: 47c37172ee0415e0046c3998aae2f4cbdcc4828f
+SHA256:
+  metadata.gz: 5f6fadfe0fa815422092e415f66fd83dc1915ce0cec8852544d877b1adb763f0
+  data.tar.gz: 731ff12c70dcbfbe16e1b6abb1c2162cd86aee4c4c4e643077280e1b8f90cab3
 SHA512:
-  metadata.gz: 8286f4993ee6bfd2aeb60434c781bb271c7b56988ef4010171de7ae1b2b007240ece07b6ccaf068ffaf788099a03743bc4735b12dd30128e8096b3424b1d7d67
-  data.tar.gz: b7875313e10cbe3a91a7593c0d942a0bb16dd44158c827659eabf4120d147eefcb3534f44b212c759431fb481028ae252976abd543d1b14d454b09da7bc2da91
+  metadata.gz: fb49bb4e9cae990a081babb2be38d814c443a6e7d60b2abf0c1eeb2d508e02f5a136e6ec4201f70555938adfe5a31f93216fd1aafba903f0f4d6016bdc263948
+  data.tar.gz: a92d7ae6f9246b5c0457744d1644fd0fc338c83b333cef0993f064fff8ee609098b7d9c841c6b71cbbdb97e5e7aff83bd131445ef22a901e86e13d1f6d440d63

data/.ruby-version

@@ -1 +1 @@
-2.3.1
+2.6.3

data/.travis.yml

@@ -1,4 +1,4 @@
 language: ruby
 rvm:
-  - 2.2.3
-before_install: gem install bundler -v 1.10.6
+  - 2.5.5
+  - 2.6.3

data/README.md

@@ -285,13 +285,13 @@ This framework has no hooks into Rails (these would be trivial to write if neces
 
 ## Development
 
-After checking out the repo, run `bin/setup` to install dependencies. Then, run `rake spec` to run the tests. You can also run `bin/console` for an interactive prompt that will allow you to experiment.
+After checking out the repo, run `script/setup` to install dependencies. Then, run `rake spec` to run the tests. You can also run `script/console` for an interactive prompt that will allow you to experiment.
 
 To install this gem onto your local machine, run `bundle exec rake install`. To release a new version, update the version number in `version.rb`, and then run `bundle exec rake release`, which will create a git tag for the version, push git commits and tags, and push the `.gem` file to [rubygems.org](https://rubygems.org).
 
 ## Contributing
 
-Bug reports and pull requests are welcome on GitHub at https://github.com/[USERNAME]/ingress.
+Bug reports and pull requests are welcome on GitHub at https://github.com/skorks/ingress.
 
 ## License
 

data/ingress.gemspec

@@ -15,10 +15,10 @@ Gem::Specification.new do |spec|
 
   spec.files         = `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
   spec.bindir        = "bin"
-  spec.executables   = spec.files.grep(%r{^script/}) { |f| File.basename(f) }
+  spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.add_development_dependency "bundler", "~> 1.10"
+  spec.add_development_dependency "bundler", ">= 1.10", "< 3"
   spec.add_development_dependency "rake", "~> 10.0"
   spec.add_development_dependency "rspec"
 end

data/lib/ingress/permissions.rb

@@ -43,22 +43,22 @@ module Ingress
     end
 
     def can?(action, subject)
-      find_matching_rules(action, subject).any? do |rule|
-        rule.match?(action, subject, user)
+      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)
+        end
+        break false if cannot_match
+
+        rules.select(&:allows?).any? do |rule|
+          rule.match?(action, subject, user)
+        end
       end
     end
 
     def user_role_identifiers
       []
     end
-
-    private
-
-    def find_matching_rules(action, subject)
-      user_role_identifiers.reduce([]) do |rules, role_identifier|
-        rules += self.class.permissions_repository.rules_for(role_identifier, action, subject)
-        rules
-      end
-    end
   end
 end

data/lib/ingress/permissions_repository.rb

@@ -21,7 +21,6 @@ module Ingress
       rules += find_rules(role_identifier, "*", "*")
       rules += find_rules(role_identifier, action, "*")
       rules += find_rules(role_identifier, "*", subject)
-      rules = apply_negative_rules(rules)
 
       rules
     end
@@ -46,17 +45,6 @@ module Ingress
 
     private
 
-    def apply_negative_rules(rules)
-      # remove rules that cancel each other out since we're within the
-      # context of 1 role, i.e. if any rule is a negation it will
-      # cancel all other ones
-      if rules.any? { |rule| !rule.allows? }
-        []
-      else
-        rules
-      end
-    end
-
     def find_rules(role_identifier, action, subject)
       rules = []
       rules += @role_subject_action_rule[role_identifier][subject][action]

data/lib/ingress/version.rb

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

metadata

@@ -1,29 +1,35 @@
 --- !ruby/object:Gem::Specification
 name: ingress
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - Alan Skorkin
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-04-13 00:00:00.000000000 Z
+date: 2019-07-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '1.10'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '1.10'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '3'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -55,9 +61,7 @@ dependencies:
 description: 
 email:
 - alan@skorks.com
-executables:
-- console
-- setup
+executables: []
 extensions: []
 extra_rdoc_files: []
 files:
@@ -69,8 +73,6 @@ files:
 - LICENSE.txt
 - README.md
 - Rakefile
-- bin/console
-- bin/setup
 - ingress.gemspec
 - lib/ingress.rb
 - lib/ingress/build_permissions_repository_for_role.rb
@@ -101,8 +103,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Simple role based authorization for Ruby applications

data/bin/console

@@ -1,14 +0,0 @@
-#!/usr/bin/env ruby
-
-require "bundler/setup"
-require "ingress"
-
-# You can add fixtures and/or initialization code here to make experimenting
-# with your gem easier. You can also use a different console, if you like.
-
-# (If you use this, don't forget to add pry to your Gemfile!)
-# require "pry"
-# Pry.start
-
-require "irb"
-IRB.start(__FILE__)

data/bin/setup

@@ -1,8 +0,0 @@
-#!/usr/bin/env bash
-set -euo pipefail
-IFS=$'\n\t'
-set -vx
-
-bundle install
-
-# Do any other automated setup that you need to do here