trackman 0.0.6 → 0.0.8

data/lib/trackman/assets/asset.rb

@@ -21,8 +21,8 @@ module Trackman
 
       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.realpath == other_path.realpath
+        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
       end
 
       def <=>(another)
@@ -37,13 +37,15 @@ module Trackman
           result += -1
         elsif another.is_child_of(self)
           result += 1
+        else
+          result = self.path.to_s <=> another.path.to_s  
         end  
 
         result
       end
       
       def is_child_of(parent)
-        parent.is_a?(Components::CompositeAsset) && parent.assets.include?(self)
+        parent.assets.include? self
       end
 
       def self.all

data/lib/trackman/assets/remote_asset.rb

@@ -33,7 +33,7 @@ module Trackman
       end
 
       def self.all
-        JSON.parse(RestClient.get @@site).map{|r|  Hash[r.map{ |k, v| [k.to_sym, v] }] }.map { |r| RemoteAsset.new(r) }.sort
+        get_attributes.map{ |r| RemoteAsset.new(r) }.sort
       end
 
       def create!
@@ -65,6 +65,9 @@ module Trackman
         def ensure_config
           raise Errors::ConfigNotFoundError, "The config TRACKMAN_URL is missing." if @@server_url.nil?      
         end
+        def self.get_attributes
+          JSON.parse(RestClient.get @@site).map{|r|  Hash[r.map{ |k, v| [k.to_sym, v] }] }
+        end
     end 
   end
 end

data/lib/trackman/version.rb

@@ -1,3 +1,3 @@
 module Trackman
-  VERSION = "0.0.6"
+  VERSION = "0.0.8"
 end

data/spec/asset_all_spec.rb

@@ -45,9 +45,9 @@ describe Trackman::Assets::Asset do
       end 
 
       expected = [
-        TestAsset.create(:path => 'spec/test_data/all/3.js'),
-        TestAsset.create(:path => 'spec/test_data/all/2.gif'), 
         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.maintenance_page,
         TestAsset.error_page
       ]

data/spec/asset_spec.rb

@@ -57,10 +57,8 @@ describe Trackman::Assets::Asset do
     it "returns a remote asset equal to the previous one" do
       local = TestAsset.maintenance_page
       
-      AppCreator.create
       remote = local.to_remote
-      AppCreator.reset
-
+      
       local.should eq(remote)
       remote.is_a?(RemoteAsset).should be_true
     end  
@@ -96,4 +94,20 @@ describe Trackman::Assets::Asset do
     (dependent <=> dependency).should == 1
     (dependency <=> dependent).should == -1
   end
+
+  it "fixes the bug with realpath" do
+    class MyAsset < Asset
+      def validate_path?
+        false
+      end
+      def file_hash
+        123
+      end
+    end
+
+    local = MyAsset.new(:path => 'public/test.html')
+    remote = MyAsset.new(:path => 'public/./test.html')
+
+    local.should == remote
+  end
 end

data/spec/helpers/fakable_pathman_tester.rb

@@ -21,7 +21,21 @@ class FakablePathManTester
         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
+    
     Conventions.module_eval do 
       alias :real_maintenance_path :maintenance_path 
       alias :real_error_path :error_path
@@ -55,7 +69,15 @@ class FakablePathManTester
 
       remove_method :real_maintenance_path
       remove_method :real_error_path
-    end 
+    end
+
+    RemoteAsset.class_eval do
+      singleton_class = class << self; self; end
+      singleton_class.instance_eval do
+        alias_method :get_attributes, :old_get_attributes  
+        remove_method :old_get_attributes
+      end
+    end
   end
 end
 

data/spec/rails2311/first_push_spec.rb

@@ -18,12 +18,12 @@ describe 'full path' do
   end
 
   it "replaces all images" do
-   expected = Asset.all
-   
-   Asset.sync
-   actual = RemoteAsset.all
+   local = Asset.all
 
-   actual.count.should == 8
-   actual.should == expected
+   Asset.sync
+   remote = RemoteAsset.all
+   
+   remote.count.should == 8
+   local.each{|l| remote.should include(l) }
   end
 end

data/spec/rails32/first_push_spec.rb

@@ -65,12 +65,13 @@ describe 'full path' do
   end
 
   it "replaces all images" do
-   expected = Asset.all
+   local = Asset.all
 
    Asset.sync
-   actual = RemoteAsset.all
-
-   actual.count.should == 7
-   actual.should == expected
+   remote = RemoteAsset.all
+   
+   remote.count.should == 7
+   
+   local.each{|l| remote.should include(l) }
   end
 end

data/spec/remote_asset_spec.rb

@@ -43,9 +43,9 @@ describe Trackman::Assets::RemoteAsset do
   end
   
   it "returns all assets on the server" do
-    expected = ['spec/test_data/y.css', 'spec/test_data/a.js', '/public/503-error.html', '/public/503.html', 'spec/test_data/sample.html']
+    expected = ['spec/test_data/a.js', 'spec/test_data/y.css', 'public/503-error.html', 'public/503.html', 'spec/test_data/sample.html']
     
-    assets = ['spec/test_data/y.css', 'spec/test_data/a.js', 'spec/test_data/sample.html'].map { |f| RemoteAsset.new(:path => f) }
+    assets = ['spec/test_data/a.js', 'spec/test_data/y.css', 'spec/test_data/sample.html'].map { |f| RemoteAsset.new(:path => f) }
 
     assets.each{|f| f.create! }
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: trackman
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.8
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-06-16 00:00:00.000000000 Z
+date: 2012-06-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client