ffast 0.0.6 → 0.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e6f6f652de04a7f59c26a9556d136e8992f6cc5631b12a3b4a28d9e6f5784d1a
-  data.tar.gz: 62ae2e2bf65a375c78b2d81ac52247b2b5a60a38557540b9e0b0179cc6010e10
+  metadata.gz: 36aaca199777feb62d91a6e052c038f4a971ab20fd37f1adcb7b0c8d3a90553b
+  data.tar.gz: 0ab405982443936ecaad957b43100496dce63d213e2a61c840b3002028c245e8
 SHA512:
-  metadata.gz: 72e1918179ab1b17a292975da6d6a2a673937032c6b924db8994edfb607c98cc80d6542a38a25597d506e23ff0c43f18d4b6a01178623c2c3cd0be982dbc4bb0
-  data.tar.gz: 5f3f02826dcdc0c13f906dfc5480f693c0cd6c5f6bae135a4f5cb99f7ac583a518a68333d562ad1fe61cec55f0dca8627978b81710d4d04507c89d28e9028131
+  metadata.gz: 32a5615982972c2e13582a8279cf94043a3a571044a6b1a04fee253f04c7ff93733eab4fca22f2878dc3e16d519cb3d78f06adafbe4b6bb998a72bea97929bc6
+  data.tar.gz: 277f3082ab12c310be88c1bda1d8fa57be86bae02ddc39c8c5adb6e49704aec036c801abe6d6f18527f23996d560bd95d199cb6c0209c72474acc1c031600bc0

data/README.md

@@ -18,8 +18,6 @@ The current version of Fast covers the following token elements:
 - `{}` - looks for **any** element to match, like a **Set** inclusion or `any?` in Ruby
 - `[]` - looks for **all** elements to match, like `all?` in Ruby.
 - `$` - will **capture** the contents of the current expression like a `Regex` group
-- `#<method-name>` - will call `<method-name>` with `node` as param allowing you
-    to build custom rules.
 - `_` - represents any non-nil value, or **something** being present
 - `nil` -  matches exactly **nil**
 - `...` - matches a **node** with children
@@ -28,6 +26,9 @@ The current version of Fast covers the following token elements:
 - `\1` - represents a substitution for any of the **previously captured** elements
 - `%1` - to bind the first extra argument in an expression
 - `""` - will match a literal string with double quotes
+- `#<method-name>` - will call `<method-name>` with `node` as param allowing you
+    to build custom rules.
+- `.<method-name>` - will call `<method-name>` from the `node`
 
 The syntax is inspired by the [RuboCop Node Pattern](https://github.com/bbatsov/rubocop/blob/master/lib/rubocop/node_pattern.rb).
 

data/docs/syntax.md

@@ -403,3 +403,10 @@ more details of the node
 ```ruby
 puts Fast.search_file('[ (def a) #debug ]', 'example.rb')
 ```
+## Calling Instance Methods
+
+You can also call instance methods using `.<method-name>`.
+
+Example `nil` is the same of calling `nil?` and you can also use `(int .odd?)`
+to pick only odd integers. The `int` fragment can also be `int_type?`.
+

data/fast.gemspec

@@ -24,6 +24,7 @@ Gem::Specification.new do |spec|
   spec.executables   = ['fast', 'fast-experiment']
   spec.require_paths = %w[lib experiments]
 
+  spec.add_dependency 'astrolabe'
   spec.add_dependency 'coderay'
   spec.add_dependency 'parser'
   spec.add_dependency 'pry'

data/lib/fast.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require 'fileutils'
+require 'astrolabe/builder'
 
 # suppress output to avoid parser gem warnings'
 def suppress_output
@@ -56,9 +57,11 @@ module Fast
     |
     \#\w[\d\w_]+[\\!\?]?  # custom method call
     |
+    \.\w[\d\w_]+\?       # instance method call
+    |
     \\\d                  # find using captured expression
     |
-    %\d                   # find using binded argument
+    %\d                   # bind extra arguments to the expression
   /x.freeze
 
   class << self
@@ -99,8 +102,7 @@ module Fast
         yield node, match if block_given?
         match != true ? [node, match] : [node]
       elsif Fast.match?(node, '...')
-        node.children
-          .grep(Parser::AST::Node)
+        node.each_child_node
           .flat_map { |e| search(e, pattern) }
           .compact.flatten
       end
@@ -110,21 +112,23 @@ module Fast
       res =
         if (match = Fast.match?(node, pattern))
           match == true ? node : match
-        elsif Fast.match?(node, '...')
-          node.children
-            .grep(Parser::AST::Node)
-            .flat_map { |child| capture(child, pattern) }.compact.flatten
+        elsif node.child_nodes.any?
+          node.each_child_node
+            .flat_map { |child| capture(child, pattern) }
+            .compact.flatten
         end
       res&.size == 1 ? res[0] : res
     end
 
-    def ast(content)
-      Parser::CurrentRuby.parse(content)
+    def ast(content, buffer_name: '(string)')
+      buffer = Parser::Source::Buffer.new(buffer_name)
+      buffer.source = content
+      Parser::CurrentRuby.new(Astrolabe::Builder.new).parse(buffer)
     end
 
     def ast_from_file(file)
       @cache ||= {}
-      @cache[file] ||= ast(IO.read(file))
+      @cache[file] ||= ast(IO.read(file), buffer_name: file)
     end
 
     def highlight(node, show_sexp: false)
@@ -145,12 +149,6 @@ module Fast
       puts Fast.highlight(result, show_sexp: show_sexp)
     end
 
-    def buffer_for(file)
-      buffer = Parser::Source::Buffer.new(file.to_s)
-      buffer.source = IO.read(file)
-      buffer
-    end
-
     def expression(string)
       ExpressionParser.new(string).parse
     end
@@ -261,6 +259,7 @@ module Fast
       when '[' then All.new(parse_until_peek(']'))
       when /^"/ then FindString.new(token[1..-2])
       when /^#\w/ then MethodCall.new(token[1..-1])
+      when /^\.\w[\w\d_]+\?/ then InstanceMethodCall.new(token[1..-1])
       when '$' then Capture.new(parse)
       when '!' then (@tokens.any? ? Not.new(parse) : Find.new(token))
       when '?' then Maybe.new(parse)
@@ -280,13 +279,6 @@ module Fast
       next_token
       list
     end
-
-    def append_token_until_peek(token)
-      list = []
-      list << next_token until @tokens.empty? || @tokens.first == token
-      next_token
-      list.join
-    end
   end
 
   # Find is the top level class that respond to #match?(node) interface.
@@ -389,6 +381,17 @@ module Fast
     end
   end
 
+  # Search using custom instance methods
+  class InstanceMethodCall < Find
+    def initialize(method_name)
+      @method_name = method_name
+    end
+
+    def match?(node)
+      node.send(@method_name)
+    end
+  end
+
   # Allow use previous captures while searching in the AST.
   # Use `\\1` to point the match to the first captured element
   class FindWithCapture < Find
@@ -464,7 +467,7 @@ module Fast
   class Parent < Find
     alias match_node match?
     def match?(node)
-      node.children.grep(Parser::AST::Node).any?(&method(:match_node))
+      node.each_child_node.any?(&method(:match_node))
     end
 
     def to_s

data/lib/fast/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Fast
-  VERSION = '0.0.6'
+  VERSION = '0.0.7'
 end

metadata

@@ -1,15 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: ffast
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.7
 platform: ruby
 authors:
 - Jônatas Davi Paganini
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-02-22 00:00:00.000000000 Z
+date: 2019-03-24 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: astrolabe
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: coderay
   requirement: !ruby/object:Gem::Requirement