growthforecast-client 0.62.4 → 0.80.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5672c5c83ce2b178ace118ac1e6f291346681f41
-  data.tar.gz: 70a5147e382bb3cef90197db057be8ce9d9ede99
+  metadata.gz: a8658e5aaffe4bcef2988147166e8bdce538900b
+  data.tar.gz: fc1807ea534cbf097507bcbbd30fc4f04e8090ee
 SHA512:
-  metadata.gz: 1f4245db2673db3389d1b99d8ce23dba339fc8979ca56ec6a5493cb2d5bd27f1c041d2e93370b2c78f1674d9973caf9e74177e5e686448674daa844aa3f615dc
-  data.tar.gz: c51644b5a8782c676719e0920c96e858630a116324701b23d5852472c2a9ac4f9d456b0aabdca0f82ba03889abe46e789bec00a35ece9411bff1fc4b1b3f5d86
+  metadata.gz: 2878c8404112b4c25fc7b2994293ee4c1a699098d85c917ee463b67461a8352c754ecb32f4795a50402798eb8da0f50a9ec0894e81e129e5c5acf300f417cf19
+  data.tar.gz: db196f7c978c7854a239bacfe5785297a4011797bec0aa5ba48898e85128ff8217cc162f2f389ef601fdf1b526d8736795847aa912ee6e6d8bb66cb9bd23335b

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+# 0.80.0 (2014/02/03)
+
+Changes:
+
+  - Use `net/http` instead of `httpclient` because we met difficulties in multi-thread environments
+
 # 0.62.4 (2014/02/01)
 
 Features:

data/README.md

@@ -46,4 +46,4 @@ $ growthforecast-client help
 
 ## Copyright
 
-Copyright (c) 2013 Naotoshi SEO. See [LICENSE](LICENSE) for details.
+Copyright (c) 2013 Naotoshi Seo. See [LICENSE](LICENSE) for details.

data/VERSION

@@ -1 +1 @@
-0.62.4
+0.80.0

data/growthforecast-client.gemspec

@@ -9,6 +9,7 @@ Gem::Specification.new do |gem|
   gem.homepage      = "https://github.com/sonots/growthforecast-client"
   gem.summary       = "A Ruby Client Library for GrowthForecast API"
   gem.description   = gem.summary
+  gem.licenses      = ["MIT"]
 
   gem.files         = `git ls-files`.split($\)
   gem.executables   = gem.files.grep(%r{^bin/}).map{ |f| File.basename(f) }
@@ -25,5 +26,5 @@ Gem::Specification.new do |gem|
 
   # for debug
   gem.add_development_dependency "pry"
-  gem.add_development_dependency "tapp"
+  gem.add_development_dependency "pry-nav"
 end

data/lib/growthforecast/client.rb

@@ -1,8 +1,8 @@
 # -*- encoding: utf-8 -*-
-require 'httpclient'
+require 'net/http'
+require 'uri'
 require 'json'
 require 'cgi'
-require 'pp'
 
 module GrowthForecast
   class Error < StandardError; end
@@ -10,124 +10,45 @@ module GrowthForecast
   class AlreadyExists < Error; end
 
   class Client
-    attr_accessor :debug
     attr_accessor :client
     attr_reader   :base_uri
-    attr_accessor :keepalive
+    attr_reader   :debug_dev
+    attr_reader   :open_timeout
+    attr_reader   :read_timeout
+    attr_reader   :keepalive
 
     # @param [String] base_uri The base uri of GrowthForecast
     def initialize(base_uri = 'http://127.0.0.1:5125', opts = {})
-      @client = HTTPClient.new
       @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)
-      @keepalive = opts.delete('keepalive') # bool
-      self.debug_dev  = opts.delete('debug_dev') # IO object such as STDOUT
-      # cf. https://github.com/nahi/httpclient/blob/0a16401e7892fbbd195a0254344bd48ac8a8bb26/lib/httpclient/session.rb#L133-L139
-      # self.connect_timeout = 60
-      # self.connect_retry = 1
-      # self.send_timeout = 120
-      # self.receive_timeout = 60        # For each read_block_size bytes
-      # self.keep_alive_timeout = 15     # '15' is from Apache 2 default
-      # self.read_block_size = 1024 * 16 # follows net/http change in 1.8.7
-      # self.protocol_retry_count = 5
+      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 stringify_keys(hash)
-      {}.tap {|h| hash.each {|key, val| h[key.to_s] = val } }
+    def debug_dev=(debug_dev)
+      @debug_dev = debug_dev
+      @client.set_debug_output(debug_dev)
     end
 
-    class << self
-      def attr_proxy_reader(symbol)
-        attr_proxy(symbol)
-      end
-
-      def attr_proxy_accessor(symbol)
-        attr_proxy(symbol, true)
-      end
-
-      def attr_proxy(symbol, assignable = false)
-        name = symbol.to_s
-        define_method(name) {
-          @client.__send__(name)
-        }
-        if assignable
-          aname = name + '='
-          define_method(aname) { |rhs|
-            @client.__send__(aname, rhs)
-          }
-        end
-      end
+    def open_timeout=(open_timeout)
+      @open_time = @client.open_timeout = open_timeout
     end
 
-    # cf. https://github.com/nahi/httpclient/blob/0a16401e7892fbbd195a0254344bd48ac8a8bb26/lib/httpclient.rb#L309-L355
-    # cf. https://github.com/nahi/httpclient/blob/0a16401e7892fbbd195a0254344bd48ac8a8bb26/lib/httpclient/session.rb#L89-L158
-    # proxy::SSLConfig:: SSL configurator.
-    attr_proxy_reader :ssl_config
-    # WebAgent::CookieManager:: Cookies configurator.
-    attr_proxy_accessor :cookie_manager
-    # An array of response HTTP message body String which is used for loop-back
-    # test.  See test/* to see how to use it.  If you want to do loop-back test
-    # of HTTP header, use test_loopback_http_response instead.
-    attr_proxy_reader :test_loopback_response
-    # An array of request filter which can trap HTTP request/response.
-    # See proxy::WWWAuth to see how to use it.
-    attr_proxy_reader :request_filter
-    # proxy::ProxyAuth:: Proxy authentication handler.
-    attr_proxy_reader :proxy_auth
-    # proxy::WWWAuth:: WWW authentication handler.
-    attr_proxy_reader :www_auth
-    # How many times get_content and post_content follows HTTP redirect.
-    # 10 by default.
-    attr_proxy_accessor :follow_redirect_count
-
-    # Set HTTP version as a String:: 'HTTP/1.0' or 'HTTP/1.1'
-    attr_proxy(:protocol_version, true)
-    # Connect timeout in sec.
-    attr_proxy(:connect_timeout, true)
-    # Request sending timeout in sec.
-    attr_proxy(:send_timeout, true)
-    # Response receiving timeout in sec.
-    attr_proxy(:receive_timeout, true)
-    # Reuse the same connection within this timeout in sec. from last used.
-    attr_proxy(:keep_alive_timeout, true)
-    # Size of reading block for non-chunked response.
-    attr_proxy(:read_block_size, true)
-    # Negotiation retry count for authentication.  5 by default.
-    attr_proxy(:protocol_retry_count, true)
-    # if your ruby is older than 2005-09-06, do not set socket_sync = false to
-    # avoid an SSL socket blocking bug in openssl/buffering.rb.
-    attr_proxy(:socket_sync, true)
-    # User-Agent header in HTTP request.
-    attr_proxy(:agent_name, true)
-    # From header in HTTP request.
-    attr_proxy(:from, true)
-    # An array of response HTTP String (not a HTTP message body) which is used
-    # for loopback test.  See test/* to see how to use it.
-    attr_proxy(:test_loopback_http_response)
-    # Decompress a compressed (with gzip or deflate) content body transparently. false by default.
-    attr_proxy(:transparent_gzip_decompression, true)
-    # Local socket address. Set HTTPClient#socket_local.host and HTTPClient#socket_local.port to specify local binding hostname and port of TCP socket.
-    attr_proxy(:socket_local, true)
-
-    # cf. https://github.com/nahi/httpclient/blob/0a16401e7892fbbd195a0254344bd48ac8a8bb26/lib/httpclient.rb#L416-L569
-    attr_proxy_accessor :debug_dev
-    attr_proxy_accessor :proxy
-    attr_proxy_accessor :no_proxy
-    def set_auth(domain, user, passwd)
-      @client.set_auth(domain, user, passwd)
-    end
-    def set_basic_auth(domain, user, passwd)
-      @client.set_basic_auth(domain, user, passwd)
+    def read_timeout=(read_timeout)
+      @read_timeout = @client.read_timeout = read_timeout
     end
-    def set_proxy_auth(user, passwd)
-      @client.set_proxy_auth(user, passwd)
-    end
-    def set_cookie_store(filename)
-      @client.set_cookie_store(filename)
+
+    def keepalive=(keepalive)
+      @keepalive = keepalive
     end
-    attr_proxy_reader :save_cookie_store
-    attr_proxy_reader :cookies
-    attr_proxy_accessor :redirect_uri_callback
 
     def last_request_uri
       @request_uri
@@ -142,9 +63,8 @@ module GrowthForecast
     # @return [Hash] response body
     def get_json(path)
       @request_uri = "#{@base_uri}#{path}" 
-      query = nil
       extheader = @keepalive ? { 'Connection' => 'Keep-Alive' } : {}
-      @res = client.get(@request_uri, query, extheader)
+      @res = client.get(path, extheader)
       handle_error(@res)
       JSON.parse(@res.body)
     end
@@ -154,11 +74,11 @@ module GrowthForecast
     # @param [Hash] data 
     # @return [Hash] response body
     def post_json(path, data = {})
-      pp data if @debug
       @request_uri = "#{@base_uri}#{path}" 
       json = JSON.generate(data)
       extheader = @keepalive ? { 'Connection' => 'Keep-Alive' } : {}
-      @res = client.post(@request_uri, json, extheader)
+      extheader = extheader.merge({ 'Content-Type' => 'application/json' })
+      @res = client.post(path, json, extheader)
       handle_error(@res)
       JSON.parse(@res.body)
     end
@@ -168,10 +88,11 @@ module GrowthForecast
     # @param [Hash] data 
     # @return [String] response body
     def post_query(path, data = {})
-      pp data if @debug
       @request_uri = "#{@base_uri}#{path}" 
+      form = URI.encode_www_form(data)
       extheader = @keepalive ? { 'Connection' => 'Keep-Alive' } : {}
-      @res = client.post(@request_uri, data, extheader)
+      extheader = extheader.merge({ 'Content-Type' => 'application/x-www-form-urlencoded' })
+      @res = client.post(path, form, extheader)
       handle_error(@res)
       JSON.parse(@res.body)
     end
@@ -488,11 +409,11 @@ module GrowthForecast
     end
 
     def handle_error(res)
-      case res.status
-      when 200
-      when 404
+      case res.code
+      when '200'
+      when '404'
         raise NotFound.new(error_message(res))
-      when 409
+      when '409'
         raise AlreadyExists.new(error_message(res))
       else
         raise Error.new(error_message(res))
@@ -517,6 +438,10 @@ module GrowthForecast
       updates['meta'] = '' if !params.has_key?('meta')
       updates
     end
+
+    def stringify_keys(hash)
+      {}.tap {|h| hash.each {|key, val| h[key.to_s] = val } }
+    end
   end
 end
 

data/spec/growthforecast/client_spec.rb

@@ -162,7 +162,7 @@ describe GrowthForecast::Client do
       include_context "stub_list_graph" if ENV['MOCK'] == 'on'
       before { @client.list_graph }
       subject { @client.last_response }
-      it { should be_kind_of HTTP::Message }
+      it { should be_kind_of Net::HTTPResponse }
     end
 
     context "#last_request_uri" do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: growthforecast-client
 version: !ruby/object:Gem::Version
-  version: 0.62.4
+  version: 0.80.0
 platform: ruby
 authors:
 - Naotoshi Seo
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-31 00:00:00.000000000 Z
+date: 2014-02-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httpclient
@@ -95,7 +95,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: tapp
+  name: pry-nav
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
@@ -139,7 +139,8 @@ files:
 - spec/support/mock.rb
 - spec/support/setup.rb
 homepage: https://github.com/sonots/growthforecast-client
-licenses: []
+licenses:
+- MIT
 metadata: {}
 post_install_message: 
 rdoc_options: []