analyst 0.15.0 → 0.16.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7b73349858dc8cc8e23a7bcee486149fa81fa14b
-  data.tar.gz: e8d736fd3c97802f6a8bf7db970ae730385938e0
+  metadata.gz: 25e03d345e3eee79249da960a221c1635de9ded7
+  data.tar.gz: 939e2a44f33bc42afed68a253be53e4110c0ea21
 SHA512:
-  metadata.gz: 121c7e0d71706490dd637a48d718002a217b4fa2c190708ed9cd8c8d2fef02758cb118f0704afbd3fa397922571f09fa9270ee2dd53eb5b68266678309d9b0cb
-  data.tar.gz: 6306167886e6d7f9e4d1b6ff3bff588525805d18a6aec93b03f0c85164def809851bcfa0c54e617002813a52f43ab5a354f9e8da3f8300dadd7c71ff00539d0f
+  metadata.gz: 385373476be049c30d9ebccb8ab096496587eae69a85678e420631cf7c1bfb9ce04336b3a316b78e36f0f293186c8967714e3d7fe6d77857e776dfcd60daaa07
+  data.tar.gz: 8423b501882aab60fac8dfea3b59272d539718731ac6a40e42152c0a512f339a68e8985c31717ecd6d3354d934fb3bd2eb9f4cd710ad53c794a99c91da7cff92

data/lib/analyst/entities/class.rb

@@ -1,12 +1,8 @@
-#TODO add == to association
-# TODO look thru the singleton_methods for ones on (self),
-#   and also look for the ones from 'class << self' constructs, which will be
-#   found in (sclass) nodes (which will be some sort of Entity)
-
 module Analyst
-
   module Entities
-    class Class < Analyst::Entities::Module
+    class Class < Entity
+
+      include HasMethods
 
       handles_node :class
 
@@ -16,33 +12,27 @@ module Analyst
         "Class"
       end
 
-      def imethods
-        @imethods ||= contents.select { |entity| entity.is_a? Analyst::Entities::InstanceMethod }
-      end
-
-      def cmethods
-        some_methods = smethods.select { |method| method.target.type == :self }
-        other_methods = singleton_class_blocks { |block| block.target.type == :self }.map(&:smethods).flatten
-        some_methods + other_methods
+      def singleton_class_blocks
+        contents.select { |entity| entity.is_a? Analyst::Entities::SingletonClass }
       end
 
-      def all_methods
-        cmethods + imethods
+      def name
+        name_entity.name
       end
 
-      def singleton_class_blocks
-        contents.select { |entity| entity.is_a? Analyst::Entities::SingletonClass }
+      def full_name
+        parent.full_name.empty? ? name : parent.full_name + '::' + name
       end
 
       private
 
-      def smethods
-        @smethods ||= contents.select do |entity|
-          entity.is_a? Analyst::Entities::SingletonMethod
-        end
+      def name_entity
+        @name_entity ||= process_node(name_node)
       end
 
+      def name_node
+        ast.children.first
+      end
     end
-
   end
 end

data/lib/analyst/entities/constant_assignment.rb

@@ -0,0 +1,28 @@
+module Analyst
+
+  module Entities
+    class ConstantAssignment < Entity
+
+      handles_node :casgn
+
+      def name
+        name_node.to_s
+      end
+
+      def full_name
+        scope.nil? ? name : scope.full_name + '::' + name
+      end
+
+      def scope
+        @scope ||= process_node(ast.children.first)
+      end
+
+      private
+
+      def name_node
+        ast.children[1]
+      end
+    end
+  end
+end
+

data/lib/analyst/entities/entity.rb

@@ -35,6 +35,14 @@ module Analyst
         @constants ||= top_level_constants + contents.map(&:constants).flatten
       end
 
+      def constant_assignments
+        @constant_assignments ||= top_level_constant_assignments + contents.map(&:constant_assignments).flatten
+      end
+
+      def top_level_constant_assignments
+        @top_level_constant_assignments ||= contents_of_type(Entities::ConstantAssignment)
+      end
+
       def top_level_constants
         @top_level_constants ||= contents_of_type(Entities::Constant)
       end

data/lib/analyst/entities/file.rb

@@ -14,6 +14,10 @@ module Analyst
         parent.source_data_for(self)
       end
 
+      def location
+        file_path
+      end
+
       def origin_source
         ::File.open(file_path, 'r').read
       end

data/lib/analyst/entities/mixins/has_methods.rb

@@ -0,0 +1,34 @@
+module Analyst
+
+  module Entities
+
+    module HasMethods
+
+      def imethods
+        @imethods ||= contents.select { |entity| entity.is_a? Analyst::Entities::InstanceMethod }
+      end
+
+      def cmethods
+        some_methods = smethods.select { |method| method.target.type == :self }
+        other_methods = singleton_class_blocks { |block| block.target.type == :self }.map(&:smethods).flatten
+        some_methods + other_methods
+      end
+
+      def all_methods
+        cmethods + imethods
+      end
+
+      def singleton_class_blocks
+        contents.select { |entity| entity.is_a? Analyst::Entities::SingletonClass }
+      end
+
+      private
+
+      def smethods
+        @smethods ||= contents.select do |entity|
+          entity.is_a? Analyst::Entities::SingletonMethod
+        end
+      end
+    end
+  end
+end

data/lib/analyst/entities/module.rb

@@ -2,6 +2,8 @@ module Analyst
   module Entities
     class Module < Entity
 
+      include HasMethods
+
       handles_node :module
 
       def kind

data/lib/analyst/entities/root.rb

@@ -27,15 +27,19 @@ module Analyst
         throw "Entity tree malformed - Source or File hsould have caught this call"
       end
 
-      private
-
-      attr_reader :source_data
+      def inspect
+        "\#<#{self.class}>"
+      end
 
       def contents
         # skip all top-level entities, cuz they're all Files and Sources
         @contents ||= actual_contents.map(&:contents).flatten
       end
 
+      private
+
+      attr_reader :source_data
+
       def actual_contents
         @actual_contents ||= ast.children.map { |child| process_node(child) }
       end

data/lib/analyst/entities/source.rb

@@ -11,7 +11,11 @@ module Analyst
       end
 
       def file_path
-        "$PARSED FROM SOURCE$"
+        "$SOURCE$"
+      end
+
+      def location
+        file_path
       end
 
       def origin_source

data/lib/analyst/parser.rb

@@ -9,12 +9,14 @@ module Analyst
     def_delegators :root, :classes, :top_level_classes, :constants,
                           :methods
 
-    def self.for_files(path_to_files)
-      file_paths = if File.directory?(path_to_files)
-        Dir.glob(File.join(path_to_files, "**", "*.rb"))
-      else
-        [path_to_files]
-      end
+    def self.for_files(*path_to_files)
+      file_paths = path_to_files.map do |path|
+        if File.directory?(path)
+          Dir.glob(File.join(path, "**", "*.rb"))
+        else
+          path
+        end
+      end.flatten
 
       wrapped_asts = file_paths.map do |path|
         ast = ::Parser::CurrentRuby.parse(File.open(path, 'r').read)

data/lib/analyst/version.rb

@@ -1,3 +1,3 @@
 module Analyst
-  VERSION = "0.15.0"
+  VERSION = "0.16.1"
 end

data/lib/analyst.rb

@@ -5,6 +5,7 @@ require 'parser/current'
 require_relative "analyst/parser"
 require_relative "analyst/processor"
 require_relative "analyst/version"
+require_relative "analyst/entities/mixins/has_methods"
 require_relative "analyst/entities/entity"
 require_relative "analyst/entities/root"
 require_relative "analyst/entities/file"
@@ -14,6 +15,7 @@ require_relative "analyst/entities/module"
 require_relative "analyst/entities/class"
 require_relative "analyst/entities/interpolated_string"
 require_relative "analyst/entities/constant"
+require_relative "analyst/entities/constant_assignment"
 require_relative "analyst/entities/conditional"
 require_relative "analyst/entities/method"
 require_relative "analyst/entities/method_call"
@@ -28,8 +30,8 @@ module Analyst
 
   module ClassMethods
 
-    def for_files(path_to_files)
-      Analyst::Parser.for_files(path_to_files)
+    def for_files(*path_to_files)
+      Analyst::Parser.for_files(*path_to_files)
     end
 
     alias :for_file :for_files

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: analyst
 version: !ruby/object:Gem::Version
-  version: 0.15.0
+  version: 0.16.1
 platform: ruby
 authors:
 - Coraline Ada Ehmke
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-06 00:00:00.000000000 Z
+date: 2014-11-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: haml
@@ -216,12 +216,14 @@ files:
 - lib/analyst/entities/code_block.rb
 - lib/analyst/entities/conditional.rb
 - lib/analyst/entities/constant.rb
+- lib/analyst/entities/constant_assignment.rb
 - lib/analyst/entities/entity.rb
 - lib/analyst/entities/file.rb
 - lib/analyst/entities/hash.rb
 - lib/analyst/entities/interpolated_string.rb
 - lib/analyst/entities/method.rb
 - lib/analyst/entities/method_call.rb
+- lib/analyst/entities/mixins/has_methods.rb
 - lib/analyst/entities/module.rb
 - lib/analyst/entities/pair.rb
 - lib/analyst/entities/root.rb