epoxy 0.1.0 → 0.1.1

data/Rakefile

@@ -10,6 +10,7 @@ begin
     gem.email = "erik@hollensbe.org"
     gem.homepage = "http://github.com/erikh/epoxy"
     gem.authors = ["Erik Hollensbe"]
+    gem.add_development_dependency 'rdoc'
     # gem is a Gem::Specification... see http://www.rubygems.org/read/chapter/20 for additional settings
   end
   Jeweler::GemcutterTasks.new
@@ -45,12 +46,13 @@ task :to_blog => [:clobber_rdoc, :rdoc] do
     sh "rm -fr $git/blog/content/docs/epoxy && mv rdoc $git/blog/content/docs/epoxy"
 end
 
-require 'rake/rdoctask'
-Rake::RDocTask.new do |rdoc|
+require 'rdoc/task'
+RDoc::Task.new do |rdoc|
   version = File.exist?('VERSION') ? File.read('VERSION') : ""
 
   rdoc.rdoc_dir = 'rdoc'
   rdoc.title = "epoxy #{version}"
+  rdoc.main = "README.rdoc"
   rdoc.rdoc_files.include('README*')
   rdoc.rdoc_files.include('lib/**/*.rb')
 end

data/VERSION

@@ -1 +1 @@
-0.1.0
+0.1.1

data/lib/epoxy.rb

@@ -35,6 +35,8 @@ class Epoxy
                 |
                 " ( [^"\\]  |  ""  |  \\. )* "      (?# match strings surrounded by " )
                 |
+                ['"]                                (?# match a loose quote ) 
+                |
                 \?\??                               (?# match one or two question marks )
                 |
                 [^-/'"?]+                           (?# match all characters except ' " ? - and / )

data/test/test_epoxy.rb

@@ -9,35 +9,110 @@ class TestEpoxy < Test::Unit::TestCase
         assert_equal("select * from foo where bar='foo'", ep.quote { |x| "'foo'" })
     end
 
-    def test_02_double_question
+    def test_02_literal_question_mark
         ep = Epoxy.new("select ?? from foo where bar=?")
         assert_equal("select ? from foo where bar='foo'", ep.quote { |x| "'foo'" })
+
+        ep = Epoxy.new("select ??? from foo where bar=?")
+        assert_equal("select ?'foo' from foo where bar='foo'", ep.quote { |x| "'foo'" })
+
+        ep = Epoxy.new("select ???? from foo where bar=?")
+        assert_equal("select ?? from foo where bar='foo'", ep.quote { |x| "'foo'" })
+
+        ep = Epoxy.new("select ????? from foo where bar=?")
+        assert_equal("select ??'foo' from foo where bar='foo'", ep.quote { |x| "'foo'" })
+
+        ep = Epoxy.new("select '?' from foo where bar=?")
+        assert_equal("select '?' from foo where bar='foo'", ep.quote { |x| "'foo'" })
+
+        ep = Epoxy.new("select '?'? from foo where bar=?")
+        assert_equal("select '?''foo' from foo where bar='foo'", ep.quote { |x| "'foo'" })
+
+        ep = Epoxy.new("select '?''?' from foo where bar=?")
+        assert_equal("select '?''?' from foo where bar='foo'", ep.quote { |x| "'foo'" })
+
+        ep = Epoxy.new("select ?'?' from foo where bar=?")
+        assert_equal("select 'foo''?' from foo where bar='foo'", ep.quote { |x| "'foo'" })
+
+        ep = Epoxy.new("select ?'?'? from foo where bar=?")
+        assert_equal("select 'foo''?''foo' from foo where bar='foo'", ep.quote { |x| "'foo'" })
+
+        ep = Epoxy.new("select '?'?'? from foo where bar=?")
+        assert_equal("select '?''foo'''foo' from foo where bar='foo'", ep.quote { |x| "'foo'" })
+
+        ep = Epoxy.new("select '?'?'?' from foo where bar=?")
+        assert_equal("select '?''foo''?' from foo where bar='foo'", ep.quote { |x| "'foo'" })
+
+        ep = Epoxy.new("select '?'?? from foo where bar=?")
+        assert_equal("select '?'? from foo where bar='foo'", ep.quote { |x| "'foo'" })
+
+        ep = Epoxy.new("select '?'??? from foo where bar=?")
+        assert_equal("select '?'?'foo' from foo where bar='foo'", ep.quote { |x| "'foo'" })
+
+        ep = Epoxy.new("select ??'?'??? from foo where bar=?")
+        assert_equal("select ?'?'?'foo' from foo where bar='foo'", ep.quote { |x| "'foo'" })
+
+        ep = Epoxy.new("select ???'?'??? from foo where bar=?")
+        assert_equal("select ?'foo''?'?'foo' from foo where bar='foo'", ep.quote { |x| "'foo'" })
+
+        ep = Epoxy.new("select ''? from foo where bar=?")
+        assert_equal("select '''foo' from foo where bar='foo'", ep.quote { |x| "'foo'" })
+
+        ep = Epoxy.new("select '''? from foo where bar=?")
+        assert_equal("select ''''foo' from foo where bar='foo'", ep.quote { |x| "'foo'" })
+
+        ep = Epoxy.new("select ''?' from foo where bar=?")
+        assert_equal("select '''foo'' from foo where bar='foo'", ep.quote { |x| "'foo'" })
+
+        ep = Epoxy.new("select ''?'' from foo where bar=?")
+        assert_equal("select '''foo''' from foo where bar='foo'", ep.quote { |x| "'foo'" })
+
+        ep = Epoxy.new("select ''??' from foo where bar=?")
+        assert_equal("select ''?' from foo where bar='foo'", ep.quote { |x| "'foo'" })
+
+        ep = Epoxy.new("select '?''?' from foo where bar=?")
+        assert_equal("select '?''?' from foo where bar='foo'", ep.quote { |x| "'foo'" })
+
+        ep = Epoxy.new("select '?'''?' from foo where bar=?")
+        assert_equal("select '?''''foo'' from foo where bar='foo'", ep.quote { |x| "'foo'" })
+
+        ep = Epoxy.new("select '?''''?' from foo where bar=?")
+        assert_equal("select '?''''?' from foo where bar='foo'", ep.quote { |x| "'foo'" })
+
+        ep = Epoxy.new("select '??' from foo where bar=?")
+        assert_equal("select '??' from foo where bar='foo'", ep.quote { |x| "'foo'" })
+
+        ep = Epoxy.new("select '???' from foo where bar=?")
+        assert_equal("select '???' from foo where bar='foo'", ep.quote { |x| "'foo'" })
+
+        ep = Epoxy.new("select ''???' from foo where bar=?")
+        assert_equal("select ''?'foo'' from foo where bar='foo'", ep.quote { |x| "'foo'" })
     end
 
     def test_03_quotes_already
         ep = Epoxy.new("select * from \"foo\" where bar=?")
         assert_equal("select * from \"foo\" where bar='foo'", ep.quote { |x| "'foo'" })
-        
+
         ep = Epoxy.new("select * from 'foo' where bar=?")
         assert_equal("select * from 'foo' where bar='foo'", ep.quote { |x| "'foo'" })
     end
-    
+
     def test_04_holy_shit
         ep = Epoxy.new("select * from \"'foo'\" where bar=?")
         assert_equal("select * from \"'foo'\" where bar='foo'", ep.quote { |x| "'foo'" })
-        
+
         ep = Epoxy.new("select * from E\"'foo'\" where bar=?")
         assert_equal("select * from E\"'foo'\" where bar='foo'", ep.quote { |x| "'foo'" })
-        
+
         ep = Epoxy.new("select * from E\"''foo''\" where bar=?")
         assert_equal("select * from E\"''foo''\" where bar='foo'", ep.quote { |x| "'foo'" })
-        
+
         ep = Epoxy.new("select * from E\"\\''foo''\" where bar=?")
         assert_equal("select * from E\"\\''foo''\" where bar='foo'", ep.quote { |x| "'foo'" })
-        
+
         ep = Epoxy.new("select * from E\"\\''foo\\''\" where bar=?")
         assert_equal("select * from E\"\\''foo\\''\" where bar='foo'", ep.quote { |x| "'foo'" })
-       
+
         ep = Epoxy.new("select * from foo where bar='?'")
         assert_equal("select * from foo where bar='?'", ep.quote { |x| "'foo'" })
     end
@@ -47,7 +122,7 @@ class TestEpoxy < Test::Unit::TestCase
                        -- a comment!
                        select * from foo where bar=?
                        }.strip)
-        
+
         assert_equal(%Q{
                        -- a comment!
                        select * from foo where bar='foo'

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 1
-  - 0
-  version: 0.1.0
+  - 1
+  version: 0.1.1
 platform: ruby
 authors: 
 - Erik Hollensbe
@@ -16,8 +16,19 @@ cert_chain: []
 
 date: 2010-05-27 00:00:00 -04:00
 default_executable: 
-dependencies: []
-
+dependencies: 
+- !ruby/object:Gem::Dependency 
+  name: rdoc
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  version_requirements: *id001
 description: Parse binds in SQL or any other data query language, quote, even configure for client-side binding. It all works!
 email: erik@hollensbe.org
 executables: []