growthforecast-client 0.80.1 → 0.80.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3006246bf805d5ea28559718454817fd471e552d
-  data.tar.gz: 98da2066a4013b894af363388d5a2e52c243c9ce
+  metadata.gz: 389f477ae239f1c04bc4da5d4c666f8cd2c3caba
+  data.tar.gz: dbc01e7a72b731632b05b1b217e00ac1b2c1cf04
 SHA512:
-  metadata.gz: 95d365a87b8c6e35917484b9e465ccbb6e1d3727ae40c60c6032268a59b86b86512a3b054ba8fd3ce6b045ed0dd9e94f3eb8c087ea294fdba3e440f8ad6c22c6
-  data.tar.gz: ceacf17cb3e36e6453a060304521722642a69cdcbfd45fd338ec04b79dd0f4acc4d946466de2361a397c48c750b668d741cabc6e3a43250199163b736748a794
+  metadata.gz: cdfe3688ec02a66270f5e62001feb72d662180944b5e4db6e9599f11e357783ced44c776b565055820a262c0ff409ba9e66a4a995d90abd5a7ac8c8893af0589
+  data.tar.gz: 02bf8f6e2845a8b13fe7656fd125733925e3a8992fbb9ed4a4b967c0530cbb0aa6ed2b4beaf2bae7e1b7b9964f8e70e2ab25218aa4af3d6dc866f82357ad9c0f

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+# 0.80.2 (2014/03/06)
+
+Fixes:
+
+  - Fixed handle_error
+
 # 0.80.1 (2014/02/11)
 
 Fixes:

data/README.md

@@ -36,6 +36,17 @@ See help for more:
 $ growthforecast-client help
 ```
 
+### Tips
+
+#### Debug Print
+
+Following codes prints the http requests and responses to STDOUT
+
+```
+client = GrowthForecast::Client.new('http://localhost:5125')
+client.debug_dev = STDOUT # IO object
+```
+
 ## Contributing
 
 1. Fork it

data/VERSION

@@ -1 +1 @@
-0.80.1
+0.80.2

data/lib/growthforecast/client.rb

@@ -78,7 +78,7 @@ module GrowthForecast
       @request_uri = "#{@base_uri}#{path}" 
       req  = get_request(path)
       @res = http_connection.start {|http| http.request(req) }
-      handle_error(@res)
+      handle_error(@res, @request_uri)
       JSON.parse(@res.body)
     end
 
@@ -92,7 +92,7 @@ module GrowthForecast
       extheader = { 'Content-Type' => 'application/json' }
       req  = post_request(path, body, extheader)
       @res = http_connection.start {|http| http.request(req) }
-      handle_error(@res)
+      handle_error(@res, @request_uri)
       JSON.parse(@res.body)
     end
 
@@ -106,7 +106,7 @@ module GrowthForecast
       extheader = { 'Content-Type' => 'application/x-www-form-urlencoded' }
       req  = post_request(path, body, extheader)
       @res = http_connection.start {|http| http.request(req) }
-      handle_error(@res)
+      handle_error(@res, @request_uri)
       JSON.parse(@res.body)
     end
 
@@ -421,20 +421,20 @@ module GrowthForecast
       CGI.escape(str).gsub('+', '%20') if str
     end
 
-    def handle_error(res)
+    def handle_error(res, request_uri)
       case res.code
       when '200'
       when '404'
-        raise NotFound.new(error_message(res))
+        raise NotFound.new(error_message(res, request_uri))
       when '409'
-        raise AlreadyExists.new(error_message(res))
+        raise AlreadyExists.new(error_message(res, request_uri))
       else
-        raise Error.new(error_message(res))
+        raise Error.new(error_message(res, request_uri))
       end
     end
 
-    def error_message(res)
-      "status:#{res.status}\turi:#{res.http_header.request_uri.to_s}\tmessage:#{res.body}"
+    def error_message(res, request_uri)
+      "status:#{res.code}\turi:#{request_uri}\tmessage:#{res.body}"
     end
 
     # GrowthForecast's /json/edit/graph API requires all parameters to update, thus

data/spec/growthforecast/client_spec.rb

@@ -31,10 +31,18 @@ describe GrowthForecast::Client do
   end
 
   context "#get_graph" do
-    include_context "stub_get_graph" if ENV['MOCK'] == 'on'
-    subject { client.get_graph(graph["service_name"], graph["section_name"], graph["graph_name"]) }
-    id_keys.each {|key| it { subject[key].should == graph[key] } }
-    graph_keys.each {|key| it { subject.should have_key(key) } }
+    context "200 OK" do
+      include_context "stub_get_graph" if ENV['MOCK'] == 'on'
+      subject { client.get_graph(graph["service_name"], graph["section_name"], graph["graph_name"]) }
+      id_keys.each {|key| it { subject[key].should == graph[key] } }
+      graph_keys.each {|key| it { subject.should have_key(key) } }
+    end
+
+    context "404 Not Found" do
+      include_context "stub_get_notfound_graph" if ENV['MOCK'] == 'on'
+      subject { client.get_graph(notfound_graph["service_name"], notfound_graph["section_name"], notfound_graph["graph_name"]) }
+      it { expect { subject }.to raise_error(GrowthForecast::NotFound) }
+    end
   end
 
   context "#get_graph_by_id" do

data/spec/support/mock.rb

@@ -225,3 +225,17 @@ shared_context "stub_create_complex" do
   before(:each, &proc)
 end
 
+shared_context "stub_get_notfound_graph" do
+  def notfound_graph
+    {
+      'service_name' => 'not found',
+      'section_name' => 'not found',
+      'graph_name'   => 'not found',
+    }
+  end
+  proc = Proc.new do
+    stub_request(:get, "#{base_uri}/api/#{e notfound_graph['service_name']}/#{e notfound_graph['section_name']}/#{e notfound_graph['graph_name']}").
+    to_return(:status => 404, :body => '<html><body><strong>404</strong> Not Found</body></html>')
+  end
+  before(:each, &proc)
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: growthforecast-client
 version: !ruby/object:Gem::Version
-  version: 0.80.1
+  version: 0.80.2
 platform: ruby
 authors:
 - Naotoshi Seo
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-10 00:00:00.000000000 Z
+date: 2014-03-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httpclient