retina_rails 1.0.1 → 1.0.2

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 6b0fc5851886964ca14ff8e7b9ca46b4f7ead87d
+  data.tar.gz: be70cf1c874eabd21b0f7e2500a477bab7ba6ac1
+SHA512:
+  metadata.gz: 0fea47157ea0f8a9daecff22bb7651ff346ddc3d56f4d3a8712800cd1b084f5bdac0bcd08f75187305699c4cbde76e3830ecafb26a7bb7de39e4cab910e02fbd
+  data.tar.gz: ae1f12e6c38db9b5859b25c8519dd9f547060ecd2e0887d38314120d4021765aeddd5db8dcbc93295c07fc82694e9dbaf2d525697d2fb107fddd1e00a9ad8a48

data/.travis.yml

@@ -2,4 +2,5 @@ language: ruby
 rvm:
  - 1.9.2
  - 1.9.3
+ - 2.0.0
  - ruby-head

data/README.md

@@ -79,8 +79,8 @@ class ExampleUploader < ActiveRecord::Base
        :original => ["800x800", :jpg],
        :big => ["125x125#", :jpg]
      },
-     :retina => true
-     # :retina => { :quality => 25 }
+     :retina => true # Or
+     :retina => { :quality => 25 } # Optional
 
 end
 ```
@@ -95,21 +95,29 @@ image_tag('image.png', :retina => true)
 
 Voila! Now you're using Retina Rails.
 
+Supported Ruby Versions
+------------
+
+This library aims to support and is tested against[travis] the following Ruby
+implementations:
+
+* Ruby 1.9.2
+* Ruby 1.9.3
+* Ruby 2.0.0
+
 Credits
 ------------
 
 Retina Rails uses retinajs (https://github.com/imulus/retinajs)
 
-Note on Patches/Pull Requests
+Contributing
 ------------
 
-* Fork the project.
-* Make your feature addition or bug fix.
-* Add tests for it. This is important so I don't break it in a
-  future version unintentionally.
-* Commit, do not mess with rakefile, version, or history.
-  (if you want to have your own version, that is fine but bump version in a commit by itself I can ignore when I pull)
-* Send me a pull request. Bonus points for topic branches.
+1. Fork it
+2. Create your feature branch (`git checkout -b my-new-feature`)
+3. Commit your changes (`git commit -am 'Add some feature'`)
+4. Push to the branch (`git push origin my-new-feature`)
+5. Create new Pull Request
 
 Copyright
 ------------

data/lib/retina_rails/strategies/carrierwave.rb

@@ -76,7 +76,12 @@ module RetinaRails
         ## Set the correct filename for storage according to the convention (append @2x to filename)
         def full_filename(for_file)
           super.tap do |file_name|
-            file_name.sub!(/(.*)\./, '\1@2x.').gsub!('retina_', '') if version_name.to_s.include?('retina')
+            if version_name.to_s.include?('retina')
+              has_extension = file_name.scan(/(jpg|jpeg|png|gif|bmp)/).any?
+
+              regex = has_extension ? /(.*)\./ : /.*/
+              file_name.sub!(regex, '\1@2x.').gsub!('retina_', '')
+            end
           end
         end
 

data/lib/retina_rails/version.rb

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

data/retina_rails.gemspec

@@ -27,5 +27,6 @@ Gem::Specification.new do |gem|
   gem.add_development_dependency 'sqlite3'
   gem.add_development_dependency 'coveralls'
 
-  gem.add_dependency 'rails', '>= 3.0'
+
+  gem.add_dependency 'rails', '>= 3.2.0', '< 4.0.0'
 end

data/spec/strategies/carrierwave_spec.rb

@@ -1,3 +1,4 @@
+require 'stringio'
 require 'spec_helper'
 
 class AnonymousUploader < CarrierWave::Uploader::Base
@@ -178,4 +179,19 @@ describe RetinaRails::Strategies::CarrierWave do
 
   end
 
+  context 'file without extension name' do
+
+    before do
+      AnonymousUploader.enable_processing = true
+      @uploader = AnonymousUploader.new(CarrierWaveUpload.new, :avatar)
+      stream = FileStringIO.new('avatar', File.read("#{fixture_path}/images/avatar.jpeg"))
+      @uploader.store!(stream)
+    end
+
+    it { File.basename(@uploader.small.current_path, 'jpeg').should include 'small_'}
+    it { File.basename(@uploader.small_retina.current_path, 'jpeg').should include '@2x'}
+    it { File.basename(@uploader.small_retina.current_path, 'jpeg').should_not include 'retina_'}
+
+  end
+
 end

data/spec/strategies/paperclip_spec.rb

@@ -72,6 +72,16 @@ describe RetinaRails::Strategies::Paperclip do
 
   end
 
+  context 'file without extension name' do
+
+    let!(:stream) { FileStringIO.new('avatar', File.read("#{fixture_path}/images/avatar.jpeg")) }
+    subject       { PaperclipUpload.create(:avatar => stream) }
+
+    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" }
+
+  end
+
   context 'with retina quality' do
 
     subject { PaperclipUpload.create(:avatar => File.open("#{fixture_path}/images/avatar.jpeg")) }
@@ -90,7 +100,7 @@ describe RetinaRails::Strategies::Paperclip do
 
   end
 
-  describe :optimze_path do
+  describe :optimize_path do
 
     subject { RetinaRails::Strategies::Paperclip::Uploader::Extensions }
 

data/spec/support/file_string_io.rb

@@ -0,0 +1,12 @@
+class FileStringIO < StringIO
+  attr_accessor :filepath
+
+  def initialize(*args)
+    super(*args[1..-1])
+    @filepath = args[0]
+  end
+
+  def original_filename
+    File.basename(@filepath)
+  end
+end

data/spec/support/rails.rb

@@ -6,7 +6,7 @@ module RetinaRailsTest
   class Application < Rails::Application
     config.active_support.deprecation = :log
 
-    config.assets.manifest = Rails.public_path.gsub('public', 'spec/fixtures')
+    config.assets.manifest = Rails.root.join("spec/fixtures")
 
     ## Asset config
 
@@ -16,6 +16,12 @@ module RetinaRailsTest
     config.assets.compress     = true
     config.assets.compile      = false
     config.assets.digest       = true
+
+    if Rails::VERSION::STRING >= "4.0.0"
+      config.secret_token    = 'existing secret token'
+      config.secret_key_base = 'new secret key base'
+    end
+
   end
 end
 RetinaRailsTest::Application.initialize!

data/vendor/assets/javascripts/retina.js

@@ -1,31 +1,24 @@
-(function() {
-
+(function () {
   var root = (typeof exports == 'undefined' ? window : exports);
-
   var config = {
     // Ensure Content-Type is an image before trying to load @2x image
     // https://github.com/imulus/retinajs/pull/45)
     check_mime_type: true
   };
-
-
-
   root.Retina = Retina;
 
   function Retina() {}
-
-  Retina.configure = function(options) {
+  Retina.configure = function (options) {
     if (options == null) options = {};
     for (var prop in options) config[prop] = options[prop];
   };
-
-  Retina.init = function(context) {
+  Retina.init = function (context) {
     if (context == null) context = root;
-
     var existing_onload = context.onload || new Function;
-
-    context.onload = function() {
-      var images = document.getElementsByTagName("img"), retinaImages = [], i, image;
+    context.onload = function () {
+      var images = document.getElementsByTagName("img"),
+        retinaImages = [],
+        i, image;
       for (i = 0; i < images.length; i++) {
         image = images[i];
         retinaImages.push(new RetinaImage(image));
@@ -33,23 +26,17 @@
       existing_onload();
     }
   };
-
-  Retina.isRetina = function(){
+  Retina.isRetina = function () {
     var mediaQuery = "(-webkit-min-device-pixel-ratio: 1.5),\
-                      (min--moz-device-pixel-ratio: 1.5),\
-                      (-o-min-device-pixel-ratio: 3/2),\
-                      (min-resolution: 1.5dppx)";
-
+      (min--moz-device-pixel-ratio: 1.5),\
+      (-o-min-device-pixel-ratio: 3/2),\
+      (min-resolution: 1.5dppx)";
     if (root.devicePixelRatio > 1)
       return true;
-
     if (root.matchMedia && root.matchMedia(mediaQuery).matches)
       return true;
-
     return false;
   };
-
-
   root.RetinaImagePath = RetinaImagePath;
 
   function RetinaImagePath(path, at_2x_path) {
@@ -58,33 +45,26 @@
       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.at_2x_path = path.replace(/\.\w+$/, function (match) {
+        return "@2x" + match;
+      });
       this.perform_check = true;
     }
   }
-
   RetinaImagePath.confirmed_paths = [];
-
-  RetinaImagePath.prototype.is_external = function() {
-    return !!(this.path.match(/^https?\:/i) && !this.path.match('//' + document.domain) )
-  }
-
-  RetinaImagePath.prototype.check_2x_variant = function(callback) {
+  RetinaImagePath.prototype.check_2x_variant = function (callback) {
     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) {
+    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 {
       http = new XMLHttpRequest;
       http.open('HEAD', this.at_2x_path);
-      http.onreadystatechange = function() {
+      http.onreadystatechange = function () {
         if (http.readyState != 4) {
           return callback(false);
         }
-
         if (http.status >= 200 && http.status <= 399) {
           if (config.check_mime_type) {
             var type = http.getResponseHeader('Content-Type');
@@ -92,7 +72,6 @@
               return callback(false);
             }
           }
-
           RetinaImagePath.confirmed_paths.push(that.at_2x_path);
           return callback(true);
         } else {
@@ -103,25 +82,21 @@
     }
   }
 
-
-
   function RetinaImage(el) {
     this.el = el;
     this.path = new RetinaImagePath(this.el.getAttribute('src'), this.el.getAttribute('data-at2x'));
     var that = this;
-    this.path.check_2x_variant(function(hasVariant) {
+    this.path.check_2x_variant(function (hasVariant) {
       if (hasVariant) that.swap();
     });
   }
-
   root.RetinaImage = RetinaImage;
-
-  RetinaImage.prototype.swap = function(path) {
+  RetinaImage.prototype.swap = function (path) {
     if (typeof path == 'undefined') path = this.path.at_2x_path;
-
     var that = this;
+
     function load() {
-      if (! that.el.complete) {
+      if (!that.el.complete) {
         setTimeout(load, 5);
       } else {
         that.el.setAttribute('width', that.el.offsetWidth);
@@ -132,12 +107,7 @@
     }
     load();
   }
-
-
-
-
   if (Retina.isRetina()) {
     Retina.init(root);
   }
-
-})();
+})();

metadata

@@ -1,8 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: retina_rails
 version: !ruby/object:Gem::Version
-  version: 1.0.1
-  prerelease: 
+  version: 1.0.2
 platform: ruby
 authors:
 - Johan van Zonneveld
@@ -10,60 +9,53 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-10 00:00:00.000000000 Z
+date: 2013-11-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 1.0.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 1.0.0
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '2.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !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
@@ -71,7 +63,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -79,99 +70,93 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: carrierwave
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: paperclip
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rmagick
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: coveralls
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: 3.2.0
+    - - <
+      - !ruby/object:Gem::Version
+        version: 4.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: 3.2.0
+    - - <
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: 4.0.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
@@ -208,32 +193,32 @@ files:
 - spec/spec_helper.rb
 - spec/strategies/carrierwave_spec.rb
 - spec/strategies/paperclip_spec.rb
+- spec/support/file_string_io.rb
 - spec/support/rails.rb
 - spec/support/schema.rb
 - vendor/assets/javascripts/retina.js
 homepage: https://github.com/jhnvz/retina_rails.git
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 2.1.5
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Makes your live easier optimizing for retina displays
 test_files:
 - spec/deprecation/carrierwave_spec.rb
@@ -246,5 +231,6 @@ test_files:
 - spec/spec_helper.rb
 - spec/strategies/carrierwave_spec.rb
 - spec/strategies/paperclip_spec.rb
+- spec/support/file_string_io.rb
 - spec/support/rails.rb
 - spec/support/schema.rb