rails_external_assets 0.3.1 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1926ed5ce1ed6267703c676d14911f30dbed3403
-  data.tar.gz: 75f38c8a4e2a76903fc251f09095755f5ca11ec2
+  metadata.gz: 75df987d26c4dedeb0a1f1ca9423f2568eace56d
+  data.tar.gz: fc0d7637e15e50864a1ee5698158fa43c3b2726d
 SHA512:
-  metadata.gz: 1f84c321887f6e668e71b4b72629998d0cc25dd9ed4e3c15d26ced35996089ae48d4f45a0b424223ad30a15c313e7680f20bedf18b4c3a896cfbce8c0298367d
-  data.tar.gz: e276e66331eb9fe248aa300d020839da3d4817c0a3b3c52a62e21235cd3720a26ba0e589e9711142aa29a4cf2bec65cfddbd2d0fec967497a58abde951a47973
+  metadata.gz: ed66d25349d5c8ebabce0bd3cda9fe08c603bc90270bbbe6ef2416a0bfbad4891a3464ab930741b67d4dcdce810095051ab218b532777757a4a419f6dd942c70
+  data.tar.gz: 5e397b9fc5e03c6d6ce7187d42cf544fe34781f7e51c4ec19924a645b55f3fed0d1a62e20bede5e78c9988a0f516e07e4858beaceaceeaf98b90c3a7b0a7da75

data/CHANGELOG.md

@@ -1,5 +1,15 @@
 # Changelog
 
+## 0.4.0 (2017-1-10)
+
+Fixed:
+
+- Sprockets methods like `asset_path` are no longer accidentally overloaded by methods in the `RailsExternalAssets::AssetFinder` module. [a426a4d](../../commit/a426a4d)
+
+Changed:
+
+- The `RailsExternalAssets::AssetFinder` is now a class instead of a module. The method names are the same as they were in the module, but they are now class methods. This won't break anything unless you were manually using the module yourself. [a426a4d](../../commit/a426a4d)
+
 ## 0.3.1 (2017-1-9)
 
 Fixed:

data/README.md

@@ -91,7 +91,7 @@ This will include the first two JS assets, `normalAsset` and `anotherAsset` from
 
 ## With Plain Ruby
 
-`RailsExternalAssets::AssetFinder` provides three methods for your disposal.
+The `RailsExternalAssets::AssetFinder` class provides three class methods for your disposal.
 
 `asset_path` takes a path to an external asset file, and returns the corresponding built asset path by looking up the key in the asset manifest JSON file.
 

data/examples/webpack/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: ../..
   specs:
-    rails_external_assets (0.3.0)
+    rails_external_assets (0.3.1)
 
 GEM
   remote: https://rubygems.org/
@@ -163,4 +163,4 @@ DEPENDENCIES
   web-console (~> 2.0)
 
 BUNDLED WITH
-   1.12.5
+   1.13.6

data/lib/rails_external_assets/asset_finder.rb

@@ -1,33 +1,35 @@
 require 'json'
 
 module RailsExternalAssets
-  module AssetFinder
-    def external_asset(path)
-      external_path = File.join(RailsExternalAssets.config.base_path, asset_path(path))
-      block_given? ? yield(external_path) : external_path
-    end
+  class AssetFinder
+    class << self
+      def external_asset(path)
+        external_path = File.join(RailsExternalAssets.config.base_path, asset_path(path))
+        block_given? ? yield(external_path) : external_path
+      end
 
-    def asset_path(path)
-      new_path = asset_manifest[path]
-      throw_unknown_path(path, RailsExternalAssets.config.manifest_file) unless new_path
-      new_path
-    end
+      def asset_path(path)
+        new_path = asset_manifest[path]
+        throw_unknown_path(path, RailsExternalAssets.config.manifest_file) unless new_path
+        new_path
+      end
 
