performify 0.9.1 → 1.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 33e27c0ba8a5b203682345fc20496321bdf8f896afe07b6a5560cc8eebabb446
-  data.tar.gz: 984702d047e7381be2672235b2ea35f88c88df605b6bffd590524b398da19ea1
+  metadata.gz: d13a5e97cc5534c7f85d91d1b3e65ec55830f2006bfda7ac57940c6ad7e30c9d
+  data.tar.gz: 34cd73abe679e97577581f43357c3e1727aaad45671bf6a778cddda32f7c9559
 SHA512:
-  metadata.gz: 055f189d9d9c6ef5dd974bc549f5c3254e58626171694ed9f2cfbf50f407c26c643d06d8ddd2fe1b0fe406df1a55be5ff3a657f7b43e66a8db0b1069f9c1c706
-  data.tar.gz: 5ee348d53bc632721f59aba5cc4d50339bb17dce38f858672bd60b2735447d2bcc7ef0def6a76f54719e5558fea5a0c2f9fe022c93b80d16a39a2a871e628955
+  metadata.gz: a2e9e69d59d859c2951fa56a1d235c70fcbc35b254872ee56f5354982f3a7b277458c276e3c4f5d440e81faec855b61146aa8dbf2c9ce4713cd6951b28c62f1d
+  data.tar.gz: 076cb868c4d988383084001ff445e80677012dc7f2a28c2b82366576252fd4b5125b3e5d13e682a794771a0b70e66cef294b9952d94804a207a82a649264ea6e

data/.github/workflows/test.yml

@@ -0,0 +1,25 @@
+name: Test
+on:
+  push:
+    branches:
+      - master
+
+  pull_request:
+    branches:
+      - master
+
+jobs:
+  test:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+
+      - uses: ruby/setup-ruby@v1
+        with:
+          ruby-version:  2.7.2
+          bundler-cache: true
+
+      - name: Test
+        run: |
+          bundle exec rspec --format progress
+

data/.ruby-version

@@ -0,0 +1 @@
+2.7.0

data/CHANGELOG.md

@@ -0,0 +1,11 @@
+# CHANGELOG
+
+## 1.0.0
+
+This version is switching performify from version `0.12.0` of `dry-validation` to `dry-schema` of version `1.4` which means breaking changes:
+
+- Because additional options are not supported by `dry-schema` (or at least I have not found this support in the source code) we were forced to drop them as well. So, from now you can't use `current_user` in your schemas by default because it's not being passed implicitly.
+
+## 1.0.1
+
+This version has all dependencies updated to latest version. We also switched automated testing from Circle CI (which was failing) to Github Action.

data/README.md

@@ -242,32 +242,6 @@ else
 end
 ```
 
-You can set options for `#with` to schema by overriding `#with_options`.
-By default `#with_options` contains `{ current_user: current_user }`.
-
-```ruby
-module Users
-  class UpdatePassword < ApplicationService
-    schema do
-      configure do
-        option :current_user
-
-        def valid_password?(value)
-          current_user.password_digest.blank? || current_user.authenticate(value)
-        end
-      end
-
-      optional(:old_password).filled(:str?, :valid_password?)
-      required(:new_password).filled(:str?)
-    end
-
-    def execute!
-      super { current_user.update(password: new_password) }
-    end
-  end
-end
-```
-
 You can get filtered inputs after success validation by accessing `inputs`.
 
 ```ruby

data/lib/performify.rb

@@ -1,3 +1,5 @@
+require "dry/schema"
+
 require "performify/version"
 require "performify/base"
 

data/lib/performify/base.rb

@@ -26,10 +26,13 @@ module Performify
       ActiveRecord::Base.transaction do
         begin
           block_result = yield
-          if block_result
-            success!(with_callbacks: false)
-          else
-            fail!(with_callbacks: false)
+
+          if @result.nil?
+            if block_result
+              success!(with_callbacks: false)
+            else
+              fail!(with_callbacks: false)
+            end
           end
         rescue RuntimeError, ActiveRecord::RecordInvalid => e
           fail!(exception: e, with_callbacks: false)
@@ -86,7 +89,10 @@ module Performify
     private def define_singleton_methods
       param_names = schema ? schema.rules.keys : args.keys
       param_names.each do |param_name|
-        define_singleton_method(param_name) { args[param_name] }
+        define_singleton_method(param_name) do
+          value = args[param_name]
+          value.is_a?(Hash) ? JSON.parse(value.to_json, object_class: OpenStruct) : value
+        end
       end
     end
   end

data/lib/performify/validation.rb

@@ -1,5 +1,3 @@
-require 'dry-validation'
-
 module Performify
   module Validation
     def self.extended(base)
@@ -10,8 +8,8 @@ module Performify
     module ClassMethods
       def schema(outer_schema = nil, &block)
         if block_given?
-          @schema = Dry::Validation.Schema(Dry::Validation::Schema::Params, {}, &block)
-        elsif outer_schema.present? && outer_schema.is_a?(Dry::Validation::Schema)
+          @schema = Dry::Schema.Params(**{}, &block)
+        elsif outer_schema.present? && outer_schema.is_a?(Dry::Schema::Params)
           @schema = outer_schema
         else
           @schema
@@ -27,7 +25,8 @@ module Performify
       def validate
         return args if schema.nil?
 
-        result = schema.with(with_options).call(args)
+        result = schema.call(args)
+
         if result.success?
           @inputs = result.output
         else
@@ -51,10 +50,6 @@ module Performify
       def errors?
         errors.any?
       end
-
-      private def with_options
-        { current_user: current_user }
-      end
     end
   end
 end

data/lib/performify/version.rb

@@ -1,3 +1,3 @@
 module Performify
-  VERSION = '0.9.1'.freeze
+  VERSION = '1.0.2'.freeze
 end

data/performify.gemspec

@@ -23,13 +23,14 @@ Gem::Specification.new do |spec|
   spec.executables = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.add_dependency "activerecord", ">= 4.0.0"
-  spec.add_dependency "dry-validation", ">= 0.12.0"
+  spec.add_dependency "activerecord", ">= 4.0"
+  spec.add_dependency "dry-schema", "~> 1.5"
 
-  spec.add_development_dependency "sqlite3", "~> 1.3.13"
-  spec.add_development_dependency "bundler", "~> 1.14"
-  spec.add_development_dependency "rake", "~> 10.0"
+  spec.add_development_dependency "sqlite3", "~> 1.4"
+  spec.add_development_dependency "bundler", ">= 2.2"
+  spec.add_development_dependency "rake", "~> 12.3.3"
   spec.add_development_dependency "rspec", "~> 3.5"
   spec.add_development_dependency "rubocop", "~> 0.48"
   spec.add_development_dependency "byebug", "~> 9.0.6"
+  spec.add_development_dependency "rspec_junit_formatter", "~> 0.4.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: performify
 version: !ruby/object:Gem::Version
-  version: 0.9.1
+  version: 1.0.2
 platform: ruby
 authors:
 - Sergey Tsvetkov
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2018-09-24 00:00:00.000000000 Z
+date: 2021-01-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -16,70 +16,70 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 4.0.0
+        version: '4.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 4.0.0
+        version: '4.0'
 - !ruby/object:Gem::Dependency
-  name: dry-validation
+  name: dry-schema
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.12.0
+        version: '1.5'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.12.0
+        version: '1.5'
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3.13
+        version: '1.4'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3.13
+        version: '1.4'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.14'
+        version: '2.2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.14'
+        version: '2.2'
 - !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
@@ -122,6 +122,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 9.0.6
+- !ruby/object:Gem::Dependency
+  name: rspec_junit_formatter
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.4.1
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.4.1
 description: Performify helps you to define your app logic in separated and isolated                       service
   classes that is easy to use, test and maitain.
 email:
@@ -130,10 +144,12 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/workflows/test.yml"
 - ".gitignore"
 - ".rspec"
 - ".rubocop.yml"
-- ".travis.yml"
+- ".ruby-version"
+- CHANGELOG.md
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -153,7 +169,7 @@ homepage: https://github.com/kimrgrey/performify
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -168,9 +184,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6
-signing_key: 
+rubygems_version: 3.1.2
+signing_key:
 specification_version: 4
 summary: Service classes that makes your life easier
 test_files: []

data/.travis.yml

@@ -1,10 +0,0 @@
-sudo: false
-language: ruby
-rvm:
-  - 2.3.1
-before_install:
-  - gem install bundler -v 1.14.6
-install:
-  - bin/setup
-before_script:
-  - bin/rubocop