restify 1.0.1.beta1 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3b00cff50046f420707ed6d6e8851d74e1392f5f
-  data.tar.gz: fa5553ba030b9ec8bcd2457d4c24a866ad1db293
+  metadata.gz: 3acb2cc3581b8c3c47ad27c6ab1ea34406d7fa39
+  data.tar.gz: 91e4eb0b80116b6e13d8aca4cf8942de6ef064bc
 SHA512:
-  metadata.gz: 76ad0f4229b26ba714763793a086ba2cffb62642fa1ebb329037e1b542a5802ace3f29acc1220100488f7010b2eae5963a729d812475d17fa7834e43079a1004
-  data.tar.gz: 32908687b5e5b3234ccc5985cf1184a179d60f5589383482a4dff87abf168f7dbbefe101b4f7a4fcbe0d5ccb10b0b2d5e2c9a46dbae11dfd9cf54ddedb94baae
+  metadata.gz: e314678c3419674b6a709db0ba224bd46b704ba24455db084dba0f7e9dfccaf4c633243e384411d1fd7046a0c34480f19353a2313190c70ed62599eb50d04a3a
+  data.tar.gz: 8378f0c684c143cab5c92b4799a1424370f3b0db6395296d7b4bf38b3b8c48e08274035dfcd770f8ecc52308e9b80d74247628e125635f477f2fcec7436ba670

data/CHANGELOG.md

@@ -1,5 +1,10 @@
 # Changelog
 
