kronk 1.2.0 → 1.2.1

data/History.rdoc

@@ -1,3 +1,10 @@
+=== 1.2.1 / 2011-01-21
+
+* Enhancements:
+
+  * Added support for setting the encoding from the Content-Type charset
+    in ruby 1.9.x
+
 === 1.2.0 / 2011-01-20
 
 * Enhancements:

data/lib/kronk.rb

@@ -11,7 +11,7 @@ require 'yaml'
 class Kronk
 
   # This gem's version.
-  VERSION = '1.2.0'
+  VERSION = '1.2.1'
 
 
   ##

data/lib/kronk/request.rb

@@ -101,8 +101,7 @@ class Kronk
 
         rescue Net::HTTPBadResponse
           file.rewind
-          resp = HeadlessResponse.new file.read
-          resp['Content-Type'] = File.extname path
+          resp = HeadlessResponse.new file.read, File.extname(path)
         end
       end
 
@@ -235,9 +234,7 @@ class Kronk
         use_cookies? options
 
       resp.extend Response::Helpers
-
-      r_req, r_resp, r_bytes = Response.read_raw_from socket_io
-      resp.raw = r_resp
+      resp.set_helper_attribs socket_io
 
       resp
     end

data/lib/kronk/response.rb

@@ -21,65 +21,93 @@ class Kronk
       end
 
       resp.extend Helpers
-
-      r_req, r_resp, r_bytes = read_raw_from socket_io
-      resp.raw = r_resp
-      resp.instance_variable_set "@read", true
-      resp.instance_variable_set "@socket", true
-
-      resp.instance_variable_set "@body", resp.raw.split("\r\n\r\n",2)[1] if
-        !resp.body
+      resp.set_helper_attribs socket_io, true, true
 
       resp
     end
 
 
+
     ##
-    # Read the raw response from a debug_output instance and return an array
-    # containing the raw request, response, and number of bytes received.
+    # Helper methods for Net::HTTPResponse objects.
 
-    def self.read_raw_from debug_io
-      req = nil
-      resp = ""
-      bytes = nil
+    module Helpers
 
-      debug_io.rewind
-      output = debug_io.read.split "\n"
+      ##
+      # Read the raw response from a debug_output instance and return an array
+      # containing the raw request, response, and number of bytes received.
 
-      if output.first =~ %r{<-\s(.*)}
-        req = instance_eval $1
-        output.delete_at 0
-      end
+      def read_raw_from debug_io
+        req = nil
+        resp = ""
+        bytes = nil
 
-      if output.last =~ %r{read (\d+) bytes}
-        bytes = $1.to_i
-        output.delete_at(-1)
-      end
+        debug_io.rewind
+        output = debug_io.read.split "\n"
 
-      output.map do |line|
-        next unless line[0..2] == "-> "
-        resp << instance_eval(line[2..-1])
+        if output.first =~ %r{<-\s(.*)}
+          req = instance_eval $1
+          output.delete_at 0
+        end
+
+        if output.last =~ %r{read (\d+) bytes}
+          bytes = $1.to_i
+          output.delete_at(-1)
+        end
+
+        output.map do |line|
+          next unless line[0..2] == "-> "
+          resp << instance_eval(line[2..-1])
+        end
+
+        [req, resp, bytes]
       end
 
-      [req, resp, bytes]
-    end
 
+      ##
+      # Instantiates helper attributes from the debug socket io.
 
-    ##
-    # Helper methods for Net::HTTPResponse objects.
+      def set_helper_attribs socket_io, socket=nil, body_read=nil
+        @raw      = udpate_encoding read_raw_from(socket_io)[1]
+
+        @read     = body_read unless body_read.nil?
+        @socket ||= socket
+        @body   ||= @raw.split("\r\n\r\n",2)[1]
+
+        udpate_encoding @body
+
+        puts "#{@raw.length} - #{@body.length}" if
+          @raw.length == 0 && @body.length != 0
+        self
+      end
 
-    module Helpers
 
       ##
-      # Assigns the raw http response value. Sets the encoding to binary
-      # if the encoding is invalid in Ruby 1.9.x
+      # Returns the encoding provided in the Content-Type header or
+      # "binary" if charset is unavailable.
+      # Returns "utf-8" if no content type header is missing.
+
+      def encoding
+        content_types = self.to_hash["content-type"]
+
+        return "utf-8" if !content_types
 
-      def raw= value
-        if value.respond_to?(:valid_encoding?) && !value.valid_encoding?
-          value.force_encoding "binary"
+        content_types.each do |c_type|
+          return $2 if c_type =~ /(^|;\s?)charset=(.*?)\s*(;|$)/
         end
 
-        @raw = value
+        "binary"
+      end
+
+
+      ##
+      # Assigns self.encoding to the passed string if
+      # it responds to 'force_encoding'.
+      # Returns the string given with the new encoding.
+
+      def udpate_encoding str
+        str.force_encoding self.encoding if str.respond_to? :force_encoding
+        str
       end
 
 
@@ -213,10 +241,15 @@ class Kronk
 
     attr_accessor :body, :code
 
-    def initialize body
+    def initialize body, file_ext=nil
       @body = body
       @raw  = body
-      @header = {}
+
+      encoding = body.encoding rescue "UTF-8"
+
+      @header = {
+        'Content-Type' => ["#{file_ext}; charset=#{encoding}"]
+      }
     end
 
 

data/test/test_helper.rb

@@ -3,6 +3,11 @@ require "kronk"
 require "mocha"
 
 
+def mock_resp name
+  File.read File.join("test/mocks", name)
+end
+
+
 def mock_200_response
   @mock_200 ||= File.read 'test/mocks/200_response.txt'
 end

data/test/test_request.rb

@@ -324,7 +324,7 @@ class TestRequest < Test::Unit::TestCase
 
 
   def test_call_ssl
-    expect_request "GET", "https://example.com" do |http, req, resp|
+    expr = expect_request "GET", "https://example.com" do |http, req, resp|
       req.expects(:use_ssl=).with true
     end
 
@@ -498,7 +498,8 @@ class TestRequest < Test::Unit::TestCase
   def expect_request req_method, url, options={}
     uri  = URI.parse url
 
-    resp = mock 'resp'
+    resp_io = StringIO.new(mock_200_response)
+    resp = Kronk::Response.read_new resp_io #mock 'resp'
     resp.stubs(:code).returns(options[:status] || '200')
     resp.stubs(:to_hash).returns Hash.new
 
@@ -524,9 +525,10 @@ class TestRequest < Test::Unit::TestCase
     Net::HTTP.expects(:new).with(uri.host, uri.port).returns req
     req.expects(:start).yields(http).returns resp
 
-    Kronk::Response.expects(:read_raw_from).returns ["", mock_200_response, 0]
+    resp.expects(:read_raw_from).returns [nil, mock_200_response, nil]
 
     yield http, req, resp if block_given?
+
     resp
   end
 end

data/test/test_response.rb

@@ -33,7 +33,8 @@ class TestResponse < Test::Unit::TestCase
 
     io = StringIO.new str
 
-    req, resp, bytes = Kronk::Response.read_raw_from io
+    resp = Kronk::Response.read_new StringIO.new(mock_200_response)
+    req, resp, bytes = resp.read_raw_from io
 
     assert_equal "mock debug request", req
     assert_equal mock_200_response, resp

metadata

@@ -1,13 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: kronk
 version: !ruby/object:Gem::Version 
-  hash: 31
   prerelease: false
   segments: 
   - 1
   - 2
-  - 0
-  version: 1.2.0
+  - 1
+  version: 1.2.1
 platform: ruby
 authors: 
 - Jeremie Castagna
@@ -15,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-01-20 00:00:00 -08:00
+date: 2011-01-21 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -26,7 +25,6 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 3
         segments: 
         - 3
         - 1
@@ -42,7 +40,6 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 11
         segments: 
         - 1
         - 2
@@ -57,7 +54,6 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 9
         segments: 
         - 1
         - 3
@@ -72,7 +68,6 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 1
         segments: 
         - 0
         - 5
@@ -87,7 +82,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 15
         segments: 
         - 2
         - 0
@@ -103,7 +97,6 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 19
         segments: 
         - 0
         - 3
@@ -119,7 +112,6 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 15
         segments: 
         - 1
         - 0
@@ -134,7 +126,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 7
         segments: 
         - 2
         - 0
@@ -150,7 +141,6 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 47
         segments: 
         - 0
         - 9
@@ -166,7 +156,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 19
         segments: 
         - 2
         - 6
@@ -229,7 +218,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
+      hash: -195272185281626433
       segments: 
       - 0
       version: "0"
@@ -238,7 +227,6 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
       segments: 
       - 0
       version: "0"