epoxy 0.3.0 → 0.3.1

data/README.rdoc

@@ -22,7 +22,7 @@
  
  Epoxy handles:
  
- * ?<name> for named binds
+ * ?<name> for named binds 
  * ? for numbered binds
  * ?? for a *real* question mark
  * '?' for a *real* question mark

data/Rakefile

@@ -8,7 +8,7 @@ begin
     gem.summary = %Q{A binding API for query languages that does not depend on any specific database.}
     gem.description = %Q{Parse binds in SQL or any other data query language, quote, even configure for client-side binding. It all works!}
     gem.email = "erik@hollensbe.org"
-    gem.homepage = "http://github.com/erikh/epoxy"
+    gem.homepage = "http://github.com/RDBI/epoxy"
     gem.authors = ["Erik Hollensbe"]
     gem.add_development_dependency 'rdoc'
     gem.add_development_dependency 'test-unit'

data/VERSION

@@ -1 +1 @@
-0.3.0
+0.3.1

data/lib/epoxy.rb

@@ -30,6 +30,9 @@
 # * not telling you how to quote your data. This solution works for any query language and any database.
 #
 class Epoxy
+
+  LEGAL_NAMED_BIND = /[a-zA-Z]+/
+
   #
   # Token parser, isolates components of the query into parts to where they
   # can be managed indepdently.
@@ -37,7 +40,7 @@ class Epoxy
   # Probably not the easiest thing to deal with by itself. Use the standard
   # methods plox.
   def self.parse_tokens(query, comment_chars)
-    a = query.scan(%r{
+    query.scan(%r{
       (
         #{comment_chars}.*                  (?# matches "--" style comments to the end of line or string )
         |
@@ -47,11 +50,11 @@ class Epoxy
         |
         ['"]                                (?# match a loose quote ) 
         |         
-        \?[a-zA-Z]+                         (?# match a named bind )
+        \?#{LEGAL_NAMED_BIND}               (?# match a named bind )
         |
         \?\??                               (?# match one or two question marks )
         |
-        [^-/'"?:]+                          (?# match all characters except ' " ? - : and / )
+        [^'"?]+                          (?# match all characters except ' " ? - : and / )
     )
     }x).collect(&:first)
   end
@@ -95,15 +98,7 @@ class Epoxy
     result = ""
     bind_pos = 0
 
-    unless binds.empty?
-      tokens.each do |token|
-        binds.each do |key, rep|
-          if token == "?#{key}"
-            token.replace block.call(key.to_sym)
-          end
-        end
-      end
-    end
+    binds = binds.keys.inject({}) { |x,y| x.merge({ y.kind_of?(String) ? y.to_sym : y => binds[y] }) }
 
     tokens.each do |part|
       case part
@@ -112,6 +107,14 @@ class Epoxy
         bind_pos += 1
       when '??'
         result << "?"
+      when /^\?(#{LEGAL_NAMED_BIND})$/
+        key = $1.to_sym
+        if binds.has_key?(key)
+          result << block.call(key)
+          bind_pos += 1
+        else
+          result << part
+        end
       else
         result << part
       end
@@ -119,6 +122,40 @@ class Epoxy
 
     return result
   end
+
+  #
+  # Returns a hash of position => name (as Symbol), if any, which correspond to
+  # binds located in the query. nil is provided as a name if it is an indexed
+  # bind already. This is useful for sanitizing features Epoxy has before
+  # sending them to the SQL engine.
+  #
+  # Ex: 
+  #   ep = Epoxy.new("select * from foo where bar=?bar and quux=? and foomatic=?foo")
+  #   ep.indexed_binds
+  #
+  #   # yields...
+  #   [ :bar, nil, :foo]
+  #
+  # *NOTE:* all syntax lookalikes are considered in this method; in
+  # the actual quote() routine, only named binds with a corresponding map are
+  # considered.
+  #
+  def indexed_binds
+    ary = []
+
+    tokens.each do |toke|
+      case toke 
+      when '?'
+        ary.push(toke)
+      when /\?(#{LEGAL_NAMED_BIND})/
+        ary.push($1.to_sym)
+      end
+    end
+
+    ary.map! { |x| x == '?' ? nil : x }
+
+    return ary
+  end
 end
 
 # vim: syntax=ruby ts=2 et sw=2 sts=2

data/test/test_epoxy.rb

@@ -151,7 +151,7 @@ class TestEpoxy < Test::Unit::TestCase
   end
 
   def test_06_named_binds
-    binds = { 0 => "test", :foo => 'bar', "bar" => 'baz', "void" => 'unused' }
+    binds = { 0 => "test", 1 => "test2", :foo => 'bar', "bar" => 'baz', "void" => 'unused' }
     yarrr = proc { |x| "'#{binds[x] || binds[x.to_s]}'" }
 
     ep = Epoxy.new("select * from 'foo' where bar=?foo and baz=?bar")
@@ -168,7 +168,7 @@ class TestEpoxy < Test::Unit::TestCase
 
     ep = Epoxy.new("select * from 'foo' where bar=?foo and baz=?")
     assert_equal(
-      "select * from 'foo' where bar='bar' and baz='test'",
+      "select * from 'foo' where bar='bar' and baz='test2'",
       ep.quote(binds, &yarrr)
     )
 
@@ -201,8 +201,32 @@ class TestEpoxy < Test::Unit::TestCase
       "select * from 'foo' where bar=?notfound",
       ep.quote(binds, &yarrr)
     )
-  end
     
+    ep = Epoxy.new("select * from 'foo' where bar=?foo and baz = ?")
+    assert_equal(
+      "select * from 'foo' where bar='bar' and baz = 'test2'",
+      ep.quote(binds, &yarrr)
+    )
+  end
+
+  def test_07_indexed_binds
+    ep = Epoxy.new("select * from foo where bar=?bar and quux=? and foomatic=?foo")
+    assert_equal(
+      [ :bar, nil, :foo ],
+      ep.indexed_binds
+    )
+  end
+
+  def test_08_meta_blackhole
+    str = "select 'some time'::TIMESTAMP"
+
+    ep = Epoxy.new "select 'some time'::TIMESTAMP"
+
+    assert_equal(
+      str,
+      ep.quote
+    )
+  end
 end
 
 # vim: syntax=ruby ts=2 et sw=2 sts=2

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: epoxy
 version: !ruby/object:Gem::Version 
-  hash: 19
+  hash: 17
   prerelease: false
   segments: 
   - 0
   - 3
-  - 0
-  version: 0.3.0
+  - 1
+  version: 0.3.1
 platform: ruby
 authors: 
 - Erik Hollensbe
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-07-12 00:00:00 -04:00
+date: 2010-07-15 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -66,7 +66,7 @@ files:
 - test/helper.rb
 - test/test_epoxy.rb
 has_rdoc: true
-homepage: http://github.com/erikh/epoxy
+homepage: http://github.com/RDBI/epoxy
 licenses: []
 
 post_install_message: