cdn_asset_gem 1.0.10 → 1.0.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 80d38e94872ec129213f3efa13dd6f267d9828bac56263e1072773a961780068
-  data.tar.gz: 1e57df88dca6335f9991c495a19ccb85d6a5b9cfd867201611d097680a756642
+  metadata.gz: 79d17b4bbd17aac6236afe083ccb7c47fc3257343f0a29b5e354bdd52f94a42d
+  data.tar.gz: fedca6223a916eb894fd18d9a1ed4bdf35edad809bc46b099bff138ce253e21d
 SHA512:
-  metadata.gz: df112e100ee82c599b1ba0b89ec9a641cdd2880ec48c94ce52320102ae00209e9c9e927a067fd370a2800f3ee60d8f1717355a13515a8c9e04cb86016b2a2f83
-  data.tar.gz: 0d2dc015025474fad3fc724f49ff93c16f8b103874944a05ad9fefa5117179b982997fd4891eb1667944ed82fdf9147b9daa2697e24d4c21e8049cef30e3afda
+  metadata.gz: a28cd6084249a032f061de254462f21c1e219dea0d18b29b2dd4bf77efc15ca564d8e31615263d60a4d685fda67420b9e013f7754b17919dbe5560673b8e4acf
+  data.tar.gz: dba0e6a4f7240043302bc3415a1611d008586bfbbaee54560a5a305dba9462672167c786f74e87f8019decdedd778879f3b3ca5af6c03b66e1c8521c9fdd1905

data/lib/cdn_asset_gem/view/helpers.rb

@@ -3,29 +3,30 @@ module CdnAssetGem
     module Helpers
       def map_asset(root_path: '', asset_name:, file_type:)
         file = "#{file_type}/#{asset_name}.min.#{file_type}"
-        if manifest_hash(root_path)[file]
-          "#{ENV['CDN_URL']}#{root_path}/assets/#{manifest_hash(root_path)[file]}"
+        assets_path = if root_path.blank? || root_path == '/'
+                        '/assets'
+                      else
+                        "#{root_path}/assets"
+                      end
+        manifest_hash = Rails.cache.fetch("cdn-asset-#{root_path}-#{asset_name}", expires_in: 5.minutes) do
+          uri = URI("#{ENV['CDN_URL']}#{assets_path}/rev-manifest.json")
+          response = HTTP.get(uri)
+          Rails.logger.info "CdnAssetGem INFO: uri: #{uri}"
+          Rails.logger.info "CdnAssetGem INFO: response #{response}"
+          if response.code == '200'
+            JSON.parse(response)
+          else
+            JSON.parse({})
+          end
+        end
+        if manifest_hash[file]
+          "#{ENV['CDN_URL']}#{assets_path}/#{manifest_hash(root_path)[file]}"
         else
-          "#{ENV['CDN_URL']}#{root_path}/assets/#{file}"
+          "#{ENV['CDN_URL']}#{assets_path}/#{file}"
         end
       resuce StandardError => e
         Rails.logger.error "CdnAssetGem Error: #{e}"
-        "#{ENV['CDN_URL']}#{root_path}/assets/#{file}"
-      end
-
-      def manifest_hash(root_path)
-        if root_path.blank? || root_path == '/'
-          assets_path = '/assets'
-        else
-          assets_path = "#{root_path}/assets"
-        end
-
-        Rails.cache.fetch("cdn-asset-#{root_path}", expires_in: 5.minutes) do
-          uri = URI("#{ENV['CDN_URL']}#{assets_path}/rev-manifest.json")
-          response = HTTP.get(uri)
-          Rails.logger.info "CdnAssetGem INFO: #{response}"
-          JSON.parse(response) if response.code == '200'
-        end
+        "#{ENV['CDN_URL']}#{assets_path}/#{file}"
       end
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cdn_asset_gem
 version: !ruby/object:Gem::Version
-  version: 1.0.10
+  version: 1.0.11
 platform: ruby
 authors:
 - Phil Baker