lash 1.0.1 → 1.0.3
Sign up to get free protection for your applications and to get access to all the features.
- data/lib/lash.rb +1 -1
- data/lib/lash/assets_host.rb +2 -2
- data/lib/lash/railtie.rb +2 -2
- data/lib/lash/version.rb +1 -1
- data/spec/lib/assets_host_spec.rb +2 -1
- metadata +10 -10
data/lib/lash.rb
CHANGED
@@ -25,7 +25,7 @@ module Lash
|
|
25
25
|
}
|
26
26
|
end
|
27
27
|
|
28
|
-
require 'lash/railtie' if defined?(Rails)
|
28
|
+
require 'lash/railtie' if defined?(Rails) and defined?(::Rails::Railtie)
|
29
29
|
require 'lash/java_script_bundler'
|
30
30
|
require 'lash/sprite_bundler'
|
31
31
|
require 'lash/files'
|
data/lib/lash/assets_host.rb
CHANGED
@@ -13,7 +13,7 @@ module Lash
|
|
13
13
|
|
14
14
|
ENV['RAILS_ASSET_ID'] = \
|
15
15
|
[:javascripts, :stylesheets, :images] \
|
16
|
-
.map { |folder| repo.log( 'master', "
|
16
|
+
.map { |folder| repo.log( 'master', "public/#{folder}", :max_count => 1 ).first } \
|
17
17
|
.max_by { |log| log && log.committed_date }
|
18
18
|
.id
|
19
19
|
end
|
@@ -23,7 +23,7 @@ module Lash
|
|
23
23
|
if Lash.lash_options[:use_git_asset_id]
|
24
24
|
repo = Grit::Repo.new( Rails.root.to_s )
|
25
25
|
[:javascripts, :stylesheets, :images] \
|
26
|
-
.map { |folder| repo.log( 'master', "
|
26
|
+
.map { |folder| repo.log( 'master', "public/#{folder}", :max_count => 1 ).first } \
|
27
27
|
.max_by { |log| log && log.committed_date }
|
28
28
|
.id
|
29
29
|
elsif ::File.exist?( file )
|
data/lib/lash/railtie.rb
CHANGED
@@ -16,8 +16,8 @@ module Lash
|
|
16
16
|
end
|
17
17
|
|
18
18
|
initializer "lash.setup_git_asset_id", :before => "action_controller.set_configs" do |app|
|
19
|
-
AssetsHost.use_git_asset_id
|
20
|
-
app.config.action_controller.asset_host =
|
19
|
+
Lash::AssetsHost.use_git_asset_id
|
20
|
+
app.config.action_controller.asset_host = Proc.new{ |source,request| Lash::AssetsHost.resolve_static_asset_server_for_source( source, request ) }
|
21
21
|
end
|
22
22
|
|
23
23
|
end
|
data/lib/lash/version.rb
CHANGED
@@ -6,7 +6,8 @@ describe Lash::AssetsHost do
|
|
6
6
|
|
7
7
|
context "asset_id" do
|
8
8
|
it "should use the git repo hash for the cachebusting id" do
|
9
|
-
|
9
|
+
pending "Can't get .git repo for embedded test app...not sure how to get arround this"
|
10
|
+
Rails.root = RAILS_ROOT
|
10
11
|
Lash::AssetsHost.use_git_asset_id
|
11
12
|
ENV['RAILS_ASSET_ID'].should match /\A[a-f0-9]{40}\Z/
|
12
13
|
end
|
metadata
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: lash
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 1.0.
|
4
|
+
version: 1.0.3
|
5
5
|
prerelease:
|
6
6
|
platform: ruby
|
7
7
|
authors:
|
@@ -9,12 +9,12 @@ authors:
|
|
9
9
|
autorequire:
|
10
10
|
bindir: bin
|
11
11
|
cert_chain: []
|
12
|
-
date: 2011-04-
|
12
|
+
date: 2011-04-20 00:00:00.000000000 -07:00
|
13
13
|
default_executable:
|
14
14
|
dependencies:
|
15
15
|
- !ruby/object:Gem::Dependency
|
16
16
|
name: grit
|
17
|
-
requirement: &
|
17
|
+
requirement: &2154633880 !ruby/object:Gem::Requirement
|
18
18
|
none: false
|
19
19
|
requirements:
|
20
20
|
- - ! '>='
|
@@ -22,10 +22,10 @@ dependencies:
|
|
22
22
|
version: '0'
|
23
23
|
type: :runtime
|
24
24
|
prerelease: false
|
25
|
-
version_requirements: *
|
25
|
+
version_requirements: *2154633880
|
26
26
|
- !ruby/object:Gem::Dependency
|
27
27
|
name: lash-sprites
|
28
|
-
requirement: &
|
28
|
+
requirement: &2154633460 !ruby/object:Gem::Requirement
|
29
29
|
none: false
|
30
30
|
requirements:
|
31
31
|
- - ! '>='
|
@@ -33,10 +33,10 @@ dependencies:
|
|
33
33
|
version: '0'
|
34
34
|
type: :runtime
|
35
35
|
prerelease: false
|
36
|
-
version_requirements: *
|
36
|
+
version_requirements: *2154633460
|
37
37
|
- !ruby/object:Gem::Dependency
|
38
38
|
name: rspec
|
39
|
-
requirement: &
|
39
|
+
requirement: &2154633020 !ruby/object:Gem::Requirement
|
40
40
|
none: false
|
41
41
|
requirements:
|
42
42
|
- - ! '>='
|
@@ -44,10 +44,10 @@ dependencies:
|
|
44
44
|
version: '0'
|
45
45
|
type: :development
|
46
46
|
prerelease: false
|
47
|
-
version_requirements: *
|
47
|
+
version_requirements: *2154633020
|
48
48
|
- !ruby/object:Gem::Dependency
|
49
49
|
name: rdiscount
|
50
|
-
requirement: &
|
50
|
+
requirement: &2154632600 !ruby/object:Gem::Requirement
|
51
51
|
none: false
|
52
52
|
requirements:
|
53
53
|
- - ! '>='
|
@@ -55,7 +55,7 @@ dependencies:
|
|
55
55
|
version: '0'
|
56
56
|
type: :development
|
57
57
|
prerelease: false
|
58
|
-
version_requirements: *
|
58
|
+
version_requirements: *2154632600
|
59
59
|
description: Lash will bundle and compress most common static assets using Googles
|
60
60
|
closure compiler for JavaScript, SASS for CSS and will package loose image files
|
61
61
|
into a single static CSS sprite.
|