asset 0.1.5 → 0.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 79324a6a074bc04bca16da39d57e2f4dc0c152b5
-  data.tar.gz: 17ba912dfa3881fb46828ba8743e5f3763611311
+  metadata.gz: e22ae9abea9fbf33633e5884f0da5df397e9e318
+  data.tar.gz: ba47b72995401b3f3e74f10fc57dee2ed76bbf5d
 SHA512:
-  metadata.gz: 04e03ba158217c029ba9cde16659b6f1b77dc1237a281365c91b181348c0f580afa7abd2a6dff05ab2cd22c0dd73c6c961cdaa5ab81829c97179fb970a42abf5
-  data.tar.gz: bc060a99a62b72841ace1024d22f4fa965d2497fa4c34219ef872ccd1bf9e300353afb63d8a614eb02b6fa9b5e975048476f29bc4a03944d75bbc839b76fbb83
+  metadata.gz: 4a861c4ef0817bf478f0e09087b8edfa4d9d8f9d763a322a5f162a7b9c2b820e774ff97ff94b2d80ea5707701dff3a57834e2ed599acc398cb53d510238bbe6f
+  data.tar.gz: 283001062c093ca36b3c23f10a16eb8d949a057f2492da706a7d0522200d66ffc0b0a4b6d04aa37e23a6949b3a78e6821545ba89b15cef02ee83122f49a48de2

data/asset.gemspec

@@ -1,8 +1,8 @@
 Gem::Specification.new do |s|
   s.name        = 'asset'
-  s.version     = '0.1.5'
+  s.version     = '0.1.6'
   s.date        = '2017-01-18'
-  s.summary     = "Compress and serve your CSS and JS automatically"
+  s.summary     = "Compress and serve your CSS and JS assets automatically"
   s.description = "The only thing you need for your assets."
   s.authors     = ["Fugroup Limited"]
   s.email       = 'vidar@fugroup.net'

data/lib/assets/util.rb

@@ -12,32 +12,36 @@ module Asset
     end
 
     # Digest
-    def self.digest(path, time = mtime(path))
-      Digest::MD5.hexdigest(%{#{path}#{time.to_i}})
+    def self.digest(string)
+      Digest::MD5.hexdigest(string)
     end
 
     # Load manifest
     def self.load_manifest
-      list = Dir["#{Asset.path}/{css,js}/**/*"].select{|f| File.file?(f)}.map{|f| f.gsub(Asset.path + '/', '')}
       manifest = []
-      list.each do |file|
-        file =~ /(js|css)\/(.+)/
-        type, name = $1, $2
+      list = Dir["#{Asset.path}/{css,js}/**/*"].select{|f| File.file?(f)}.each do |file|
+        # Extract type and name
+        file =~ /(js|css)\/(.+)$/; type, name = $1, $2
 
+        # Get the modified time
         # Get the modified time of the asset
         modified = mtime("#{type}/#{name}")
 
         # Loading manifest with items
-        manifest << ::Asset::Item.new(name, type, digest(name, modified), modified)
+        manifest << ::Asset::Item.new(name, type, digest(File.read(file)), modified)
       end
 
       # Insert the css bundle
-      max = manifest.select{|r| r.type == 'css'}.map{|r| r.modified}.max
-      manifest.insert(0, ::Asset::Item.new('bundle.css', 'css', digest('bundle.css', max), max))
+      css = manifest.select{|r| r.type == 'css'}
+      # Get the max modified date and the keys
+      max, keys = css.map{|r| r.modified}.max, css.map{|r| r.key}.join
+      manifest.insert(0, ::Asset::Item.new('bundle.css', 'css', digest(keys), max))
 
       # Insert the js bundle
-      max = manifest.select{|r| r.type == 'js'}.map{|r| r.modified}.max
-      manifest.insert(0, ::Asset::Item.new('bundle.js', 'js', digest('bundle.js', max), max))
+      js = manifest.select{|r| r.type == 'js'}
+      # Get the max modified date and the keys
+      max, keys = js.map{|r| r.modified}.max, js.map{|r| r.key}.join
+      manifest.insert(0, ::Asset::Item.new('bundle.js', 'js', digest(keys), max))
 
       manifest
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: asset
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.1.6
 platform: ruby
 authors:
 - Fugroup Limited
@@ -221,5 +221,5 @@ rubyforge_project:
 rubygems_version: 2.6.8
 signing_key: 
 specification_version: 4
-summary: Compress and serve your CSS and JS automatically
+summary: Compress and serve your CSS and JS assets automatically
 test_files: []