anbt-sql-formatter 0.0.5 → 0.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 06c0d1af78c569f0eb6c74286ade60edd1aaeca8
-  data.tar.gz: f1366c1c4e7a1769c5384ad2ff102702499466e5
+SHA256:
+  metadata.gz: 533c8ba946b0b41bb3e9b56631b9e4fcbf7fd8e643b6c0875c1a3d1b2f8f25c8
+  data.tar.gz: e74a08b3d979b1cab4d998533c8ed6167cfe703ee75288da4e45d31c25e91d41
 SHA512:
-  metadata.gz: 0e12afe4467dba91c3ac4f18f39594b33d3a73f4008b37e46fa22f8f51dc6041b6c470c83ee4b22fdfeffdda7db12a41d9a3c96239e375c803df6390e47c2fe4
-  data.tar.gz: 44e782498886cebb11e7b49a087b35d46d30364d10709efc20f1dd6f13ad790b087f41e34f40083f7a4d01328be21aca18f47b04a1aad0a6e64cb77107c6b42b
+  metadata.gz: cfd6fdc3fc8621957778f559464c7ab863cc5665b0ec084cbf755010ee6fd1699e7f3ad1952bc85d43d6d1fb233eb1b49858935d3c67fe1a7f4b9c4b8c20e476
+  data.tar.gz: 9b8ddfe422d4fb89f381751c95517ab8252a9abd6a915df228886deffec4d478c95f9983a356d681ac12ea8eb035cdb21424816074d4980547897a03c5328e7d

data/.gitignore

@@ -2,3 +2,6 @@
 .bundle
 Gemfile.lock
 pkg/*
+
+# Emacs
+*~

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+# 0.0.6 (2018-03-31)
+
+No breaking changes.
+
+
 # 0.0.5 (2016-11-29)
 
 No breaking changes.

data/lib/anbt-sql-formatter/formatter.rb

@@ -57,13 +57,13 @@ class AnbtSql
 
         statements = split_to_statements(tokens)
 
-        statements = statements.map{|tokens|
-          format_list(tokens)
+        statements = statements.map{|inner_tokens|
+          format_list(inner_tokens)
         }
 
         # 変換結果を文字列に戻す。
-        after = statements.map{|tokens|
-          tokens.map{ |t| t.string }.join("")
+        after = statements.map{|inner_tokens|
+          inner_tokens.map{ |t| t.string }.join("")
         }.join("\n;\n\n").sub( /\n\n\Z/, "" )
 
         after += "\n" if is_sql_ends_with_new_line
@@ -175,6 +175,8 @@ class AnbtSql
       prev = AnbtSql::Token.new(AnbtSql::TokenConstants::SPACE,
                                   " ")
 
+      encounter_between = false
+
       index = 0
       # Length of tokens changes in loop!
       while index < tokens.size
@@ -337,8 +339,6 @@ class AnbtSql
       remove_symbol_side_space(tokens)
       concat_operator_for_oracle(tokens)
 
-      encounter_between = false
-
       format_list_main_loop(tokens)
 
       special_treatment_for_parenthesis_with_one_element(tokens)

data/lib/anbt-sql-formatter/version.rb

@@ -1,7 +1,7 @@
 module Anbt
   module Sql
     module Formatter
-      VERSION = "0.0.5"
+      VERSION = "0.0.6"
     end
   end
 end

data/test/test_coarse-tokenizer.rb

@@ -61,11 +61,9 @@ class TestCoarseTokenizer < Test::Unit::TestCase
   end
   
 
-  def test_tokenize
-    msg = "tokenize - "
-
+  def test_tokenize_1
     assert_equals(
-      msg,
+      "tokenize 1",
       strip_indent(
         <<-EOB
         plain (aa)
@@ -77,10 +75,11 @@ class TestCoarseTokenizer < Test::Unit::TestCase
         EOB
       )))
     )
-                 
-    ########
+  end
+
+  def test_tokenize_2
     assert_equals(
-      msg,
+      "tokenize 2",
       strip_indent(
         <<-EOB
         plain (aa )
@@ -93,10 +92,11 @@ class TestCoarseTokenizer < Test::Unit::TestCase
         EOB
       )))
     )
+  end
 
-    ########
+  def test_tokenize_3
     assert_equals(
-      msg,
+      "tokenize 3",
       strip_indent(
         <<-EOB
         plain (aa )
@@ -109,10 +109,11 @@ class TestCoarseTokenizer < Test::Unit::TestCase
         EOB
       )))
     )
+  end
 
-    ########
+  def test_tokenize_4
     assert_equals(
-      msg,
+      "tokenize 4",
       strip_indent(
         <<-EOB
         plain (aa )
@@ -127,10 +128,11 @@ class TestCoarseTokenizer < Test::Unit::TestCase
         EOB
       )))
     )
+  end
 
-    ########
+  def test_tokenize_5
     assert_equals(
-      msg,
+      "tokenize 5",
       strip_indent(
         <<-EOB
         plain (aa )
@@ -144,10 +146,11 @@ class TestCoarseTokenizer < Test::Unit::TestCase
         EOB
       )))
     )
+  end
 
-    ########
+  def test_tokenize_6
     assert_equals(
-      msg + "begin with multiline comment",
+      "tokenize - begin with multiline comment",
       strip_indent(
         <<-EOB
         comment_multi (/* bb */)
@@ -163,12 +166,9 @@ class TestCoarseTokenizer < Test::Unit::TestCase
   end
 
 
-  def test_string_in_string
-    msg = "string_in_string"
-
-    ########
+  def test_string_in_string_1
     assert_equals(
-      msg,
+      "string_in_string 1",
       strip_indent(
         <<-EOB
         quote_double ("aa'bb'cc")
@@ -180,10 +180,11 @@ class TestCoarseTokenizer < Test::Unit::TestCase
         EOB
       )))
     )
+  end
 
-    ########
+  def test_string_in_string_2
     assert_equals(
-      msg,
+      "string_in_string 2",
       strip_indent(
         <<-EOB
         quote_single ('aa"bb"cc')
@@ -198,12 +199,9 @@ class TestCoarseTokenizer < Test::Unit::TestCase
   end
 
 
-  def test_comment_in_comment
-    msg = "comment_in_comment - "
-
-    ########
+  def test_comment_in_comment_1
     assert_equals(
-      msg,
+      "comment_in_comment 1",
       strip_indent(
         <<-EOB
         comment_single (--a--b)
@@ -215,10 +213,11 @@ class TestCoarseTokenizer < Test::Unit::TestCase
         EOB
       )))
     )
+  end
 
-    ########
+  def test_comment_in_comment_2
     assert_equals(
-      msg,
+      "comment_in_comment 2",
       strip_indent(
         <<-EOB
         comment_single (-- aa /* bb */)
@@ -230,10 +229,11 @@ class TestCoarseTokenizer < Test::Unit::TestCase
         EOB
       )))
     )
+  end
 
-    ########
+  def test_comment_in_comment_3
     assert_equals(
-      msg,
+      "comment_in_comment 3",
       strip_indent(
         <<-EOB
         comment_multi (/* aa /* bb */)
@@ -245,10 +245,11 @@ class TestCoarseTokenizer < Test::Unit::TestCase
         EOB
       )))
     )
+  end
 
-    ########
+  def test_comment_in_comment_4
     assert_equals(
-      msg,
+      "comment_in_comment 4",
       strip_indent(
         <<-EOB
         comment_multi (/* aa -- bb */)
@@ -263,12 +264,9 @@ class TestCoarseTokenizer < Test::Unit::TestCase
   end
 
 
-  def test_string_in_comment
-    msg = "string_in_comment - "
-
-    ########
+  def test_string_in_comment_1
     assert_equals(
-      msg,
+      "string_in_comment 1",
       strip_indent(
         <<-EOB
         comment_single (-- aa "bb" cc)
@@ -280,10 +278,11 @@ class TestCoarseTokenizer < Test::Unit::TestCase
         EOB
       )))
     )
+  end
 
-    ########
+  def test_string_in_comment_2
     assert_equals(
-      msg,
+      "string_in_comment 2",
       strip_indent(
         <<-EOB
         comment_single (-- aa 'bb' cc)
@@ -295,10 +294,11 @@ class TestCoarseTokenizer < Test::Unit::TestCase
         EOB
       )))
     )
+  end
 
-    ########
+  def test_string_in_comment_3
     assert_equals(
-      msg,
+      "string_in_comment 3",
       strip_indent(
         <<-EOB
         comment_multi (/* aa "bb" cc */)
@@ -310,10 +310,11 @@ class TestCoarseTokenizer < Test::Unit::TestCase
         EOB
       )))
     )
+  end
 
-    ########
+  def test_string_in_comment_4
     assert_equals(
-      msg,
+      "string_in_comment 4",
       strip_indent(
         <<-EOB
         comment_multi (/* aa 'bb' cc */)
@@ -328,12 +329,9 @@ class TestCoarseTokenizer < Test::Unit::TestCase
   end
   
 
-  def test_comment_in_string
-    msg = "comment_in_string - "
-
-    ########
+  def test_comment_in_string_1
     assert_equals(
-      msg + "comment_single in quote_single",
+      "comment_in_string - comment_single in quote_single",
       strip_indent(
         <<-EOB
         quote_single ('aa--bb')
@@ -345,10 +343,11 @@ class TestCoarseTokenizer < Test::Unit::TestCase
         EOB
       )))
     )
+  end
 
-    ########
+  def test_comment_in_string_2
     assert_equals(
-      msg + "comment_single in quote_double",
+      "comment_in_string - comment_single in quote_double",
       strip_indent(
         <<-EOB
         quote_double ("aa--bb")
@@ -360,10 +359,11 @@ class TestCoarseTokenizer < Test::Unit::TestCase
         EOB
       )))
     )
+  end
 
-    ########
+  def test_comment_in_string_3
     assert_equals(
-      msg + "comment_multi in quote_double",
+      "comment_in_string - comment_multi in quote_double",
       strip_indent(
         <<-EOB
         quote_double ("aa /* bb */ cc")
@@ -375,10 +375,11 @@ class TestCoarseTokenizer < Test::Unit::TestCase
         EOB
       )))
     )
+  end
 
-    ########
+  def test_comment_in_string_4
     assert_equals(
-      msg + "comment_multi in quote_double",
+      "comment_in_string - comment_multi in quote_double",
       strip_indent(
         <<-EOB
         quote_single ('aa /* bb */ cc')
@@ -393,12 +394,9 @@ class TestCoarseTokenizer < Test::Unit::TestCase
   end
   
 
-  def test_string_escape
-    msg = "string_escape"
-
-    ########
+  def test_string_escape_1
     assert_equals(
-      msg,
+      "string_escape 1",
       strip_indent(
         <<-EOB
         quote_double ("_a_\\\\_b_\n_c_\\'_d_")
@@ -410,10 +408,11 @@ class TestCoarseTokenizer < Test::Unit::TestCase
         EOB
       )))
     )
+  end
 
-    ########
+  def test_string_escape_2
     assert_equals(
-      msg,
+      "string_escape 2",
       strip_indent(
         <<-EOB
         quote_single ('_a_\\\\_b_\n_c_\\'_d_')
@@ -425,10 +424,11 @@ class TestCoarseTokenizer < Test::Unit::TestCase
         EOB
       )))
     )
+  end
 
-    ########
+  def test_string_escape_3
     assert_equals(
-      msg,
+      "string_escape 3",
       strip_indent(
         <<-EOB
         quote_double ("_a_""_b_")
@@ -440,10 +440,11 @@ class TestCoarseTokenizer < Test::Unit::TestCase
         EOB
       )))
     )
+  end
 
-    ########
+  def test_string_escape_4
     assert_equals(
-      msg,
+      "string_escape 4",
       strip_indent(
         <<-EOB
         quote_single ('_a_''_b_')

data/test/test_formatter.rb

@@ -498,8 +498,20 @@ class TestAnbtSqlFormatter < Test::Unit::TestCase
       @fmt.format("a;")
     )
   end
-  
-  
+
+  def test_format_between
+    assert_equals(
+      "should not add a new line to 'BETWEEN ... AND ...'",
+      strip_indent(
+        <<-EOB
+        BETWEEN 0 AND 1
+        EOB
+      ),
+      @fmt.format("between 0 and 1")
+    )
+  end
+
+
   def test_split_to_statements
     msg = "split_to_statements - "
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: anbt-sql-formatter
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
 platform: ruby
 authors:
 - sonota88
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-11-29 00:00:00.000000000 Z
+date: 2018-03-31 00:00:00.000000000 Z
 dependencies: []
 description: A tool for SQL formatting written in Ruby. Ruby port of Blanco SQL Formatter.
 email:
@@ -66,7 +66,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: anbt-sql-formatter
-rubygems_version: 2.6.8
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: A tool for SQL formatting written in Ruby.