courgette 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 57adf4c4137fcf9342cc36a2da2d18bae46adff3
-  data.tar.gz: c7d05925b78857a07c8765859e9c945dbcffd3e8
+  metadata.gz: 38ea2fcd95ca4875051e13099c9bd2588d27ee5a
+  data.tar.gz: eda2e173085c058bff814cfb19a963a6e099e0d8
 SHA512:
-  metadata.gz: 17e68370df6b304fdf7973b9f969e53d5bc9f30764a2eebdf0b33442b48bfddf6d4b40a81bcb4bd35679448e23a1962e222688339fc1797670d75943f732d5a4
-  data.tar.gz: bf96fc9d079926ea905030564e21a12f2543fbe546249056c53c85565deed8d05ac56e49b608e68d2fc3750009480a258506e7968aa8f5cd67aa5a6640e0ff2c
+  metadata.gz: 5b842597ac23ddca376de1f97de42d4d405831a9264f32342bfedc991613d28ee9dc45cebc461b443e820644ab495e5052c2dc32635727e842aa772aacd5914f
+  data.tar.gz: 0716c611805a0657751446a40897a61c4bb74aae132a1177583e13be135e9d5c45a7764118623740705939cc874c408e8cc1cb5d21cdf0cc62341af967a284f0

data/courgette.gemspec

@@ -25,4 +25,6 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "bundler", "~> 1.3"
   spec.add_development_dependency "rake"
   spec.add_development_dependency "minitest"
+  spec.add_development_dependency "mocha"
+  spec.add_development_dependency "simplecov"
 end

data/lib/courgette/capturer.rb

@@ -1,18 +1,22 @@
 require 'courgette/scope'
 
 module Courgette
-  class Capturer
+  class Captured
     def initialize
       @references  = []
       @definitions = []
     end
 
-    def capture sexpr
-      iterate sexpr, []
+    def add_definition definition
+      @definitions << definition
+    end
+
+    def add_reference reference, context
+      @references << Reference.new(reference, context)
     end
 
     def references
-      @references.uniq! { |reference| reference.to_a }
+      @references.uniq! { |ref| ref.to_a }
       @references
     end
 
@@ -23,13 +27,32 @@ module Courgette
 
     private
     Reference = Struct.new :name, :context
+  end
+
+  class Capturer
+    def initialize observer = nil
+      @captured = observer || Captured.new
+    end
+
+    def capture sexpr
+      iterate sexpr, []
+    end
+
+    def references
+      @captured.references
+    end
 
+    def definitions
+      @captured.definitions
+    end
+
+    private
     def add_definition definition
-      @definitions << definition.flatten
+      @captured.add_definition definition.flatten
     end
 
     def add_reference context, reference
-      @references << Reference.new(reference, context)
+      @captured.add_reference reference, context
     end
 
     def scope sexpr
@@ -63,7 +86,6 @@ module Courgette
       iterate_many sexpr[3..-1], context
     end
 
-
     def iterate sexpr, context
       return unless sexpr.is_a? Enumerable
 

data/lib/courgette/file_to_sexpr.rb

@@ -9,7 +9,11 @@ module Courgette
     def convert filename
       contents = File.read filename
 
-      @parser.parse contents
+      begin
+        x = @parser.parse contents
+      rescue Racc::ParseError => e
+        $stderr.puts "Error parsing #{filename}: #{e} (file ignored)"
+      end
     end
   end
 end

data/lib/courgette/name_resolution.rb

@@ -5,15 +5,21 @@ module Courgette
     end
 
     def resolve reference
-      definitions.find do |definition|
-        match_name?(definition, reference) &&
-          match_scope?(definition, reference)
+      matches(reference).max do |x, y|
+        x.length <=> y.length
       end
     end
 
     private
     attr_reader :definitions
 
+    def matches reference
+      definitions.select do |definition|
+        match_name?(definition, reference) &&
+          match_scope?(definition, reference)
+      end
+    end
+
     def match_name? definition, reference
       definition.last == reference.name.last
     end

data/lib/courgette/reference_to_dependency.rb

@@ -2,8 +2,8 @@ require 'courgette/name_resolution'
 
 module Courgette
   class ReferenceToDependency
-    def initialize definitions
-      @resolver = Courgette::NameResolution.new definitions
+    def initialize definitions, resolver = nil
+      @resolver = resolver || Courgette::NameResolution.new(definitions)
     end
 
     def transform reference

data/lib/courgette/version.rb

@@ -1,4 +1,4 @@
 module Courgette
-  VERSION = "0.1.0"
+  VERSION = "0.2.0"
 end
 

data/test/courgette/test_capturer.rb

@@ -0,0 +1,109 @@
+require 'simplecov'
+require 'minitest/autorun'
+require 'courgette/capturer'
+require 'mocha/setup'
+
+class TestCourgetteCaptured < MiniTest::Unit::TestCase
+  def setup
+    @object = Courgette::Captured.new
+  end
+
+  def test_definition
+    @object.add_definition [:A]
+
+    assert_equal [:A], @object.definitions.first
+  end
+
+  def test_reference
+    @object.add_reference "name", "context"
+
+    assert_equal "name", @object.references.first.name
+    assert_equal "context", @object.references.first.context
+  end
+
+  def test_duplicate_definitions
+    @object.add_definition [:A]
+    @object.add_definition [:A]
+
+    assert_equal 1, @object.definitions.count
+  end
+
+  def test_duplicate_references
+    @object.add_reference "name", "context"
+    @object.add_reference "name", "context"
+
+    assert_equal 1, @object.references.count
+  end
+end
+
+class TestCourgetteCapturer < MiniTest::Unit::TestCase
+  def setup
+    @observer = mock()
+    @object = Courgette::Capturer.new @observer
+  end
+
+  def test_references_delegation
+    @observer.expects(:references).once
+
+    @object.references
+  end
+
+  def test_definitions_delegation
+    @observer.expects(:definitions).once
+
+    @object.definitions
+  end
+
+  def test_class_definition
+    @observer.expects(:add_definition).with([:X]).once
+
+    @object.capture [:class, :X]
+  end
+
+  def test_module_definition
+    @observer.expects(:add_definition).with([:M]).once
+
+    @object.capture [:module, :M]
+  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]]
+  end
+
+  def test_constant_declaration
+    @observer.expects(:add_definition).with([:C]).once
+
+    @object.capture [:cdecl, :C, [:lit, 1]]
+  end
+
+  def test_scoped_definition
+    @observer.expects(:add_definition).with([:M, :C]).once
+
+    @object.capture [:module, [:colon2, [:const, :M], :C]]
+  end
+
+  def test_reference
+    @observer.expects(:add_reference).with([:C], []).once
+
+    @object.capture [:const, :C]
+  end
+
+  def test_class_call
+    @observer.expects(:add_reference).with([:C], []).once
+
+    @object.capture [:call, [:const, :C], :new]
+  end
+
+  def test_reference_in_method
+    @observer.expects(:add_reference).with([:C], []).once
+
+    @object.capture [:defn, :bananas, [], [:const, :C]]
+  end
+
+  def test_others
+    @object.capture [:if, [:lit, 42]]
+  end
+end

data/test/courgette/test_name_resolution.rb

@@ -1,3 +1,4 @@
+require 'simplecov'
 require 'minitest/autorun'
 require 'courgette/name_resolution'
 
@@ -69,4 +70,40 @@ class TestCourgetteNameResolution < MiniTest::Unit::TestCase
     ref = FakeReference.new [:Name], [[:Potato, :Scoped]]
     assert_equal nil, @resolver.resolve(ref)
   end
+
+  def test_ambiguous_reference_from_specific_context
+    definitions = [[:Potato, :Name], [:Name]]
+    create definitions
+
+    ref = FakeReference.new [:Name], [[:Potato]]
+
+    assert_equal [:Potato, :Name], @resolver.resolve(ref)
+  end
+
+  def test_ambiguous_reference_from_specific_context_different_creation_order
+    definitions = [[:Name], [:Potato, :Name]]
+    create definitions
+
+    ref = FakeReference.new [:Name], [[:Potato]]
+
+    assert_equal [:Potato, :Name], @resolver.resolve(ref)
+  end
+
+  def test_ambiguous_reference_from_global_context
+    definitions = [[:Potato, :Name], [:Name]]
+    create definitions
+
+    ref = FakeReference.new [:Name], []
+
+    assert_equal [:Name], @resolver.resolve(ref)
+  end
+
+  def test_ambiguous_reference_from_global_context_different_creation_order
+    definitions = [[:Name], [:Potato, :Name]]
+    create definitions
+
+    ref = FakeReference.new [:Name], []
+
+    assert_equal [:Name], @resolver.resolve(ref)
+  end
 end

data/test/courgette/test_reference_to_dependency.rb

@@ -0,0 +1,41 @@
+require 'simplecov'
+require 'minitest/autorun'
+require 'courgette/reference_to_dependency'
+
+class FakeResolver < Struct.new(:value)
+  def resolve reference
+    value
+  end
+end
+
+class TestCourgetteReferenceToDependency < MiniTest::Unit::TestCase
+  class FakeReference < Struct.new(:context)
+  end
+
+  def test_unknown_reference
+    @converter = Courgette::ReferenceToDependency.new [], FakeResolver.new(nil)
+    reference = FakeReference.new
+
+    dependency = @converter.transform reference
+
+    assert_nil dependency
+  end
+
+  def test_known_reference
+    @converter = Courgette::ReferenceToDependency.new [], FakeResolver.new(42)
+    reference = FakeReference.new []
+
+    dependency = @converter.transform reference
+
+    assert_equal 42, dependency.reference
+  end
+
+  def test_referrer
+    @converter = Courgette::ReferenceToDependency.new [], FakeResolver.new(42)
+    reference = FakeReference.new [[:X], [:Y]]
+
+    dependency = @converter.transform reference
+
+    assert_equal [:X, :Y], dependency.referrer
+  end
+end

data/test/courgette/test_scope.rb

@@ -1,3 +1,4 @@
+require 'simplecov'
 require 'minitest/autorun'
 require 'courgette/scope'
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: courgette
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - Hugo Peixoto
@@ -94,17 +94,45 @@ dependencies:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: mocha
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: simplecov
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Static ruby dependency analyser
 email:
 - hugo.peixoto@gmail.com
 executables:
-- courgette.rb
+- courgette
 extensions: []
 extra_rdoc_files: []
 files:
 - Gemfile
 - Rakefile
-- bin/courgette.rb
+- bin/courgette
 - courgette.gemspec
 - lib/courgette.rb
 - lib/courgette/capturer.rb
@@ -119,7 +147,9 @@ files:
 - lib/courgette/reference_to_dependency.rb
 - lib/courgette/scope.rb
 - lib/courgette/version.rb
+- test/courgette/test_capturer.rb
 - test/courgette/test_name_resolution.rb
+- test/courgette/test_reference_to_dependency.rb
 - test/courgette/test_scope.rb
 homepage: https://github.com/hugopeixoto/courgette
 licenses:
@@ -146,6 +176,8 @@ signing_key:
 specification_version: 4
 summary: Courgette analyses a set of files, and calculates a dependency graph
 test_files:
+- test/courgette/test_capturer.rb
 - test/courgette/test_name_resolution.rb
+- test/courgette/test_reference_to_dependency.rb
 - test/courgette/test_scope.rb
 has_rdoc: