polist 1.2.0 → 1.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d41a9ea7c84cd858fc92d79160ea448ed78fd36cfcf164195a7afe9cc5dbd59e
-  data.tar.gz: 2d2e676fd05d9b57f3b3159955a473933e95500de4f4e80f63b708a1cdc04f83
+  metadata.gz: a66da4b33f58d9ed4ff5e449d0ee209793fd17477648a2ae37292ee856cb5a58
+  data.tar.gz: 6d0886005342b86c7b2dc75510f3ede54b108b1b17eb2fe1c5cc273f544cd20a
 SHA512:
-  metadata.gz: f447ab40d832e15136acbf2b312f2941d2d18b0c8a046f40a4a3e26a76aa4e8be4df313e30962c665e3cc0f755ed1989f3ea8c6df050d0a4c28555fffd457558
-  data.tar.gz: 7e02ad12d1e8a13669a9e657c8ed7a181d19707c85c754c227c2fb006ba84e2b411ed4fe226001e8aeb2a3fa2a0aaee198eba1ef04d0432752f2353a8ce0f9fa
+  metadata.gz: fd47fe21f11eefac3483d886fba883c0ae5b5675eb93c5f2d0850826f09c5ba9ebef845ffa104b48e2f3da4aa5aa4aedacc5f7210df94b466084f52b89a278e4
+  data.tar.gz: 1f38095d7c52be31ba11f23e1fd0b92c50df90442ec506124d34cf10f5b5fb5a88aa71e10214baf81b86fe1ba2b4cdc41de2738e03e19f09b8ce0771b2d47a65

data/.github/workflows/ci.yml

@@ -0,0 +1,31 @@
+name: CI
+
+on: [push, pull_request]
+
+jobs:
+  test:
+    runs-on: ubuntu-latest
+
+    # We want to run on external PRs, but not on our own internal PRs as they'll be run on push event
+    if: github.event_name == 'push' || github.event.pull_request.head.repo.full_name != 'umbrellio/polist'
+
+    strategy:
+      fail-fast: false
+      matrix:
+        ruby: ["2.7", "3.0"]
+
+    name: ${{ matrix.ruby }}
+
+    steps:
+    - uses: actions/checkout@v2
+
+    - uses: ruby/setup-ruby@v1
+      with:
+        ruby-version: ${{ matrix.ruby }}
+        bundler-cache: true
+
+    - run: bundle exec rake
+
+    - uses: coverallsapp/github-action@v1.1.2
+      with:
+        github-token: ${{ secrets.GITHUB_TOKEN }}

data/.gitignore

@@ -1,6 +1,5 @@
 /.bundle/
 /.yardoc
-/Gemfile.lock
 /_yardoc/
 /coverage/
 /doc/

data/.rubocop.yml

@@ -3,7 +3,7 @@ inherit_gem:
 
 AllCops:
   DisplayCopNames: true
-  TargetRubyVersion: 2.5
+  TargetRubyVersion: 2.7
 
 Naming/MemoizedInstanceVariableName:
   Enabled: false

data/CHANGELOG.md

@@ -1,6 +1,10 @@
 # Changelog
 
-## [Unreleased]
+## [1.4.0] - 2021-06-21
+
+### Fixed
+
+- Fixes for Ruby 3 ([@tycooon]) [#9]
 
 ## [1.2.0] - 2019-03-15
 
@@ -35,7 +39,8 @@
 [1.1.0]: https://github.com/umbrellio/polist/compare/v1.0.0...v1.1.0
 [1.1.1]: https://github.com/umbrellio/polist/compare/v1.1.0...v1.1.1
 [1.2.0]: https://github.com/umbrellio/polist/compare/v1.1.1...v1.2.0
-[Unreleased]: https://github.com/umbrellio/polist/compare/v1.2.0...HEAD
+[1.4.0]: https://github.com/umbrellio/polist/compare/v1.2.0...v1.4.0
+[Unreleased]: https://github.com/umbrellio/polist/compare/v1.4.0...HEAD
 
 [@nesaulov]: https://github.com/nesaulov
 [@VanyaZ158]: https://github.com/VanyaZ158
@@ -45,3 +50,4 @@
 [#3]: https://github.com/umbrellio/polist/pull/3
 [#4]: https://github.com/umbrellio/polist/pull/4
 [#5]: https://github.com/umbrellio/polist/pull/5
+[#9]: https://github.com/umbrellio/polist/pull/9

data/Gemfile

@@ -1,8 +1,4 @@
 # frozen_string_literal: true
 
 source "https://rubygems.org"
-
-# Specify your gem's dependencies in polist.gemspec
 gemspec
-
-gem "rubocop-config-umbrellio", github: "umbrellio/code-style"

data/Gemfile.lock

@@ -0,0 +1,117 @@
+PATH
+  remote: .
+  specs:
+    polist (1.4.0)
+      activemodel (>= 3.0)
+      plissken (>= 0.3)
+      tainbox
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    activemodel (6.1.3.2)
+      activesupport (= 6.1.3.2)
+    activesupport (6.1.3.2)
+      concurrent-ruby (~> 1.0, >= 1.0.2)
+      i18n (>= 1.6, < 2)
+      minitest (>= 5.1)
+      tzinfo (~> 2.0)
+      zeitwerk (~> 2.3)
+    ast (2.4.2)
+    coderay (1.1.3)
+    concurrent-ruby (1.1.9)
+    diff-lcs (1.4.4)
+    docile (1.4.0)
+    i18n (1.8.10)
+      concurrent-ruby (~> 1.0)
+    method_source (1.0.0)
+    minitest (5.14.4)
+    parallel (1.20.1)
+    parser (3.0.1.1)
+      ast (~> 2.4.1)
+    plissken (1.4.1)
+    pry (0.14.1)
+      coderay (~> 1.1)
+      method_source (~> 1.0)
+    rack (2.2.3)
+    rainbow (3.0.0)
+    rake (13.0.3)
+    regexp_parser (2.1.1)
+    rexml (3.2.5)
+    rspec (3.10.0)
+      rspec-core (~> 3.10.0)
+      rspec-expectations (~> 3.10.0)
+      rspec-mocks (~> 3.10.0)
+    rspec-core (3.10.1)
+      rspec-support (~> 3.10.0)
+    rspec-expectations (3.10.1)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.10.0)
+    rspec-mocks (3.10.2)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.10.0)
+    rspec-support (3.10.2)
+    rubocop (1.11.0)
+      parallel (~> 1.10)
+      parser (>= 3.0.0.0)
+      rainbow (>= 2.2.2, < 4.0)
+      regexp_parser (>= 1.8, < 3.0)
+      rexml
+      rubocop-ast (>= 1.2.0, < 2.0)
+      ruby-progressbar (~> 1.7)
+      unicode-display_width (>= 1.4.0, < 3.0)
+    rubocop-ast (1.7.0)
+      parser (>= 3.0.1.1)
+    rubocop-config-umbrellio (1.11.0.51)
+      rubocop (= 1.11.0)
+      rubocop-performance (= 1.10.0)
+      rubocop-rails (= 2.9.1)
+      rubocop-rake (= 0.5.1)
+      rubocop-rspec (= 2.2.0)
+      rubocop-sequel (= 0.2.0)
+    rubocop-performance (1.10.0)
+      rubocop (>= 0.90.0, < 2.0)
+      rubocop-ast (>= 0.4.0)
+    rubocop-rails (2.9.1)
+      activesupport (>= 4.2.0)
+      rack (>= 1.1)
+      rubocop (>= 0.90.0, < 2.0)
+    rubocop-rake (0.5.1)
+      rubocop
+    rubocop-rspec (2.2.0)
+      rubocop (~> 1.0)
+      rubocop-ast (>= 1.1.0)
+    rubocop-sequel (0.2.0)
+      rubocop (~> 1.0)
+    ruby-progressbar (1.11.0)
+    simplecov (0.21.2)
+      docile (~> 1.1)
+      simplecov-html (~> 0.11)
+      simplecov_json_formatter (~> 0.1)
+    simplecov-html (0.12.3)
+    simplecov-lcov (0.8.0)
+    simplecov_json_formatter (0.1.3)
+    tainbox (2.1.2)
+      activesupport
+    tzinfo (2.0.4)
+      concurrent-ruby (~> 1.0)
+    unicode-display_width (2.0.0)
+    zeitwerk (2.4.2)
+
+PLATFORMS
+  x86_64-darwin-19
+  x86_64-darwin-20
+  x86_64-linux
+
+DEPENDENCIES
+  bundler
+  polist!
+  pry
+  rake
+  rspec
+  rubocop-config-umbrellio
+  simplecov
+  simplecov-lcov
+
+BUNDLED WITH
+   2.2.20

data/LICENSE.txt

@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2017 Yuri Smirnov
+Copyright (c) 2017-2019 Yuri Smirnov
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

data/README.md

@@ -1,5 +1,11 @@
 # Polist   [![Gem Version](https://badge.fury.io/rb/polist.svg)](https://badge.fury.io/rb/polist) [![Build Status](https://travis-ci.org/umbrellio/polist.svg?branch=master)](https://travis-ci.org/umbrellio/polist) [![Coverage Status](https://coveralls.io/repos/github/umbrellio/polist/badge.svg?branch=master)](https://coveralls.io/github/umbrellio/polist?branch=master)
 
+## DEPRECATION NOTICE
+
+This gem is no longer actively maintained. As a replacement, you can use [Resol](https://github.com/umbrellio/resol) as well as gems from [smart-rb](https://github.com/smart-rb) family.
+
+## Description
+
 Polist is a set of simple tools for creating business logic layer of your applications:
 
 - `Polist::Service` is a simple class designed for creating service classes.

data/Rakefile

@@ -2,7 +2,19 @@
 
 require "bundler/gem_tasks"
 require "rspec/core/rake_task"
+require "rubocop"
+require "rubocop-rspec"
+require "rubocop-performance"
+require "rubocop/rake_task"
 
-RSpec::Core::RakeTask.new(:spec)
+RuboCop::RakeTask.new(:rubocop) do |t|
+  config_path = File.expand_path(File.join(".rubocop.yml"), __dir__)
 
-task default: :spec
+  t.options = ["--config", config_path]
+  t.requires << "rubocop-rspec"
+  t.requires << "rubocop-performance"
+end
+
+RSpec::Core::RakeTask.new(:rspec)
+
+task default: %i[rubocop rspec]

data/bin/console

@@ -0,0 +1,8 @@
+#!/usr/bin/env ruby
+# frozen_string_literal: true
+
+require 'bundler/setup'
+require 'polist'
+
+require 'pry'
+Pry.start

data/lib/polist/builder.rb

@@ -1,32 +1,54 @@
 # frozen_string_literal: true
 
-require "uber/builder"
-
 module Polist
+  # Most of the code here is borrowed from Uber::Builder code
+  # See https://github.com/apotonick/uber/blob/master/lib/uber/builder.rb
   module Builder
     def self.included(base)
-      base.include(Uber::Builder)
       base.extend(ClassMethods)
     end
 
+    class Builders < Array
+      def call(context, *args, **kwargs)
+        each do |block|
+          klass = block.call(context, *args, **kwargs) and return klass
+        end
+
+        context
+      end
+
+      def <<(proc)
+        wrapped_proc = -> (ctx, *args, **kwargs) { ctx.instance_exec(*args, **kwargs, &proc) }
+        super(wrapped_proc)
+      end
+    end
+
     module ClassMethods
+      def builders
+        @builders ||= Builders.new
+      end
+
+      def builds(proc = nil, &block)
+        builders << (proc || block)
+      end
+
+      def build(*args, **kwargs)
+        build_klass(*args, **kwargs).new(*args, **kwargs)
+      end
+
       # Recursively runs class builders on class until no builders on that class found
       # or some builder returns the class itself
-      def build_klass(*args)
+      def build_klass(*args, **kwargs)
         klass = self
 
         loop do
-          new_klass = klass.build!(klass, *args)
+          new_klass = klass.builders.call(klass, *args, **kwargs)
           break if new_klass == klass
           klass = new_klass
         end
 
         klass
       end
-
-      def build(*args)
-        build_klass(*args).new(*args)
-      end
     end
   end
 end

data/lib/polist/service.rb

@@ -39,18 +39,19 @@ module Polist
       klass.const_set(:Failure, Class.new(klass::Failure))
       klass.prepend(MiddlewareCaller)
       klass.instance_variable_set(:@__polist_middlewares__, __polist_middlewares__.dup)
+      super
     end
 
-    def self.build(*args)
-      new(*args)
+    def self.build(*args, **options)
+      new(*args, **options)
     end
 
-    def self.call(*args, &block)
-      build(*args).tap { |service| service.call(&block) }
+    def self.call(*args, **options, &block)
+      build(*args, **options).tap { |service| service.call(&block) }
     end
 
-    def self.run(*args, &block)
-      build(*args).tap { |service| service.run(&block) }
+    def self.run(*args, **options, &block)
+      build(*args, **options).tap { |service| service.run(&block) }
     end
 
     def self.param(*names)
@@ -103,7 +104,10 @@ module Polist
     end
 
     def validate!
-      error!(form.errors.to_h.values.first) unless form.valid?
+      return if form.valid?
+      first_error = form.errors.to_hash.values.first
+      first_error = first_error.first if first_error.is_a?(Array)
+      error!(first_error)
     end
 
     private

data/lib/polist/service/middleware.rb

@@ -13,8 +13,8 @@ class Polist::Service::Middleware
   attr_reader :service
 
   %i[fail! error! success! form form_attributes].each do |service_method|
-    define_method(service_method) do |*args|
-      service.send(service_method, *args)
+    define_method(service_method) do |*args, **options|
+      service.send(service_method, *args, **options)
     end
   end
 end

data/lib/polist/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Polist
-  VERSION = "1.2.0"
+  VERSION = "1.4.0"
 end

data/polist.gemspec

@@ -5,28 +5,30 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require "polist/version"
 
 Gem::Specification.new do |spec|
-  spec.name          = "polist"
-  spec.version       = Polist::VERSION
-  spec.authors       = ["Yuri Smirnov"]
-  spec.email         = ["tycooon@yandex.ru"]
+  spec.required_ruby_version = ">= 2.7.0"
 
-  spec.summary       = "A gem for creating simple service classes and more."
-  spec.description   = "Polist is a gem for creating simple service classes and more."
-  spec.homepage      = "https://github.com/umbrellio/polist"
-  spec.license       = "MIT"
+  spec.name = "polist"
+  spec.version = Polist::VERSION
+  spec.authors = ["Yuri Smirnov"]
+  spec.email = ["tycooon@yandex.ru", "oss@umbrellio.biz"]
 
-  spec.files         = `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^spec/}) }
+  spec.summary = "A gem for creating simple service classes and more."
+  spec.description = "Polist is a gem for creating simple service classes and more."
+  spec.homepage = "https://github.com/umbrellio/polist"
+  spec.license = "MIT"
+
+  spec.files = `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^spec/}) }
   spec.require_paths = ["lib"]
 
   spec.add_runtime_dependency "activemodel", ">= 3.0"
   spec.add_runtime_dependency "plissken", ">= 0.3"
   spec.add_runtime_dependency "tainbox"
-  spec.add_runtime_dependency "uber"
 
   spec.add_development_dependency "bundler"
-  spec.add_development_dependency "coveralls"
   spec.add_development_dependency "pry"
   spec.add_development_dependency "rake"
   spec.add_development_dependency "rspec"
+  spec.add_development_dependency "rubocop-config-umbrellio"
   spec.add_development_dependency "simplecov"
+  spec.add_development_dependency "simplecov-lcov"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: polist
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.4.0
 platform: ruby
 authors:
 - Yuri Smirnov
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2019-03-15 00:00:00.000000000 Z
+date: 2021-06-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
@@ -53,13 +53,13 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: uber
+  name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  type: :runtime
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
@@ -67,7 +67,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: bundler
+  name: pry
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -81,7 +81,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: coveralls
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -95,7 +95,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: pry
+  name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -109,7 +109,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: rubocop-config-umbrellio
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -123,7 +123,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rspec
+  name: simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -137,7 +137,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: simplecov
+  name: simplecov-lcov
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -153,19 +153,22 @@ dependencies:
 description: Polist is a gem for creating simple service classes and more.
 email:
 - tycooon@yandex.ru
+- oss@umbrellio.biz
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/workflows/ci.yml"
 - ".gitignore"
 - ".rspec"
 - ".rubocop.yml"
-- ".travis.yml"
 - CHANGELOG.md
 - Gemfile
+- Gemfile.lock
 - LICENSE.txt
 - README.md
 - Rakefile
+- bin/console
 - lib/polist.rb
 - lib/polist/builder.rb
 - lib/polist/service.rb
@@ -177,7 +180,7 @@ homepage: https://github.com/umbrellio/polist
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -185,15 +188,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 2.7.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
-signing_key: 
+rubygems_version: 3.2.20
+signing_key:
 specification_version: 4
 summary: A gem for creating simple service classes and more.
 test_files: []

data/.travis.yml

@@ -1,24 +0,0 @@
-language: ruby
-
-sudo: false
-
-rvm:
-  - 2.3
-  - 2.4
-  - 2.5
-  - ruby-head
-
-before_install: gem install bundler
-
-env: SUITE="rspec"
-
-script: bundle exec $SUITE
-
-matrix:
-  fast_finish: true
-  # Only run RuboCop on the latest Ruby
-  include:
-    - rvm: 2.5
-      env: SUITE="rubocop"
-  allow_failures:
-    - rvm: ruby-head