lash 1.0.1 → 1.0.3

data/lib/lash.rb

@@ -25,7 +25,7 @@ module Lash
   }
 end
 
-require 'lash/railtie' if defined?(Rails) && Rails === Class and defined?(::Rails::Railtie)
+require 'lash/railtie' if defined?(Rails) and defined?(::Rails::Railtie)
 require 'lash/java_script_bundler'
 require 'lash/sprite_bundler'
 require 'lash/files'

data/lib/lash/assets_host.rb

@@ -13,7 +13,7 @@ module Lash
 
       ENV['RAILS_ASSET_ID'] = \
       [:javascripts, :stylesheets, :images] \
-        .map { |folder| repo.log( 'master', "spec/test_app/public/#{folder}", :max_count => 1 ).first } \
+        .map { |folder| repo.log( 'master', "public/#{folder}", :max_count => 1 ).first } \
         .max_by { |log| log && log.committed_date } 
         .id
     end
@@ -23,7 +23,7 @@ module Lash
       if Lash.lash_options[:use_git_asset_id]
         repo = Grit::Repo.new( Rails.root.to_s )
         [:javascripts, :stylesheets, :images] \
-          .map { |folder| repo.log( 'master', "spec/test_app/public/#{folder}", :max_count => 1 ).first } \
+          .map { |folder| repo.log( 'master', "public/#{folder}", :max_count => 1 ).first } \
           .max_by { |log| log && log.committed_date } 
           .id
       elsif ::File.exist?( file )

data/lib/lash/railtie.rb

@@ -16,8 +16,8 @@ module Lash
     end
     
     initializer "lash.setup_git_asset_id", :before => "action_controller.set_configs" do |app|
-      AssetsHost.use_git_asset_id      
-      app.config.action_controller.asset_host = AssetsHosts.resolve_static_asset_server_for_source
+      Lash::AssetsHost.use_git_asset_id      
+      app.config.action_controller.asset_host = Proc.new{ |source,request| Lash::AssetsHost.resolve_static_asset_server_for_source( source, request ) }
     end
     
   end

data/lib/lash/version.rb

@@ -1,3 +1,3 @@
 module Lash
-  VERSION = "1.0.1"
+  VERSION = "1.0.3"
 end

data/spec/lib/assets_host_spec.rb

@@ -6,7 +6,8 @@ describe Lash::AssetsHost do
   
   context "asset_id" do
     it "should use the git repo hash for the cachebusting id" do 
-      Rails.root = File.expand_path( "../../../", __FILE__ )
+      pending "Can't get .git repo for embedded test app...not sure how to get arround this"
+      Rails.root = RAILS_ROOT
       Lash::AssetsHost.use_git_asset_id
       ENV['RAILS_ASSET_ID'].should match /\A[a-f0-9]{40}\Z/
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: lash
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,12 +9,12 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-04-19 00:00:00.000000000 -07:00
+date: 2011-04-20 00:00:00.000000000 -07:00
 default_executable: 
 dependencies:
 - !ruby/object:Gem::Dependency
   name: grit
-  requirement: &2156047520 !ruby/object:Gem::Requirement
+  requirement: &2154633880 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -22,10 +22,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2156047520
+  version_requirements: *2154633880
 - !ruby/object:Gem::Dependency
   name: lash-sprites
-  requirement: &2156046980 !ruby/object:Gem::Requirement
+  requirement: &2154633460 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -33,10 +33,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2156046980
+  version_requirements: *2154633460
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &2156046400 !ruby/object:Gem::Requirement
+  requirement: &2154633020 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -44,10 +44,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2156046400
+  version_requirements: *2154633020
 - !ruby/object:Gem::Dependency
   name: rdiscount
-  requirement: &2156045840 !ruby/object:Gem::Requirement
+  requirement: &2154632600 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -55,7 +55,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2156045840
+  version_requirements: *2154632600
 description: Lash will bundle and compress most common static assets using Googles
   closure compiler for JavaScript, SASS for CSS and will package loose image files
   into a single static CSS sprite.