aitch 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c38a1b4c89a137aad0faec66bd2c53f00d59871c
-  data.tar.gz: 6d6054265f125130692693f502f43e856830a7e8
+  metadata.gz: 53e317f071ded556b9eff2bfbf8b222cbfc6735a
+  data.tar.gz: e24ee0d7e6f28c49b49b22de458f663a7776ff3e
 SHA512:
-  metadata.gz: 233cb27de492f6e8f03cceaf0f8d5ddf65aaffdaee7aaf963db1865aecbed347024360727ec5e72e3064bd046b53bc196e7f50cdce435a5cc6ae8bd38d3ca62b
-  data.tar.gz: 9c02590e9d20323273e4584ae86f0ac0694ef316a2e35be6e2c7516402afb78991110f9aa228cbd2a35207c3c8dd510df57da2e4d6720906b55286401a7a2e26
+  metadata.gz: 2e19f66a240033ab32c969190dfa4994cfd6da5a6132bbd3fcc9331b4ff12f8d78193474d8be432bb206d9b59c3270657afcdc2d99ea98b93668ea3a6a2aa983
+  data.tar.gz: 626726af8014cbb4391c7be9da92c469cfc5519cd9f7e842ba874320e20375cfe7fcc4bd35a9e995f028856386a6c52d70218fb8d89a054aa1176fa507bb6643

data/.coveralls.yml

@@ -0,0 +1 @@
+service_name: travis-ci

data/README.md

@@ -3,6 +3,7 @@
 [![Build Status](https://travis-ci.org/fnando/aitch.png)](https://travis-ci.org/fnando/aitch)
 [![CodeClimate](https://codeclimate.com/github/fnando/aitch.png)](https://codeclimate.com/github/fnando/aitch/)
 [![RubyGems](https://badge.fury.io/rb/aitch.png)](https://rubygems.org/gems/aitch)
+[![Coveralls](https://coveralls.io/repos/fnando/aitch/badge.png?branch=master)](https://coveralls.io/r/fnando/aitch)
 
 A simple HTTP client.
 

data/lib/aitch.rb

@@ -3,13 +3,15 @@ require "forwardable"
 require "json"
 require "zlib"
 
+require "aitch/utils"
+require "aitch/uri"
 require "aitch/namespace"
 require "aitch/configuration"
 require "aitch/errors"
 require "aitch/request"
 require "aitch/redirect"
-require "aitch/response"
 require "aitch/response/errors"
+require "aitch/response"
 require "aitch/response/body"
 require "aitch/xml_parser"
 require "aitch/version"

data/lib/aitch/request.rb

@@ -33,8 +33,8 @@ module Aitch
     end
 
     def request
-      @request ||= http_method_class.new(File.join("/", uri.path)).tap do |request|
-        set_body(request)
+      @request ||= http_method_class.new(uri.request_uri).tap do |request|
+        set_body(request) if request.request_body_permitted?
         set_user_agent(request)
         set_gzip(request)
         set_headers(request)
@@ -51,9 +51,7 @@ module Aitch
     end
 
     def uri
-      @uri ||= URI.parse(url)
-    rescue URI::InvalidURIError
-      raise InvalidURIError
+      @uri ||= URI.new(url, data, http_method_class::REQUEST_HAS_BODY)
     end
 
     def http_method_class

data/lib/aitch/response.rb

@@ -9,6 +9,14 @@ module Aitch
       @http_response = http_response
     end
 
+    ERRORS.each do |status_code, exception|
+      method_name = Utils.underscore(exception.name.split("::").last).gsub("_error", "")
+
+      define_method "#{method_name}?" do
+        code == status_code
+      end
+    end
+
     def code
       @http_response.code.to_i
     end

data/lib/aitch/uri.rb

@@ -0,0 +1,43 @@
+module Aitch
+  class URI
+    extend Forwardable
+
+    def_delegators :@uri, :host, :port, :scheme
+
+    def initialize(url, data = {}, request_has_body = false)
+      @url = url
+      @data = data
+      @request_has_body = request_has_body
+
+      begin
+        @uri = ::URI.parse(url)
+      rescue ::URI::InvalidURIError => error
+        raise InvalidURIError, error
+      end
+    end
+
+    def request_has_body?
+      @request_has_body
+    end
+
+    def path
+      File.join("/", @uri.path)
+    end
+
+    def request_uri
+      [path, query, fragment].compact.join("")
+    end
+
+    def fragment
+      "##{@uri.fragment}" if @uri.fragment
+    end
+
+    def query
+      query = [@uri.query]
+      query << ::URI.encode_www_form(@data.to_a) if !request_has_body? && @data.respond_to?(:to_a)
+      query = query.compact.reject(&:empty?).join("&")
+
+      "?#{query}" unless query == ""
+    end
+  end
+end

data/lib/aitch/utils.rb

@@ -0,0 +1,11 @@
+module Aitch
+  module Utils extend self
+    def underscore(string)
+      string = string.gsub(/(?<=.)(URI|[A-Z])/) do |char|
+        "_#{char}"
+      end
+
+      string.downcase
+    end
+  end
+end

data/lib/aitch/version.rb

@@ -1,3 +1,3 @@
 module Aitch
-  VERSION = "0.1.1"
+  VERSION = "0.1.2"
 end

data/spec/aitch/request_spec.rb

@@ -4,7 +4,7 @@ describe Aitch::Request do
   def build_request(options = {})
     Aitch::Request.new({
       request_method: "get",
-      url: "URL",
+      url: "http://example.org",
       config: Aitch::Configuration.new
     }.merge(options))
   end
@@ -50,28 +50,35 @@ describe Aitch::Request do
   end
 
   it "sets request body from hash" do
-    request = build_request(data: {a: 1}).request
+    request = build_request(request_method: "post", data: {a: 1}).request
     expect(request.body).to eql("a=1")
   end
 
   it "sets request body from string" do
-    request = build_request(data: "some body").request
+    request = build_request(request_method: "post", data: "some body").request
     expect(request.body).to eql("some body")
   end
 
   it "sets request body from to_h protocol" do
     data = stub(to_h: {a: 1})
-    request = build_request(data: data).request
+    request = build_request(request_method: "post", data: data).request
     expect(request.body).to eql("a=1")
   end
 
   it "sets request body from to_s protocol" do
     data = stub(to_s: "some body")
-    request = build_request(data: data).request
+    request = build_request(request_method: "post", data: data).request
 
     expect(request.body).to eql("some body")
   end
 
+  it "sets query string from hash data" do
+    FakeWeb.register_uri :get, "http://example.org/?a=1&b=2", body: "hello"
+    requester = build_request(data: {a: 1, b: 2})
+
+    expect(requester.perform.body).to eql("hello")
+  end
+
   it "sets default headers" do
     requester = build_request
     requester.config.default_headers = {"HEADER" => "VALUE"}
@@ -162,4 +169,13 @@ describe Aitch::Request do
       }.to raise_error(Aitch::TooManyRedirectsError)
     end
   end
+
+  describe "GET requests" do
+    it "sets data as query string" do
+      FakeWeb.register_uri(:get, %r[.+], body: "")
+      Aitch.get("http://example.org/", a: 1, b: 2)
+
+      expect(FakeWeb.last_request.path).to eql("/?a=1&b=2")
+    end
+  end
 end

data/spec/aitch/response_spec.rb

@@ -177,4 +177,15 @@ describe Aitch::Response do
       expect(response.data).to be_a(Nokogiri::XML::Document)
     end
   end
+
+  Aitch::Response::ERRORS.each do |code, exception|
+    name = Aitch::Utils.underscore(exception.name.split("::").last).gsub("_error", "")
+
+    it "detects response as #{name}" do
+      config = mock
+      http_response = stub(code: code)
+      response = Aitch::Response.new(config, http_response)
+      expect(response.public_send("#{name}?")).to be_true
+    end
+  end
 end

data/spec/aitch/uri_spec.rb

@@ -0,0 +1,36 @@
+require "spec_helper"
+
+describe Aitch::URI do
+  it "returns default path" do
+    expect(Aitch::URI.new("http://example.org").path).to eql("/")
+  end
+
+  it "returns defined path" do
+    expect(Aitch::URI.new("http://example.org/some/path").path).to eql("/some/path")
+  end
+
+  it "returns fragment" do
+    expect(Aitch::URI.new("http://example.org/#top").fragment).to eql("#top")
+  end
+
+  it "returns query string" do
+    expect(Aitch::URI.new("http://example.org/?a=1&b=2").query).to eql("?a=1&b=2")
+  end
+
+  it "converts data into query string" do
+    expect(Aitch::URI.new("http://example.org", a: 1, b: 2).query).to eql("?a=1&b=2")
+  end
+
+  it "merges data into query string" do
+    expect(Aitch::URI.new("http://example.org/?a=1&b=2", c: 3).query).to eql("?a=1&b=2&c=3")
+  end
+
+  it "ignores data when request has body" do
+    expect(Aitch::URI.new("http://example.org/", {c: 3}, true).query).to eql(nil)
+  end
+
+  it "returns request uri" do
+    uri = Aitch::URI.new("http://example.org/some/path?a=1&b=2#hello", c: 3)
+    expect(uri.request_uri).to eql("/some/path?a=1&b=2&c=3#hello")
+  end
+end

data/spec/aitch/utils_spec.rb

@@ -0,0 +1,13 @@
+require "spec_helper"
+
+describe Aitch::Utils do
+  describe ".underscore" do
+    it "replaces capital letters by underscores" do
+      expect(Aitch::Utils.underscore("SomeConstantName")).to eql("some_constant_name")
+    end
+
+    it "considers URI acronym" do
+      expect(Aitch::Utils.underscore("RequestURITooLong")).to eql("request_uri_too_long")
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: aitch
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Nando Vieira
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-30 00:00:00.000000000 Z
+date: 2013-05-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -115,6 +115,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- .coveralls.yml
 - .gitignore
 - .rspec
 - .travis.yml
@@ -132,6 +133,8 @@ files:
 - lib/aitch/response.rb
 - lib/aitch/response/body.rb
 - lib/aitch/response/errors.rb
+- lib/aitch/uri.rb
+- lib/aitch/utils.rb
 - lib/aitch/version.rb
 - lib/aitch/xml_parser.rb
 - spec/aitch/aitch_spec.rb
@@ -139,6 +142,8 @@ files:
 - spec/aitch/namespace_spec.rb
 - spec/aitch/request_spec.rb
 - spec/aitch/response_spec.rb
+- spec/aitch/uri_spec.rb
+- spec/aitch/utils_spec.rb
 - spec/aitch/xml_parser_spec.rb
 - spec/spec_helper.rb
 homepage: http://rubygems.org/gems/aitch
@@ -161,7 +166,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.0
+rubygems_version: 2.0.3
 signing_key: 
 specification_version: 4
 summary: A simple HTTP client
@@ -171,5 +176,7 @@ test_files:
 - spec/aitch/namespace_spec.rb
 - spec/aitch/request_spec.rb
 - spec/aitch/response_spec.rb
+- spec/aitch/uri_spec.rb
+- spec/aitch/utils_spec.rb
 - spec/aitch/xml_parser_spec.rb
 - spec/spec_helper.rb