shimmer 0.0.15 → 0.0.18

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 789f3862287d4a4e4ea0ea64429d5855d147853d25a85f896acde0f4a456f805
-  data.tar.gz: 5fe592396ee46ae62468f4436835b1a3718fedfe60823287388bbe28cbb51f92
+  metadata.gz: de8e99f1e252a60ee4c57442fe9fe67ba7af78e626b55d7c1756eedf3a83e404
+  data.tar.gz: d28eeba9b1cdf8d9c1fc46151a334dc0993cacfbafe91223f14647e988a3ba23
 SHA512:
-  metadata.gz: 3ca1e5c4a38b5b36da2b9cc20bae29c2a20df60550f8e9904db8de6cca92aea4c02f62cdb57d1c72cbfb0b4d660b2714ac3051e6c9eb8996914d954ba5ec14a4
-  data.tar.gz: 50d5ffc3cac315ad169da4da82c621338b565598919930a3f3f72bd32f0321d2c781ba0598020762aaa5492b96a3988d6377ded829e4c650e4ebb3fb48361d5b
+  metadata.gz: e750c73c60fa769a97526a0eaeb13b0f497539d9ae5c5500c581e2b0aafa7dc922c61b6edf6c4514d8946e8526d5789b5e454ce5787f4850cb598bd9450c6f05
+  data.tar.gz: 62bcf6a9014420997d088bd41e9c491b4257456ec75f5881e252db5b7aea8b107c2d531ff2b10cba44e037d8eeb387a0edfbedcc09618da898dd3267bf84cad2

data/lib/shimmer/utils/file_helper.rb

@@ -2,6 +2,16 @@
 
 module Shimmer
   module FileHelper
+    extend ActiveSupport::Concern
+
+    included do
+      ActiveSupport.on_load(:action_view) do
+        include Shimmer::FileAdditions
+      end
+    end
+  end
+
+  module FileAdditions
     def image_tag(source, **options)
       return nil if source.blank?
 
@@ -9,19 +19,27 @@ module Shimmer
         attachment = source
         width = options[:width]
         height = options[:height]
-        source = image_file_url(source, width: width, height: height)
+        source = image_file_path(source, width: width, height: height)
         options[:loading] = :lazy
-        options[:srcset] = "#{source} 1x, #{image_file_url(attachment, width: width.to_i * 2, height: height ? height.to_i * 2 : nil)} 2x" if options[:width].present?
+        options[:srcset] = "#{source} 1x, #{image_file_path(attachment, width: width.to_i * 2, height: height ? height.to_i * 2 : nil)} 2x" if options[:width].present?
       end
       super source, options
     end
 
+    def image_file_path(source, width: nil, height: nil)
+      image_file_proxy(source, width: width, height: height)&.path
+    end
+
     def image_file_url(source, width: nil, height: nil)
+      image_file_proxy(source, width: width, height: height)&.url
+    end
+
+    def image_file_proxy(source, width: nil, height: nil)
       return if source.blank?
       return source if source.is_a?(String)
 
       blob = source.try(:blob) || source
-      Shimmer::FileProxy.new(blob_id: blob.id, width: width, height: height).url
+      Shimmer::FileProxy.new(blob_id: blob.id, width: width, height: height)
     end
   end
 end

data/lib/shimmer/utils/remote_navigation.rb

@@ -22,8 +22,12 @@ module Shimmer
       end
 
       helper_method :close_modal_path
-      def close_modal_path(id: nil)
-        "javascript:ui.modal.close(#{{id: id}.to_json})"
+      def close_modal_path(id = nil)
+        if id.present?
+          "javascript:ui.modal.close(#{{id: id}.to_json})"
+        else
+          "javascript:ui.modal.close()"
+        end
       end
 
       helper_method :popover_path
@@ -87,7 +91,7 @@ module Shimmer
 
     def close_modal(id = nil)
       if id.present?
-        run_javascript "ui.modal.close('#{id}')"
+        run_javascript "ui.modal.close(#{{id: id}.to_json})"
       else
         run_javascript "ui.modal.close()"
       end

data/lib/shimmer/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Shimmer
-  VERSION = "0.0.15"
+  VERSION = "0.0.18"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: shimmer
 version: !ruby/object:Gem::Version
-  version: 0.0.15
+  version: 0.0.18
 platform: ruby
 authors:
 - Jens Ravens
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-06-27 00:00:00.000000000 Z
+date: 2022-07-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake