retina_image_tag 1.0.0 → 1.0.1

data/README.md

@@ -2,8 +2,6 @@
 
 retina_image_tag is a ViewHelper for Rails 3.1. in contrast to the normal Rails image_tag knows the retina_image_tag if the user invokes an image on a Apple Retina Display.
 
-[![Dependency Status](https://gemnasium.com/ffaerber/retina_image_tag.png)](https://gemnasium.com/ffaerber/retina_image_tag)
-
 
 ### Retina Display
 The Retina Display on the iPhone4 and iPad3 doubles the pixel resolution of the display.
@@ -13,7 +11,7 @@ You can think about a full screen display with dimensions of 320x480 for iPhone4
 The '@2x' naming convention will be instantly familiar to any iOS developer. It's simply a way of naming an alternate, high-resolution version of an image so that it will be recognized and used by high-resolution Retina Displays.
 
 ### Example
-herokuapp: <http://retinaimagetag-demoapp.herokuapp.com/>
+herokuapp: <http://retinaimagetag.herokuapp.com/>
 
 sourcecode: <https://github.com/ffaerber/retina_image_tag_demoapp/>
 
@@ -36,8 +34,8 @@ And then execute:
 
 
 
-## Usage
-
+## Usage via Asset Pipeline
+ 
 ```erb
 <%= retina_image_tag 'foo.jpg', :size => "400x400" %>
 ```
@@ -62,6 +60,16 @@ after:
 * `subdir/bar.png (500×278px)`
 
 
+## Usage via CarrierWave
+ 
+```erb
+<%= retina_image_tag @picture.image.thumb %>
+```
+
+Uploader: <https://github.com/ffaerber/retina_image_tag_demoapp/blob/master/app/uploaders/image_uploader.rb>
+
+
+
 ## Contributing
 
 1. Fork it

data/lib/retina_image_tag/version.rb

@@ -1,3 +1,3 @@
 module RetinaImageTag
-  VERSION = "1.0.0"
+  VERSION = "1.0.1"
 end

data/lib/retina_image_tag/view_helpers.rb

@@ -1,26 +1,39 @@
 module RetinaImageTag
   module ViewHelpers
-    
+
+
     def retina_image( pixel_ratio )
-      insert_on = -File.extname(@image).size-1
-      image_tag(@image.insert(insert_on, "@#{pixel_ratio}x"), @options)
+      if @image.class.superclass.superclass.to_s == "CarrierWave::Uploader::Base"
+        image_tag(@image, :size => @image.class.sizes[@image.version_name].join('x'))
+      else
+        insert_on = -File.extname(@image).size-1
+        image_tag(@image.insert(insert_on, "@#{pixel_ratio}x"), @options)
+      end
     end
-    
-    
+
     def retina_image_tag(image, options = {})
-      @devicePixelRatio = cookies[:devicePixelRatio]
+      @devicePixelRatio = cookies[:devicePixelRatio].to_i
       @options          = options
-      @image            = image             # foo.jpg, subdir/foo.png
+      @image            = image
 
       case @devicePixelRatio
-        when '2'
+        when 4
+          retina_image 2
+        when 3
           retina_image 2
-        when '1.5'
+        when 2
+          retina_image 2
+        when 1.5
           retina_image 2
         else
-          image_tag(@image, @options)
+          if @image.class.superclass.superclass.to_s == "CarrierWave::Uploader::Base"
+            image_tag(@image.normal)
+          else
+            image_tag(@image, @options)
+          end
        end
      end
-     
+
   end
-end
+end
+

data/retina_image_tag.gemspec

@@ -17,4 +17,5 @@ Gem::Specification.new do |gem|
   
   gem.add_dependency "railties", "~> 3.1"
   gem.add_dependency "rmagick", "~> 2.13.1"
+  gem.add_dependency "rspec", "~> 2.12.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: retina_image_tag
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-06-01 00:00:00.000000000 Z
+date: 2012-12-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: railties
@@ -43,6 +43,22 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: 2.13.1
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 2.12.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 2.12.0
 description: ! 'A high-resolution image is loaded when the retina_image_tag is called
   from a retina display '
 email:
@@ -78,15 +94,21 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: 2815526574589731245
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: 2815526574589731245
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.19
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: A high-resolution image is loaded when the retina_image_tag is called from