httpspec_simple 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 92e584f885b0245242709a44891cad5267dc21a3
-  data.tar.gz: 1570a382d33fca4616b46f542ddc178ce6f2729b
+  metadata.gz: cd5d9c54f71ba2d0a77591e82b3151857f9a8dac
+  data.tar.gz: 95843a7989ef5a42220ec441c2763eea828bcb85
 SHA512:
-  metadata.gz: ba779d59ac4afaa6ca22df2e48ca4d12dd6b975cf1501fa93792fb2079cc9848a403a7c3339d169cf967d79723643e014dcaa6e8342db6980789f058decd922a
-  data.tar.gz: e68340e72c87f173ecf6a250756933e2ddcbc6a80d5f72841ea53dd89dce346559e7166904fd3a8ae387d11fb292500c2e30e3e5929d134cf3cd2295a1ee88f0
+  metadata.gz: d4d9c21b1ee6d3633e2c286594457e848e54f2dcae6b67e175da4eedcab84b80bfd72aa450bd3199530f4600b4b93b64999ea11829402409bf8a6d203d2a55cd
+  data.tar.gz: d1a3b4c5951ceab8012add155dcdfc3584d64cf69f89ff00ae64b77c014a90a0b6bc66fab4efbbad354c131d519a8e0c2c69d473816dc0e2aab187dcd8310dff

data/README.md

@@ -12,14 +12,30 @@ base_url 'http://kozy4324.github.io'
 describe request('/') do
   it { should be_http_ok }
   it { should respond_within(2).seconds }
+  it { should retrieve_body_including '<title>L4L</title>' }
 end
 
 describe request('/blog/archives/') do
   it { should be_http_ok }
   it { should respond_within(2).seconds }
+  it { should retrieve_body_including '<title>Blog Archive - L4L</title>' }
 end
 ```
 
+```
+$ rspec -f d
+
+http://kozy4324.github.io/
+  should be http ok
+  should respond within 2 seconds (got 0.122 seconds)
+  should retrieve body including "<title>L4L</title>"
+
+http://kozy4324.github.io/blog/archives/
+  should be http ok
+  should respond within 2 seconds (got 0.111 seconds)
+  should retrieve body including "<title>Blog Archive - L4L</title>"
+```
+
 ## Custom matchers
 
 ### be_http_ok
@@ -46,13 +62,30 @@ Do request
 
 option key | type    | description
 ---------- | ------- | -----------
-:retry     | integer | when the response code is {40x,50x} or the timeout occurs, retry request the specific times, default value is 0
-:timeout   | integer | set to Net::HTTP's open_timeout and read_timeout
+:retry     | Integer | when the response code is {40x,50x} or the timeout occurs, retry request the specific times, default value is 0
+:timeout   | Integer | set to Net::HTTP's open_timeout and read_timeout
+:headers   | Hash    | set to the request header
 
 ### base_url(prepend_string)
 
 Prepend to the url string passed to following `request` method
 
+### HttpspecSimple::Request.configure
+
+configure the global setting as `request()`'s opt argument
+
+```
+HttpspecSimple::Request.configure {|config|
+  config.retry = 3
+  config.timeout = 15
+  config.headers = {"user-agent" => "my-agent"}
+}
+```
+
+### HttpspecSimple::Request.reset_configuration
+
+clear all configuration set by `HttpspecSimple::Request.configure`
+
 ## Contributing
 
 1. Fork it

data/lib/httpspec_simple/request.rb

@@ -8,17 +8,19 @@ module HttpspecSimple
     def initialize(url, opt = {})
       @url = URI.parse(url)
       http = Net::HTTP.new(@url.host, @url.port)
-      unless opt[:timeout].nil?
-        http.read_timeout = opt[:timeout]
-        http.open_timeout = opt[:timeout]
-      end
-      retry_count = opt[:retry].to_i
-      res, @response_time = http.start do |http|
-        process_time do
+      http.open_timeout = opt[:timeout] || Request.configuration.timeout
+      http.read_timeout = opt[:timeout] || Request.configuration.timeout
+      retry_count = (opt[:retry] || Request.configuration.retry).to_i
+      res, @response_time = process_time do
+        http.start do |http|
           open_timeout_error = if Net.const_defined?(:OpenTimeout) then Net::OpenTimeout else Timeout::Error end
           read_timeout_error = if Net.const_defined?(:ReadTimeout) then Net::ReadTimeout else Timeout::Error end
           begin
-            res = http.request(Net::HTTP::Get.new(@url.path))
+            req = Net::HTTP::Get.new(@url.path)
+            if (headers = opt[:headers] || Request.configuration.headers)
+              headers.each {|k, v| req[k] = v }
+            end
+            res = http.request(req)
             raise RequestError.new if res.kind_of?(Net::HTTPClientError) or res.kind_of?(Net::HTTPServerError)
           rescue open_timeout_error, read_timeout_error, RequestError
             retry if (retry_count-=1) > 0
@@ -43,6 +45,26 @@ module HttpspecSimple
     def to_s
       @url.to_s
     end
+
+    class << Request
+      def configure
+        config = CONFIG_CLASS.new(20, 0)
+        yield config if block_given?
+        configuration.timeout = config.timeout
+        configuration.retry = config.retry
+        configuration.headers = config.headers
+      end
+
+      CONFIG_CLASS = Struct.new(:timeout, :retry, :headers)
+
+      def configuration
+        @config ||= reset_configuration
+      end
+
+      def reset_configuration
+        @config = CONFIG_CLASS.new(20, 0, {})
+      end
+    end
   end
 
   class RequestError < StandardError; end

data/lib/httpspec_simple/version.rb

@@ -1,3 +1,3 @@
 module HttpspecSimple
-  VERSION = "0.1.2"
+  VERSION = "0.1.3"
 end

data/spec/httpspec_simple/request_spec.rb

@@ -57,4 +57,68 @@ describe HttpspecSimple::Request do
     end
     response.body.should == "body_string"
   end
+
+  describe ".configure" do
+    before(:each) { HttpspecSimple::Request.reset_configuration }
+    after(:each)  { HttpspecSimple::Request.reset_configuration }
+    it "should configure the default configuration" do
+      HttpspecSimple::Request.configuration.timeout.should == 20
+      HttpspecSimple::Request.configuration.retry.should == 0
+      HttpspecSimple::Request.configure do |config|
+        config.timeout = 60
+        config.retry = 10
+      end
+      HttpspecSimple::Request.configuration.timeout.should == 60
+      HttpspecSimple::Request.configuration.retry.should == 10
+    end
+
+    it "should timeout within a specific time" do
+      HttpspecSimple::Request.configure do |config|
+        config.timeout = 1
+      end
+      requests, response = server_start( '/' => Proc.new {|req, res| sleep 2 } ) do
+        HttpspecSimple::Request.new('http://localhost:10080/')
+      end
+      response.status.should == "timeout"
+    end
+
+    it "should retry requests while response is not ok" do
+      HttpspecSimple::Request.configure do |config|
+        config.retry = 3
+      end
+      response_codes = %w{503 404 200}
+      requests, response = server_start( '/' => Proc.new {|req, res| res.status = response_codes.shift } ) do
+        HttpspecSimple::Request.new('http://localhost:10080/')
+      end
+      requests.should have(3).items
+      response.status.should == "200"
+    end
+
+    it "should send headers" do
+      HttpspecSimple::Request.configure do |config|
+        config.headers = {"user-agent" => "my-agent"}
+      end
+      user_agent_in_req_header = nil
+      server_start( '/' => Proc.new {|req, res|
+        user_agent_in_req_header = req["user-agent"]
+        res.status = "200"
+      } ) do
+        HttpspecSimple::Request.new('http://localhost:10080/')
+      end
+      user_agent_in_req_header.should == "my-agent"
+    end
+  end
+
+  describe "initialize with :headers option" do
+    it "should send headers" do
+      user_agent_in_req_header = nil
+      server_start( '/' => Proc.new {|req, res|
+        user_agent_in_req_header = req["user-agent"]
+        res.status = "200"
+      } ) do
+        HttpspecSimple::Request.new('http://localhost:10080/', :headers => {"user-agent" => "my-agent"})
+      end
+      user_agent_in_req_header.should == "my-agent"
+    end
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: httpspec_simple
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - Koji NAKAMURA