bankrupt 2.1.1 → 2.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1409314669d3b6ac7f02a307d69bebaa0f179ba5d6a6990ceec82f3335cdba7e
-  data.tar.gz: 38847aa1a145f910d54761a799bdb22a8472a2608848909e8bcc4843db8c8387
+  metadata.gz: 4a9d75977ce24ba0712d558d3ab5003c1877e5f2099af75911788f3f0ef7fd53
+  data.tar.gz: 7996990b475cc9cca5df4aade17e7a2815bab0ab85edb6d76fd3083f4cfef4d3
 SHA512:
-  metadata.gz: 511f7aa62155396cb3aeba42c919ab07dd1bff771c26acc0de87d088cb19c7bb89119f08a42c3b073055a36656585795ba7a0c6ec41b8fa99ce0edd17db7b0d7
-  data.tar.gz: 2cf717e16d200124b1f5957cfd27a8ff144dacde64fe4c8f6a775b44b19cf426fc312ba680fef4c3e9ed1f181367b637bb5b043ecf7b867445904bbcf0fb4793
+  metadata.gz: 15dd67b22ac708a464dfce8b95214661bb1fc90dc10e7ad4199aa685582cd9a5acf48f19ff8459494e19cdc7f3ec79b7de00bb3a3c346ba509e753e19a4ffcd6
+  data.tar.gz: 2af9d31bfcc234aa2e845b0a34b9fc718f71f86af0361356c0e088a0410f58136952dc7d18ac8ab2e34336b9e82cbc8ea3654d6b1b929ce462571a37fbc755e4

data/.rubocop.yml

@@ -7,13 +7,16 @@ AllCops:
 Layout/ExtraSpacing:
   AllowForAlignment: false
 
+Metrics/AbcSize:
+  Max: 20
+
 Metrics/BlockLength:
   Max: 100
   Exclude:
     - 'spec/**/*_spec.rb'
 
 Metrics/MethodLength:
-  Max: 15
+  Max: 20
 
 RSpec/DescribeClass:
   Exclude:

data/CHANGELOG.md

@@ -3,6 +3,10 @@
 This file keeps track of changes between releases for the bankrupt project
 which adheres to [semantic versioning](https://semver.org).
 
+## v2.1.2 2020-01-20
+
+Take options into account to ensure unique asset lookups.
+
 ## v2.1.1 2020-01-09
 
 Ensure that the `purge` task works with hashless assets.

data/README.md

@@ -170,3 +170,5 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 See the License for the specific language governing permissions and
 limitations under the License.
 ```
+
+TODO: tests to ensure the lookups are separate

data/lib/bankrupt.rb

@@ -49,9 +49,6 @@ module Bankrupt
   #
   # @todo we compute the options on every call, we should do the
   #        lookup first and short circuit
-  # @todo lookup needs to be based on path _and_ options so that the
-  #        same asset can be used in multiple places with e.g. different
-  #        css classes applied
   #
   # @param path [String] relative (from public) path to the img
   # @param options [Hash] additional attributes to add to the img tag
@@ -60,7 +57,7 @@ module Bankrupt
     o = Hash(options).map { |k, v| "#{k}='#{v}'" }.join(' ')
 
     asset_html(path, [IMAGE_CDN.chomp, o].join(' '),
-               [IMAGE_LOCAL.chomp, o].join(' '))
+               [IMAGE_LOCAL.chomp, o].join(' '), options)
   end
 
   # Return a javascript html tag for the asset.
@@ -95,9 +92,14 @@ module Bankrupt
   # Return a precomputed asset path if it exists
   #
   # @param path [String] asset on which to perform the lookup
+  # @params options [String] the options string to use in the lookup
   # @return [String] the rendered slim template with the asset in place
-  def lookup(path)
-    @_assets.fetch(path)
+  def lookup(path, options = nil)
+    if actual_options?(options)
+      @_assets.fetch([path, options].join('?'))
+    else
+      @_assets.fetch(path)
+    end
   rescue KeyError
     nil
   end
@@ -133,24 +135,56 @@ module Bankrupt
   # @param path [String] relative path to the asset
   # @param cdn [String] a slim template for generating a cdn asset
   # @param local [String] a slim template for generating a local asset
+  # @param options [String] options as a string to make unique lookups
   # @return [String] the asset html
-  def asset_html(path, cdn, local)
-    if (asset = lookup("/#{path}"))
+  def asset_html(path, cdn, local, options = nil)
+    opts = options_string(options)
+
+    if (asset = lookup("/#{path}", opts))
       return asset
     end
 
+    lookup_path = "/#{actual_options?(opts) ? [path, opts].join('?') : path}"
+
     begin
       details = ASSETS.fetch(path)
 
       fullpath = create_fullpath(path, details[:md5], details[:hashless])
 
-      @_assets["/#{path}"] = Slim::Template.new { cdn }.render(
+      @_assets[lookup_path] = Slim::Template.new { cdn }.render(
         ASSET.new(fullpath, details[:sri])
       )
     rescue KeyError
-      @_assets["/#{path}"] = Slim::Template.new { local }.render(
+      @_assets[lookup_path] = Slim::Template.new { local }.render(
         ASSET.new("/#{path}", nil)
       )
     end
   end
+
+  # Turn the options hash into a concatenated string for use in the lookup.
+  #
+  # @param options [Hash] the options has to convert
+  # @return [String] concatenated options suitable for use in lookups
+  def options_string(options)
+    return nil if Hash(options).size.zero?
+
+    options.map do |k, v|
+      [k.to_s, v.to_s].join
+    end.join.gsub(/[^A-Za-z0-9\-_]/, '')
+  end
+
+  # Determine if we actually have options regardless if input is a string,
+  # hash, or nil.
+  #
+  # @param options [String, Hash] options to check
+  # @return [Boolean] true if there are options, false otherwise
+  def actual_options?(options)
+    return false if options.nil?
+
+    if (options.is_a?(String) || options.is_a?(Hash)) && !options.size.zero?
+      true
+    else
+      false
+    end
+  end
 end

data/lib/bankrupt/version.rb

@@ -15,5 +15,5 @@
 # limitations under the License.
 
 module Bankrupt
-  VERSION = '2.1.1'
+  VERSION = '2.1.2'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bankrupt
 version: !ruby/object:Gem::Version
-  version: 2.1.1
+  version: 2.1.2
 platform: ruby
 authors:
 - Mario Finelli
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-01-09 00:00:00.000000000 Z
+date: 2020-01-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: slim