hyperclient 0.2.0 → 0.3.0

metadata

@@ -1,144 +1,176 @@
 --- !ruby/object:Gem::Specification
 name: hyperclient
 version: !ruby/object:Gem::Version
+  version: 0.3.0
   prerelease: 
-  version: 0.2.0
 platform: ruby
 authors:
 - Oriol Gual
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-14 00:00:00.000000000 Z
+date: 2013-02-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-    none: false
-  prerelease: false
   name: faraday
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
-    none: false
+        version: '0.8'
   type: :runtime
-- !ruby/object:Gem::Dependency
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.8'
+- !ruby/object:Gem::Dependency
+  name: faraday_middleware
+  requirement: !ruby/object:Gem::Requirement
     none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '0.9'
+  type: :runtime
   prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '0.9'
+- !ruby/object:Gem::Dependency
   name: uri_template
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
-    none: false
+        version: '0.5'
   type: :runtime
-- !ruby/object:Gem::Dependency
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
-    none: false
-  prerelease: false
+        version: '0.5'
+- !ruby/object:Gem::Dependency
   name: net-http-digest_auth
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
-    none: false
+        version: '1.2'
   type: :runtime
-- !ruby/object:Gem::Dependency
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 3.4.0
-    none: false
-  prerelease: false
+        version: '1.2'
+- !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: 3.4.0
-    none: false
   type: :development
-- !ruby/object:Gem::Dependency
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
-    none: false
-  prerelease: false
+        version: 3.4.0
+- !ruby/object:Gem::Dependency
   name: turn
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
-    none: false
+        version: '0.9'
   type: :development
-- !ruby/object:Gem::Dependency
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
-    none: false
-  prerelease: false
+        version: '0.9'
+- !ruby/object:Gem::Dependency
   name: webmock
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
-    none: false
+        version: '1.8'
   type: :development
-- !ruby/object:Gem::Dependency
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
-    none: false
-  prerelease: false
+        version: '1.8'
+- !ruby/object:Gem::Dependency
   name: mocha
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
-    none: false
+        version: '0.13'
   type: :development
-- !ruby/object:Gem::Dependency
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.13'
+- !ruby/object:Gem::Dependency
+  name: rack-test
+  requirement: !ruby/object:Gem::Requirement
     none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '0.6'
+  type: :development
   prerelease: false
-  name: rack-test
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '0.6'
+- !ruby/object:Gem::Dependency
+  name: spinach
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-    none: false
   type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: HyperClient is a Ruby Hypermedia API client.
 email:
 - oriol.gual@gmail.com
@@ -151,6 +183,7 @@ files:
 - .travis.yml
 - .yardopts
 - Gemfile
+- Gemfile.lock
 - Guardfile
 - LICENSE
 - MIT-LICENSE
@@ -158,28 +191,38 @@ files:
 - Readme.md
 - examples/cyberscore.rb
 - examples/hal_shop.rb
+- features/api_navigation.feature
+- features/default_config.feature
+- features/steps/api_navigation.rb
+- features/steps/default_config.rb
+- features/support/api.rb
+- features/support/env.rb
+- features/support/fixtures.rb
 - hyperclient.gemspec
+- lib/faraday/connection.rb
+- lib/faraday/request/digest_authentication.rb
 - lib/hyperclient.rb
 - lib/hyperclient/attributes.rb
 - lib/hyperclient/collection.rb
 - lib/hyperclient/entry_point.rb
-- lib/hyperclient/http.rb
 - lib/hyperclient/link.rb
 - lib/hyperclient/link_collection.rb
 - lib/hyperclient/resource.rb
 - lib/hyperclient/resource_collection.rb
 - lib/hyperclient/version.rb
+- test/faraday/connection_test.rb
+- test/faraday/digest_authentication_test.rb
 - test/fixtures/collection.json
 - test/fixtures/element.json
 - test/fixtures/root.json
 - test/hyperclient/attributes_test.rb
 - test/hyperclient/collection_test.rb
 - test/hyperclient/entry_point_test.rb
-- test/hyperclient/http_test.rb
 - test/hyperclient/link_collection_test.rb
 - test/hyperclient/link_test.rb
 - test/hyperclient/resource_collection_test.rb
 - test/hyperclient/resource_test.rb
+- test/hyperclient_test.rb
 - test/test_helper.rb
 homepage: http://codegram.github.com/hyperclient/
 licenses: []
@@ -188,23 +231,23 @@ rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
       segments:
       - 0
-      hash: -3503842849478118704
-  none: false
+      hash: -3632989280066104764
 required_rubygems_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
       segments:
       - 0
-      hash: -3503842849478118704
-  none: false
+      hash: -3632989280066104764
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24
@@ -212,16 +255,25 @@ signing_key:
 specification_version: 3
 summary: ''
 test_files:
+- features/api_navigation.feature
+- features/default_config.feature
+- features/steps/api_navigation.rb
+- features/steps/default_config.rb
+- features/support/api.rb
+- features/support/env.rb
+- features/support/fixtures.rb
+- test/faraday/connection_test.rb
+- test/faraday/digest_authentication_test.rb
 - test/fixtures/collection.json
 - test/fixtures/element.json
 - test/fixtures/root.json
 - test/hyperclient/attributes_test.rb
 - test/hyperclient/collection_test.rb
 - test/hyperclient/entry_point_test.rb
