brianmario-yajl-ruby 0.4.1 → 0.4.2

data/CHANGELOG.rdoc

@@ -1,5 +1,10 @@
 = Changelog
 
+0.4.2 (April 30th, 2009)
+ * Yajl::HttpStream is now sending "proper" http request headers
+ * Yajl::HttpStream will request HTTP-Basic auth if credentials are provided in the passed URI
+ * cleanup requires
+
 0.4.1 (April 30th, 2009)
  * fixed a typo in the stream.rb benchmark file
  * fixed a bug in Yajl::Stream.parse that was causing "strange" Ruby malloc errors on large files, with large strings

data/Rakefile

@@ -7,7 +7,7 @@ begin
     gem.email = "seniorlopez@gmail.com"
     gem.homepage = "http://github.com/brianmario/yajl-ruby"
     gem.authors = ["Brian Lopez"]
-    gem.require_paths = ["ext", "lib"]
+    gem.require_paths = ["lib", "ext"]
     gem.extra_rdoc_files = `git ls-files *.rdoc`.split("\n")
     gem.files = `git ls-files`.split("\n")
     gem.extensions = ["ext/extconf.rb"]

data/VERSION.yml

@@ -1,4 +1,4 @@
 --- 
-:patch: 1
+:patch: 2
 :major: 0
 :minor: 4

data/lib/yajl/http_stream.rb

@@ -1,7 +1,7 @@
 # encoding: UTF-8
 require 'socket' unless defined?(Socket)
 require 'zlib' unless defined?(Zlib)
-require 'yajl' unless defined?(Yajl)
+require 'yajl.rb' unless defined?(Yajl)
 
 module Yajl
   # == Yajl::HttpStream
@@ -29,8 +29,15 @@ module Yajl
       socket = Socket.new(Socket::Constants::AF_INET, Socket::Constants::SOCK_STREAM, 0)
       sockaddr = Socket.pack_sockaddr_in(uri.port, uri.host)
       socket.connect(sockaddr)
-      socket.write("GET #{uri.path}?#{uri.query} HTTP/1.0\r\nAccept-encoding: gzip\r\n\r\n")
-      
+      request = "GET #{uri.path}#{uri.query ? "?"+uri.query : nil} HTTP/1.0\r\n"
+      request << "Host: #{uri.host}\r\n"
+      request << "Authorization: Basic #{[userinfo].pack('m')}\r\n" unless uri.userinfo.nil?
+      request << "User-Agent: Yajl::HttpStream #{Yajl::VERSION}\r\n"
+      request << "Accept: text/html,application/xhtml+xml,application/xml;q=0.9,*/*;q=0.8\r\n"
+      request << "Accept-Encoding: gzip\r\n"
+      request << "Accept-Charset: ISO-8859-1,utf-8;q=0.7,*;q=0.7\r\n"
+      request << "\r\n\r\n"
+      socket.write(request)
       response_head = {}
       response_head[:headers] = {}
       
@@ -70,9 +77,10 @@ module Yajl
   # This is a wrapper around Zlib::GzipReader to allow it's #read method to adhere
   # to the IO spec, allowing for two parameters (length, and buffer)
   class GzipStreamReader < ::Zlib::GzipReader
-    def read(len, buffer=nil)
-      buffer.gsub!(/.*/, '')
-      buffer << super(len)
+    def read(len=nil, buffer=nil)
+      buffer.gsub!(/.*/, '') unless buffer.nil?
+      buffer << super(len) and return unless buffer.nil?
+      super(len)
     end
   end
 end

data/lib/yajl.rb

@@ -1,5 +1,6 @@
 # encoding: UTF-8
-require 'yajl'
+require 'yajl.bundle'
+require 'yajl/http_stream.rb' unless defined?(Yajl::HttpStream)
 
 # = Yajl
 #

data/yajl-ruby.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{yajl-ruby}
-  s.version = "0.4.1"
+  s.version = "0.4.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Brian Lopez"]
@@ -99,7 +99,7 @@ Gem::Specification.new do |s|
   s.has_rdoc = true
   s.homepage = %q{http://github.com/brianmario/yajl-ruby}
   s.rdoc_options = ["--charset=UTF-8"]
-  s.require_paths = ["ext", "lib"]
+  s.require_paths = ["lib", "ext"]
   s.rubygems_version = %q{1.3.2}
   s.summary = %q{Ruby C bindings to the excellent Yajl JSON stream-based parser library.}
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: brianmario-yajl-ruby
 version: !ruby/object:Gem::Version 
-  version: 0.4.1
+  version: 0.4.2
 platform: ruby
 authors: 
 - Brian Lopez
@@ -110,8 +110,8 @@ post_install_message:
 rdoc_options: 
 - --charset=UTF-8
 require_paths: 
-- ext
 - lib
+- ext
 required_ruby_version: !ruby/object:Gem::Requirement 
   requirements: 
   - - ">="