tram-policy 2.0.0 → 2.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d2d94489718b8070f78e8a4792e67902336e87d03da02d216fe49069767684fb
-  data.tar.gz: 4c9e417c8a39f18e0faf75c2b7bae22f7d3aa0e53c2c9486e068910f59837f2f
+  metadata.gz: ee9ed362efd81c55cfe3097f6188f8da61af5b3ec78eee0eb6e5182bbfd62245
+  data.tar.gz: f2ab09546f5c6c5a70fca9459b1e2658dab85b0b2f9ffd27685ba61b00c62f06
 SHA512:
-  metadata.gz: 71862e68041ee87d414f60bcf79c5f84f4996db5bc1ddc143628598dc29f0ca4a9816c7669b63a1c10e9e737e371800ff9ad1b214ed814753ce4c393c3877165
-  data.tar.gz: 6278ffc6803fdb5ab6f96bc4c4d2a38ad7758e2eb723fca763234aa647e2ba6b1854220059d2ce0cc182215042b2926080ad39f39eb815614610850d12e2d72c
+  metadata.gz: 4ff7aaa1632158f2c5664b7bd492cd3a0f7d574f91c7232a97fb2a45b8ebdaf4923578716d805b56c66098ab4ddb7dbe2a2a506832f42d5a03c2e4128675acb4
+  data.tar.gz: 8d28126a3d030a3b7ff4a59e11f3444865bb634358997fd690af1117380b9001d2221b40456d2a727cd32ba2fd0ed2a03fd6eef3618caa13e3e068f5427f8da5

data/.github/workflows/ci.yml

@@ -0,0 +1,44 @@
+name: CI
+
+on:
+  push:
+    branches:
+      - master
+  pull_request:
+    branches:
+      - "*"
+
+jobs:
+  build:
+    name: Ruby ${{ matrix.ruby }}
+
+    strategy:
+      fail-fast: true
+      matrix:
+        ruby:
+          - "2.5.0"
+          - "3.0.0"
+          - "head"
+
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v2
+
+      - name: Install dependent libraries
+        run: sudo apt-get install libpq-dev
+
+      - name: Install Ruby ${{ matrix.ruby }}
+        uses: ruby/setup-ruby@v1.61.1
+        with:
+          ruby-version: ${{ matrix.ruby }}
+          bundler-cache: true # 'bundle install' and cache
+
+      - name: Check code style
+        run: bundle exec rubocop
+        continue-on-error: false
+
+      - name: Run tests
+        run: bundle exec rake --trace
+        continue-on-error: false

data/.rubocop.yml

@@ -3,7 +3,7 @@ AllCops:
   DisplayCopNames:    true
   DisplayStyleGuide:  true
   StyleGuideCopsOnly: true
-  TargetRubyVersion:  2.4
+  TargetRubyVersion:  3.0
 
 Lint/AmbiguousBlockAssociation:
   Enabled: false

data/CHANGELOG.md

@@ -4,6 +4,22 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](http://keepachangelog.com/)
 and this project adheres to [Semantic Versioning](http://semver.org/).
 
+## [2.2.0] - [2022-06-18]
+
+### Added
+- Support for Ruby 3+ (HolyWalley)
+
+## [2.1.0] - [2021-11-30]
+
+### Fixed
+- Difference between last positional and keyword arguments in Ruby 3.0+ (mrexox)
+
+## [2.0.1] - [2019-11-14]
+
+### Fixed
+- Allow translation :scope to be customized in the #merge operation (sclinede)
+  Before the fix, the customized value was always replaced by the default value.
+
 ## [2.0.0] - [2019-07-04]
 
 ### Changed
@@ -212,3 +228,6 @@ This is a first public release (@nepalez, @charlie-wasp, @JewelSam, @sergey-chec
 [1.0.0]: https://github.com/tram-rb/tram-policy/compare/v0.4.0...v1.0.0
 [1.0.1]: https://github.com/tram-rb/tram-policy/compare/v1.0.0...v1.0.1
 [2.0.0]: https://github.com/tram-rb/tram-policy/compare/v1.0.1...v2.0.0
+[2.0.1]: https://github.com/tram-rb/tram-policy/compare/v2.0.0...v2.0.1
+[2.1.0]: https://github.com/tram-rb/tram-policy/compare/v2.0.1...v2.1.0
+[2.1.0]: https://github.com/tram-rb/tram-policy/compare/v2.1.0...v2.2.0

data/README.md

@@ -6,7 +6,6 @@ Policy Object Pattern
 <img src="https://evilmartians.com/badges/sponsored-by-evil-martians.svg" alt="Sponsored by Evil Martians" width="236" height="54"></a>
 
 [![Gem Version][gem-badger]][gem]
-[![Build Status][travis-badger]][travis]
 [![Inline docs][inch-badger]][inch]
 
 ## Intro
@@ -340,7 +339,6 @@ The gem is available as open source under the terms of the [MIT License](http://
 [inch-badger]: http://inch-ci.org/github/tram-rb/tram-policy.svg
 [inch]: https://inch-ci.org/github/tram-rb/tram-policy
 [travis-badger]: https://img.shields.io/travis/tram-rb/tram-policy/master.svg?style=flat
-[travis]: https://travis-ci.org/tram-rb/tram-policy
 [active-model-validation]: http://api.rubyonrails.org/classes/ActiveModel/Validations.html
 [active-record-validation]: http://guides.rubyonrails.org/active_record_validations.html
 [dry-validation]: http://dry-rb.org/gems/dry-validation/

data/lib/tram/policy/dsl.rb

@@ -9,7 +9,7 @@ class Tram::Policy
     # @return [self]
     #
     def validate(name = nil, **opts, &block)
-      local_validators << Validator.new(name, block, opts)
+      local_validators << Validator.new(name, block, **opts)
       self
     end
 
@@ -18,8 +18,8 @@ class Tram::Policy
     # @param  [Object] *args
     # @return [Tram::Policy]
     #
-    def [](*args)
-      new(*args)
+    def [](*args, **kwargs)
+      new(*args, **kwargs)
     end
 
     # Sets the root scope of the policy and its subclasses

data/lib/tram/policy/error.rb

@@ -41,7 +41,7 @@ class Tram::Policy
     # @return [String]
     #
     def message
-      key.is_a?(Symbol) ? I18n.t(*item) : key.to_s
+      key.is_a?(Symbol) ? I18n.t(key, **tags) : key.to_s
     end
 
     # Fetches an option
@@ -105,8 +105,8 @@ class Tram::Policy
       true
     end
 
-    def method_missing(name, *args, &block)
-      args.any? || block ? super : tags[name]
+    def method_missing(name, *args, **kwargs, &block)
+      args.any? || kwargs.any? || block ? super : tags[name]
     end
   end
 end

data/lib/tram/policy/errors.rb

@@ -24,7 +24,7 @@ class Tram::Policy
       raise ArgumentError.new("Error message should be defined") unless message
 
       tap do
-        tags = tags.merge(scope: scope) if message.is_a?(Symbol)
+        tags = { scope: scope }.merge(tags) if message.is_a?(Symbol)
         @set << Tram::Policy::Error.new(message, **tags)
       end
     end
@@ -47,7 +47,7 @@ class Tram::Policy
     #
     def filter(key = nil, **tags)
       list = each_with_object(Set.new) do |error, obj|
-        obj << error if error.contain?(key, tags)
+        obj << error if error.contain?(key, **tags)
       end
       self.class.new(scope: scope, errors: list)
     end
@@ -95,7 +95,7 @@ class Tram::Policy
       other.each do |err|
         key, opts = err.item
         opts = yield(opts) if block_given?
-        add key, opts.merge(options)
+        add key, **opts.merge(options)
       end
 
       self

data/lib/tram/policy/rspec.rb

@@ -6,7 +6,7 @@ RSpec::Matchers.define :be_invalid_at do |**tags|
   end
 
   def check(policy, tags)
-    @errors ||= policy.errors.filter(tags).map do |error|
+    @errors ||= policy.errors.filter(**tags).map do |error|
       { item: error.item }.tap do |obj|
         locales.each { |l| obj[l] = I18n.with_locale(l) { error.message } }
       end

data/lib/tram/policy.rb

@@ -101,7 +101,7 @@ module Tram
 
     private
 
-    def initialize(*)
+    def initialize(*, **)
       super
 
       self.class.validators.each do |validator|

data/spec/tram/policy/error_spec.rb

@@ -1,5 +1,5 @@
 RSpec.describe Tram::Policy::Error do
-  subject(:error) { described_class.new :bad, options }
+  subject(:error) { described_class.new :bad, **options }
 
   let(:scope)   { %w[tram-policy] }
   let(:options) { { level: "warning", scope: scope } }

data/tram-policy.gemspec

@@ -1,9 +1,9 @@
 Gem::Specification.new do |gem|
   gem.name     = "tram-policy"
-  gem.version  = "2.0.0"
+  gem.version  = "2.2.0"
   gem.author   = ["Viktor Sokolov (gzigzigzeo)", "Andrew Kozin (nepalez)"]
   gem.email    = "andrew.kozin@gmail.com"
-  gem.homepage = "https://github.com/tram/tram-policy"
+  gem.homepage = "https://github.com/tram-rb/tram-policy"
   gem.summary  = "Policy Object Pattern"
   gem.license  = "MIT"
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tram-policy
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.2.0
 platform: ruby
 authors:
 - Viktor Sokolov (gzigzigzeo)
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-07-04 00:00:00.000000000 Z
+date: 2022-06-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dry-initializer
@@ -125,10 +125,10 @@ extra_rdoc_files:
 - CHANGELOG.md
 files:
 - ".codeclimate.yml"
+- ".github/workflows/ci.yml"
 - ".gitignore"
 - ".rspec"
 - ".rubocop.yml"
-- ".travis.yml"
 - CHANGELOG.md
 - Gemfile
 - LICENSE.txt
@@ -160,7 +160,7 @@ files:
 - spec/tram/policy/validation_error_spec.rb
 - spec/tram/policy_spec.rb
 - tram-policy.gemspec
-homepage: https://github.com/tram/tram-policy
+homepage: https://github.com/tram-rb/tram-policy
 licenses:
 - MIT
 metadata: {}
@@ -179,7 +179,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.2.3
 signing_key: 
 specification_version: 4
 summary: Policy Object Pattern

data/.travis.yml

@@ -1,22 +0,0 @@
----
-language: ruby
-sudo: false
-cache: bundler
-bundler_args: --without benchmarks tools
-script:
-  - bundle exec rake
-  - bundle exec rubocop
-rvm:
-  - 2.3.0
-  - 2.6.2
-  - ruby-head
-  - jruby-9.2.7.0
-  - truffleruby
-env:
-  global:
-    - JRUBY_OPTS='--dev -J-Xmx1024M'
-matrix:
-  allow_failures:
-    - rvm: ruby-head
-    - rvm: jruby-head
-    - rvm: truffleruby