inline_svg 1.2.0 → 1.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9af50a1ce42f8f67f9df531b740b4d0f8adedc2b
-  data.tar.gz: 4c4399fffe814ff7587851cefd33deb3cb1910ce
+  metadata.gz: d0744ec1e4d10792a793f1214439367b2d94fd3b
+  data.tar.gz: 23dd2ee7f07558d6c2e27d97da29815bbbdc94d5
 SHA512:
-  metadata.gz: d0facb0d977943f429edd52e7ac6307b3c092dd53a16bd694214048157a3b128cbdd6eb8c168f9a71889837a4427e30b1e97ffffd4b55fd353c87e6aae798fca
-  data.tar.gz: 1e3e2fe9c6f563bd654fbbba92a216eef5efa340f2d755807ad2934d4b1bccf1bb70877f8ee74e2e1c5192aa8edef894f175f19890c76e6882eeec9e25deab48
+  metadata.gz: 85ae8c8c0288d74353a1c6636ab731f0af647204e4c8b59460c9a76f60c872c353a3f7c25a2e6d99e44bf74b9bcb6e87e7e7df7f2c7cec086e88ca6e10e82fa5
+  data.tar.gz: a4a4059fedc579a1321471e249e290d078626a96d4a268e78911db79c496d3e39ed7bf271c04833654bd5a3ea5c3cc4f0e66f0e32a0040fc8448ba9d97dca127

data/CHANGELOG.md

@@ -5,6 +5,11 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 ## [Unreleased][unreleased]
 - Nothing
 
+## [1.2.1] - 2017-05-02
+### Fixed
+- Select most exactly matching cached asset file when multiple files match
+  given asset name [#64](https://github.com/jamesmartin/inline_svg/pull/64)
+
 ## [1.2.0] - 2017-04-20
 ### Added
 - Cached asset file (load assets into memory at boot time)
@@ -154,7 +159,8 @@ transformations](https://github.com/jamesmartin/inline_svg/blob/master/README.md
 ### Added
 - Basic Railtie and view helper to inline SVG documents to Rails views.
 
-[unreleased]: https://github.com/jamesmartin/inline_svg/compare/v1.2.0...HEAD
+[unreleased]: https://github.com/jamesmartin/inline_svg/compare/v1.2.1...HEAD
+[1.2.1]: https://github.com/jamesmartin/inline_svg/compare/v1.2.0...v1.2.1
 [1.2.0]: https://github.com/jamesmartin/inline_svg/compare/v1.1.0...v1.2.0
 [1.1.0]: https://github.com/jamesmartin/inline_svg/compare/v1.0.1...v1.1.0
 [1.0.1]: https://github.com/jamesmartin/inline_svg/compare/v1.0.0...v1.0.1

data/lib/inline_svg/cached_asset_file.rb

@@ -31,11 +31,25 @@ module InlineSvg
     end
 
     private
-    # Internal: Finds the key for a given asset name (using a Regex).
+    # Internal: Finds the key for a given asset name (using a Regex). In the
+    # event of an ambiguous asset_name matching multiple assets, this method
+    # ranks the matches by their full file path, choosing the shortest (most
+    # exact) match over all others.
     #
-    # Returns a String representing the key for the named asset.
+    # Returns a String representing the key for the named asset or nil if there
+    # is no match.
     def key_for_asset(asset_name)
-      assets.keys.map { |k| k.to_s }.select { |k| /#{asset_name}/.match(k) }.first
+      match = all_keys_matching(asset_name).sort do |a, b|
+        a.string.size <=> b.string.size
+      end.first
+      match && match.string
+    end
+
+    # Internal: Find all potential asset keys matching the given asset name.
+    #
+    # Returns an array of MatchData objects for keys matching the asset name.
+    def all_keys_matching(asset_name)
+      assets.keys.map { |k| /(#{asset_name})/.match(k.to_s) }.compact
     end
 
     # Internal: Recursively descends through current_paths reading each file it

data/lib/inline_svg/version.rb

@@ -1,3 +1,3 @@
 module InlineSvg
-  VERSION = "1.2.0"
+  VERSION = "1.2.1"
 end

data/spec/cached_asset_file_spec.rb

@@ -34,6 +34,18 @@ describe InlineSvg::CachedAssetFile do
     expect(known_document_1).to eq(asset_loader.named("assets1/known-document.svg"))
   end
 
+  it "chooses the closest exact matching file when similar files exist in the same path" do
+    known_document = File.read(fixture_path.join("assets0", "known-document.svg"))
+    known_document_2 = File.read(fixture_path.join("assets0", "known-document-two.svg"))
+
+    expect(known_document).not_to eq(known_document_2)
+
+    asset_loader = InlineSvg::CachedAssetFile.new(paths: fixture_path.join("assets0"), filters: /\.svg/)
+
+    expect(asset_loader.named("known-document")).to eq(known_document)
+    expect(asset_loader.named("known-document-two")).to eq(known_document_2)
+  end
+
   it "filters wanted files by simple string matching" do
     known_document_0 = File.read(fixture_path.join("assets0", "known-document.svg"))
     known_document_1 = File.read(fixture_path.join("assets1", "known-document.svg"))

data/spec/files/static_assets/assets0/known-document-two.svg

@@ -0,0 +1 @@
+<svg>other interesting content</svg>

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: inline_svg
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.2.1
 platform: ruby
 authors:
 - James Martin
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-04-20 00:00:00.000000000 Z
+date: 2017-05-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -150,6 +150,7 @@ files:
 - spec/asset_file_spec.rb
 - spec/cached_asset_file_spec.rb
 - spec/files/example.svg
+- spec/files/static_assets/assets0/known-document-two.svg
 - spec/files/static_assets/assets0/known-document.svg
 - spec/files/static_assets/assets0/some-document.svg
 - spec/files/static_assets/assets1/known-document.svg
@@ -199,6 +200,7 @@ test_files:
 - spec/asset_file_spec.rb
 - spec/cached_asset_file_spec.rb
 - spec/files/example.svg
+- spec/files/static_assets/assets0/known-document-two.svg
 - spec/files/static_assets/assets0/known-document.svg
 - spec/files/static_assets/assets0/some-document.svg
 - spec/files/static_assets/assets1/known-document.svg