stowaway 0.0.6 → 0.1.1

data/VERSION.yml

@@ -1,4 +1,5 @@
 --- 
 :major: 0
-:minor: 0
-:patch: 6
+:minor: 1
+:patch: 1
+:build: 

data/bin/stowaway

@@ -2,4 +2,4 @@
 
 require 'stowaway/runner' 
 runner = Stowaway::Runner.new(ARGV) 
-runner.run 
+runner.run

data/lib/stowaway/matcher.rb

@@ -0,0 +1,42 @@
+module Stowaway
+  class Matcher
+    def match?(line, file)
+      return true if attr_ref?(line, file)
+      return true if rails_js_ref?(line, file)
+      return true if rails_css_ref?(line, file)
+    end
+
+    private
+
+    def attr_ref?(line, file)
+      line =~ /(src|link|href)=(["|'])(#{file.fullpath})(\2)/
+    end
+
+    def rails_js_ref?(line, file)
+      return false unless line =~ /=?\s(javascript_include_tag)?\s(["|'])(.+)(\2)/
+      params = $3.gsub(/[\s|"]/, "").split(",")
+      params.each do |f|
+        if f =~ /\.js$/
+          return true if "/public/javascripts/#{f}" == file.fullpath
+        else
+          return true if "/public/javascripts/#{f}.js" == file.fullpath
+        end
+      end
+      false
+    end
+
+    def rails_css_ref?(line, file)
+      return false unless line =~ /=?\s(stylesheet_link_tag)?\s(["|'])(.+)(\2)/
+      params = $3.gsub(/[\s|"]/, "").split(",")
+      params.each do |f|
+        if f =~ /\.css$/
+          return true if "/public/stylesheets/#{f}" == file.fullpath
+        else
+          return true if "/public/stylesheets/#{f}.css" == file.fullpath
+        end
+      end
+      false
+    end
+
+  end
+end

data/lib/stowaway/runner.rb

@@ -20,6 +20,7 @@ module Stowaway
     end
     
     private
+
     def respond(not_found)
       if not_found.empty?
         print "Zero stowaways found. You run a tight ship.\n\n"

data/lib/stowaway/sweeper.rb

@@ -1,5 +1,6 @@
 require_relative 'fshelpyhelp'
 require_relative 'status'
+require_relative "matcher"
 
 module Stowaway
   class Sweeper
@@ -9,17 +10,18 @@ module Stowaway
       @files_to_find = files_to_find
       @ignore = ext_to_ignore || [/^\.|\.jpg$|\.gif$|.png$/i]
       @status = status
+      @matcher = Matcher.new
     end
-  
-  
+
     def sweep(path)
       dir = Dir.new(path)
-    
+      @root = path if @root.nil?
+
       dir.each do |f|
         next if ignore?(f)
-      
+
         file = File.join(dir.path, f)
-      
+
         if File.directory?(file)
           sweep(file)
         else
@@ -30,6 +32,7 @@ module Stowaway
     end
 
     private
+
     def inspect_file(file)
       @status.out "Sweeping: #{file}"
       File.open(file, 'r') do |i|
@@ -41,7 +44,8 @@ module Stowaway
     end
 
     def remove_match(line)
-      @files_to_find.delete_if { |file| line.include?(file.name) }
+      @files_to_find.delete_if { |file| @matcher.match?(line, file) }
     end
+
   end
 end

data/spec/data/testfile1.txt

@@ -1,4 +1,8 @@
 this is a line of test text.
-this line has the name of a file: file1.jpg.
-this line also has the name of a file (file2.gif) and it is so awesome.
-the end.
+this filename on this line should be ignored: file1.js.
+= javascript_include_tag "file.js"
+= javascript_include_tag "jquery.js", "home/index.js"
+= javascript_include_tag "application"
+= stylesheet_link_tag "file.css"
+= stylesheet_link_tag "reset", "common"
+the end.

data/spec/data/testfile2.txt

@@ -1,2 +1,9 @@
 Hello, I'm test data:
-file3.js
+
+This is testing files with the same name but different paths
+
+<img src="/fake/path1/button.jpg" />
+<img src="/fake/path2/button.jpg" />
+<a href="/fake/path/photo.jpg" />
+<script type="text/javascript" src="/fake/path/file.js" ></script>
+

data/spec/lib/sweeper_spec.rb

@@ -1,6 +1,6 @@
-require 'spec/spec_helper'
-require 'lib/stowaway/file'
-require 'lib/stowaway/sweeper'
+require "spec/spec_helper"
+require "lib/stowaway/file"
+require "lib/stowaway/sweeper"
 
 describe Stowaway::Sweeper do
   
@@ -10,36 +10,87 @@ describe Stowaway::Sweeper do
   end
 
   before(:each) do
-    @f1 = Stowaway::FileObj.new('/fake/file1.jpg')
-    @f2 = Stowaway::FileObj.new('/fake/file2.gif')
-    @f3 = Stowaway::FileObj.new('/fake/file3.js')
-    @f4 = Stowaway::FileObj.new('/fake/also/file3.js')
-    @files = [@f1, @f2, @f3, @f4]
-    @status_mock = mock('status_mock', :null_object => true)
+    @files = []
+    @status_mock = mock("status_mock", :null_object => true)
   end
   
-  it "should sweep through directory looking for matches" do
-    sweeper.sweep('.')
+  it "should match images referened in a src attribute" do
+    @files << Stowaway::FileObj.new("/fake/path1/button.jpg")
+    sweeper.sweep("spec/data")
     @files.should be_empty
   end
   
+  it "should match images referened in an href attribute" do
+    @files << Stowaway::FileObj.new("/fake/path/photo.jpg")
+    sweeper.sweep("spec/data")
+    @files.should be_empty
+  end
+
+  it "should match scripts referenced in a src attribute" do
+    @files << Stowaway::FileObj.new("/fake/path/file.js")
+    sweeper.sweep("spec/data")
+    @files.should be_empty
+  end
+
+  it "should match scripts referenced in a rails javascript_include_tag helper" do
+    @files << Stowaway::FileObj.new("/public/javascripts/file.js")
+    sweeper([/^\.|\.rb$|testfile2/]).sweep("spec/data")
+    @files.should be_empty
+  end
+
+  it "should match scripts referenced in a rails javascript_include_tag helper when no extension is given" do
+    @files << Stowaway::FileObj.new("/public/javascripts/application.js")
+    sweeper([/^\.|\.rb$|testfile2/]).sweep("spec/data")
+    @files.should be_empty
+  end
+
+  it "should match multiple scripts referenced in a rails javascript_include_tag helper" do
+    @files << Stowaway::FileObj.new("/public/javascripts/jquery.js")
+    @files << Stowaway::FileObj.new("/public/javascripts/home/index.js")
+    sweeper([/^\.|\.rb$|testfile2/]).sweep("spec/data")
+    @files.should be_empty
+  end
+
+  it "should match css files referenced in a rails stylesheet_link_tag helper" do
+    @files << Stowaway::FileObj.new("/public/stylesheets/file.css")
+    sweeper([/^\.|\.rb$|testfile2/]).sweep("spec/data")
+    @files.should be_empty
+  end
+
+  it "should match multiple css files referenced in a rails stylesheet_link_tag helper" do
+    @files << Stowaway::FileObj.new("/public/stylesheets/reset.css")
+    @files << Stowaway::FileObj.new("/public/stylesheets/common.css")
+    sweeper([/^\.|\.rb$|testfile2/]).sweep("spec/data")
+    @files.should be_empty
+  end
+
   it "should not sweep through ignored file types" do
-    sweeper([/^\.|\.rb$|testfile1/]).sweep('spec/data').length.should == 2
+    @files << Stowaway::FileObj.new("/public/stylesheets/reset.css")
+    sweeper([/^\.|\.rb$|testfile1/]).sweep("spec/data").length.should == 1
   end
   
   it "should output a message when sweeping through a file" do 
     @status_mock.should_receive(:out).with("Sweeping: spec/data/testfile1.txt").once
-    sweeper([/^\.|\.rb$|testfile2/]).sweep('spec/data')
+    sweeper([/^\.|\.rb$|testfile2/]).sweep("spec/data")
   end
 
   it "should flush the output after sweeping through a file" do 
     @status_mock.should_receive(:flush).once
-    sweeper([/^\.|\.rb$|testfile2/]).sweep('spec/data')
+    sweeper([/^\.|\.rb$|testfile2/]).sweep("spec/data")
+  end
+
+  it "should find images of the same name but with different paths" do
+    @files << Stowaway::FileObj.new("/fake/path1/button.jpg")
+    @files << Stowaway::FileObj.new("/fake/path2/button.jpg")
+    sweeper([/^\.|\.rb$/]).sweep("spec/data")
+    @files.should be_empty
   end
 
   it "should remove matches and leave files that were not found" do
-    sweeper([/^\.|\.rb$|testfile1/]).sweep('spec/data')
-    @files.should == [@f1, @f2]
+    @files << Stowaway::FileObj.new("/a/stowaway/file.txt")
+    sweeper([/^\.|\.rb$/]).sweep("spec/data")
+    @files.should_not be_empty
+    @files.first.fullpath.should == "/a/stowaway/file.txt"
   end
   
 end

data/stowaway.gemspec

@@ -1,15 +1,15 @@
 # Generated by jeweler
-# DO NOT EDIT THIS FILE
-# Instead, edit Jeweler::Tasks in Rakefile, and run `rake gemspec`
+# DO NOT EDIT THIS FILE DIRECTLY
+# Instead, edit Jeweler::Tasks in Rakefile, and run the gemspec command
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
   s.name = %q{stowaway}
-  s.version = "0.0.6"
+  s.version = "0.1.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Emilio Cavazos"]
-  s.date = %q{2009-10-07}
+  s.date = %q{2010-02-14}
   s.default_executable = %q{stowaway}
   s.email = %q{ejcavazos@gmail.com}
   s.executables = ["stowaway"]
@@ -28,6 +28,7 @@ Gem::Specification.new do |s|
      "lib/stowaway/file.rb",
      "lib/stowaway/fshelpyhelp.rb",
      "lib/stowaway/locator.rb",
+     "lib/stowaway/matcher.rb",
      "lib/stowaway/options.rb",
      "lib/stowaway/runner.rb",
      "lib/stowaway/status.rb",
@@ -67,3 +68,4 @@ Gem::Specification.new do |s|
   else
   end
 end
+

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: stowaway
 version: !ruby/object:Gem::Version 
-  version: 0.0.6
+  version: 0.1.1
 platform: ruby
 authors: 
 - Emilio Cavazos
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-10-07 00:00:00 -07:00
+date: 2010-02-14 00:00:00 -08:00
 default_executable: stowaway
 dependencies: []
 
@@ -33,6 +33,7 @@ files:
 - lib/stowaway/file.rb
 - lib/stowaway/fshelpyhelp.rb
 - lib/stowaway/locator.rb
+- lib/stowaway/matcher.rb
 - lib/stowaway/options.rb
 - lib/stowaway/runner.rb
 - lib/stowaway/status.rb