http-parser 1.0.1 → 1.0.2

checksums.yaml

@@ -1,7 +1,15 @@
 ---
-SHA1:
-  metadata.gz: ef7dd40436524e48ef90904d871caed3ba2754d6
-  data.tar.gz: d1eebb668464073456f155757c4d34d06c3ebd1d
-SHA512:
-  metadata.gz: 477ec97207cb8c602db5279f4e1ef315cb896d3d79e2669c712d0c4a950c36b941a8d1aa5ba490813e6bd5a6befcbd5947f00dd1d1e28acaeb340d20c789f111
-  data.tar.gz: e5b18b9ddd5bc2befbd6b334834bc9cd16f5428c2d0413bb791a0ede0141ca9f6dbed49daddc42177dcf96b5e51610fcdc92bc5ea5753b66f15e2cccb5d31cbf
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    ZjlmZDQwNmJmYjJlNWMzY2NmZmFlZDcwNWQ2NDUwZjQ0OWIzNzljNw==
+  data.tar.gz: !binary |-
+    YjhiMTgxOTMxNGViODRmYjM0YTE5MmU1YTNmMmViZGM4ZjM1ZDhkMQ==
+!binary "U0hBNTEy":
+  metadata.gz: !binary |-
+    ODNiNzNmM2Q3ZjE4Mjk1NzFiMDQ5ZDM3YTUxNGM5OGVlNWI3MWMzMzQ5NjIx
+    NGQ0YTYyYzYyNDZhOTE4NTZkMGYxZjY3ZjllMzViZGY0Nzk3NDM0NmFjYTll
+    YzI3NjFiOGJiNjI0MmFmZDc4NjJkOTI0YmFlNjkwMmM5NDVmYmU=
+  data.tar.gz: !binary |-
+    Nzc3MTM3ZTc2ZTJjMzYxZThmY2IzMTJlMWQzZGU4MjIyZDNkODMyN2RmNWE2
+    OTNkYzYzMTM1MjM1MjMyOTUxZDkzY2VjMzk4YzU4NTZmMTQ2ODQwOWZkMWVj
+    ZmIyM2Q4MzkwN2Y4NmY5OTJkZGIyNTI0MTUyZWZkYzQ5ZDQxMWQ=

data/lib/http-parser/parser.rb

@@ -14,6 +14,7 @@ module HttpParser
         #
         def initialize
             @settings = ::HttpParser::Settings.new
+            @callbacks = {} # so GC doesn't clean them up on java
             yield self if block_given?
         end
 
@@ -27,7 +28,9 @@ module HttpParser
         #   The state so far of the request / response being processed.
         #
         def on_message_begin(&block)
-            @settings[:on_message_begin] = Callback.new(&block)
+            cb = Callback.new(&block)
+            @callbacks[:on_message_begin] = cb
+            @settings[:on_message_begin] = cb
         end
 
         #
@@ -46,7 +49,9 @@ module HttpParser
         # @see http://www.w3.org/Protocols/rfc2616/rfc2616-sec5.html#sec5.1.2
         #
         def on_url(&block)
-            @settings[:on_url] = DataCallback.new(&block)
+            cb = DataCallback.new(&block)
+            @callbacks[:on_url] = cb
+            @settings[:on_url] = cb
         end
 
         #
@@ -59,7 +64,9 @@ module HttpParser
         #   The state so far of the request / response being processed.
         #
         def on_status_complete(&block)
-            @settings[:on_status_complete] = Callback.new(&block)
+            cb = Callback.new(&block)
+            @callbacks[:on_status_complete] = cb
+            @settings[:on_status_complete] = cb
         end
 
         #
@@ -78,7 +85,9 @@ module HttpParser
         # @see http://www.w3.org/Protocols/rfc2616/rfc2616-sec4.html#sec4.5
         #
         def on_header_field(&block)
-            @settings[:on_header_field] = DataCallback.new(&block)
+            cb = DataCallback.new(&block)
+            @callbacks[:on_header_field] = cb
+            @settings[:on_header_field] = cb
         end
 
         #
@@ -97,7 +106,9 @@ module HttpParser
         # @see http://www.w3.org/Protocols/rfc2616/rfc2616-sec4.html#sec4.5
         #
         def on_header_value(&block)
-            @settings[:on_header_value] = DataCallback.new(&block)
+            cb = DataCallback.new(&block)
+            @callbacks[:on_header_value] = cb
+            @settings[:on_header_value] = cb
         end
 
         #
@@ -110,7 +121,9 @@ module HttpParser
         #   The state so far of the request / response being processed.
         #
         def on_headers_complete(&block)
-            @settings[:on_headers_complete] = Callback.new(&block)
+            cb = Callback.new(&block)
+            @callbacks[:on_headers_complete] = cb
+            @settings[:on_headers_complete] = cb
         end
 
         #
@@ -130,7 +143,9 @@ module HttpParser
         # @see http://www.w3.org/Protocols/rfc2616/rfc2616-sec4.html#sec4.5
         #
         def on_body(&block)
-            @settings[:on_body] = DataCallback.new(&block)
+            cb = DataCallback.new(&block)
+            @callbacks[:on_body] = cb
+            @settings[:on_body] = cb
         end
 
         #
@@ -143,7 +158,9 @@ module HttpParser
         #   The state so far of the request / response being processed.
         #
         def on_message_complete(&block)
-            @settings[:on_message_complete] = Callback.new(&block)
+            cb = Callback.new(&block)
+            @callbacks[:on_message_complete] = cb
+            @settings[:on_message_complete] = cb
         end
 
         #
@@ -167,12 +184,12 @@ module HttpParser
         protected
 
 
-        class Callback < Proc
+        class Callback < ::FFI::Function
             #
             # Creates a new Parser callback.
             #
             def self.new(&block)
-                super do |parser|
+                super(:int, [::HttpParser::Instance.ptr]) do |parser|
                     begin
                         catch(:return) { yield(parser); 0 }
                     rescue
@@ -182,9 +199,9 @@ module HttpParser
             end
         end
 
-        class DataCallback < Proc
+        class DataCallback < ::FFI::Function
             def self.new(&block)
-                super do |parser, buffer, length|
+                super(:int, [::HttpParser::Instance.ptr, :pointer, :size_t]) do |parser, buffer, length|
                     begin
                         data = buffer.get_bytes(0, length)
                         catch(:return) { yield(parser, data); 0 }

data/lib/http-parser/types.rb

@@ -113,7 +113,6 @@ module HttpParser
         def reset!(new_type = type)
             ::HttpParser.http_parser_init(self, new_type)
         end
-        alias reset reset!
 
         #
         # The type of the parser.

data/lib/http-parser/version.rb

@@ -1,3 +1,3 @@
 module HttpParser
-    VERSION = "1.0.1"
+    VERSION = "1.0.2"
 end

metadata

@@ -1,74 +1,79 @@
 --- !ruby/object:Gem::Specification
 name: http-parser
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.2
 platform: ruby
 authors:
 - Stephen von Takach
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-29 00:00:00.000000000 Z
+date: 2013-09-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ffi-compiler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 0.0.2
-  type: :runtime
-  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 0.0.2
+  type: :runtime
+  prerelease: false
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
+        version: !binary |-
+          MA==
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: !binary |-
+          MA==
+  type: :runtime
+  prerelease: false
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
+        version: !binary |-
+          MA==
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: !binary |-
+          MA==
+  type: :development
+  prerelease: false
 - !ruby/object:Gem::Dependency
   name: yard
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
+        version: !binary |-
+          MA==
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: '0'
-description: |2
-      A super fast http parser for ruby.
-      Cross platform and multiple ruby implementation support thanks to ffi.
+        version: !binary |-
+          MA==
+  type: :development
+  prerelease: false
+description: ! "    A super fast http parser for ruby.\n    Cross platform and multiple
+  ruby implementation support thanks to ffi.\n"
 email:
 - steve@cotag.me
 executables: []
@@ -77,12 +82,12 @@ extensions:
 extra_rdoc_files:
 - README.md
 files:
+- lib/http-parser.rb
 - lib/http-parser/errors.rb
 - lib/http-parser/ext.rb
 - lib/http-parser/parser.rb
 - lib/http-parser/types.rb
 - lib/http-parser/version.rb
-- lib/http-parser.rb
 - Rakefile
 - http-parser.gemspec
 - README.md
@@ -103,14 +108,16 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ! '>='
     - !ruby/object:Gem::Version
-      version: '0'
+      version: !binary |-
+        MA==
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ! '>='
     - !ruby/object:Gem::Version
-      version: '0'
+      version: !binary |-
+        MA==
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.0.6