ostiary 0.11.0 → 0.15.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4fb578931e7699371535e5d759d387d36587e922d71e9f4c748cf115ec687af4
-  data.tar.gz: 6134612b7f338b2a2511ca501e8aa3d6cf0100e6df6f7716fbfccc5cdaf5ddb5
+  metadata.gz: 06dd41598d092805491bf1002d20b09e64794171c9e5c1544cbe9602d9ce7cd8
+  data.tar.gz: fd650ed79a11cd624500bb3e3f6d4b0d21fc87f80a09de630cc06b535f9e765b
 SHA512:
-  metadata.gz: 52d562092fdd9555ddb5b8e52073c2c6a939aba1b664e9027f97829a45b3ef363d097811ffea88d7351f026f7ccd73c141a4a67c3ea39615083372b5ee9471e2
-  data.tar.gz: a5f3d43534641beaa6923129a71e8d05da2d707c42ef3ebe9ff7b58527ec681894adf3063f0320dfb7ea2a8e95cb718cbd339c64e1437c27db42ff2f7623c9f2
+  metadata.gz: 88c015f225cb267ab1b52d2732e78125d9e9fc3c04f4ae5cedf1704dc55d8da7f4867dba3df03d4783ff993f5fa6b15ec4889d1be47b673c3d67c4a7f58c6b7e
+  data.tar.gz: ea35d66e93f5b9da36b5d4bf88d9bc2ccb8820e5a629f2908217c27d5d0f350e8a7a9704446ca9918184c6cc6cf03cf5647b75e79aaf9744994288987cc8a289

data/lib/ostiary/controller_helper.rb

@@ -37,12 +37,12 @@ module Ostiary
         raise ArgumentError, "Use either only or except"       if except && only
         raise ArgumentError, "Use a symbol for method:"        if method && !(method.is_a? Symbol)
 
-        if actions.empty?
-          ostiary.policies << Policy.new(role, method: method&.to_proc)
-        elsif only
+        if only
           ostiary.policies << PolicyLimited.new(role, only, method: method&.to_proc)
         elsif except
           ostiary.policies << PolicyExempted.new(role, except, method: method&.to_proc)
+        else
+          ostiary.policies << Policy.new(role, method: method&.to_proc)
         end
       end
 

data/lib/ostiary/ostiary.rb

@@ -8,7 +8,7 @@ module Ostiary
 
     def authorize!(action, &block)
       policies.each do |policy|
-        next if policy.met?(action, block)
+        next if policy.met?(action, &block)
         raise PolicyBroken, policy.error_message(action)
       end
     end

data/lib/ostiary/policy.rb

@@ -12,7 +12,7 @@ module Ostiary
       "#{name}"
     end
 
-    def met?(_action)
+    def met?(_action, &block)
       return yield name unless method
       method.call
     end

data/lib/ostiary/policy_exempted.rb

@@ -5,7 +5,7 @@ module Ostiary
       "#{name} except for #{actions.to_sentence}"
     end
 
-    def met?(action)
+    def met?(action, &block)
       return true if actions.include?(action)
       super
     end

data/lib/ostiary/policy_limited.rb

@@ -5,7 +5,7 @@ module Ostiary
       "#{name} only for #{actions.to_sentence}"
     end
 
-    def met?(action)
+    def met?(action, &block)
       return true unless actions.include?(action)
       super
     end

data/lib/ostiary/version.rb

@@ -1,3 +1,3 @@
 module Ostiary
-  VERSION = "0.11.0"
+  VERSION = "0.15.0"
 end

metadata

@@ -1,43 +1,43 @@
 --- !ruby/object:Gem::Specification
 name: ostiary
 version: !ruby/object:Gem::Version
-  version: 0.11.0
+  version: 0.15.0
 platform: ruby
 authors:
 - Jacques Hakvoort
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-11-11 00:00:00.000000000 Z
+date: 2022-08-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.13'
+        version: 2.3.18
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.13'
+        version: 2.3.18
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: 12.3.3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: 12.3.3
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -81,15 +81,8 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- ".circleci/config.yml"
-- ".gitignore"
-- ".rspec"
-- ".ruby-gemset"
-- ".ruby-version"
-- Gemfile
 - LICENSE.txt
 - README.md
-- Rakefile
 - lib/ostiary.rb
 - lib/ostiary/controller_helper.rb
 - lib/ostiary/ostiary.rb
@@ -97,7 +90,6 @@ files:
 - lib/ostiary/policy_exempted.rb
 - lib/ostiary/policy_limited.rb
 - lib/ostiary/version.rb
-- ostiary.gemspec
 homepage: https://github.com/nedap/ostiary
 licenses:
 - MIT
@@ -117,7 +109,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.3.11
 signing_key: 
 specification_version: 4
 summary: Limit access to (rails) controllers/actions with policies

data/.circleci/config.yml

@@ -1,42 +0,0 @@
-version: 2
-jobs:
-  build:
-    docker:
-      - image: circleci/ruby:2.6.5
-
-    working_directory: ~/repo
-
-    steps:
-      - checkout
-
-      - restore_cache:
-          keys:
-            - v1-dependencies-{{ checksum "Gemfile.lock" }}
-            - v1-dependencies-
-
-      - run:
-          name: install dependencies
-          command: |
-            bundle install --jobs=4 --retry=3 --path vendor/bundle
-
-      - save_cache:
-          paths:
-            - ./vendor/bundle
-          key: v1-dependencies-{{ checksum "Gemfile.lock" }}
-
-      - run:
-          name: run tests
-          command: |
-            mkdir /tmp/test-results
-            TEST_FILES="$(circleci tests glob "spec/**/*_spec.rb" | \
-              circleci tests split --split-by=timings)"
-
-            bundle exec rspec \
-              --format progress \
-              --format RspecJunitFormatter \
-              --out /tmp/test-results/rspec.xml \
-              --format progress \
-              $TEST_FILES
-
-      - store_test_results:
-          path: /tmp/test-results

data/.gitignore

@@ -1,53 +0,0 @@
-*.gem
-*.rbc
-.rspec_status
-/.config
-/coverage/
-/InstalledFiles
-/pkg/
-/spec/reports/
-/spec/examples.txt
-/test/tmp/
-/test/version_tmp/
-/tmp/
-
-# Used by dotenv library to load environment variables.
-# .env
-
-## Specific to RubyMotion:
-.dat*
-.repl_history
-build/
-*.bridgesupport
-build-iPhoneOS/
-build-iPhoneSimulator/
-
-## Specific to RubyMotion (use of CocoaPods):
-#
-# We recommend against adding the Pods directory to your .gitignore. However
-# you should judge for yourself, the pros and cons are mentioned at:
-# https://guides.cocoapods.org/using/using-cocoapods.html#should-i-check-the-pods-directory-into-source-control
-#
-# vendor/Pods/
-
-## Documentation cache and generated files:
-/.yardoc/
-/_yardoc/
-/doc/
-/rdoc/
-
-## Environment normalization:
-/.bundle/
-/vendor/bundle
-/lib/bundler/man/
-
-# for a library or gem, you might want to ignore these files since the code is
-# intended to run in multiple environments; otherwise, check them in:
-Gemfile.lock
-# .ruby-version
-# .ruby-gemset
-
-# unless supporting rvm < 1.11.0 or doing something fancy, ignore this:
-.rvmrc
-
-.DS_Store

data/.rspec

@@ -1,3 +0,0 @@
---color
---format documentation
---profile

data/.ruby-gemset

@@ -1 +0,0 @@
-ostiary

data/.ruby-version

@@ -1 +0,0 @@
-ruby-2.3.5

data/Gemfile

@@ -1,4 +0,0 @@
-source 'https://rubygems.org'
-
-# Specify your gem's dependencies in ostiary.gemspec
-gemspec

data/Rakefile

@@ -1,6 +0,0 @@
-require "bundler/gem_tasks"
-require "rspec/core/rake_task"
-
-RSpec::Core::RakeTask.new(:spec)
-
-task :default => :spec

data/ostiary.gemspec

@@ -1,36 +0,0 @@
-# coding: utf-8
-lib = File.expand_path('../lib', __FILE__)
-$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
-require 'ostiary/version'
-
-Gem::Specification.new do |spec|
-  spec.name          = "ostiary"
-  spec.version       = Ostiary::VERSION
-  spec.author        = "Jacques Hakvoort"
-  spec.authors       = ["Jacques Hakvoort"]
-  spec.email         = ["jacques.hakvoort@nedap.com"]
-
-  spec.homepage      = "https://github.com/nedap/ostiary"
-  spec.summary       = "Limit access to (rails) controllers/actions with policies"
-  spec.description   = <<-TXT;
-    Ostiary is a security gem for your (rails) controllers & actions.
-    It employs a before_filter-like call to set policies per controller/action.
-    You can pass your own security call in block and handle the PolicyBroken
-    yourself.
-    Policies are also inherited from parent classes.
-    From wikipedia: "An ostiarius, a Latin word sometimes anglicized as ostiary
-    but often literally translated as porter or doorman, originally was a
-    servant or guard posted at the entrance of a building. See also gatekeeper."
-  TXT
-  spec.license = 'MIT'
-
-  spec.files = `git ls-files -z`.split("\x0").reject do |f|
-    f.match(%r{^(test|spec|features)/})
-  end
-  spec.require_paths = ["lib"]
-
-  spec.add_development_dependency "bundler", "~> 1.13"
-  spec.add_development_dependency "rake", "~> 10.0"
-  spec.add_development_dependency "rspec", "~> 3.0"
-  spec.add_development_dependency 'rspec_junit_formatter'
-end