retina_rails 0.0.5 → 0.0.6

data/README.md

@@ -58,7 +58,7 @@ For retina images use
 ------------
 
 ```ruby
-= image_tag('/assets/image.png', :retina => true)
+image_tag('image.png', :retina => true)
 ```
 
 Voila! Now you're using Retina Rails.

data/lib/retina_rails/helpers.rb

@@ -10,7 +10,8 @@ module ActionView
           filename      = retina_source.slice!(-2)
           retina_source = retina_source.insert(-2, "#{filename}@2x").join('.')
 
-          options.merge!(:data => { :at2x => path_to_image(retina_source) })
+          options[:data] ||= {}
+          options[:data].merge!(:at2x => path_to_image(retina_source))
         end
 
         image_tag_without_retina(source, options)
@@ -19,4 +20,4 @@ module ActionView
 
     end
   end
-end
+end

data/lib/retina_rails/version.rb

@@ -1,3 +1,3 @@
 module RetinaRails
-  VERSION = "0.0.5"
+  VERSION = "0.0.6"
 end

data/retina_rails.gemspec

@@ -23,9 +23,9 @@ Gem::Specification.new do |gem|
   gem.add_development_dependency 'rspec-rails', '~> 2.0'
   gem.add_development_dependency 'carrierwave'
   gem.add_development_dependency 'paperclip'
+  gem.add_development_dependency 'rmagick'
   gem.add_development_dependency 'sqlite3'
   gem.add_development_dependency 'coveralls'
 
   gem.add_dependency 'rails', '>= 3.0'
-  gem.add_dependency 'rmagick'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: retina_rails
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-16 00:00:00.000000000 Z
+date: 2013-04-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -108,7 +108,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: sqlite3
+  name: rmagick
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
@@ -124,7 +124,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: coveralls
+  name: sqlite3
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
@@ -140,29 +140,29 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rails
+  name: coveralls
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '3.0'
-  type: :runtime
+        version: '0'
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: rmagick
+  name: rails
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -170,7 +170,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.0'
 description: Retina Rails automatically generates retina versions of your uploaded
   images (CarrierWave or Paperclip). It detects if a visitor has a retina display
   and if so it displays the @2x version