nakajima-protocov 0.0.2 → 0.0.3

data/History.txt

@@ -1,3 +1,9 @@
+=== 0.0.3 / 2008-05-21 ===
+
+* Bug fixes
+
+  * Fixed bug that didn't see tests in unit subdirectory, which caused missed method invocations.
+
 === 0.0.2 / 2008-05-21 ===
 
 * Initial release

data/Rakefile

@@ -7,8 +7,6 @@ require './lib/protocov.rb'
 Hoe.new('protocov', ProtoCov::VERSION) do |p|
   # p.rubyforge_name = 'protocovx' # if different than lowercase project name
   p.developer('Pat Nakajima', 'patnakajima@gmail.com')
-  p.description = 'Code coverage docs for Prototype-style Javascript projects'
-  p.homepage = 'http://github.com/nakajima/protocov'
 end
 
 # vim: syntax=Ruby

data/lib/protocov.rb

@@ -9,6 +9,6 @@ require 'protocov/source_file'
 require 'protocov/runner'
 
 module ProtoCov
-  VERSION = '0.0.2'
+  VERSION = '0.0.3'
 end
 

data/lib/protocov/base.rb

@@ -12,14 +12,6 @@ module ProtoCov
   
   # Parent class of SourceFile and TestFile. Defines common methods.
   class GenericFile
-    class << self
-      def find_files_in(dir)
-        dir.entries \
-          .select  { |file| valid?(file) } \
-          .collect { |file| new(file, File.expand_path(dir.path)) }
-      end
-    end
-    
     def path
       File.expand_path(File.join(path_prefix, filename))
     end

data/lib/protocov/ext/string_extensions.rb

@@ -11,7 +11,7 @@ module ProtoCov
       string.gsub!(/\bvar\b/, '')
       result = case thing
       when :method_definitions: self.scan(/(\w+)\s*:\s*function\s*\(|[A-Z][A-Za-z0-9]*\.prototype\.(\w+)/i)
-      when :method_invocations: self.scan(/\.([a-zA-Z\_*]\w*)\(/)
+      when :method_invocations: self.scan(/\.(\w+)\(/)
       when :modules: self.scan(/\s*[^\/{2}]*\s+([A-Z][A-Za-z0-9]+)\s*[\=\:]\s*\{/)
       when :classes: self.scan(/\s*([A-Z][A-Za-z0-9]+)\s*[\=\:]\s*Class\.create/)
       else

data/lib/protocov/runner.rb

@@ -4,16 +4,16 @@ module ProtoCov
     
     def initialize(args)
       parse_args(args)
-      get_files
+      get_files!
       @source_files.invoke(:annotate!) and return if @annotate
       report!
     end
     
     # This could definitely be smarter
-    def get_files
+    def get_files!
       @source_files = SourceFile.find_files_in(Dir.new(File.join(@dir.path, 'src')))
       @test_files   = TestFile.find_files_in(Dir.new(File.join(@dir.path, 'test')))
-      @test_files  += TestFile.find_files_in(Dir.new(File.join(@dir.path, 'test', 'unit'))) if @dir.entries.include?('unit')
+      @test_files  += TestFile.find_files_in(Dir.new(File.join(@dir.path, 'test', 'unit'))) if Dir.new(File.join(@dir.path, 'test')).entries.detect { |e| e.match(/unit/) }
     end
     
     # Holy cow this method is ugly.
@@ -48,7 +48,7 @@ module ProtoCov
         args = args.dup
         raise NoPathSpecified.new("Please specify your project's root directory, e.g. `protocov .") if args.empty?
         @annotate = args.delete('--annotate') ? true : false        
-        @dir = Dir.new(File.join(Dir.pwd, args.shift))
+        @dir = Dir.new(File.expand_path(File.join(Dir.pwd, args.shift)))
         
       rescue Errno::ENOENT => e
         d = e.to_s.match(/src/) ? 'src/' : 'test/'

data/lib/protocov/source_file.rb

@@ -3,6 +3,12 @@ module ProtoCov
     attr_reader :filename, :path_prefix
     
     class << self
+      def find_files_in(dir)
+        dir.entries \
+          .select  { |file| valid?(file) } \
+          .collect { |file| new(file, File.expand_path(dir.path)) }
+      end
+      
       def valid?(file)
         file.match(/\.js\z/)
       end

data/lib/protocov/test_file.rb

@@ -3,8 +3,14 @@ module ProtoCov
     attr_reader :filename, :path_prefix
     
     class << self
+      def find_files_in(dir)
+        dir.entries \
+          .select  { |file| valid?(file) } \
+          .collect { |file| new(file, File.expand_path(dir.path)) }
+      end
+      
       def valid?(file)
-        file.match(/\.(html|js)\z/)
+        file.match(/\.(html|js)/i)
       end
     end
 

data/test/test_string_extensions.rb

@@ -16,10 +16,30 @@ class TestStringExtensions < Test::Unit::TestCase
   
   def test_should_get_method_invocations
     method_invocations = @_test_string_2.parse_for(:method_invocations)
-    assert_equal 10, method_invocations.length
-    %w(any bindAsEventListener blank clear element findForms setup setupBehaviors stop uniq).each do |method|
-      assert method_invocations.include?(method)
-    end
+    assert_equal [
+      "Defaultable",
+      "addClassName",
+      "any",
+      "bindAsEventListener",
+      "blank",
+      "clear",
+      "create",
+      "delegators",
+      "each",
+      "element",
+      "extend", 
+      "findForms",
+      "invoke",
+      "observe",
+      "pluck",
+      "readAttribute",
+      "removeClassName",
+      "select",
+      "setup",
+      "setupBehaviors",
+      "stop",
+      "uniq"
+      ].sort, method_invocations.sort, method_invocations.inspect
   end
   
   def test_should_get_modules

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: nakajima-protocov
 version: !ruby/object:Gem::Version 
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors: 
 - Pat Nakajima
@@ -73,7 +73,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   version: 
 requirements: []
 
-rubyforge_project: 
+rubyforge_project: protocov
 rubygems_version: 1.0.1
 signing_key: 
 specification_version: 2