i_dig_sql 1.0.0 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5c3f4ef668f82b48eec51d0df59388fd5e8fa98d
-  data.tar.gz: 25e21fb88208f4d9fdadf7a7cead463d2a0fb17a
+  metadata.gz: cc217b63c8a06244155e7007377bca783c611b36
+  data.tar.gz: c284841ef57010e523b15405072726c7d5f6125f
 SHA512:
-  metadata.gz: e889e9ec8ccb723c62f3cd8cecbe2450bc228336763c6eb27b13ae8acb4c8bb788cbf5a4cbf7fbd00654c14dfdd073aeb84aa2453a839479f613c1f464e5a3ef
-  data.tar.gz: 76929d84b06a279b22572a0f0a056c6ebb509eb5224000ead47d60b27303d6393241d2c27d10f76be19cd9dd462f57bac3fc54d60f0536f5f21aa8d79863b55e
+  metadata.gz: afd3204cc8130e91f844b192641cd44829ba544d92cec68fd6b7766d688f11564de76ecaa3ae16aa5472515234f6c1962d06447e0b448d69869c0ef01a54e1fd
+  data.tar.gz: e403fe4f10c7b8ec7e9b323fa8c3907f216682ac4fd5159af99505e92f0cf5ee0140df7acb42896e7148c1e4aee99efca0785f6964f155efa74b96f5647a224b

data/README.md

@@ -40,13 +40,15 @@ Please note that none of this is ready yet.
     SELECT *
     FROM people
     WHERE
-      id IN ( {{{ HEROES }}} AND status = :ALIVE)
+      id IN ( << HEROES >> AND status = :ALIVE)
       OR
       id IN (SELECT ID FROM {{ HEROES }} AND status = :ALIVE)
       OR
-      id IN ( {{ * HEROES }} )
+      id IN ( << * HEROES >> )
       OR
-      id IN ( {{ ! VILLIANS }} )
+      id IN ( << patron_id VILLIANS >> )
+      OR
+      id IN ( << VILLIANS >> )
   ^
 
   sql.to_sql

data/VERSION

@@ -1 +1 @@
-1.0.0
+2.0.0

data/englishy_sql.rb

@@ -77,18 +77,21 @@ puts(Englishy_Sql.new {
 SELECT *
 FROM screen_name
 WHERE
+  id = (SELECT id FROM screen_name WHERE screen_name = 'MEANIE_6294')
+  AND (
   owner_id = :AUDIENCE_ID
-  OR
-  (
-    :AUDIENCE_ID NOT IN  (BLOCKED)
-    AND
-    ( privacy = :WORLD
-      OR
-      (
-        privacy = :PROTECTED
-        AND
-        :AUDIENCE_ID IN (
-          ALLOWED
+    OR
+    (
+      :AUDIENCE_ID NOT IN  (BLOCKED)
+      AND
+      ( privacy = :WORLD
+        OR
+        (
+          privacy = :PROTECTED
+          AND
+          :AUDIENCE_ID IN (
+            ALLOWED
+          )
         )
       )
     )

data/lib/i_dig_sql.rb

@@ -2,6 +2,7 @@
 class I_Dig_Sql
 
   include Enumerable
+  HAS_VAR = /(\{\{|\<\<)[^\}\>]+(\}\}|\>\>)/
 
   Duplicate = Class.new RuntimeError
 
@@ -11,7 +12,7 @@ class I_Dig_Sql
   class H < Hash
 
     def [] name
-      fail ArgumentError, "Unknown key: #{k.inspect}" unless has_key?(name)
+      fail ArgumentError, "Unknown key: #{name.inspect}" unless has_key?(name)
       super
     end
 
@@ -83,25 +84,33 @@ class I_Dig_Sql
     s    = @string.dup
     ctes = []
 
-    s.gsub!(/\{\{\s?(\!|\*)?\s?([a-zA-Z0-9\_]+)\s?\}\}/) do |match|
-      key = $2.to_sym
-      case $1
-      when "!"
-        self[key]
-      when "*"
-        ctes << key
-        "SELECT * FROM #{key}"
-      else
+    while s[HAS_VAR]
+      s.gsub!(/\{\{\s?([a-zA-Z0-9\_]+)\s?\}\}/) do |match|
+        key = $1.to_sym
         ctes << key
         key
       end
+
+      s.gsub!(/\<\<\s?([a-zA-Z0-9\_\-\ \*]+)\s?\>\>/) do |match|
+        tokens = $1.split
+        key    = tokens.pop.to_sym
+        field  = tokens.empty? ? nil : tokens.join(' ')
+
+        case
+        when field
+          ctes << key
+          "SELECT #{field} FROM #{key}"
+        else
+          self[key]
+        end
+      end
     end
 
     return s if ctes.empty?
 
     %^
       WITH
-      #{ctes.map { |k| "#{k} AS (
+      #{ctes.uniq.map { |k| "#{k} AS (
         #{self[k]}
       )" }.join "
       ,

data/specs/i_dig_sql.rb

@@ -21,7 +21,22 @@ describe :I_Dig_Sql do
     line   = 0
     readme.split("\n").detect { |l| line = line + 1; l['```ruby'] }
     result = eval(code, nil, 'README.md', line)
-    sql(result)['WITH HEROES'].should == 'WITH HEROES'
+    sql(result).should == sql(%^
+      WITH
+      HEROES AS ( SELECT id FROM hero WHERE id = :PERSON_ID ) ,
+      VILLIANS AS ( SELECT id FROM villian WHERE id = :PERSON_ID )
+      SELECT * FROM people
+      WHERE
+        id IN ( SELECT id FROM hero WHERE id = :PERSON_ID AND status = :ALIVE)
+        OR
+        id IN (SELECT ID FROM HEROES AND status = :ALIVE)
+        OR
+        id IN ( SELECT * FROM HEROES )
+        OR
+        id IN ( SELECT patron_id FROM VILLIANS )
+        OR
+        id IN ( SELECT id FROM villian WHERE id = :PERSON_ID )
+    ^)
   end # === it
 
   it "adds WITH: {{MY_NAME}}" do
@@ -46,36 +61,38 @@ describe :I_Dig_Sql do
     ^)
   end
 
-  it "adds WITH: {{ * MY_NAME }}" do
-    sql = I_Dig_Sql.new
-    sql[:MY_HERO] = "SELECT * FROM hero"
-    sql[:MY_NAME] = "SELECT * FROM name"
-    sql << %^
-      {{ * MY_NAME }}
-      {{ * MY_HERO }}
-    ^
-    sql(sql).should == sql(%^
-      WITH
-      MY_NAME AS (
-        SELECT * FROM name
-      ) ,
-      MY_HERO AS (
-        SELECT * FROM hero
-      )
-      SELECT * FROM MY_NAME
-      SELECT * FROM MY_HERO
-    ^)
-  end # === it
-
-  it "replaces text with content: {{ ! MY_NAME }}" do
+  it "replaces text with content: << MY_NAME >>" do
     sql = I_Dig_Sql.new
     sql[:MY_HERO] = "SELECT * FROM hero"
     sql << %^
-      {{ ! MY_HERO }}
+      << MY_HERO >>
     ^
     sql(sql).should == "SELECT * FROM hero"
   end # === it
 
+  %w{ * id }.each { |s|
+    it "adds WITH: << #{s} MY_NAME >>" do
+      sql = I_Dig_Sql.new
+      sql[:MY_HERO] = "SELECT id, p_id FROM hero"
+      sql[:MY_NAME] = "SELECT id, n_id FROM name"
+      sql << %^
+        << #{s} MY_NAME >>
+        << #{s} MY_HERO >>
+      ^
+      sql(sql).should == sql(%^
+        WITH
+        MY_NAME AS (
+          SELECT id, n_id FROM name
+        ) ,
+        MY_HERO AS (
+          SELECT id, p_id FROM hero
+        )
+        SELECT #{s} FROM MY_NAME
+        SELECT #{s} FROM MY_HERO
+      ^)
+    end # === it
+  }
+
 end # === describe :I_Dig_Sql
 
 describe '.new' do
@@ -86,8 +103,8 @@ describe '.new' do
     second = I_Dig_Sql.new(first)
     second[:name] = "SELECT * FROM name"
     second << %^
-      {{ ! hero }}
-      {{ ! name }}
+      << hero >>
+      << name >>
     ^
     sql(second).should == sql(%^
       SELECT * FROM hero
@@ -153,3 +170,34 @@ describe :to_pair do
   end # === it
 
 end # === describe :to_pair
+
+
+describe :to_sql do
+
+  it "renders nested replacements"  do
+    i = I_Dig_Sql.new <<-EOF
+      << FIRST >>
+    EOF
+    i[:FIRST] = " << SECOND >> "
+    i[:SECOND] = " << THIRD >> "
+    i[:THIRD] = "FINAL"
+    sql(i).should == "FINAL"
+  end # === it
+
+  it "prints CTE definitions once, if used multiple times" do
+    i = I_Dig_Sql.new <<-EOF
+      {{my_cte}}
+      {{my_cte}}
+    EOF
+    i[:my_cte] = "SELECT *"
+    sql(i).should == sql(%^
+      WITH
+      my_cte AS (
+        SELECT *
+      )
+      my_cte
+      my_cte
+    ^)
+  end # === it
+
+end # === describe :to_sql

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: i_dig_sql
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 2.0.0
 platform: ruby
 authors:
 - da99
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-02 00:00:00.000000000 Z
+date: 2015-04-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler