external_asset_pipeline 0.3.0 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 547629ac518b2b784df463acc7a930892f395d3d6537e1491a11b149fb12efb7
-  data.tar.gz: aa861afcb41156923afa22e359d024f08b264fd8ff30280381f7aeefdfff3f70
+  metadata.gz: 277f7dca5593faff66735a6fa238128fc8a810d0d59e31afa461d9bbde910372
+  data.tar.gz: 0f2e02b7e3dc90821642e4315045394943b01594667e63f6d15cb60e94b657bd
 SHA512:
-  metadata.gz: ae6bc9ebe73f48d7edb7eab1dc7e07f2318552336a34d9a26bf376f5cdf540da733d94b847d314879e322e0d4f45ed0cf34d30698460cd2dff56b2d92c38657c
-  data.tar.gz: 1c9a91b49c48a3d00ac615a81459cdcbdc9dfaf3bedfb5417a298c37df6730a563096c9a24451c8c06e8c1eec3ece10ccf9ccacee62f7a3ff23e6ac86381c61c
+  metadata.gz: 68daf25b4678a9aa512ef5ba00a506ebca6205cf6ac8778ee507bf3d601a9b01992475755c512d31d4fe5a1877f407f6a4aaf2c994637d138b66fb8ef541df68
+  data.tar.gz: 4d1fbf67ea7d1d4ea56c3102f52b65239faa305f7568087d779515eb59cb7ea6e7fc250956cd0f359619fa426c3d32e5578ddce64a426406209201f047fe4d47

data/lib/external_asset_pipeline/configuration.rb

@@ -10,6 +10,7 @@ module ExternalAssetPipeline
                   :fall_back_to_sprockets,
                   :logger,
                   :manifest_filename,
+                  :prepend_assets_prefix_to_manifest_values,
                   :public_path
 
     alias cache_manifest? cache_manifest
@@ -34,6 +35,11 @@ module ExternalAssetPipeline
       @fall_back_to_sprockets = false
       @logger = Logger.new(STDOUT)
       @manifest_filename = 'manifest.json'
+      @prepend_assets_prefix_to_manifest_values = true
+    end
+
+    def manifest_value_prefix
+      @prepend_assets_prefix_to_manifest_values ? "#{@assets_prefix}/" : ''
     end
 
     def configure

data/lib/external_asset_pipeline/manifest.rb

@@ -10,7 +10,7 @@ module ExternalAssetPipeline
 
     def find(name)
       value = data[name.to_s]
-      { path: "#{@config.assets_prefix}/#{value}" } if value
+      { path: "#{@config.manifest_value_prefix}#{value}" } if value
     end
 
     def fall_back_to_sprockets?

data/lib/external_asset_pipeline/server_manifest.rb

@@ -18,10 +18,6 @@ module ExternalAssetPipeline
 
     private
 
-    def data
-      load
-    end
-
     def load
       if @server.running?
         manifest_path = "#{@config.assets_prefix}/#{@config.manifest_filename}"

data/lib/external_asset_pipeline/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module ExternalAssetPipeline
-  VERSION = '0.3.0'
+  VERSION = '0.4.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: external_asset_pipeline
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors:
 - Richard Macklin
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-05-19 00:00:00.000000000 Z
+date: 2019-09-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: railties
@@ -47,7 +47,6 @@ files:
 - lib/external_asset_pipeline/dev_server.rb
 - lib/external_asset_pipeline/helper.rb
 - lib/external_asset_pipeline/manifest.rb
-- lib/external_asset_pipeline/origin.rb
 - lib/external_asset_pipeline/priority_manifest.rb
 - lib/external_asset_pipeline/railtie.rb
 - lib/external_asset_pipeline/server_manifest.rb
@@ -57,8 +56,8 @@ licenses:
 - MIT
 metadata:
   homepage_uri: https://github.com/rails-front-end/external_asset_pipeline
-  source_code_uri: https://github.com/rails-front-end/external_asset_pipeline/tree/v0.3.0
-  changelog_uri: https://github.com/rails-front-end/external_asset_pipeline/blob/v0.3.0/CHANGELOG.md
+  source_code_uri: https://github.com/rails-front-end/external_asset_pipeline/tree/v0.4.0
+  changelog_uri: https://github.com/rails-front-end/external_asset_pipeline/blob/v0.4.0/CHANGELOG.md
 post_install_message: 
 rdoc_options: []
 require_paths:

data/lib/external_asset_pipeline/origin.rb

@@ -1,62 +0,0 @@
-# frozen_string_literal: true
-
-require 'json'
-
-# rubocop:disable all
-module ExternalAssetPipeline
-  class Origin
-    def initialize(server:, fallback:)
-      @server = server
-      @fallback = fallback
-    end
-
-    # USE THIS VERSION IF IT WORKS!
-    # Run some tests in the demo app with different asset_host procs
-    # _Might_ need to define this proc inside a module that includes
-    # ActionView::Helpers::AssetUrlHelper in order for
-    # compute_asset_host to be available - not sure.
-    def call(source, request = nil)
-      if @server.running?
-        @server.origin
-      else
-        ComputeAssetHostProxy.new(request).call(source, host: @fallback)
-      end
-    end
-
-    class ComputeAssetHostProxy
-      include ActionView::Helpers::AssetUrlHelper
-
-      attr_reader :request
-
-      def initialize(request:)
-        @request = request
-      end
-
-      def call(source, host:)
-        compute_asset_host(source, host: host)
-      end
-    end
-
-    def ugly_call(source, request)
-      # Ugh, this is so ugly
-      # the logic in the elsif branch is copied from
-      # https://github.com/rails/rails/blob/b13a5cb83ea00d6a3d71320fd276ca21049c2544/actionview/lib/action_view/helpers/asset_url_helper.rb#L280-L284
-      if server.running?
-        server.origin
-      elsif fallback.respond_to?(:call)
-        arity =
-          if fallback.respond_to?(:arity)
-            host.arity
-          else
-            host.method(:call).arity
-          end
-        args = [source]
-        args << request if request && (arity > 1 || arity < 0)
-        fallback.call(*args)
-      else
-        fallback
-      end
-    end
-  end
-end
-# rubocop:enable all