acfs 2.1.0 → 2.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1a8433e212c204d4d4cfac1240933f0db9205e1c7290dd8f22a3cf0f17f41ad2
-  data.tar.gz: e89a53d16da8d2899ec89bbca9d4cf818e820dc7bb7887a34314faa6eaa60ad1
+  metadata.gz: 872db04bfa202ae5db849b28811d66577f3cd485cfa662f504ff559b57cc15f8
+  data.tar.gz: bffc375bafdcb31236de3dc3c8178c38704e0c20ecf28220c5a645bca639dce2
 SHA512:
-  metadata.gz: a752de373a4d503da9de34886bb4d5e5988c0d04fd40afd95d3570d24f6ccc70136ef487491301d25f0b50120b7e81b38c2f79cf12492d016498c768ed7bb1dd
-  data.tar.gz: fa18f22c3cbb3dddf61d96e660a4c869cbe58efb991a6d2d4460c2b4a2a9388e77ad7f5b54210eb8829c6865d920e3e45ad34f09ece63ecbe0045f7a2d020a28
+  metadata.gz: de761f5fc6fcbe043a50a9079c6d9907a51509a7a6f0c31a1964d17eb889fe56164d42512e423a4f4e03a0544224c8babc4ea7e4f321c3de4e28773db96d1cbe
+  data.tar.gz: 596ca3283a20c86867efa444bf234170ae4b0caf750d44ddb10ccba9f5d9898d5b7843fe770428f9f9d22b47e5ebed49a3c5d4582f942dd01a769daced69a851

data/CHANGELOG.md

@@ -12,6 +12,28 @@
 
 ### Breaks
 
+## 2.2.1 - (2026-06-20)
+
+---
+
+### Fixes
+
+- Re-release due to release workflow issues
+
+### Changes
+
+- Maintenance release
+- Improve compatibility with ActiveSupport/JSON
+
+## 2.2.0 - (2026-06-20)
+
+---
+
+### Changes
+
+- Maintenance release
+- Improve compatibility with ActiveSupport/JSON
+
 ## 2.1.0 - (2025-02-14)
 
 ---

data/README.md

@@ -14,7 +14,7 @@ Acfs covers model and service abstraction, convenient query and filter methods,
 Add this line to your application's Gemfile:
 
 ```ruby
-gem 'acfs', '~> 2.1'
+gem 'acfs', '~> 2.2'
 ```
 
 And then execute:

data/acfs.gemspec

@@ -31,7 +31,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'actionpack', '>= 7.0'
   spec.add_dependency 'activemodel', '>= 7.0'
   spec.add_dependency 'activesupport', '>= 7.0'
-  spec.add_dependency 'multi_json', '~> 1.0'
+  spec.add_dependency 'multi_json', '~> 1.21'
   spec.add_dependency 'opentelemetry-api', '~> 1.0'
   spec.add_dependency 'opentelemetry-common'
   spec.add_dependency 'rack'

data/lib/acfs/location.rb

@@ -8,13 +8,13 @@ module Acfs
   class Location
     attr_reader :arguments, :raw, :struct, :vars
 
-    REGEXP = /^:([A-z][A-z0-9_]*)$/
+    REGEXP = /^:([A-Za-z][A-Za-z0-9_]*)$/
 
     def initialize(uri, vars = {})
       @raw       = URI.parse uri
       @vars      = vars
       @struct    = raw.path.split('/').reject(&:empty?).map {|s| s =~ REGEXP ? Regexp.last_match[1].to_sym : s }
-      @arguments = struct.select {|s| s.is_a?(Symbol) }
+      @arguments = struct.grep(Symbol)
     end
 
     def build(vars)

data/lib/acfs/middleware/json.rb

@@ -12,12 +12,12 @@ module Acfs
       end
 
       def encode(data)
-        ::MultiJson.dump(data)
+        ::MultiJSON.generate(data)
       end
 
       def decode(body)
