restify 1.15.2 → 2.0.0

data/spec/restify/resource_spec.rb

@@ -3,18 +3,12 @@
 require 'spec_helper'
 
 describe Restify::Resource do
-  subject { resource }
+  subject(:resource) { described_class.new(context, response:, data:, relations:) }
 
   let(:data)      { {} }
   let(:relations) { {} }
-  let(:context)   { double 'context' }
-  let(:response)  { double 'response' }
-  let(:resource)  { described_class.new(context, response: response, data: data, relations: relations) }
-
-  before do
-    allow(context).to receive(:relation?).and_return(false)
-    allow(context).to receive(:relation).and_raise(KeyError)
-  end
+  let(:context)   { instance_double(Restify::Context) }
+  let(:response)  { instance_double(Restify::Response) }
 
   context 'relations' do
     let(:relations) do
@@ -26,41 +20,41 @@ describe Restify::Resource do
 
     describe '#relation?' do
       it 'matches relations' do
-        expect(subject.relation?(:users)).to eq true
-        expect(subject.relation?('users')).to eq true
-        expect(subject.relation?(:projects)).to eq true
-        expect(subject.relation?('projects')).to eq true
-        expect(subject.relation?('fuu')).to eq false
-
-        expect(subject).to have_relation :users
-        expect(subject).to have_relation :projects
-
-        expect(subject.rel?(:users)).to eq true
-        expect(subject.rel?('users')).to eq true
-        expect(subject.rel?(:projects)).to eq true
-        expect(subject.rel?('projects')).to eq true
-        expect(subject.rel?('fuu')).to eq false
-
-        expect(subject).to have_rel :users
-        expect(subject).to have_rel :projects
+        expect(resource.relation?(:users)).to be true
+        expect(resource.relation?('users')).to be true
+        expect(resource.relation?(:projects)).to be true
+        expect(resource.relation?('projects')).to be true
+        expect(resource.relation?('fuu')).to be false
+
+        expect(resource).to have_relation :users
+        expect(resource).to have_relation :projects
+
+        expect(resource.rel?(:users)).to be true
+        expect(resource.rel?('users')).to be true
+        expect(resource.rel?(:projects)).to be true
+        expect(resource.rel?('projects')).to be true
+        expect(resource.rel?('fuu')).to be false
+
+        expect(resource).to have_rel :users
+        expect(resource).to have_rel :projects
       end
     end
 
     describe '#relation' do
       it 'returns relation' do
-        expect(subject.rel(:users)).to be_a Restify::Relation
-
-        expect(subject.rel(:users)).to eq 'http://example.org/users'
-        expect(subject.rel('users')).to eq 'http://example.org/users'
-        expect(subject.rel(:projects)).to eq 'http://example.org/projects'
-        expect(subject.rel('projects')).to eq 'http://example.org/projects'
-        expect { subject.rel(:fuu) }.to raise_error KeyError
-
-        expect(subject.relation(:users)).to eq 'http://example.org/users'
-        expect(subject.relation('users')).to eq 'http://example.org/users'
-        expect(subject.relation(:projects)).to eq 'http://example.org/projects'
-        expect(subject.relation('projects')).to eq 'http://example.org/projects'
-        expect { subject.relation(:fuu) }.to raise_error KeyError
+        expect(resource.rel(:users)).to be_a Restify::Relation
+
+        expect(resource.rel(:users)).to eq 'http://example.org/users'
+        expect(resource.rel('users')).to eq 'http://example.org/users'
+        expect(resource.rel(:projects)).to eq 'http://example.org/projects'
+        expect(resource.rel('projects')).to eq 'http://example.org/projects'
+        expect { resource.rel(:fuu) }.to raise_error KeyError
+
+        expect(resource.relation(:users)).to eq 'http://example.org/users'
+        expect(resource.relation('users')).to eq 'http://example.org/users'
+        expect(resource.relation(:projects)).to eq 'http://example.org/projects'
+        expect(resource.relation('projects')).to eq 'http://example.org/projects'
+        expect { resource.relation(:fuu) }.to raise_error KeyError
       end
     end
 
@@ -68,15 +62,15 @@ describe Restify::Resource do
       let(:relations) { {_restify_follow: 'http://localhost/10'} }
 
       it 'returns follow relation' do
-        expect(subject.follow).to be_a Restify::Relation
-        expect(subject.follow).to eq 'http://localhost/10'
+        expect(resource.follow).to be_a Restify::Relation
+        expect(resource.follow).to eq 'http://localhost/10'
       end
 
       context 'when nil' do
         let(:relations) { {} }
 
         it 'returns nil' do
-          expect(subject.follow).to be nil
+          expect(resource.follow).to be_nil
         end
       end
     end
@@ -85,15 +79,15 @@ describe Restify::Resource do
       let(:relations) { {_restify_follow: 'http://localhost/10'} }
 
       it 'returns follow relation' do
-        expect(subject.follow!).to be_a Restify::Relation
-        expect(subject.follow!).to eq 'http://localhost/10'
+        expect(resource.follow!).to be_a Restify::Relation
+        expect(resource.follow!).to eq 'http://localhost/10'
       end
 
       context 'when nil' do
         let(:relations) { {} }
 
         it 'raise runtime error' do
-          expect { subject.follow! }.to raise_error RuntimeError do |err|
+          expect { resource.follow! }.to raise_error RuntimeError do |err|
             expect(err.message).to eq 'Nothing to follow'
           end
         end
@@ -102,25 +96,25 @@ describe Restify::Resource do
   end
 
   context 'data' do
-    let(:data) { double 'data' }
+    let(:data) { double 'data' } # rubocop:disable RSpec/VerifiedDoubles
 
     it 'delegates methods (I)' do
-      expect(data).to receive(:some_method).and_return(42)
+      allow(data).to receive(:some_method).and_return(42)
 
-      expect(subject).to respond_to :some_method
-      expect(subject.some_method).to eq 42
+      expect(resource).to respond_to :some_method
+      expect(resource.some_method).to eq 42
     end
 
     it 'delegates methods (II)' do
-      expect(data).to receive(:[]).with(1).and_return(2)
+      allow(data).to receive(:[]).with(1).and_return(2)
 
-      expect(subject).to respond_to :[]
-      expect(subject[1]).to eq 2
+      expect(resource).to respond_to :[]
+      expect(resource[1]).to eq 2
     end
 
     describe '#data' do
       it 'returns data' do
-        expect(subject.data).to equal data
+        expect(resource.data).to equal data
       end
     end
   end

data/spec/restify/timeout_spec.rb

@@ -16,7 +16,7 @@ describe Restify::Timeout do
       it 'calls given block' do
         expect { timer.timeout! }.not_to raise_error
         sleep timer.send(:wait_interval)
-        expect { timer.timeout! }.to raise_error ::Restify::Timeout::Error
+        expect { timer.timeout! }.to raise_error Restify::Timeout::Error
       end
     end
   end
@@ -25,13 +25,13 @@ describe Restify::Timeout do
     it 'calls block on IVar timeout' do
       expect do
         timer.wait_on!(Concurrent::IVar.new)
-      end.to raise_error ::Restify::Timeout::Error
+      end.to raise_error Restify::Timeout::Error
     end
 
     it 'calls block on Promise timeout' do
       expect do
         timer.wait_on!(Restify::Promise.new)
-      end.to raise_error ::Restify::Timeout::Error
+      end.to raise_error Restify::Timeout::Error
     end
 
     it 'does nothing on successful IVar' do

data/spec/restify_spec.rb

@@ -132,21 +132,21 @@ describe Restify do
           # Because we forgot to send a "name" the server complains
           # with an error code that will lead to a raised error.
 
-          expect(e.status).to eq :unprocessable_entity
+          expect(e.status).to eq :unprocessable_content
           expect(e.code).to eq 422
           expect(e.errors).to eq 'name' => ["can't be blank"]
         end
 
         # Let's try again.
-        created_user = users_relation.post(name: 'John Smith').value!
+        created_user = users_relation.post({name: 'John Smith'}).value!
 
         # The server returns a 201 Created response with the created
         # resource.
         expect(created_user.response.status).to eq :created
         expect(created_user.response.code).to eq 201
 
-        expect(created_user).to have_key :name
-        expect(created_user.name).to eq 'John Smith'
+        expect(created_user).to have_key 'name'
+        expect(created_user['name']).to eq 'John Smith'
 
         # Let's follow the "Location" header.
         followed_resource = created_user.follow.get.value!
@@ -154,8 +154,8 @@ describe Restify do
         expect(followed_resource.response.status).to eq :ok
         expect(followed_resource.response.code).to eq 200
 
-        expect(followed_resource).to have_key :name
-        expect(followed_resource.name).to eq 'John Smith'
+        expect(followed_resource).to have_key 'name'
+        expect(followed_resource['name']).to eq 'John Smith'
 
         # Now we will fetch a list of all users.
         users = users_relation.get.value!
@@ -168,80 +168,19 @@ describe Restify do
 
         # We have all our attributes and relations here as defined in the
         # responses from the server.
-        expect(user).to have_key :name
-        expect(user[:name]).to eq 'John Smith'
+        expect(user).to have_key 'name'
+        expect(user['name']).to eq 'John Smith'
         expect(user).to have_relation :self
         expect(user).to have_relation :blurb
 
         # Let's get the blurb.
         blurb = user.rel(:blurb).get.value!
 
-        expect(blurb).to have_key :title
-        expect(blurb).to have_key :image
+        expect(blurb).to have_key 'title'
+        expect(blurb).to have_key 'image'
 
-        expect(blurb[:title]).to eq 'Prof. Dr. John Smith'
-        expect(blurb[:image]).to eq 'http://example.org/avatar.png'
-      end
-    end
-
-    context 'within EM-synchrony' do
-      it 'consumes the API' do
-        skip 'Seems to be impossible to detect EM scheduled fibers from within'
-
-        EM.synchrony do
-          root = Restify.new('http://localhost:9292/base').get.value!
-
-          users_relation = root.rel(:users)
-
-          expect(users_relation).to be_a Restify::Relation
-
-          create_user_promise = users_relation.post
-          expect(create_user_promise).to be_a Restify::Promise
-
-          expect { create_user_promise.value! }.to \
-            raise_error(Restify::ClientError) do |e|
-            expect(e.status).to eq :unprocessable_entity
-            expect(e.code).to eq 422
-            expect(e.errors).to eq 'name' => ["can't be blank"]
-          end
-
-          created_user = users_relation.post(name: 'John Smith').value!
-
-          expect(created_user.response.status).to eq :created
-          expect(created_user.response.code).to eq 201
-
-          expect(created_user).to have_key :name
-          expect(created_user.name).to eq 'John Smith'
-
-          followed_resource = created_user.follow.get.value!
-
-          expect(followed_resource.response.status).to eq :ok
-          expect(followed_resource.response.code).to eq 200
-
-          expect(followed_resource).to have_key :name
-          expect(followed_resource.name).to eq 'John Smith'
-
-          users = users_relation.get.value!
-
-          expect(users).to have(2).items
-
-          user = users.first
-
-          expect(user).to have_key :name
-          expect(user[:name]).to eq 'John Smith'
-          expect(user).to have_relation :self
-          expect(user).to have_relation :blurb
-
-          blurb = user.rel(:blurb).get.value!
-
-          expect(blurb).to have_key :title
-          expect(blurb).to have_key :image
-
-          expect(blurb[:title]).to eq 'Prof. Dr. John Smith'
-          expect(blurb[:image]).to eq 'http://example.org/avatar.png'
-
-          EventMachine.stop
-        end
+        expect(blurb['title']).to eq 'Prof. Dr. John Smith'
+        expect(blurb['image']).to eq 'http://example.org/avatar.png'
       end
     end
   end

data/spec/spec_helper.rb

@@ -4,25 +4,21 @@ require 'rspec'
 require 'rspec/collection_matchers'
 
 require 'simplecov'
+require 'simplecov-cobertura'
+
 SimpleCov.start do
   add_filter 'spec'
 end
 
-if ENV['CI']
-  require 'codecov'
-  SimpleCov.formatter = SimpleCov::Formatter::Codecov
-end
+SimpleCov.formatters = [
+  SimpleCov::Formatter::HTMLFormatter,
+  SimpleCov::Formatter::CoberturaFormatter,
+]
 
 require 'restify'
 
 if ENV['ADAPTER']
   case ENV['ADAPTER'].to_s.downcase
-    when 'em'
-      require 'restify/adapter/em'
-      Restify.adapter = Restify::Adapter::EM.new
-    when 'em-pooled'
-      require 'restify/adapter/pooled_em'
-      Restify.adapter = Restify::Adapter::PooledEM.new
     when 'typhoeus'
       require 'restify/adapter/typhoeus'
       Restify.adapter = Restify::Adapter::Typhoeus.new
@@ -40,21 +36,21 @@ RSpec.configure do |config|
   config.order = 'random'
 
   config.before(:suite) do
-    ::Restify::Timeout.default_timeout = 1.0
+    Restify::Timeout.default_timeout = 1.0
   end
 
   config.before do |example|
     next unless (adapter = example.metadata[:adapter])
-    next if Restify.adapter.is_a?(adapter)
+    next if Restify.adapter.class.ancestors.map(&:to_s).include?(adapter)
 
     skip 'Spec not enabled for current adapter'
   end
 
   config.before do
-    Ethon.logger = ::Logging.logger[Ethon] if defined?(Ethon)
+    Ethon.logger = Logging.logger[Ethon] if defined?(Ethon)
 
-    ::Logging.logger.root.level = :debug
-    ::Logging.logger.root.add_appenders ::Logging.appenders.stdout
+    Logging.logger.root.level = :debug
+    Logging.logger.root.add_appenders Logging.appenders.stdout
   end
 
   config.warnings = true

metadata

@@ -1,14 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: restify
 version: !ruby/object:Gem::Version
-  version: 1.15.2
+  version: 2.0.0
 platform: ruby
 authors:
 - Jan Graichen
-autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-12-23 00:00:00.000000000 Z
+date: 2025-02-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -52,26 +51,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
-- !ruby/object:Gem::Dependency
-  name: hashie
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '3.3'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '5.0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '3.3'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '5.0'
 - !ruby/object:Gem::Dependency
   name: hitimes
   requirement: !ruby/object:Gem::Requirement
@@ -115,51 +94,65 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '1.2'
 - !ruby/object:Gem::Dependency
-  name: rack
+  name: opentelemetry-api
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.0'
 - !ruby/object:Gem::Dependency
-  name: typhoeus
+  name: opentelemetry-common
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: bundler
+  name: rack
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  type: :development
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: typhoeus
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.3'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.3'
 description: An experimental hypermedia REST client that uses parallel, keep-alive
   and pipelined requests by default.
 email:
-- jg@altimos.de
+- jgraichen@altimos.de
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -169,8 +162,7 @@ files:
 - README.md
 - lib/restify.rb
 - lib/restify/adapter/base.rb
-- lib/restify/adapter/em.rb
-- lib/restify/adapter/pooled_em.rb
+- lib/restify/adapter/telemetry.rb
 - lib/restify/adapter/typhoeus.rb
 - lib/restify/cache.rb
 - lib/restify/context.rb
@@ -216,7 +208,6 @@ licenses:
 - LGPL-3.0+
 metadata:
   rubygems_mfa_required: 'true'
-post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -224,36 +215,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.5.0
+      version: 3.1.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.6
-signing_key: 
+rubygems_version: 3.6.2
 specification_version: 4
 summary: An experimental hypermedia REST client.
-test_files:
-- spec/restify/cache_spec.rb
-- spec/restify/context_spec.rb
-- spec/restify/error_spec.rb
-- spec/restify/features/head_requests_spec.rb
-- spec/restify/features/request_bodies_spec.rb
-- spec/restify/features/request_errors_spec.rb
-- spec/restify/features/request_headers_spec.rb
-- spec/restify/features/response_errors_spec.rb
-- spec/restify/global_spec.rb
-- spec/restify/link_spec.rb
-- spec/restify/processors/base_spec.rb
-- spec/restify/processors/json_spec.rb
-- spec/restify/processors/msgpack_spec.rb
-- spec/restify/promise_spec.rb
-- spec/restify/registry_spec.rb
-- spec/restify/relation_spec.rb
-- spec/restify/resource_spec.rb
-- spec/restify/timeout_spec.rb
-- spec/restify_spec.rb
-- spec/spec_helper.rb
-- spec/support/stub_server.rb
+test_files: []

data/lib/restify/adapter/em.rb

@@ -1,134 +0,0 @@
-# frozen_string_literal: true
-
-require 'eventmachine'
-require 'em-http-request'
-
-module Restify
-  module Adapter
-    class EM < Base
-      class Connection
-        class << self
-          def open(uri)
-            connections[uri.origin] ||= new uri.origin
-          end
-
-          def connections
-            @connections ||= {}
-          end
-        end
-
-        attr_reader :origin
-
-        def initialize(origin)
-          @origin   = origin
-          @pipeline = true
-        end
-
-        def requests
-          @requests ||= []
-        end
-
-        # rubocop:disable Style/IdenticalConditionalBranches
-        def call(request, writer, retried: false)
-          if requests.empty?
-            requests << [request, writer, retried]
-            process_next
-          else
-            requests << [request, writer, retried]
-          end
-        end
-        # rubocop:enable all
-
-        def connection
-          @connection ||= EventMachine::HttpRequest.new(origin)
-        end
-
-        def pipeline?
-          @pipeline
-        end
-
-        def process_next
-          return if requests.empty?
-
-          request, writer, retried = pipeline? ? requests.shift : requests.first
-          begin
-            req = connection.send request.method.downcase,
-              keepalive: true,
-              redirects: 3,
-              path: request.uri.normalized_path,
-              query: request.uri.normalized_query,
-              body: request.body,
-              head: request.headers
-          rescue Exception => e # rubocop:disable Lint/RescueException
-            writer.reject e
-            requests.shift unless pipeline?
-            return
-          end
-
-          req.callback do
-            requests.shift unless pipeline?
-
-            writer.fulfill Response.new(
-              request,
-              req.last_effective_url,
-              req.response_header.status,
-              req.response_header,
-              req.response,
-            )
-
-            if req.response_header['CONNECTION'] == 'close'
-              @connection = nil
-              @pipeline   = false
-            end
-
-            process_next
-          end
-
-          req.errback do
-            requests.shift unless pipeline?
-            @connection = nil
-
-            if pipeline?
-              EventMachine.next_tick do
-                @pipeline = false
-                call request, writer
-              end
-            elsif !retried
-              EventMachine.next_tick { call request, writer }
-            else
-              begin
-                raise "(#{req.response_header.status}) #{req.error}"
-              rescue StandardError => e
-                writer.reject e
-              end
-            end
-          end
-        end
-      end
-
-      def call_native(request, writer)
-        next_tick do
-          Connection.open(request.uri).call(request, writer)
-        end
-      end
-
-      private
-
-      def next_tick(&block)
-        ensure_running
-        EventMachine.next_tick(&block)
-      end
-
-      def ensure_running
-        return if EventMachine.reactor_running?
-
-        Thread.new do
-          EventMachine.run
-        rescue StandardError => e
-          puts "#{self.class} -> #{e}\n#{e.backtrace.join("\n")}"
-          raise e
-        end
-      end
-    end
-  end
-end