growthforecast-client 0.80.0 → 0.80.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a8658e5aaffe4bcef2988147166e8bdce538900b
-  data.tar.gz: fc1807ea534cbf097507bcbbd30fc4f04e8090ee
+  metadata.gz: 3006246bf805d5ea28559718454817fd471e552d
+  data.tar.gz: 98da2066a4013b894af363388d5a2e52c243c9ce
 SHA512:
-  metadata.gz: 2878c8404112b4c25fc7b2994293ee4c1a699098d85c917ee463b67461a8352c754ecb32f4795a50402798eb8da0f50a9ec0894e81e129e5c5acf300f417cf19
-  data.tar.gz: db196f7c978c7854a239bacfe5785297a4011797bec0aa5ba48898e85128ff8217cc162f2f389ef601fdf1b526d8736795847aa912ee6e6d8bb66cb9bd23335b
+  metadata.gz: 95d365a87b8c6e35917484b9e465ccbb6e1d3727ae40c60c6032268a59b86b86512a3b054ba8fd3ce6b045ed0dd9e94f3eb8c087ea294fdba3e440f8ad6c22c6
+  data.tar.gz: ceacf17cb3e36e6453a060304521722642a69cdcbfd45fd338ec04b79dd0f4acc4d946466de2361a397c48c750b668d741cabc6e3a43250199163b736748a794

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+# 0.80.1 (2014/02/11)
+
+Fixes:
+
+  - Fixed `net/http` errors
+
 # 0.80.0 (2014/02/03)
 
 Changes:

data/VERSION

@@ -1 +1 @@
-0.80.0
+0.80.1

data/lib/growthforecast/cli.rb

@@ -8,6 +8,18 @@ class GrowthForecast::CLI < Thor
     super(args, opts, config)
   end
 
+  desc 'post <json> <api_url>', 'post a paramter to graph api'
+  long_desc <<-LONGDESC
+    Post a parameter to graph api
+
+    ex) growthforecast-client post '{"number":0}' http://{hostname}:{port}/api/{service_name}/{section_name}/{graph_name}
+  LONGDESC
+  def post(json, url)
+    base_uri, service_name, section_name, graph_name = split_url(url)
+    @client = client(base_uri)
+    puts @client.post_graph(service_name, section_name, graph_name, JSON.parse(json))
+  end
+
   desc 'delete <url>', 'delete a graph or graphs under a url'
   long_desc <<-LONGDESC
     Delete a graph or graphs under a <url> where <url> is the one obtained from the GrowthForecast URI, e.g., 
@@ -32,7 +44,7 @@ class GrowthForecast::CLI < Thor
     delete_complexes(complexes, graph_names, section_names)
   end
 
-  desc 'color <url>', 'change the color of graphs'
+  desc 'color <url>', 'change the color of graphs under url'
   long_desc <<-LONGDESC
     Change the color of graphs
 
@@ -49,7 +61,7 @@ class GrowthForecast::CLI < Thor
     setup_colors(colors, graphs)
   end
 
-  desc 'create_complex <url>', 'create complex graphs'
+  desc 'create_complex <url>', 'create complex graphs under url'
   long_desc <<-LONGDESC
     Create complex graphs under a url
 
@@ -134,7 +146,7 @@ class GrowthForecast::CLI < Thor
     end
 
     def split_path(path)
-      path = path.gsub(/.*list\/?/, '').gsub(/.*view_graph\/?/, '')
+      path = path.gsub(/.*list\/?/, '').gsub(/.*view_graph\/?/, '').gsub(/.*api\/?/, '')
       path.split('/').map {|p| CGI.unescape(p.gsub('%20', '+')) }
     end
   end

data/lib/growthforecast/client.rb

@@ -10,44 +10,57 @@ module GrowthForecast
   class AlreadyExists < Error; end
 
   class Client
-    attr_accessor :client
     attr_reader   :base_uri
-    attr_reader   :debug_dev
-    attr_reader   :open_timeout
-    attr_reader   :read_timeout
-    attr_reader   :keepalive
+    attr_reader   :host
+    attr_reader   :port
+    attr_accessor :debug_dev
+    attr_accessor :open_timeout
+    attr_accessor :read_timeout
+    attr_accessor :verify_ssl
+    attr_accessor :keepalive
 
     # @param [String] base_uri The base uri of GrowthForecast
     def initialize(base_uri = 'http://127.0.0.1:5125', opts = {})
       @base_uri = base_uri
-      URI.parse(base_uri).tap {|uri|
-        @client = Net::HTTP.new(uri.host, uri.port)
-        @client.use_ssl = uri.scheme == 'https'
-      }
-
       opts = stringify_keys(opts)
-      self.debug_dev = opts['debug_dev'] # IO object such as STDOUT
-      self.open_timeout = opts['open_timeout'] || 5
-      self.read_timeout = opts['read_timeout'] || 30
-      self.keepalive    = opts['keepalive']
-      # self.verify_mode = OpenSSL::SSL::VERIFY_NONE
-    end
 
-    def debug_dev=(debug_dev)
-      @debug_dev = debug_dev
-      @client.set_debug_output(debug_dev)
+      URI.parse(base_uri).tap {|uri|
+        @host = uri.host
+        @port = uri.port
+        @use_ssl   = uri.scheme == 'https'
+      }
+      @debug_dev    = opts['debug_dev'] # IO object such as STDOUT
+      @open_timeout = opts['open_timeout'] # 60
+      @read_timeout = opts['read_timeout'] # 60
+      @verify_ssl   = opts['verify_ssl']
+      @keepalive    = opts['keepalive']
     end
 
-    def open_timeout=(open_timeout)
-      @open_time = @client.open_timeout = open_timeout
+    def http_connection
+      Net::HTTP.new(@host, @port).tap {|http|
+        http.use_ssl      = @use_ssl
+        http.open_timeout = @open_timeout if @open_timeout
+        http.read_timeout = @read_timeout if @read_timeout
+        http.verify_mode  = OpenSSL::SSL::VERIFY_NONE unless @verify_ssl
+        http.set_debug_output(@debug_dev) if @debug_dev
+      }
     end
 
-    def read_timeout=(read_timeout)
-      @read_timeout = @client.read_timeout = read_timeout
+    def get_request(path, extheader = {})
+      Net::HTTP::Get.new(path).tap {|req|
+        req['Host'] = @host
+        req['Connection'] = 'Keep-Alive' if @keepalive
+        extheader.each {|key, value| req[key] = value }
+      }
     end
 
-    def keepalive=(keepalive)
-      @keepalive = keepalive
+    def post_request(path, body, extheader = {})
+      Net::HTTP::Post.new(path).tap {|req|
+        req['Host'] = @host
+        req['Connection'] = 'Keep-Alive' if @keepalive
+        extheader.each {|key, value| req[key] = value }
+        req.body = body
+      }
     end
 
     def last_request_uri
@@ -63,8 +76,8 @@ module GrowthForecast
     # @return [Hash] response body
     def get_json(path)
       @request_uri = "#{@base_uri}#{path}" 
-      extheader = @keepalive ? { 'Connection' => 'Keep-Alive' } : {}
-      @res = client.get(path, extheader)
+      req  = get_request(path)
+      @res = http_connection.start {|http| http.request(req) }
       handle_error(@res)
       JSON.parse(@res.body)
     end
@@ -75,10 +88,10 @@ module GrowthForecast
     # @return [Hash] response body
     def post_json(path, data = {})
       @request_uri = "#{@base_uri}#{path}" 
-      json = JSON.generate(data)
-      extheader = @keepalive ? { 'Connection' => 'Keep-Alive' } : {}
-      extheader = extheader.merge({ 'Content-Type' => 'application/json' })
-      @res = client.post(path, json, extheader)
+      body = JSON.generate(data)
+      extheader = { 'Content-Type' => 'application/json' }
+      req  = post_request(path, body, extheader)
+      @res = http_connection.start {|http| http.request(req) }
       handle_error(@res)
       JSON.parse(@res.body)
     end
@@ -89,10 +102,10 @@ module GrowthForecast
     # @return [String] response body
     def post_query(path, data = {})
       @request_uri = "#{@base_uri}#{path}" 
-      form = URI.encode_www_form(data)
-      extheader = @keepalive ? { 'Connection' => 'Keep-Alive' } : {}
-      extheader = extheader.merge({ 'Content-Type' => 'application/x-www-form-urlencoded' })
-      @res = client.post(path, form, extheader)
+      body = URI.encode_www_form(data)
+      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)
       JSON.parse(@res.body)
     end

data/spec/growthforecast/client_spec.rb

@@ -153,10 +153,6 @@ describe GrowthForecast::Client do
 
   describe 'http://blog.64p.org/?page=1366971426' do
     before { @client ||= client }
-    context "#client=" do
-      before { @client.client = HTTPClient.new(agent_name: 'TestAgent/0.1') }
-      it { @client.client.agent_name.should == 'TestAgent/0.1' }
-    end
 
     context "#last_response" do
       include_context "stub_list_graph" if ENV['MOCK'] == 'on'

metadata

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