restify 0.1.2.1.b27 → 0.1.2.1.b28

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ODExNGE4NTJmNjJmOTk2YTY0YjE4YjViYmI3Mzg5MDdiNzAyYTA1Mg==
+    MjFmODExYzA1MWQyMWQyYjQ3NDM0M2I5NWQ3NDRmYTBkYjMzZGRhZA==
   data.tar.gz: !binary |-
-    Njg0ZjcxZWI1ZmQ1ODEzNDdiMjYyMjQ1NzdiYjdmMTYyMTM3NGJiNw==
+    MWUxMzRiN2RlZmEwZGVmMTBmNzg0ZWMzODFiMjBlOGUwN2Y5YmNkOA==
 SHA512:
   metadata.gz: !binary |-
-    MTA3ZDFkNTAwN2ZmNDExMGQ2YjE0ODZlODhhNTFkZjgxYmEwMmMwNWNiYTE1
-    OTc2NjY3MjhlMjY1OTkxNzc5YTdiYWU4N2JiMTMzNWUzOTM4NmRmMGY2NTE4
-    NmUxNTE3NzU2YmMyNDhkYTE5Y2VmNzA1MzcxMTFmNTFjZWY3MzQ=
+    NmNiMmJkNTQ4Y2Y4MjBiYzllOTBkNjE1NWExZTE0NDhhNTk3ZmRjYjE0NTky
+    N2VlYTkzZjI3NDI5N2I5MDE2M2FlYTNkYWJiYzM2Njc5OTY4YTFjOWJjZDdm
+    YmNhMTg2ODU0ZTg1YWNjZWQ2MTI0OGU3ZWRkNTYwNjg0ZmFhODM=
   data.tar.gz: !binary |-
-    NTkzYjUwYzQyM2ZjN2YwMjMwYzI5YzkwZTRhYzA0YWM4YTUzOTQ0NjQ1MDRh
-    ZTMyODEyMzhkNmIxNDQ2YjAwNWY0ZjQyY2FiMGI4ZDRkOTQ0NWM4NWIzMmJi
-    ZGRjODJhNTY0NjU4N2VlNDdhYTY2MGNhZGI4YWZjZDlmMzkwM2Q=
+    Yzc2ZjVhY2Q1NzYyOGIwNmRmYzMwOTMxZDYwOWJlNDYzMjExODc1MTViNjk3
+    MDBiMGI2MWUxNzc1OGU4OWI1ZjJmMzBiMjI4NzdlNzhkMjZmZDYyZWZjZDY4
+    MmUwYTcyM2Y0NzdhNGI5M2VhZTZjNDVlZTJjZjI3YmViZDA0ZDE=

data/lib/restify/client.rb

@@ -90,9 +90,9 @@ module Restify
 
     def handle_success(response)
       if response.decoded_body.is_a?(Array)
-        Collection.create(self, response.decoded_body, response)
+        Collection.new(self, response.decoded_body, response)
       else
-        Resource.create(self, response.decoded_body, response)
+        Resource.new(self, response.decoded_body, response)
       end
     end
 

data/lib/restify/collection.rb

@@ -1,79 +1,23 @@
 module Restify
   #
-  class Collection
+  class Collection < Array
+    include Result
     include Relations
 
-    # @!method [](index)
-    #   Retrieve value for given index.
-    #
-    #   @param index [Integer] Index.
-    #   @return [Object] Data value for given index.
-    #
-    delegate :[], to: :items
+    def initialize(client, data = [], response = nil)
+      super data
 
-    # @!method size
-    #   Return size of collection. Only includes size of current
-    #   page in paginated resources.
-    #
-    #   @return [Integer] Number of items in current collection.
-    #
-    delegate :size, to: :items
-
-    # @!method first
-    #   Return first item of collection.
-    #
-    #   @return [Resource, Collection, Object] Return first
-    #
-    delegate :first, to: :items
-
-    # @!method each
-    #   Iterate over all items or return enumerator.
-    #
-    #   @overload each
-    #     Calls block once for each item, passing the item as
-    #     parameters.
-    #
-    #     @yield [item] Yield for each item.
-    #     @yieldparam item [Resource, Collection, Object] Collection item.
-    #
-    #   @overload each
-    #     Return enumerator for each item.
-    #
-    #     @return [Enumerator] Enumerator for each item.
-    #
-    delegate :each, to: :items
-
-    # Return parsed resource attributes as hash.
-    #
-    # @return [Array] Collection items.
-    #
-    def items
-      @items ||= []
-    end
-
-    def initialize(client, relations = {}, items = [])
-      @client     = client
-      @relations  = HashWithIndifferentAccess.new relations
-      @items      = Array items
-    end
-
-    class << self
-      def create(client, data, response)
-        data = data.map do |value|
-          case value
-            when Hash
-              Resource.create client, value, nil
-            when Array
-              create client, value, nil
-            else
-              value
-          end
+      map! do |item|
+        case item
+          when Hash
+            Resource.new client, item
+          else
+            item
         end
-
-        relations = response ? response.relations(client) : nil
-
-        new client, relations, data
       end
+
+      @client    = client
+      @relations = response ? response.relations(client) : nil
     end
   end
 end

data/lib/restify/link.rb

@@ -13,13 +13,13 @@ module Restify
 
     # Link metadata like "rel" if specified.
     #
-    # @return [HashWithIndifferentAccess<String, String>] Metadata.
+    # @return [Hash<String, String>] Metadata.
     #
     attr_reader :metadata
 
     def initialize(uri, metadata = {})
       @uri      = uri
-      @metadata = HashWithIndifferentAccess.new(metadata)
+      @metadata = metadata
     end
 
     class << self

data/lib/restify/relation.rb

@@ -30,13 +30,17 @@ module Restify
       request :delete, params.merge(data: data)
     end
 
+    def ==(other)
+      super || (other.is_a?(String) && @template.pattern == other)
+    end
+
     private
 
     attr_reader :client, :template
 
     def request(method, opts = {})
       keys   = template.variables - Client::RESERVED_KEYS
-      params = opts.except!(keys)
+      params = Hash[keys.map{|key| [key, opts.delete(:key)]}]
       uri    = template.expand(params)
 
       client.request method, uri, opts

data/lib/restify/relations.rb

@@ -8,7 +8,7 @@ module Restify
     # @return [Boolean] True if resource has relation, false otherwise.
     #
     def rel?(name)
-      relations.key? name
+      relations.key? name.to_s
     end
     alias_method :relation?, :rel?
     alias_method :has_rel?, :rel?
@@ -20,16 +20,16 @@ module Restify
     # @return [Relation] Relation.
     #
     def rel(name)
-      relations.fetch name
+      relations.fetch name.to_s
     end
     alias_method :relation, :rel
 
     # Hash of all known relations.
     #
-    # @return [HashWithIndifferentAccess<String, Relation>] Relations.
+    # @return [Hash<String, Relation>] Relations.
     #
     def relations
-      @relations ||= HashWithIndifferentAccess.new
+      @relations ||= Hash.new
     end
   end
 end

data/lib/restify/resource.rb

@@ -1,6 +1,7 @@
 module Restify
   #
-  class Resource
+  class Resource < Hashie::Mash
+    include Result
     include Relations
 
     # Return content Media-Type.
@@ -9,130 +10,58 @@ module Restify
     #
     attr_reader :media_type
 
-    # @!method [](key)
-    #   Retrieve value for given key.
     #
-    #   @param key [String, Symbol] Data key.
-    #   @return [Object] Data value for given key.
-    #
-    delegate :[], to: :attributes
+    def initialize(client, data = {}, response = nil)
+      @client   = client
+      @response = response
 
-    # @!method []=(key, value)
-    #   Set value for given key.
-    #
-    #   @param key [String, Symbol] Data key.
-    #   @param key [String, Fixnum, Object] Data value.
-    #
-    delegate :[]=, to: :attributes
+      relations.merge! @response.relations(client) if @response
 
-    # @!method key?(name)
-    #   Check if resource has given key.
-    #
-    #   @param name [String, Symbol] Key name.
-    #   @return [Boolean] True if resource contains key, false otherwise.
-    #
-    delegate :key?, :has_key?, to: :attributes
+      data.each_pair do |key, value|
+        self[key.to_s] = convert_value(value)
 
-    # @!method each
-    #   Iterate over keys and values or return enumerator.
-    #
-    #   @overload each
-    #     Calls block once for each key, passing the key-value pair as
-    #     parameters.
-    #
-    #     @yield [key, value] Yield for each key-value pair.
-    #     @yieldparam key [String] Attribute key.
-    #     @yieldparam value [Object] Attribute value.
-    #
-    #   @overload each
-    #     Return enumerator for each key-value pair.
-    #
-    #     @return [Enumerator] Enumerator for each key-value pair.
-    #
-    delegate :each, to: :attributes
+        name = case key.to_s.downcase
+          when /\A(\w+)_url\z/
+            $1
+          when 'url'
+            'self'
+          else
+            next
+        end
 
-    # Return parsed resource attributes as hash.
-    #
-    # @return [HashWithIndifferentAccess] Attribute hash.
-    #
-    def attributes
-      @attributes ||= HashWithIndifferentAccess.new
+        unless relations.key?(name) || value.nil? || value.to_s.empty?
+          relations[name] = Relation.new(client, value.to_s)
+        end
+      end
     end
 
-    # @!method status
-    #   Return response status if available.
-    #
-    #   @return [Symbol] Response status.
-    #   @see Response#status
-    #
-    delegate :status, to: :@response, allow_nil: true
-
-    # @!method code
-    #   Return response status code if available.
-    #
-    #   @return [Fixnum] Response status code.
-    #   @see Response#code
-    #
-    delegate :code, to: :@response, allow_nil: true
-
-    # Follow the Location header from the response of
-    # this resource if available.
-    #
-    # @return [Obligation<Resource>] Followed resource.
-    #
-    def follow
-      if @response && @response.headers['LOCATION']
-        @client.request :get, @response.headers['LOCATION']
-      else
-        raise RuntimeError.new 'Nothing to follow.'
+    # Compare with other {Resource}s or {Hash}s.
+    #
+    def ==(other)
+      case other
+        when Resource
+          @data == other.data && relations == other.relations
+        when Hash
+          @data == other
+        else
+          super
       end
     end
 
-    def initialize(client, relations = {}, attributes = {}, response = nil)
-      @client     = client
-      @response   = response
-      @relations  = HashWithIndifferentAccess.new relations
-      @attributes = HashWithIndifferentAccess.new attributes
+    # @private
+    #
+    def convert_key(key)
+      key.to_s
     end
 
-    class << self
-      #
-      # Build a resource from given response.
-      #
-      def create(client, data, response)
-        relations = {}
-        relations = response.relations(client) if response
-
-        hash = {}
-        if data
-          data.each do |key, value|
-            hash[key] = case value
-                          when Array
-                            Collection.create(client, value, nil)
-                          when Hash
-                            Resource.create(client, value, nil)
-                          else
-                            value
-                        end
-          end
-
-          data.keys.each do |key|
-            name = nil
-            if (m = /\A(\w+)_url\z/.match(key))
-              name = m[1]
-            elsif key == 'url'
-              name = :self
-            else
-              next
-            end
-
-            unless relations.key?(name) || data[key].to_s.blank?
-              relations[name] = Relation.new(client, data[key].to_s)
-            end
-          end
-        end
-
-        new client, relations, hash, response
+    # @private
+    #
+    def convert_value(value)
+      case value
+        when Hash
+          self.new client, value
+        else
+          value
       end
     end
   end

data/lib/restify/result.rb

@@ -0,0 +1,34 @@
+module Restify
+  module Result
+    # Return response status if available.
+    #
+    # @return [Symbol] Response status.
+    # @see Response#status
+    #
+    def status
+      @response ? @response.status : nil
+    end
+
+    # Return response status code if available.
+    #
+    # @return [Fixnum] Response status code.
+    # @see Response#code
+    #
+    def code
+      @response ? @response.code : nil
+    end
+
+    # Follow the Location header from the response of
+    # this resource if available.
+    #
+    # @return [Obligation<Resource>] Followed resource.
+    #
+    def follow
+      if @response && @response.headers['LOCATION']
+        @client.request :get, @response.headers['LOCATION']
+      else
+        raise RuntimeError.new 'Nothing to follow.'
+      end
+    end
+  end
+end

data/lib/restify.rb

@@ -1,17 +1,15 @@
 require 'restify/version'
 require 'addressable/uri'
 require 'addressable/template'
-require 'active_support'
-require 'active_support/core_ext'
-require 'active_support/hash_with_indifferent_access'
-require 'active_support/core_ext/module/delegation'
 require 'multi_json'
 require 'obligation'
+require 'hashie'
 
 #
 module Restify
   require 'restify/adapter'
   require 'restify/client'
+  require 'restify/result'
   require 'restify/relations'
   require 'restify/collection'
   require 'restify/link'

data/restify.gemspec

@@ -21,7 +21,7 @@ Gem::Specification.new do |spec|
   spec.add_runtime_dependency 'obligation', '~> 0.1'
   spec.add_runtime_dependency 'addressable', '~> 2.3'
   spec.add_runtime_dependency 'em-http-request', '~> 1.1'
-  spec.add_runtime_dependency 'activesupport', '>= 3.2', '< 5'
+  spec.add_runtime_dependency 'hashie', '~> 3.3'
   spec.add_runtime_dependency 'multi_json'
   spec.add_runtime_dependency 'rack'
 

data/spec/restify/collection_spec.rb

@@ -0,0 +1,5 @@
+require 'spec_helper'
+
+describe Restify::Collection do
+
+end

data/spec/restify/resource_spec.rb

@@ -2,14 +2,15 @@ require 'spec_helper'
 
 describe Restify::Resource do
   let(:client) { double 'client' }
-  let(:relations) { {} }
-  let(:attributes) { {} }
-  let(:res)    { described_class.new(client, relations, attributes) }
+  let(:data) { {} }
+  let(:res)    { described_class.new(client, data) }
 
   describe '#rel?' do
-    before do
-      res.relations['users']   = true
-      res.relations[:projects] = true
+    let(:data) do
+      {
+        'users_url' => 'http://example.org/users',
+        'projects_url' => 'http://example.org/projects',
+      }
     end
 
     it 'should match relations' do
@@ -34,30 +35,30 @@ describe Restify::Resource do
   end
 
   describe '#rel' do
-    let(:users) { double 'users rel' }
-    let(:projects) { double 'projects rel' }
-    before do
-      res.relations['users']   = users
-      res.relations[:projects] = projects
+    let(:data) do
+      {
+        'users_url' => 'http://example.org/users',
+        'projects_url' => 'http://example.org/projects',
+      }
     end
 
     it 'should return relation' do
-      expect(res.rel(:users)).to eq users
-      expect(res.rel('users')).to eq users
-      expect(res.rel(:projects)).to eq projects
-      expect(res.rel('projects')).to eq projects
+      expect(res.rel(:users)).to eq 'http://example.org/users'
+      expect(res.rel('users')).to eq 'http://example.org/users'
+      expect(res.rel(:projects)).to eq 'http://example.org/projects'
+      expect(res.rel('projects')).to eq 'http://example.org/projects'
       expect { res.rel(:fuu) }.to raise_error KeyError
 
-      expect(res.relation(:users)).to eq users
-      expect(res.relation('users')).to eq users
-      expect(res.relation(:projects)).to eq projects
-      expect(res.relation('projects')).to eq projects
+      expect(res.relation(:users)).to eq 'http://example.org/users'
+      expect(res.relation('users')).to eq 'http://example.org/users'
+      expect(res.relation(:projects)).to eq 'http://example.org/projects'
+      expect(res.relation('projects')).to eq 'http://example.org/projects'
       expect { res.relation(:fuu) }.to raise_error KeyError
     end
   end
 
   describe '#key?' do
-    let(:attributes) { {a: 0, 'b' => 1, 0 => 2} }
+    let(:data) { {a: 0, 'b' => 1, 0 => 2} }
 
     it 'should test for key inclusion' do
       expect(res.key?(:a)).to eq true
@@ -81,7 +82,7 @@ describe Restify::Resource do
   end
 
   describe '#each' do
-    let(:attributes) { {a: 0, b: 1} }
+    let(:data) { {a: 0, b: 1} }
 
     it 'should yield' do
       expect{|cb| res.each(&cb) }.to yield_control.twice
@@ -95,18 +96,30 @@ describe Restify::Resource do
   end
 
   describe '#[]' do
-    let(:attributes) { {a: 0, b: 1} }
+    let(:data) { {a: 0, b: 1} }
 
-    it 'should return attributes' do
+    it 'should return data' do
       expect(res[:a]).to eq 0
       expect(res[:b]).to eq 1
     end
   end
 
+  describe '<getter>' do
+    let(:data) { {a: 0, b: 1} }
+
+    it 'should return data' do
+      expect(res).to respond_to :a
+      expect(res).to respond_to :b
+
+      expect(res.a).to eq 0
+      expect(res.b).to eq 1
+    end
+  end
+
   describe '#[]=' do
-    let(:attributes) { {a: 0, b: 1} }
+    let(:data) { {a: 0, b: 1} }
 
-    it 'should return attributes' do
+    it 'should return data' do
       res[:a] = 5
       res[:c] = 15
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: restify
 version: !ruby/object:Gem::Version
-  version: 0.1.2.1.b27
+  version: 0.1.2.1.b28
 platform: ruby
 authors:
 - Jan Graichen
@@ -53,25 +53,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '1.1'
 - !ruby/object:Gem::Dependency
-  name: activesupport
+  name: hashie
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '3.2'
-    - - <
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '5'
+        version: '3.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '3.2'
-    - - <
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '5'
+        version: '3.3'
 - !ruby/object:Gem::Dependency
   name: multi_json
   requirement: !ruby/object:Gem::Requirement
@@ -135,8 +129,10 @@ files:
 - lib/restify/request.rb
 - lib/restify/resource.rb
 - lib/restify/response.rb
+- lib/restify/result.rb
 - lib/restify/version.rb
 - restify.gemspec
+- spec/restify/collection_spec.rb
 - spec/restify/link_spec.rb
 - spec/restify/resource_spec.rb
 - spec/restify_spec.rb
@@ -166,6 +162,7 @@ signing_key:
 specification_version: 4
 summary: An experimental hypermedia REST client.
 test_files:
+- spec/restify/collection_spec.rb
 - spec/restify/link_spec.rb
 - spec/restify/resource_spec.rb
 - spec/restify_spec.rb