trackman 0.1.5 → 0.1.6

data/README.md

@@ -21,7 +21,7 @@ Trackman works out of the box for Ruby(1.8.7 and 1.9.3) on
 ```console
 heroku addons:add trackman
 ```
-### Step 2 - Add the client gem to your Gemfile
+### Step 2 - Add the gem to your Gemfile
 ```console
 gem 'trackman'
 ```
@@ -36,7 +36,7 @@ This will add trackman.rake to lib/tasks/
 ```console
 rake trackman:setup
 ```
-Sets up your initial configuration and add custom error page add-on if you don't have it yet.
+Sets up your initial configuration.
 
 ### Optional
 ```console
@@ -69,14 +69,14 @@ public/503-error.html
 
 After the add-on installation
 
-* On the first publish or manual sync, your html file(s) and every internal assets referenced by your pages(s) will be pushed to our server so that we can store them properly on S3.
+* On the first publish or manual sync, your html file(s) and every internal assets referenced by your pages(s) will be pushed to the server so that we can store them properly on S3.
 * On the next publications, only modified assets will be published. 
-* Any renamed or missing asset will be handled properly on our side.
+* Any renamed or missing asset will be handled properly.
 
 ### Bug reports
 
 Any bug report can be submitted here.
-https://github.com/jfabre/trackman/issues
+https://github.com/SynApps/trackman/issues
 
 
 ### Creators / Maintainers

data/lib/trackman/assets/asset.rb

@@ -72,7 +72,8 @@ module Trackman
       def self.autosync
         autosync = ENV['TRACKMAN_AUTOSYNC'] || true
         autosync = autosync !~ /(0|false|FALSE)/ unless autosync.is_a? TrueClass
-        if const_defined?(:Rails) 
+        
+        if Object.const_defined?(:Rails)
           autosync = autosync && Rails.env.production?
         end 
         

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

@@ -1,38 +1,41 @@
+require 'sprockets'
+
 module Trackman
   module Assets
     module Components  
       module Rails32PathResolver
-        extend PathResolver
+        include PathResolver
         
-        class << self
-          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 
+          root = working_dir.realpath
+          
+          path = url
+          path.slice! /^\/assets/
+          path = Pathname.new path
+          
+          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 
+          end
+          
+          path = sprockets.resolve path
+          path.relative_path_from(root).to_s
         end
 
-        def translate url, parent_url
-          path = Rails32PathResolver.old_translate(url, parent_url)
-          parts = path.split('/')
-          parts.insert(0, 'app') if parts.first == 'assets'
-
-          if parts.first == 'app' && parts[1] == 'assets'
-            parts.insert(2, subfolder(parts.last))
-          elsif parts.first != 'public'
-            parts.insert(0, 'public') 
+        def sprockets 
+          @@sprockets ||= init_env
+        end
+        def init_env
+          env = ::Sprockets::Environment.new
+          paths = ['app', 'lib', 'vendor'].inject([]) do |array, f|
+             array + ["images", "stylesheets", "javascripts"].map{|p| "#{working_dir}/#{f}/assets/#{p}" }
           end
-
-          parts.join('/')
+          paths << "#{working_dir}/public"
+          paths.each{|p| env.append_path p }
+          
+          env
         end
-
         def subfolder(file)
           if file.include?('.js')
             subfolder = "javascripts"

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

@@ -2,26 +2,23 @@ module Trackman
   module Assets
     module Components  
       module RailsPathResolver
+        include PathResolver
         
-        #way 2
-        extend PathResolver
-        class << self
-          alias old_translate translate
-          alias old_parent_of parent_of
+        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)
+        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
-          end 
-        end
-
+          else
+            return old_parent_of(url)
+          end
+        end 
+        
         def translate url, parent_url
-          path = RailsPathResolver.old_translate(url, parent_url)
+          path = old_translate(url, parent_url)
 
           parts = path.split('/')
           parts.insert(0, 'public') if parts.first != 'public'

data/lib/trackman/assets/remote_asset.rb

@@ -39,13 +39,13 @@ module Trackman
       end
 
       def create!
-        response = RestClient.post @@site, :asset => {:path => path.to_s, :file => File.open(path)}, :content_type => :json, :accept => :json
+        response = RestClient.post @@site, build_params, :content_type => :json, :accept => :json
         path = response.headers[:location]
         @id = path[/\d+$/].to_i
       end
 
       def update!
-        RestClient.put "#{@@site}/#{id}", :asset => {:path => path, :file => File.open(path)}, :content_type => :json, :accept => :json
+        RestClient.put "#{@@site}/#{id}", build_params, :content_type => :json, :accept => :json
       end  
       def delete
         response = RestClient.delete "#{@@site}/#{id}"
@@ -63,7 +63,10 @@ module Trackman
         false 
       end
 
-      private 
+      private
+        def build_params
+          { :asset => { :path => path.to_s, :file => File.open(path) } }
+        end 
         def ensure_config
           raise Errors::ConfigNotFoundError, "The config TRACKMAN_URL is missing." if @@server_url.nil?      
         end

data/lib/trackman/version.rb

@@ -1,3 +1,3 @@
 module Trackman
-  VERSION = "0.1.5"
+  VERSION = "0.1.6"
 end

data/spec/fixtures/sprockets/app/assets/stylesheets/a/css.css

@@ -0,0 +1,4 @@
+img{
+img{
+  width:100%;
+}

data/spec/fixtures/sprockets/app/assets/stylesheets/bombero.css

@@ -0,0 +1,4 @@
+img{
+img{
+  width:100%;
+}

data/spec/fixtures/sprockets/app/assets/stylesheets/bombero/tralala/trundle.css

@@ -0,0 +1,4 @@
+img{
+img{
+  width:100%;
+}

data/spec/helpers/act_like_rails2311.rb

@@ -0,0 +1,27 @@
+
+class ActLikeRails2311
+  def self.switch_on
+    Trackman::Assets::Components::AssetFactory.module_eval do
+      alias :old_rails_defined? :rails_defined?
+      alias :old_asset_pipeline_enabled? :asset_pipeline_enabled? 
+      
+      define_method :rails_defined? do
+        true
+      end
+
+      define_method :asset_pipeline_enabled? do
+        false
+      end
+    end
+  end
+
+  def self.switch_off
+    Trackman::Assets::Components::AssetFactory.module_eval do
+      alias :rails_defined? :old_rails_defined?
+      alias :asset_pipeline_enabled? :old_asset_pipeline_enabled?
+      
+      remove_method :old_rails_defined?
+      remove_method :old_asset_pipeline_enabled?
+    end
+  end
+end

data/spec/helpers/act_like_rails32.rb

@@ -0,0 +1,18 @@
+class ActLikeRails32
+  def self.switch_on
+    Trackman::Assets::Components::AssetFactory.module_eval do
+      alias :old_asset_pipeline_enabled? :asset_pipeline_enabled?
+      
+      define_method :asset_pipeline_enabled? do
+        true
+      end
+    end
+  end
+
+  def self.switch_off
+    Trackman::Assets::Components::AssetFactory.module_eval do
+      alias :asset_pipeline_enabled? :old_asset_pipeline_enabled?
+      remove_method :old_asset_pipeline_enabled?
+    end
+  end
+end

data/spec/helpers/fakable_pathman_tester.rb

@@ -3,39 +3,41 @@ class FakablePathManTester
   Conventions = Trackman::Assets::Components::Conventions
 
   def self.switch_on prepath
+    override_remote_assets prepath
+    override_conventions prepath
+    override_resolvers prepath
+  end
+
+  def self.switch_off
+    reset_resolvers
+    reset_conventions
+    reset_remote_assets
+  end
+
+  def self.override_resolvers prepath
+    
+    PathResolver.module_eval do
+      alias real_working_dir working_dir
+
+      define_method :working_dir do
+        real_working_dir + prepath
+      end
+    end
+   
     @@modules.each do |m| 
       m.module_eval do
         alias real_translate translate  
-        alias real_working_dir working_dir if method_defined? :working_dir
-
+        
         define_method :translate do |url, parent_url|
           parent = parent_url.to_s.dup
           parent.slice!(prepath)
           prepath + real_translate(url, parent)
         end
-
-        if method_defined? :working_dir
-          define_method :working_dir do
-            real_working_dir + prepath
-          end
-        end
       end
     end
-    
-    RemoteAsset.class_eval do
-      singleton_class = class << self; self; end
-      singleton_class.instance_eval do
-        alias_method :old_get_attributes, :get_attributes  
-        define_method :get_attributes do
-          old_get_attributes.map do |h|
-            my_hash = h.dup
-            my_hash[:path] = prepath + h[:path] unless h[:path].start_with? prepath
-            my_hash
-          end    
-        end
-      end
-    end
-    
+  end
+
+  def self.override_conventions prepath
     Conventions.module_eval do 
       alias :real_maintenance_path :maintenance_path 
       alias :real_error_path :error_path
@@ -50,19 +52,48 @@ class FakablePathManTester
     end 
   end
 
-  def self.switch_off
+  def self.override_remote_assets prepath
+    RemoteAsset.class_eval do
+      alias_method :old_build_params, :build_params
+      define_method :build_params do
+        params = old_build_params
+        path = params[:asset][:path]
+        path.slice! prepath
+
+        params 
+      end
+
+      singleton_class = class << self; self; end
+      singleton_class.instance_eval do
+        alias_method :old_get_attributes, :get_attributes  
+        
+        define_method :get_attributes do
+          old_get_attributes.map do |h|
+            my_hash = h.dup
+            my_hash[:path] = prepath + h[:path] unless h[:path].start_with? prepath
+            my_hash
+          end
+        end
+      end
+    end
+  end
+
+  def self.reset_resolvers
+    PathResolver.module_eval do    
+      alias :working_dir :real_working_dir
+      remove_method :real_working_dir
+    end
+
     @@modules.each do |m| 
       m.module_eval do
         alias :translate :real_translate
         remove_method :real_translate
-
-        if method_defined? :working_dir
-          alias :working_dir :real_working_dir
-          remove_method :real_working_dir
-        end
       end
     end
-    
+    Rails32PathResolver.send(:class_variable_set, :@@sprockets, nil)
+  end
+
+  def self.reset_conventions
     Conventions.module_eval do
       alias :maintenance_path :real_maintenance_path 
       alias :error_path :real_error_path
@@ -70,8 +101,13 @@ class FakablePathManTester
       remove_method :real_maintenance_path
       remove_method :real_error_path
     end
+  end
 
+  def self.reset_remote_assets
     RemoteAsset.class_eval do
+      alias_method :build_params, :old_build_params
+      remove_method :old_build_params
+      
       singleton_class = class << self; self; end
       singleton_class.instance_eval do
         alias_method :get_attributes, :old_get_attributes  
@@ -80,60 +116,3 @@ class FakablePathManTester
     end
   end
 end
-
-
-module Trackman
-  module Assets
-    module Components
-      module AssetFactory
-        alias :old_asset_pipeline_enabled? :asset_pipeline_enabled?
-      end
-    end
-  end
-end
-
-class ActLikeRails32
-  def self.switch_on
-    Trackman::Assets::Components::AssetFactory.module_eval do
-      alias :old_asset_pipeline_enabled? :asset_pipeline_enabled?
-      
-      define_method :asset_pipeline_enabled? do
-        true
-      end
-    end
-  end
-
-  def self.switch_off
-    Trackman::Assets::Components::AssetFactory.module_eval do
-      alias :asset_pipeline_enabled? :old_asset_pipeline_enabled?
-      remove_method :old_asset_pipeline_enabled?
-    end
-  end
-end
-
-class ActLikeRails2311
-  def self.switch_on
-    Trackman::Assets::Components::AssetFactory.module_eval do
-      alias :old_rails_defined? :rails_defined?
-      alias :old_asset_pipeline_enabled? :asset_pipeline_enabled? 
-      
-      define_method :rails_defined? do
-        true
-      end
-
-      define_method :asset_pipeline_enabled? do
-        false
-      end
-    end
-  end
-
-  def self.switch_off
-    Trackman::Assets::Components::AssetFactory.module_eval do
-      alias :rails_defined? :old_rails_defined?
-      alias :asset_pipeline_enabled? :old_asset_pipeline_enabled?
-      
-      remove_method :old_rails_defined?
-      remove_method :old_asset_pipeline_enabled?
-    end
-  end
-end

data/spec/paths/rails32_pathman_spec.rb

@@ -1,17 +1,22 @@
 require 'spec_helper'
+require 'sprockets'
 
 class Rails32Tester
   extend Rails32PathResolver
+
+  def self.working_dir
+    Pathname.new('spec/fixtures/sprockets')
+  end
 end
 
 
 describe Rails32PathResolver do
   it "serves an image linked by an html" do
     parent_url = 'public/503.html'
-    url = '/assets/bombero.jpg'
+    url = '/assets/bombero.jpeg'
 
     actual = Rails32Tester.translate url, parent_url
-    expected = 'app/assets/images/bombero.jpg'
+    expected = 'app/assets/images/bombero.jpeg'
 
     actual.should == expected
   end
@@ -37,11 +42,11 @@ describe Rails32PathResolver do
   end
 
   it "serves a relative image" do
-    parent_url = 'app/assets/stylesheets/trundle.css'
-    url = 'image.jpg'
+    parent_url = 'app/assets/stylesheets/bombero/tralala/trundle.css'
+    url = 'img.jpg'
 
     actual = Rails32Tester.translate url, parent_url
-    expected = 'app/assets/images/image.jpg'
+    expected = 'app/assets/images/bombero/tralala/img.jpg'
 
     actual.should == expected
   end
@@ -56,14 +61,12 @@ 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/3/32/allo.png'
+    expected = 'app/assets/images/a/3/32/allo.png'
 
     actual.should == expected
   end

data/spec/rails2311/first_push_spec.rb

@@ -1,6 +1,7 @@
 require 'spec_helper'
 require 'helpers/app_creator'
 require 'helpers/fakable_pathman_tester'
+require 'helpers/act_like_rails2311'
 
 describe 'full path' do
   before :all do

data/spec/rails32/first_push_spec.rb

@@ -1,6 +1,7 @@
 require 'spec_helper'
 require 'helpers/app_creator'
 require 'helpers/fakable_pathman_tester'
+require 'helpers/act_like_rails32'
 
 describe 'first push' do
   before :all do

data/spec/sync_spec.rb

@@ -1,27 +1,11 @@
 require 'spec_helper'
 
 describe Trackman::Assets::Asset do
-  before :all do
-    class Asset
-      class << self
-        alias :old_sync :sync
-      end
-    end
-
-    def Asset.sync
-      @@called = true
-    end
+  
+  class MyTestAsset < Asset
   end
 
-  after :all do
-    def Asset.sync
-      old_sync
-    end
-  end
-  
   before :each do
-    @@called = false
-
     class Env
       def production?
         true
@@ -38,18 +22,18 @@ describe Trackman::Assets::Asset do
   end
   
   it "syncs without any special config" do
-    Asset.autosync
+    MyTestAsset.should_receive(:sync)
 
-    @@called.should be_true
+    MyTestAsset.autosync
   end  
   
   it "doesnt autosync if ENV is set to false/0/FALSE" do
+    MyTestAsset.should_not_receive(:sync)
+
     ['false', '0', 'FALSE'].each do |v|
       ENV['TRACKMAN_AUTOSYNC'] = v
-      Asset.autosync
+      MyTestAsset.autosync
     end
-     
-    @@called.should be_false
   end
   
   it "doesn't autosync if the env is not in production" do
@@ -64,22 +48,20 @@ describe Trackman::Assets::Asset do
         false
       end
     end
+    MyTestAsset.should_not_receive(:sync)
 
-    Asset.autosync
-
-    @@called.should be_false
+    MyTestAsset.autosync
   end
   
   it "doesn't blow up when I autosync even though something is broken" do
-    def Asset.sync
-      @@called = true
+    def MyTestAsset.sync
       raise "something is wrong"
     end
     result = true
-    
-    lambda { result = Asset.autosync }.should_not raise_error
+    MyTestAsset.should_receive(:sync)
+
+    lambda { result = MyTestAsset.autosync }.should_not raise_error
     
     result.should be_false
-    @@called.should be_true
   end
 end

data/trackman.gemspec

@@ -25,4 +25,5 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency "heroku", ">= 2.26.2"
   
   s.add_development_dependency "rspec"
+  s.add_development_dependency "sprockets"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: trackman
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.1.6
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-06-22 00:00:00.000000000 Z
+date: 2012-06-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client
@@ -108,6 +108,22 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: sprockets
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Trackman hosts your maintenances and app-down pages (503s) and lets you
   keep them in your current development environment so that you can focus on delivering
   and not configuring.
@@ -381,11 +397,20 @@ files:
 - spec/fixtures/rails32/happy-path/public/index.html
 - spec/fixtures/rails32/happy-path/public/robots.txt
 - spec/fixtures/rails32/happy-path/script/rails
+- spec/fixtures/sprockets/app/assets/images/a/3/32/allo.png
+- spec/fixtures/sprockets/app/assets/images/bombero.jpeg
+- spec/fixtures/sprockets/app/assets/images/bombero/tralala/img.jpg
+- spec/fixtures/sprockets/app/assets/images/image.jpg
+- 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
+- spec/fixtures/sprockets/public/assets/rails.png
+- spec/fixtures/sprockets/public/favicon.png
+- spec/helpers/act_like_rails2311.rb
+- spec/helpers/act_like_rails32.rb
 - spec/helpers/app_creator.rb
 - spec/helpers/fakable_pathman_tester.rb
 - spec/html_asset_spec.rb
-- spec/path_spec.rb
-- spec/paths/fakable_pathman_tester_spec.rb
 - spec/paths/pathman_spec.rb
 - spec/paths/rails32_pathman_spec.rb
 - spec/rails2311/first_push_spec.rb

data/spec/path_spec.rb

@@ -1,6 +0,0 @@
-
-
-
-
-
-

data/spec/paths/fakable_pathman_tester_spec.rb

@@ -1,36 +0,0 @@
-require 'spec_helper'
-require 'helpers/fakable_pathman_tester'
-
-class Tester
-  extend Rails32PathResolver
-end
-
-describe FakablePathManTester do
-  before :all do
-    FakablePathManTester.switch_on 'spec/fixtures/rails32/clean_path/'
-  end
-
-  after :all do
-    FakablePathManTester.switch_off
-  end
-
-  it "should have a root anywhere for favicons" do
-    parent_url = 'spec/fixtures/rails32/clean_path/app/assets/stylesheets/trundle.css'
-    url = 'image.jpg'
-    
-    actual = Tester.translate url, parent_url
-    expected = 'spec/fixtures/rails32/clean_path/app/assets/images/image.jpg'
-
-    actual.should == expected
-  end
-
-  it "should have a root anywhere for linked images" do
-    parent_url = 'spec/fixtures/rails32/clean_path/public/503.html'
-    url = '/favicon.png'
-
-    actual = Tester.translate url, parent_url
-    expected = 'spec/fixtures/rails32/clean_path/public/favicon.png'
-
-    actual.should == expected
-  end
-end