trackman 0.6.9 → 0.6.10

data/lib/trackman/assets/asset.rb

@@ -8,7 +8,6 @@ module Trackman
       def initialize attributes = {}
         @assets = []
         
-        
         self.path = attributes[:path]
         self.virtual_path = attributes[:virtual_path]
       end
@@ -16,14 +15,17 @@ module Trackman
       attr_accessor :virtual_path
       attr_reader :path, :assets
 
-      def to_remote
-        RemoteAsset.create(:path => @path, :virtual_path => self.virtual_path)
+      def to_remote(id = nil)
+        RemoteAsset.create(:path => @path, :virtual_path => self.virtual_path, :id => id)
       end
 
       def ==(other)
         return false if other.nil?
         other_path = other.path.is_a?(Pathname) ? other.path : Pathname.new(other.path)
-        other_path.to_s == path.to_s || path.cleanpath == other_path.cleanpath
+        path_equal = other_path.to_s == path.to_s || path.cleanpath == other_path.cleanpath
+        vp_equal = virtual_path.to_s == other.virtual_path.to_s
+        
+        path_equal && vp_equal
       end
 
       def <=>(another)
@@ -50,7 +52,7 @@ module Trackman
       end
       
       def to_s
-        "<#{self.class}:\npath=#{path}\nfile_hash=#{file_hash}>"
+        "\n<#{self.class}>:\npath='#{path}'\nfile_hash='#{file_hash}'\nvirtual_path='#{virtual_path}'"
       end
       
       def self.all

data/lib/trackman/assets/remote_asset.rb

@@ -27,9 +27,8 @@ module Trackman
           if other.is_a? RemoteAsset
             result = other.id == id && other.file_hash == file_hash 
           end
-          return result
         end
-        false 
+        result 
       end
 
       private

data/lib/trackman/components/diffable.rb

@@ -6,7 +6,7 @@ module Trackman
         
         { 
           :create => to_create, 
-          :update => remote.select{|a| local.any?{ |s| a.path == s.path && (a.file_hash != s.file_hash || a.virtual_path != s.virtual_path) }},  
+          :update => define_update(local, remote),  
           :delete => define_deleted(local, remote) do |a| 
             to_create.any?{ |c| c.path.basename == a.path.basename }
           end
@@ -23,6 +23,24 @@ module Trackman
 
           to_delete.reject{|a| a.path.to_s =~ /.html$/ }.to_a
         end
+
+        def define_update local, remote
+          to_update = local.select do |l| 
+            remote.any? do |r| 
+              path_eql = a.path == s.path
+              hash_eql = a.file_hash == s.file_hash 
+              vp_eql = a.virtual_path == s.virtual_path
+
+              path_eql && (!hash_eql || !vp_eql)
+            end
+          end
+
+          to_update.map do |a| 
+            sibling = remote.select{|x| x.path == a.path }.first
+            a.to_remote(sibling.id)
+          end
+        end
+
     end
   end
 end

data/lib/trackman/version.rb

@@ -1,3 +1,3 @@
 module Trackman
-  VERSION = "0.6.9"
+  VERSION = "0.6.10"
 end

data/spec/asset_all_spec.rb

@@ -16,8 +16,8 @@ describe Trackman::Assets::Asset do
       end 
 
       expected = [
-        TestAsset.create(:path => 'spec/test_data/all/1.css'), 
-        TestAsset.create(:path => 'spec/test_data/all/2.gif'),  
+        TestAsset.create(:path => 'spec/test_data/all/1.css', :virtual_path => '1.css'), 
+        TestAsset.create(:path => 'spec/test_data/all/2.gif', :virtual_path => '2.gif'),  
         TestAsset.maintenance_page
       ]
 
@@ -45,9 +45,9 @@ describe Trackman::Assets::Asset do
       end 
 
       expected = [
-        TestAsset.create(:path => 'spec/test_data/all/1.css'),
-        TestAsset.create(:path => 'spec/test_data/all/2.gif'),
-        TestAsset.create(:path => 'spec/test_data/all/3.js'),
+        TestAsset.create(:path => 'spec/test_data/all/1.css', :virtual_path => '1.css'),
+        TestAsset.create(:path => 'spec/test_data/all/2.gif', :virtual_path => '2.gif'),
+        TestAsset.create(:path => 'spec/test_data/all/3.js', :virtual_path => '3.js'),
         TestAsset.maintenance_page,
         TestAsset.error_page
       ]
@@ -74,8 +74,8 @@ describe Trackman::Assets::Asset do
       end 
 
       expected = [
-        TestAsset.create(:path => 'spec/test_data/all/1.css'), 
-        TestAsset.create(:path => 'spec/test_data/all/2.gif'), 
+        TestAsset.create(:path => 'spec/test_data/all/1.css', :virtual_path => '1.css'), 
+        TestAsset.create(:path => 'spec/test_data/all/2.gif', :virtual_path => '2.gif'), 
         TestAsset.maintenance_page, 
         TestAsset.error_page
       ]
@@ -108,7 +108,7 @@ describe Trackman::Assets::Asset do
         end  
       end 
 
-      expected = [TestAsset.create(:path => 'spec/test_data/external_paths/1.css'), TestAsset.maintenance_page]
+      expected = [TestAsset.create(:path => 'spec/test_data/external_paths/1.css', :virtual_path => '1.css'), TestAsset.maintenance_page]
       
       TestAsset.all.should eq(expected)
     end
@@ -129,7 +129,7 @@ describe Trackman::Assets::Asset do
         end  
       end
      
-      expected = [TestAsset.create(:path => 'spec/test_data/external_paths/1.css'), TestAsset.maintenance_page] 
+      expected = [TestAsset.create(:path => 'spec/test_data/external_paths/1.css', :virtual_path => '1.css'), TestAsset.maintenance_page] 
       TestAsset.all.should eq(expected)
     end
   end

data/spec/asset_spec.rb

@@ -26,6 +26,13 @@ describe Trackman::Assets::Asset do
 
     asset1.should == asset2
   end
+
+  it "is not equal if the virtual path is different" do
+    asset1 = RemoteAsset.create(:path => 'same/path', :virtual_path => '/different/virtual/path')
+    asset2 = RemoteAsset.create(:path => 'same/path', :virtual_path => 'different/virtual/path')
+
+    asset1.should_not == asset2
+  end
   
   describe "#data" do
     it "returns content of the file specified by path" do

data/spec/composite_asset_spec.rb

@@ -22,9 +22,10 @@ describe Trackman::Assets::CompositeAsset do
   before :each do
     @composite = TestComposite.new
   end
+  
   it "has children" do
     asset = Asset.create(:path => 'spec/test_data/css/with-asset.css')
-    asset.assets.should == [Asset.create(:path => 'spec/test_data/css/imported.css')] 
+    asset.assets.should == [Asset.create(:path => 'spec/test_data/css/imported.css', :virtual_path => 'imported.css')] 
   end
 
   it "removes the translated assets that are nil" do

data/spec/css_asset_spec.rb

@@ -4,14 +4,14 @@ describe CssAsset do
   it "returns its assets when it has import in it" do
     asset = Asset.create(:path => 'spec/test_data/css/with-asset.css')
     
-    asset.assets.should == [Asset.create(:path => 'spec/test_data/css/imported.css')] 
+    asset.assets.should == [Asset.create(:path => 'spec/test_data/css/imported.css', :virtual_path => 'imported.css')] 
   end
 
   it "returns multiple assets when it has multiple imports" do
     actual = Asset.create(:path => 'spec/test_data/css/with-multiple-assets.css')
     expected = [
-      Asset.create(:path => 'spec/test_data/css/imported.css'), 
-      Asset.create(:path => 'spec/test_data/css/imported2.css')
+      Asset.create(:path => 'spec/test_data/css/imported.css', :virtual_path => 'imported.css'), 
+      Asset.create(:path => 'spec/test_data/css/imported2.css',  :virtual_path => 'imported2.css')
     ] 
 
     actual.assets.should == expected
@@ -19,7 +19,7 @@ describe CssAsset do
 
   it "returns an image if it is within the css" do
     actual = Asset.create(:path => 'spec/test_data/css/image/with-image.css')
-    expected = [ Asset.create(:path => 'spec/test_data/css/image/riding-you.jpg')] 
+    expected = [ Asset.create(:path => 'spec/test_data/css/image/riding-you.jpg', :virtual_path => 'riding-you.jpg')] 
 
     actual.assets.should == expected
   end
@@ -27,9 +27,9 @@ describe CssAsset do
   it "returns all recursive css imports and images under the css file" do
     expected = 
       [
-        Asset.create(:path => 'spec/test_data/css/recursive/imported-lvl2.css'),
-        Asset.create(:path => 'spec/test_data/css/recursive/imported-lvl3.css'),
-        Asset.create(:path => 'spec/test_data/css/recursive/riding-you.jpg')
+        Asset.create(:path => 'spec/test_data/css/recursive/imported-lvl2.css', :virtual_path => 'imported-lvl2.css'),
+        Asset.create(:path => 'spec/test_data/css/recursive/imported-lvl3.css', :virtual_path => 'imported-lvl3.css'),
+        Asset.create(:path => 'spec/test_data/css/recursive/riding-you.jpg', :virtual_path => 'riding-you.jpg')
       ]
     asset = Asset.create(:path => 'spec/test_data/css/recursive/imported-recursive.css')
     actual = asset.assets

data/spec/html_asset_spec.rb

@@ -5,10 +5,10 @@ describe Trackman::Assets::HtmlAsset do
     asset = Asset.create(:path => 'spec/test_data/sample.html')
 
     expected = [
-      'spec/test_data/test1.jpeg', 
-      'spec/test_data/test2.png', 
-      'spec/test_data/test3.gif'
-    ].map{|x| Asset.create(:path => x) } 
+      Asset.create(:path => 'spec/test_data/test1.jpeg', :virtual_path => 'test1.jpeg'),
+      Asset.create(:path => 'spec/test_data/test2.png', :virtual_path => 'test2.png'),
+      Asset.create(:path => 'spec/test_data/test3.gif', :virtual_path => 'test3.gif')
+    ]
     
     actual = asset.assets.select{|a| !(['.css', '.js'].include?(a.path.extname)) }
 
@@ -19,8 +19,8 @@ describe Trackman::Assets::HtmlAsset do
   it "should contains every js within the html as assets" do
     asset = Asset.create(:path => 'spec/test_data/sample.html')
 
-    expected = ['a', 'b', 'c'].map{|x| Asset.create(:path =>"spec/test_data/#{x}.js") } 
-    
+    expected = ['a', 'b', 'c'].map{|x| Asset.create(:path =>"spec/test_data/#{x}.js", :virtual_path => "#{x}.js") } 
+      
     actual = asset.assets.select{|a| a.path.extname == '.js'}
 
     actual.should eq(expected)
@@ -29,7 +29,7 @@ describe Trackman::Assets::HtmlAsset do
   it "should contains every css within the html as assets" do
     asset = Asset.create(:path => 'spec/test_data/sample.html')
 
-    expected = ['y', 'z'].map{|x| Asset.create(:path => "spec/test_data/#{x}.css") } 
+    expected = ['y', 'z'].map{|x| Asset.create(:path => "spec/test_data/#{x}.css", :virtual_path => "#{x}.css") } 
     
     actual = asset.assets.select{|a| a.path.extname == '.css'}
 
@@ -38,9 +38,9 @@ describe Trackman::Assets::HtmlAsset do
 
   it "returns all recursive css imports and images under the html file that contains css" do
     expected = [
-        CssAsset.new(:path => 'spec/test_data/css/recursive/imported-lvl2.css'),
-        CssAsset.new(:path => 'spec/test_data/css/recursive/imported-lvl3.css'),
-        Asset.new(:path => 'spec/test_data/css/recursive/riding-you.jpg')
+        CssAsset.new(:path => 'spec/test_data/css/recursive/imported-lvl2.css', :virtual_path => "imported-lvl2.css"),
+        CssAsset.new(:path => 'spec/test_data/css/recursive/imported-lvl3.css', :virtual_path => "imported-lvl3.css"),
+        Asset.new(:path => 'spec/test_data/css/recursive/riding-you.jpg', :virtual_path => "riding-you.jpg")
       ]
     asset = Asset.create(:path => 'spec/test_data/css/recursive/html-with-css.html')
 

data/spec/rails2311/first_push_spec.rb

@@ -3,7 +3,7 @@ require 'helpers/app_creator'
 require 'helpers/fakable_pathman_tester'
 require 'helpers/act_like_rails2311'
 
-describe 'full path' do
+describe 'sync' do
   before :all do
     FakablePathManTester.switch_on 'spec/fixtures/rails2311/fully-loaded/'
     ActLikeRails2311.switch_on
@@ -25,6 +25,7 @@ describe 'full path' do
    remote = RemoteAsset.all
    
    remote.count.should == 8
+
    local.each{|l| remote.should include(l) }
   end
 end

data/spec/remote_asset_spec.rb

@@ -14,7 +14,7 @@ describe Trackman::Assets::RemoteAsset do
   end
 
   it "creates assets on the server" do
-    expected = RemoteAsset.create(:path => 'spec/test_data/test2.png')
+    expected = RemoteAsset.create(:path => 'spec/test_data/test2.png', :virtual_path => 'spec/test_data/test2.png')
     expected.insert
     
     actual = RemoteAsset.find expected.id
@@ -48,7 +48,7 @@ describe Trackman::Assets::RemoteAsset do
   end
 
   it "updates assets on the server" do
-    expected = RemoteAsset.create(:path => 'spec/test_data/y.css')
+    expected = RemoteAsset.create(:path => 'spec/test_data/y.css', :virtual_path => 'spec/test_data/y.css')
     
     expected.insert
     

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: trackman
 version: !ruby/object:Gem::Version
-  version: 0.6.9
+  version: 0.6.10
   prerelease: 
 platform: ruby
 authors: