lazy_images-rails 1.2.1 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3a6aee109cdcdeee73bce95c95da80cd9767fda7
-  data.tar.gz: 91792e4ef1fa65d8da187771641bb2173dffdfe2
+  metadata.gz: 13f44cb2e7e89f97c7fcffeb4ed01541822e1770
+  data.tar.gz: 139c313d6e07fd176e107b5420a1b40e148ff2d5
 SHA512:
-  metadata.gz: eae3b7b80b125251fec0c751a1aecfda4b14ec121fe5aa085a42d29bf464428499b285d298b468bb1d7bb55b51609663032f4df2817cbc7d1f3b6afafbe4f59d
-  data.tar.gz: 77c3cd1c9c09e1bd3c73f25e9b5a413bc9c3bb8382d6047e8b87ad115f37317fde1ca43ce7a94364c57e44b3f0cc35acc1d7be4a35b713131230a4f27783e31c
+  metadata.gz: fc8d5255274164198f8f48830ac03749eef7d343ec9523c34e66fd15a737e7b3a17bd8e41ca430650b87b9b56dcb488164e363d1c66494bc05821bf4ed18b57a
+  data.tar.gz: f22c1f8b90721c81820c1f2566905808570ba6a58629bfda69faf35fb83c91c3a3cd950e151d98aed6bdd2ce9fca0a58923e4cd2fb1893dcbb1be3bd29545a98

data/lib/lazy_images/rails/placeholder.rb

@@ -0,0 +1,35 @@
+require 'nokogiri'
+
+module LazyImages
+  module Rails
+    class Placeholder
+      include ActionView::Helpers::AssetTagHelper
+
+      attr_reader :svg
+      attr_reader :options
+
+      def initialize(svg, options)
+        @svg = svg
+        @options = options
+      end
+
+      def to_s
+        if options[:size]
+          # N. B. extract_dimensions is a private method from
+          # actionview/lib/action_view/helpers/asset_tag_helper.rb
+          # beware of breakage
+          options[:width], options[:height] =
+            extract_dimensions(options.delete(:size))
+
+          fragment = Nokogiri::XML::DocumentFragment.parse(svg)
+          fragment.first_element_child['width'] = options[:width]
+          fragment.first_element_child['height'] = options[:height]
+
+          fragment.to_s
+        else
+          svg
+        end
+      end
+    end
+  end
+end

data/lib/lazy_images/rails/tag_helper.rb

@@ -1,4 +1,4 @@
-require 'nokogiri'
+require 'lazy_images/rails/placeholder'
 
 module LazyImages
   module Rails
@@ -10,29 +10,18 @@ module LazyImages
       end
 
       def image_tag_with_lazy_images(source, options={})
-        src = path_to_image(source)
-        data = { rli_image_src: src, rli_placeholder: true }
-        placeholder = LazyImages::Rails.placeholder.dup
+        options.merge!(
+          class: "#{options[:class]} rli-image",
+          src: path_to_image(source)
+        )
 
-        if options[:size]
-          # N. B. extract_dimensions is a private method from
-          # actionview/lib/action_view/helpers/asset_tag_helper.rb
-          # beware of breakage
-          options[:width], options[:height] = extract_dimensions(options.delete(:size))
+        placeholder = LazyImages::Rails::Placeholder.new(
+          LazyImages::Rails.placeholder, options
+        )
 
-          fragment = Nokogiri::XML::DocumentFragment.parse(placeholder)
-          fragment.first_element_child.set_attribute('width', options[:width])
-          fragment.first_element_child.set_attribute('height', options[:height])
-
-          placeholder = fragment.to_s
-        end
-
-        content_tag(:div, data: data, class: 'rli-wrapper') do
-          placeholder.html_safe + content_tag(:noscript) do
-            options[:src] = src
-            options[:class] = "#{options[:class]} rli-image"
+        content_tag(:div, class: 'rli-wrapper') do
+          placeholder.to_s.html_safe +
             image_tag_without_lazy_images(source, options)
-          end
         end
       end
     end

data/lib/lazy_images/rails/version.rb

@@ -1,5 +1,5 @@
 module LazyImages
   module Rails
-    VERSION = "1.2.1"
+    VERSION = "2.0.0"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: lazy_images-rails
 version: !ruby/object:Gem::Version
-  version: 1.2.1
+  version: 2.0.0
 platform: ruby
 authors:
 - René Hansen
@@ -67,8 +67,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 0.5.2
 description: lazy-images-rails is a rails plugin that augments the standard image_tag
-  helper to provide instant placeholder images while the actual image is being lazy
-  loaded. A noscript fallback is provided along with the placeholder for non-js browsers.
+  helper to provide instant placeholders while theactual image is still being fetched.
 email:
 - renehh@gmail.com
 executables: []
@@ -77,11 +76,11 @@ extra_rdoc_files: []
 files:
 - MIT-LICENSE
 - app/assets/images/placeholder.svg
-- app/assets/javascripts/lazy_images_rails.js.coffee
 - app/assets/stylesheets/lazy_images_rails.css.scss
 - config/initializers/lazy_images-rails.rb
 - lib/lazy_images-rails.rb
 - lib/lazy_images/rails/engine.rb
+- lib/lazy_images/rails/placeholder.rb
 - lib/lazy_images/rails/tag_helper.rb
 - lib/lazy_images/rails/version.rb
 - lib/tasks/lazy_images_tasks.rake
@@ -108,5 +107,5 @@ rubyforge_project:
 rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
-summary: Lazy loaded images with placeholders and noscript fallback
+summary: Simple placeholders for images
 test_files: []

data/app/assets/javascripts/lazy_images_rails.js.coffee

@@ -1,26 +0,0 @@
-class @LazyImagesRails
-  @init: (all_replaced) ->
-    replace_with_image = (placeholder) =>
-      noscript = placeholder.querySelector('noscript')
-      method = if 'innerText' in noscript then 'innerText' else 'textContent'
-      content = noscript[method]
-
-      tmp = document.createElement('div')
-      tmp.innerHTML = content # will trigger download of image
-      img = tmp.querySelector('img')
-
-      done = --@placeholder_count == 0 && all_replaced? &&
-        typeof all_replaced == 'function'
-
-      # Race condition:
-      # Event attachment happens after the download triggers above.
-      # If image loads before getting here, the callback never runs.
-      img.onload = =>
-        placeholder.parentNode.replaceChild(img, placeholder)
-        all_replaced.call() if done
-
-    placeholders = document.querySelectorAll('div[data-rli-placeholder]')
-    @placeholder_count = placeholders.length
-
-    for placeholder in placeholders
-      replace_with_image placeholder