retina_rails 0.0.3 → 0.0.4

data/.gitignore

@@ -1,3 +1,4 @@
+.DS_Store
 *.gem
 *.rbc
 .bundle
@@ -12,7 +13,9 @@ lib/bundler/man
 pkg
 rdoc
 spec/reports
+spec/paperclip_uploads
 test/tmp
 test/version_tmp
 tmp
+log
 uploads

data/README.md

@@ -7,7 +7,7 @@ How it works
 
 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.
 
-Note: It also works for images that live in assets/images
+Note: It also works for images that live in assets/images.
 
 Installation
 ------------
@@ -52,6 +52,13 @@ class ExampleUploader < ActiveRecord::Base
 end
 ```
 
+For retina images use
+------------
+
+```ruby
+= image_tag('/assets/image.png', :retina => true)
+```
+
 Voila! Now you're using Retina Rails.
 
 Credits

data/lib/retina_rails.rb

@@ -2,12 +2,12 @@ require "retina_rails/version"
 require 'retina_rails/extensions'
 require "retina_rails/paperclip"
 require "retina_rails/carrierwave"
+require "retina_rails/helpers"
 
 module RetinaRails
 
   if defined?(Rails)
-    class Engine < Rails::Engine
-    end
+    class Engine < Rails::Engine; end
   end
 
 end

data/lib/retina_rails/helpers.rb

@@ -0,0 +1,22 @@
+module ActionView
+  module Helpers
+    module AssetTagHelper
+
+      def image_tag_with_retina(source, options={})
+        retina = options.delete(:retina)
+
+        if retina
+          retina_source = source.split('.')
+          filename      = retina_source.slice!(-2)
+          retina_source = retina_source.insert(-2, "#{filename}@2x").join('.')
+
+          options.merge!(:data => { :at2x => path_to_image(retina_source) })
+        end
+
+        image_tag_without_retina(source, options)
+      end
+      alias_method_chain :image_tag, :retina
+
+    end
+  end
+end

data/lib/retina_rails/version.rb

@@ -1,3 +1,3 @@
 module RetinaRails
-  VERSION = "0.0.3"
+  VERSION = "0.0.4"
 end

data/retina_rails.gemspec

@@ -20,6 +20,7 @@ Gem::Specification.new do |gem|
   gem.add_development_dependency "bundler", ">= 1.0.0"
   gem.add_development_dependency "rake"
   gem.add_development_dependency "rspec", ">= 2.3"
+  gem.add_development_dependency "rspec-rails", "~> 2.0"
   gem.add_development_dependency 'carrierwave'
   gem.add_development_dependency 'paperclip'
   gem.add_development_dependency "sqlite3"

data/spec/fixtures/manifest.yml

@@ -0,0 +1,10 @@
+---
+image.png: image-e8de7f87c2b9d08490575267a4c9eddc.png
+image/index.png: image-e8de7f87c2b9d08490575267a4c9eddc.png
+image@2x.png: image@2x-0842b16379ded9ddcc299912621f76bc.png
+image@2x/index.png: image@2x-0842b16379ded9ddcc299912621f76bc.png
+
+image.some.png: image.some-e8de7f87c2b9d08490575267a4c9eddc.png
+image.some/index.png: image.some-e8de7f87c2b9d08490575267a4c9eddc.png
+image.some@2x.png: image.some@2x-0842b16379ded9ddcc299912621f76bc.png
+image.some@2x/index.png: image.some@2x-0842b16379ded9ddcc299912621f76bc.png

data/spec/helpers_spec.rb

@@ -0,0 +1,25 @@
+require 'spec_helper'
+
+describe ActionView::Helpers::AssetTagHelper, :type => :helper do
+
+  subject { helper }
+
+  describe :image_tag do
+
+    context 'with retina option' do
+
+      it { subject.image_tag('image.png', :retina => true).should == '<img alt="Image" data-at2x="/assets/image@2x-0842b16379ded9ddcc299912621f76bc.png" src="/assets/image-e8de7f87c2b9d08490575267a4c9eddc.png" />' }
+
+      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" />' }
+
+    end
+
+    context 'without retina' do
+
+      it { subject.image_tag('image.png').should == '<img alt="Image" src="/assets/image-e8de7f87c2b9d08490575267a4c9eddc.png" />' }
+
+    end
+
+  end
+
+end

data/spec/spec_helper.rb

@@ -1,18 +1,32 @@
+require 'rubygems'
 require 'active_support'
 require 'active_record'
 
+## Carrierwave
+
 require 'carrierwave'
 
+## Paperclip
 
 require 'paperclip'
 require "paperclip/railtie"
 Paperclip::Railtie.insert
 
-require 'retina_rails'
+## Setup fixture database for activerecord
 
 ActiveRecord::Base.establish_connection(
   :adapter => "sqlite3",
   :database => File.dirname(__FILE__) + "/fixtures/db/retina_rails.sqlite3"
 )
 
-load File.dirname(__FILE__) + '/support/schema.rb'
+## Load support files
+
+Dir["spec/support/**/*.rb"].each { |f| load f }
+
+## Load rspec rails after initializing rails app
+
+require 'rspec/rails'
+
+## Load retina_rails
+
+require 'retina_rails'

data/spec/support/rails.rb

@@ -0,0 +1,21 @@
+ENV['RAILS_ENV'] = 'test'
+
+require "sprockets/railtie"
+
+module RetinaRailsTest
+  class Application < Rails::Application
+    config.active_support.deprecation = :log
+
+    config.assets.manifest = Rails.public_path.gsub('public', 'spec/fixtures')
+
+    ## Asset config
+
+    config.assets.version      = '1.0'
+    config.serve_static_assets = false
+    config.assets.enabled      = true
+    config.assets.compress     = true
+    config.assets.compile      = false
+    config.assets.digest       = true
+  end
+end
+RetinaRailsTest::Application.initialize!

data/vendor/assets/javascripts/retina.js

@@ -28,9 +28,7 @@
       var images = document.getElementsByTagName("img"), retinaImages = [], i, image;
       for (i = 0; i < images.length; i++) {
         image = images[i];
-        if ($(image).attr('data-retina') != 'true') {
-          retinaImages.push(new RetinaImage(image));
-        }
+        retinaImages.push(new RetinaImage(image));
       }
       existing_onload();
     }
@@ -54,9 +52,15 @@
 
   root.RetinaImagePath = RetinaImagePath;
 
-  function RetinaImagePath(path) {
+  function RetinaImagePath(path, at_2x_path) {
     this.path = path;
-    this.at_2x_path = path.replace(/\.\w+$/, function(match) { return "@2x" + match; });
+    if (typeof at_2x_path !== "undefined" && at_2x_path !== null) {
+      this.at_2x_path = at_2x_path;
+      this.perform_check = false;
+    } else {
+      this.at_2x_path = path.replace(/\.\w+$/, function(match) { return "@2x" + match; });
+      this.perform_check = true;
+    }
   }
 
   RetinaImagePath.confirmed_paths = [];
@@ -69,6 +73,8 @@
     var http, that = this;
     if (this.is_external()) {
       return callback(false);
+    } else if (!this.perform_check && typeof this.at_2x_path !== "undefined" && this.at_2x_path !== null) {
+      return callback(true);
     } else if (this.at_2x_path in RetinaImagePath.confirmed_paths) {
       return callback(true);
     } else {
@@ -101,7 +107,7 @@
 
   function RetinaImage(el) {
     this.el = el;
-    this.path = new RetinaImagePath(this.el.getAttribute('src'));
+    this.path = new RetinaImagePath(this.el.getAttribute('src'), this.el.getAttribute('data-at2x'));
     var that = this;
     this.path.check_2x_variant(function(hasVariant) {
       if (hasVariant) that.swap();

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: retina_rails
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-28 00:00:00.000000000 Z
+date: 2013-03-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -59,6 +59,22 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '2.3'
+- !ruby/object:Gem::Dependency
+  name: rspec-rails
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '2.0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: carrierwave
   requirement: !ruby/object:Gem::Requirement
@@ -157,6 +173,7 @@ files:
 - lib/retina_rails.rb
 - lib/retina_rails/carrierwave.rb
 - lib/retina_rails/extensions.rb
+- lib/retina_rails/helpers.rb
 - lib/retina_rails/paperclip.rb
 - lib/retina_rails/version.rb
 - retina_rails.gemspec
@@ -164,8 +181,11 @@ files:
 - spec/extensions_spec.rb
 - spec/fixtures/db/retina_rails.sqlite3
 - spec/fixtures/images/avatar.jpeg
+- spec/fixtures/manifest.yml
+- spec/helpers_spec.rb
 - spec/paperclip_spec.rb
 - spec/spec_helper.rb
+- spec/support/rails.rb
 - spec/support/schema.rb
 - vendor/assets/javascripts/retina.js
 homepage: https://github.com/jhnvz/retina_rails.git
@@ -197,6 +217,9 @@ test_files:
 - spec/extensions_spec.rb
 - spec/fixtures/db/retina_rails.sqlite3
 - spec/fixtures/images/avatar.jpeg
+- spec/fixtures/manifest.yml
+- spec/helpers_spec.rb
 - spec/paperclip_spec.rb
 - spec/spec_helper.rb
+- spec/support/rails.rb
 - spec/support/schema.rb