-        ::MultiJson.load(body)
-      rescue ::MultiJson::ParseError => e
+        ::MultiJSON.parse(body)
+      rescue ::MultiJSON::ParseError => e
         raise ::JSON::ParserError.new(e)
       end
     end

data/lib/acfs/request.rb

@@ -11,6 +11,7 @@ module Acfs
     attr_reader :uri, :url, :headers, :params, :data, :method, :operation
 
     include Request::Callbacks
+
     def initialize(url, **options, &block)
       @uri = URI.parse(url.to_s).tap do |_url|
         @data    = options.delete(:data) || nil

data/lib/acfs/resource/attributes.rb

@@ -103,7 +103,7 @@ class Acfs::Resource
     #
     # @see #write_attribute Delegates attribute values to `#write_attribute`.
     #
-    def write_attributes(attributes, **opts)
+    def write_attributes(attributes, **opts) # rubocop:disable Naming/PredicateMethod
       unless attributes.respond_to?(:each) && attributes.respond_to?(:keys)
         return false
       end

data/lib/acfs/stub.rb

@@ -158,7 +158,7 @@ module Acfs
         accepted_stubs.first
       end
 
-      def stubbed(operation)
+      def stubbed(operation) # rubocop:disable Naming/PredicateMethod
         stub = stub_for(operation)
         unless stub
           return false if allow_requests?

data/lib/acfs/version.rb

@@ -3,8 +3,8 @@
 module Acfs
   module VERSION
     MAJOR = 2
-    MINOR = 1
-    PATCH = 0
+    MINOR = 2
+    PATCH = 1
     STAGE = nil
 
     STRING = [MAJOR, MINOR, PATCH, STAGE].compact.join('.')

data/lib/acfs.rb

@@ -1,10 +1,7 @@
 # frozen_string_literal: true
 
 require 'active_support'
-require 'active_support/core_ext/hash'
-require 'active_support/core_ext/class'
-require 'active_support/core_ext/string'
-require 'active_support/core_ext/module'
+require 'active_support/core_ext'
 require 'active_support/notifications'
 
 require 'opentelemetry'
@@ -12,6 +9,7 @@ require 'opentelemetry/common'
 
 module Acfs
   extend ActiveSupport::Autoload
+
   require 'acfs/version'
   require 'acfs/errors'
   require 'acfs/global'
@@ -35,6 +33,7 @@ module Acfs
 
   module Middleware
     extend ActiveSupport::Autoload
+
     require 'acfs/middleware/base'
     require 'acfs/middleware/serializer'
 

data/spec/acfs/collection_spec.rb

@@ -6,7 +6,7 @@ describe Acfs::Collection do
   let(:model) { MyUser }
 
   describe 'Pagination' do
-    subject do
+    subject(:res) do
       Acfs.run
       collection
     end
@@ -24,9 +24,11 @@ describe Acfs::Collection do
             },)
       end
 
-      its(:total_pages) { is_expected.to eq 2 }
-      its(:current_page) { is_expected.to eq 1 }
-      its(:total_count) { is_expected.to eq 10 }
+      it 'exposes pagination headers', :aggregate_failures do
+        expect(res.total_pages).to eq 2
+        expect(res.current_page).to eq 1
+        expect(res.total_count).to eq 10
+      end
     end
 
     context 'with page parameter' do
@@ -41,9 +43,11 @@ describe Acfs::Collection do
             },)
       end
 
-      its(:total_pages) { is_expected.to eq 2 }
-      its(:current_page) { is_expected.to eq 2 }
-      its(:total_count) { is_expected.to eq 10 }
+      it 'exposes pagination headers', :aggregate_failures do
+        expect(res.total_pages).to eq 2
+        expect(res.current_page).to eq 2
+        expect(res.total_count).to eq 10
+      end
     end
 
     context 'with non-numerical page parameter' do
@@ -58,9 +62,11 @@ describe Acfs::Collection do
             },)
       end
 
-      its(:total_pages) { is_expected.to eq 2 }
-      its(:current_page) { is_expected.to eq 'e546f5' }
-      its(:total_count) { is_expected.to eq 10 }
+      it 'exposes pagination headers', :aggregate_failures do
+        expect(res.total_pages).to eq 2
+        expect(res.current_page).to eq 'e546f5'
+        expect(res.total_count).to eq 10
+      end
     end
 
     describe '#next_page' do

data/spec/acfs/global_spec.rb

@@ -31,7 +31,7 @@ describe Acfs::Global do
 
       it 'triggers event' do
         Acfs.run
-        expect(collector.events).to have(1).items
+        expect(collector.events.size).to eq(1)
       end
     end
 
@@ -42,7 +42,7 @@ describe Acfs::Global do
 
       it 'triggers event' do
         Acfs.reset
-        expect(collector.events).to have(1).items
+        expect(collector.events.size).to eq(1)
       end
     end
   end

data/spec/acfs/middleware/json_spec.rb

@@ -29,12 +29,28 @@ describe Acfs::Middleware::JSON do
       end
     end
 
+    context 'with #as_json objects' do
+      let(:data) do
+        Class.new do
+          def as_json(*)
+            {a: 1, b: 3}
+          end
+        end.new
+      end
+
+      it 'serializes data with #as_json' do
+        expect(JSON.parse(request.body)).to eq 'a' => 1, 'b' => 3
+      end
+    end
+
     context 'with #to_json objects' do
       let(:data) do
         Class.new do
           def to_json(*)
             '{"a": 1, "b": 2}'
           end
+
+          undef as_json
         end.new
       end
 

data/spec/acfs/operation_spec.rb

@@ -6,8 +6,8 @@ describe Acfs::Operation do
   let(:operation) { described_class.new MyUser, :read, params: {id: 0} }
 
   describe '#request' do
-    subject { operation.request }
+    subject(:op_request) { operation.request }
 
-    its(:operation) { is_expected.to eq operation }
+    it { expect(op_request.operation).to eq operation }
   end
 end

data/spec/acfs/request/callbacks_spec.rb

@@ -10,7 +10,7 @@ describe Acfs::Request::Callbacks do
     it 'stores a given callback' do
       request.on_complete(&callback)
 
-      expect(request.callbacks).to have(1).item
+      expect(request.callbacks.size).to eq(1)
       expect(request.callbacks[0]).to eq callback
     end
 
@@ -18,7 +18,7 @@ describe Acfs::Request::Callbacks do
       request.on_complete {|_res| 'abc' }
       request.on_complete(&callback)
 
-      expect(request.callbacks).to have(2).item
+      expect(request.callbacks.size).to eq(2)
       expect(request.callbacks[0]).to eq callback
     end
   end

data/spec/acfs/resource/locatable_spec.rb

@@ -44,37 +44,31 @@ describe Acfs::Resource::Locatable do
       context ':list location' do
         let(:action) { :list }
 
-        its(:raw_uri) do
-          is_expected.to eq 'http://users.example.org/users/:user_id/sessions'
-        end
+        it { expect(location.raw_uri).to eq 'http://users.example.org/users/:user_id/sessions' }
       end
 
       context ':create location' do
         let(:action) { :create }
 
-        its(:raw_uri) { is_expected.to eq 'http://users.example.org/sessions' }
+        it { expect(location.raw_uri).to eq 'http://users.example.org/sessions' }
       end
 
       context ':read location' do
         let(:action) { :read }
 
-        its(:raw_uri) { is_expected.to eq 'http://users.example.org/sessions/:id' }
+        it { expect(location.raw_uri).to eq 'http://users.example.org/sessions/:id' }
       end
 
       context ':update location' do
         let(:action) { :update }
 
-        its(:raw_uri) do
-          expect { location }.to raise_error ArgumentError, /update.*disabled/
-        end
+        it { expect { location }.to raise_error ArgumentError, /update.*disabled/ }
       end
 
       context ':delete location' do
         let(:action) { :delete }
 
-        its(:raw_uri) do
-          is_expected.to eq 'http://users.example.org/users/:user_id/sessions/del/:id'
-        end
+        it { expect(location.raw_uri).to eq 'http://users.example.org/users/:user_id/sessions/del/:id' }
       end
     end
   end

data/spec/acfs/resource/query_methods_spec.rb

@@ -197,7 +197,7 @@ describe Acfs::Resource::QueryMethods do
         Acfs.run
 
         expect(computers).to be_loaded
-        expect(computers).to have(3).items
+        expect(computers.size).to eq(3)
         expect(computers[0]).to be_a PC
         expect(computers[1]).to be_a Computer
         expect(computers[2]).to be_a Mac

data/spec/acfs/resource/validation_spec.rb

@@ -61,10 +61,9 @@ describe Acfs::Resource::Validation do
 
       before { model.valid? }
 
-      it { is_expected.not_to be_empty }
-      it { is_expected.to have(2).items }
-
-      it 'contains a list of error messages' do
+      it 'contains expected errors', :aggregate_failures do
+        expect(errors).not_to be_empty
+        expect(errors.size).to eq(2)
         expect(errors.to_hash).to eq age: ["can't be blank"], name: ['is invalid']
       end
     end

data/spec/acfs/runner_spec.rb

@@ -50,24 +50,24 @@ describe Acfs::Runner do
     describe '#process' do
       it 'triggers event' do
         runner.process Acfs::Operation.new MyUser, :read, params: {id: 0}
-        expect(collector.events).to have(1).items
-        expect(collector2.events).to have(1).items
+        expect(collector.events.size).to eq(1)
+        expect(collector2.events.size).to eq(1)
       end
     end
 
     describe '#run' do
       it 'triggers event' do
         runner.run Acfs::Operation.new MyUser, :read, params: {id: 0}
-        expect(collector.events).to have(1).items
-        expect(collector2.events).to have(0).items
+        expect(collector.events.size).to eq(1)
+        expect(collector2.events.size).to eq(0)
       end
     end
 
     describe '#enqueue' do
       it 'triggers event' do
         runner.enqueue Acfs::Operation.new MyUser, :read, params: {id: 0}
-        expect(collector.events).to have(1).items
-        expect(collector2.events).to have(0).items
+        expect(collector.events.size).to eq(1)
+        expect(collector2.events.size).to eq(0)
       end
     end
   end

data/spec/acfs/stub_spec.rb

@@ -140,7 +140,7 @@ describe Acfs::Stub do
         users = MyUser.all
         Acfs.run
 
-        expect(users).to have(2).items
+        expect(users.size).to eq(2)
       end
 
       it 'returns defined resources' do
@@ -169,7 +169,7 @@ describe Acfs::Stub do
       end
 
       context 'with header' do
-        subject do
+        subject(:comments_result) do
           Acfs.run
           comments
         end
@@ -188,8 +188,10 @@ describe Acfs::Stub do
           }
         end
 
-        its(:total_pages) { is_expected.to eq 2 }
-        its(:total_count) { is_expected.to eq 10 }
+        it 'exposes pagination headers', :aggregate_failures do
+          expect(comments_result.total_pages).to eq 2
+          expect(comments_result.total_count).to eq 10
+        end
       end
     end
 

data/spec/acfs_spec.rb

@@ -155,7 +155,7 @@ describe 'Acfs' do
     Acfs.run
 
     expect(users).to be_loaded
-    expect(users).to have(3).items
+    expect(users.size).to eq(3)
 
     expect(users[0].id).to eq 2
     expect(users[0].name).to eq 'John'
@@ -181,7 +181,7 @@ describe 'Acfs' do
     Acfs.run
 
     expect(users).to be_loaded
-    expect(users).to have(2).items
+    expect(users.size).to eq(2)
     expect(users[0].name).to eq 'Anon'
     expect(users[0].age).to eq 12
     expect(users[1].name).to eq 'John'
@@ -201,7 +201,7 @@ describe 'Acfs' do
     expect(user.name).to eq 'John'
     expect(user.age).to eq 26
 
