twowaysql 0.4.1 → 0.5.0

data/.gitignore

@@ -0,0 +1,7 @@
+*.gem
+.ditz-config
+.bundle
+Gemfile.lock
+lib/twowaysql/parser.output
+pkg/*
+coverage/*

data/Gemfile

@@ -0,0 +1,4 @@
+source "http://rubygems.org"
+
+# Specify your gem's dependencies in twowaysql.gemspec
+gemspec

data/History.txt

@@ -1,3 +1,7 @@
+== release_0_5 / 2012-01-20
+* use Bundler to build this gem
+* fix old specs / features
+
 == release_0_4_1 / 2008-11-02
 * apply latest newgem structure
 

data/License.txt

@@ -1,4 +1,4 @@
-Copyright 2004-2008 the Seasar Foundation and the Others.
+Copyright 2008-2012 Takuto Wada
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -8,6 +8,6 @@ You may obtain a copy of the License at
 
 Unless required by applicable law or agreed to in writing, software
 distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, 
-either express or implied. See the License for the specific language
-governing permissions and limitations under the License.
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.

data/README.rdoc

@@ -447,7 +447,7 @@ Default is false. When true, parser preserves original actual comments. When fal
 
 == LICENSE:
 
-Copyright 2004-2008 the Seasar Foundation and the Others.
+Copyright 2008-2012 Takuto Wada
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -457,6 +457,6 @@ You may obtain a copy of the License at
 
 Unless required by applicable law or agreed to in writing, software
 distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, 
-either express or implied. See the License for the specific language
-governing permissions and limitations under the License.
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.

data/Rakefile

@@ -0,0 +1,31 @@
+require "bundler/gem_tasks"
+
+namespace :racc do
+  @grammar = "lib/twowaysql/parser"
+  @generate_parser = "racc -o #{@grammar}.rb #{@grammar}.y"
+  @debug_parser = "racc -v -o #{@grammar}.rb -g #{@grammar}.y"
+  @revert_generated = "git checkout #{@grammar}.rb"
+  
+  desc 'Regenerate parser'
+  task :gen do
+    `#{@generate_parser}`
+  end
+
+  desc 'Debug parser'
+  task :debug do
+    `#{@debug_parser}`
+
+    $:.unshift(File.dirname(__FILE__) + '/../lib')
+    require 'twowaysql'
+    template = TwoWaySQL::Template.parse($stdin, :debug => true)
+    template.merge({})
+
+    `#{@revert_generated}`
+  end
+
+  desc 'Update tab file'
+  task :tab do
+    `#{@debug_parser}`
+    `#{@revert_generated}`
+  end
+end

data/cucumber.yml

@@ -0,0 +1 @@
+rest: --format pretty

data/features/feature_helper.rb

@@ -0,0 +1,3 @@
+$:.unshift(File.dirname(__FILE__) + '/../lib')
+require 'rspec'
+require 'twowaysql'

data/features/simple/simple.feature

@@ -0,0 +1,15 @@
+Feature: Simple usage
+  TwoWaySQL simple feature description
+
+  Scenario Outline: merge context with template
+    Given template is <template>
+    And modify context <context>
+    When template merged with context
+    Then merged sql should be <sql>
+    And bound variables should be <bound_variables>
+
+  Examples:
+    | template           | context | sql               | bound_variables |
+    | SELECT * FROM emp  |         | SELECT * FROM emp | []              |
+    | SELECT * FROM emp WHERE job = /*ctx[:job]*/'CLERK' | ctx[:job] = 'MANAGER' | SELECT * FROM emp WHERE job = ? | ['MANAGER'] |
+    | SELECT * FROM emp WHERE age < /*ctx[:age]*/30 | ctx[:age] = 25 | SELECT * FROM emp WHERE age < ? | [25] |

data/features/simple/steps/stories_steps.rb

@@ -0,0 +1,29 @@
+require File.dirname(__FILE__) + '/../../feature_helper.rb'
+
+Before do
+  @ctx = {}
+end
+
+After do
+end
+
+Given /template is (.*)/ do |text|
+  @template = TwoWaySQL::Template.parse(text)
+end
+
+Given /modify context (.*)/ do |exp|
+  ctx = @ctx
+  eval(exp)
+end
+
+When /template merged with context/ do
+  @result = @template.merge(@ctx)
+end
+
+Then /merged sql should be (.*)/ do |text|
+  @result.sql.should == text
+end
+
+Then /bound variables should be (.*)/ do |exp|
+  @result.bound_variables.should == eval(exp)
+end

data/issues/issue-0c8cb2854109cb31df8a09b4bb7272fa5af52848.yaml

@@ -0,0 +1,30 @@
+--- !ditz.rubyforge.org,2008-03-06/issue 
+title: use Cucumber to describe features
+desc: use Cucumber to describe features
+type: :task
+component: twowaysql
+release: release_0_4_2
+reporter: takuto <takuto.wada@gmail.com>
+status: :closed
+disposition: :fixed
+creation_time: 2008-11-01 09:49:10.745475 Z
+references: []
+
+id: 0c8cb2854109cb31df8a09b4bb7272fa5af52848
+log_events: 
+- - 2008-11-01 09:49:12.136663 Z
+  - takuto <takuto.wada@gmail.com>
+  - created
+  - ""
+- - 2008-11-03 04:51:12.548699 Z
+  - takuto <takuto.wada@gmail.com>
+  - changed status from unstarted to in_progress
+  - ""
+- - 2008-11-03 06:44:22.905684 Z
+  - takuto <takuto.wada@gmail.com>
+  - closed with disposition fixed
+  - cucumberize spike finished. Migration from rspec should be a new task.
+- - 2008-11-03 06:45:58.082688 Z
+  - takuto <takuto.wada@gmail.com>
+  - assigned to release release_0_4_2 from unassigned
+  - ""

data/issues/project.yaml

@@ -70,3 +70,12 @@ releases:
     - takuto <takuto.wada@gmail.com>
     - released
     - ""
+- !ditz.rubyforge.org,2008-03-06/release 
+  name: release_0_4_2
+  status: :unreleased
+  release_time: 
+  log_events: 
+  - - 2008-11-03 06:45:18.083136 Z
+    - takuto <takuto.wada@gmail.com>
+    - created
+    - release_0_4_2 for cucumberization

data/lib/twowaysql.rb

@@ -1,10 +1,7 @@
-$:.unshift(File.dirname(__FILE__)) unless
-  $:.include?(File.dirname(__FILE__)) || $:.include?(File.expand_path(File.dirname(__FILE__)))
-
+require "twowaysql/version"
 require 'twowaysql/node'
 require 'twowaysql/parser'
 require 'twowaysql/template'
 
 module TwoWaySQL
-  VERSION = '0.4.1'
 end

data/lib/twowaysql/parser.rb

@@ -1,17 +1,14 @@
 #
 # DO NOT MODIFY!!!!
-# This file is automatically generated by racc 1.4.5
-# from racc grammer file "lib/twowaysql/parser.y".
+# This file is automatically generated by Racc 1.4.7
+# from Racc grammer file "".
 #
 
-require 'racc/parser'
-
-
+require 'racc/parser.rb'
 module TwoWaySQL
-
   class Parser < Racc::Parser
 
-module_eval <<'..end lib/twowaysql/parser.y modeval..id64138765db', 'lib/twowaysql/parser.y', 134
+module_eval(<<'...end parser.y/module_eval...', 'parser.y', 134)
 
 require 'strscan'
 
@@ -143,393 +140,417 @@ def line_no(pos)
   scanned.each_line { lines += 1 }
   lines
 end
-..end lib/twowaysql/parser.y modeval..id64138765db
-
-##### racc 1.4.5 generates ###
-
-racc_reduce_table = [
- 0, 0, :racc_error,
- 1, 20, :_reduce_1,
- 0, 21, :_reduce_2,
- 2, 21, :_reduce_3,
- 1, 22, :_reduce_none,
- 1, 22, :_reduce_none,
- 1, 22, :_reduce_none,
- 3, 25, :_reduce_7,
- 4, 24, :_reduce_8,
- 2, 27, :_reduce_9,
- 0, 27, :_reduce_10,
- 1, 26, :_reduce_none,
- 1, 26, :_reduce_none,
- 1, 26, :_reduce_none,
- 2, 28, :_reduce_14,
- 2, 29, :_reduce_15,
- 1, 23, :_reduce_16,
- 1, 23, :_reduce_17,
- 1, 23, :_reduce_18,
- 1, 23, :_reduce_19,
- 1, 23, :_reduce_20,
- 1, 23, :_reduce_21,
- 1, 23, :_reduce_22,
- 1, 23, :_reduce_23,
- 1, 23, :_reduce_24,
- 1, 23, :_reduce_25,
- 1, 23, :_reduce_none,
- 1, 23, :_reduce_none,
- 2, 30, :_reduce_28,
- 3, 30, :_reduce_29,
- 2, 30, :_reduce_30,
- 3, 30, :_reduce_31,
- 1, 30, :_reduce_32,
- 2, 31, :_reduce_33,
- 3, 31, :_reduce_34 ]
-
-racc_reduce_n = 35
-
-racc_shift_n = 48
+...end parser.y/module_eval...
+##### State transition tables begin ###
 
 racc_action_table = [
-     9,    36,    14,    37,    17,    19,    21,    23,    24,     4,
-     6,     8,    11,    13,    15,    16,    18,     9,    39,    14,
-    45,    17,    19,    21,    23,    24,     4,     6,     8,    11,
-    13,    15,    16,    18,     9,    47,    14,    25,    17,    19,
-    21,    23,    24,     4,     6,     8,    11,    13,    15,    16,
-    18,     9,    38,    14,     3,    17,    19,    21,    23,    24,
-     4,     6,     8,    11,    13,    15,    16,    18,     9,   nil,
-    14,   nil,    17,    19,    21,    23,    24,     4,     6,     8,
-    11,    13,    15,    16,    18,    33,    34,    35,    28,    30,
-    28,    30,    43,    44 ]
+     8,    36,     9,    37,    12,    13,    10,    11,    14,    15,
+    16,    17,    18,    19,    22,    23,    24,     8,    45,     9,
+    46,    12,    13,    10,    11,    14,    15,    16,    17,    18,
+    19,    22,    23,    24,     8,    40,     9,    25,    12,    13,
+    10,    11,    14,    15,    16,    17,    18,    19,    22,    23,
+    24,     8,    38,     9,     3,    12,    13,    10,    11,    14,
+    15,    16,    17,    18,    19,    22,    23,    24,     8,   nil,
+     9,   nil,    12,    13,    10,    11,    14,    15,    16,    17,
+    18,    19,    22,    23,    24,    35,    33,    34,    31,    32,
+    31,    32,    44,    43 ]
 
 racc_action_check = [
-    42,    18,    42,    18,    42,    42,    42,    42,    42,    42,
-    42,    42,    42,    42,    42,    42,    42,     2,    27,     2,
-    37,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-     2,     2,     2,     2,    41,    40,    41,     3,    41,    41,
+    42,    24,    42,    24,    42,    42,    42,    42,    42,    42,
+    42,    42,    42,    42,    42,    42,    42,     2,    37,     2,
+    39,     2,     2,     2,     2,     2,     2,     2,     2,     2,
+     2,     2,     2,     2,    41,    28,    41,     3,    41,    41,
     41,    41,    41,    41,    41,    41,    41,    41,    41,    41,
     41,    26,    26,    26,     1,    26,    26,    26,    26,    26,
-    26,    26,    26,    26,    26,    26,    26,    26,    32,   nil,
-    32,   nil,    32,    32,    32,    32,    32,    32,    32,    32,
-    32,    32,    32,    32,    32,    15,    15,    15,    39,    39,
-    14,    14,    35,    35 ]
+    26,    26,    26,    26,    26,    26,    26,    26,    27,   nil,
+    27,   nil,    27,    27,    27,    27,    27,    27,    27,    27,
+    27,    27,    27,    27,    27,    22,    22,    22,     9,     9,
+    40,    40,    34,    34 ]
 
 racc_action_pointer = [
-   nil,    54,    15,    37,   nil,   nil,   nil,   nil,   nil,   nil,
-   nil,   nil,   nil,   nil,    84,    77,   nil,   nil,    -7,   nil,
-   nil,   nil,   nil,   nil,   nil,   nil,    49,    13,   nil,   nil,
-   nil,   nil,    66,   nil,   nil,    84,   nil,    12,   nil,    82,
-    32,    32,    -2,   nil,   nil,   nil,   nil,   nil ]
+   nil,    54,    15,    37,   nil,   nil,   nil,   nil,   nil,    82,
+   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
+   nil,   nil,    77,   nil,    -7,   nil,    49,    66,    30,   nil,
+   nil,   nil,   nil,   nil,    84,   nil,   nil,    10,   nil,    17,
+    84,    32,    -2,   nil,   nil,   nil,   nil,   nil ]
 
 racc_action_default = [
-    -2,   -35,    -1,   -35,   -21,    -3,   -22,    -4,   -23,    -2,
-    -5,   -24,    -6,   -25,    -2,   -35,   -32,   -18,   -35,   -19,
-   -26,   -16,   -27,   -17,   -20,    48,   -35,   -10,    -2,   -11,
-    -2,   -12,   -13,   -30,   -28,   -35,   -33,   -35,    -7,    -2,
-   -35,   -14,   -15,   -31,   -29,   -34,    -9,    -8 ]
+    -2,   -35,    -1,   -35,    -3,    -4,    -5,    -6,    -2,    -2,
+   -16,   -17,   -18,   -19,   -20,   -21,   -22,   -23,   -24,   -25,
+   -26,   -27,   -35,   -32,   -35,    48,   -35,   -13,   -10,   -11,
+   -12,    -2,    -2,   -28,   -35,   -30,   -33,   -35,    -7,   -35,
+    -2,   -14,   -15,   -29,   -31,   -34,    -8,    -9 ]
 
 racc_goto_table = [
-     2,    27,     1,    40,   nil,   nil,   nil,   nil,   nil,    26,
+     2,     1,    28,    39,   nil,   nil,   nil,   nil,    26,   nil,
+   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
    nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
-   nil,   nil,   nil,   nil,   nil,   nil,    46,   nil,    41,   nil,
-    42 ]
+   nil,    41,    42,    47 ]
 
 racc_goto_check = [
-     2,     7,     1,     8,   nil,   nil,   nil,   nil,   nil,     2,
+     2,     1,     7,     8,   nil,   nil,   nil,   nil,     2,   nil,
+   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
    nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
-   nil,   nil,   nil,   nil,   nil,   nil,     7,   nil,     2,   nil,
-     2 ]
+   nil,     2,     2,     7 ]
 
 racc_goto_pointer = [
-   nil,     2,     0,   nil,   nil,   nil,   nil,   -13,   -24,   nil,
+   nil,     1,     0,   nil,   nil,   nil,   nil,    -7,   -25,   nil,
    nil,   nil,   nil ]
 
 racc_goto_default = [
-   nil,   nil,    32,     5,     7,    10,    12,   nil,   nil,    29,
-    31,    20,    22 ]
+   nil,   nil,    27,     4,     5,     6,     7,   nil,   nil,    29,
+    30,    20,    21 ]
 
-racc_token_table = {
- false => 0,
- Object.new => 1,
- :BEGIN => 2,
- :END => 3,
- :IF => 4,
- :ELSE => 5,
- :AND => 6,
- :OR => 7,
- :IDENT => 8,
- :STRING_LITERAL => 9,
- :SPACES => 10,
- :COMMA => 11,
- :LPAREN => 12,
- :RPAREN => 13,
- :QUESTION => 14,
- :ACTUAL_COMMENT => 15,
- :BIND_VARIABLE => 16,
- :PAREN_BIND_VARIABLE => 17,
- :EMBED_VARIABLE => 18 }
+racc_reduce_table = [
+  0, 0, :racc_error,
+  1, 20, :_reduce_1,
+  0, 21, :_reduce_2,
+  2, 21, :_reduce_3,
+  1, 22, :_reduce_none,
+  1, 22, :_reduce_none,
+  1, 22, :_reduce_none,
+  3, 25, :_reduce_7,
+  4, 24, :_reduce_8,
+  2, 27, :_reduce_9,
+  0, 27, :_reduce_10,
+  1, 26, :_reduce_none,
+  1, 26, :_reduce_none,
+  1, 26, :_reduce_none,
+  2, 28, :_reduce_14,
+  2, 29, :_reduce_15,
+  1, 23, :_reduce_16,
+  1, 23, :_reduce_17,
+  1, 23, :_reduce_18,
+  1, 23, :_reduce_19,
+  1, 23, :_reduce_20,
+  1, 23, :_reduce_21,
+  1, 23, :_reduce_22,
+  1, 23, :_reduce_23,
+  1, 23, :_reduce_24,
+  1, 23, :_reduce_25,
+  1, 23, :_reduce_none,
+  1, 23, :_reduce_none,
+  2, 30, :_reduce_28,
+  3, 30, :_reduce_29,
+  2, 30, :_reduce_30,
+  3, 30, :_reduce_31,
+  1, 30, :_reduce_32,
+  2, 31, :_reduce_33,
+  3, 31, :_reduce_34 ]
 
-racc_use_result_var = true
+racc_reduce_n = 35
+
+racc_shift_n = 48
+
+racc_token_table = {
+  false => 0,
+  :error => 1,
+  :BEGIN => 2,
+  :END => 3,
+  :IF => 4,
+  :ELSE => 5,
+  :AND => 6,
+  :OR => 7,
+  :IDENT => 8,
+  :STRING_LITERAL => 9,
+  :SPACES => 10,
+  :COMMA => 11,
+  :LPAREN => 12,
+  :RPAREN => 13,
+  :QUESTION => 14,
+  :ACTUAL_COMMENT => 15,
+  :BIND_VARIABLE => 16,
+  :PAREN_BIND_VARIABLE => 17,
+  :EMBED_VARIABLE => 18 }
 
 racc_nt_base = 19
 
+racc_use_result_var = true
+
 Racc_arg = [
- racc_action_table,
- racc_action_check,
- racc_action_default,
- racc_action_pointer,
- racc_goto_table,
- racc_goto_check,
- racc_goto_default,
- racc_goto_pointer,
- racc_nt_base,
- racc_reduce_table,
- racc_token_table,
- racc_shift_n,
- racc_reduce_n,
- racc_use_result_var ]
+  racc_action_table,
+  racc_action_check,
+  racc_action_default,
+  racc_action_pointer,
+  racc_goto_table,
+  racc_goto_check,
+  racc_goto_default,
+  racc_goto_pointer,
+  racc_nt_base,
+  racc_reduce_table,
+  racc_token_table,
+  racc_shift_n,
+  racc_reduce_n,
+  racc_use_result_var ]
 
 Racc_token_to_s_table = [
-'$end',
-'error',
-'BEGIN',
-'END',
-'IF',
-'ELSE',
-'AND',
-'OR',
-'IDENT',
-'STRING_LITERAL',
-'SPACES',
-'COMMA',
-'LPAREN',
-'RPAREN',
-'QUESTION',
-'ACTUAL_COMMENT',
-'BIND_VARIABLE',
-'PAREN_BIND_VARIABLE',
-'EMBED_VARIABLE',
-'$start',
-'sql',
-'stmt_list',
-'stmt',
-'primary',
-'if_stmt',
-'begin_stmt',
-'sub_stmt',
-'else_stmt',
-'and_stmt',
-'or_stmt',
-'bind_var',
-'embed_var']
+  "$end",
+  "error",
+  "BEGIN",
+  "END",
+  "IF",
+  "ELSE",
+  "AND",
+  "OR",
+  "IDENT",
+  "STRING_LITERAL",
+  "SPACES",
+  "COMMA",
+  "LPAREN",
+  "RPAREN",
+  "QUESTION",
+  "ACTUAL_COMMENT",
+  "BIND_VARIABLE",
+  "PAREN_BIND_VARIABLE",
+  "EMBED_VARIABLE",
+  "$start",
+  "sql",
+  "stmt_list",
+  "stmt",
+  "primary",
+  "if_stmt",
+  "begin_stmt",
+  "sub_stmt",
+  "else_stmt",
+  "and_stmt",
+  "or_stmt",
+  "bind_var",
+  "embed_var" ]
 
 Racc_debug_parser = false
 
-##### racc system variables end #####
+##### State transition tables end #####
 
- # reduce 0 omitted
+# reduce 0 omitted
 
-module_eval <<'.,.,', 'lib/twowaysql/parser.y', 8
-  def _reduce_1( val, _values, result )
-                  result = RootNode.new( val[0] )
-   result
+module_eval(<<'.,.,', 'parser.y', 6)
+  def _reduce_1(val, _values, result)
+                      result = RootNode.new( val[0] )
+                
+    result
   end
 .,.,
 
-module_eval <<'.,.,', 'lib/twowaysql/parser.y', 13
-  def _reduce_2( val, _values, result )
-                  result = []
-   result
+module_eval(<<'.,.,', 'parser.y', 11)
+  def _reduce_2(val, _values, result)
+                      result = []
+                
+    result
   end
 .,.,
 
-module_eval <<'.,.,', 'lib/twowaysql/parser.y', 17
-  def _reduce_3( val, _values, result )
-                  result.push val[1]
-   result
+module_eval(<<'.,.,', 'parser.y', 15)
+  def _reduce_3(val, _values, result)
+                      result.push val[1]
+                
+    result
   end
 .,.,
 
- # reduce 4 omitted
+# reduce 4 omitted
 
- # reduce 5 omitted
+# reduce 5 omitted
 
- # reduce 6 omitted
+# reduce 6 omitted
 
-module_eval <<'.,.,', 'lib/twowaysql/parser.y', 26
-  def _reduce_7( val, _values, result )
-                  result = BeginNode.new( val[1] )
-   result
+module_eval(<<'.,.,', 'parser.y', 24)
+  def _reduce_7(val, _values, result)
+                      result = BeginNode.new( val[1] )
+                
+    result
   end
 .,.,
 
-module_eval <<'.,.,', 'lib/twowaysql/parser.y', 31
-  def _reduce_8( val, _values, result )
-                  result = IfNode.new( val[0][1], val[1], val[2] )
-   result
+module_eval(<<'.,.,', 'parser.y', 29)
+  def _reduce_8(val, _values, result)
+                      result = IfNode.new( val[0][1], val[1], val[2] )
+                
+    result
   end
 .,.,
 
-module_eval <<'.,.,', 'lib/twowaysql/parser.y', 36
-  def _reduce_9( val, _values, result )
-                  result = val[1]
-   result
+module_eval(<<'.,.,', 'parser.y', 34)
+  def _reduce_9(val, _values, result)
+                      result = val[1]
+                
+    result
   end
 .,.,
 
-module_eval <<'.,.,', 'lib/twowaysql/parser.y', 40
-  def _reduce_10( val, _values, result )
-                  result = nil
-   result
+module_eval(<<'.,.,', 'parser.y', 38)
+  def _reduce_10(val, _values, result)
+                      result = nil
+                
+    result
   end
 .,.,
 
- # reduce 11 omitted
+# reduce 11 omitted
 
- # reduce 12 omitted
+# reduce 12 omitted
 
- # reduce 13 omitted
+# reduce 13 omitted
 
-module_eval <<'.,.,', 'lib/twowaysql/parser.y', 49
-  def _reduce_14( val, _values, result )
-                  result = SubStatementNode.new( val[0][1], val[1] )
-   result
+module_eval(<<'.,.,', 'parser.y', 47)
+  def _reduce_14(val, _values, result)
+                      result = SubStatementNode.new( val[0][1], val[1] )
+                
+    result
   end
 .,.,
 
-module_eval <<'.,.,', 'lib/twowaysql/parser.y', 54
-  def _reduce_15( val, _values, result )
-                  result = SubStatementNode.new( val[0][1], val[1] )
-   result
+module_eval(<<'.,.,', 'parser.y', 52)
+  def _reduce_15(val, _values, result)
+                      result = SubStatementNode.new( val[0][1], val[1] )
+                
+    result
   end
 .,.,
 
-module_eval <<'.,.,', 'lib/twowaysql/parser.y', 59
-  def _reduce_16( val, _values, result )
-                  result = LiteralNode.new( val[0][1] )
-   result
+module_eval(<<'.,.,', 'parser.y', 57)
+  def _reduce_16(val, _values, result)
+                      result = LiteralNode.new( val[0][1] )
+                
+    result
   end
 .,.,
 
-module_eval <<'.,.,', 'lib/twowaysql/parser.y', 63
-  def _reduce_17( val, _values, result )
-                  result = LiteralNode.new( val[0][1] )
-   result
+module_eval(<<'.,.,', 'parser.y', 61)
+  def _reduce_17(val, _values, result)
+                      result = LiteralNode.new( val[0][1] )
+                
+    result
   end
 .,.,
 
-module_eval <<'.,.,', 'lib/twowaysql/parser.y', 67
-  def _reduce_18( val, _values, result )
-                  result = LiteralNode.new( val[0][1] )
-   result
+module_eval(<<'.,.,', 'parser.y', 65)
+  def _reduce_18(val, _values, result)
+                      result = LiteralNode.new( val[0][1] )
+                
+    result
   end
 .,.,
 
-module_eval <<'.,.,', 'lib/twowaysql/parser.y', 71
-  def _reduce_19( val, _values, result )
-                  result = LiteralNode.new( val[0][1] )
-   result
+module_eval(<<'.,.,', 'parser.y', 69)
+  def _reduce_19(val, _values, result)
+                      result = LiteralNode.new( val[0][1] )
+                
+    result
   end
 .,.,
 
-module_eval <<'.,.,', 'lib/twowaysql/parser.y', 75
-  def _reduce_20( val, _values, result )
-                  result = WhiteSpaceNode.new( val[0][1], @preserve_space )
-   result
+module_eval(<<'.,.,', 'parser.y', 73)
+  def _reduce_20(val, _values, result)
+                      result = WhiteSpaceNode.new( val[0][1], @preserve_space )
+                
+    result
   end
 .,.,
 
-module_eval <<'.,.,', 'lib/twowaysql/parser.y', 79
-  def _reduce_21( val, _values, result )
-                  result = LiteralNode.new( val[0][1] )
-   result
+module_eval(<<'.,.,', 'parser.y', 77)
+  def _reduce_21(val, _values, result)
+                      result = LiteralNode.new( val[0][1] )
+                
+    result
   end
 .,.,
 
-module_eval <<'.,.,', 'lib/twowaysql/parser.y', 83
-  def _reduce_22( val, _values, result )
-                  result = LiteralNode.new( val[0][1] )
-   result
+module_eval(<<'.,.,', 'parser.y', 81)
+  def _reduce_22(val, _values, result)
+                      result = LiteralNode.new( val[0][1] )
+                
+    result
   end
 .,.,
 
-module_eval <<'.,.,', 'lib/twowaysql/parser.y', 87
-  def _reduce_23( val, _values, result )
-                  result = LiteralNode.new( val[0][1] )
-   result
+module_eval(<<'.,.,', 'parser.y', 85)
+  def _reduce_23(val, _values, result)
+                      result = LiteralNode.new( val[0][1] )
+                
+    result
   end
 .,.,
 
-module_eval <<'.,.,', 'lib/twowaysql/parser.y', 92
-  def _reduce_24( val, _values, result )
-                  @num_questions += 1
+module_eval(<<'.,.,', 'parser.y', 89)
+  def _reduce_24(val, _values, result)
+                      @num_questions += 1
                   result = QuestionNode.new( @num_questions )
-   result
+                
+    result
   end
 .,.,
 
-module_eval <<'.,.,', 'lib/twowaysql/parser.y', 96
-  def _reduce_25( val, _values, result )
-                  result = ActualCommentNode.new( val[0][1] , val[0][2] )
-   result
+module_eval(<<'.,.,', 'parser.y', 94)
+  def _reduce_25(val, _values, result)
+                      result = ActualCommentNode.new( val[0][1] , val[0][2] )
+                
+    result
   end
 .,.,
 
- # reduce 26 omitted
+# reduce 26 omitted
 
- # reduce 27 omitted
+# reduce 27 omitted
 
-module_eval <<'.,.,', 'lib/twowaysql/parser.y', 103
-  def _reduce_28( val, _values, result )
-                  result = BindVariableNode.new( val[0][1] )
-   result
+module_eval(<<'.,.,', 'parser.y', 101)
+  def _reduce_28(val, _values, result)
+                      result = BindVariableNode.new( val[0][1] )
+                
+    result
   end
 .,.,
 
-module_eval <<'.,.,', 'lib/twowaysql/parser.y', 107
-  def _reduce_29( val, _values, result )
-                  result = BindVariableNode.new( val[0][1] )
-   result
+module_eval(<<'.,.,', 'parser.y', 105)
+  def _reduce_29(val, _values, result)
+                      result = BindVariableNode.new( val[0][1] )
+                
+    result
   end
 .,.,
 