-    def asset_manifest
-      manifest_file = RailsExternalAssets.config.manifest_file
-      throw_invalid_manifest(manifest_file) unless File.file? manifest_file
-      JSON.parse(File.read manifest_file)
-    end
+      def asset_manifest
+        manifest_file = RailsExternalAssets.config.manifest_file
+        throw_invalid_manifest(manifest_file) unless File.file? manifest_file
+        JSON.parse(File.read manifest_file)
+      end
 
 
-    private
+      private
 
-    def throw_unknown_path(path, manifest_file)
-        raise Errors::UnknownAssetManifestKey.new("No corresponding file found for \"#{path}\" in \"#{manifest_file}\".")
-    end
+      def throw_unknown_path(path, manifest_file)
+          raise Errors::UnknownAssetManifestKey.new("No corresponding file found for \"#{path}\" in \"#{manifest_file}\".")
+      end
 
-    def throw_invalid_manifest(manifest_file)
-        raise Errors::InvalidManifestFile.new("Manifest file, \"#{manifest_file}\", was not found.")
+      def throw_invalid_manifest(manifest_file)
+          raise Errors::InvalidManifestFile.new("Manifest file, \"#{manifest_file}\", was not found.")
+      end
     end
   end
 end

data/lib/rails_external_assets/rails/view_helpers.rb

@@ -1,22 +1,20 @@
 module RailsExternalAssets
   module Rails
     module ViewHelpers
-      include RailsExternalAssets::AssetFinder
-
       def external_asset_js(path)
         ext_name = File.extname(path)
         ext = ext_name.empty? ? '.js' : ''
-        external_asset("#{path}#{ext}") { |p| javascript_include_tag p }
+        RailsExternalAssets::AssetFinder.external_asset("#{path}#{ext}") { |p| javascript_include_tag p }
       end
 
       def external_asset_css(path)
         ext_name = File.extname(path)
         ext = ext_name.empty? ? '.css' : ''
-        external_asset("#{path}#{ext}") { |p| stylesheet_link_tag p }
+        RailsExternalAssets::AssetFinder.external_asset("#{path}#{ext}") { |p| stylesheet_link_tag p }
       end
 
       def external_asset_img(path)
-        external_asset(path) { |p| image_tag p }
+        RailsExternalAssets::AssetFinder.external_asset(path) { |p| image_tag p }
       end
     end
   end

data/lib/rails_external_assets/sprockets/directive_processor.rb

@@ -1,24 +1,22 @@
 module RailsExternalAssets
   module Sprockets
     class DirectiveProcessor < ::Sprockets::DirectiveProcessor
-      include RailsExternalAssets::AssetFinder
-
        def process_external_require_directive(path)
          ext_name = File.extname(path)
          ext = ext_name.empty? ? file_extension : ''
-         new_path = asset_path("#{path}#{ext}")
+         new_path = RailsExternalAssets::AssetFinder.asset_path("#{path}#{ext}")
          process_require_directive new_path
        end
 
        def process_external_require_directory_directive(path)
-         selected_paths = asset_manifest.keys
+         selected_paths = RailsExternalAssets::AssetFinder.asset_manifest.keys
           .select { |key| key.match "#{File.join(path, '[^/]+\..+')}" }
           .select { |path| File.extname(path) == file_extension }
          selected_paths.each { |path| process_external_require_directive path }
        end
 
        def process_external_require_tree_directive(path)
-         selected_paths = asset_manifest.keys
+         selected_paths = RailsExternalAssets::AssetFinder.asset_manifest.keys
           .select { |key| key.match File.join(path) }
           .select { |path| File.extname(path) == file_extension }
          selected_paths.each { |path| process_external_require_directive path }

data/lib/rails_external_assets/version.rb

@@ -1,3 +1,3 @@
 module RailsExternalAssets
-  VERSION = '0.3.1'
+  VERSION = '0.4.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rails_external_assets
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.4.0
 platform: ruby
 authors:
 - Jonathan Lehman
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-01-09 00:00:00.000000000 Z
+date: 2017-01-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler