trackman 0.6.3 → 0.6.4

data/Gemfile.lock

@@ -9,7 +9,7 @@ GIT
 PATH
   remote: .
   specs:
-    trackman (0.6.2)
+    trackman (0.6.4)
       heroku (>= 2.26.2)
       json
       nokogiri
@@ -24,7 +24,7 @@ GEM
     blockenspiel (0.4.5)
     diff-lcs (1.1.3)
     excon (0.16.4)
-    heroku (2.32.13)
+    heroku (2.32.14)
       heroku-api (~> 0.3.5)
       launchy (>= 0.3.2)
       netrc (~> 0.7.7)

data/lib/trackman/assets/asset_factory.rb

@@ -23,7 +23,7 @@ module Trackman
           instance.extend Trackman::Path::Rails32Resolver, BundledAsset
           return instance
         elsif rails_defined? #fallback to rails without asset pipeline
-          instance.extend Trackman::Path::RailsResolver
+          instance.extend Trackman::Path::Resolver
         end
         instance.extend Trackman::Components::Hashable
 

data/lib/trackman/path/rails32_resolver.rb

@@ -1,16 +1,16 @@
 module Trackman
   module Path  
     module Rails32Resolver
-      include RailsResolver
+      include Resolver
       
       alias old_rails_translate translate
 
       def translate url, parent_url 
         root = working_dir.realpath
-        
+   
         path = url.dup
-        path.slice! /^(\/assets|assets\/)/
-        path = Pathname.new path
+        path.slice! /^\/?assets/
+        path =  Pathname.new(path)
 
         path = prepare_for_sprocket(path, parent_url, root) if path.relative?
         begin

data/lib/trackman/path/resolver.rb

@@ -11,14 +11,15 @@ module Trackman
     			parent = parent_of(parent_url)
     			child = url
     		else
-    			parent = working_dir
-          s = url.to_s
-    			child = Pathname.new(s[1...s.length])
+    			parent = working_dir + 'public/'
+    			child = Pathname.new(url.to_s[1..-1])
     		end
-
-        (parent + child).relative_path_from(working_dir).to_s
-    	end
-
+        relative_path = (parent + child).relative_path_from(working_dir).to_s
+        file_exist?(relative_path) ? relative_path : nil
+      end
+      def file_exist? path
+        File.exists? path
+      end
     	def working_dir
     		Pathname.new Dir.pwd
     	end

data/lib/trackman/path.rb

@@ -2,6 +2,5 @@ module Trackman
   module Path
     autoload :Resolver, 'trackman/path/resolver'
     autoload :Rails32Resolver, 'trackman/path/rails32_resolver'
-    autoload :RailsResolver, 'trackman/path/rails_resolver'
   end
 end

data/lib/trackman/version.rb

@@ -1,3 +1,3 @@
 module Trackman
-  VERSION = "0.6.3"
+  VERSION = "0.6.4"
 end