inline_svg 1.6.0 → 1.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5141ac43ede6f67761b367d5697e8b007719bb445831bea6b689e712bf50414c
-  data.tar.gz: 6694ac5aa490995a47138013b550a28e738ae5d9f5fb0df72bdef476d802e0b0
+  metadata.gz: 1ebc9f8de24984925fe3457d98efeb29198bbda5551f83b5c2afad97bf61fa8c
+  data.tar.gz: 0ab9a31d27a0a97e4aafb1691af4e9e8c0f03074637237819ba611c73d24b82f
 SHA512:
-  metadata.gz: 0310736a1123e9e5d42da01cc1dc4b966f369cd9c6931610623eb57921ce2b82119334224b6e953a130e374e3bd6cc47014fefbd4c1fb30ff1d87a09bf91b903
-  data.tar.gz: 95cbe5a123f9fa66bf2ea7510efccd017abf7e6269543dd8e22fd6b3bb0d7d165d7b37cd1a4ac891dc1412c811982b30037751c65be84ab3bfddf15d9c4f67d8
+  metadata.gz: e909570434548e33cfc76627819b636b0f28e24b485165b44a467dd7e49c191ccccb082240bd5fec0ae7bd2cfc2686011b56dc3b96ed938530353c6196e8dce8
+  data.tar.gz: d509b78518354a7b1e40cf481cc4cc4b7ea350d006b5268d2106b9700e2ad2eea7e4431ee674b9e7276a1c11ae61f4903cc9e101ffe40e9a902f870d9429c36b

data/CHANGELOG.md

@@ -3,8 +3,19 @@ All notable changes to this project will be documented in this file.
 This project adheres to [Semantic Versioning](http://semver.org/).
 
 ## [Unreleased][unreleased]
+
 - Nothing
 
+## [1.7.0] - 2020-02-13
+### Added
+- WebpackAssetFinder serves files from dev server if one is running. [#111](https://github.com/jamesmartin/inline_svg/pull/111). Thanks, [@connorshea](https://github.com/connorshea)
+
+### Fixed
+- Using Webpacker and Asset Pipeline in a single App could result in SVGs not
+  being found because the wrong `AssetFinder` was used.
+  [#114](https://github.com/jamesmartin/inline_svg/pull/114). Thanks,
+  [@kylefox](https://github.com/kylefox)
+
 ## [1.6.0] - 2019-11-13
 ### Added
 - Support Webpack via the new `inline_svg_pack_tag` helper and deprecate `inline_svg` helper in preparation for v2.0.
@@ -220,7 +231,9 @@ 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.5.2...HEAD
+[unreleased]: https://github.com/jamesmartin/inline_svg/compare/v1.7.0...HEAD
+[1.7.0]: https://github.com/jamesmartin/inline_svg/compare/v1.6.0...v1.7.0
+[1.6.0]: https://github.com/jamesmartin/inline_svg/compare/v1.5.2...v1.6.0
 [1.5.2]: https://github.com/jamesmartin/inline_svg/compare/v1.5.1...v1.5.2
 [1.5.1]: https://github.com/jamesmartin/inline_svg/compare/v1.5.0...v1.5.1
 [1.5.0]: https://github.com/jamesmartin/inline_svg/compare/v1.4.0...v1.5.0

data/lib/inline_svg/action_view/helpers.rb

@@ -69,11 +69,9 @@ module InlineSvg
       end
 
       def with_asset_finder(asset_finder)
-        initial_asset_finder = InlineSvg.configuration.asset_finder
-
-        InlineSvg.configuration.asset_finder = asset_finder
+        Thread.current[:inline_svg_asset_finder] = asset_finder
         output = yield
-        InlineSvg.configuration.asset_finder = initial_asset_finder
+        Thread.current[:inline_svg_asset_finder] = nil
 
         output
       end

data/lib/inline_svg/finds_asset_paths.rb

@@ -6,7 +6,7 @@ module InlineSvg
     end
 
     def self.configured_asset_finder
-      InlineSvg.configuration.asset_finder
+      Thread.current[:inline_svg_asset_finder] || InlineSvg.configuration.asset_finder
     end
   end
 end

data/lib/inline_svg/version.rb

@@ -1,3 +1,3 @@
 module InlineSvg
-  VERSION = "1.6.0"
+  VERSION = "1.7.0"
 end

data/lib/inline_svg/webpack_asset_finder.rb

@@ -9,11 +9,29 @@ module InlineSvg
     end
 
     def pathname
-      public_path = Webpacker.config.public_path
       file_path = Webpacker.instance.manifest.lookup(@filename)
-      return unless public_path && file_path
+      return unless file_path
 
-      File.join(public_path, file_path)
+      if Webpacker.dev_server.running?
+        asset = Net::HTTP.get(Webpacker.dev_server.host, file_path, Webpacker.dev_server.port)
+
+        begin
+          Tempfile.new(file_path).tap do |file|
+            file.binmode
+            file.write(asset)
+            file.rewind
+          end
+        rescue StandardError => e
+          Rails.logger.error "Error creating tempfile: #{e}"
+          raise
+        end
+
+      else
+        public_path = Webpacker.config.public_path
+        return unless public_path
+
+        File.join(public_path, file_path)
+      end
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: inline_svg
 version: !ruby/object:Gem::Version
-  version: 1.6.0
+  version: 1.7.0
 platform: ruby
 authors:
 - James Martin
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-11-13 00:00:00.000000000 Z
+date: 2020-02-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler