httparty 0.13.0 → 0.14.0

data/spec/spec_helper.rb

@@ -1,17 +1,16 @@
-$:.push File.expand_path("../lib", __FILE__)
+require "simplecov"
+SimpleCov.start
 
 require "httparty"
-
-require 'spec/autorun'
-require 'fakeweb'
+require "fakeweb"
 
 def file_fixture(filename)
-  open(File.join(File.dirname(__FILE__), 'fixtures', "#{filename.to_s}")).read
+  open(File.join(File.dirname(__FILE__), 'fixtures', "#{filename}")).read
 end
 
-Dir[File.expand_path(File.join(File.dirname(__FILE__),'support','**','*.rb'))].each {|f| require f}
+Dir[File.expand_path(File.join(File.dirname(__FILE__), 'support', '**', '*.rb'))].each {|f| require f}
 
-Spec::Runner.configure do |config|
+RSpec.configure do |config|
   config.include HTTParty::StubResponse
   config.include HTTParty::SSLTestHelper
 
@@ -22,15 +21,38 @@ Spec::Runner.configure do |config|
   config.after(:suite) do
     FakeWeb.allow_net_connect = true
   end
-end
 
-Spec::Matchers.define :use_ssl do
-  match do |connection|
-    connection.use_ssl?
+  config.expect_with :rspec do |expectations|
+    expectations.include_chain_clauses_in_custom_matcher_descriptions = true
+  end
+
+  config.mock_with :rspec do |mocks|
+    mocks.verify_partial_doubles = false
   end
+
+  config.filter_run :focus
+  config.run_all_when_everything_filtered = true
+
+  config.disable_monkey_patching!
+
+  config.warnings = true
+
+  if config.files_to_run.one?
+    config.default_formatter = 'doc'
+  end
+
+  config.profile_examples = 10
+
+  config.order = :random
+
+  Kernel.srand config.seed
+end
+
+RSpec::Matchers.define :use_ssl do
+  match(&:use_ssl?)
 end
 
-Spec::Matchers.define :use_cert_store do |cert_store|
+RSpec::Matchers.define :use_cert_store do |cert_store|
   match do |connection|
     connection.cert_store == cert_store
   end

data/spec/support/ssl_test_helper.rb

@@ -4,8 +4,8 @@ module HTTParty
   module SSLTestHelper
     def ssl_verify_test(mode, ca_basename, server_cert_filename, options = {})
       options = {
-        :format  => :json,
-        :timeout => 30,
+        format:  :json,
+        timeout: 30
       }.merge(options)
 
       if mode
@@ -16,8 +16,8 @@ module HTTParty
 
       begin
         test_server = SSLTestServer.new(
-            :rsa_key => File.read(File.expand_path("../../fixtures/ssl/generated/server.key", __FILE__)),
-            :cert    => File.read(File.expand_path("../../fixtures/ssl/generated/#{server_cert_filename}", __FILE__)))
+            rsa_key: File.read(File.expand_path("../../fixtures/ssl/generated/server.key", __FILE__)),
+            cert:    File.read(File.expand_path("../../fixtures/ssl/generated/#{server_cert_filename}", __FILE__)))
 
         test_server.start
 
@@ -33,8 +33,8 @@ module HTTParty
       end
 
       test_server = SSLTestServer.new({
-        :rsa_key => path.join('server.key').read,
-        :cert    => path.join(server_cert_filename).read,
+        rsa_key: path.join('server.key').read,
+        cert:    path.join(server_cert_filename).read
       })
 
       test_server.start

data/spec/support/ssl_test_server.rb

@@ -9,7 +9,7 @@ class SSLTestServer
   attr_accessor :ctx    # SSLContext object
   attr_reader :port
 
-  def initialize(options={})
+  def initialize(options = {})
     @ctx             = OpenSSL::SSL::SSLContext.new
     @ctx.cert        = OpenSSL::X509::Certificate.new(options[:cert])
     @ctx.key         = OpenSSL::PKey::RSA.new(options[:rsa_key])
@@ -24,21 +24,21 @@ class SSLTestServer
     @raw_server = TCPServer.new(@port)
 
     if @port == 0
-      @port = Socket::getnameinfo(@raw_server.getsockname, Socket::NI_NUMERICHOST|Socket::NI_NUMERICSERV)[1].to_i
+      @port = Socket.getnameinfo(@raw_server.getsockname, Socket::NI_NUMERICHOST | Socket::NI_NUMERICSERV)[1].to_i
     end
 
     @ssl_server = OpenSSL::SSL::SSLServer.new(@raw_server, @ctx)
 
-    @stopping_mutex.synchronize{
+    @stopping_mutex.synchronize {
       return if @stopping
-      @thread = Thread.new{ thread_main }
+      @thread = Thread.new { thread_main }
     }
 
     nil
   end
 
   def stop
-    @stopping_mutex.synchronize{
+    @stopping_mutex.synchronize {
       return if @stopping
       @stopping = true
     }
@@ -47,22 +47,22 @@ class SSLTestServer
 
   private
 
-    def thread_main
-      until @stopping_mutex.synchronize{ @stopping }
-        (rr,_,_) = select([@ssl_server.to_io], nil, nil, 0.1)
+  def thread_main
+    until @stopping_mutex.synchronize { @stopping }
+      (rr, _, _) = select([@ssl_server.to_io], nil, nil, 0.1)
 
-        next unless rr && rr.include?(@ssl_server.to_io)
+      next unless rr && rr.include?(@ssl_server.to_io)
 
-        socket = @ssl_server.accept
+      socket = @ssl_server.accept
 
-        Thread.new{
-          header = []
+      Thread.new {
+        header = []
 
-          until (line = socket.readline).rstrip.empty?
-            header << line
-          end
+        until (line = socket.readline).rstrip.empty?
+          header << line
+        end
 
-          response =<<EOF
+        response = <<EOF
 HTTP/1.1 200 OK
 Connection: close
 Content-Type: application/json; charset=UTF-8
@@ -70,11 +70,11 @@ Content-Type: application/json; charset=UTF-8
 {"success":true}
 EOF
 
-          socket.write(response.gsub(/\r\n/n, "\n").gsub(/\n/n, "\r\n"))
-          socket.close
+        socket.write(response.gsub(/\r\n/n, "\n").gsub(/\n/n, "\r\n"))
+        socket.close
       }
-      end
-
-      @ssl_server.close
     end
+
+    @ssl_server.close
+  end
 end

data/spec/support/stub_response.rb

@@ -5,38 +5,44 @@ module HTTParty
       data = file_fixture(filename)
 
       response = Net::HTTPOK.new("1.1", 200, "Content for you")
-      response.stub!(:body).and_return(data)
+      allow(response).to receive(:body).and_return(data)
 
-      http_request = HTTParty::Request.new(Net::HTTP::Get, 'http://localhost', :format => format)
-      http_request.stub_chain(:http, :request).and_return(response)
+      http_request = HTTParty::Request.new(Net::HTTP::Get, 'http://localhost', format: format)
+      allow(http_request).to receive_message_chain(:http, :request).and_return(response)
 
-      HTTParty::Request.should_receive(:new).and_return(http_request)
+      expect(HTTParty::Request).to receive(:new).and_return(http_request)
     end
 
-    def stub_chunked_http_response_with(chunks)
+    def stub_chunked_http_response_with(chunks, options = {format: "html"})
       response = Net::HTTPResponse.new("1.1", 200, nil)
-      response.stub(:chunked_data).and_return(chunks)
+      allow(response).to receive(:chunked_data).and_return(chunks)
       def response.read_body(&block)
         @body || chunked_data.each(&block)
       end
 
-      http_request = HTTParty::Request.new(Net::HTTP::Get, 'http://localhost', :format => "html")
-      http_request.stub_chain(:http, :request).and_yield(response).and_return(response)
+      http_request = HTTParty::Request.new(Net::HTTP::Get, 'http://localhost', options)
+      allow(http_request).to receive_message_chain(:http, :request).and_yield(response).and_return(response)
 
-      HTTParty::Request.should_receive(:new).and_return(http_request)
+      expect(HTTParty::Request).to receive(:new).and_return(http_request)
     end
 
-    def stub_response(body, code = 200)
+    def stub_response(body, code = '200')
+      code = code.to_s
       @request.options[:base_uri] ||= 'http://localhost'
       unless defined?(@http) && @http
         @http = Net::HTTP.new('localhost', 80)
-        @request.stub!(:http).and_return(@http)
+        allow(@request).to receive(:http).and_return(@http)
       end
 
-      response = Net::HTTPResponse::CODE_TO_OBJ[code.to_s].new("1.1", code, body)
-      response.stub!(:body).and_return(body)
+      # CODE_TO_OBJ currently missing 308
+      if code == '308'
+        response = Net::HTTPRedirection.new("1.1", code, body)
+      else
+        response = Net::HTTPResponse::CODE_TO_OBJ[code].new("1.1", code, body)
+      end
+      allow(response).to receive(:body).and_return(body)
 
-      @http.stub!(:request).and_return(response)
+      allow(@http).to receive(:request).and_return(response)
       response
     end
   end

data/website/index.html

@@ -33,7 +33,7 @@
   basic_auth 'username', 'password'
 end
 
-Twitter.post('/statuses/update.json', :query => {:status => "It's an HTTParty and everyone is invited!"})</code></pre>
+Twitter.post('/statuses/update.json', query: {status: "It's an HTTParty and everyone is invited!"})</code></pre>
 
     <p>That is really it! The object returned is a ruby hash that is decoded from Twitter's json response. JSON parsing is used because of the .json extension in the path of the request. You can also explicitly set a format (see the examples). </p>
 
@@ -44,11 +44,11 @@ Twitter.post('/statuses/update.json', :query => {:status => "It's an HTTParty an
   base_uri 'twitter.com'
 
   def initialize(u, p)
-    @auth = {:username => u, :password => p}
+    @auth = {username: u, password: p}
   end
 
   def post(text)
-    options = { :query => {:status => text}, :basic_auth => @auth }
+    options = { query: {status: text}, basic_auth: @auth }
     self.class.post('/statuses/update.json', options)
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: httparty
 version: !ruby/object:Gem::Version
-  version: 0.13.0
+  version: 0.14.0
 platform: ruby
 authors:
 - John Nunemaker
@@ -9,34 +9,20 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-14 00:00:00.000000000 Z
+date: 2016-07-25 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: json
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '1.8'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '1.8'
 - !ruby/object:Gem::Dependency
   name: multi_xml
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.5.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.5.2
 description: Makes http fun! Also, makes consuming restful web services dead easy.
@@ -47,8 +33,12 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .travis.yml
+- ".gitignore"
+- ".rubocop.yml"
+- ".rubocop_todo.yml"
+- ".simplecov"
+- ".travis.yml"
+- CONTRIBUTING.md
 - Gemfile
 - Guardfile
 - History
@@ -57,6 +47,8 @@ files:
 - Rakefile
 - bin/httparty
 - cucumber.yml
+- docs/README.md
+- examples/README.md
 - examples/aaws.rb
 - examples/basic.rb
 - examples/crack.rb
@@ -64,8 +56,11 @@ files:
 - examples/delicious.rb
 - examples/google.rb
 - examples/headers_and_user_agents.rb
+- examples/logging.rb
 - examples/nokogiri_html_parser.rb
+- examples/rescue_json.rb
 - examples/rubyurl.rb
+- examples/stackexchange.rb
 - examples/tripit_sign_in.rb
 - examples/twitter.rb
 - examples/whoismyrep.rb
@@ -80,17 +75,17 @@ files:
 - features/steps/httparty_steps.rb
 - features/steps/mongrel_helper.rb
 - features/steps/remote_service_steps.rb
+- features/supports_read_timeout_option.feature
 - features/supports_redirection.feature
 - features/supports_timeout_option.feature
 - httparty.gemspec
 - lib/httparty.rb
 - lib/httparty/connection_adapter.rb
 - lib/httparty/cookie_hash.rb
-- lib/httparty/core_extensions.rb
 - lib/httparty/exceptions.rb
 - lib/httparty/hash_conversions.rb
-- lib/httparty/logger/apache_logger.rb
-- lib/httparty/logger/curl_logger.rb
+- lib/httparty/logger/apache_formatter.rb
+- lib/httparty/logger/curl_formatter.rb
 - lib/httparty/logger/logger.rb
 - lib/httparty/module_inheritable_attributes.rb
 - lib/httparty/net_digest_auth.rb
@@ -119,8 +114,9 @@ files:
 - spec/httparty/connection_adapter_spec.rb
 - spec/httparty/cookie_hash_spec.rb
 - spec/httparty/exception_spec.rb
-- spec/httparty/logger/apache_logger_spec.rb
-- spec/httparty/logger/curl_logger_spec.rb
+- spec/httparty/hash_conversions_spec.rb
+- spec/httparty/logger/apache_formatter_spec.rb
+- spec/httparty/logger/curl_formatter_spec.rb
 - spec/httparty/logger/logger_spec.rb
 - spec/httparty/net_digest_auth_spec.rb
 - spec/httparty/parser_spec.rb
@@ -128,7 +124,6 @@ files:
 - spec/httparty/response_spec.rb
 - spec/httparty/ssl_spec.rb
 - spec/httparty_spec.rb
-- spec/spec.opts
 - spec/spec_helper.rb
 - spec/support/ssl_test_helper.rb
 - spec/support/ssl_test_server.rb
@@ -136,7 +131,8 @@ files:
 - website/css/common.css
 - website/index.html
 homepage: http://jnunemaker.github.com/httparty
-licenses: []
+licenses:
+- MIT
 metadata: {}
 post_install_message: When you HTTParty, you must party hard!
 rdoc_options: []
@@ -144,17 +140,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: 1.9.3
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 2.4.5.1
 signing_key: 
 specification_version: 4
 summary: Makes http fun! Also, makes consuming restful web services dead easy.
@@ -170,6 +166,7 @@ test_files:
 - features/steps/httparty_steps.rb
 - features/steps/mongrel_helper.rb
 - features/steps/remote_service_steps.rb
+- features/supports_read_timeout_option.feature
 - features/supports_redirection.feature
 - features/supports_timeout_option.feature
 - spec/fixtures/delicious.xml
@@ -191,8 +188,9 @@ test_files:
 - spec/httparty/connection_adapter_spec.rb
 - spec/httparty/cookie_hash_spec.rb
 - spec/httparty/exception_spec.rb
-- spec/httparty/logger/apache_logger_spec.rb
-- spec/httparty/logger/curl_logger_spec.rb
+- spec/httparty/hash_conversions_spec.rb
+- spec/httparty/logger/apache_formatter_spec.rb
+- spec/httparty/logger/curl_formatter_spec.rb
 - spec/httparty/logger/logger_spec.rb
 - spec/httparty/net_digest_auth_spec.rb
 - spec/httparty/parser_spec.rb
@@ -200,7 +198,6 @@ test_files:
 - spec/httparty/response_spec.rb
 - spec/httparty/ssl_spec.rb
 - spec/httparty_spec.rb
-- spec/spec.opts
 - spec/spec_helper.rb
 - spec/support/ssl_test_helper.rb
 - spec/support/ssl_test_server.rb

data/lib/httparty/core_extensions.rb

@@ -1,32 +0,0 @@
-module HTTParty
-  if defined?(::BasicObject)
-    BasicObject = ::BasicObject #:nodoc:
-  else
-    class BasicObject #:nodoc:
-      instance_methods.each { |m| undef_method m unless m =~ /^__|instance_eval/ }
-    end
-  end
-
-  unless defined?(Net::HTTP::Patch)
-    class Net::HTTP
-      def patch(path, data, initheader = nil, dest = nil, &block) #:nodoc:
-        res = nil
-        request(Patch.new(path, initheader), data) {|r|
-          r.read_body dest, &block
-          res = r
-        }
-        unless @newimpl
-          res.value
-          return res, res.body
-        end
-        res
-      end
-
-      class Patch < Net::HTTPRequest
-        METHOD = 'PATCH'
-        REQUEST_HAS_BODY = true
-        RESPONSE_HAS_BODY = true
-      end
-    end
-  end
-end

data/lib/httparty/logger/curl_logger.rb

@@ -1,48 +0,0 @@
-module HTTParty
-  module Logger
-    class CurlLogger #:nodoc:
-      TAG_NAME = HTTParty.name
-      OUT = ">"
-      IN = "<"
-
-      attr_accessor :level, :logger, :current_time
-
-      def initialize(logger, level)
-        @logger = logger
-        @level  = level.to_sym
-      end
-
-      def format(request, response)
-        messages        = []
-        time            = Time.now.strftime("%Y-%m-%d %H:%M:%S %z")
-        http_method     = request.http_method.name.split("::").last.upcase
-        path            = request.path.to_s
-
-        messages << print(time, OUT, "#{http_method} #{path}")
-
-        if request.options[:headers] && request.options[:headers].size > 0
-          request.options[:headers].each do |k, v|
-            messages << print(time, OUT, "#{k}: #{v}")
-          end
-        end
-
-        messages << print(time, OUT, request.raw_body)
-        messages << print(time, OUT, "")
-        messages << print(time, IN, "HTTP/#{response.http_version} #{response.code}")
-
-        headers = response.respond_to?(:headers) ? response.headers : response
-        response.each_header do |response_header|
-          messages << print(time, IN, "#{response_header.capitalize}: #{headers[response_header]}")
-        end
-
-        messages << print(time, IN, "\n#{response.body}")
-
-        @logger.send @level, messages.join("\n")
-      end
-
-      def print(time, direction, line)
-        "[#{TAG_NAME}] [#{time}] #{direction} #{line}"
-      end
-    end
-  end
-end

data/spec/httparty/logger/apache_logger_spec.rb

@@ -1,26 +0,0 @@
-require File.expand_path(File.join(File.dirname(__FILE__), '..', '..', 'spec_helper'))
-
-describe HTTParty::Logger::ApacheLogger do
-  describe "#format" do
-    it "formats a response in a style that resembles apache's access log" do
-      request_time = Time.new.strftime("%Y-%m-%d %H:%M:%S %z")
-      log_message = "[HTTParty] [#{request_time}] 302 \"GET http://my.domain.com/my_path\" - "
-
-      request_double  = double(
-        :http_method => Net::HTTP::Get,
-        :path => "http://my.domain.com/my_path"
-      )
-      response_double = double(
-        :code => 302,
-        :[]   => nil
-      )
-
-      logger_double = double
-      logger_double.should_receive(:info).with(log_message)
-
-      subject = described_class.new(logger_double, :info)
-      subject.current_time = request_time
-      subject.format(request_double, response_double)
-    end
-  end
-end

data/spec/httparty/logger/curl_logger_spec.rb

@@ -1,18 +0,0 @@
-require File.expand_path(File.join(File.dirname(__FILE__), '..', '..', 'spec_helper'))
-
-describe HTTParty::Logger::CurlLogger do
-  describe "#format" do
-    it "formats a response in a style that resembles a -v curl" do
-      logger_double = double
-      logger_double.should_receive(:info).with(
-          /\[HTTParty\] \[\d{4}-\d\d-\d\d \d\d:\d\d:\d\d\ [+-]\d{4}\] > GET http:\/\/localhost/)
-
-      subject = described_class.new(logger_double, :info)
-
-      stub_http_response_with("google.html")
-
-      response = HTTParty::Request.new.perform
-      subject.format(response.request, response)
-    end
-  end
-end

data/spec/spec.opts

@@ -1,2 +0,0 @@
---colour
---backtrace