httpspec_simple 0.1.6 → 0.1.7

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 645b42d56bb4db55f1dce37ace28f07581258232
+  data.tar.gz: 624b70cab0c40e33688cd238c98b4ac47373bbdb
+SHA512:
+  metadata.gz: e1bbc733be03f4974d79412c859d2672151ca5a25c6f22e46504f6ed726795428a221379733a3396d22bc95955c9aa246cfbc208849f400ff5b1d68de75b5e84
+  data.tar.gz: e6d6b01a230f5b1d8a3c2c7e4adfde90fdea988c9adc5c44310ee920caf266df9d57ebbf96f86cd521cb769492db078f928b35588777e4bd5f10bea5ade482a0

data/lib/httpspec_simple/request.rb

@@ -17,9 +17,7 @@ module HttpspecSimple
           read_timeout_error = if Net.const_defined?(:ReadTimeout) then Net::ReadTimeout else Timeout::Error end
           begin
             req = Net::HTTP::Get.new(@url.request_uri)
-            if (headers = opt[:headers] || Request.configuration.headers)
-              headers.each {|k, v| req[k] = v }
-            end
+            {}.merge( Request.configuration.headers || {} ).merge( opt[:headers] || {} ).each {|k, v| req[k] = v }
             if (basic_auth = opt[:basic_auth] || Request.configuration.basic_auth)
               req.basic_auth *basic_auth if Array === basic_auth
             end

data/lib/httpspec_simple/version.rb

@@ -1,3 +1,3 @@
 module HttpspecSimple
-  VERSION = "0.1.6"
+  VERSION = "0.1.7"
 end

data/spec/httpspec_simple/request_spec.rb

@@ -122,6 +122,27 @@ describe HttpspecSimple::Request do
     end
   end
 
+  describe "configure beaders both global configuration and initializer option" do
+    before(:each) { HttpspecSimple::Request.reset_configuration }
+    after(:each)  { HttpspecSimple::Request.reset_configuration }
+    it "should send headers all" do
+      user_agent_in_req_header = nil
+      x_custom_in_req_header = nil
+      server_start( '/' => Proc.new {|req, res|
+        user_agent_in_req_header = req["user-agent"]
+        x_custom_in_req_header = req["x-custom"]
+        res.status = "200"
+      } ) do
+        HttpspecSimple::Request.configure do |config|
+          config.headers = {"user-agent" => "my-agent"}
+        end
+        HttpspecSimple::Request.new('http://localhost:10080/', :headers => {"x-custom" => "custom-header"})
+      end
+      user_agent_in_req_header.should == "my-agent"
+      x_custom_in_req_header.should == "custom-header"
+    end
+  end
+
   it "should send get parameters" do
     query = nil
     server_start( '/' => Proc.new {|req, res|

metadata

@@ -1,20 +1,18 @@
 --- !ruby/object:Gem::Specification
 name: httpspec_simple
 version: !ruby/object:Gem::Version
-  version: 0.1.6
-  prerelease: 
+  version: 0.1.7
 platform: ruby
 authors:
 - Koji NAKAMURA
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-29 00:00:00.000000000 Z
+date: 2013-11-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -22,7 +20,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -30,7 +27,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -38,7 +34,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -46,17 +41,15 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 description: RSpec extension for HTTP request
@@ -84,33 +77,26 @@ files:
 homepage: https://github.com/kozy4324/httpspec_simple
 licenses:
 - MIT
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -795099866452761345
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -795099866452761345
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 2.0.3
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: RSpec extension for HTTP request
 test_files:
 - spec/httpspec_simple/custom_matcher_spec.rb