-- test/hyperclient/http_test.rb
 - test/hyperclient/link_collection_test.rb
 - test/hyperclient/link_test.rb
 - test/hyperclient/resource_collection_test.rb
 - test/hyperclient/resource_test.rb
+- test/hyperclient_test.rb
 - test/test_helper.rb
 has_rdoc: 

data/lib/hyperclient/http.rb

@@ -1,165 +0,0 @@
-require 'faraday'
-require 'json'
-require 'net/http/digest_auth'
-
-module Hyperclient
-  # Internal: This class wrapps HTTParty and performs the HTTP requests for a
-  # resource.
-  class HTTP
-    attr_writer :faraday
-    # Public: Initializes the HTTP agent.
-    #
-    # url    - A String to send the HTTP requests.
-    # config - A Hash with the configuration of the HTTP connection.
-    #          :headers - The Hash with the headers of the connection.
-    #          :auth    - The Hash with the authentication options:
-    #            :type     - A String or Symbol to set the authentication type.
-    #                        Allowed values are :digest or :basic.
-    #            :user     - A String with the user.
-    #            :password - A String with the user.
-    #          :debug   - The flag (true/false) to debug the HTTP connections.
-    #          :faraday_options - A Hash that will be passed to Faraday.new (optional).
-    #                             Can additionally include a :block => <Proc> that is also
-    #                             passed to Faraday.
-    #
-    def initialize(url, config)
-      @url      = url
-      @config   = config
-      @base_uri = config.fetch(:base_uri)
-      @faraday_options = (config[:faraday_options] || {}).dup
-      @faraday_block = @faraday_options.delete(:block)
-
-      authenticate!
-      toggle_debug! if @config[:debug]
-    end
-
-    def url
-      begin
-        URI.parse(@base_uri).merge(@url).to_s
-      rescue URI::InvalidURIError
-        @url
-      end
-    end
-
-    # Public: Sends a GET request the the resource url.
-    #
-    # Returns: The parsed response.
-    def get
-      response = process_request :get
-
-      if body = response.body
-        JSON.parse(body)
-      end
-    end
-
-    # Public: Sends a POST request the the resource url.
-    #
-    # params - A Hash to send as POST params
-    #
-    # Returns: A HTTParty::Response
-    def post(params)
-      wrap_response process_request(:post, params)
-    end
-
-    # Public: Sends a PUT request the the resource url.
-    #
-    # params - A Hash to send as PUT params
-    #
-    # Returns: A HTTParty::Response
-    def put(params)
-      wrap_response process_request(:put, params)
-    end
-
-    # Public: Sends an OPTIONS request the the resource url.
-    #
-    # Returns: A HTTParty::Response
-    def options
-      wrap_response process_request(:options)
-    end
-
-    # Public: Sends a HEAD request the the resource url.
-    #
-    # Returns: A HTTParty::Response
-    def head
-      wrap_response process_request(:head)
-    end
-
-    # Public: Sends a DELETE request the the resource url.
-    #
-    # Returns: A HTTParty::Response
-    def delete
-      wrap_response process_request(:delete)
-    end
-
-    private
-
-    def faraday
-      default_block = lambda do |faraday|
-          faraday.request  :url_encoded
-          faraday.adapter :net_http
-      end
-      @faraday ||= Faraday.new({:url => @base_uri, :headers => @config[:headers] || {}
-        }.merge(@faraday_options), &(@faraday_block || default_block))
-    end
-
-    def wrap_response(faraday_response)
-      def faraday_response.code
-        status
-      end
-      faraday_response
-    end
-
-    def process_request(method, params = nil)
-      response = faraday.run_request method, url, params, faraday.headers
-      if response.status == 401 && @digest_auth
-        response = faraday.run_request method, url, nil, faraday.headers do |request|
-          request.headers['Authorization'] = digest_auth_header(
-            url,  response.headers['www-authenticate'], method)
-        end
-      end
-      response
-    end
-
-    # Internal: Sets the authentication method for HTTParty.
-    #
-    # options - An options Hash to set the authentication options.
-    #
-    # Returns nothing.
-    def authenticate!
-      if (options = @config[:auth])
-        auth_method = options.fetch(:type).to_s + '_auth'
-        send auth_method, options
-      end
-    end
-
-    def basic_auth(options)
-      faraday.basic_auth options[:user], options[:password]
-    end
-
-    def digest_auth(options)
-      @digest_auth = options
-    end
-
-    def digest_auth_header(url, realm, method)
-      uri = URI.parse(url)
-      uri.user = @digest_auth[:user]
-      uri.password = @digest_auth[:password]
-      digest_auth = Net::HTTP::DigestAuth.new
-      digest_auth.auth_header uri, realm, method.upcase
-    end
-
-    # Internal: Enables HTTP debugging.
-    #
-    # stream - An object to stream the HTTP out to or just a truthy value.
-    def toggle_debug!
-      stream = @config[:debug]
-      require 'logger'
-
-      if stream.respond_to?(:<<)
-        faraday.response :logger, ::Logger.new(stream)
-      else
-        faraday.response :logger, ::Logger.new($stderr)
-      end
-    end
-  end
-end