jls-grok 0.4.1 → 0.4.2

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.1"
+  spec.version = "0.4.2"
 
   spec.summary = "grok bindings for ruby"
   spec.description = "Grok ruby bindings - pattern match/extraction tool"

data/lib/grok/match.rb

@@ -28,8 +28,8 @@ class Grok::Match < FFI::Struct
     @captures = nil
   end
 
-  private
-  def _get_captures
+  public
+  def each_capture
     @captures = Hash.new { |h, k| h[k] = Array.new }
     grok_match_walk_init(self)
     name_ptr = FFI::MemoryPointer.new(:pointer)
@@ -41,16 +41,21 @@ class Grok::Match < FFI::Struct
       name = name_ptr.get_pointer(0).get_string(0, namelen)
       datalen = datalen_ptr.read_int
       data = data_ptr.get_pointer(0).get_string(0, datalen)
-      @captures[name] << data
+      yield name, data
     end
     grok_match_walk_end(self)
-  end
+  end # def each_capture
 
   public
   def captures
-    _get_captures if @captures.nil?
+    if @captures.nil?
+      @captures = Hash.new { |h,k| h[k] = [] }
+      each_capture do |key, val|
+        @captures[key] << val
+      end
+    end
     return @captures
-  end
+  end # def captures
 
   public
   def start
@@ -66,10 +71,4 @@ class Grok::Match < FFI::Struct
   def subject
     return self[:subject]
   end
-
-  public
-  def each_capture
-    _get_captures if @captures.nil?
-    @captures.each { |k, v| yield([k, v]) }
-  end
 end # Grok::Match

data/test/general/captures_test.rb

@@ -32,6 +32,11 @@ class GrokPatternCapturingTests < Test::Unit::TestCase
     assert_kind_of(String, match.captures["foo"][0])
     assert_equal(input, match.captures["foo"][0])
 
+    match.each_capture do |key, val|
+      assert(key.is_a?(String), "Grok::Match::each_capture should yield string,string, got #{key.class.name} as first argument.")
+      assert(val.is_a?(String), "Grok::Match::each_capture should yield string,string, got #{key.class.name} as first argument.")
+    end
+
     assert_kind_of(Fixnum, match.start)
     assert_kind_of(Fixnum, match.end)
     assert_kind_of(String, match.subject)

metadata

@@ -1,44 +1,42 @@
 --- !ruby/object:Gem::Specification 
 name: jls-grok
 version: !ruby/object:Gem::Version 
-  hash: 13
-  prerelease: 
+  prerelease: false
   segments: 
-  - 0
-  - 4
-  - 1
-  version: 0.4.1
+    - 0
+    - 4
+    - 2
+  version: 0.4.2
 platform: ruby
 authors: 
-- Jordan Sissel
-- Pete Fritchman
+  - Jordan Sissel
+  - Pete Fritchman
 autorequire: 
 bindir: bin
 cert_chain: []
 
-date: 2011-02-16 00:00:00 -08:00
+date: 2011-02-20 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 
+            segments: 
+              - 0
+              - 6
+              - 3
+            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 +44,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 +78,27 @@ 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 
+        segments: 
+          - 0
+        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 
+        segments: 
+          - 0
+        version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.5.1
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: grok bindings for ruby