stowaway 0.1.1 → 0.1.2

data/VERSION.yml

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

data/lib/stowaway/locator.rb

@@ -36,4 +36,4 @@ module Stowaway
     end
     
   end
-end
+end

data/lib/stowaway/matcher.rb

@@ -1,38 +1,44 @@
 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)
+      @line, @file = line, file
+      return true if html_attr_ref?
+      return true if haml_attr_ref?
+      return true if rails_js_ref?
+      return true if rails_css_ref?
     end
 
     private
 
-    def attr_ref?(line, file)
-      line =~ /(src|link|href)=(["|'])(#{file.fullpath})(\2)/
+    def html_attr_ref?
+      @line =~ /(src|link|href|:href)\s?[=|=>]\s?(["|'])(#{@file.fullpath})(\2)/
     end
 
-    def rails_js_ref?(line, file)
-      return false unless line =~ /=?\s(javascript_include_tag)?\s(["|'])(.+)(\2)/
+    def haml_attr_ref?
+      @line =~ /(:src|:link|:href)(\s?=>\s?)(["|'])(#{@file.fullpath})(\3)/
+    end
+
+    def rails_js_ref?
+      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
+          return true if "/public/javascripts/#{f}" == @file.fullpath
         else
-          return true if "/public/javascripts/#{f}.js" == file.fullpath
+          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)/
+    def rails_css_ref?
+      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
+          return true if "/public/stylesheets/#{f}" == @file.fullpath
         else
-          return true if "/public/stylesheets/#{f}.css" == file.fullpath
+          return true if "/public/stylesheets/#{f}.css" == @file.fullpath
         end
       end
       false

data/spec/data/testfile1.txt

@@ -5,4 +5,7 @@ this filename on this line should be ignored: file1.js.
 = javascript_include_tag "application"
 = stylesheet_link_tag "file.css"
 = stylesheet_link_tag "reset", "common"
+%a{ :href => "/images/haml.jpg", :title => "haml" }
+%img{ :src => "/images/file.jpg", :alt => "file" }
+
 the end.

data/spec/lib/sweeper_spec.rb

@@ -14,18 +14,30 @@ describe Stowaway::Sweeper do
     @status_mock = mock("status_mock", :null_object => true)
   end
   
-  it "should match images referened in a src attribute" do
+  it "should match images referenced 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
+  it "should match images referenced 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 images referenced in an href attribute when using haml" do
+    @files << Stowaway::FileObj.new("/images/haml.jpg")
+    sweeper.sweep("spec/data")
+    @files.should be_empty
+  end
+
+  it "should match images referenced in a src attribute when using haml" do
+    @files << Stowaway::FileObj.new("/images/file.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")

data/stowaway.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{stowaway}
-  s.version = "0.1.1"
+  s.version = "0.1.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Emilio Cavazos"]
-  s.date = %q{2010-02-14}
+  s.date = %q{2010-02-15}
   s.default_executable = %q{stowaway}
   s.email = %q{ejcavazos@gmail.com}
   s.executables = ["stowaway"]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: stowaway
 version: !ruby/object:Gem::Version 
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors: 
 - Emilio Cavazos
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-02-14 00:00:00 -08:00
+date: 2010-02-15 00:00:00 -08:00
 default_executable: stowaway
 dependencies: []