passpartu 1.0.2 → 1.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6941eb262c351f25dd525ced8ce9d27cf03c90f6977d9e31674b5aa675db2ada
-  data.tar.gz: e9fd5451850cc07bec8b6a2db6e23cadbc9415eb14945a39ab3913857c7e4628
+  metadata.gz: 7ff6ec8f5f35ec4a606df7c651868203f755d0d6f5b6152d23a152fa91d45126
+  data.tar.gz: 4ed57d9ced50f0c8ab11725835be3cc2ecb37a9309433146429312d22417dd13
 SHA512:
-  metadata.gz: 8986a0743c963712de307a141bfe37405636ec7f952e29ae13c22c2512ec5ae04ef0f4e93e29a8ee5ffd32ebcf39675c7800e58332b451acfc34444d875178a6
-  data.tar.gz: 5d1fde0b670dd30acd04bb819d503588cccaaacbae773076eee10fbd865a16fa370e822c1227d73388d588afd49f3cf96ad759a2db373ef8774d3206d39b3524
+  metadata.gz: c55101f249104c06a591cffa4df5126e3bf01a0f81a1bcd96d766b91d657f7997cfaebc81ae22e4da56265951ec47b751565c97a220ec17042945b9ba3e0fbb7
+  data.tar.gz: 5618f1ecf4e1b8ad3b27f802cefd2213e65ee08125e840aa32aab603b1ca85868fc4d79464bcacf4d9be75103174cff9474c05ef8d6d3058d0fd56381cc86f69

data/README.md

