houdinirx 0.0.1 → 0.0.2

data/README

@@ -20,10 +20,9 @@ Houdini.define(:word, /\w+/)
 Call hmatch or hscan on a string and build your expression pieces with the r() method by defining the expression inline or using a pre-defined expression.  Then build your match results with the m( ) method.
 
 data = t.hmatch do
-  r("amount", /\d+[,\d]*\.\d+/)
-  r("phone_number", /\(\d{3}\)\s+\d{3}-\d{4}/)
-  r("city", :word)
-  r("state", :word)
+  r(/\d+[,\d]*\.\d+/, "amount")
+  r(/\(\d{3}\)\s+\d{3}-\d{4}/, "phone_number")
+  r(:word, "city", "state")
   m("\\$(amount) (phone_number) (city), (state)")
 end
 

data/lib/houdinirx/match_result.rb

@@ -10,18 +10,32 @@ module Houdini
       @captures = captures.collect {|c| c.to_sym }
     end
     
+    def to_hash
+      {}.tap do |attributes|
+        captures.each { |c| attributes[c] = value_for(c) }
+      end
+    end
+    
     def method_missing(method, *args, &block)
-      if @captures.include?(method)
-        index = @captures.index(method)
-        if @match.class == MatchData
-          @match.captures[index]
-        else
-          @match[index]
-        end
+      value = value_for(method)
+      
+      if value
+        return value
       else
         raise RuntimeError, "#{method} not captured"
       end
     end
     
+    protected
+    def value_for(name)
+      index = @captures.index(name)
+      return nil if index == nil
+      if @match.class == MatchData
+        @match.captures[index]
+      else
+        @match[index]
+      end
+    end
+    
   end
 end

data/lib/houdinirx/regex_helper.rb

@@ -10,9 +10,9 @@ module Houdini
   
     def r(*args)
       if args.size == 2
-        @expressions << [args[0], args[1]]
+        @expressions << [args[1], args[0]]
       else
-        expression = args.pop
+        expression = args.shift
         args.each do |name|
           @expressions << [name, expression]
         end
@@ -42,6 +42,7 @@ module Houdini
     protected
     def replace_expressions!(regex)
       @expressions.each do |name, r|
+        name = name.to_s
         if regex =~ /\(#{name}\)/
           @captures << name
         end

data/lib/houdinirx/version.rb

@@ -1,3 +1,3 @@
 module Houdini
-  VERSION = "0.0.1"
+  VERSION = "0.0.2"
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: houdinirx
 version: !ruby/object:Gem::Version 
-  hash: 29
+  hash: 27
   prerelease: 
   segments: 
   - 0
   - 0
-  - 1
-  version: 0.0.1
+  - 2
+  version: 0.0.2
 platform: ruby
 authors: 
 - Eric Campbell
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-08-01 00:00:00 Z
+date: 2011-08-03 00:00:00 Z
 dependencies: []
 
 description: A ruby DSL for building long complex regular expressions used frequently across large data extraction projects