trackman 0.6.3 → 0.6.4

data/spec/helpers/fakable_pathman_tester.rb

@@ -1,5 +1,5 @@
 class FakablePathManTester  
-  @@modules = [Resolver, Rails32Resolver, RailsResolver]
+  @@modules = [Resolver, Rails32Resolver]
   Conventions = Trackman::Components::Conventions
 
   def self.switch_on prepath
@@ -18,10 +18,14 @@ class FakablePathManTester
     
     Resolver.module_eval do
       alias real_working_dir working_dir
+      alias real_file_exist file_exist?
 
       define_method :working_dir do
         real_working_dir + prepath
       end
+      define_method :file_exist? do |path|
+        File.exist?(prepath + path)
+      end
     end
    
     @@modules.each do |m| 
@@ -84,6 +88,9 @@ class FakablePathManTester
     Resolver.module_eval do    
       alias :working_dir :real_working_dir
       remove_method :real_working_dir
+      
+      alias file_exist? real_file_exist
+      remove_method :real_file_exist 
     end
 
     @@modules.each do |m| 

data/spec/paths/{rails32_pathman_spec.rb → rails32_resolver_spec.rb}

@@ -11,6 +11,19 @@ end
 
 
 describe Rails32Resolver do
+  before :all do
+    module Resolver
+      alias old_exist file_exist?
+      def file_exist? path
+        true
+      end
+    end
+  end
+  after :all do
+    module Resolver
+      alias file_exist? old_exist
+    end
+  end
   it "serves an image linked by an html" do
     parent_url = 'public/503.html'
     url = '/assets/bombero.jpeg'
@@ -100,4 +113,14 @@ describe Rails32Resolver do
 
     actual.should == expected
   end
+
+  it "can find this image" do
+    parent_url = 'public/503.html'
+    url = 'assets/trackman70x70.png'
+
+    actual = Rails32Tester.translate url, parent_url
+    expected = 'app/assets/images/trackman70x70.png'
+
+    actual.should == expected
+  end
 end

data/spec/paths/{pathman_spec.rb → resolver_spec.rb}

@@ -5,6 +5,20 @@ class PathTester
 end
 
 describe Resolver do
+  before :all do
+    module Resolver
+      alias old_exist file_exist?
+      def file_exist? path
+        true
+      end
+    end
+  end
+  after :all do
+    module Resolver
+      alias file_exist? old_exist
+    end
+  end
+  
   it 'gives a path at the same level as the parent if the url is relative and there is no parent specified' do
     parent_url = 'allo/home.html' 
     url = 'bob.jpg'
@@ -20,7 +34,7 @@ describe Resolver do
     url = '/bob.jpg'
 
     actual = PathTester.translate url, parent_url
-    expected = 'bob.jpg'
+    expected = 'public/bob.jpg'
 
     actual.should == expected
   end
@@ -37,7 +51,7 @@ describe Resolver do
     url = '/johnny/cash/likes/women/but/not/bob.jpg'
 
     actual = PathTester.translate url, parent_url
-    expected = 'johnny/cash/likes/women/but/not/bob.jpg'
+    expected = 'public/johnny/cash/likes/women/but/not/bob.jpg'
 
     actual.should == expected
   end

data/spec/rails32_resolver_spec.rb

@@ -29,7 +29,18 @@ describe Trackman::Path::Rails32Resolver do
     
     result = @test.translate 'favicon.ico', 'spec/fixtures/rails32/happy-path/public/503.html'
     
-    #I know path is not good but I think this is what we want to achieve
-    result.should == 'public/spec/fixtures/rails32/happy-path/public/favicon.ico'
+    result.should == 'spec/fixtures/rails32/happy-path/public/favicon.ico'
+  end
+
+  it "returns nil it cannot find anything" do
+    sprocket = double "SprocketEnvironment"
+    sprocket.stub(:paths).and_return([])
+    sprocket.stub(:resolve).and_raise Sprockets::FileNotFound
+
+    @test.stub(:sprockets).and_return(sprocket)
+    
+    result = @test.translate 'non-existent.jpg', 'spec/fixtures/rails32/happy-path/public/503.html'
+    
+    result.should be_nil
   end
 end

data/spec/spec_helper.rb

@@ -44,5 +44,4 @@ RemoteAsset = Trackman::Assets::RemoteAsset unless defined?(RemoteAsset)
 
 Resolver = Trackman::Path::Resolver unless defined?(Resolver)
 Rails32Resolver = Trackman::Path::Rails32Resolver unless defined?(Rails32Resolver)
-RailsResolver = Trackman::Path::RailsResolver unless defined?(RailsResolver)
 Configuration = Trackman::Utility::Configuration unless defined?(Configuration)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: trackman
 version: !ruby/object:Gem::Version
-  version: 0.6.3
+  version: 0.6.4
   prerelease: 
 platform: ruby
 authors:
@@ -184,7 +184,6 @@ files:
 - lib/trackman/errors/config_setup_error.rb
 - lib/trackman/path.rb
 - lib/trackman/path/rails32_resolver.rb
-- lib/trackman/path/rails_resolver.rb
 - lib/trackman/path/resolver.rb
 - lib/trackman/scaffold.rb
 - lib/trackman/scaffold/content_saver.rb
@@ -441,6 +440,7 @@ files:
 - spec/fixtures/sprockets/app/assets/images/bombero/tralala/img.jpg
 - spec/fixtures/sprockets/app/assets/images/image.jpg
 - spec/fixtures/sprockets/app/assets/images/img.png
+- spec/fixtures/sprockets/app/assets/images/trackman70x70.png
 - spec/fixtures/sprockets/app/assets/stylesheets/a/css.css
 - spec/fixtures/sprockets/app/assets/stylesheets/bombero.css
 - spec/fixtures/sprockets/app/assets/stylesheets/bombero/tralala/trundle.css
@@ -451,8 +451,8 @@ files:
 - spec/helpers/app_creator.rb
 - spec/helpers/fakable_pathman_tester.rb
 - spec/html_asset_spec.rb
-- spec/paths/pathman_spec.rb
-- spec/paths/rails32_pathman_spec.rb
+- spec/paths/rails32_resolver_spec.rb
+- spec/paths/resolver_spec.rb
 - spec/rails2311/first_push_spec.rb
 - spec/rails32/first_push_spec.rb
 - spec/rails32_resolver_spec.rb
@@ -756,6 +756,7 @@ test_files:
 - spec/fixtures/sprockets/app/assets/images/bombero/tralala/img.jpg
 - spec/fixtures/sprockets/app/assets/images/image.jpg
 - spec/fixtures/sprockets/app/assets/images/img.png
+- spec/fixtures/sprockets/app/assets/images/trackman70x70.png
 - spec/fixtures/sprockets/app/assets/stylesheets/a/css.css
 - spec/fixtures/sprockets/app/assets/stylesheets/bombero.css
 - spec/fixtures/sprockets/app/assets/stylesheets/bombero/tralala/trundle.css
@@ -766,8 +767,8 @@ test_files:
 - spec/helpers/app_creator.rb
 - spec/helpers/fakable_pathman_tester.rb
 - spec/html_asset_spec.rb
-- spec/paths/pathman_spec.rb
-- spec/paths/rails32_pathman_spec.rb
+- spec/paths/rails32_resolver_spec.rb
+- spec/paths/resolver_spec.rb
 - spec/rails2311/first_push_spec.rb
 - spec/rails32/first_push_spec.rb
 - spec/rails32_resolver_spec.rb

data/lib/trackman/path/rails_resolver.rb

@@ -1,29 +0,0 @@
-module Trackman
-  module Path  
-    module RailsResolver
-      include Resolver
-      
-      alias old_translate translate
-      alias old_parent_of parent_of
-
-      def parent_of(url)
-        if url.to_s.include?('assets')
-          old_parent_of(url).ascend do |p|
-            return p if p.basename.to_s == 'assets'
-          end
-        else
-          return old_parent_of(url)
-        end
-      end 
-      
-      def translate url, parent_url
-        path = old_translate(url, parent_url)
-
-        parts = path.split('/')
-        parts.insert(0, 'public') if parts.first != 'public'
-
-        parts.join('/')
-      end
-    end
-  end 
-end