dissociated_introspection 0.7.1 → 0.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 07819f7817b19bf6557dde81cfc9df9c8c792bd3
-  data.tar.gz: 35b6226a9b5d0b716af84e1d06fa23e9f38e0619
+  metadata.gz: 36a8544f5157efb38e2cfe40ec2888847211b761
+  data.tar.gz: f70dd03c6c9e52966e95068d59637e70e6a13714
 SHA512:
-  metadata.gz: 07f047d77917cac86da4c6c898660a4f20a236783f5006b518d9b5eab69f9134ca26cd3e0b7de3ea379eead0bc9a29fc13a56d870e036fb7a91c26efc9629c3d
-  data.tar.gz: 4cd70f3162a835d53406d3b3943973bc5b559b7a942fb0c97edc87fe591cf298970ee82d6e9ba9c97fb584fa7cb692915bc07ebc39b36385f05a9edf68251c7a
+  metadata.gz: cd41ba99f377e6988fa6884f44ce62b25e83b425c12d59292a971102a9c6a4120b0aa5f37a4bf7fb769a3866e5b36b0d76c44215adf1e30a5fce6eaa362920db
+  data.tar.gz: f0fc7cdcaccbedfd83b1992a7cd040c54ff7eeead3860940f5f44e7ce7b25a10bef12e6b9aff8b0761249b17ab8f20f3f0c55ee7864169cf50fcc11d8a66ba92

data/CHANGELOG.md

@@ -1,6 +1,16 @@
 # Changelog
 All notable changes to this project will be documented in this file.
 
+## 0.8.0 - 2017-03-24
+### Enhancement
+- DissociatedIntrospection::RubyClass#class_defs returns same api as #defs
+- DissociatedIntrospection::RubyClass#class_method_calls inspect method name and its arguments ie. attr_reader :name
+
+### Deprecated
+ - DissociatedIntrospection::RubyClass#is_class? changed to #class?
+ - DissociatedIntrospection::RubyClass#has_parent_class? changed to #parent_class?
+ - DissociatedIntrospection::RubyCode#to_ruby_str changed to #source
+
 ## 0.7.1 - 2016-10-20
 ### Fix
 - `DissociatedIntrospection::RubyClass#defs` fixed parse issue when class has one method.

data/README.md

@@ -44,7 +44,7 @@ new_ruby_class = ruby_class.modify_parent_class(:C)
 new_ruby_class.parent_class_name
     # => "C"
     
-new_ruby_class.to_ruby_str
+new_ruby_class.source
     # => "class A < C\n  def method\n  end\nend"
     
 ruby_class.defs.first.name

data/lib/dissociated_introspection/block.rb

@@ -0,0 +1,11 @@
+module DissociatedIntrospection
+  Block = Struct.new(:ast, :type)
+
+  def Block.source
+    :source
+  end
+
+  def Block.to_h
+    super.merge(source: source)
+  end
+end

data/lib/dissociated_introspection/inspection.rb

@@ -83,7 +83,7 @@ module DissociatedIntrospection
                               else
                                 file.path
                               end
-      load_sandbox(OpenStruct.new(read: modified_class_source.to_ruby_str, path: path))
+      load_sandbox(OpenStruct.new(read: modified_class_source.source, path: path))
     end
 
     def load_sandbox(file)

data/lib/dissociated_introspection/method_call.rb

@@ -0,0 +1,75 @@
+module DissociatedIntrospection
+  class Lambda
+    attr_reader :ast
+
+    def initialize(ast)
+      @ast = ast
+    end
+
+    def type
+      ast.type
+    end
+
+    def body
+      RubyCode.build_from_ast(ast.to_a[2])
+    end
+
+    def arguments
+      RubyCode.build_from_ast(ast.to_a[1])
+    end
+  end
+
+  class MethodCall
+    attr_reader :ruby_code
+
+    def initialize(ruby_code)
+      @ruby_code = ruby_code
+    end
+
+    def arguments
+      ruby_code.ast.children[2..-1].map do |c|
+        case c.type
+        when :sym, :str
+          c.to_a.first
+        when :block
+          Lambda.new(c)
+        else
+          c
+        end
+      end
+    end
+
+    def name
+      ruby_code.ast.children[1]
+    end
+
+    def to_h
+      { name: name, arguments: arguments }
+    end
+
+    class Argument
+      attr_reader :ast
+
+      def initialize(ast)
+        @ast = ast
+      end
+
+      def type
+        ast.type
+      end
+
+      def value
+        case type
+        when :block
+          Block.new(ast.children)
+        else
+          ast.children[0]
+        end
+      end
+
+      def to_h
+        { type: type, value: value }
+      end
+    end
+  end
+end

data/lib/dissociated_introspection/ruby_class.rb

@@ -1,6 +1,7 @@
 module DissociatedIntrospection
   class RubyClass
     attr_reader :ruby_code
+    extend Forwardable
     using Try
 
     def initialize(ruby_code)
@@ -14,19 +15,9 @@ module DissociatedIntrospection
                    end
     end
 
