courgette 0.2.2 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b29ee38ee6dfcfc6cc22cbc3caf3f00b08c0cc02
-  data.tar.gz: 5cdd93f711eec0daeaba7057f251be5478fe52bd
+  metadata.gz: f615e4ef69593e21d1de8c8e0f5a1f4137777bd6
+  data.tar.gz: 9972586e2328530973db1e9234d6fd6978a214e8
 SHA512:
-  metadata.gz: 8d94271ccd57572f4313b620f87e57212821bae2660071e50433122176d00a34387ef544586def5673b9b52d1ea2cb5bb82ed103bc62a3cc676bca387ce2efa1
-  data.tar.gz: 49432ae8c095a31cd30f88e3387c5054ad1a74fc0dbb4c9039f2164c6058d42e017bc1d4730270be4b67a0463d257c8557810189473e1adff5cf4c428353599f
+  metadata.gz: 31414ebd38fb6d5a3328e0c4e46be2d6bdc7fd2b97b66beabcc7f081140c2fe2ea31ca489168cf538fee32e025f88d9a7268b08f46b3f1720c56b1b5314ca3c5
+  data.tar.gz: 86c6a07660d04acffb78c4909b1a90fd67548f0952b7e0876b0a9de511608b3b144134ada8869de57b8f5992f287d68272709ac05b83ef21219cc205630b5890

data/courgette.gemspec

@@ -18,7 +18,7 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
-  spec.add_dependency "ruby_parser"
+  spec.add_dependency "parser"
   spec.add_dependency "commander"
   spec.add_dependency "graph"
 

data/lib/courgette/capturer.rb

@@ -12,6 +12,7 @@ module Courgette
     end
 
     def add_reference reference, context
+      context = [Kernel] if context.empty?
       @references << Reference.new(reference, context)
     end
 
@@ -74,11 +75,13 @@ module Courgette
     end
 
     def iterate_definition sexpr, context
-      s = scope sexpr[1]
+      s = scope sexpr.children[0]
       new_context = context + [s]
+
       add_definition new_context
 
-      iterate_many sexpr[2..-1], new_context
+
+      iterate_many sexpr.children[1..-1], new_context
     end
 
     def iterate_call sexpr, context
@@ -87,23 +90,17 @@ module Courgette
     end
 
     def iterate sexpr, context
-      return unless sexpr.is_a? Enumerable
+      return unless sexpr.is_a? Parser::AST::Node
 
-      case sexpr[0]
+      case sexpr.type
       when :const, :colon2
         add_reference context, scope(sexpr)
       when :module, :class
         iterate_definition sexpr, context
-      when :cdecl
-        iterate_cdecl sexpr, context
-      when :defn
-        iterate_many sexpr[3..-1], context
-
-      when :call
-        iterate_call sexpr, context
-      when :nil, :lit
+      when :casgn
+        add_definition context + [sexpr.children[1]]
       else
-        iterate_many sexpr[1..-1], context
+        iterate_many sexpr.children, context
       end
     end
   end

data/lib/courgette/file_to_sexpr.rb

@@ -1,17 +1,21 @@
-require 'ruby_parser'
+require 'parser/current'
 
 module Courgette
   class FileToSexpr
-    def initialize
-      @parser = RubyParser.new
+    def initialize p=nil
+      @parser = p || default_parser
+    end
+
+    def default_parser
+      Parser::CurrentRuby
     end
 
     def convert filename
       contents = File.read filename
 
       begin
-        x = @parser.parse contents
-      rescue Racc::ParseError, RubyParser::SyntaxError => e
+        @parser.parse contents
+      rescue Parser::SyntaxError => e
         $stderr.puts "Error parsing #{filename}: #{e} (file ignored)"
       end
     end

data/lib/courgette/scope.rb

@@ -1,13 +1,10 @@
 module Courgette
   class Scope
     def scope sexpr
-      case sexpr[0]
-      when :colon2
-        scope(sexpr[1]) + scope(sexpr[2])
-      when :const
-        scope sexpr[1]
+      if sexpr.respond_to? :type
+        sexpr.children.flat_map { |c| scope c }
       else
-        [sexpr]
+        [sexpr].compact
       end
     end
   end

data/lib/courgette/version.rb

@@ -1,4 +1,3 @@
 module Courgette
-  VERSION = "0.2.2"
+  VERSION = "0.3.0"
 end
-

data/test/courgette/test_capturer.rb

@@ -2,6 +2,7 @@ require 'simplecov'
 require 'minitest/autorun'
 require 'courgette/capturer'
 require 'mocha/setup'
+require 'parser/current'
 
 class TestCourgetteCaptured < MiniTest::Unit::TestCase
   def setup
@@ -40,6 +41,11 @@ class TestCourgetteCapturer < MiniTest::Unit::TestCase
   def setup
     @observer = mock()
     @object = Courgette::Capturer.new @observer
+    @parser = Parser::CurrentRuby
+  end
+
+  def capture code
+    @object.capture @parser.parse(code)
   end
 
   def test_references_delegation
@@ -57,53 +63,53 @@ class TestCourgetteCapturer < MiniTest::Unit::TestCase
   def test_class_definition
     @observer.expects(:add_definition).with([:X]).once
 
-    @object.capture [:class, :X]
+    capture "class X; end"
   end
 
   def test_module_definition
     @observer.expects(:add_definition).with([:M]).once
 
-    @object.capture [:module, :M]
+    capture "module M; end"
   end
 
   def test_class_inside_module
     @observer.expects(:add_definition).with([:M]).once
     @observer.expects(:add_definition).with([:M, :C]).once
 
-    @object.capture [:module, :M, [:class, :C]]
+    capture "module M; class C; end; end"
   end
 
   def test_constant_declaration
     @observer.expects(:add_definition).with([:C]).once
 
-    @object.capture [:cdecl, :C, [:lit, 1]]
+    capture "C = 1"
   end
 
   def test_scoped_definition
     @observer.expects(:add_definition).with([:M, :C]).once
 
-    @object.capture [:module, [:colon2, [:const, :M], :C]]
+    capture "module M::C; end"
   end
 
   def test_reference
     @observer.expects(:add_reference).with([:C], []).once
 
-    @object.capture [:const, :C]
+    capture "C"
   end
 
   def test_class_call
     @observer.expects(:add_reference).with([:C], []).once
 
-    @object.capture [:call, [:const, :C], :new]
+    capture "C.new"
   end
 
   def test_reference_in_method
     @observer.expects(:add_reference).with([:C], []).once
 
-    @object.capture [:defn, :bananas, [], [:const, :C]]
+    capture "def bananas; C; end"
   end
 
   def test_others
-    @object.capture [:if, [:lit, 42]]
+    capture "if 42; end"
   end
 end

data/test/courgette/test_scope.rb

@@ -7,8 +7,14 @@ class TestCourgetteScope < MiniTest::Unit::TestCase
     @scope = Courgette::Scope.new
   end
 
+  class ConstNode < Struct.new(:children)
+    def type
+      :const
+    end
+  end
+
   def test_const
-    assert_equal [:Name], @scope.scope([:const, :Name])
+    assert_equal [:Name], @scope.scope(ConstNode.new([nil, :Name]))
   end
 
   def test_other
@@ -17,16 +23,16 @@ class TestCourgetteScope < MiniTest::Unit::TestCase
 
   def test_colon2
     assert_equal [:Scoped, :Name],
-      @scope.scope([:colon2, :Scoped, :Name])
+      @scope.scope(ConstNode.new([ConstNode.new([nil, :Scoped]), :Name]))
   end
 
   def test_compose
     assert_equal [:Really, :Scoped, :Name],
       @scope.scope(
-        [:colon2,
-          [:colon2,
-            [:const, :Really],
-            [:const, :Scoped]],
-          [:const, :Name]])
+        ConstNode.new([
+          ConstNode.new([
+            ConstNode.new([nil, :Really]),
+            :Scoped]),
+          :Name]))
   end
 end

metadata

@@ -1,17 +1,17 @@
 --- !ruby/object:Gem::Specification
 name: courgette
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.3.0
 platform: ruby
 authors:
 - Hugo Peixoto
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-20 00:00:00.000000000 Z
+date: 2015-02-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: ruby_parser
+  name: parser
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -171,7 +171,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.0.preview.1
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Courgette analyses a set of files, and calculates a dependency graph
@@ -180,3 +180,4 @@ test_files:
 - test/courgette/test_name_resolution.rb
 - test/courgette/test_reference_to_dependency.rb
 - test/courgette/test_scope.rb
+has_rdoc: