anbt-sql-formatter 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0bd065b8b98fe3a87257b39677bd7ed0fc78233173c0a1f1e99792cec2e9868f
-  data.tar.gz: 999857541e0547429abb974f830fbba8ff0c31ae2284b89bfd840353e3029786
+  metadata.gz: 84e2831d39ea0a114b7dd67a1ad69be88df0a575f017c6e9ec16ed87cdc8597b
+  data.tar.gz: b7f86dd15c4c5b421035f39b4f7bff403305e1f2f0ebd84eed5644b5be57e7a2
 SHA512:
-  metadata.gz: fc5d07dc5eb05cc96c250e865bf36f2ae7b8e11457b3850d112b75925a00ccb93f498b1fc389288de875d77292b7139464227f35fa7db56fb602498ffe07e623
-  data.tar.gz: 276dc243eeaeab0ee353017e1f7d1bbcf6ec3e11e8b295f5a93331d4b5786f68a6725abe1ca89c81f72a53da821f318aeebde04ed2aa9eb205cfb497f256debe
+  metadata.gz: 9b928f9e74ae4139c3f1408c6727832e352b2f78ad5479f38eb5959817c405f936faab338620536ac7c2a94dc931e839e3e58e2b460922e64fbb8da805d74aff
+  data.tar.gz: b978f80c52d14d067c150e48992dc81eaafc948d1103ff12fade72bb3d1f6835af86532393e658b5856dd75ee3d3dc03cf9498a01b66379011a09ffb9adc87cc

data/CHANGELOG.md

@@ -1,3 +1,27 @@
+# 0.1.2 (2025-01-xx)
+
+## Breaking changes
+
+- Changed to exclusive branching to reduce complexity (`Formatter#format_list_main_loop`).
+  - If you have not customized the rules, there will be no change in behavior.
+    - This likely applies to most users.
+  - If you have customized the rules such that keywords overlap between conditions of the branches,
+    this update may change the behavior.
+
+```ruby
+# Example of customization that may change behavior:
+
+custom_rule = AnbtSql::Rule.new
+custom_rule.kw_nl_x << "SOME_CUSTOM_KEYWORD"
+custom_rule.kw_nl_x_plus1_indent << "SOME_CUSTOM_KEYWORD"
+```
+
+## Improvements
+
+- Some cleanups, formatting improvements
+  - cleanup: Remove encoding magic comments
+
+
 # 0.1.1 (2025-01-12)
 
 No breaking changes.

data/anbt-sql-formatter.gemspec

@@ -1,4 +1,3 @@
-# -*- encoding: utf-8 -*-
 $:.push File.expand_path("../lib", __FILE__)
 require "anbt-sql-formatter/version"
 

data/bin/anbt-sql-formatter

@@ -1,5 +1,4 @@
 #! /usr/bin/env ruby
-# -*- coding: utf-8 -*-
 
 begin
   require "anbt-sql-formatter/formatter"

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

@@ -1,5 +1,3 @@
-# -*- coding: utf-8 -*-
-
 =begin
 エスケープ文字
 =end

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

@@ -1,5 +1,3 @@
-# -*- coding: utf-8 -*-
-
 =begin rdoc
 AnbtSqlFormatter: SQL整形ツール. SQL文を決められたルールに従い整形します。
 
@@ -76,6 +74,7 @@ class AnbtSql
        "ORDINALITY", "OUT", "PARAMETER", "PARAMETERS", "PATH", "POSTFIX",
        "PREFIX", "PREORDER", "RAW", "READS", "RECURSIVE", "REDO",
        # ANSI SQLではないのだが とても良く使われる構文
-       "TRUNCATE" ]
+       "TRUNCATE"
+      ]
   end
 end

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

@@ -1,5 +1,3 @@
-# -*- coding: utf-8 -*-
-
 =begin rdoc
 BlancoSqlFormatterException : SQL整形ツールの例外を表します。
 

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

@@ -1,5 +1,3 @@
-# -*- coding: utf-8 -*-
-
 require "anbt-sql-formatter/rule"
 require "anbt-sql-formatter/parser"
 require "anbt-sql-formatter/exception"
@@ -222,56 +220,47 @@ class AnbtSql
               equals_ignore_case(token.string, "UPDATE")   )
             indent += 2
             index += insert_return_and_indent(tokens, index + 1, indent, "+2")
-          end
 
           # indentを１つ増やし、キーワードの後ろで改行
-          if @rule.kw_plus1_indent_x_nl.any?{ |kw| equals_ignore_case(token.string, kw) }
+          elsif @rule.kw_plus1_indent_x_nl.any?{ |kw| equals_ignore_case(token.string, kw) }
             indent += 1
             index += insert_return_and_indent(tokens, index + 1, indent)
-          end
 
           # キーワードの前でindentを１つ減らして改行、キーワードの後ろでindentを戻して改行。
-          if @rule.kw_minus1_indent_nl_x_plus1_indent.any?{ |kw| equals_ignore_case(token.string, kw) }
+          elsif @rule.kw_minus1_indent_nl_x_plus1_indent.any?{ |kw| equals_ignore_case(token.string, kw) }
             index += insert_return_and_indent(tokens, index    , indent - 1)
             index += insert_return_and_indent(tokens, index + 1, indent    )
-          end
 
           # キーワードの前でindentを１つ減らして改行、キーワードの後ろでindentを戻して改行。
-          if (equals_ignore_case(token.string, "VALUES"))
+          elsif (equals_ignore_case(token.string, "VALUES"))
             indent -= 1
             index += insert_return_and_indent(tokens, index, indent)
-          end
 
           # キーワードの前でindentを１つ減らして改行
-          if (equals_ignore_case(token.string, "END"))
+          elsif (equals_ignore_case(token.string, "END"))
             indent -= 1
             index += insert_return_and_indent(tokens, index, indent)
-          end
 
           # キーワードの前で改行
-          if @rule.kw_nl_x.any?{ |kw| equals_ignore_case(token.string, kw) }
+          elsif @rule.kw_nl_x.any?{ |kw| equals_ignore_case(token.string, kw) }
             index += insert_return_and_indent(tokens, index, indent)
-          end
 
           # キーワードの前で改行, インデント+1
-          if @rule.kw_nl_x_plus1_indent.any?{ |kw| equals_ignore_case(token.string, kw) }
+          elsif @rule.kw_nl_x_plus1_indent.any?{ |kw| equals_ignore_case(token.string, kw) }
             index += insert_return_and_indent(tokens, index, indent + 1)
-          end
 
           # キーワードの前で改行。indentを強制的に０にする。
-          if (equals_ignore_case(token.string, "UNION"    ) ||
+          elsif (equals_ignore_case(token.string, "UNION"    ) ||
               equals_ignore_case(token.string, "INTERSECT") ||
               equals_ignore_case(token.string, "EXCEPT"   )   )
             indent -= 2
             index += insert_return_and_indent(tokens, index    , indent)
             index += insert_return_and_indent(tokens, index + 1, indent)
-          end
 
-          if equals_ignore_case(token.string, "BETWEEN")
+          elsif equals_ignore_case(token.string, "BETWEEN")
             encounter_between = true
-          end
 
-          if equals_ignore_case(token.string, "AND")
+          elsif equals_ignore_case(token.string, "AND")
             # BETWEEN のあとのANDは改行しない。
             if not encounter_between
               index += insert_return_and_indent(tokens, index, indent)
@@ -395,7 +384,7 @@ class AnbtSql
         if $DEBUG
           $stderr.puts e.message, e.backtrace
           $stderr.puts "tokens: "
-          tokens.each_with_index{|t,i|
+          tokens.each_with_index{|t, i|
             $stderr.puts "index=%d: %s" % [i, t.inspect]
           }
           $stderr.puts "index/size: %d/%d / indent: %d / opt: %s" % [index, tokens.size, indent, opt]

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

@@ -1,5 +1,3 @@
-# -*- coding: utf-8 -*-
-
 require "pp"
 
 require "anbt-sql-formatter/token"
@@ -67,7 +65,7 @@ class AnbtSql
     # これ以降の文字の扱いは保留
     def symbol?(c)
       %w(" ? % & ' \( \) | * + , - . / : ; < = > !).include? c
-      #"
+      # "
     end
 
 
@@ -160,7 +158,7 @@ class AnbtSql
 
         # ２文字の記号かどうか調べる
         ch2 = char_at(@before, @pos)
-        #for (int i = 0; i < two_character_symbol.length; i++) {
+        # for (int i = 0; i < two_character_symbol.length; i++) {
         for i in 0...@two_character_symbol.length
           if (char_at(@two_character_symbol[i], 0) == @char &&
               char_at(@two_character_symbol[i], 1) == ch2)

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

@@ -1,5 +1,3 @@
-# -*- coding: utf-8 -*-
-
 require "anbt-sql-formatter/helper"
 
 =begin

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

@@ -1,5 +1,3 @@
-# -*- coding: utf-8 -*-
-
 class AnbtSql
   class TokenConstants
 

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

@@ -1,7 +1,7 @@
 module Anbt
   module Sql
     module Formatter
-      VERSION = "0.1.1"
+      VERSION = "0.1.2"
     end
   end
 end

data/misc/anbt-sql-formatter-customize-example

@@ -1,5 +1,4 @@
 #! /usr/bin/ruby
-# -*- coding: utf-8 -*-
 
 require "pp"
 
@@ -55,8 +54,8 @@ if $0 == __FILE__
     rule.function_names << func_name.upcase
   }
 
-  #rule.indent_string = "    "
-  #rule.indent_string = "('-')"
+  # rule.indent_string = "    "
+  # rule.indent_string = "('-')"
   rule.indent_string = "|   "
 
   formatter = AnbtSql::Formatter.new(rule)

data/test/helper.rb

@@ -12,8 +12,8 @@ class Helper
 end
 
 
-def assert_equals(a,b,c)
-  assert_equal(b,c,a)
+def assert_equals(a, b, c)
+  assert_equal(b, c, a)
 end
 
 def strip_indent(text)

data/test/test_coarse-tokenizer.rb

@@ -1,5 +1,3 @@
-# -*- coding: utf-8 -*-
-
 require File.join(File.expand_path(File.dirname(__FILE__)), "helper")
 
 require "anbt-sql-formatter/coarse-tokenizer"

data/test/test_formatter.rb

@@ -1,5 +1,3 @@
-# -*- coding: utf-8 -*-
-
 require File.join(File.expand_path(File.dirname(__FILE__)), "helper")
 
 require "anbt-sql-formatter/formatter"

data/test/test_helper.rb

@@ -1,5 +1,3 @@
-# -*- coding: utf-8 -*-
-
 require File.join(File.expand_path(File.dirname(__FILE__)), "helper")
 
 require "anbt-sql-formatter/helper"

data/test/test_in_values.rb

@@ -1,5 +1,3 @@
-# -*- coding: utf-8 -*-
-
 require File.join(File.expand_path(File.dirname(__FILE__)), "helper")
 
 require "anbt-sql-formatter/formatter"

data/test/test_parser.rb

@@ -1,5 +1,3 @@
-# -*- coding: utf-8 -*-
-
 require File.join(File.expand_path(File.dirname(__FILE__)), "helper")
 
 require "anbt-sql-formatter/rule"

data/test/test_rule.rb

@@ -1,5 +1,3 @@
-# -*- coding: utf-8 -*-
-
 require File.join(File.expand_path(File.dirname(__FILE__)), "helper")
 
 require "anbt-sql-formatter/helper"

metadata

@@ -1,13 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: anbt-sql-formatter
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - sonota88
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-01-12 00:00:00.000000000 Z
+date: 2025-01-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: test-unit
@@ -66,6 +67,7 @@ files:
 homepage: https://github.com/sonota88/anbt-sql-formatter
 licenses: []
 metadata: {}
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -80,7 +82,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.6.2
+rubygems_version: 3.4.19
+signing_key:
 specification_version: 4
 summary: A tool for SQL formatting written in Ruby.
 test_files: []