dissociated_introspection 0.9.1 → 0.11.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 943e04bc256389529fa5d43a1e0cba4fbb8a1451
-  data.tar.gz: 6651fde5dde7b492b0adc926d96f5b1be689d0db
+SHA256:
+  metadata.gz: 882e7dbe56d7d2cf361e7d572a72c955c74d58e0918140255ce15606a6f3cb3d
+  data.tar.gz: df0f04acc33076c45a5c2eb0a7c1d1d2ac40f901b931fbacfbd75210c5241068
 SHA512:
-  metadata.gz: b4ab2267f0cccdcd2e8b6512f5ca6f33b85a4bf4cc0842b2b380b9dc2ce23741de14276cf2b205aaac312b1388ffc3e4a450f97d0a9d3852738223370195770d
-  data.tar.gz: 1e22d5ec0bb0b2a23eb690c61bfdde2a4b0299b441e947a8929a3d72183db59a68f2dc03aa0c9832e0e260bfa9a6024c59f4cb7aa4066b7a3da15aaf5ea6b0f1
+  metadata.gz: 91404ea1dddef2e77f98c9c81d0e73c4280a9313426c7ecd745a18e72aca525f78ac68d41c5f9ab393bd9284ac4133a293d70898e1416dbaabd6f22467d216b6
+  data.tar.gz: ced0ed7383e7a6ebf0b4c51a4ce5afffbeabaf5523131bdf5245578be4c7d48268653293be12712a26852928f5b3f85f318820749364308970d5069ebb9b036f

data/.travis.yml

@@ -1,8 +1,8 @@
 language: ruby
 rvm:
-  - 2.1.9
-  - 2.2.7
-  - 2.3.4
-  - 2.4.1
+  - 2.2.9
+  - 2.3.7
+  - 2.4.4
+  - 2.5.1
 sudo: false
 cache: bundler

data/CHANGELOG.md

@@ -1,6 +1,19 @@
 # Changelog
 All notable changes to this project will be documented in this file.
 
+## 0.11.0 - 2018-08-01
+### Enhancement
+- Ability to Inline local methods with the exception of ones with arguments passed.
+
+## 0.10.0 - 2018-07-28
+### Fix
+- Require Ruby core lib resources. (Forwardable, Pathname)
+- Deal with change in how Ruby order's it's constants.
+### Enhancement
+- RubyClass::Def methods return RubyCode object so that AST could be inspected
+### Deprecation
+- Dropping support for Ruby version 2.1
+
 ## 0.9.1 - 2018-01-16
 ### Fix
 - `DissociatedIntrospection::RubyClass#class_begin` added back to public API

data/dissociated_introspection.gemspec

@@ -19,10 +19,10 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.required_ruby_version = '>= 2.1'
+  spec.required_ruby_version = '>= 2.2'
 
-  spec.add_runtime_dependency "parser", "~> 2.1", ">= 2.1.9"
-  spec.add_runtime_dependency "unparser", "~> 0.2", ">= 0.2.6"
+  spec.add_runtime_dependency "parser", "~> 2.2", ">= 2.2.1"
+  spec.add_runtime_dependency "unparser", "~> 0.2", ">= 0.2.8"
 
   spec.add_development_dependency "bundler", "~> 1.9"
   spec.add_development_dependency "rake", "~> 10.0"

data/lib/dissociated_introspection.rb

@@ -1,12 +1,15 @@
 require 'parser/current'
 require 'unparser'
+require 'forwardable'
 require 'dissociated_introspection/version'
 require 'dissociated_introspection/try'
 require 'dissociated_introspection/eval_sandbox'
 require 'dissociated_introspection/wrap_in_modules'
 require 'dissociated_introspection/ruby_code'
 require 'dissociated_introspection/ruby_class'
+require 'dissociated_introspection/ruby_class/create_def'
 require 'dissociated_introspection/ruby_class/def'
+require 'dissociated_introspection/method_in_liner'
 require 'dissociated_introspection/inspection'
 require 'dissociated_introspection/method_call'
 

data/lib/dissociated_introspection/eval_sandbox.rb

@@ -11,7 +11,7 @@ module DissociatedIntrospection
     def call
       module_namespace.module_eval(recording_parent.read, recording_parent.path)
       module_namespace.module_eval(file.read, file.path)
-      module_namespace.const_get(module_namespace.constants.last)
+      module_namespace.const_get(module_namespace.constants.select{|c| c != :RecordingParent}.last)
     end
 
     def constants
@@ -27,4 +27,4 @@ module DissociatedIntrospection
     end
 
   end
-end
+end

data/lib/dissociated_introspection/inspection.rb

@@ -1,8 +1,8 @@
 require 'ostruct'
+require "pathname"
 
 module DissociatedIntrospection
   class Inspection
-
     # @param file [File]
     # @optional parent_class_replacement [Symbol]
     def initialize(file:, parent_class_replacement: :RecordingParent)

data/lib/dissociated_introspection/method_in_liner.rb

@@ -0,0 +1,40 @@
+module DissociatedIntrospection
+  class MethodInLiner
+    attr_reader :defs, :ruby_code
+    # @param [Array<DissociatedIntrospection::RubyClass::Def>] defs
+    # @param [DissociatedIntrospection::RubyCode] ruby_code
+    def initialize(ruby_code, defs:)
+      @defs      = defs
+      @ruby_code = ruby_code
+    end
+
+    # @return [DissociatedIntrospection::RubyCode]
+    def in_line
+      rewriter      = InLiner.new
+      rewriter.defs = defs
+      result        = rewriter.process(ruby_code.ast)
+      RubyCode.build_from_ast(result)
+    end
+
+    class InLiner < Parser::TreeRewriter
+      attr_accessor :defs
+
+      def on_send(node)
+        called_on, method_name, *args = *node
+        # TODO: Deal with args by replacing lvar with passed objects
+        return super unless args.empty? && called_on_self?(called_on)
+        called_method = called_method(method_name)
+        return super unless called_method
+        node.updated(called_method.body.ast.type, called_method.body.ast.children)
+      end
+
+      def called_on_self?(called_on)
+        called_on.nil? || called_on.type == :self
+      end
+
+      def called_method(method_name)
+        defs.detect { |_def| _def.name == method_name }
+      end
+    end
+  end
+end

data/lib/dissociated_introspection/recording_parent.rb

@@ -1,7 +1,5 @@
 class RecordingParent < BasicObject
-
   class << self
-
     def method_missing(m, *args, &block)
       __missing_class_macros__.push({ m => [args, block].compact })
     end

data/lib/dissociated_introspection/ruby_class.rb

@@ -4,6 +4,7 @@ module DissociatedIntrospection
     extend Forwardable
     using Try
 
+    # @param [DissociatedIntrospection::RubyCode, String, Parse::AST, Hash{source: String, parse_with_comments: [Boolean]}] ruby_code
     def initialize(ruby_code)
       @ruby_code = if ruby_code.is_a?(Hash) && ruby_code.key?(:source)
                      RubyCode.build_from_source(
@@ -64,12 +65,12 @@ module DissociatedIntrospection
       self.class.new(RubyCode.build_from_ast(new_ast, comments: comments))
     end
 
-    # @return [DissociatedIntrospection::RubyClass::Def]
+    # @return [Array<DissociatedIntrospection::RubyClass::Def>]
     def defs
       class_begin.children.select { |n| n.try(:type) == :def }.map(&method(:create_def))
     end
 
-    # @return [DissociatedIntrospection::RubyClass::Def]
+    # @return [Array<DissociatedIntrospection::RubyClass::Def>]
     def class_defs
       ns = class_begin.children.select { |n| :defs == n.try(:type) }.map do |n|
         create_def(n.updated(:def, n.children[1..-1]))
@@ -81,6 +82,7 @@ module DissociatedIntrospection
       [*ns, *ns2]
     end
 
+    # @private
     def inspect_methods(type=:instance_methods)
       public_send(if type == :instance_methods
                     :defs
@@ -143,10 +145,7 @@ module DissociatedIntrospection
     private
 
     def create_def(n)
-      def_comments = comments.select do |comment|
-        comment.location.last_line+1 == n.location.first_line
-      end
-      Def.new(RubyCode.build_from_ast(n, comments: def_comments))
+      CreateDef.new(n, comments).create
     end
 
     def scrub_inner_classes_ast
@@ -156,7 +155,7 @@ module DissociatedIntrospection
     end
 
     def find_class
-      depth_first_search(ast, :class)
+      depth_first_search(ast, :class) || ast
     end
 
     def depth_first_search(node, target, stop=nil)

data/lib/dissociated_introspection/ruby_class/create_def.rb

@@ -0,0 +1,19 @@
+module DissociatedIntrospection
+  class RubyClass
+    class CreateDef
+      attr_reader :ast, :comments
+
+      def initialize(ast, comments)
+        @ast      = ast
+        @comments = comments
+      end
+
+      def create
+        def_comments = comments.select do |comment|
+          comment.location.last_line + 1 == ast.location.first_line
+        end
+        Def.new(RubyCode.build_from_ast(ast, comments: def_comments))
+      end
+    end
+  end
+end

data/lib/dissociated_introspection/ruby_class/def.rb

@@ -1,28 +1,41 @@
 module DissociatedIntrospection
   class RubyClass
     class Def
-
+      # @param [DissociatedIntrospection::RubyClass] ruby_code
       def initialize(ruby_code)
         @ruby_code = ruby_code
       end
 
+      # @return [Symbol, NilClass]
       def name
         ruby_code.ast.children[0]
       end
 
+      # @return [DissociatedIntrospection::RubyClass]
       def arguments
-        Unparser.unparse(ruby_code.ast.children[1])
+        RubyCode.build_from_ast(ruby_code.ast.children[1])
       end
 
+      # @return [DissociatedIntrospection::RubyClass]
       def body
-        Unparser.unparse(ruby_code.ast.children[2])
+        RubyCode.build_from_ast(ruby_code.ast.children[2])
       end
 
+      # @return [String]
       def source
         ruby_code.source
       end
 
-      private
+      def to_s
+        ruby_code.source
+      end
+
+      # @return [Parser::AST]
+      def ast
+        ruby_code.ast
+      end
+
+      # @return [DissociatedIntrospection::RubyClass]
       attr_reader :ruby_code
     end
   end

data/lib/dissociated_introspection/ruby_code.rb

@@ -52,6 +52,7 @@ module DissociatedIntrospection
     def source
       @source = @source.nil? ? source_from_ast : @source
     end
+    alias_method :to_s, :source
 
     # @return [String]
     def source_from_ast

data/lib/dissociated_introspection/version.rb

@@ -1,3 +1,3 @@
 module DissociatedIntrospection
-  VERSION = "0.9.1"
+  VERSION = "0.11.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dissociated_introspection
 version: !ruby/object:Gem::Version
-  version: 0.9.1
+  version: 0.11.0
 platform: ruby
 authors:
 - Dustin Zeisler
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-01-16 00:00:00.000000000 Z
+date: 2018-08-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: parser
@@ -16,20 +16,20 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.1'
+        version: '2.2'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.1.9
+        version: 2.2.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.1'
+        version: '2.2'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.1.9
+        version: 2.2.1
 - !ruby/object:Gem::Dependency
   name: unparser
   requirement: !ruby/object:Gem::Requirement
@@ -39,7 +39,7 @@ dependencies:
         version: '0.2'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.2.6
+        version: 0.2.8
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -49,7 +49,7 @@ dependencies:
         version: '0.2'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.2.6
+        version: 0.2.8
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -116,8 +116,10 @@ files:
 - lib/dissociated_introspection/eval_sandbox.rb
 - lib/dissociated_introspection/inspection.rb
 - lib/dissociated_introspection/method_call.rb
+- lib/dissociated_introspection/method_in_liner.rb
 - lib/dissociated_introspection/recording_parent.rb
 - lib/dissociated_introspection/ruby_class.rb
+- lib/dissociated_introspection/ruby_class/create_def.rb
 - lib/dissociated_introspection/ruby_class/def.rb
 - lib/dissociated_introspection/ruby_code.rb
 - lib/dissociated_introspection/try.rb
@@ -135,7 +137,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.1'
+      version: '2.2'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -143,7 +145,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.11
+rubygems_version: 2.7.7
 signing_key: 
 specification_version: 4
 summary: Introspect methods, parameters, class macros, and constants without loading