auto_sql_formatter 0.1.0.dev → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c17489584eef662868c6ebb8121706be9d7284b43dc30a778c0fbf02b61b068b
-  data.tar.gz: 977aa3d4d992399a4e1a9d83db5ac9d7f18226327bb8376d10470c8a9f3aff8f
+  metadata.gz: b400f6cb9005cd9caf412e2b9a7109d6e85fd28805efbb97f4613ca59c97c40f
+  data.tar.gz: d4f74bf8a1e545911229967226b1f3ad601dd73d27b7ccb514f7453dd53178af
 SHA512:
-  metadata.gz: 87c9e3f39d9c9a4de832f6e9691d3d64a738f5f62e618d1d3c537667bbb2837dc6913694efb63fec946ec6a306e02ff6bbc6f99e7f6a6cd4306a4b6f882ab04a
-  data.tar.gz: 024ca5e191480229b795c079fea1e8639ba5eeb3431dac75f356478c1dbe64a2a53d92597021a8d74b11dfc2749387821ed62a58fe4edd1aaf89463458a4d964
+  metadata.gz: 3aaff527171abb4c149a4b5987f4f02d62f738d37c362af377c95308cbfffcfae7ade069194411d167fad95b55b55cdd3d96db29190c064ed83202f43a10f7d5
+  data.tar.gz: 7092111e81614f6a4c5a9f3ac33830537f2e1ba3b9f985d9a0439e21e9ea68f41176be50a0b83f2592eb7a547b1aa74f29bce646040aacc2f060091a2be80c21

data/Gemfile

@@ -4,3 +4,5 @@ git_source(:github) {|repo_name| "https://github.com/#{repo_name}" }
 
 # Specify your gem's dependencies in auto_sql_formatter.gemspec
 gemspec
+
+gem 'export_strings'

data/Gemfile.lock

@@ -1,12 +1,13 @@
 PATH
   remote: .
   specs:
-    auto_sql_formatter (0.1.0.dev)
+    auto_sql_formatter (0.1.1)
 
 GEM
   remote: https://rubygems.org/
   specs:
     diff-lcs (1.3)
+    export_strings (0.2.0)
     rake (10.5.0)
     rspec (3.8.0)
       rspec-core (~> 3.8.0)
@@ -28,6 +29,7 @@ PLATFORMS
 DEPENDENCIES
   auto_sql_formatter!
   bundler (~> 1.17)
+  export_strings
   rake (~> 10.0)
   rspec (~> 3.0)
 

data/example/example.rb

@@ -4,8 +4,8 @@ class Example
     <<-SQL
       sasdfasdf
       adsafsdf
-      ssdfghs
-      dfasdfa
+ ssdfghs
+ dfasdfa
       dfasdf
 a      asdfasdfasdfasdfsh
     SQL
@@ -20,18 +20,18 @@ a      asdfasdfasdfasdfsh
   def sql2
     "
       SELECT * 
-      from users 
+ from users 
       where user.id > 100
-      JOIN profiles ON profiles.user_id =users.id
+   JOIN profiles ON profiles.user_id =users.id
     "
   end
 
   def sql3
     "
-    SELECT * 
-    from users 
+ SELECT * 
+  from users 
     where user.id > 100
-    JOIN profiles ON profiles.user_id =users.id
+       JOIN profiles ON profiles.user_id =users.id
     GROUP BY gender
     HAVING 100 > Max(#{hogeo})
     "

data/example/example2.rb

@@ -0,0 +1,93 @@
+class Example
+  @pokemon = 'pokemon'
+
+  def str
+    <<-SQL
+      sasdfasdf
+      adsafsdf
+      ssdfghs
+      dfasdfa
+      dfasdf
+a      asdfasdfasdfasdfsh
+    SQL
+  end
+
+  def sql1
+    <<-SQL
+      select * from users where user.id > 100
+    SQL
+  end
+
+  def sql2
+    "
+      SELECT * 
+    from users 
+      where user.id > 100    JOIN profiles ON profiles.user_id =users.id
+    "
+  end
+
+  def sql3
+    "
+    SELECT *     from users 
+  where user.id > 100
+  JOIN profiles ON profiles.user_id =users.id
+  GROUP BY gender
+    HAVING 100 > Max(#{hogeo})
+    AND HAVING 1000 < Max(#{test})
+    AND HAVING 1000 < Max(#{String.new})
+    AND HAVING 1000 < Max(#{test; test})
+    AND HAVING 1000 < Max(#{@pokemon})
+    #{!!test ? 'hogeo' : 'hoge'}
+    "
+  end
+
+  def hogeo
+    'test'
+    "test"
+    'test' + "test"
+    'test' << 'test'
+  end
+
+  def test
+    'hi'
+  end
+
+  def single_auot
+    'single_quot_str'
+  end
+end
+
+class Example2
+  def hogeo2
+    'test'
+    "test"
+    'test' + "test"
+    'test' << 'test'
+  end
+
+  def test2
+    'hi'
+  end
+end
+
+class Example
+  def str1
+    <<-SQL
+      SELECT *
+      FROM users
+      WHERE id > 100
+    SQL
+  end
+
+  def str2
+    "I like gohan. Do you like gohan.Oh Yeah."
+  end
+
+  def str3
+    "#{hello} Mikel"
+  end
+
+  def hello
+    'hello world'
+  end
+end

data/example/example3.rb

@@ -0,0 +1,42 @@
+class Example3
+  def str
+    <<-SQL
+      sasdfasdf
+      adsafsdf
+      ssdfghs
+ dfasdfa
+      dfasdf
+a      asdfasdfasdfasdfsh
+    SQL
+  end
+
+  def sql1
+    <<-SQL
+      select * from users where user.id > 100
+    SQL
+  end
+
+  def sql2
+    "
+      SELECT * 
+  from users 
+      where user.id > 100
+      JOIN profiles ON profiles.user_id =users.id
+    "
+  end
+
+  def sql3
+    "
+    SELECT * 
+  from users 
+    where user.id > 100
+    JOIN profiles ON profiles.user_id =users.id
+    GROUP BY gender
+    HAVING 100 > Max(#{hogeo})
+    "
+  end
+
+  def hogeo
+    'test'
+  end
+end

data/lib/auto_sql_formatter/core.rb

@@ -6,23 +6,23 @@ module AutoSqlFormatter
     attr_reader :workdir
 
     def initialize(dir = DEFAULT_DIR)
-      @workdir = dir || DEFAULT_DIR
+      @workdir = dir
     end
 
     def execute
       puts "========Start to format sql========="
-
+      puts
       files.each do |file|
         result = Runner.do file[:path]
-        display(file[:state] = result)
+        display(file[:status] = result)
       end
-
-      puts "===========Completed！！！============"
-
-      puts <<-STR
-        Targets and statuses are
-        #{files.each { |file| "・#{file[:path]}  #{file[:status]}/n"}}
-      STR
+      puts
+      puts
+      files.each do |file| 
+        puts "#{file[:path]}  #{file[:status]}\n"
+      end
+      puts
+      puts '===========Completed!!!============'
     end
 
     private
@@ -34,12 +34,12 @@ module AutoSqlFormatter
     #   { 'path' => 'spec/sql_formatter./sql_formatter._spec.rb', 'state' => 'success' }
     # ]
     def files
-      @files ||= Dir.glob("#{workdir}/**/*.rb").map { |file| { path: file, state: nil } }
+      @files ||= Dir.glob("#{workdir}/**/*.rb").map { |file| { path: file, status: nil } }
     end
 
     # 実行中に SSSSS・・・E・SSSSみたいに表示される
-    def display(state)
-      str = case state
+    def display(status)
+      str = case status
             when 'success'
               'S' #success
             when 'error'

data/lib/auto_sql_formatter/formatter.rb

@@ -5,7 +5,7 @@ require 'json'
 module AutoSqlFormatter
   class Formatter
     DEFAULT_INDENT = 2
-    DEFAULT_CASE = 'upper'
+    DEFAULT_CASE = 'upper'.freeze
     API_URI = 'https://sqlformat.org/api/v1/format'.freeze
     HEADERS = { 'Content-Type' => 'application/x-www-form-urlencoded' }.freeze
 
@@ -19,8 +19,9 @@ module AutoSqlFormatter
         https = Net::HTTP.new(uri.host, uri.port)
         https.use_ssl = true
 
-        body = URI.encode_www_form(sql: sql)
+        body = URI.encode_www_form(sql: sql, keyword_case: DEFAULT_CASE)
 
+        '===Net::HTTP==='
         response = https.post(uri.path, body, HEADERS)
         JSON.parse(response.body)['result']
       end

data/lib/auto_sql_formatter/runner.rb

@@ -1,24 +1,23 @@
-require "auto_sql_formatter/formatter"
-require "auto_sql_formatter/searcher"
+require 'auto_sql_formatter/formatter'
+require 'auto_sql_formatter/searcher'
 
 module AutoSqlFormatter
   class Runner
     def self.do(path)
       file_text = File.read(path)
-      sqls = Searcher.do file_text
-      if sqls
-        # results
-        # [
-        #   {
-        #     from: old sql,
-        #     to: new sql,
-        #   }
-        # ]
-        results = Formatter.do sqls
-        results.each { |result| file_text.gsub! Regexp.new(result[:from]), result[:to] }
-        return 'success' if File.open(path, 'w') { |f| f.write file_text }
-      end
-      'none'
+      sqls = Searcher.do(file_text)
+      return 'none' if sqls.empty?
+
+      # results
+      # [
+      #   {
+      #     from: old sql,
+      #     to: new sql,
+      #   }
+      # ]
+      results = Formatter.do sqls
+      results.each { |result| file_text.gsub! /#{result[:from]}/m, result[:to] }
+      return 'success' if File.open(path, 'w') { |f| f.write file_text }
     end
     class Error < StandardError; end
   end

data/lib/auto_sql_formatter/searcher.rb

@@ -1,14 +1,10 @@
-require 'ripper'
+require 'export_strings'
+
 module AutoSqlFormatter
   class Searcher
     class << self
       def do(file_text)
-        pp r = Ripper.sexp(file_text)
-        pp r = Ripper.lex(file_text)
-        r = Ripper.lex(file_text).reduce([]) do |acc, element|
-          element[1] == :on_tstring_content && sql?(element[2]) ? acc.push(element[2]) : acc
-        end
-        pp r
+        ExportStrings::Core.execute(file_text).each_with_object([]) { |str, memo| memo << str if sql?(str) }
       end
 
       private

data/lib/auto_sql_formatter/version.rb

@@ -1,3 +1,3 @@
 module AutoSqlFormatter
-  VERSION = "0.1.0.dev"
+  VERSION = "0.1.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: auto_sql_formatter
 version: !ruby/object:Gem::Version
-  version: 0.1.0.dev
+  version: 0.1.1
 platform: ruby
 authors:
 - Tashiro
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-05-27 00:00:00.000000000 Z
+date: 2019-06-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -73,6 +73,11 @@ files:
 - bin/console
 - bin/setup
 - example/example.rb
+- example/example2.rb
+- example/example3.rb
+- example/example4.rb
+- example/example5.rb
+- lib/.DS_Store
 - lib/auto_sql_formatter.rb
 - lib/auto_sql_formatter/core.rb
 - lib/auto_sql_formatter/formatter.rb
@@ -97,9 +102,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubygems_version: 3.0.3
 signing_key: