retina_rails 1.0.0 → 1.0.1

data/lib/retina_rails/helpers.rb

@@ -6,7 +6,8 @@ module ActionView
         retina = options.delete(:retina)
 
         if retina
-          retina_source = source.split('.')
+          retina_source = source.to_s
+          retina_source = retina_source.split('.')
           filename      = retina_source.slice!(-2)
           retina_source = retina_source.insert(-2, "#{filename}@2x").join('.')
 

data/lib/retina_rails/strategies/paperclip.rb

@@ -59,14 +59,15 @@ module RetinaRails
               ## Iterate over styles and set optimzed dimensions
               styles.each_pair do |key, value|
 
-                dimensions = value[0]
+                dimensions = value.kind_of?(Array) ? value[0] : value
 
                 width  = dimensions.scan(/\d+/)[0].to_i * 2
                 height = dimensions.scan(/\d+/)[1].to_i * 2
 
                 processor = dimensions.scan(/#|</).first
 
-                retina_styles["#{key}_retina".to_sym] = ["#{width}x#{height}#{processor}", value[1]]
+                new_dimensions = "#{width}x#{height}#{processor}"
+                retina_styles["#{key}_retina".to_sym] = value.kind_of?(Array) ? [new_dimensions, value[1]] : new_dimensions
 
                 ## Set quality convert option
                 convert_option = convert_options[key] if convert_options

data/lib/retina_rails/version.rb

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

data/spec/helpers_spec.rb

@@ -2,6 +2,12 @@ require 'spec_helper'
 
 describe ActionView::Helpers::AssetTagHelper, :type => :helper do
 
+  class SomeWrapperClassForUrl
+    def to_s
+      'image.png'
+    end
+  end
+
   subject { helper }
 
   describe :image_tag do
@@ -12,6 +18,12 @@ describe ActionView::Helpers::AssetTagHelper, :type => :helper do
 
       it { subject.image_tag('image.some.png', :retina => true).should == '<img alt="Image.some" data-at2x="/assets/image.some@2x-0842b16379ded9ddcc299912621f76bc.png" src="/assets/image.some-e8de7f87c2b9d08490575267a4c9eddc.png" />' }
 
+      context 'with class' do
+
+        it { subject.image_tag(SomeWrapperClassForUrl.new, :retina => true).should == '<img alt="Image" data-at2x="/assets/image@2x-0842b16379ded9ddcc299912621f76bc.png" src="/assets/image-e8de7f87c2b9d08490575267a4c9eddc.png" />' }
+
+      end
+
     end
 
     context 'without retina' do

data/spec/strategies/paperclip_spec.rb

@@ -24,6 +24,14 @@ class PaperclipUpload < ActiveRecord::Base
      :path => "#{ROOT}/:class/:id/:basename_:style.:extension",
      :url => "#{ROOT}/:class/:id/:basename_:style.:extension"
 
+  has_attached_file :avatar_string_styles,
+    :styles => {
+        :original => "800x800",
+        :big => "125x125#"
+    },
+    :retina => true,
+    :path => "#{ROOT}/:class/:id/:basename_:style.:extension",
+    :url => "#{ROOT}/:class/:id/:basename_:style.:extension"
 end
 
 describe RetinaRails::Strategies::Paperclip do
@@ -44,14 +52,26 @@ describe RetinaRails::Strategies::Paperclip do
 
     subject { PaperclipUpload.create(:avatar => File.open("#{fixture_path}/images/avatar.jpeg")) }
 
-    it { subject.avatar.url(:big).should == "#{ROOT}/paperclip_uploads/1/avatar_big.jpg" }
-    it { subject.avatar.url(:big_retina).should == "#{ROOT}/paperclip_uploads/2/avatar_big@2x.jpg" }
+    it { subject.avatar.url(:big).should == "#{ROOT}/paperclip_uploads/#{subject.id}/avatar_big.jpg" }
+    it { subject.avatar.url(:big_retina).should == "#{ROOT}/paperclip_uploads/#{subject.id}/avatar_big@2x.jpg" }
 
     it { Paperclip::Geometry.from_file(subject.avatar.url(:big)).to_s.should == '125x125' }
     it { Paperclip::Geometry.from_file(subject.avatar.url(:big_retina)).to_s.should == '250x250' }
 
   end
 
+  context 'uploads with string styles' do
+
+    subject { PaperclipUpload.create(:avatar_string_styles => File.open("#{fixture_path}/images/avatar.jpeg")) }
+
+    it { subject.avatar_string_styles.url(:big).should == "#{ROOT}/paperclip_uploads/#{subject.id}/avatar_big.jpeg" }
+    it { subject.avatar_string_styles.url(:big_retina).should == "#{ROOT}/paperclip_uploads/#{subject.id}/avatar_big@2x.jpeg" }
+
+    it { Paperclip::Geometry.from_file(subject.avatar_string_styles.url(:big)).to_s.should == '125x125' }
+    it { Paperclip::Geometry.from_file(subject.avatar_string_styles.url(:big_retina)).to_s.should == '250x250' }
+
+  end
+
   context 'with retina quality' do
 
     subject { PaperclipUpload.create(:avatar => File.open("#{fixture_path}/images/avatar.jpeg")) }

data/spec/support/schema.rb

@@ -4,6 +4,7 @@ ActiveRecord::Schema.define do
   create_table :paperclip_uploads, :force => true do |t|
     t.string :avatar_file_name
     t.string :avatar_without_quality_file_name
+    t.string :avatar_string_styles_file_name
     t.timestamps
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: retina_rails
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-21 00:00:00.000000000 Z
+date: 2013-06-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -231,7 +231,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.25
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Makes your live easier optimizing for retina displays