+## 1.1.0
+
+* Return response body if no processor matches (#7)
+* Add shortcuts for creating fulfilled / rejected promises (#6)
+
 ## 1.0.0
 
 * Experimental cache API doing nothing for now

data/lib/restify.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'restify/version'
 
 require 'hashie'
@@ -30,7 +32,7 @@ module Restify
     require 'restify/processors/json'
   end
 
-  PROCESSORS = [Processors::Json]
+  PROCESSORS = [Processors::Json].freeze
 
   extend Global
 end

data/lib/restify/adapter/base.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Restify
   module Adapter
     class Base
@@ -7,8 +9,8 @@ module Restify
         end
       end
 
-      def call_native(request, writer)
-        throw NotImplementedError.new '#call_native not implemented. Subclass responsibility.'
+      def call_native(_request, _writer)
+        throw NotImplementedError.new 'Subclass responsibility'
       end
     end
   end

data/lib/restify/adapter/em.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'eventmachine'
 require 'em-http-request'
 
@@ -26,6 +28,7 @@ module Restify
           @requests ||= []
         end
 
+        # rubocop:disable Style/IdenticalConditionalBranches
         def call(request, writer, retried = false)
           if requests.empty?
             requests << [request, writer, retried]
@@ -43,6 +46,10 @@ module Restify
           @pipeline
         end
 
+        # rubocop:disable Metrics/AbcSize
+        # rubocop:disable Metrics/CyclomaticComplexity
+        # rubocop:disable Metrics/MethodLength
+        # rubocop:disable Metrics/PerceivedComplexity
         def process_next
           return if requests.empty?
 
@@ -55,7 +62,7 @@ module Restify
               query: request.uri.normalized_query,
               body: request.body,
               head: request.headers
-          rescue Exception => err
+          rescue Exception => err # rubocop:disable RescueException
             writer.reject err
             requests.shift unless pipeline?
             return
@@ -93,8 +100,7 @@ module Restify
               EventMachine.next_tick { call request, writer }
             else
               begin
-                raise RuntimeError.new \
-                  "(#{req.response_header.status}) #{req.error}"
+                raise "(#{req.response_header.status}) #{req.error}"
               rescue => e
                 writer.reject e
               end
@@ -117,6 +123,8 @@ module Restify
       end
 
       def ensure_running
+        return if EventMachine.reactor_running?
+
         Thread.new do
           begin
             EventMachine.run {}
@@ -124,7 +132,7 @@ module Restify
             puts "#{self.class} -> #{e}\n#{e.backtrace.join("\n")}"
             raise e
           end
-        end unless EventMachine.reactor_running?
+        end
       end
     end
   end

data/lib/restify/adapter/typhoeus.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'typhoeus'
 
 module Restify
@@ -51,7 +53,7 @@ module Restify
       def handle(native_response, writer, request)
         writer.fulfill convert_back(native_response, request)
 
-        @hydra.queue convert(*@queue.pop(true)) while !@queue.empty?
+        @hydra.queue convert(*@queue.pop(true)) until @queue.empty?
       end
 
       def convert_back(response, request)
@@ -69,6 +71,7 @@ module Restify
         end
       end
 
+      # rubocop:disable Metrics/MethodLength
       def start
         Thread.new do
           loop do

data/lib/restify/cache.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Restify
   class Cache
     def initialize(store)
@@ -9,15 +11,15 @@ module Restify
         return response
       end
 
-      yield(request).then do |response|
-        cache(response)
-        response
+      yield(request).then do |new_response|
+        cache(new_response)
+        new_response
       end
     end
 
     private
 
-    def match(request)
+    def match(_request)
       false
     end
 

data/lib/restify/context.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Restify
   # A resource context.
   #
@@ -19,7 +21,12 @@ module Restify
     attr_reader :options
 
     def initialize(uri, **kwargs)
-      @uri     = uri.is_a?(Addressable::URI) ? uri : Addressable::URI.parse(uri.to_s)
+      @uri = if uri.is_a?(Addressable::URI)
+               uri
+             else
+               @uri = Addressable::URI.parse(uri.to_s)
+             end
+
       @options = kwargs
     end
 
@@ -34,20 +41,21 @@ module Restify
 
     def process(response)
       context   = inherit response.uri
-      processor = Restify::PROCESSORS.find { |p| p.accept? response }
+      processor = Restify::PROCESSORS.find {|p| p.accept? response }
       processor ||= Restify::Processors::Base
 
       processor.new(context, response).resource
     end
 
-    def request(method, uri, data = nil, opts = {})
+    # rubocop:disable Metrics/MethodLength
+    def request(method, uri, data = nil, _opts = {})
       request = Request.new \
         method: method,
         uri: join(uri),
         data: data,
         headers: options.fetch(:headers, {})
 
-      ret = cache.call(request) {|request| adapter.call(request) }
+      ret = cache.call(request) {|req| adapter.call(req) }
       ret.then do |response|
         if response.success?
           process response
@@ -75,7 +83,7 @@ module Restify
           when 500...600
             raise ServerError.new(response)
           else
-            raise RuntimeError.new "Unknown response code: #{response.code}"
+            raise "Unknown response code: #{response.code}"
         end
       end
     end

data/lib/restify/error.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Restify
   #
   # A {ResponseError} is returned on a non-successful
@@ -36,7 +38,9 @@ module Restify
     #
     def errors
       if response.decoded_body
-        response.decoded_body['errors'] || response.decoded_body[:errors] || response.decoded_body
+        response.decoded_body['errors'] ||
+          response.decoded_body[:errors] ||
+          response.decoded_body
       else
         response.body
       end

data/lib/restify/global.rb

@@ -1,7 +1,7 @@
+# frozen_string_literal: true
+
 module Restify
   module Global
-    extend self
-
     def new(uri, **opts)
       context = resolve_context uri, **opts
 

data/lib/restify/link.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Restify
   #
   # A {Link} represents a single entry from the Link header

data/lib/restify/processors/base.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Restify
   #
   module Processors
@@ -36,7 +38,7 @@ module Restify
       # Should be overridden in subclass.
       #
       def load
-
+        body
       end
 
       # @!method body
@@ -50,18 +52,17 @@ module Restify
           name  = link.metadata['rel']
           value = link.uri
 
-          if !name.empty? && !relations.key?(name)
-            relations[name] = value
-          end
+          relations[name] = value if !name.empty? && !relations.key?(name)
         end
 
-        if (location = @response.follow_location)
-          relations[:_restify_follow] = location
-        end
+        location = @response.follow_location
+        return unless location
+
+        relations[:_restify_follow] = location
       end
 
       class << self
-        def accept?(response)
+        def accept?(_response)
           false
         end
       end

data/lib/restify/processors/json.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'json'
 
 module Restify
@@ -9,13 +11,13 @@ module Restify
     # JSON fields matching *_url will be parsed as relations.
     #
     class Json < Base
-
       def load
-        parse ::JSON.load(body), root: true
+        parse ::JSON.parse(body), root: true
       end
 
       private
 
+      # rubocop:disable Metrics/MethodLength
       def parse(object, root: false)
         case object
           when Hash
@@ -27,9 +29,14 @@ module Restify
             end
 
             if root
-              Resource.new context, response: response, data: data, relations: relations
+              Resource.new context,
+                data: data,
+                response: response,
+                relations: relations
             else
-              Resource.new context, data: data, relations: relations
+              Resource.new context,
+                data: data,
+                relations: relations
             end
           when Array
             object.map(&method(:parse))
@@ -44,21 +51,23 @@ module Restify
 
       def parse_rels(pair, relations)
         name = case pair[0].to_s.downcase
-          when /\A(\w+)_url\z/
-            Regexp.last_match[1]
-          when 'url'
-            'self'
-          else
-            return
+                 when /\A(\w+)_url\z/
+                   Regexp.last_match[1]
+                 when 'url'
+                   'self'
+                 else
+                   return
+               end
+
+        if relations.key?(name) || pair[1].nil? || pair[1].to_s =~ /\A\w*\z/
+          return
         end
 
-        return if relations.key?(name) || pair[1].nil? || pair[1].to_s =~ /\A\w*\z/
-
         relations[name] = pair[1].to_s
       end
 
       def json
-        @json ||= JSON.load response.body
+        @json ||= JSON.parse(response.body)
       end
 
       def with_indifferent_access(data)
@@ -67,19 +76,17 @@ module Restify
 
       class << self
         def accept?(response)
-          response.content_type =~ /\Aapplication\/json($|;)/
+          response.content_type =~ %r{\Aapplication/json($|;)}
         end
 
         def indifferent_access?
-          @@indifferent_access
+          @indifferent_access
         end
 
-        def indifferent_access=(value)
-          @@indifferent_access = value
-        end
-
-        @@indifferent_access = true
+        attr_writer :indifferent_access
       end
+
+      self.indifferent_access = true
     end
   end
 end

data/lib/restify/promise.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Restify
   #
   class Promise < Concurrent::IVar
@@ -10,22 +12,7 @@ module Restify
 
     def wait(timeout = nil)
       execute if pending?
-
-      # if defined?(EventMachine)
-      #   if incomplete?
-      #     fiber = Fiber.current
-
-      #     self.add_observer do
-      #       EventMachine.next_tick { fiber.resume }
-      #     end
-
-      #     Fiber.yield
-      #   else
-      #     self
-      #   end
-      # else
-        super
-      # end
+      super
     end
 
     def then(&block)
@@ -39,17 +26,16 @@ module Restify
     protected
 
     # @!visibility private
-    def ns_execute(timeout)
-      if compare_and_set_state(:processing, :pending)
-        return unless @task || @dependencies.any?
+    def ns_execute(_timeout)
+      return unless compare_and_set_state(:processing, :pending)
+      return unless @task || @dependencies.any?
 
-        executor = Concurrent::SafeTaskExecutor.new \
-          method(:ns_exec), rescue_exception: true
+      executor = Concurrent::SafeTaskExecutor.new \
+        method(:ns_exec), rescue_exception: true
 
-        success, value, reason = executor.execute
+      success, value, reason = executor.execute
 
-        complete success, value, reason
-      end
+      complete success, value, reason
     end
 
     # @!visibility private
@@ -57,9 +43,7 @@ module Restify
       args  = @dependencies.any? ? @dependencies.map(&:value!) : []
       value = @task ? @task.call(*args) : args
 
-      while value.is_a? Restify::Promise
-        value = value.value!
-      end
+      value = value.value! while value.is_a? Restify::Promise
 
       value
     end
@@ -70,6 +54,18 @@ module Restify
         yield Writer.new(promise)
         promise
       end
+
+      def fulfilled(value)
+        create do |writer|
+          writer.fulfill value
+        end
+      end
+
+      def rejected(value)
+        create do |writer|
+          writer.reject value
+        end
+      end
     end
 
     class Writer

data/lib/restify/registry.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Restify
   class Registry
     def initialize

data/lib/restify/relation.rb

@@ -1,7 +1,8 @@
+# frozen_string_literal: true
+
 module Restify
   #
   class Relation
-
     # Relation context
     #
     # @return [Restify::Context] Context

data/lib/restify/request.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Restify
   #
   class Request

data/lib/restify/resource.rb

@@ -1,9 +1,10 @@
+# frozen_string_literal: true
+
 require 'delegate'
 
 module Restify
   #
   class Resource < SimpleDelegator
-
     # @api private
     #
     def initialize(context, response: nil, data: nil, relations: {})
@@ -23,9 +24,9 @@ module Restify
       @relations.key?(name) || @relations.key?(name.to_s)
     end
 
-    alias_method :rel?, :relation?
-    alias_method :has_rel?, :relation?
-    alias_method :has_relation?, :relation?
+    alias rel? relation?
+    alias has_rel? relation?
+    alias has_relation? relation?
 
     # Return relation with given name.
     #
@@ -40,7 +41,7 @@ module Restify
       end
     end
 
-    alias_method :rel, :relation
+    alias rel relation
 
     # @!method data
     #
@@ -64,11 +65,7 @@ module Restify
     # @return [Relation] Relation to follow resource or nil.
     #
     def follow
-      if relation? :_restify_follow
-        relation :_restify_follow
-      else
-        nil
-      end
+      relation :_restify_follow if relation? :_restify_follow
     end
 
     # Follow a LOCATION or CONTEXT-LOCATION header.
@@ -76,11 +73,12 @@ module Restify
     # @return [Relation] Relation to follow resource.
     # @raise RuntimeError If nothing to follow.
     #
+    # rubocop:disable Style/GuardClause
     def follow!
       if (rel = follow)
         rel
       else
-        raise RuntimeError.new 'Nothing to follow'
+        raise 'Nothing to follow'
       end
     end
 
@@ -97,9 +95,9 @@ module Restify
     # @api private
     def inspect
       text = {
-        "@data" => data,
-        "@relations" => @relations
-      }.map {|k,v | k + '=' + v.inspect }.join(' ')
+        '@data' => data,
+        '@relations' => @relations
+      }.map {|k, v| k + '=' + v.inspect }.join(' ')
 
       "#<#{self.class} #{text}>"
     end

data/lib/restify/response.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'rack/utils'
 require 'json'
 
@@ -87,6 +89,7 @@ module Restify
     #
     # @return [Array<Link>] Links.
     #
+    # rubocop:disable Metrics/MethodLength
     def links
       @links ||= begin
         if headers['LINK']
@@ -116,15 +119,15 @@ module Restify
     # @return [Boolean] True if status code is 2XX otherwise false.
     #
     def success?
-      (200...300).include? code
+      (200...300).cover? code
     end
 
     # @api private
     def decoded_body
       @decoded_body ||= begin
         case content_type
-          when /\Aapplication\/json($|;)/
-            JSON.load body
+          when %r{\Aapplication/json($|;)}
+            ::JSON.parse(body)
         end
       end
     end

data/lib/restify/version.rb

@@ -1,9 +1,11 @@
+# frozen_string_literal: true
+
 module Restify
   module VERSION
     MAJOR = 1
-    MINOR = 0
-    PATCH = 1
-    STAGE = :beta1
+    MINOR = 1
+    PATCH = 0
+    STAGE = nil
     STRING = [MAJOR, MINOR, PATCH, STAGE].reject(&:nil?).join('.').freeze
 
     def self.to_s

data/spec/restify/cache_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe Restify::Cache do

data/spec/restify/global_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe Restify::Global do

data/spec/restify/link_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe Restify::Link do

data/spec/restify/processors/base_spec.rb

@@ -0,0 +1,44 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+describe Restify::Processors::Base do
+  let(:context)  { Restify::Context.new('http://test.host/') }
+  let(:response) { double 'response' }
+
+  before do
+    allow(response).to receive(:links).and_return []
+    allow(response).to receive(:follow_location).and_return nil
+  end
+
+  describe 'class' do
+    describe '#accept?' do
+      subject { described_class.accept? response }
+
+      # If no other processor accepts the request, we have an explicit fallback
+      # to the base processor.
+      it 'does not accept any responses' do
+        expect(subject).to be_falsey
+      end
+    end
+  end
+
+  describe '#resource' do
+    subject { described_class.new(context, response).resource }
+    before { allow(response).to receive(:body).and_return(body) }
+
+    describe 'parsing' do
+      context 'string' do
+        let(:body) do
+          <<-BODY
+            binaryblob
+          BODY
+        end
+
+        it { is_expected.to be_a Restify::Resource }
+        it { expect(subject.response).to be response }
+        it { is_expected.to eq body }
+      end
+    end
+  end
+end

data/spec/restify/processors/json_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe Restify::Processors::Json do
@@ -29,27 +31,29 @@ describe Restify::Processors::Json do
     subject { described_class.new(context, response).resource }
     before { allow(response).to receive(:body).and_return(body) }
 
-    context 'parsing' do
+    describe 'parsing' do
       context 'single object' do
-        let(:body) do <<-JSON
-            {"key": "value"}
+        let(:body) do
+          <<-JSON
+            {"json": "value"}
           JSON
         end
 
         it { is_expected.to be_a Restify::Resource }
         it { expect(subject.response).to be response }
-        it { is_expected.to eq 'key' => 'value' }
+        it { is_expected.to eq 'json' => 'value' }
       end
 
       context 'object with relation fields' do
-        let(:body) do <<-JSON
-            {"key": "value", "search_url": "https://google.com{?q}"}
+        let(:body) do
+          <<-JSON
+            {"json": "value", "search_url": "https://google.com{?q}"}
           JSON
         end
 
         it do
           is_expected.to eq \
-            'key' => 'value', 'search_url' => 'https://google.com{?q}'
+            'json' => 'value', 'search_url' => 'https://google.com{?q}'
         end
 
         it { is_expected.to have_relation :search }
@@ -57,8 +61,9 @@ describe Restify::Processors::Json do
       end
 
       context 'object with implicit self relation' do
-        let(:body) do <<-JSON
-            {"key": "value", "url": "/self"}
+        let(:body) do
+          <<-JSON
+            {"json": "value", "url": "/self"}
           JSON
         end
 
@@ -66,18 +71,20 @@ describe Restify::Processors::Json do
       end
 
       context 'single array' do
-        let(:body) do <<-JSON
+        let(:body) do
+          <<-JSON
             [1, 2, null, "STR"]
           JSON
         end
 
         it { is_expected.to be_a Restify::Resource }
         it { expect(subject.response).to be response }
-        it { is_expected.to eq [1, 2, nil, "STR"] }
+        it { is_expected.to eq [1, 2, nil, 'STR'] }
       end
 
       context 'array with objects' do
-        let(:body) do <<-JSON
+        let(:body) do
+          <<-JSON
             [{"a":0}, {"b":1}]
           JSON
         end
@@ -86,15 +93,15 @@ describe Restify::Processors::Json do
       end
 
       context 'array with resources' do
-        let(:body) do <<-JSON
+        let(:body) do
+          <<-JSON
             [{"name": "John", "self_url": "/users/john"},
              {"name": "Jane", "self_url": "/users/jane"}]
           JSON
         end
 
         it 'parses objects as resources' do
-          expect(subject.map(&:class)).to eq \
-            [Restify::Resource, Restify::Resource]
+          expect(subject).to all(be_a(Restify::Resource))
         end
 
         it 'parses relations of resources' do
@@ -104,7 +111,8 @@ describe Restify::Processors::Json do
       end
 
       context 'nested objects' do
-        let(:body) do <<-JSON
+        let(:body) do
+          <<-JSON
             {"john": {"name": "John"},
              "jane": {"name": "Jane"}}
           JSON
@@ -123,18 +131,20 @@ describe Restify::Processors::Json do
       end
 
       context 'single value' do
-        let(:body) do <<-JSON
+        let(:body) do
+          <<-JSON
             "BLUB"
           JSON
         end
 
         it { is_expected.to be_a Restify::Resource }
         it { expect(subject.response).to be response }
-        it { is_expected.to eq "BLUB" }
+        it { is_expected.to eq 'BLUB' }
       end
 
       context 'with indifferent access' do
-        let(:body) do <<-JSON
+        let(:body) do
+          <<-JSON
             {"name": "John", "age": 24}
           JSON
         end
@@ -157,7 +167,8 @@ describe Restify::Processors::Json do
       end
 
       context 'with method getter access' do
-        let(:body) do <<-JSON
+        let(:body) do
+          <<-JSON
             {"name": "John", "age": 24}
           JSON
         end

data/spec/restify/promise_spec.rb

@@ -0,0 +1,165 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+describe Restify::Promise do
+  describe 'factory methods' do
+    describe '#fulfilled' do
+      subject { described_class.fulfilled(fulfill_value) }
+      let(:fulfill_value) { 42 }
+
+      it 'returns a fulfilled promise' do
+        expect(subject.fulfilled?).to be true
+        expect(subject.rejected?).to be false
+      end
+
+      it 'wraps the given value' do
+        expect(subject.value!).to eq 42
+      end
+    end
+
+    describe '#rejected' do
+      subject { described_class.rejected(rejection_reason) }
+      let(:rejection_reason) { ArgumentError }
+
+      it 'returns a rejected promise' do
+        expect(subject.fulfilled?).to be false
+        expect(subject.rejected?).to be true
+      end
+
+      it 'bubbles up the caught exception on #value!' do
+        expect { subject.value! }.to raise_error(ArgumentError)
+      end
+
+      it 'swallows the exception on #value' do
+        expect(subject.value).to be nil
+      end
+    end
+
+    describe '#create' do
+      context 'when fulfilling the promise in the writer block' do
+        subject do
+          described_class.create do |writer|
+            # Calculate a value and fulfill the promise with it
+            writer.fulfill 42
+          end
+        end
+
+        it 'returns a fulfilled promise' do
+          expect(subject.fulfilled?).to be true
+          expect(subject.rejected?).to be false
+        end
+
+        it 'wraps the given value' do
+          expect(subject.value!).to eq 42
+        end
+      end
+
+      context 'when rejecting the promise in the writer block' do
+        subject do
+          described_class.create do |writer|
+            # Calculate a value and fulfill the promise with it
+            writer.reject ArgumentError
+          end
+        end
+
+        it 'returns a rejected promise' do
+          expect(subject.fulfilled?).to be false
+          expect(subject.rejected?).to be true
+        end
+
+        it 'bubbles up the caught exception on #value!' do
+          expect { subject.value! }.to raise_error(ArgumentError)
+        end
+
+        it 'swallows the exception on #value' do
+          expect(subject.value).to be nil
+        end
+      end
+
+      context 'when fulfilling the promise asynchronously' do
+        subject do
+          described_class.create do |writer|
+            Thread.new do
+              sleep 0.1
+              writer.fulfill 42
+            end
+          end
+        end
+
+        it 'returns a pending promise' do
+          expect(subject.fulfilled?).to be false
+          expect(subject.rejected?).to be false
+          expect(subject.pending?).to be true
+        end
+
+        it 'waits for the fulfillment value' do
+          expect(subject.value!).to eq 42
+        end
+      end
+    end
+  end
+
+  describe 'result' do
+    subject { described_class.new(*dependencies, &task).value! }
+    let(:dependencies) { [] }
+    let(:task) { nil }
+
+    context 'with a task' do
+      let(:task) do
+        proc {
+          # Calculate the resulting value
+          38 + 4
+        }
+      end
+
+      it 'is calculated using the task block' do
+        expect(subject).to eq 42
+      end
+    end
+
+    context 'with dependencies, but no task' do
+      let(:dependencies) do
+        [
+          Restify::Promise.fulfilled(1),
+          Restify::Promise.fulfilled(2),
+          Restify::Promise.fulfilled(3)
+        ]
+      end
+
+      it 'is an array of the dependencies\' results' do
+        expect(subject).to eq [1, 2, 3]
+      end
+    end
+
+    context 'with dependencies passed as an array, but no task' do
+      let(:dependencies) do
+        [[
+          Restify::Promise.fulfilled(1),
+          Restify::Promise.fulfilled(2),
+          Restify::Promise.fulfilled(3)
+        ]]
+      end
+
+      it 'is an array of the dependencies\' results' do
+        expect(subject).to eq [1, 2, 3]
+      end
+    end
+
+    context 'with dependencies and a task' do
+      let(:dependencies) do
+        [
+          Restify::Promise.fulfilled(5),
+          Restify::Promise.fulfilled(12)
+        ]
+      end
+      let(:task) do
+        proc {|dep1, dep2| dep1 + dep2 }
+      end
+
+      it 'can use the dependencies to calculate the value' do
+        expect(subject).to eq 17
+      end
+    end
+  end
+end

data/spec/restify/registry_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe Restify::Registry do

data/spec/restify/relation_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe Restify::Relation do
@@ -26,7 +28,6 @@ describe Restify::Relation do
     end
 
     context 'with #to_param object' do
-
       let(:params) { {id: ParamObject.new} }
 
       it { expect(subject.to_s).to eq 'http://test.host/resource/42' }

data/spec/restify/resource_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe Restify::Resource do

data/spec/restify_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe Restify do

data/spec/spec_helper.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'rspec'
 require 'webmock/rspec'
 
@@ -10,19 +12,21 @@ end
 
 require 'restify'
 
-case ENV['ADAPTER'].to_s.downcase
-  when 'em-http-request'
-    require 'restify/adapter/em'
-    Restify.adapter = Restify::Adapter::EM.new
-  when 'typhoeus'
-    require 'restify/adapter/typhoeus'
-    Restify.adapter = Restify::Adapter::Typhoeus.new
-  when 'typhoeus-sync'
-    require 'restify/adapter/typhoeus'
-    Restify.adapter = Restify::Adapter::Typhoeus.new sync: true
-  else
-    raise "Invalid adapter: #{ENV['ADAPTER']}"
-end if ENV['ADAPTER']
+if ENV['ADAPTER']
+  case ENV['ADAPTER'].to_s.downcase
+    when 'em-http-request'
+      require 'restify/adapter/em'
+      Restify.adapter = Restify::Adapter::EM.new
+    when 'typhoeus'
+      require 'restify/adapter/typhoeus'
+      Restify.adapter = Restify::Adapter::Typhoeus.new
+    when 'typhoeus-sync'
+      require 'restify/adapter/typhoeus'
+      Restify.adapter = Restify::Adapter::Typhoeus.new sync: true
+    else
+      raise "Invalid adapter: #{ENV['ADAPTER']}"
+  end
+end
 
 require 'webmock/rspec'
 require 'rspec/collection_matchers'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: restify
 version: !ruby/object:Gem::Version
-  version: 1.0.1.beta1
+  version: 1.1.0
 platform: ruby
 authors:
 - Jan Graichen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-01-20 00:00:00.000000000 Z
+date: 2017-05-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: concurrent-ruby
@@ -151,11 +151,12 @@ files:
 - lib/restify/resource.rb
 - lib/restify/response.rb
 - lib/restify/version.rb
-- restify.gemspec
 - spec/restify/cache_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/promise_spec.rb
 - spec/restify/registry_spec.rb
 - spec/restify/relation_spec.rb
 - spec/restify/resource_spec.rb
@@ -176,12 +177,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.6.11
 signing_key: 
 specification_version: 4
 summary: An experimental hypermedia REST client.
@@ -189,7 +190,9 @@ test_files:
 - spec/restify/cache_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/promise_spec.rb
 - spec/restify/registry_spec.rb
 - spec/restify/relation_spec.rb
 - spec/restify/resource_spec.rb

data/restify.gemspec

@@ -1,35 +0,0 @@
-# coding: utf-8
-lib = File.expand_path('../lib', __FILE__)
-$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
-require 'restify/version'
-
-Gem::Specification.new do |spec|
-  spec.name          = 'restify'
-  spec.version       = Restify::VERSION
-  spec.authors       = ['Jan Graichen']
-  spec.email         = ['jg@altimos.de']
-  spec.summary       = 'An experimental hypermedia REST client.'
-  spec.description   = 'An experimental hypermedia REST client that uses parallel, keep-alive and pipelined requests by default.'
-  spec.homepage      = 'https://github.com/jgraichen/restify'
-  spec.license       = 'LGPLv3'
-
-  spec.files         = Dir['**/*'].grep(%r{^((bin|lib|test|spec|features)/|.*\.gemspec|.*LICENSE.*|.*README.*|.*CHANGELOG.*)})
-  spec.executables   = spec.files.grep(%r{^bin/}) {|f| File.basename(f) }
-  spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
-  spec.require_paths = ['lib']
-
-  spec.add_runtime_dependency 'concurrent-ruby', '~> 1.0'
-  spec.add_runtime_dependency 'addressable', '~> 2.3'
-  spec.add_runtime_dependency 'hashie', '~> 3.3'
-  spec.add_runtime_dependency 'rack'
-  spec.add_runtime_dependency 'eventmachine', '>= 1.2'
-  spec.add_runtime_dependency 'em-http-request', '~> 1.1.3'
-  spec.add_runtime_dependency 'activesupport'
-
-  spec.add_development_dependency 'bundler', '~> 1.5'
-
-  if ENV['TRAVIS_BUILD_NUMBER']
-    # Append travis build number for auto-releases
-    spec.version = "#{spec.version}.1.b#{ENV['TRAVIS_BUILD_NUMBER']}"
-  end
-end