asset 0.1.10 → 0.1.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6867cd26673824ea72eeb8dd0e1cd71fb23fb380
-  data.tar.gz: 9f38ee1241bf966194b86bc7f6949bfe8878584d
+  metadata.gz: 90fde4e9a5059373b6ef73bda578b175b836926f
+  data.tar.gz: 84e13b7340c9056da1b4751009ae0d2af6c42be8
 SHA512:
-  metadata.gz: 7918c2dae433d1f4ac2fc6dc938d65d5afff0546c1346af8f49bc0ce091a5696e200bf04e4094bb05864550ae3f83699e162869e6f17b9a334a39799cd1769a0
-  data.tar.gz: 3941bea2e41d71310309f9ca9379328ba6ca72abd528752872f77b793f97efb5d235c58567aef44e6d6320056d7b019b03329ccc643929448d3d707b723b80e3
+  metadata.gz: e2129596f7a05b2f64f047b37e329da0924fcc4ceb629bf49bc43de4a4bb7e5b98ff6f5a43a68aff5fc0d30d855ab24891edd248ed06aa44f31e180d78e2e24f
+  data.tar.gz: 25b0ed903309dc2da7c5a16ae40facbdf8fd532f81adc4de29de49cf8ce3e076f2755da85607d9e99eb038a3888e3bc2ebafd1e6a820d07be34984c58d8461f1

data/CHANGELOG.md

@@ -1,6 +1,10 @@
+**Version 0.1.11** - *2017-01-25*
+
+- Assets and images now follow symlinks
+
 **Version 0.1.10** - *2017-01-22*
 
-- Included rubyracer as dependency, fixed Uglifier not working
+- Included rubyracer as dependency, fixed Uglifier now working
 - Refactored router, now 404 only if item not found
 
 **Version 0.1.9** - *2017-01-19*

data/asset.gemspec

@@ -1,7 +1,7 @@
 Gem::Specification.new do |s|
   s.name        = 'asset'
-  s.version     = '0.1.10'
-  s.date        = '2017-01-22'
+  s.version     = '0.1.11'
+  s.date        = '2017-01-25'
   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"]

data/lib/assets/router.rb

@@ -24,9 +24,8 @@ module Asset
         # Extract type and path
         type, path = $2, $3
 
-        # Extract digest key if any
-        path =~ /-([a-f0-9]{32})\.(css|js)$/
-        path.gsub!("-#{@key}", '') if (@key = $1)
+        # Extract digest key and remove from path
+        path.gsub!("-#{@key = $1}", '') if path =~ /-([a-f0-9]{32})\.(css|js)$/
 
         # Find the item
         item = ::Asset.manifest.find{|i| i.path == path and i.type == type}

data/lib/assets/util.rb

@@ -6,6 +6,9 @@ module Asset
       # Load the manifest
       ::Asset.manifest = load_manifest
 
+      # Insert bundles
+      %w[css js].each{|type| load_bundle(type)}
+
       # Load the bundle
       ::Asset.bundle = YAML.load_file(File.join(::Asset.path, 'manifest.yml'))
 
@@ -31,11 +34,11 @@ module Asset
     # Load manifest
     def self.load_manifest
       manifest = []
-      list = Dir["#{Asset.path}/{css,js}/**/*"].select{|f| File.file?(f)}.each do |file|
+
+      Dir["#{Asset.path}/{css,js}/**{,/*/**}/*.{css,js}"].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}")
 
@@ -43,25 +46,25 @@ module Asset
         manifest << ::Asset::Item.new(name, type, digest(File.read(file)), modified)
       end
 
-      # Insert the css bundle
-      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))
+      manifest
+    end
+
+    # Load bundles for js and css
+    def self.load_bundle(type)
+      # Insert the bundle
+      a = ::Asset.manifest.select{|r| r.type == type}
 
-      # Insert the js bundle
-      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))
+      max, keys = a.map{|r| r.modified}.max, a.map{|r| r.key}.join
 
-      manifest
+      # Insert the bundle into the manifest
+      ::Asset.manifest.insert(0, ::Asset::Item.new("bundle.#{type}", type, digest(keys), max))
     end
 
     # Load images into memory
     def self.load_images
       # Store the path and the timestamp
-      images = Dir["#{::Asset.path}/images/**/*"].select{|f| File.file?(f)}.map do |i|
+      images = Dir["#{::Asset.path}/images/**{,/*/**}/*.*"].map do |i|
         i =~ /\/images\/(.+)/; [$1, mtime("images/#{$1}").to_i]
       end
       Hash[*images.flatten]

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: asset
 version: !ruby/object:Gem::Version
-  version: 0.1.10
+  version: 0.1.11
 platform: ruby
 authors:
 - Fugroup Limited
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-01-22 00:00:00.000000000 Z
+date: 2017-01-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack