asset 0.1.4 → 0.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f6278ea671a78e4cf156bb1dad148e268d11dcb9
-  data.tar.gz: b445698bdb23def5a03fa76c2ac1fbff5a673f12
+  metadata.gz: 79324a6a074bc04bca16da39d57e2f4dc0c152b5
+  data.tar.gz: 17ba912dfa3881fb46828ba8743e5f3763611311
 SHA512:
-  metadata.gz: b02ccb480ae994e3570013dd78ed99f4347686bdd6dd919ad1f7f213a9368be23713680c9820cebf19501bb7fa144ba06b705a31eaadff90d7e86cc799727ed1
-  data.tar.gz: 0d2d320cad89f38253d244d7489be2acf39f1ab61878c3648d44809408f99bfc27ceb66d0067cab2ac6e5ad2fbfdc0ffd25f9a7c9469469919834fbcaaba4aa8
+  metadata.gz: 04e03ba158217c029ba9cde16659b6f1b77dc1237a281365c91b181348c0f580afa7abd2a6dff05ab2cd22c0dd73c6c961cdaa5ab81829c97179fb970a42abf5
+  data.tar.gz: bc060a99a62b72841ace1024d22f4fa965d2497fa4c34219ef872ccd1bf9e300353afb63d8a614eb02b6fa9b5e975048476f29bc4a03944d75bbc839b76fbb83

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+**Version 0.1.5** - *2017-01-18*
+
+- Correct load order for bundle
+
 **Version 0.1.4** - *2017-01-18*
 
 - Moved images to /images instead of /assets/images

data/asset.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name        = 'asset'
-  s.version     = '0.1.4'
+  s.version     = '0.1.5'
   s.date        = '2017-01-18'
   s.summary     = "Compress and serve your CSS and JS automatically"
   s.description = "The only thing you need for your assets."

data/lib/assets/item.rb

@@ -13,7 +13,7 @@ module Asset
 
     # Get the files for this item
     def files(bundle = true)
-      (@app and bundle) ? bundle_files : [@path]
+      (@app and bundle) ? ::Asset.bundle[@type] : [@path]
     end
 
     # Get the sources for this item
@@ -26,11 +26,6 @@ module Asset
       File.join('/assets', @type, (p? ? @kpath : @path))
     end
 
-    # Get the files for the bundle
-    def bundle_files
-      @bundle_files ||= ::Asset.manifest.select{|i| ::Asset.bundle[type].include?(i.path) and i.type == @type and !i.app}.map{|i| i.path}
-    end
-
     # Get the content. Pass cache = false to fetch from disk instead of the cache.
     def content(key = nil)
       !key ? (@joined ||= joined) : (@cached ||= cached)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: asset
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.5
 platform: ruby
 authors:
 - Fugroup Limited