dissociated_introspection 0.2.0 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d52a5954cb2475630f4bc5b5bf6f7c2da5d7f725
-  data.tar.gz: 40245585bd9ace7f23b553c96f74338999c475ca
+  metadata.gz: d9a42a861612c49b10e198aa675c5ea86b5802d5
+  data.tar.gz: 3ce894b45ba7bdda24ad8d4120a07ce24bde4206
 SHA512:
-  metadata.gz: 3e5bdfb47e27e052dc08aa9318100964115918c90cbd52d1697bc45c8e2fbd1a6c57704bda52c58fdf626d17abd99951ebef9c93c2846c1a5db7657f2851ebe6
-  data.tar.gz: 2c56974c1bcf78f779ff30778ad92dff8c469900cb554927345550904daf0c55ead6bdba9c4135042b51117fb6d06fced33c784718c3d3b1095ffbc7dc0bbc02
+  metadata.gz: 19ad771d2a31f1efe5ed4466d6461371edc78ab44b6820999f1e7987fbeb65b8a583339be0256e7c7208de6f0a8dcdfb450ff91eb52631b24cd9b7fa495f861f
+  data.tar.gz: 071c6aedfffab0a6b1eed7a887dd69b14e3d54561c0c7f8197402e3b514c5bb4d4f04486380298382c3c3d8fe6788693309c91feccf840a5f7b98c95c727e01e

data/.rspec

@@ -1,2 +1,3 @@
 --format documentation
 --color
+--require spec_helper

data/CHANGELOG.md

@@ -0,0 +1,7 @@
+# Changelog
+All notable changes to this project will be documented in this file.
+
+## 0.3.1 - 2015-01-17
+### Enhancement
+- `DissociatedIntrospection::RubyClass` now can take a `DissociatedIntrospection::RubyCode` which is build with `#build_from_ast`, `#build_from_source`.
+- `DissociatedIntrospection::WrapInModules` given a instance of `DissociatedIntrospection::RubyCode` it will nest any depth of module namespacing.

data/lib/dissociated_introspection.rb

@@ -3,5 +3,8 @@ require 'unparser'
 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/def'
 require 'dissociated_introspection/inspection'

data/lib/dissociated_introspection/ruby_class.rb

@@ -1,13 +1,29 @@
 module DissociatedIntrospection
   class RubyClass
+    attr_reader :ruby_code
     using Try
 
-    def initialize(source: nil, ast: nil)
-      @source = source
-      @ast    = ast
-      if source.nil? && ast.nil?
-        raise ArgumentError.new "#{self.class.name} require either source or ast to be given as named arguments."
-      end
+    def initialize(ruby_code)
+      @ruby_code = if ruby_code.is_a?(Hash) && ruby_code.has_key?(:source)
+                     RubyCode.build_from_source(ruby_code[:source])
+                   elsif ruby_code.is_a?(Hash) && ruby_code.has_key?(:ast)
+                     RubyCode.build_from_ast(ruby_code[:ast],
+                                             comments: ruby_code.fetch(:comments, []))
+                   else
+                     ruby_code
+                   end
+    end
+
+    def ast
+      ruby_code.ast
+    end
+
+    def source
+      ruby_code.source
+    end
+
+    def comments
+      ruby_code.comments
     end
 
     def is_class?
@@ -44,80 +60,38 @@ module DissociatedIntrospection
         nodes[1] = nodes[0].updated(:const, [nil, parent_class.to_sym])
         new_ast  = ast.updated(nil, nodes, nil)
       end
-      self.class.new(ast: new_ast)
-    end
-
-    class Def
-
-      def initialize(ast:)
-        @ast = ast
-      end
-
-      def name
-        ast.children[0]
-      end
-
-      def arguments
-        Unparser.unparse(ast.children[1])
-      end
-
-      def body
-        Unparser.unparse(ast.children[2])
-      end
-
-      def to_ruby_str
-        Unparser.unparse(ast)
-      end
 
-      private
-      attr_reader :ast
+      self.class.new(RubyCode.build_from_ast(new_ast, comments: comments))
     end
 
     def defs
-      class_begin.children.select { |n| n.try(:type) == :def }.map{|n| Def.new(ast: n)}
+      class_begin.children.select { |n| n.try(:type) == :def }.map { |n| Def.new(ast: n) }
     end
 
     def class_begin
-      find_class.children.find{|n| n.try(:type) == :begin}
+      find_class.children.find { |n| n.try(:type) == :begin }
     end
 
     def to_ruby_str
-      Unparser.unparse(ast)
+      source
     end
 
     def scrub_inner_classes
-      self.class.new(ast: find_class.updated(find_class.type, class_begin.updated(class_begin.type, class_begin.children.reject { |n| n.try(:type) == :class })))
-    end
-
-    def wrap_in_modules(modules)
-      return self if modules.nil? || modules.empty?
-      ruby_string = to_ruby_str
-      modules.split("::").reverse.each do |module_name|
-        ruby_string = wrap_module(module_name, ruby_string)
-      end
-      wrapped_ast = Parser::CurrentRuby.parse(ruby_string)
-      self.class.new(ast: wrapped_ast)
+      self.class.new RubyCode.build_from_ast(scrub_inner_classes_ast,
+                                             comments: comments)
     end
 
     private
 
-    def wrap_module(module_name, ruby)
-      <<-RUBY
-        module #{module_name}
-      #{ruby}
-        end
-      RUBY
+    def scrub_inner_classes_ast
+      find_class.updated(find_class.type,
+                         class_begin.updated(class_begin.type,
+                                             class_begin.children.reject { |n| n.try(:type) == :class }))
     end
 
-    attr_reader :source
-
     def find_class
       return ast if ast.try(:type) == :class
-      ast.to_a.select { |n|n.try(:type) == :class }.first
-    end
-
-    def ast
-      @ast ||= Parser::CurrentRuby.parse(source)
+      ast.to_a.select { |n| n.try(:type) == :class }.first
     end
 
     def nodes

data/lib/dissociated_introspection/ruby_class/def.rb

@@ -0,0 +1,29 @@
+module DissociatedIntrospection
+  class RubyClass
+    class Def
+
+      def initialize(ast:)
+        @ast = ast
+      end
+
+      def name
+        ast.children[0]
+      end
+
+      def arguments
+        Unparser.unparse(ast.children[1])
+      end
+
+      def body
+        Unparser.unparse(ast.children[2])
+      end
+
+      def to_ruby_str
+        Unparser.unparse(ast)
+      end
+
+      private
+      attr_reader :ast
+    end
+  end
+end

data/lib/dissociated_introspection/ruby_code.rb

@@ -0,0 +1,63 @@
+module DissociatedIntrospection
+  class RubyCode
+
+    # @param [String] source
+    # @param [true, false] parse_with_comments
+    # @return [DissociatedIntrospection::RubyCode]
+    def self.build_from_source(source, parse_with_comments: false)
+      ast, comments = create_ast(parse_with_comments, source)
+      new(source:              source,
+          ast:                 ast,
+          comments:            comments)
+    end
+
+    # @param [Ast] ast
+    # @param [Array] comments
+    # @return [DissociatedIntrospection::RubyCode]
+    def self.build_from_ast(ast, comments: [])
+      new(source:   nil,
+          ast:      ast,
+          comments: comments
+      )
+    end
+
+    # @private
+    def self.parse_source_method(parse_with_comments)
+      parse_with_comments ? :parse_with_comments : :parse
+    end
+
+    # @private
+    def self.create_ast(parse_with_comments, source)
+      a = Parser::CurrentRuby.public_send(self.parse_source_method(parse_with_comments), source)
+      if parse_with_comments
+        [a[0], a[1]]
+      else
+        [a, []]
+      end
+    end
+
+    attr_reader :ast, :comments
+    #@private
+    def initialize(source:, ast:, comments:)
+      @source   = source
+      @ast      = ast
+      @comments = comments
+    end
+
+    def comments?
+      !comments.empty?
+    end
+
+    # @return [String]
+    def source
+      @source = @source.nil? ? source_from_ast : @source
+    end
+
+    alias_method :to_ruby_str, :source
+
+    # @return [String]
+    def source_from_ast
+      Unparser.unparse(ast, comments)
+    end
+  end
+end

data/lib/dissociated_introspection/version.rb

@@ -1,3 +1,3 @@
 module DissociatedIntrospection
-  VERSION = "0.2.0"
+  VERSION = "0.3.1"
 end

data/lib/dissociated_introspection/wrap_in_modules.rb

@@ -0,0 +1,35 @@
+module DissociatedIntrospection
+  class WrapInModules
+    # @param [DissociatedIntrospection::RubyCode] ruby_code
+    def initialize(ruby_code:)
+      @ruby_code = ruby_code
+    end
+
+    # @param [String] modules
+    # @return [DissociatedIntrospection::RubyCode]
+    def call(modules:)
+      return ruby_code if modules.nil? || modules.empty?
+      wrap_in_modules(modules)
+    end
+
+    private
+
+    attr_reader :ruby_code
+
+    def wrap_in_modules(modules)
+      ruby_string = ruby_code.source_from_ast
+      modules.split("::").reverse.each do |module_name|
+        ruby_string = wrap_module(module_name, ruby_string)
+      end
+      RubyCode.build_from_source(ruby_string, parse_with_comments: ruby_code.comments?)
+    end
+
+    def wrap_module(module_name, ruby_string)
+      <<-RUBY
+    module #{module_name}
+      #{ruby_string}
+    end
+      RUBY
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dissociated_introspection
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.1
 platform: ruby
 authors:
 - Dustin Zeisler
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-01-05 00:00:00.000000000 Z
+date: 2016-01-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: parser
@@ -91,6 +91,7 @@ files:
 - ".gitignore"
 - ".rspec"
 - ".travis.yml"
+- CHANGELOG.md
 - CODE_OF_CONDUCT.md
 - Gemfile
 - LICENSE.txt
@@ -104,8 +105,11 @@ files:
 - lib/dissociated_introspection/inspection.rb
 - lib/dissociated_introspection/recording_parent.rb
 - lib/dissociated_introspection/ruby_class.rb
+- lib/dissociated_introspection/ruby_class/def.rb
+- lib/dissociated_introspection/ruby_code.rb
 - lib/dissociated_introspection/try.rb
 - lib/dissociated_introspection/version.rb
+- lib/dissociated_introspection/wrap_in_modules.rb
 homepage: https://github.com/zeisler/dissociated_introspection
 licenses:
 - MIT
@@ -132,3 +136,4 @@ specification_version: 4
 summary: Introspect methods, parameters, class macros, and constants without loading
   a parent class or any other dependencies.
 test_files: []
+has_rdoc: