each_sql 0.3.1 → 0.4.0

data/CHANGELOG.markdown

@@ -1,10 +1,13 @@
+### 0.4.0 / 2013/05/15
+* Returns an Enumerator instead of an Array when block is not given
+
 ### 0.3.1 / 2012/03/15
 * Bug fix: `begin transaction`
 * `EachSQL#clear`
 
 ### 0.3.0 / 2012/03/10
 * Internal implementation revised.
- * At first, I thought this would be trivial, 
+ * At first, I thought this would be trivial,
    that I didn't need a real parser for just breaking SQL scripts
    into individual executable units.
    I couldn't be more wrong. Codes for handling a few exceptional cases

data/README.markdown

@@ -1,7 +1,7 @@
 each_sql
 ========
 
-Enumerate executable blocks in the given SQL script.
+Enumerate executable blocks in the given SQL script. (experimental)
 
 Installation
 ------------

data/VERSION

@@ -1 +1 @@
-0.3.1
+0.4.0

data/lib/each_sql/each_sql.rb

@@ -68,6 +68,8 @@ class EachSQL
   # @yield [String]
   # @return [NilClass]
   def each
+    return enum_for(:each) unless block_given?
+
     result = shift
     sqls   = (result[:sqls] + result[:leftover]).
               map { |sql| strip_sql(sql) }.

data/lib/each_sql/parser.rb

@@ -19,7 +19,7 @@ module Parser
 
     Citrus.eval erb.result(binding)
 
-    @@parser[[type, delimiter]] = 
+    @@parser[[type, delimiter]] =
       case type
       when :default
         eval "EachSQL::Parser::Default#{suffix}"

data/lib/each_sql.rb

@@ -9,10 +9,11 @@ require 'each_sql/parser'
 # @param[String] input Input script.
 # @param[Symbol] The type of the input SQL script. :default, :mysql, and :oracle (or :plsql)
 # @yield[String] Executable SQL statement or block.
-# @return[Array] Array of executable SQL statements and blocks.
+# @return[Enumerator] Enumerator of executable SQL statements and blocks.
 def EachSQL input, type = :default
+  return enum_for(:EachSQL, input, type) unless block_given?
+
   esql   = EachSQL.new(type)
-  ret    = []
   result = {}
 
   process = lambda {
@@ -20,11 +21,7 @@ def EachSQL input, type = :default
     result = esql.shift
     sqls   = result[:sqls]
     sqls.each do |sql|
-      if block_given?
-        yield sql
-      else
-        ret << sql
-      end
+      yield sql
     end
   }
 
@@ -50,13 +47,7 @@ def EachSQL input, type = :default
   end
 
   if sql = result[:leftover]
-    if block_given?
-      yield sql
-    else
-      ret << sql
-    end
+    yield sql
   end
-
-  ret
 end
 

data/test/test_each_sql.rb

@@ -43,7 +43,7 @@ class TestEachSql < Test::Unit::TestCase
   def test_parser_cache
     [:default, :mysql, :oracle, :postgres].each do |typ|
       %w[';', '$$', '//'].each do |delim|
-        arr = 
+        arr =
           10.times.map {
             EachSQL::Parser.parser_for typ, delim
           }
@@ -88,7 +88,8 @@ class TestEachSql < Test::Unit::TestCase
       end
       assert_equal data['each'].length, cnt
       assert_equal cnt, EachSQL(script, typ).to_a.length
-      assert_equal EachSQL(script, typ).to_a, EachSQL(script, typ).map { |e| e }
+      assert_equal EachSQL(script, typ).to_a,
+        EachSQL(script, typ).each.each.take_while { true }.map { |e| e }
     end
 	end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: each_sql
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.4.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-03-15 00:00:00.000000000 Z
+date: 2013-05-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: citrus
@@ -135,7 +135,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 4467039074985070644
+      hash: 3224767987852485011
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -144,7 +144,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.18
+rubygems_version: 1.8.25
 signing_key: 
 specification_version: 3
 summary: Enumerate each SQL statement in SQL scripts.