Skip to content
This repository was archived by the owner on Nov 8, 2018. It is now read-only.
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion asset_id.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@ Gem::Specification.new do |s|
s.description = %q{asset_id is a library for uploading static assets to Amazon S3.}
s.email = %q{[email protected]}
s.files = ["LICENSE", "README.textile","lib/asset_id.rb"] + Dir.glob('lib/asset_id/*.rb') + Dir.glob('lib/asset_id/backend/*.rb')
s.has_rdoc = false
s.homepage = %q{http://github.com/moomerman/asset_id}
s.rdoc_options = ["--inline-source", "--charset=UTF-8"]
s.require_paths = ["lib"]
Expand Down
5 changes: 4 additions & 1 deletion lib/asset_id/backend/s3.rb
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,9 @@ def self.upload(options={})
:access => s3_permissions,
}.merge(asset.cache_headers)

#load css md5 before replace_css_images
asset.md5

asset.replace_css_images!(:prefix => s3_prefix) if asset.css?

if asset.gzip_type?
Expand Down Expand Up @@ -74,4 +77,4 @@ def self.upload(options={})
end

end
end
end
5 changes: 3 additions & 2 deletions lib/asset_id/cache.rb
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ def self.empty
end

def self.cache
@cache ||= YAML.load_file(cache_path) rescue {}
@cache ||= (YAML.load_file(cache_path) rescue {})
end

def self.cache_path
Expand All @@ -20,6 +20,7 @@ def self.get(asset)
end

def self.hit?(asset)
return false if asset.css?
return true if cache[asset.relative_path] and cache[asset.relative_path][:fingerprint] == asset.fingerprint
cache[asset.relative_path] = {:expires => asset.expiry_date.to_s, :fingerprint => asset.fingerprint}
false
Expand All @@ -34,4 +35,4 @@ def self.save!
end

end
end
end
8 changes: 7 additions & 1 deletion test/asset_test.rb
Original file line number Diff line number Diff line change
Expand Up @@ -50,11 +50,17 @@ def test_parse_css_with_prefix
asset.replace_css_images!(:prefix => 'https://example.com')
assert_equal 'body { background: url(https://example.com/images/thundercats-id-982f2a3a4d905189959e848badb4f55b.jpg); }', asset.data
end

def test_cache_hit
assert !AssetID::Cache.hit?(@asset)
assert AssetID::Cache.hit?(@asset)
end


end

class Rails
def self.root
File.expand_path(File.join(File.dirname(__FILE__), 'sandbox'))
end
end
end