asset 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 45bfd8e5aba5d8941fc5dad1e7b6cfb13618f51e
-  data.tar.gz: fa9dfa2916357553683779b8988d60604fbd8a90
+  metadata.gz: 4e2cdcf6a4a6b0f479b75196656f1dee83cbdc03
+  data.tar.gz: caac933ea274c7b56d577326feeafe7e7a97ecc3
 SHA512:
-  metadata.gz: b3f53b15353d381dde1a06e2a798bcfcbab10bb3e5089d8bb3a216dcbb5d252830fe3a52d3e450374cd2dd0af7eec2a80563465a8e1d89eb8e24b9ea5ef97106
-  data.tar.gz: 6a6eec4c65c51c5b8bfc3803aecb63dbd743a94e892e113ff28799ebfd2cbd5784fb3e4b117d5bac88e0ca54886147149dfe5d1cf5716983330ba2a76f8e46ff
+  metadata.gz: 48635c80768eab2b81e8aef4bd299025d5d3feae593043363f23a7e1cc1acb441303f23a3ee3d4b8a70ebb554bbc521954a3c4b2b64db46cf2eddfdbd8bfec13
+  data.tar.gz: bad81f56d84f5f77fe103591be8721a0d66bbaceccd7aa45e107aa62142c2a57654a350158d4dbcf5bc2df960864c67d785825747baa74079ed4971dbfe35e06

data/CHANGELOG.md

@@ -1,3 +1,11 @@
+**Version 0.1.3** - *2017-01-18*
+
+- Added more greedy regex for files with dashes
+
+**Version 0.1.2** - *2017-01-18*
+
+- Removed old options, manifest is now only for bundle
+
 **Version 0.1.1** - *2017-01-16*
 
 - Moved image timestamps to startup

data/asset.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name        = 'asset'
-  s.version     = '0.1.2'
+  s.version     = '0.1.3'
   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/helpers.rb

@@ -25,7 +25,7 @@ module Asset
       b = ::Asset.images[path] rescue nil
       # Just slip through if the path starts with http(s) or //
       src = path =~ /^(http[s]?)?:?\/\// ? path : %{/assets/images/#{path}}
-      %{<img src="#{src}#{b ? "?#{b}" : ''}">} rescue path
+      %{<img src="#{src}#{b ? "?#{b}" : ''}">}
     end
 
     private
@@ -37,7 +37,7 @@ module Asset
         item = ::Asset.manifest.find{|i| i.path == path}
 
         # Src is same as path if item not found
-        item ? item.files.map{|f| yield(asset_url(f))} : yield(path)
+        item ? item.sources.map{|f| yield(asset_url(f))} : yield(path)
       end.flatten.join("\n")
     end
 

data/lib/assets/item.rb

@@ -12,8 +12,13 @@ module Asset
     end
 
     # Get the files for this item
-    def files
-      (@app and !p?) ? bundle_files : [@path]
+    def files(bundle = true)
+      (@app and bundle) ? bundle_files : [@path]
+    end
+
+    # Get the sources for this item
+    def sources
+      files(!p?)
     end
 
     # Get the full path

data/lib/assets/router.rb

@@ -20,7 +20,7 @@ module Asset
       # Match /assets?/:type/path
       when /^(\/assets)?\/(js|css)\/(.+)/
         type, path = $2, $3
-        path =~ /-([a-f0-9]{1,32})/
+        path =~ /-([a-f0-9]{1,32})\.(css|js)$/
         path.gsub!("-#{@key}", '') if (@key = $1)
 
         # Find the item

metadata

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