ffast 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7b1063b0bb3b8dcc82515f0b10fc24601c6b322979d0a53eb6e65fa6f3ab439c
-  data.tar.gz: b984df89b42bb0f21c2f91567d37fe10e336fb489fdea3ad8ff5ae658dc1de34
+  metadata.gz: 25f7e0fd657799e3fb4a1871fc8a88f8bab0737c7a24720d2bd58e9da7cd2d80
+  data.tar.gz: 1acb400b517ab4b5e68dd931639eb1916638951c745fff49823d6b6cb9aa7e09
 SHA512:
-  metadata.gz: adf2973bf7e616dbd7fe1866abda708afd1e667ee2938d74f3204d26f228b8f235b017f6729cc083651627aee97ac924d6042ef73248e8d5bcd4491065f18ade
-  data.tar.gz: b6c77021c7db79ed8e7382e168409cfbc2c66b94681b6ba8fbcd6ec0842aedf3fe431ce894034640a2dfe2b22a8cf22884498d2b40df674e6a697aa16dd1282d
+  metadata.gz: 8302eeefd5df60556bc07db2724d45f02325b02e7c8edb1f5cdf2ccb26a2e88fcdfe0bf01b4bbe3bb3959c5571ffb63ecf6c8d97794a36421188c24bdb439a01
+  data.tar.gz: 4cbb366fb6be3c0e8be305922b286154524337b504d42f43098641359ad2916f4e3a64f5c3982099f5a0660a01fac0b218f26019bbdf2f104ce8f33ce2f5a4ba

data/.rubocop.yml

@@ -2,6 +2,7 @@
 
 require:
   - rubocop-rspec
+  - rubocop-performance
 
 AllCops:
   Exclude:

data/.travis.yml

@@ -1,14 +1,18 @@
 sudo: false
 language: ruby
+env:
+  global:
+    - CC_TEST_REPORTER_ID=cf3977cb8c335147723d765c91877e0506ba43e56a22a0dc5b83d7fb969cf5e4
 rvm:
   - 2.5.0
-before_install: gem install bundler -v 1.16.1
+before_install:
+  gem install bundler -v 1.16.1
 before_script:
   - curl -L https://codeclimate.com/downloads/test-reporter/test-reporter-latest-linux-amd64 > ./cc-test-reporter
   - chmod +x ./cc-test-reporter
   - ./cc-test-reporter before-build
 after_script:
-  - ./cc-test-reporter after-build --exit-code $TRAVIS_TEST_RESULT
+  - ./cc-test-reporter after-build -t simplecov --exit-code $TRAVIS_TEST_RESULT
 script:
   - bundle exec rubocop
   - bundle exec rspec

data/README.md

@@ -1,6 +1,8 @@
 # Fast
 
 [![Build Status](https://travis-ci.org/jonatas/fast.svg?branch=master)](https://travis-ci.org/jonatas/fast)
+[![Maintainability](https://api.codeclimate.com/v1/badges/b03d62ee266399e76e32/maintainability)](https://codeclimate.com/github/jonatas/fast/maintainability)
+[![Test Coverage](https://api.codeclimate.com/v1/badges/b03d62ee266399e76e32/test_coverage)](https://codeclimate.com/github/jonatas/fast/test_coverage)
 
 Fast, short for "Find AST", is a tool to search, prune, and edit Ruby ASTs.
 

data/fast.gemspec

@@ -29,7 +29,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'parser'
   spec.add_dependency 'pry'
 
-  spec.add_development_dependency 'bundler', '~> 1.14'
+  spec.add_development_dependency 'bundler'
   spec.add_development_dependency 'guard'
   spec.add_development_dependency 'guard-livereload'
   spec.add_development_dependency 'guard-rspec'
@@ -37,5 +37,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'rspec', '~> 3.0'
   spec.add_development_dependency 'rspec-its', '~> 1.2'
   spec.add_development_dependency 'rubocop'
+  spec.add_development_dependency 'rubocop-performance'
   spec.add_development_dependency 'rubocop-rspec'
+  spec.add_development_dependency 'simplecov'
 end

data/lib/fast.rb

@@ -113,7 +113,7 @@ module Fast
       rewriter.buffer = buffer
       rewriter.search = pattern
       rewriter.replacement = replacement
-      rewriter.affect_types(*types)
+      rewriter.replace_on(*types)
       rewriter.rewrite(buffer, ast)
     end
 
@@ -144,10 +144,10 @@ module Fast
     # otherwise it recursively collect possible children nodes
     # @yield node and capture if block given
     def search(node, pattern)
-      if (match = Fast.match?(node, pattern))
+      if (match = match?(node, pattern))
         yield node, match if block_given?
         match != true ? [node, match] : [node]
-      elsif Fast.match?(node, '...')
+      else
         node.each_child_node
           .flat_map { |e| search(e, pattern) }
           .compact.flatten
@@ -156,12 +156,12 @@ module Fast
 
     # Return only captures from a search
     # @return [Array<Object>] with all captured elements.
-    # If the result is only a single capture, it will return the single element.
+    # @return [Object] with single element when single capture.
     def capture(node, pattern)
       res =
-        if (match = Fast.match?(node, pattern))
+        if (match = match?(node, pattern))
           match == true ? node : match
-        elsif node.child_nodes.any?
+        else
           node.each_child_node
             .flat_map { |child| capture(child, pattern) }
             .compact.flatten
@@ -169,33 +169,6 @@ module Fast
       res&.size == 1 ? res[0] : res
     end
 
-    # Highligh some source code based on the node.
-    # Useful for printing code with syntax highlight.
-    def highlight(node, show_sexp: false)
-      output =
-        if node.respond_to?(:loc) && !show_sexp
-          node.loc.expression.source
-        else
-          node
-        end
-      CodeRay.scan(output, :ruby).term
-    end
-
-    # Combines {.highlight} with files printing file name in the head with the
-    # source line.
-    # @param result [Astrolabe::Node]
-    # @param show_sexp [Boolean] Show string expression instead of source
-    # @param file [String] Show the file name and result line before content
-    # @example
-    #   Fast.highlight(Fast.search(...))
-    def report(result, show_sexp: nil, file: nil)
-      if file
-        line = result.loc.expression.line if result.is_a?(Parser::AST::Node)
-        puts Fast.highlight("# #{file}:#{line}")
-      end
-      puts Fast.highlight(result, show_sexp: show_sexp)
-    end
-
     def expression(string)
       ExpressionParser.new(string).parse
     end
@@ -253,14 +226,12 @@ module Fast
     def expression_from(node)
       case node
       when Parser::AST::Node
-        children_expression = node.children.map(&Fast.method(:expression_from)).join(' ')
+        children_expression = node.children.map(&method(:expression_from)).join(' ')
         "(#{node.type}#{' ' + children_expression if node.children.any?})"
       when nil, 'nil'
         'nil'
       when Symbol, String, Numeric
         '_'
-      when Array, Hash
-        '...'
       end
     end
   end
@@ -268,7 +239,7 @@ module Fast
   # Rewriter encapsulates {Rewriter#match_index} to allow
   # {ExperimentFile.partial_replace} in a {Fast::ExperimentFile}.
   # @see https://www.rubydoc.info/github/whitequark/parser/Parser/TreeRewriter
-  # @note the standalone class needs to combines {Rewriter#affect_types} to properly generate the `on_<node-type>` methods depending on the expression being used.
+  # @note the standalone class needs to combines {Rewriter#replace_on} to properly generate the `on_<node-type>` methods depending on the expression being used.
   # @example Simple Rewriter
   #    ast = Fast.ast("a = 1")
   #    buffer = Parser::Source::Buffer.new('replacement')
@@ -277,7 +248,7 @@ module Fast
   #    rewriter.buffer = buffer
   #    rewriter.search ='(lvasgn _ ...)'
   #    rewriter.replacement =  -> (node) { replace(node.location.name, 'variable_renamed') }
-  #    rewriter.affect_types(:lvasgn)
+  #    rewriter.replace_on(:lvasgn)
   #    rewriter.rewrite(buffer, ast) # => "variable_renamed = 1"
   class Rewriter < Parser::TreeRewriter
     # @return [Integer] with occurrence index
@@ -294,21 +265,28 @@ module Fast
 
     # Generate methods for all affected types.
     # @see Fast.replace
-    def affect_types(*types) # rubocop:disable Metrics/MethodLength
+    def replace_on(*types)
       types.map do |type|
         self.class.send :define_method, "on_#{type}" do |node|
           if captures = match?(node) # rubocop:disable Lint/AssignmentInCondition
             @match_index += 1
-            if replacement.parameters.length == 1
-              instance_exec node, &replacement
-            else
-              instance_exec node, captures, &replacement
-            end
+            execute_replacement(node, captures)
           end
           super(node)
         end
       end
     end
+
+    # Execute {#replacement} block
+    # @param [Astrolabe::Node] node that will be yield in the replacement block
+    # @param [Array<Object>, nil] captures are yield if {#replacement} take second argument.
+    def execute_replacement(node, captures)
+      if replacement.parameters.length == 1
+        instance_exec node, &replacement
+      else
+        instance_exec node, captures, &replacement
+      end
+    end
   end
 
   # ExpressionParser empowers the AST search in Ruby.
@@ -435,7 +413,7 @@ module Fast
     end
 
     def to_s
-      "f[#{[*token].join(', ')}]"
+      "f[#{[*token].map(&:to_s).join(', ')}]"
     end
 
     def ==(other)
@@ -458,8 +436,8 @@ module Fast
 
     def typecast_value(token)
       case token
-      when /\d+\.\d*/ then token.to_f
-      when /\d+/ then token.to_i
+      when /^\d+\.\d*/ then token.to_f
+      when /^\d+/ then token.to_i
       else token.to_sym
       end
     end
@@ -594,7 +572,7 @@ module Fast
     end
 
     def to_s
-      "c[#{token} $: #{@captures}]"
+      "c[#{token}]"
     end
   end
 
@@ -623,7 +601,7 @@ module Fast
     end
 
     def to_s
-      "any[#{token}]"
+      "any[#{token.map(&:to_s).join(', ')}]"
     end
   end
 
@@ -689,11 +667,13 @@ module Fast
     def match?(ast = @ast, fast = @fast)
       head, *tail = fast
       return false unless head.match?(ast)
-      if tail.empty?
-        return ast == @ast ? find_captures : true # root node
-      end
+      return find_captures if tail.empty?
+
+      match_tail?(ast.children, tail)
+    end
 
-      child = ast.children
+    # @return [true] if all children matches with tail
+    def match_tail?(child, tail)
       tail.each_with_index.all? do |token, i|
         prepare_token(token)
         token.is_a?(Array) ? match?(child[i], token) : token.match?(child[i])

data/lib/fast/cli.rb

@@ -6,7 +6,37 @@ require 'coderay'
 require 'optparse'
 require 'ostruct'
 
+# Command Line Interface powered by CodeRay
 module Fast
+  module_function
+
+  # Highligh some source code based on the node.
+  # Useful for printing code with syntax highlight.
+  def highlight(node, show_sexp: false)
+    output =
+      if node.respond_to?(:loc) && !show_sexp
+        node.loc.expression.source
+      else
+        node
+      end
+    CodeRay.scan(output, :ruby).term
+  end
+
+  # Combines {.highlight} with files printing file name in the head with the
+  # source line.
+  # @param result [Astrolabe::Node]
+  # @param show_sexp [Boolean] Show string expression instead of source
+  # @param file [String] Show the file name and result line before content
+  # @example
+  #   Fast.highlight(Fast.search(...))
+  def report(result, show_sexp: nil, file: nil)
+    if file
+      line = result.loc.expression.line if result.is_a?(Parser::AST::Node)
+      puts Fast.highlight("# #{file}:#{line}")
+    end
+    puts Fast.highlight(result, show_sexp: show_sexp)
+  end
+
   # Command Line Interface for Fast
   class Cli
     attr_reader :pattern, :show_sexp, :pry, :from_code, :similar, :help

data/lib/fast/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ffast
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Jônatas Davi Paganini
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-04-27 00:00:00.000000000 Z
+date: 2019-05-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: astrolabe
@@ -70,16 +70,16 @@ dependencies:
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.14'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.14'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: guard
   requirement: !ruby/object:Gem::Requirement
@@ -178,6 +178,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: rubocop-performance
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rubocop-rspec
   requirement: !ruby/object:Gem::Requirement
@@ -192,6 +206,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: simplecov
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Allow you to search for code using node pattern syntax.
 email:
 - jonatasdp@gmail.com
@@ -259,7 +287,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 2.7.6.2
 signing_key: 
 specification_version: 4
 summary: 'FAST: Find by AST.'