-module_eval <<'.,.,', 'lib/twowaysql/parser.y', 111
-  def _reduce_30( val, _values, result )
-                  result = BindVariableNode.new( val[0][1] )
-   result
+module_eval(<<'.,.,', 'parser.y', 109)
+  def _reduce_30(val, _values, result)
+                      result = BindVariableNode.new( val[0][1] )
+                
+    result
   end
 .,.,
 
-module_eval <<'.,.,', 'lib/twowaysql/parser.y', 115
-  def _reduce_31( val, _values, result )
-                  result = BindVariableNode.new( val[0][1] )
-   result
+module_eval(<<'.,.,', 'parser.y', 113)
+  def _reduce_31(val, _values, result)
+                      result = BindVariableNode.new( val[0][1] )
+                
+    result
   end
 .,.,
 
-module_eval <<'.,.,', 'lib/twowaysql/parser.y', 119
-  def _reduce_32( val, _values, result )
-                  result = ParenBindVariableNode.new( val[0][1] )
-   result
+module_eval(<<'.,.,', 'parser.y', 117)
+  def _reduce_32(val, _values, result)
+                      result = ParenBindVariableNode.new( val[0][1] )
+                
+    result
   end
 .,.,
 
-module_eval <<'.,.,', 'lib/twowaysql/parser.y', 124
-  def _reduce_33( val, _values, result )
-                  result = EmbedVariableNode.new( val[0][1] )
-   result
+module_eval(<<'.,.,', 'parser.y', 122)
+  def _reduce_33(val, _values, result)
+                      result = EmbedVariableNode.new( val[0][1] )
+                
+    result
   end
 .,.,
 
-module_eval <<'.,.,', 'lib/twowaysql/parser.y', 128
-  def _reduce_34( val, _values, result )
-                  result = EmbedVariableNode.new( val[0][1] )
-   result
+module_eval(<<'.,.,', 'parser.y', 126)
+  def _reduce_34(val, _values, result)
+                      result = EmbedVariableNode.new( val[0][1] )
+                
+    result
   end
 .,.,
 
- def _reduce_none( val, _values, result )
-  result
- end
+def _reduce_none(val, _values, result)
+  val[0]
+end
 
   end   # class Parser
-
-end   # module TwoWaySQL
+  end   # module TwoWaySQL

data/lib/twowaysql/version.rb

@@ -0,0 +1,3 @@
+module TwoWaySQL
+  VERSION = "0.5.0"
+end

data/spec/spec_helper.rb

@@ -1,11 +1,3 @@
-begin
-  require 'spec'
-rescue LoadError
-  require 'rubygems'
-  gem 'rspec'
-  require 'spec'
-end
-
 $:.unshift(File.dirname(__FILE__) + '/../lib')
+require 'rspec'
 require 'twowaysql'
-

data/twowaysql.gemspec

@@ -0,0 +1,26 @@
+# -*- encoding: utf-8 -*-
+$:.push File.expand_path("../lib", __FILE__)
+require "twowaysql/version"
+
+Gem::Specification.new do |s|
+  s.name        = "twowaysql"
+  s.version     = TwoWaySQL::VERSION
+  s.authors     = ["Takuto Wada"]
+  s.email       = ["takuto.wada@gmail.com"]
+  s.homepage    = "https://github.com/twada/twowaysql"
+  s.summary     = %q{Template Engine for SQL}
+  s.description = %q{Template Engine for SQL}
+
+  s.rubyforge_project = "twowaysql"
+
+  s.files         = `git ls-files`.split("\n")
+  s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
+  s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
+  s.require_paths = ["lib"]
+
+  # specify any dependencies here; for example:
+  s.add_development_dependency "racc"
+  s.add_development_dependency "rspec"
+  s.add_development_dependency "cucumber"
+  # s.add_runtime_dependency "rest-client"
+end

metadata

@@ -1,55 +1,68 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: twowaysql
-version: !ruby/object:Gem::Version 
-  version: 0.4.1
+version: !ruby/object:Gem::Version
+  version: 0.5.0
+  prerelease: 
 platform: ruby
-authors: 
+authors:
 - Takuto Wada
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2008-11-03 00:00:00 +09:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
-  name: newgem
+date: 2012-01-20 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: racc
+  requirement: &70290123701160 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: 1.0.5
-    version: 
-- !ruby/object:Gem::Dependency 
-  name: hoe
+  prerelease: false
+  version_requirements: *70290123701160
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: &70290123700720 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: 1.8.0
-    version: 
+  prerelease: false
+  version_requirements: *70290123700720
+- !ruby/object:Gem::Dependency
+  name: cucumber
+  requirement: &70290123700260 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: *70290123700260
 description: Template Engine for SQL
-email: 
+email:
 - takuto.wada@gmail.com
 executables: []
-
 extensions: []
-
-extra_rdoc_files: 
+extra_rdoc_files: []
+files:
+- .gitignore
+- Gemfile
 - History.txt
 - License.txt
-- Manifest.txt
-- README.rdoc
-files: 
-- History.txt
-- License.txt
-- Manifest.txt
 - README.rdoc
+- Rakefile
+- cucumber.yml
+- features/feature_helper.rb
+- features/simple/simple.feature
+- features/simple/steps/stories_steps.rb
 - issues/issue-001c53236380a42cd8c5a9099bbcc6ec613919c2.yaml
+- issues/issue-0c8cb2854109cb31df8a09b4bb7272fa5af52848.yaml
 - issues/issue-1cee7e821865a216674832b0186bd92792680571.yaml
 - issues/issue-25efcfc383f3b0f6c0e2730ae7c2975bb2b3de26.yaml
 - issues/issue-279105dd0d9f03514d318f5eab5e99c4c2d47fda.yaml
@@ -76,37 +89,49 @@ files:
 - lib/twowaysql/parser.rb
 - lib/twowaysql/parser.y
 - lib/twowaysql/template.rb
+- lib/twowaysql/version.rb
 - spec/large_sql_spec.rb
 - spec/learning_regex_spec.rb
 - spec/spec.opts
 - spec/spec_helper.rb
 - spec/twowaysql_spec.rb
-has_rdoc: true
-homepage: http://twowaysql.rubyforge.org
+- twowaysql.gemspec
+homepage: https://github.com/twada/twowaysql
+licenses: []
 post_install_message: 
-rdoc_options: 
-- --main
-- README.rdoc
-require_paths: 
+rdoc_options: []
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
-  version: 
-required_rubygems_version: !ruby/object:Gem::Requirement 
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
-  version: 
+required_ruby_version: !ruby/object:Gem::Requirement
+  none: false
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+      segments:
+      - 0
+      hash: 164586672608732535
+required_rubygems_version: !ruby/object:Gem::Requirement
+  none: false
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+      segments:
+      - 0
+      hash: 164586672608732535
 requirements: []
-
 rubyforge_project: twowaysql
-rubygems_version: 1.2.0
+rubygems_version: 1.8.10
 signing_key: 
-specification_version: 2
+specification_version: 3
 summary: Template Engine for SQL
-test_files: []
-
+test_files:
+- features/feature_helper.rb
+- features/simple/simple.feature
+- features/simple/steps/stories_steps.rb
+- spec/large_sql_spec.rb
+- spec/learning_regex_spec.rb
+- spec/spec.opts
+- spec/spec_helper.rb
+- spec/twowaysql_spec.rb

data/Manifest.txt

@@ -1,36 +0,0 @@
-History.txt
-License.txt
-Manifest.txt
-README.rdoc
-issues/issue-001c53236380a42cd8c5a9099bbcc6ec613919c2.yaml
-issues/issue-1cee7e821865a216674832b0186bd92792680571.yaml
-issues/issue-25efcfc383f3b0f6c0e2730ae7c2975bb2b3de26.yaml
-issues/issue-279105dd0d9f03514d318f5eab5e99c4c2d47fda.yaml
-issues/issue-28cde89ed3eb306957edc90595b1d16bf43daf42.yaml
-issues/issue-2a172da16d3a59adc8448f2e36ec48b36951e02d.yaml
-issues/issue-39023ea09e17e2d64bcef03aa59cdfe38b78ad5b.yaml
-issues/issue-4bc308d55ae91f266e656162a4147d356de1166c.yaml
-issues/issue-5c973ef5bb074eacca0c6c84f7d27c4267773ea8.yaml
-issues/issue-664986b219202ff1948cab717b56e7540f493561.yaml
-issues/issue-6daccddf089d11d42bf016897da98f70cf5ab46c.yaml
-issues/issue-897995fa10377eabdf597e8e7692f17087c76923.yaml
-issues/issue-901f65630639507c8b05b466790e9f22256c6450.yaml
-issues/issue-a185b4247f64c1104bc49ebf823b57b5de3d06f8.yaml
-issues/issue-bd38c1cdc965d73dd629a81db2de1bcdcf4b10b8.yaml
-issues/issue-dca4b19aa13de59838b33e03252bf824670a2d12.yaml
-issues/issue-ec698dd75fb717a23045852de2fb367cff119b2e.yaml
-issues/issue-f1bd40de5458397d9b142ea3e197e5264e0dcdbf.yaml
-issues/issue-f2b773020b54f839c03d899b38b5113c8fd991df.yaml
-issues/issue-f39b907d01d7fa93df8c7a9de2e1b5e27727ee0a.yaml
-issues/issue-f64d73ed4f9854f1ded77e6496dbf59cfb3770a7.yaml
-issues/project.yaml
-lib/twowaysql.rb
-lib/twowaysql/node.rb
-lib/twowaysql/parser.rb
-lib/twowaysql/parser.y
-lib/twowaysql/template.rb
-spec/large_sql_spec.rb
-spec/learning_regex_spec.rb
-spec/spec.opts
-spec/spec_helper.rb
-spec/twowaysql_spec.rb