-    def ast
-      ruby_code.ast
-    end
-
-    def source
-      ruby_code.source
-    end
+    def_delegators :ruby_code, :ast, :source, :comments
 
-    def comments
-      ruby_code.comments
-    end
-
-    def is_class?
+    def class?
       ast.type == :class
     end
 
@@ -38,25 +29,25 @@ module DissociatedIntrospection
       Unparser.unparse(find_class.to_a[1])
     end
 
-    def has_parent_class?
+    def parent_class?
       return false unless find_class
       find_class.to_a[1].try(:type) == :const
     end
 
     def change_class_name(class_name)
-      reset_nodes
+      nodes    = ast.to_a.dup
       nodes[0] = Parser::CurrentRuby.parse(class_name)
       new_ast  = ast.updated(nil, nodes, nil)
       self.class.new(ast: new_ast)
     end
 
     def modify_parent_class(parent_class)
-      reset_nodes
-      if has_parent_class?
+      if parent_class?
         class_node    = find_class.to_a.dup
         class_node[1] = Parser::CurrentRuby.parse(parent_class.to_s)
         new_ast       = find_class.updated(nil, class_node, nil)
       else
+        nodes    = ast.to_a.dup
         nodes[1] = nodes[0].updated(:const, [nil, parent_class.to_sym])
         new_ast  = ast.updated(nil, nodes, nil)
       end
@@ -65,11 +56,18 @@ module DissociatedIntrospection
     end
 
     def defs
-      class_begin.children.select { |n| n.try(:type) == :def }.map do |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))
+      class_begin.children.select { |n| n.try(:type) == :def }.map(&method(:create_def))
+    end
+
+    def class_defs
+      class_begin.children.select { |n| [:defs, :sclass].include? n.try(:type) }.map do |n|
+        new_n = if n.type == :defs # def self.method;end
+                  n.updated(:def, n.children[1..-1])
+                elsif n.type == :sclass # class >> self; def method;end
+                  n.updated(:def, n.children[1].children, location: n.children[1].location)
+                end
+
+        create_def(new_n)
       end
     end
 
@@ -77,18 +75,16 @@ module DissociatedIntrospection
       find_class.children.find { |n| n.try(:type) == :begin } || find_class
     end
 
-    def to_ruby_str
-      source
-    end
-
     def scrub_inner_classes
-      self.class.new RubyCode.build_from_ast(scrub_inner_classes_ast,
-                                             comments: comments)
+      self.class.new RubyCode.build_from_ast(
+        scrub_inner_classes_ast,
+        comments: comments
+      )
     end
 
     def module_nesting
       ary = []
-      m = ast
+      m   = ast
       while m
         if (m = depth_first_search(m, :module, :class))
           name = m.to_a[0].to_a[1]
@@ -99,8 +95,21 @@ module DissociatedIntrospection
       ary
     end
 
+    def class_method_calls
+      class_begin.children.select { |n| n.try(:type) == :send }.map do |ast|
+        MethodCall.new(RubyCode.build_from_ast(ast))
+      end
+    end
+
     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))
+    end
+
     def scrub_inner_classes_ast
       find_class.updated(find_class.type,
                          class_begin.updated(class_begin.type,
@@ -121,15 +130,7 @@ module DissociatedIntrospection
           return v if v.is_a?(Parser::AST::Node)
         end
       end
-      return false
-    end
-
-    def nodes
-      @nodes ||= ast.to_a.dup
-    end
-
-    def reset_nodes
-      @nodes = nil
+      false
     end
   end
 end

data/lib/dissociated_introspection/ruby_class/def.rb

@@ -18,8 +18,8 @@ module DissociatedIntrospection
         Unparser.unparse(ruby_code.ast.children[2])
       end
 
-      def to_ruby_str
-        ruby_code.to_ruby_str
+      def source
+        ruby_code.source
       end
 
       private

data/lib/dissociated_introspection/ruby_code.rb

@@ -53,8 +53,6 @@ module DissociatedIntrospection
       @source = @source.nil? ? source_from_ast : @source
     end
 
-    alias_method :to_ruby_str, :source
-
     # @return [String]
     def source_from_ast
       Unparser.unparse(ast, comments)

data/lib/dissociated_introspection/version.rb

@@ -1,3 +1,3 @@
 module DissociatedIntrospection
-  VERSION = "0.7.1"
+  VERSION = "0.8.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dissociated_introspection
 version: !ruby/object:Gem::Version
-  version: 0.7.1
+  version: 0.8.0
 platform: ruby
 authors:
 - Dustin Zeisler
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-10-20 00:00:00.000000000 Z
+date: 2017-03-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: parser
@@ -101,8 +101,10 @@ files:
 - bin/setup
 - dissociated_introspection.gemspec
 - lib/dissociated_introspection.rb
+- lib/dissociated_introspection/block.rb
 - lib/dissociated_introspection/eval_sandbox.rb
 - lib/dissociated_introspection/inspection.rb
+- lib/dissociated_introspection/method_call.rb
 - lib/dissociated_introspection/recording_parent.rb
 - lib/dissociated_introspection/ruby_class.rb
 - lib/dissociated_introspection/ruby_class/def.rb