trackman 0.2.65 → 0.2.80

data/lib/trackman/assets/components/rails32_path_resolver.rb

@@ -10,10 +10,10 @@ module Trackman
           root = working_dir.realpath
           
           path = url
-          path.slice! /^\/assets/
+          path.slice! /^(\/assets|assets\/)/
           path = Pathname.new path
           
-          if path.relative?          
+          if path.relative? 
             folder = (root + Pathname.new(parent_url)).parent.realpath
             path = (folder + path).to_s
             path.slice! sprockets.paths.select{|p| path.include? p }.first 
@@ -28,16 +28,16 @@ module Trackman
         end
 
         def init_env
-          # should be like this but we will change it when it is testable
-          # if defined?(::Rails) && ::Rails.application
-          #   env = ::Rails.application.class.assets
-          # else
-          env = ::Sprockets::Environment.new
-          paths = ['app', 'lib', 'vendor'].inject([]) do |array, f|
-            array + ["images", "stylesheets", "javascripts"].map{|p| "#{working_dir}/#{f}/assets/#{p}" }
+          if defined?(::Rails) && ::Rails.application
+            env = ::Rails.application.class.assets
+          else
+            env = ::Sprockets::Environment.new
+            paths = ['app', 'lib', 'vendor'].inject([]) do |array, f|
+              array + ["images", "stylesheets", "javascripts"].map{|p| "#{working_dir}/#{f}/assets/#{p}" }
+            end
+            paths << "#{working_dir}/public"
+            paths.each{|p| env.append_path p }
           end
-          paths << "#{working_dir}/public"
-          paths.each{|p| env.append_path p }
 
           env
         end

data/lib/trackman/assets/remote_asset.rb

@@ -1,6 +1,8 @@
 require 'rest-client'
 require 'json'
 require 'uri'
+require 'logger'
+RestClient.log = Logger.new(STDOUT) if Debugger.debug_mode?
 
 module Trackman
   module Assets

data/lib/trackman/version.rb

@@ -1,3 +1,3 @@
 module Trackman
-  VERSION = "0.2.65"
+  VERSION = "0.2.80"
 end

data/spec/paths/rails32_pathman_spec.rb

@@ -51,6 +51,26 @@ describe Rails32PathResolver do
     actual.should == expected
   end
 
+  it "works for nested paths" do
+    parent_url = 'app/assets/stylesheets/a/css.css'
+    url = '3/32/allo.png'
+
+    actual = Rails32Tester.translate url, parent_url
+    expected = 'app/assets/images/a/3/32/allo.png'
+
+    actual.should == expected
+  end
+
+  it "works for nested paths with assets/img.png" do
+    parent_url = 'app/assets/stylesheets/css.css'
+    url = 'assets/img.png'
+
+    actual = Rails32Tester.translate url, parent_url
+    expected = 'app/assets/images/img.png'
+
+    actual.should == expected
+  end
+
   it "serves a favicon" do
     parent_url = 'public/503.html'
     url = '/favicon.png'
@@ -61,22 +81,22 @@ describe Rails32PathResolver do
     actual.should == expected
   end
 
-  it "works for nested paths" do
-    parent_url = 'app/assets/stylesheets/a/css.css'
-    url = '3/32/allo.png'
+  it "public is not buggy" do
+    parent_url = 'public/500.html'
+    url = 'assets/assets/rails.png'
 
     actual = Rails32Tester.translate url, parent_url
-    expected = 'app/assets/images/a/3/32/allo.png'
+    expected = 'public/assets/rails.png'
 
     actual.should == expected
   end
 
-  it "public is not buggy" do
+  it "public is not buggy 2" do
     parent_url = 'public/500.html'
-    url = 'assets/rails.png'
+    url = 'assets/img.png'
 
     actual = Rails32Tester.translate url, parent_url
-    expected = 'public/assets/rails.png'
+    expected = 'app/assets/images/img.png'
 
     actual.should == expected
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: trackman
 version: !ruby/object:Gem::Version
-  version: 0.2.65
+  version: 0.2.80
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-07-20 00:00:00.000000000 Z
+date: 2012-07-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client
@@ -488,7 +488,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.22
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Client version of the Trackman addon on Heroku