anbt-sql-formatter 0.0.2 → 0.0.3

data/anbt-sql-formatter.gemspec

@@ -5,7 +5,7 @@ require "anbt-sql-formatter/version"
 Gem::Specification.new do |s|
   s.name        = "anbt-sql-formatter"
   s.version     = Anbt::Sql::Formatter::VERSION
-  s.authors     = ["sonota"]
+  s.authors     = ["sonota88"]
   s.email       = ["yosiot8753@gmail.com"]
   s.homepage    = ""
   s.summary     = %q{A tool for SQL formatting written in Ruby.}

data/bin/anbt-sql-formatter

@@ -1,4 +1,4 @@
-#! /usr/bin/ruby1.8
+#! /usr/bin/env ruby
 # -*- coding: utf-8 -*-
 
 begin

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

@@ -22,7 +22,7 @@ class AnbtSql
     end
 
 
-    def split_by_semicolon(tokens)
+    def split_to_statements(tokens)
       statements = []
       buf = []
       tokens.each{|token|
@@ -48,14 +48,14 @@ class AnbtSql
     def format(sql_str)
       @function_bracket.clear()
       begin
-        isSqlEndsWithNewLine = false
+        is_sql_ends_with_new_line = false
         if sql_str.end_with?("\n")
-          isSqlEndsWithNewLine = true
+          is_sql_ends_with_new_line = true
         end
         
         tokens = @parser.parse(sql_str)
 
-        statements = split_by_semicolon(tokens)
+        statements = split_to_statements(tokens)
 
         statements = statements.map{|tokens|
           format_list(tokens)
@@ -66,7 +66,7 @@ class AnbtSql
           tokens.map{ |t| t.string }.join("")
         }.join("\n;\n\n").sub( /\n\n\Z/, "" )
 
-        after += "\n" if isSqlEndsWithNewLine
+        after += "\n" if is_sql_ends_with_new_line
 
         return after
       rescue => e
@@ -112,19 +112,19 @@ class AnbtSql
 
 
     def remove_symbol_side_space(tokens)
-      prevToken = nil
+      prev_token = nil
 
       (tokens.size - 1).downto(1){|index|
         token     = ArrayUtil.get(tokens, index)
-        prevToken = ArrayUtil.get(tokens, index - 1)
+        prev_token = ArrayUtil.get(tokens, index - 1)
 
         if (token._type == AnbtSql::TokenConstants::SPACE &&
-            (prevToken._type == AnbtSql::TokenConstants::SYMBOL ||
-             prevToken._type == AnbtSql::TokenConstants::COMMENT))
+            (prev_token._type == AnbtSql::TokenConstants::SYMBOL ||
+             prev_token._type == AnbtSql::TokenConstants::COMMENT))
           ArrayUtil.remove(tokens, index)
         elsif ((token._type == AnbtSql::TokenConstants::SYMBOL ||
                 token._type == AnbtSql::TokenConstants::COMMENT) &&
-               prevToken._type == AnbtSql::TokenConstants::SPACE)
+               prev_token._type == AnbtSql::TokenConstants::SPACE)
           ArrayUtil.remove(tokens, index - 1)
         elsif (token._type == AnbtSql::TokenConstants::SPACE)
           token.string = " "
@@ -259,15 +259,15 @@ class AnbtSql
           end
 
           if equals_ignore_case(token.string, "BETWEEN")
-            encounterBetween = true
+            encounter_between = true
           end
 
           if equals_ignore_case(token.string, "AND")
             # BETWEEN のあとのANDは改行しない。
-            if not encounterBetween
+            if not encounter_between
               index += insert_return_and_indent(tokens, index, indent)
             end
-            encounterBetween = false
+            encounter_between = false
           end
 
         elsif (token._type == AnbtSql::TokenConstants::COMMENT) # ****
@@ -337,7 +337,7 @@ class AnbtSql
       remove_symbol_side_space(tokens)
       concat_operator_for_oracle(tokens)
 
-      encounterBetween = false
+      encounter_between = false
 
       format_list_main_loop(tokens)
 

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

@@ -1,7 +1,7 @@
 module Anbt
   module Sql
     module Formatter
-      VERSION = "0.0.2"
+      VERSION = "0.0.3"
     end
   end
 end

data/test/test_formatter.rb

@@ -500,8 +500,8 @@ class TestAnbtSqlFormatter < Test::Unit::TestCase
   end
   
   
-  def test_split_by_semicolon
-    msg = "split_by_semicolon - "
+  def test_split_to_statements
+    msg = "split_to_statements - "
 
     ########
     tokens = @parser.parse("a;b")
@@ -509,17 +509,17 @@ class TestAnbtSqlFormatter < Test::Unit::TestCase
     assert_equals(
       msg + "first statement",
       "a",
-      @fmt.split_by_semicolon(tokens)[0][0].string
+      @fmt.split_to_statements(tokens)[0][0].string
     )
     assert_equals(
       msg + "second statement",
       "b",
-      @fmt.split_by_semicolon(tokens)[1][0].string
+      @fmt.split_to_statements(tokens)[1][0].string
     )
 
     ########
     tokens = @parser.parse(";")
-    statements = @fmt.split_by_semicolon(tokens)
+    statements = @fmt.split_to_statements(tokens)
     assert_equals(
       msg,
       [],
@@ -533,7 +533,7 @@ class TestAnbtSqlFormatter < Test::Unit::TestCase
 
     ########
     tokens = @parser.parse("a;")
-    statements = @fmt.split_by_semicolon(tokens)
+    statements = @fmt.split_to_statements(tokens)
     assert_equals(
       msg,
       "name (a)",
@@ -547,7 +547,7 @@ class TestAnbtSqlFormatter < Test::Unit::TestCase
 
     ########
     tokens = @parser.parse(";a")
-    statements = @fmt.split_by_semicolon(tokens)
+    statements = @fmt.split_to_statements(tokens)
     assert_equals(
       msg,
       [],
@@ -561,7 +561,7 @@ class TestAnbtSqlFormatter < Test::Unit::TestCase
 
     ########
     tokens = @parser.parse("a;b")
-    statements = @fmt.split_by_semicolon(tokens)
+    statements = @fmt.split_to_statements(tokens)
     assert_equals(
       msg,
       "name (a)",

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: anbt-sql-formatter
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
   prerelease: 
 platform: ruby
 authors:
-- sonota
+- sonota88
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-06 00:00:00.000000000 Z
+date: 2015-02-14 00:00:00.000000000 Z
 dependencies: []
 description: A tool for SQL formatting written in Ruby. Ruby port of Blanco SQL Formatter.
 email: