dm-regex 0.0.1 → 0.0.2

data/.travis.yml

@@ -1,5 +1,4 @@
 rvm:
-  - 1.8.7
   - 1.9.2
   - 1.9.3
   - rbx

data/README.md

@@ -43,3 +43,48 @@ p ApacheLogEntry.match(
 )
 # => #<ApacheLogEntry @id=nil @h="87.18.183.252" @l="-" @u="-" @t=#<DateTime: 2008-08-13T00:50:49-07:00 ((2454692j,28249s,0n),-25200s,2299161j)> @r="GET /blog/index.xml HTTP/1.1" @s=302 @b=527 @referer="-" @user_agent="Feedreader 3.13 (Powered by Newsbrain)">
 ```
+
+or using Regex compile options ...
+
+``` ruby
+ApacheLogEntry.compile(%{
+    ^
+    \\g<h>              # host
+    [ ]
+    \\g<l>              # l
+    [ ]
+    \\g<u>              # user
+    [ ]\\[
+    \\g<t>              # timestamp
+    \\][ ]"
+    \\g<r>              # request
+    "[ ]
+    \\g<s>              # status
+    [ ]
+    \\g<b>              # bytes
+    [ ]"
+    \\g<referer>        # referer
+    "[ ]"
+    \\g<user_agent>     # user agent
+    "$
+  },
+  Regexp::EXTENDED
+)
+ApacheLogEntry.match(
+  '87.18.183.252 - - [13/Aug/2008:00:50:49 -0700] "GET /blog/index.xml HTTP/1.1" 302 527 "-" "Feedreader 3.13 (Powered by Newsbrain)"'
+) do |o|
+  p o
+end
+# => #<ApacheLogEntry @id=nil @h="87.18.183.252" @l="-" @u="-" @t=#<DateTime: 2008-08-13T00:50:49-07:00 ((2454692j,28249s,0n),-25200s,2299161j)> @r="GET /blog/index.xml HTTP/1.1" @s=302 @b=527 @referer="-" @user_agent="Feedreader 3.13 (Powered by Newsbrain)">
+```
+
+`.compile`
+---
+ * works the same as the built-in `Regexp.compile`
+ * uses named groups specified using `\g<name>` syntax to map groups to properties. (NB. make sure to use `\\g` when using double quoted strings)
+
+`property opts`
+---
+
+ * `:pat` option specifies the pattern used to match the property. (NB. the default of `/.+?/` might be good enough in most cases)
+ * `:method` option takes a proc that is used to transform the matched value. (NB. DataMapper's built-in typescasting might be good enough in most cases)

data/dm-regex.gemspec

@@ -15,6 +15,8 @@ Gem::Specification.new do |gem|
   gem.require_paths = [ "lib" ]
   gem.version       = DataMapper::Regex::VERSION
 
+  gem.required_ruby_version = '>= 1.9.2'
+
   gem.add_runtime_dependency('dm-core', '~> 1.0')
   gem.add_runtime_dependency('dm-migrations', '~> 1.0')
   gem.add_runtime_dependency('dm-sqlite-adapter', '~> 1.0')

data/lib/dm-regex/regex.rb

@@ -15,7 +15,9 @@ module DataMapper
       end
 
       def match(buf, parent=self)
-        pat.match(buf) { |m| parent.first_or_new(attrs_from_match(m)) }
+        pat.match(buf) { |m| parent.first_or_new(attrs_from_match(m)) }.tap { |obj|
+          yield obj if block_given?
+        }
       end
 
       def property(name, type, opts={}, &block)

data/lib/dm-regex/version.rb

@@ -1,5 +1,5 @@
 module DataMapper
   module Regex
-    VERSION = '0.0.1'
+    VERSION = '0.0.2'
   end
 end

data/spec/dm-regex_spec.rb

@@ -26,10 +26,6 @@ describe DataMapper::Regex do
   describe '.match' do
     subject { ApacheLogEntry.match(line) }
 
-    before :all do
-
-    end
-
     let(:line) {
       '87.18.183.252 - - [13/Aug/2008:00:50:49 -0700] "GET /blog/index.xml HTTP/1.1" 302 527 "-" "Feedreader 3.13 (Powered by Newsbrain)"'
     }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dm-regex
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
   prerelease: 
 platform: ruby
 authors:
@@ -120,10 +120,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
-      version: '0'
-      segments:
-      - 0
-      hash: -1581250388491881790
+      version: 1.9.2
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -132,7 +129,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1581250388491881790
+      hash: 1459867127956847609
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24