@@ -1,7 +1,12 @@
-# Passpartu v1.0.2 - [changelog](https://github.com/coaxsoft/passpartu/blob/master/CHANGELOG.md)
+# Passpartu v1.0.3 - [changelog](https://github.com/coaxsoft/passpartu/blob/master/CHANGELOG.md)
 
 Passpartu makes policies great again (works awesome with [Pundit](https://rubygems.org/gems/pundit)).
 
+### Tested with ruby:
+- 2.7.3
+- 3.0.0
+- 3.1.1
+
 Instead of this:
 
 ```ruby

data/lib/passpartu/patcher.rb

@@ -3,6 +3,7 @@
 module Passpartu
   class Patcher
     attr_reader :klass
+
     def initialize(klass)
       raise PolicyYmlNotFoundError if Passpartu.policy.nil?
 
@@ -15,11 +16,11 @@ module Passpartu
 
     def call
       klass.class_eval do
-        define_method('can?') do |*keys, only: nil, except: nil, skip: nil, &block|
+        define_method(:can?) do |*keys, only: nil, except: nil, skip: nil, &block|
           Passpartu::BlockVerify.call(role, keys, only: only, except: except, skip: skip, &block)
         end
 
-        Passpartu.policy.keys.each do |policy_role|
+        Passpartu.policy.each_key do |policy_role|
           define_method("#{policy_role}_can?") do |*keys, only: nil, except: nil, skip: nil, &block|
             role.to_s == policy_role && Passpartu::BlockVerify.call(role, keys,
                                                                     only: only,

data/lib/passpartu/validate_result.rb

@@ -5,6 +5,7 @@ module Passpartu
     class PolicyMissedError < StandardError; end
 
     attr_reader :result
+
     def initialize(result)
       @result = result
     end
@@ -23,7 +24,7 @@ module Passpartu
     private
 
     def boolean?
-      [TrueClass, FalseClass].include?(result.class)
+      [true, false].include?(result)
     end
 
     def raise_error?

data/lib/passpartu/verify.rb

@@ -31,7 +31,8 @@ module Passpartu
       validate_result
     rescue StandardError => e
       if ['TrueClass does not have #dig method', 'FalseClass does not have #dig method'].include?(e.message)
-        raise WaterfallError.new "Looks like you want to use check_waterfall feature, but it's set to 'false'. Otherwise check your #{Passpartu.config.policy_file} for validness"
+        raise WaterfallError,
+              "Looks like you want to use check_waterfall feature, but it's set to 'false'. Otherwise check your #{Passpartu.config.policy_file} for validness"
       else
         raise e
       end

data/lib/passpartu/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Passpartu
-  VERSION = '1.0.2'
+  VERSION = '1.0.3'
 end

data/lib/passpartu.rb

@@ -13,21 +13,21 @@ module Passpartu
   class PolicyYmlNotFoundError < StandardError; end
   class WaterfallError < StandardError; end
 
-  def self.included(policy_class)
-    Passpartu::Patcher.call(policy_class)
-  end
-
-  def self.policy
-    config.policy
-  end
-
   class << self
     attr_accessor :config
-  end
 
-  def self.configure
-    self.config ||= Config.new
-    yield(config)
+    def included(policy_class)
+      Passpartu::Patcher.call(policy_class)
+    end
+
+    def policy
+      config.policy
+    end
+
+    def configure
+      self.config ||= Config.new
+      yield(config)
+    end
   end
 
   class Config
@@ -38,7 +38,7 @@ module Passpartu
 
     def initialize
       @policy_file = DEFAULT_POLICY_FILE
-      set_policy(YAML.load_file(policy_file)) if File.exist?(policy_file)
+      self.policy = load_policy_file(policy_file) if File.exist?(policy_file)
       @raise_policy_missed_error = true
       @check_waterfall = false
     end
@@ -48,23 +48,27 @@ module Passpartu
 
       raise PolicyYmlNotFoundError unless File.exist?(policy_file)
 
-      set_policy(YAML.load_file(policy_file))
+      self.policy = load_policy_file(policy_file)
     end
 
     def check_waterfall=(value)
       @check_waterfall = value
 
-      if @check_waterfall
-        @raise_policy_missed_error = false
-        set_policy(@policy)
+      @check_waterfall.tap do |check_waterfall|
+        if check_waterfall
+          @raise_policy_missed_error = false
+          self.policy = @policy
+        end
       end
-
-      @check_waterfall
     end
 
     private
 
-    def set_policy(value)
+    def load_policy_file(path)
+      RUBY_VERSION.to_f >= 3.1 ? YAML.load_file(path, aliases: true) : YAML.load_file(path)
+    end
+
+    def policy=(value)
       @policy = patch_policy_booleans_if(value)
     end
 
@@ -73,11 +77,12 @@ module Passpartu
       return hash unless @check_waterfall
 
       hash.transform_values! do |value|
-        if value.is_a?(TrueClass)
+        case value
+        when true
           value.define_singleton_method(:dig) { |*_keys| true }
-        elsif value.is_a?(FalseClass)
+        when false
           value.define_singleton_method(:dig) { |*_keys| false }
-        elsif
+        else
           patch_policy_booleans_if(value)
         end
 
@@ -93,8 +98,6 @@ module Passpartu
       !blank?(item)
     end
   end
-
-  configure {}
 end
 
 initializer = './config/initializers/passpartu.rb'

data/passpartu.gemspec

@@ -38,7 +38,10 @@ Gem::Specification.new do |spec|
   spec.require_paths = ['lib']
   spec.files = Dir['README.md', 'lib/**/*', 'lib/*', 'passpartu.gemspec']
 
-  spec.add_development_dependency 'bundler', '~> 2.0'
-  spec.add_development_dependency 'rake', '~> 12.3'
-  spec.add_development_dependency 'rspec', '~> 3.0'
+  spec.add_development_dependency 'bundler', '~> 2.3'
+  spec.add_development_dependency 'rake', '~> 13.0'
+  spec.add_development_dependency 'rspec', '~> 3.11'
+  spec.add_development_dependency 'codecov', '~> 0.6'
+  spec.add_development_dependency 'dotenv', '~> 2.7'
+  spec.add_development_dependency 'simplecov', '~> 0.21'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: passpartu
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.0.3
 platform: ruby
 authors:
 - OrestF
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2020-08-12 00:00:00.000000000 Z
+date: 2022-03-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -16,42 +16,84 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '2.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '2.3'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '12.3'
+        version: '13.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '12.3'
+        version: '13.0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '3.11'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '3.11'
+- !ruby/object:Gem::Dependency
+  name: codecov
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.6'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.6'
+- !ruby/object:Gem::Dependency
+  name: dotenv
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.7'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.7'
+- !ruby/object:Gem::Dependency
+  name: simplecov
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.21'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.21'
 description: |-
   Passpartu is a great tool to manage your policies.
                           Keep all your policy rules in one file - passpartu.yml.
@@ -74,7 +116,7 @@ homepage: https://github.com/coaxsoft/passpartu
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -89,8 +131,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.1
-signing_key: 
+rubygems_version: 3.1.6
+signing_key:
 specification_version: 4
 summary: Passpartu makes policies great again
 test_files: []