restify 2.0.1 → 2.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2b3748ffce3669fb7d0cf84c08ef2cb5732e18edd0a2c7f49c611c00a7d09058
-  data.tar.gz: 86918b318d74c3c1fa5ed03e68bd4fcc877a0697b37a324407508a1d2cb78477
+  metadata.gz: 6db18b2b418bd450289f6e0c64f429e0c3f3066e6a45c082af2f34fa87b3219f
+  data.tar.gz: ca2c0abe620c7a679e0c0ec0b12e57448ea7d709b5e0ee18d523183e97085715
 SHA512:
-  metadata.gz: 8fca1f764083979b98c66a55c2a3d49e3ad4c77bff142f2e5af8d40c4003fd2151bb8bce4076cb66b856b91054fba4cb814bb0635d2b3be3cf9d7e6b301f79f2
-  data.tar.gz: bdb52897e18ae8ba441128f9147a383ddde7e777f92ab59cce5353ac8e8feda23c9af072f9aaf2b4cb252085840bb7ef70927b289a42b66e6209a650d3d5a4c5
+  metadata.gz: 85f715444240b80d9a269662779b69791a9240b6d37d69586948aaed3c138c8b8bc11d78e0eadd42d7da600f65e628b589053f33991b66a0a9b2c923248b4999
+  data.tar.gz: 9a1509904bcc695749e2cfb2b95976a38a94013db01aabb7374c270de7af788ac1f8e633a846aafe56e14b3cbb244d3952a99c769d845ea3c68c57f8d4f66c8e

data/CHANGELOG.md

@@ -17,6 +17,22 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 
 ### Breaks
 
+## 2.1.0 - (2026-06-20)
+
+---
+
+### New
+
+- Maintenance release
+
+## 2.0.2 - (2025-05-19)
+
+---
+
+### Fixes
+
+- Restore literal false in parameter expansion (#68)
+
 ## 2.0.1 - (2025-02-16)
 
 ---

data/README.md

@@ -33,7 +33,7 @@ Links are extracted from
 Add it to your Gemfile:
 
 ```ruby
-gem 'restify', '~> 2.0'
+gem 'restify', '~> 2.1'
 ```
 
 Or install it manually:

data/lib/restify/adapter/base.rb

@@ -14,7 +14,7 @@ module Restify
       end
 
       def call_native(_request, _writer)
-        throw NotImplementedError.new 'Subclass responsibility'
+        raise NotImplementedError.new 'Subclass responsibility'
       end
     end
   end

data/lib/restify/cache.rb

@@ -19,7 +19,7 @@ module Restify
 
     private
 
-    def match(_request)
+    def match(_request) # rubocop:disable Naming/PredicateMethod
       false
     end
 

data/lib/restify/relation.rb

@@ -16,7 +16,7 @@ module Restify
 
     def initialize(context, template)
       @context  = context
-      @template = Addressable::Template.new template
+      @template = Addressable::Template.new(template)
     end
 
     def request(method:, params: {}, **opts)
@@ -113,17 +113,13 @@ module Restify
 
     def extract!(params)
       @template.variables.each_with_object({}) do |var, hash|
-        if (value = params.delete(var) { params.delete(var.to_sym) { nil } })
-          hash[var] = value
+        sym = var.to_sym
+        if params.key?(var)
+          hash[var] = params.delete(var)
+        end
+        if params.key?(sym)
+          hash[sym] = params.delete(sym)
         end
-      end
-    end
-
-    def to_template(pattern)
-      if pattern.is_a?(Addressable::Template)
-        pattern
-      else
-        Addressable::Template.new pattern
       end
     end
   end

data/lib/restify/response.rb

@@ -148,8 +148,8 @@ module Restify
     private
 
     def convert_headers(headers)
-      headers.each_with_object({}) do |pair, hash|
-        hash[pair[0].upcase] = pair[1]
+      headers.each.to_h do |pair|
+        [pair[0].upcase, pair[1]]
       end
     end
   end

data/lib/restify/version.rb

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

data/spec/restify/adapter/base_spec.rb

@@ -0,0 +1,33 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+describe Restify::Adapter::Base do
+  subject(:adapter) { described_class.new }
+
+  let(:request) { Restify::Request.new(uri: 'https://example.org') }
+
+  describe '#call' do
+    subject(:call) { adapter.call(request) }
+
+    it 'delegates to call_native with a promise' do
+      expect(adapter).to receive(:call_native) do |req, writer| # rubocop:disable RSpec/SubjectStub
+        expect(req).to be request
+        expect(writer).to be_a Restify::Promise::Writer
+      end
+
+      call.tap do |promise|
+        expect(promise).to be_a Restify::Promise
+        expect(promise).to be_pending
+      end
+    end
+  end
+
+  describe '#call_native' do
+    subject(:call_native) { adapter.call_native(nil, nil) }
+
+    it 'must be implemented in a subclass' do
+      expect { call_native }.to raise_error(NotImplementedError)
+    end
+  end
+end

data/spec/restify/context_spec.rb

@@ -59,7 +59,7 @@ describe Restify::Context do
         let(:load) { YAML.load(dump) }
       end
 
-      include_examples 'serialization'
+      it_behaves_like 'serialization'
     end
 
     context 'Marshall' do
@@ -68,7 +68,7 @@ describe Restify::Context do
       let(:dump) { Marshal.dump(context) }
       let(:load) { Marshal.load(dump) } # rubocop:disable Security/MarshalLoad
 
-      include_examples 'serialization'
+      it_behaves_like 'serialization'
     end
   end
 end

data/spec/restify/features/opentelemetry_spec.rb

@@ -38,7 +38,7 @@ describe Restify do
       # Latest span has to be from the Ethon instrumentation and must
       # have the Restify span as a parent.
       spans[0].tap do |span|
-        expect(span.instrumentation_scope.name).to match(/Ethon/)
+        expect(span.instrumentation_scope.name).to include('Ethon')
         expect(span.parent_span_id).to eq spans[1].span_id
       end
     end

data/spec/restify/global_spec.rb

@@ -21,7 +21,7 @@ describe Restify::Global do
     end
 
     context 'with registry symbol' do
-      subject(:restify) { global.new(uri, **options) }
+      subject(:restify) { global.new(name, **options) }
 
       let(:name) { :registry_item_name }
       let(:uri)     { 'http://api.github.com/' }
@@ -38,4 +38,53 @@ describe Restify::Global do
       end
     end
   end
+
+  describe '#adapter' do
+    subject(:adapter) { global.adapter }
+
+    it 'defaults to Typhoeus adapter' do
+      expect(adapter).to be_a Restify::Adapter::Typhoeus
+    end
+  end
+
+  describe '#adapter=' do
+    let(:stub) { Object.new }
+
+    # Ensure to reset adapter after these specs!
+    after { Restify.adapter = nil }
+
+    it 'sets a new adapter' do
+      global.adapter = stub
+      expect(global.adapter).to be stub
+    end
+  end
+
+  describe '#cache' do
+    subject(:cache) { global.cache }
+
+    it 'defaults to Typhoeus adapter' do
+      expect(cache).to be_a Restify::Cache
+    end
+  end
+
+  describe '#cache=' do
+    let(:stub) { Object.new }
+
+    # Ensure to reset cache after these specs!
+    after { Restify.cache = nil }
+
+    it 'sets a new adapter' do
+      global.cache = stub
+      expect(global.cache).to be stub
+    end
+  end
+
+  describe '#logger' do
+    subject(:logger) { global.logger }
+
+    it 'returns Restify root logger' do
+      expect(logger).to be_a Logging::Logger
+      expect(logger).to eq Logging.logger[Restify]
+    end
+  end
 end

data/spec/restify/link_spec.rb

@@ -9,7 +9,7 @@ describe Restify::Link do
         links = described_class
           .parse('<http://example.org/search{?query}>; rel="search"')
 
-        expect(links).to have(1).item
+        expect(links.size).to eq(1)
         expect(links[0].uri).to eq 'http://example.org/search{?query}'
         expect(links[0].metadata).to eq 'rel' => 'search'
       end
@@ -18,7 +18,7 @@ describe Restify::Link do
         links = described_class
           .parse('<http://example.org/search{?query}>; rel=search')
 
-        expect(links).to have(1).item
+        expect(links.size).to eq(1)
         expect(links[0].uri).to eq 'http://example.org/search{?query}'
         expect(links[0].metadata).to eq 'rel' => 'search'
       end
@@ -27,7 +27,7 @@ describe Restify::Link do
         links = described_class
           .parse('<p://h.tld/p>; rel=abc, <p://h.tld/b>; a=b; c="d"')
 
-        expect(links).to have(2).item
+        expect(links.size).to eq(2)
         expect(links[0].uri).to eq 'p://h.tld/p'
         expect(links[0].metadata).to eq 'rel' => 'abc'
         expect(links[1].uri).to eq 'p://h.tld/b'
@@ -50,6 +50,16 @@ describe Restify::Link do
         expect { described_class.parse('</>; rel="s", abc-invalid') }
           .to raise_error ArgumentError, /Invalid token at \d+:/i
       end
+
+      it 'errors on invalid param' do
+        expect { described_class.parse('<https://example.org>; rel') }
+          .to raise_error ArgumentError, /Invalid token at \d+:/i
+      end
+
+      it 'errors on invalid param value' do
+        expect { described_class.parse('<https://example.org>; rel=') }
+          .to raise_error ArgumentError, /Invalid token at \d+:/i
+      end
     end
   end
 end

data/spec/restify/relation_spec.rb

@@ -38,7 +38,7 @@ describe Restify::Relation do
     context 'with false' do
       let(:params) { {id: false} }
 
-      it { expect(expanded.to_s).to eq 'http://test.host/resource/' }
+      it { expect(expanded.to_s).to eq 'http://test.host/resource/false' }
     end
 
     context 'with true' do
@@ -47,6 +47,19 @@ describe Restify::Relation do
       it { expect(expanded.to_s).to eq 'http://test.host/resource/true' }
     end
 
+    context 'with Object' do
+      let(:object) do
+        Class.new do
+          undef to_param
+        end.new
+      end
+      let(:params) { {id: object} }
+
+      it 'raise a TypeError from adressable' do
+        expect { expanded }.to raise_error(TypeError, /Can't convert #<Class:0x.*> into String or Array/)
+      end
+    end
+
     context 'with #to_param object' do
       let(:params) { {id: cls_to_param.new} }
 
@@ -59,6 +72,27 @@ describe Restify::Relation do
       it { expect(expanded.to_s).to eq 'http://test.host/resource/1,2' }
     end
 
+    context 'with nil query parameter' do
+      let(:pattern) { '/resource{?abc}' }
+      let(:params) { {abc: nil} }
+
+      it { expect(expanded.to_s).to eq 'http://test.host/resource' }
+    end
+
+    context 'with false query parameter' do
+      let(:pattern) { '/resource{?abc}' }
+      let(:params) { {abc: false} }
+
+      it { expect(expanded.to_s).to eq 'http://test.host/resource?abc=false' }
+    end
+
+    context 'with true query parameter' do
+      let(:pattern) { '/resource{?abc}' }
+      let(:params) { {abc: true} }
+
+      it { expect(expanded.to_s).to eq 'http://test.host/resource?abc=true' }
+    end
+
     context 'with unknown additional query parameter' do
       let(:pattern) { '/resource{?a,b}' }
       let(:params) { {a: 1, b: 2, c: 3} }
@@ -119,6 +153,38 @@ describe Restify::Relation do
 
       it { expect { expanded }.to raise_exception TypeError, /Can't convert Hash into String./ }
     end
+
+    context 'with string-keyed params' do
+      context 'with value' do
+        let(:params) { {'id' => 1} }
+
+        it { expect(expanded.to_s).to eq 'http://test.host/resource/1' }
+      end
+    end
+
+    context 'with mixed-keyed params' do
+      context 'non-overlapping' do
+        let(:params) { {'id' => 1, q: 2} }
+
+        it { expect(expanded.to_s).to eq 'http://test.host/resource/1?q=2' }
+      end
+
+      context 'overlapping (1)' do
+        let(:params) { {'id' => 1, id: 2} }
+
+        it 'prefers symbol value' do
+          expect(expanded.to_s).to eq 'http://test.host/resource/2'
+        end
+      end
+
+      context 'overlapping (2)' do
+        let(:params) { {id: 2, 'id' => 1} }
+
+        it 'prefers symbol value' do
+          expect(expanded.to_s).to eq 'http://test.host/resource/2'
+        end
+      end
+    end
   end
 
   shared_examples 'non-data-request' do |method|
@@ -160,15 +226,15 @@ describe Restify::Relation do
   end
 
   describe '#get' do
-    include_examples 'non-data-request', :get
+    it_behaves_like 'non-data-request', :get
   end
 
   describe '#head' do
-    include_examples 'non-data-request', :head
+    it_behaves_like 'non-data-request', :head
   end
 
   describe '#delete' do
-    include_examples 'non-data-request', :delete
+    it_behaves_like 'non-data-request', :delete
   end
 
   shared_examples 'data-request' do |method|
@@ -221,14 +287,20 @@ describe Restify::Relation do
   end
 
   describe '#post' do
-    include_examples 'data-request', :post
+    it_behaves_like 'data-request', :post
   end
 
   describe '#put' do
-    include_examples 'data-request', :put
+    it_behaves_like 'data-request', :put
   end
 
   describe '#patch' do
-    include_examples 'data-request', :patch
+    it_behaves_like 'data-request', :patch
+  end
+
+  describe '#to_s' do
+    subject(:string) { relation.to_s }
+
+    it { is_expected.to eq '/resource/{id}{?q*}' }
   end
 end

data/spec/restify/resource_spec.rb

@@ -118,4 +118,10 @@ describe Restify::Resource do
       end
     end
   end
+
+  describe '#inspect' do
+    subject(:inspect) { resource.inspect }
+
+    it { is_expected.to eq '#<Restify::Resource @data={} @relations={}>' }
+  end
 end

data/spec/restify_spec.rb

@@ -161,7 +161,7 @@ describe Restify do
         users = users_relation.get.value!
 
         # We get a collection back (Restify::Collection).
-        expect(users).to have(2).items
+        expect(users.size).to eq(2)
 
         # Let's get the first one.
         user = users.first

data/spec/spec_helper.rb

@@ -1,7 +1,6 @@
 # frozen_string_literal: true
 
 require 'rspec'
-require 'rspec/collection_matchers'
 
 require 'simplecov'
 require 'simplecov-cobertura'

data/vendor/bundle/ruby/4.0.0/bundler/gems/my-rubocop-2b861962124a/LICENSE

@@ -0,0 +1,21 @@
+The MIT License (MIT)
+
+Copyright (c) 2020 Jan Graichen
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.

data/vendor/bundle/ruby/4.0.0/bundler/gems/my-rubocop-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
+```