aitch 0.3.0 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 74de1f797705e033d093d57165a479c6b98f4586
-  data.tar.gz: ccad13b73ffdc1e648c666cbbb6d8fad162e08c8
+  metadata.gz: de38868979f48b300cc6c7bcf89867eb5a6c763f
+  data.tar.gz: 44071a93ca9d00f5adb3f8324ae12421818ae63d
 SHA512:
-  metadata.gz: 1849671f3d88abcee256d31d6200d7ce7831eebdc750fe272fdc75023faf20bfd048cc7cb5e32edf9a8c064abc3037f50f49f1f95b4b971cf0f18c86c44b5730
-  data.tar.gz: e4eac1e14d9a4a6a998c26cd3d33b32e2d349db37ef39cde837208407f834ca938af125ca6974d77e95c48043a1ac6a58458c5313e4a0268e4823f81b9b185e7
+  metadata.gz: 21f5737e0c0ace3b19f464c54020194d3a7ba5debef88853e6c93248f7ae4845447d830f4852c3fcdcdee351f7afde456df37107dcf2bd309053bf98a9d7d21f
+  data.tar.gz: 6adb9a4df4c44b6ff700ba5e2e9f49fa42d65eed09cfd3800a462b947c1389f414bff7efb9409b88f3aa1abe173fb38c9d75f8c94a9c66879f7ddda685669423

data/.travis.yml

@@ -2,6 +2,7 @@ language: ruby
 script: "bundle exec rspec"
 
 rvm:
+  - 2.1.2
   - 2.0.0
   - 1.9.3
   - jruby-19mode

data/Gemfile

@@ -1,2 +1,4 @@
 source "https://rubygems.org"
 gemspec
+
+gem "pry-meta", platforms: :ruby

data/Gemfile.lock

@@ -1,69 +1,64 @@
 PATH
   remote: .
   specs:
-    aitch (0.3.0)
+    aitch (0.4.0)
       activesupport
       nokogiri (>= 1.6.0)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (4.0.4)
+    activesupport (4.1.8)
       i18n (~> 0.6, >= 0.6.9)
-      minitest (~> 4.2)
-      multi_json (~> 1.3)
+      json (~> 1.7, >= 1.7.7)
+      minitest (~> 5.1)
       thread_safe (~> 0.1)
-      tzinfo (~> 0.3.37)
-    atomic (1.1.16)
+      tzinfo (~> 1.1)
     awesome_print (1.2.0)
     coderay (1.1.0)
-    columnize (0.3.6)
-    debugger (1.6.6)
-      columnize (>= 0.3.1)
-      debugger-linecache (~> 1.2.0)
-      debugger-ruby_core_source (~> 1.3.2)
-    debugger-linecache (1.2.0)
-    debugger-ruby_core_source (1.3.2)
     diff-lcs (1.2.5)
     fakeweb (1.3.0)
-    i18n (0.6.9)
+    i18n (0.6.11)
+    json (1.8.1)
     method_source (0.8.2)
-    mini_portile (0.5.3)
-    minitest (4.7.5)
-    multi_json (1.9.2)
-    nokogiri (1.6.1)
-      mini_portile (~> 0.5.0)
-    notifier (0.4.1)
-    pry (0.9.12.6)
-      coderay (~> 1.0)
-      method_source (~> 0.8)
+    mini_portile (0.6.1)
+    minitest (5.5.0)
+    nokogiri (1.6.5)
+      mini_portile (~> 0.6.0)
+    notifier (0.5.0)
+    pry (0.10.1)
+      coderay (~> 1.1.0)
+      method_source (~> 0.8.1)
       slop (~> 3.4)
-    pry-debugger (0.2.2)
-      debugger (~> 1.3)
-      pry (~> 0.9.10)
-    pry-meta (0.0.6)
+    pry-meta (0.0.9)
       awesome_print
       pry
-      pry-debugger
+      pry-nav
       pry-remote
+    pry-nav (0.2.4)
+      pry (>= 0.9.10, < 0.11.0)
     pry-remote (0.1.8)
       pry (~> 0.9)
       slop (~> 3.0)
-    rake (10.2.2)
-    rspec (2.14.1)
-      rspec-core (~> 2.14.0)
-      rspec-expectations (~> 2.14.0)
-      rspec-mocks (~> 2.14.0)
-    rspec-core (2.14.8)
-    rspec-expectations (2.14.5)
-      diff-lcs (>= 1.1.3, < 2.0)
-    rspec-mocks (2.14.6)
-    slop (3.5.0)
-    test_notifier (1.0.1)
+    rake (10.4.2)
+    rspec (3.1.0)
+      rspec-core (~> 3.1.0)
+      rspec-expectations (~> 3.1.0)
+      rspec-mocks (~> 3.1.0)
+    rspec-core (3.1.7)
+      rspec-support (~> 3.1.0)
+    rspec-expectations (3.1.2)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.1.0)
+    rspec-mocks (3.1.3)
+      rspec-support (~> 3.1.0)
+    rspec-support (3.1.2)
+    slop (3.6.0)
+    test_notifier (2.0.3)
       notifier
-    thread_safe (0.3.1)
-      atomic (>= 1.1.7, < 2)
-    tzinfo (0.3.39)
+    thread_safe (0.3.4)
+    tzinfo (1.2.2)
+      thread_safe (~> 0.1)
 
 PLATFORMS
   ruby

data/README.md

@@ -169,7 +169,7 @@ Setting basic auth credentials:
 ```ruby
 response = Aitch.get do
   url "http://restrict.example.org/"
-  options: user: "john", password: "test"
+  options: {user: "john", password: "test"}
 end
 ```
 

data/aitch.gemspec

@@ -24,7 +24,6 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "bundler"
   spec.add_development_dependency "rake"
   spec.add_development_dependency "rspec"
-  spec.add_development_dependency "pry-meta"
   spec.add_development_dependency "test_notifier"
   spec.add_development_dependency "fakeweb"
 end

data/lib/aitch/request.rb

@@ -7,12 +7,12 @@ module Aitch
     attr_accessor :options
 
     def initialize(options)
+      self.headers ||= {}
+      self.options ||= {}
+
       options.each do |name, value|
         public_send("#{name}=", value)
       end
-
-      self.headers ||= {}
-      self.options ||= {}
     end
 
     def perform
@@ -35,6 +35,14 @@ module Aitch
       raise RequestTimeoutError
     end
 
+    def content_type=(content_type)
+      headers['Content-Type'] = content_type
+    end
+
+    def content_type
+      headers['Content-Type']
+    end
+
     def request
       @request ||= http_method_class.new(uri.request_uri).tap do |request|
         set_body(request) if request.request_body_permitted?
@@ -65,13 +73,14 @@ module Aitch
 
     private
     def set_body(request)
+      body_data = data
       body_data = data.to_h if data.respond_to?(:to_h)
-      body_data ||= data
+      body_data = options[:json_parser].dump(body_data) if content_type.to_s =~ /\bjson\b/
 
       if body_data.kind_of?(Hash)
         request.body = Utils.build_query(body_data)
       else
-        request.body = data.to_s
+        request.body = body_data.to_s
       end
     end
 

data/lib/aitch/version.rb

@@ -1,3 +1,3 @@
 module Aitch
-  VERSION = "0.3.0"
+  VERSION = "0.4.0"
 end

data/spec/aitch/aitch_spec.rb

@@ -38,17 +38,14 @@ describe Aitch do
         options: options.merge(Aitch.config.to_h)
       }
 
-      Aitch::Request
-        .should_receive(:new)
-        .with(expected)
-        .and_return(request)
+      expect(Aitch::Request).to receive(:new).with(expected).and_return(request)
 
       Aitch.get("URL", "DATA", "HEADERS", options)
     end
 
     it "performs request" do
-      Aitch::Request.stub new: request
-      request.should_receive(:perform)
+      allow(Aitch::Request).to receive(:new).and_return(request)
+      expect(request).to receive(:perform)
 
       Aitch.get("URL")
     end
@@ -57,14 +54,14 @@ describe Aitch do
   describe "#execute!" do
     it "returns response when successful" do
       response = double(error?: false)
-      Aitch::Request.any_instance.stub perform: response
+      allow_any_instance_of(Aitch::Request).to receive(:perform).and_return(response)
 
       expect(Aitch.get!("URL")).to eql(response)
     end
 
     it "raises when has errors" do
       response = double(error?: true, error: "ERROR")
-      Aitch::Request.any_instance.stub perform: response
+      allow_any_instance_of(Aitch::Request).to receive(:perform).and_return(response)
 
       expect {
         Aitch.get!("URL")

data/spec/aitch/html_parser_spec.rb

@@ -2,10 +2,7 @@ require "spec_helper"
 
 describe Aitch::HTMLParser do
   it "instantiates Nokogiri" do
-    Nokogiri
-      .should_receive(:HTML)
-      .with("HTML")
-
+    expect(Nokogiri).to receive(:HTML).with("HTML")
     Aitch::HTMLParser.load("HTML")
   end
 end

data/spec/aitch/request_spec.rb

@@ -9,6 +9,11 @@ describe Aitch::Request do
     }.merge(options))
   end
 
+  it "sets content type" do
+    request = build_request(content_type: 'application/json')
+    expect(request.content_type).to eq('application/json')
+  end
+
   it "raises with invalid uri" do
     expect {
       build_request(url: "\\").uri
@@ -17,7 +22,7 @@ describe Aitch::Request do
 
   it "raises on timeout", ruby: 2.0 do
     request = build_request(request_method: "post", url: "http://example.org")
-    request.stub_chain(:client, :request).and_raise(Net::ReadTimeout)
+    allow(request).to receive_message_chain(:client, :request).and_raise(Net::ReadTimeout)
 
     expect {
       request.perform
@@ -26,7 +31,7 @@ describe Aitch::Request do
 
   it "raises on timeout", ruby: 1.9 do
     request = build_request(request_method: "post", url: "http://example.org")
-    request.stub_chain(:client, :request).and_raise(Timeout::Error)
+    allow(request).to receive_message_chain(:client, :request).and_raise(Timeout::Error)
 
     expect {
       request.perform
@@ -59,6 +64,17 @@ describe Aitch::Request do
     expect(request.body).to eql("some body")
   end
 
+  it "sets json body from object" do
+    request = build_request(
+      request_method: "post",
+      data: {a: 1},
+      content_type: "application/json",
+      options: {json_parser: JSON}
+    ).request
+
+    expect(request.body).to eql({a: 1}.to_json)
+  end
+
   it "sets request body from to_h protocol" do
     data = double(to_h: {a: 1})
     request = build_request(request_method: "post", data: data).request
@@ -110,7 +126,7 @@ describe Aitch::Request do
       subject(:client) { request.client }
 
       it "sets https" do
-        expect(client.use_ssl?).to be_true
+        expect(client.use_ssl?).to be_truthy
       end
 
       it "sets verification mode" do

data/spec/aitch/response_spec.rb

@@ -208,7 +208,7 @@ describe Aitch::Response do
       config = double
       http_response = double(code: code)
       response = Aitch::Response.new(config, http_response)
-      expect(response.public_send("#{name}?")).to be_true
+      expect(response.public_send("#{name}?")).to be_truthy
     end
   end
 end

data/spec/aitch/xml_parser_spec.rb

@@ -3,10 +3,7 @@ require "spec_helper"
 
 describe Aitch::XMLParser do
   it "instantiates Nokogiri" do
-    Nokogiri
-      .should_receive(:XML)
-      .with("XML", nil, "utf-8")
-
+    expect(Nokogiri).to receive(:XML).with("XML", nil, "utf-8")
     Aitch::XMLParser.load("XML")
   end
 

data/spec/spec_helper.rb

@@ -13,4 +13,8 @@ RSpec.configure do |config|
   config.filter_run_excluding :ruby => -> version {
     !(RUBY_VERSION.to_s =~ /^#{version.to_s}/)
   }
+
+  config.expect_with :rspec do |c|
+    c.syntax = :expect
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: aitch
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors:
 - Nando Vieira
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-28 00:00:00.000000000 Z
+date: 2014-12-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
@@ -80,20 +80,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: pry-meta
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: test_notifier
   requirement: !ruby/object:Gem::Requirement