-    expect(friends).to have(1).items
+    expect(friends.size).to eq(1)
   end
 
   it 'loads associated resources from different service' do
@@ -218,6 +218,6 @@ describe 'Acfs' do
     expect(user.name).to eq 'John'
     expect(user.age).to eq 26
 
-    expect(comments).to have(2).items
+    expect(comments.size).to eq(2)
   end
 end

data/vendor/bundle/ruby/4.0.0/bundler/gems/rubocop-config-2b861962124a/README.md

@@ -0,0 +1,23 @@
+# Shared RuboCop Configuration
+
+Shared RuboCop configuration and defaults for my libraries and projects.
+
+## Usage
+
+```ruby
+# Gemfile
+
+gem 'rubocop-config', github: 'jgraichen/rubocop-config', tag: 'v13', require: false
+```
+
+```yaml
+# .rubocop.yml
+
+inherit_gem:
+  rubocop-config: default.yml
+
+AllCops:
+  TargetRubyVersion: 3.1
+  SuggestExtensions: False
+  NewCops: enable
+```

data/vendor/bundle/ruby/{3.4.0/bundler/gems/rubocop-config-67802c9d1826 → 4.0.0/bundler/gems/rubocop-config-2b861962124a}/rubocop-config.gemspec

@@ -1,31 +1,31 @@
 # -*- encoding: utf-8 -*-
-# stub: rubocop-config 13.0.0 ruby lib
+# stub: rubocop-config 15.0.0 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "rubocop-config".freeze
-  s.version = "13.0.0".freeze
+  s.version = "15.0.0".freeze
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0".freeze) if s.respond_to? :required_rubygems_version=
   s.metadata = { "allowed_push_host" => ".", "rubygems_mfa_required" => "true" } if s.respond_to? :metadata=
   s.require_paths = ["lib".freeze]
   s.authors = ["Jan Graichen".freeze]
-  s.date = "2025-02-14"
+  s.date = "1980-01-02"
   s.email = ["jgraichen@altimos.de".freeze]
   s.files = ["LICENSE".freeze, "README.md".freeze, "default.yml".freeze]
   s.homepage = "https://github.com/jgraichen/rubocop-config".freeze
   s.licenses = ["MIT".freeze]
   s.required_ruby_version = Gem::Requirement.new(">= 2.7.0".freeze)
-  s.rubygems_version = "3.6.2".freeze
+  s.rubygems_version = "4.0.10".freeze
   s.summary = "Shared rubocop config".freeze
 
-  s.installed_by_version = "3.6.2".freeze
+  s.installed_by_version = "4.0.10".freeze
 
   s.specification_version = 4
 
-  s.add_runtime_dependency(%q<rubocop>.freeze, ["~> 1.70.0".freeze])
-  s.add_runtime_dependency(%q<rubocop-capybara>.freeze, ["~> 2.21.0".freeze])
-  s.add_runtime_dependency(%q<rubocop-factory_bot>.freeze, ["~> 2.26.1".freeze])
-  s.add_runtime_dependency(%q<rubocop-performance>.freeze, ["~> 1.23.0".freeze])
-  s.add_runtime_dependency(%q<rubocop-rspec>.freeze, ["~> 3.3.0".freeze])
-  s.add_runtime_dependency(%q<rubocop-rspec_rails>.freeze, ["~> 2.30.0".freeze])
+  s.add_runtime_dependency(%q<rubocop>.freeze, ["~> 1.88.0".freeze])
+  s.add_runtime_dependency(%q<rubocop-capybara>.freeze, ["~> 2.23.0".freeze])
+  s.add_runtime_dependency(%q<rubocop-factory_bot>.freeze, ["~> 2.28.0".freeze])
+  s.add_runtime_dependency(%q<rubocop-performance>.freeze, ["~> 1.26.1".freeze])
+  s.add_runtime_dependency(%q<rubocop-rspec>.freeze, ["~> 3.10.2".freeze])
+  s.add_runtime_dependency(%q<rubocop-rspec_rails>.freeze, ["~> 2.32.0".freeze])
 end