patron 0.5.0 → 0.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d00ecf42f426d8d52b56cd005e3c0d1740819f96
-  data.tar.gz: b4635d6adc592ac3576495fa04578f1256b8517f
+  metadata.gz: 018a03fb6977a92e0dbf70f4e8473ef273d7576c
+  data.tar.gz: 611bde5b709c9f24007fa8805b369310baa8ed6d
 SHA512:
-  metadata.gz: 37193992f549400596a21c553023befd7e5c47b360eaf7a8ac1de2347544e2adce5e462b76543cb98ade09af6b8656426176262d25bc46e12d22db128b1ded3a
-  data.tar.gz: 9be5c558dd549b671137e5f62e29a9f3af2a63f35b1e7525d5afe1450a9a689973fd5f221e92de39d9bed7c9319be13bfbfa73b87de8bda4fb31284952d888fd
+  metadata.gz: a2e176e3648ab4293bc69cbaca8e048ba7effb544ebf49de0cd3647b99cd1105e0b52f1afaef32e3c9ab899ff5c41cc01e8fa2d97861de0f3064c405d0af4865
+  data.tar.gz: a1525278695ce34f891f3d06f2bb352e841d97fba8b4f50b71a21b6fe960964cd4f8f9e39ca5dab1d65ac8d30e8fd97dd80b8d3c9ff8cc63d78eb331756c35df

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    patron (0.4.20)
+    patron (0.5.1)
 
 GEM
   remote: https://rubygems.org/
@@ -42,4 +42,4 @@ DEPENDENCIES
   simplecov (>= 0.10.0)
 
 BUNDLED WITH
-   1.10.6
+   1.11.2

data/ext/patron/session_ext.c

@@ -367,6 +367,7 @@ static void set_options_from_request(VALUE self, VALUE request) {
 
     curl_easy_setopt(curl, CURLOPT_HTTPGET, 1);
     if (!NIL_P(data)) {
+      data = rb_funcall(data, rb_intern("to_s"), 0);
       long len = RSTRING_LEN(data);
       state->upload_buf = StringValuePtr(data);
       curl_easy_setopt(curl, CURLOPT_UPLOAD, 1);
@@ -387,8 +388,8 @@ static void set_options_from_request(VALUE self, VALUE request) {
     VALUE multipart = rb_iv_get(request, "@multipart");
 
     if (!NIL_P(data) && NIL_P(multipart)) {
+      data = rb_funcall(data, rb_intern("to_s"), 0);
       long len = RSTRING_LEN(data);
-
       state->upload_buf = StringValuePtr(data);
 
       if (action == rb_intern("post")) {
@@ -537,7 +538,8 @@ static VALUE create_response(VALUE self, CURL* curl, VALUE header_buffer, VALUE
   char* effective_url = NULL;
   long code = 0;
   long count = 0;
-
+  VALUE responseKlass = Qnil;
+  
   curl_easy_getinfo(curl, CURLINFO_EFFECTIVE_URL, &effective_url);
   args[0] = rb_str_new2(effective_url);
 
@@ -550,8 +552,9 @@ static VALUE create_response(VALUE self, CURL* curl, VALUE header_buffer, VALUE
   args[3] = header_buffer;
   args[4] = body_buffer;
   args[5] = rb_iv_get(self, "@default_response_charset");
-
-  return rb_class_new_instance(6, args, rb_const_get(mPatron, rb_intern("Response")));
+  
+  responseKlass = rb_funcall(self, rb_intern("response_class"), 0);
+  return rb_class_new_instance(6, args, responseKlass);
 }
 
 /* Raise an exception based on the Curl error code. */
@@ -647,6 +650,10 @@ static VALUE cleanup(VALUE self) {
     state->upload_file = NULL;
   }
 
+  if (state->post) {
+    curl_formfree(state->post);
+  }
+
   state->upload_buf = NULL;
 
   return Qnil;

data/lib/patron/response.rb

@@ -68,13 +68,20 @@ module Patron
     def determine_charset(header_data, body)
       header_data.match(charset_regex) || (body && body.match(charset_regex))
 
-      $1
+      charset = $1
+      validate_charset(charset) ? charset : nil
     end
 
     def charset_regex
       /(?:charset|encoding)="?([a-z0-9-]+)"?/i
     end
 
+    def validate_charset(charset)
+      charset && Encoding.find(charset) && true
+    rescue ArgumentError
+      false
+    end
+
     def convert_to_default_encoding!(str)
       if str.respond_to?(:encode) && Encoding.default_internal
         str.force_encoding(charset).encode!(Encoding.default_internal)

data/lib/patron/session.rb

@@ -215,7 +215,19 @@ module Patron
       req = build_request(action, url, headers, options)
       handle_request(req)
     end
-
+    
+    # Returns the class that will be used to build a Response
+    # from a Curl call.
+    #
+    # Primarily useful if you need a very lightweight Response
+    # object that does not have to perform all the parsing of
+    # various headers/status codes. The method must return
+    # a module that supports the same interface for +new+
+    # as ++Patron::Response++
+    def response_class
+      ::Patron::Response
+    end
+    
     # Build a request object that can be used in +handle_request+
     def build_request(action, url, headers, options = {})
       # If the Expect header isn't set uploads are really slow

data/lib/patron/version.rb

@@ -1,3 +1,3 @@
 module Patron
-  VERSION = "0.5.0"
+  VERSION = "0.5.1"
 end

data/spec/response_spec.rb

@@ -59,4 +59,30 @@ describe Patron::Response do
   it "should be able to serialize and deserialize itself" do
     expect(Marshal.load(Marshal.dump(@request))).to eql(@request)
   end
+
+  it "should encode body in the internal charset" do
+    allow(Encoding).to receive(:default_internal).and_return("UTF-8")
+
+    greek_encoding = Encoding.find("ISO-8859-7")
+    utf_encoding = Encoding.find("UTF-8")
+
+    headers = "HTTP/1.1 200 OK \r\nContent-Type: text/css\r\n"
+    body = "charset=ISO-8859-7 Ππ".encode(greek_encoding) # Greek alphabet
+
+    response = Patron::Response.new("url", "status", 0, headers, body, nil)
+
+    expect(response.body.encoding).to eql(utf_encoding)
+  end
+
+  it "should fallback to default charset when header or body charset is not valid" do
+    allow(Encoding).to receive(:default_internal).and_return("UTF-8")
+
+    encoding = Encoding.find("UTF-8")
+    headers = "HTTP/1.1 200 OK \r\nContent-Type: text/css\r\n"
+    body = "charset=invalid"
+
+    response = Patron::Response.new("url", "status", 0, headers, body, "UTF-8")
+
+    expect(response.body.encoding).to eql(encoding)
+  end
 end

data/spec/session_spec.rb

@@ -168,7 +168,14 @@ describe Patron::Session do
     expect(body.request_method).to be == "GET"
     expect(body.header['content-length']).to be == [data.size.to_s]
   end
-
+  
+  it "should call to_s on the data being uploaded via GET if it is not already a String" do
+    data = 12345
+    response = @session.request(:get, "/test", {}, :data => data)
+    body = YAML::load(response.body)
+    expect(body.request_method).to be == "GET"
+  end
+  
   it "should upload data with :put" do
     data = "upload data"
     response = @session.put("/test", data)
@@ -204,7 +211,14 @@ describe Patron::Session do
     body = YAML::load(response.body)
     expect(body.header['transfer-encoding'].first).to be == "chunked"
   end
-
+  
+  it "should call to_s on the data being uploaded via POST if it is not already a String" do
+    data = 12345
+    response = @session.post("/testpost", data)
+    body = YAML::load(response.body)
+    expect(body['body']).to eq("12345")
+  end
+  
   it "should upload data with :post" do
     data = "upload data"
     response = @session.post("/test", data)
@@ -333,6 +347,31 @@ describe Patron::Session do
     "Basic " + Base64.encode64("#{user}:#{passwd}").strip
   end
 
+  describe 'when using a subclass with a custom Response' do
+    
+    class CustomResponse
+      attr_reader :constructor_args
+      def initialize(*constructor_args)
+        @constructor_args = constructor_args
+      end
+    end
+    
+    class CustomizedSession < Patron::Session
+      def response_class
+        CustomResponse
+      end
+    end
+    
+    it 'instantiates the customized response object' do
+      @session = CustomizedSession.new
+      @session.base_url = "http://localhost:9001"
+      response = @session.request(:get, "/test", {}, :query => {:foo => "bar"})
+      
+      expect(response).to be_kind_of(CustomResponse)
+      expect(response.constructor_args.length).to eq(6)
+    end
+  end
+  
   describe 'when instantiating with hash arguments' do
 
     let(:args) { {

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: patron
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.5.1
 platform: ruby
 authors:
 - Phillip Toland
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-08 00:00:00.000000000 Z
+date: 2016-03-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -130,7 +130,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.2.0
 requirements: []
 rubyforge_project: patron
-rubygems_version: 2.4.5.1
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Patron HTTP Client