trackman 0.5.4 → 0.5.5

data/spec/diffable_spec.rb

@@ -1,8 +1,8 @@
 require 'spec_helper'
 
-describe Trackman::Assets::Components::Diffable do
+describe Trackman::Components::Diffable do
   class TestDiff
-    extend Trackman::Assets::Components::Diffable
+    extend Trackman::Components::Diffable
   end
  
   it "specify the html to update and the image to delete" do    

data/spec/helpers/act_like_rails2311.rb

@@ -1,7 +1,7 @@
 
 class ActLikeRails2311
   def self.switch_on
-    Trackman::Assets::Components::AssetFactory.module_eval do
+    Trackman::Assets::AssetFactory.module_eval do
       alias :old_rails_defined? :rails_defined?
       alias :old_asset_pipeline_enabled? :asset_pipeline_enabled? 
       
@@ -16,7 +16,7 @@ class ActLikeRails2311
   end
 
   def self.switch_off
-    Trackman::Assets::Components::AssetFactory.module_eval do
+    Trackman::Assets::AssetFactory.module_eval do
       alias :rails_defined? :old_rails_defined?
       alias :asset_pipeline_enabled? :old_asset_pipeline_enabled?
       

data/spec/helpers/act_like_rails32.rb

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

data/spec/helpers/app_creator.rb

@@ -5,7 +5,7 @@ class AppCreator
 
     trackman_url = json['config']['TRACKMAN_URL'].gsub('https', 'http')
 
-    [[:@@server_url, trackman_url], [:@@site, "#{trackman_url}/assets"]]
+    [[:server_url, trackman_url], [:site, "#{trackman_url}/assets"]]
   end
 
   def self.create
@@ -15,8 +15,12 @@ class AppCreator
     
     @@config = get_config "http://#{user}:#{pass}@#{server}/heroku/resources"
 
-    @@config.each do |s, v| 
-      RemoteAsset.send(:class_variable_set, s, v)
+    Trackman::Assets::Persistence::Remote::ClassMethods.module_eval do
+      #singleton = class << self; self; end
+      @@config.each do |k, v|   
+        alias_method "old_#{k}", k
+        define_method(k, lambda { v })
+      end
     end
 
     @@config
@@ -25,8 +29,11 @@ class AppCreator
   def self.reset
     RemoteAsset.all.each { |a| a.delete }
 
-    @@config.each do |k,v|
-      RemoteAsset.send(:class_variable_set, k, v)
+    Trackman::Assets::Persistence::Remote::ClassMethods.module_eval do
+      #singleton = class << self; self; end
+      @@config.each do |k,v|
+        alias_method k, "old_#{k}"
+      end
     end
   end
 end

data/spec/helpers/fakable_pathman_tester.rb

@@ -1,6 +1,6 @@
 class FakablePathManTester  
-  @@modules = [PathResolver, Rails32PathResolver, RailsPathResolver]
-  Conventions = Trackman::Assets::Components::Conventions
+  @@modules = [Resolver, Rails32Resolver, RailsResolver]
+  Conventions = Trackman::Components::Conventions
 
   def self.switch_on prepath
     override_remote_assets prepath
@@ -16,7 +16,7 @@ class FakablePathManTester
 
   def self.override_resolvers prepath
     
-    PathResolver.module_eval do
+    Resolver.module_eval do
       alias real_working_dir working_dir
 
       define_method :working_dir do
@@ -81,7 +81,7 @@ class FakablePathManTester
   end
 
   def self.reset_resolvers
-    PathResolver.module_eval do    
+    Resolver.module_eval do    
       alias :working_dir :real_working_dir
       remove_method :real_working_dir
     end
@@ -92,7 +92,7 @@ class FakablePathManTester
         remove_method :real_translate
       end
     end
-    Rails32PathResolver.send(:class_variable_set, :@@sprockets, nil)
+    Rails32Resolver.send(:class_variable_set, :@@sprockets, nil)
   end
 
   def self.reset_conventions

data/spec/paths/pathman_spec.rb

@@ -1,10 +1,10 @@
 require 'spec_helper'
 
 class PathTester
-  extend PathResolver
+  extend Resolver
 end
 
-describe PathResolver do
+describe Resolver do
   it 'gives a path at the same level as the parent if the url is relative and there is no parent specified' do
     parent_url = 'allo/home.html' 
     url = 'bob.jpg'

data/spec/paths/rails32_pathman_spec.rb

@@ -2,7 +2,7 @@ require 'spec_helper'
 require 'sprockets'
 
 class Rails32Tester
-  extend Rails32PathResolver
+  extend Rails32Resolver
 
   def self.working_dir
     Pathname.new('spec/fixtures/sprockets')
@@ -10,7 +10,7 @@ class Rails32Tester
 end
 
 
-describe Rails32PathResolver do
+describe Rails32Resolver do
   it "serves an image linked by an html" do
     parent_url = 'public/503.html'
     url = '/assets/bombero.jpeg'

data/spec/{rails32_path_resolver_spec.rb → rails32_resolver_spec.rb}

@@ -1,11 +1,11 @@
 require 'spec_helper'
 
 class Rails32ResolverTest
-  include Trackman::Assets::Components::Rails32PathResolver
+  include Rails32Resolver
 end
 
-describe Trackman::Assets::Components::Rails32PathResolver do  
-  Rails32PathResolver = Trackman::Assets::Components::Rails32PathResolver
+describe Trackman::Path::Rails32Resolver do  
+  
   before :all do
     @test = Rails32ResolverTest.new
   end

data/spec/remote_asset_spec.rb

@@ -3,20 +3,8 @@ require 'helpers/app_creator'
 
 describe Trackman::Assets::RemoteAsset do  
   before :each do
-    # user = ENV['HEROKU_USERNAME']
-    # pass = ENV['HEROKU_PASSWORD']
-    # server = ENV['TRACKMAN_SERVER_URL']
     @old_file = nil
     @config = AppCreator.create
-
-    # response = RestClient.post "http://#{user}:#{pass}@#{server}/heroku/resources", :plan => 'test', :heroku_id => 123 
-    # json = JSON.parse response
-    # @trackman_url = json['config']['TRACKMAN_URL'].gsub('https', 'http')
-    
-    # @config = [[:@@server_url, @trackman_url], [:@@site, "#{@trackman_url}/assets"]]
-    # @config.each do |s, v|
-    #   RemoteAsset.send(:class_variable_set, s, v)
-    # end
   end
   
   after :each do
@@ -74,13 +62,21 @@ describe Trackman::Assets::RemoteAsset do
   end 
 
   it "throws if a config is missing" do
-    begin 
-      @config.each {|k,v| RemoteAsset.send(:class_variable_set, k, nil) }
-      @config.each do |k,v|
-        lambda { RemoteAsset.create(:path => 'spec/test_data/a.js') }.should raise_error(Trackman::Assets::Errors::ConfigNotFoundError)
+    config = @config
+    begin
+      Trackman::Assets::Persistence::Remote::ClassMethods.module_eval do
+        config.each do |k,v| 
+          alias_method "temp_#{k}", k
+          define_method(k, lambda{ nil }) 
+        end
       end
+      lambda { RemoteAsset.create(:path => 'spec/test_data/a.js') }.should raise_error(Trackman::Errors::ConfigNotFoundError)
     ensure
-      @config.each {|k,v| RemoteAsset.send(:class_variable_set, k, v) }
+      Trackman::Assets::Persistence::Remote::ClassMethods.module_eval do
+        config.each do |k,v| 
+          alias_method k, "temp_#{k}"
+        end
+      end
     end
   end
 end

data/spec/shippable_spec.rb

@@ -1,8 +1,8 @@
 require 'spec_helper'
 
-describe Trackman::Assets::Components::Shippable do
+describe Trackman::Components::Shippable do
   class Test
-    extend Trackman::Assets::Components::Shippable
+    extend Trackman::Components::Shippable
 
     @@events = []
     def self.events

data/spec/spec_helper.rb

@@ -12,7 +12,7 @@ RSpec.configure do |config|
   config.filter_run :focus
 end
 
-module Trackman::Assets::Components::BundledAsset
+module Trackman::Components::BundledAsset
   def env
     working_dir = Pathname.new(Dir.pwd)
     env = ::Sprockets::Environment.new
@@ -24,7 +24,7 @@ module Trackman::Assets::Components::BundledAsset
     env
   end
 end
-module Trackman::Assets::Components::Rails32PathResolver 
+module Trackman::Path::Rails32Resolver 
   def sprockets  
     env = ::Sprockets::Environment.new
     paths = ['app', 'lib', 'vendor'].inject([]) do |array, f|
@@ -42,7 +42,7 @@ CssAsset = Trackman::Assets::CssAsset unless defined?(CssAsset)
 HtmlAsset = Trackman::Assets::HtmlAsset unless defined?(HtmlAsset)
 RemoteAsset = Trackman::Assets::RemoteAsset unless defined?(RemoteAsset)
 
-PathResolver = Trackman::Assets::Components::PathResolver unless defined?(PathResolver)
-Rails32PathResolver = Trackman::Assets::Components::Rails32PathResolver unless defined?(Rails32PathResolver)
-RailsPathResolver = Trackman::Assets::Components::RailsPathResolver unless defined?(RailsPathResolver)
-ConfigurationHandler = Trackman::ConfigurationHandler unless defined?(ConfigurationHandler)
+Resolver = Trackman::Path::Resolver unless defined?(Resolver)
+Rails32Resolver = Trackman::Path::Rails32Resolver unless defined?(Rails32Resolver)
+RailsResolver = Trackman::Path::RailsResolver unless defined?(RailsResolver)
+Configuration = Trackman::Utility::Configuration unless defined?(Configuration)

data/spec/sync_spec.rb

@@ -74,7 +74,7 @@ describe Trackman::Assets::Asset do
   it "logs the error when sync is broken" do
     MyTestAsset.stub!(:sync).and_raise("something is wrong")
 
-    RemoteAsset.should_receive(:log_exception).once
+    Trackman::Utility::Debugger.should_receive(:log_exception).once
 
     lambda { result = MyTestAsset.autosync }.should_not raise_error
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: trackman
 version: !ruby/object:Gem::Version
-  version: 0.5.4
+  version: 0.5.5
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-09-27 00:00:00.000000000 Z
+date: 2012-09-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client
@@ -164,32 +164,37 @@ files:
 - lib/trackman.rb
 - lib/trackman/assets.rb
 - lib/trackman/assets/asset.rb
-- lib/trackman/assets/components.rb
-- lib/trackman/assets/components/asset_factory.rb
-- lib/trackman/assets/components/bundled_asset.rb
-- lib/trackman/assets/components/composite_asset.rb
-- lib/trackman/assets/components/conventions.rb
-- lib/trackman/assets/components/diffable.rb
-- lib/trackman/assets/components/hashable.rb
-- lib/trackman/assets/components/path_resolver.rb
-- lib/trackman/assets/components/rails32_path_resolver.rb
-- lib/trackman/assets/components/rails_path_resolver.rb
-- lib/trackman/assets/components/remote_asset_factory.rb
-- lib/trackman/assets/components/shippable.rb
+- lib/trackman/assets/asset_factory.rb
+- lib/trackman/assets/bundled_asset.rb
+- lib/trackman/assets/composite_asset.rb
 - lib/trackman/assets/css_asset.rb
-- lib/trackman/assets/errors.rb
-- lib/trackman/assets/errors/asset_not_found_error.rb
-- lib/trackman/assets/errors/config_not_found_error.rb
 - lib/trackman/assets/html_asset.rb
+- lib/trackman/assets/persistence.rb
+- lib/trackman/assets/persistence/remote.rb
 - lib/trackman/assets/remote_asset.rb
-- lib/trackman/configuration_handler.rb
-- lib/trackman/core_extensions.rb
-- lib/trackman/debugger.rb
+- lib/trackman/assets/remote_asset_factory.rb
+- lib/trackman/components.rb
+- lib/trackman/components/conventions.rb
+- lib/trackman/components/diffable.rb
+- lib/trackman/components/hashable.rb
+- lib/trackman/components/shippable.rb
+- lib/trackman/errors.rb
+- lib/trackman/errors/asset_not_found_error.rb
+- lib/trackman/errors/config_not_found_error.rb
+- lib/trackman/errors/config_setup_error.rb
+- lib/trackman/path.rb
+- lib/trackman/path/rails32_resolver.rb
+- lib/trackman/path/rails_resolver.rb
+- lib/trackman/path/resolver.rb
 - lib/trackman/scaffold.rb
 - lib/trackman/scaffold/content_saver.rb
 - lib/trackman/scaffold/pretty-print.xslt
+- lib/trackman/utility.rb
+- lib/trackman/utility/configuration.rb
+- lib/trackman/utility/core_extensions.rb
+- lib/trackman/utility/debugger.rb
+- lib/trackman/utility/railtie.rb
 - lib/trackman/version.rb
-- lib/trackman_railtie.rb
 - rails_generators/trackman_controller/USAGE
 - rails_generators/trackman_controller/templates/controller_layout.rb.erb
 - rails_generators/trackman_controller/templates/view_layout.html.erb
@@ -201,7 +206,7 @@ files:
 - spec/asset_factory_spec.rb
 - spec/asset_spec.rb
 - spec/composite_asset_spec.rb
-- spec/configuration_handler_spec.rb
+- spec/configuration_spec.rb
 - spec/css_asset_spec.rb
 - spec/diffable_spec.rb
 - spec/fixtures/composite_assets/query_string_in_path.html
@@ -447,9 +452,9 @@ files:
 - spec/paths/rails32_pathman_spec.rb
 - spec/rails2311/first_push_spec.rb
 - spec/rails32/first_push_spec.rb
-- spec/rails32_path_resolver_spec.rb
+- spec/rails32_resolver_spec.rb
 - spec/remote_asset_spec.rb
-- spec/scaffolding_spec.rb
+- spec/scaffold_spec.rb
 - spec/shippable_spec.rb
 - spec/spec_helper.rb
 - spec/sync_spec.rb
@@ -513,7 +518,7 @@ test_files:
 - spec/asset_factory_spec.rb
 - spec/asset_spec.rb
 - spec/composite_asset_spec.rb
-- spec/configuration_handler_spec.rb
+- spec/configuration_spec.rb
 - spec/css_asset_spec.rb
 - spec/diffable_spec.rb
 - spec/fixtures/composite_assets/query_string_in_path.html
@@ -759,9 +764,9 @@ test_files:
 - spec/paths/rails32_pathman_spec.rb
 - spec/rails2311/first_push_spec.rb
 - spec/rails32/first_push_spec.rb
-- spec/rails32_path_resolver_spec.rb
+- spec/rails32_resolver_spec.rb
 - spec/remote_asset_spec.rb
-- spec/scaffolding_spec.rb
+- spec/scaffold_spec.rb
 - spec/shippable_spec.rb
 - spec/spec_helper.rb
 - spec/sync_spec.rb

data/lib/trackman/assets/components.rb

@@ -1,13 +0,0 @@
-module Trackman
-  module Assets
-    module Components
-      @@modules = [:Conventions, :Diffable, :Hashable, 
-        :Shippable, :CompositeAsset, :AssetFactory, :PathResolver, 
-        :Rails32PathResolver, :RailsPathResolver, :BundledAsset, :RemoteAssetFactory]
-     
-      ::Trackman::Assets.autoloads 'trackman/assets/components', @@modules do |s,p|
-          autoload s, p 
-      end
-    end
-  end
-end

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

@@ -1,48 +0,0 @@
-module Trackman
-  module Assets
-    module Components
-      module AssetFactory
-        def create attributes = {}
-          path = attributes[:path]
-          instance = retrieve_parent(path).new attributes
-          add_content_behavior instance
-        end
-
-        def retrieve_parent path
-          if File.extname(path) == '.html'
-            parent = HtmlAsset
-          elsif File.extname(path) == '.css'
-            parent = CssAsset 
-          else
-            parent = Asset
-          end
-          parent 
-        end
-
-        def add_content_behavior instance
-          if asset_pipeline_enabled?
-            instance.extend Rails32PathResolver, BundledAsset
-            return instance
-          elsif rails_defined? #fallback to rails without asset pipeline
-            instance.extend RailsPathResolver
-          end
-          instance.extend Hashable
-
-          instance
-        end
-        
-        def rails_defined?
-          Object.const_defined?(:Rails)
-        end
-
-        def asset_pipeline_enabled?
-           rails_defined? && 
-           Rails.respond_to?(:application) &&
-           Rails.application.config.assets.enabled &&
-           Rails.application.respond_to?(:assets) &&
-           Rails.application.assets
-        end  
-      end
-    end
-  end
-end