jls-grok 0.4.3 → 0.4.4

data/grok.gemspec

@@ -38,7 +38,7 @@ Gem::Specification.new do |spec|
 
   #svnrev = %x{svn info}.split("\n").grep(/Revision:/).first.split(" ").last.to_i
   spec.name = "jls-grok"
-  spec.version = "0.4.3"
+  spec.version = "0.4.4"
 
   spec.summary = "grok bindings for ruby"
   spec.description = "Grok ruby bindings - pattern match/extraction tool"

data/lib/grok.rb

@@ -94,6 +94,18 @@ class Grok < FFI::Struct
     rc = grok_execn(self, text_c, text.size, match)
     case rc
     when GROK_OK
+      # Give the Grok::Match object a reference to the 'text_c'
+      # object which is also Grok::Match#subject string;
+      # this will prevent Ruby from garbage collecting it until
+      # the match object is garbage collectd.
+      #
+      # If we don't do this, then 'text_c' will fall out of
+      # scope at the end of this function and become a candidate
+      # for garbage collection, causing Grok::Match#subject to become
+      # corrupt and any captures to point to those corrupt portions.
+      # http://code.google.com/p/logstash/issues/detail?id=47
+      match.subject_memorypointer = text_c
+
       return match
     when GROK_ERROR_NOMATCH
       return false

data/lib/grok/match.rb

@@ -21,6 +21,12 @@ class Grok::Match < FFI::Struct
          :start, :int,
          :end, :int
 
+  # Placeholder for the FFI::MemoryPointer that we pass to
+  # grok_execn() during Grok#match; this should prevent ruby from
+  # garbage collecting us until the GrokMatch goes out of scope.
+  # http://code.google.com/p/logstash/issues/detail?id=47
+  attr_accessor :subject_memorypointer
+
   public
   def initialize
     super

metadata

@@ -1,44 +1,34 @@
 --- !ruby/object:Gem::Specification 
 name: jls-grok
 version: !ruby/object:Gem::Version 
-  hash: 9
   prerelease: 
-  segments: 
-  - 0
-  - 4
-  - 3
-  version: 0.4.3
+  version: 0.4.4
 platform: ruby
 authors: 
-- Jordan Sissel
-- Pete Fritchman
+  - Jordan Sissel
+  - Pete Fritchman
 autorequire: 
 bindir: bin
 cert_chain: []
 
-date: 2011-02-23 00:00:00 -08:00
+date: 2011-03-03 00:00:00 -08:00
 default_executable: 
 dependencies: 
-- !ruby/object:Gem::Dependency 
-  name: ffi
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 1
-        segments: 
-        - 0
-        - 6
-        - 3
-        version: 0.6.3
-  type: :runtime
-  version_requirements: *id001
+  - !ruby/object:Gem::Dependency 
+    name: ffi
+    prerelease: false
+    requirement: &id001 !ruby/object:Gem::Requirement 
+      none: false
+      requirements: 
+        - - ~>
+          - !ruby/object:Gem::Version 
+            version: 0.6.3
+    type: :runtime
+    version_requirements: *id001
 description: Grok ruby bindings - pattern match/extraction tool
 email: 
-- jls@semicomplete.com
-- petef@databits.net
+  - jls@semicomplete.com
+  - petef@databits.net
 executables: []
 
 extensions: []
@@ -46,32 +36,32 @@ extensions: []
 extra_rdoc_files: []
 
 files: 
-- INSTALL
-- Rakefile
-- examples/grok-web.rb
-- examples/pattern-discovery.rb
-- examples/test.rb
-- grok.gemspec
-- lib/grok.rb
-- lib/grok/match.rb
-- lib/grok/pile.rb
-- test/Makefile
-- test/alltests.rb
-- test/general/basic_test.rb
-- test/general/captures_test.rb
-- test/patterns/day.rb
-- test/patterns/host.rb
-- test/patterns/ip.input
-- test/patterns/ip.rb
-- test/patterns/iso8601.rb
-- test/patterns/month.rb
-- test/patterns/number.rb
-- test/patterns/path.rb
-- test/patterns/prog.rb
-- test/patterns/quotedstring.rb
-- test/patterns/uri.rb
-- test/run.sh
-- test/speedtest.rb
+  - INSTALL
+  - Rakefile
+  - examples/grok-web.rb
+  - examples/pattern-discovery.rb
+  - examples/test.rb
+  - grok.gemspec
+  - lib/grok.rb
+  - lib/grok/match.rb
+  - lib/grok/pile.rb
+  - test/Makefile
+  - test/alltests.rb
+  - test/general/basic_test.rb
+  - test/general/captures_test.rb
+  - test/patterns/day.rb
+  - test/patterns/host.rb
+  - test/patterns/ip.input
+  - test/patterns/ip.rb
+  - test/patterns/iso8601.rb
+  - test/patterns/month.rb
+  - test/patterns/number.rb
+  - test/patterns/path.rb
+  - test/patterns/prog.rb
+  - test/patterns/quotedstring.rb
+  - test/patterns/uri.rb
+  - test/run.sh
+  - test/speedtest.rb
 has_rdoc: true
 homepage: http://code.google.com/p/semicomplete/wiki/Grok
 licenses: []
@@ -80,29 +70,23 @@ post_install_message:
 rdoc_options: []
 
 require_paths: 
-- lib
+  - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.5.1
+rubygems_version: 1.5.0
 signing_key: 
 specification_version: 3
 summary: grok bindings for ruby