querly 0.15.1 → 0.16.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 667d28c47f1169482de3e65425249fd1e9ca2593876fe13c8661558b1a588151
-  data.tar.gz: b0d6025b7fcb82b6933b020d080b28f8ef6e5637b9096fbd9d9e806cf5e1177f
+  metadata.gz: c34b195fa9bb5ccf96c35fe740b783b3567c137a664949e65c84b6d7980f1270
+  data.tar.gz: 47a16a78713ababe10ae4ec8f51aed46b5b750288cff22ffbf7114ba980a8d6e
 SHA512:
-  metadata.gz: cf4b1ce23c783b45e54369cfe5372d4be44bf516db2a9938f898d376706b832d3618d7940ed0f78135a565bd853a8707068390df71a1a8c41fdbc8581fec3e49
-  data.tar.gz: 66cdc533c9a98c0a9cd9139a1f015225bc1d33ecb44c066c65b46c2ca608c80a37d6b31aec3dd7e1837a7684f7307e93e7acfe0be2c378fd9d994ac7cb213489
+  metadata.gz: d612449bfd38faca312aaec2cd6e8e420ff3ac5ee41fa8d1d84c94b5413e5121b4ff49f559b193c4a23f54e1d70c95f4e36d665c31515093acb297c18cd7eed0
+  data.tar.gz: c61989656fb5d91872f4a684339aa5d3f6b83af89b39d73c8cf0b1422d7f2c1833bb788f0c27bb5f78d5f76eeabd3e455ebcbdd6dcd5339066b0ccb03a844691

data/CHANGELOG.md

@@ -2,6 +2,13 @@
 
 ## master
 
+## 0.16.0 (2019-04-23)
+
+* Support string literal pattern (@pocke) [#64](https://github.com/soutaro/querly/pull/64)
+* Allow underscore method name pattern (@pocke) [#63](https://github.com/soutaro/querly/pull/63)
+* Add erb support (@hanachin) [#61](https://github.com/soutaro/querly/pull/61)
+* Add `exit` command on console (@wata727) [#59](https://github.com/soutaro/querly/pull/59)
+
 ## 0.15.1 (2019-03-12)
 
 * Relax parser version requirement

data/lib/querly/cli/console.rb

@@ -60,7 +60,7 @@ Querly #{VERSION}, interactive console
       def start_loop
         while line = Readline.readline("> ", true)
           case line
-          when "quit"
+          when "quit", "exit"
             exit
           when "reload!"
             STDOUT.print "reloading..."

data/lib/querly/pattern/parser.y

@@ -72,7 +72,7 @@ keyword: LIDENT | UIDENT
 constant: UIDENT { result = [val[0]] }
   | UIDENT COLONCOLON constant { result = [val[0]] + val[2] }
 
-send: LIDENT block { result = val[1] != nil ? Expr::Send.new(receiver: nil, name: val[0], args: Argument::AnySeq.new, block: val[1]) : Expr::Vcall.new(name: val[0]) }
+send: LIDENT block { result = val[1] != nil ? Expr::Send.new(receiver: nil, name: val[0], block: val[1]) : Expr::Vcall.new(name: val[0]) }
   | UIDENT block { result = Expr::Send.new(receiver: nil, name: val[0], block: val[1]) }
   | method_name { result = Expr::Send.new(receiver: nil, name: val[0], block: nil) }
   | method_name_or_ident LPAREN args RPAREN block { result = Expr::Send.new(receiver: nil,
@@ -83,18 +83,15 @@ send: LIDENT block { result = val[1] != nil ? Expr::Send.new(receiver: nil, name
                                                                   name: val[1],
                                                                   args: Argument::AnySeq.new,
                                                                   block: val[2]) }
-  | receiver method_name_or_ident block { result = Expr::Send.new(receiver: val[0],
-                                                                  name: val[1],
-                                                                  args: Argument::AnySeq.new,
-                                                                  block: val[2]) }
-  | receiver method_name_or_ident LPAREN args RPAREN block { result = Expr::Send.new(receiver: val[0],
-                                                                                     name: val[1],
-                                                                                     args: val[3],
-                                                                                     block: val[5]) }
   | receiver method_name_or_ident LPAREN args RPAREN block { result = Expr::Send.new(receiver: val[0],
                                                                                      name: val[1],
                                                                                      args: val[3],
                                                                                      block: val[5]) }
+  | receiver UNDERBAR block { result = Expr::Send.new(receiver: val[0], name: /.+/, block: val[2]) }
+  | receiver UNDERBAR LPAREN args RPAREN block { result = Expr::Send.new(receiver: val[0],
+                                                                         name: /.+/,
+                                                                         args: val[3],
+                                                                         block: val[5]) }
 
 receiver: expr DOT { result = val[0] }
   | expr DOTDOTDOT { result = Expr::ReceiverContext.new(receiver: val[0]) }
@@ -136,6 +133,8 @@ def next_token
     [:NIL, false]
   when input.scan(/:string:/)
     [:STRING, nil]
+  when input.scan(/"([^"]+)"/)
+    [:STRING, input[1]]
   when input.scan(/:dstr:/)
     [:DSTR, nil]
   when input.scan(/:int:/)

data/lib/querly/pp/cli.rb

@@ -42,7 +42,7 @@ module Querly
       end
 
       def run
-        available_commands = [:haml]
+        available_commands = [:haml, :erb]
 
         if available_commands.include?(command)
           send :"run_#{command}"
@@ -70,6 +70,24 @@ module Querly
           stdout.print compiler.precompiled
         end
       end
+
+      def run_erb
+        require 'better_html'
+        require 'better_html/parser'
+        load_libs
+        source = stdin.read
+        source_buffer = Parser::Source::Buffer.new('(erb)')
+        source_buffer.source = source
+        parser = BetterHtml::Parser.new(source_buffer, template_language: :html)
+
+        new_source = source.gsub(/./, ' ')
+        parser.ast.descendants(:erb).each do |erb_node|
+          _, _, code_node, = *erb_node
+          new_source[code_node.loc.range] = code_node.loc.source
+          new_source[code_node.loc.range.end] = ';'
+        end
+        stdout.puts new_source
+      end
     end
   end
 end

data/lib/querly/script.rb

@@ -3,6 +3,16 @@ module Querly
     attr_reader :path
     attr_reader :node
 
+    def self.load(path:, source:)
+      parser = Parser::Ruby25.new(Builder.new).tap do |parser|
+        parser.diagnostics.all_errors_are_fatal = true
+        parser.diagnostics.ignore_warnings = true
+      end
+      buffer = Parser::Source::Buffer.new(path.to_s, 1)
+      buffer.source = source
+      self.new(path: path, node: parser.parse(buffer))
+    end
+
     def initialize(path:, node:)
       @path = path
       @node = node
@@ -11,5 +21,15 @@ module Querly
     def root_pair
       NodePair.new(node: node)
     end
+
+    class Builder < Parser::Builders::Default
+      def string_value(token)
+        value(token)
+      end
+
+      def emit_lambda
+        true
+      end
+    end
   end
 end

data/lib/querly/script_enumerator.rb

@@ -45,9 +45,7 @@ module Querly
                    path.read
                  end
 
-        buffer = Parser::Source::Buffer.new(path.to_s, 1)
-        buffer.source = source
-        script = Script.new(path: path, node: parser.parse(buffer))
+        script = Script.load(path: path, source: source)
       rescue StandardError, LoadError, Preprocessor::Error => exn
         script = exn
       end
@@ -55,13 +53,6 @@ module Querly
       yield(path, script)
     end
 
-    def parser
-      Parser::Ruby25.new(Builder.new).tap do |parser|
-        parser.diagnostics.all_errors_are_fatal = true
-        parser.diagnostics.ignore_warnings = true
-      end
-    end
-
     def preprocessors
       config&.preprocessors || {}
     end
@@ -101,15 +92,5 @@ module Querly
         load_script_from_path(path, &block) if should_load_file
       end
     end
-
-    class Builder < Parser::Builders::Default
-      def string_value(token)
-        value(token)
-      end
-
-      def emit_lambda
-        true
-      end
-    end
   end
 end

data/lib/querly/version.rb

@@ -1,3 +1,3 @@
 module Querly
-  VERSION = "0.15.1"
+  VERSION = "0.16.0"
 end

data/manual/patterns.md

@@ -71,6 +71,8 @@ bar.foo.baz               # foo...bar...baz does not match
 * `1.23` (float)
 * `:foobar` (symbol)
 * `:symbol:` (any symbol literal)
+* `"foobar"` (string)
+    * NOTE: It only supports double quotation.
 * `:string:` (any string literal)
 * `:dstr:` (any dstr `"hi #{name}"`)
 * `true`, `false` (true and false)
@@ -145,9 +147,9 @@ end
 
 # Interpolation Syntax
 
-If you want to describe a pattern that can not be described with adove syntax, you can use interpolation as follows:
+If you want to describe a pattern that can not be described with above syntax, you can use interpolation as follows:
 
-```rb
+```yaml
 id: find_by_abc_and_def
 pattern:
   subject: "'finder(...)"
@@ -164,6 +166,16 @@ It matches with `find_by_email_and_name(...)`.
 - If value of meta var is a string `foo`, it matches send nodes with exactly same method name
 - If value of meta var is a regexp `/foo/`, it matches send nodes with method name which `=~` the regexp
 
+You can also use `as` syntax with `:symbol:` and so on.
+
+```yaml
+id: migration_references
+pattern:
+  subject: "t.integer(:symbol: as 'column, ...)"
+  where:
+    column: '/.+_id/'
+```
+
 # Difference from Ruby
 
 * Method call parenthesis cannot be omitted (if omitted, it means *any arguments*)

data/querly.gemspec

@@ -25,8 +25,11 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "bundler", ">= 1.12"
   spec.add_development_dependency "rake", "~> 10.0"
   spec.add_development_dependency "minitest", "~> 5.0"
-  spec.add_development_dependency "racc", "= 1.4.14"
+  spec.add_development_dependency "racc", ">= 1.4.14"
   spec.add_development_dependency "unification_assertion", "0.0.1"
+  spec.add_development_dependency "better_html", "~> 1.0.13"
+  spec.add_development_dependency "slim", "~> 4.0.1"
+  spec.add_development_dependency "haml", "~> 5.0.4"
 
   spec.add_dependency 'thor', ">= 0.19.0", "< 0.21.0"
   spec.add_dependency "parser", ">= 2.5.0"

data/sample.yaml

@@ -146,6 +146,8 @@ rules:
 
 preprocessor:
   .slim: slimrb --compile
+  .haml: querly-pp haml
+  .erb: querly-pp erb
 
 import:
   - load: querly/rules/*.yml

data/template.yml

@@ -58,7 +58,9 @@ rules:
           assert_empty some.count
 
 preprocessor:
-  .slim: slimrb --compile
+  # .slim: slimrb --compile # Install `slim` gem for slim support
+  # .erb: querly-pp erb     # Install `better_erb` gem for erb support
+  # .haml: querly-pp haml   # Install `haml` gem for haml support
 
 check:
   - path: /

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: querly
 version: !ruby/object:Gem::Version
-  version: 0.15.1
+  version: 0.16.0
 platform: ruby
 authors:
 - Soutaro Matsumoto
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-03-12 00:00:00.000000000 Z
+date: 2019-04-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -56,14 +56,14 @@ dependencies:
   name: racc
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.4.14
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.4.14
 - !ruby/object:Gem::Dependency
@@ -80,6 +80,48 @@ dependencies:
     - - '='
       - !ruby/object:Gem::Version
         version: 0.0.1
+- !ruby/object:Gem::Dependency
+  name: better_html
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.0.13
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.0.13
+- !ruby/object:Gem::Dependency
+  name: slim
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 4.0.1
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 4.0.1
+- !ruby/object:Gem::Dependency
+  name: haml
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 5.0.4
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 5.0.4
 - !ruby/object:Gem::Dependency
   name: thor
   requirement: !ruby/object:Gem::Requirement