f_service 0.3.0 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6cb29d87cf5c970b2b185ed2c3da41020f40122e2d0857af068302fb32e55400
-  data.tar.gz: 27a89660bb6d1e65d537f5d6617cc8175f600ab71efca79f65875a1b6adf0c97
+  metadata.gz: 4997e65a2e3054de3de7a252a3e85143d41701f44046982ffc583c486755aa1d
+  data.tar.gz: ea5212762e5529ec315dac3437d29ac75a5c20058d30fdc382fe31b6f18288a6
 SHA512:
-  metadata.gz: 2b444953aee676163a2b076d814b3cc801b0808a30660c4edd2f19172754d58c41a7fcb3129a52cf95c1a0fdb8546419a55a8101b6882459673cd647d520f660
-  data.tar.gz: 0e2f10e1ad6cf4ba7ba2375b2302661429721b7bf4023afcb1559909205eb7e8f013efbb3da07c4b7926b2e967592c31a6c930ca6d6e69b195bba97342407b69
+  metadata.gz: f3c51bf4006bb0b037361690fabb7e0af7895b393394561ed9a784d89ffe063bd48e573406fbee6675e5d3ef5f9ca3f9085240c6855ece5a7a50259dd6264e98
+  data.tar.gz: 7af0dfcf8f92fb8ac39b43efc044c5f623c9c52084b0b1a9542a9d6f1902dbe7444eb5b3b00ec043302dfe9b6e78eb879bc1cb335c2e078930bb15c49a9fe176

data/.github/workflows/tests-and-linter.yml

@@ -11,7 +11,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        ruby: [2.6, 2.7, 3.0, 3.1]
+        ruby: [3.0, 3.1, 3.2, 3.3]
 
     steps:
       - uses: actions/checkout@v2

data/.rubocop.yml

@@ -2,6 +2,7 @@ require:
   - rubocop-rspec
 
 AllCops:
+  TargetRubyVersion: 3.0.0
   NewCops: enable
 
 Layout/LineLength:
@@ -31,3 +32,7 @@ RSpec/ExampleLength:
 
 RSpec/NestedGroups:
   Enabled: false
+
+##### RUBYGEMS #####
+Gemspec/RequireMFA:
+  Enabled: false

data/CHANGELOG.md

@@ -10,6 +10,12 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 <!-- ### Removed -->
 ---
 
+## 0.3.0
+### Added
+ - Drop Support to Ruby 2.6 and 2.7
+ - Add Support to Ruby 3.2 and 3.3
+ - Changed and_error to use a matcher instead of equality comparation #51
+
 ## 0.3.0
 ### Added
 - Added Rspec Helper `#mock_service` #41;

data/Gemfile

@@ -9,7 +9,7 @@ group :development, :test do
   gem 'pry'
   gem 'pry-nav'
   gem 'rake', '~> 13.0.0'
-  gem 'rubocop', '~> 0.82.0', require: false
+  gem 'rubocop', '~> 1.60.2', require: false
   gem 'rubocop-rspec', require: false
 end
 

data/Gemfile.lock

@@ -1,39 +1,47 @@
 PATH
   remote: .
   specs:
-    f_service (0.3.0)
+    f_service (0.3.1)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    ast (2.4.0)
-    backport (1.1.2)
-    benchmark (0.1.0)
+    ast (2.4.2)
+    backport (1.2.0)
+    benchmark (0.3.0)
     coderay (1.1.3)
     diff-lcs (1.3)
     docile (1.3.5)
     e2mmap (0.1.0)
-    jaro_winkler (1.5.4)
-    maruku (0.7.3)
+    jaro_winkler (1.5.6)
+    json (2.7.1)
+    kramdown (2.4.0)
+      rexml
+    kramdown-parser-gfm (1.1.0)
+      kramdown (~> 2.0)
+    language_server-protocol (3.17.0.3)
     method_source (1.0.0)
-    mini_portile2 (2.8.1)
-    nokogiri (1.14.3)
-      mini_portile2 (~> 2.8.0)
+    mini_portile2 (2.8.6)
+    nokogiri (1.16.5)
+      mini_portile2 (~> 2.8.2)
       racc (~> 1.4)
-    parallel (1.19.1)
-    parser (2.7.1.1)
-      ast (~> 2.4.0)
+    parallel (1.24.0)
+    parser (3.3.0.5)
+      ast (~> 2.4.1)
+      racc
     pry (0.14.1)
       coderay (~> 1.1)
       method_source (~> 1.0)
     pry-nav (1.0.0)
       pry (>= 0.9.10, < 0.15)
-    racc (1.6.2)
-    rainbow (3.0.0)
+    racc (1.7.3)
+    rainbow (3.1.1)
     rake (13.0.1)
-    reverse_markdown (1.4.0)
+    regexp_parser (2.9.0)
+    reverse_markdown (2.1.1)
       nokogiri
-    rexml (3.2.5)
+    rexml (3.2.8)
+      strscan (>= 3.0.9)
     rspec (3.9.0)
       rspec-core (~> 3.9.0)
       rspec-expectations (~> 3.9.0)
@@ -47,53 +55,64 @@ GEM
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.9.0)
     rspec-support (3.9.2)
-    rubocop (0.82.0)
-      jaro_winkler (~> 1.5.1)
+    rubocop (1.60.2)
+      json (~> 2.3)
+      language_server-protocol (>= 3.17.0)
       parallel (~> 1.10)
-      parser (>= 2.7.0.1)
+      parser (>= 3.3.0.2)
       rainbow (>= 2.2.2, < 4.0)
-      rexml
+      regexp_parser (>= 1.8, < 3.0)
+      rexml (>= 3.2.5, < 4.0)
+      rubocop-ast (>= 1.30.0, < 2.0)
       ruby-progressbar (~> 1.7)
-      unicode-display_width (>= 1.4.0, < 2.0)
-    rubocop-rspec (1.38.1)
-      rubocop (>= 0.68.1)
-    ruby-progressbar (1.10.1)
+      unicode-display_width (>= 2.4.0, < 3.0)
+    rubocop-ast (1.30.0)
+      parser (>= 3.2.1.0)
+    rubocop-capybara (2.20.0)
+      rubocop (~> 1.41)
+    rubocop-factory_bot (2.25.1)
+      rubocop (~> 1.41)
+    rubocop-rspec (2.26.1)
+      rubocop (~> 1.40)
+      rubocop-capybara (~> 2.17)
+      rubocop-factory_bot (~> 2.22)
+    ruby-progressbar (1.13.0)
     simplecov (0.21.2)
       docile (~> 1.1)
       simplecov-html (~> 0.11)
       simplecov_json_formatter (~> 0.1)
     simplecov-html (0.12.3)
     simplecov_json_formatter (0.1.2)
-    solargraph (0.38.6)
+    solargraph (0.41.2)
       backport (~> 1.1)
       benchmark
       bundler (>= 1.17.2)
       e2mmap
       jaro_winkler (~> 1.5)
-      maruku (~> 0.7, >= 0.7.3)
-      nokogiri (~> 1.9, >= 1.9.1)
-      parser (~> 2.3)
-      reverse_markdown (~> 1.0, >= 1.0.5)
-      rubocop (~> 0.52)
+      kramdown (~> 2.3)
+      kramdown-parser-gfm (~> 1.1)
+      parser (~> 3.0)
+      reverse_markdown (>= 1.0.5, < 3)
+      rubocop (>= 0.52)
       thor (~> 1.0)
       tilt (~> 2.0)
-      yard (~> 0.9)
-    thor (1.0.1)
-    tilt (2.0.10)
-    unicode-display_width (1.7.0)
-    yard (0.9.24)
+      yard (~> 0.9, >= 0.9.24)
+    strscan (3.1.0)
+    thor (1.3.0)
+    tilt (2.3.0)
+    unicode-display_width (2.5.0)
+    yard (0.9.36)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  bundler (~> 2.0)
   f_service!
   pry
   pry-nav
   rake (~> 13.0.0)
   rspec (~> 3.0)
-  rubocop (~> 0.82.0)
+  rubocop (~> 1.60.2)
   rubocop-rspec
   simplecov
   solargraph

data/README.md

@@ -189,11 +189,14 @@ class UsersController < BaseController
 end
 ```
 
-### Types precedence
+### Type precedence
 
-FService matches types from left to right, from more specific to more generic.
-Example (:unprocessable_entity, :client_error, :http_response)
-Then, result will match first :unprocessable_entity, after :client_error, after :http_response, then not matched.
+FService matches the service's types from left to right, from more specific to more generic.
+For example, the following result `Failure(:unprocessable_entity, :client_error, :http_response)` will match in the following order:
+1. `:unprocessable_entity`;
+2. `:client_error`;
+3. `:http_response`;
+4. unmatched block;
 
 ### Chaining services
 
@@ -277,7 +280,7 @@ require 'f_service/rspec'
 
 ### Mocking a result
 
-```
+```rb
 mock_service(Uer::Create)
 # => Mocks a successful result with all values nil
 
@@ -310,6 +313,8 @@ expect(User::Create.(name: 'Joe')).to have_succeed_with(:created).and_value(an_i
 expect(User::Create.(name: nil)).to have_failed_with(:invalid_attributes)
 
 expect(User::Create.(name: nil)).to have_failed_with(:invalid_attributes).and_error({ name: ["can't be blank"] })
+
+expect(User::Create.(name: nil)).to have_failed_with(:invalid_attributes).and_error(a_hash_including(name: ["can't be blank"]))
 ```
 
 ## API Docs

data/f_service.gemspec

@@ -19,6 +19,7 @@ Gem::Specification.new do |spec|
 
   spec.homepage = 'https://github.com/Fretadao/f_service'
   spec.license  = 'MIT'
+  spec.required_ruby_version = '>= 3.0.0'
 
   spec.metadata['homepage_uri']    = spec.homepage
   spec.metadata['source_code_uri'] = 'https://github.com/Fretadao/f_service'
@@ -33,6 +34,4 @@ Gem::Specification.new do |spec|
   spec.bindir        = 'exe'
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ['lib']
-
-  spec.add_development_dependency 'bundler', '~> 2.0'
 end

data/lib/f_service/rspec/support/matchers/result.rb

@@ -6,7 +6,7 @@ RSpec::Matchers.define :have_failed_with do |*expected_types|
   match do |actual|
     matched = actual.is_a?(FService::Result::Failure) && actual.types == expected_types
 
-    matched &&= actual.error == @expected_error if defined?(@expected_error)
+    matched &&= values_match?(@expected_error, actual.error) if defined?(@expected_error)
 
     matched
   end

data/lib/f_service/version.rb

@@ -2,5 +2,5 @@
 
 module FService
   # Current version of the gem
-  VERSION = '0.3.0'
+  VERSION = '0.3.1'
 end

metadata

@@ -1,29 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: f_service
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
 platform: ruby
 authors:
 - Fretadao Tech Team
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2023-05-22 00:00:00.000000000 Z
-dependencies:
-- !ruby/object:Gem::Dependency
-  name: bundler
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.0'
+date: 2024-07-18 00:00:00.000000000 Z
+dependencies: []
 description: |2
       FService is a small gem that provides a base class for your services (aka operations).
       The goal is to make services simpler, safer and more composable.
@@ -77,14 +63,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 3.0.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.5
+rubygems_version: 3.5.11
 signing_key: 
 specification_version: 4
 summary: A small, monad-based service class