retina_tag 1.3.1 → 1.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 28acff04b272c96deb4b0754d8070a9cb196adc0
-  data.tar.gz: c1e08ba947ae3b7fc053b853a8238a63ee4c8652
+  metadata.gz: be758b14dfbee1b2a1214ea8001f00dba536dd85
+  data.tar.gz: f66a6ac77692eb0dffaf7e5e3e2846e2b1710619
 SHA512:
-  metadata.gz: 6b880d2efe14c00ff966500eab438a2e6b3395ce9080f6286cdc19f951974892b7eed612658d7eb2e97a386d072a7381a6deb4c36500fd59556b9a79cc775797
-  data.tar.gz: 5494f7869f91f985e03749636d2935651f3b9378cd29c952749561cd8d5342c382ff9ed8c150b4172e5944b97d9fc3ad64c3b5dbf39d5ba4a125b1e166ae7198
+  metadata.gz: a38a469ddd135e6320df1fbfdfc806885ed6b680734dbd5a39e56b11538a2992a5a50460abd7031996f9af8725ca18b3ef7f78527c1f084ccea3bd98eb143353
+  data.tar.gz: 05dc502a23eeeed21390f2fcd4ca043afd537e98ae7f091b8f1aea6a1938a0c24565b9cc14c381bc6c6775d369d1f3fe8b156c278d4f881c2cec1cb7693715b2

data/README.md

@@ -2,7 +2,7 @@
 
 Interested in making your web-sites retina compatible? Rails asset pipeline
 makes this a pain with retina `image_tag`s, especially when precompiling assets.
-RetinaTag resolves this by extending `image_tag` to create a `hidpi_src`
+RetinaTag resolves this by extending `image_tag` to create a `data-hidpi-src`
 attribute with the retina image path if it exists.
 
 ## Installation
@@ -40,13 +40,13 @@ Awesome right?
 ### Forcing Refresh after loading dynamic content
 Retina tag listens to the global event on document called `retina_tag:refresh`. Firing this event will force retina_tag to rescan the dom for images and update their image src if necessary. Useful if loading content dynamically. **Note:** retina_tag automatically supports turbolinks.
 
-### Override Hidpi src attribute
-In some cases it becomes necessary to override the hidpi_src attribute and skip asset pipeline. A good example of this might be to load a users profile picture which is stored elsewhere.
+### Override Hidpi src data attribute
+In some cases it becomes necessary to override the data-hidpi-src attribute and skip asset pipeline. A good example of this might be to load a users profile picture which is stored elsewhere.
 
-    <%=image_tag(user.photo.url(:medium), "hidpi_src" => user.photo.url(:medium_2x), :height=>75, :width => 75%>
+    <%=image_tag(user.photo.url(:medium), "data-hidpi-src" => user.photo.url(:medium_2x), :height=>75, :width => 75%>
 
 ### Lazy Loading Images
-If you set `:lazy => true` on an image_tag, the src attribute is moved to a lodpi_src attribute. You will need to manually instruct the image to load. To do this use `RetinaTag.refreshImage(img)` where img is the image element.
+If you set `:lazy => true` on an image_tag, the src attribute is moved to a data-lodpi-src attribute. You will need to manually instruct the image to load. To do this use `RetinaTag.refreshImage(img)` where img is the image element.
 
 
 ## Contributing

data/lib/retina_tag/engine.rb

@@ -1,41 +1,48 @@
-
 module RetinaTag
   module TagHelper
     def self.included(base)
-      base.alias_method_chain :image_tag, :retina
+      base.module_eval do
+        alias_method :image_tag_without_retina, :image_tag
+        alias_method :image_tag, :image_tag_with_retina
+      end
     end
 
-    def image_tag_with_retina(source,options={})
+    def image_tag_with_retina(source, options={})
       hidpi_asset_path = nil
       src = options[:src] = path_to_image(source)
 
       begin
-          retina_els = source.split('.')
-          extension = retina_els.last
-          retina_els.slice!(-1)
-          retina_path = "#{retina_els.join('.')}@2x.#{extension}"
-
-          if !Rails.application.assets.find_asset(retina_path).nil?
-            hidpi_asset_path = asset_path(retina_path)
-          end
+        retina_els = source.split('.')
+        extension = retina_els.last
+        retina_els.slice!(-1)
+        retina_path = "#{retina_els.join('.')}@2x.#{extension}"
+
+        retina_asset_present = if Rails.application.assets.present?
+          Rails.application.assets.find_asset(retina_path).present?
+        else
+          Rails.application.assets_manifest.files.values.any? { |asset| asset['logical_path'] == retina_path }
+        end
+
+        if retina_asset_present
+          hidpi_asset_path = asset_path(retina_path)
+        end
       rescue
       end
-      options_default = { "data-hidpi-src" => hidpi_asset_path }
+      options_default = { 'data-hidpi-src' => hidpi_asset_path }
 
       if lazy = options.delete(:lazy)
-        options["data-lazy-load"] = lazy
+        options['data-lazy-load'] = lazy
       end
 
       options_default.merge!(options)
 
-      if options_default[:"data-lazy-load"]
-        options_default["data-lowdpi-src"] = options_default.delete(:src)
+      if options_default[:'data-lazy-load']
+        options_default['data-lowdpi-src'] = options_default.delete(:src)
       end
 
       image_tag_without_retina(source, options_default)
     end
 
-
   end
 
   class Engine < ::Rails::Engine
@@ -43,7 +50,6 @@ module RetinaTag
       ActionView::Helpers::AssetTagHelper.module_eval do
         include TagHelper
       end
-
     end
   end
 end

data/lib/retina_tag/version.rb

@@ -1,3 +1,3 @@
 module RetinaTag
-  VERSION = "1.3.1"
+  VERSION = "1.4.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: retina_tag
 version: !ruby/object:Gem::Version
-  version: 1.3.1
+  version: 1.4.0
 platform: ruby
 authors:
 - David Estes
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-28 00:00:00.000000000 Z
+date: 2016-07-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -76,7 +76,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: image_tag addon for retina graphics, with cache support.