httparty 0.13.3 → 0.13.4

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

@@ -5,7 +5,7 @@ module HTTParty
     def ssl_verify_test(mode, ca_basename, server_cert_filename, options = {})
       options = {
         format:  :json,
-        timeout: 30,
+        timeout: 30
       }.merge(options)
 
       if mode
@@ -34,7 +34,7 @@ module HTTParty
 
       test_server = SSLTestServer.new({
         rsa_key: path.join('server.key').read,
-        cert:    path.join(server_cert_filename).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,38 @@ 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)
+      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, options={format: "html"})
+    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', options)
-      http_request.stub_chain(:http, :request).and_yield(response).and_return(response)
+      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)
       @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)
+      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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: httparty
 version: !ruby/object:Gem::Version
-  version: 0.13.3
+  version: 0.13.4
 platform: ruby
 authors:
 - John Nunemaker
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-06 00:00:00.000000000 Z
+date: 2015-05-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
@@ -48,6 +48,9 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
+- ".rubocop.yml"
+- ".rubocop_todo.yml"
+- ".simplecov"
 - ".travis.yml"
 - Gemfile
 - Guardfile
@@ -67,6 +70,7 @@ files:
 - 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
@@ -90,7 +94,6 @@ files:
 - 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
@@ -123,6 +126,7 @@ files:
 - spec/httparty/connection_adapter_spec.rb
 - spec/httparty/cookie_hash_spec.rb
 - spec/httparty/exception_spec.rb
+- spec/httparty/hash_conversions_spec.rb
 - spec/httparty/logger/apache_logger_spec.rb
 - spec/httparty/logger/curl_logger_spec.rb
 - spec/httparty/logger/logger_spec.rb
@@ -158,7 +162,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.2.3
 signing_key: 
 specification_version: 4
 summary: Makes http fun! Also, makes consuming restful web services dead easy.
@@ -196,6 +200,7 @@ test_files:
 - spec/httparty/connection_adapter_spec.rb
 - spec/httparty/cookie_hash_spec.rb
 - spec/httparty/exception_spec.rb
+- spec/httparty/hash_conversions_spec.rb
 - spec/httparty/logger/apache_logger_spec.rb
 - spec/httparty/logger/curl_logger_spec.rb
 - spec/httparty/logger/logger_spec.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