picture_tag-rails 0.0.5 → 0.0.6

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: a5f03793d175d320b870bd6b3e89662056c14665
+  data.tar.gz: 68b1d6b25e2fbc38312a2f15fd285ace513942e3
+SHA512:
+  metadata.gz: 756535f2cfd4e4569e4cda5db5e3324b6d4bb7fef8cc6ad0ed719a77e6bcf340541b2abc3be637ed79924eda103bd9e7c522c9eec9128dc0bbafec28db9003b8
+  data.tar.gz: d1378e2855858938f68959a52103c57a490603ab2906ddd6688c94ce158f118651a1711a5fa639e8704e51fd780d603cc80ddf78d55de5a26ab425fff9f58222

data/Gemfile

@@ -8,5 +8,5 @@ gem 'tzinfo'
 group :test, :development do
   gem 'guard-rspec'
   gem 'rb-fsevent', '~> 0.9.1'
-  gem 'rspec-rails'
-end
+  gem 'rspec-rails', '<3.0.0'
+end

data/README.md

@@ -4,18 +4,18 @@
 
 A Rails view helper extension to generate HTML5 `<picture>` tag markup
 from the W3C HTML Responsive Images Extension Proposal.
-  
+
 [w3.org/community/respimg](http://www.w3.org/community/respimg)
 
 
 ## Current Version
 
-0.0.5
+0.0.6
 
 
 ## Requirements
 
-* [Ruby on Rails](http://rubyonrails.org) > 3.0
+* [Ruby on Rails](http://rubyonrails.org) > 3.0 and < 4.0
 
 
 
@@ -107,25 +107,34 @@ Paperclip options for default media queries and sizes.
 
 ```ruby
 has_attached_file :image, {
-  styles: { 
-    tiny:   "320x", 
-    small:  "480x", 
-    medium: "768x", 
-    large:  "1000x", 
+  styles: {
+    tiny:   "320x",
+    small:  "480x",
+    medium: "768x",
+    large:  "1000x",
     huge:   "1600x",
-    %s(tiny@2x)   => "640x", 
-    %s(small@2x)  => "960x", 
-    %s(medium@2x) => "1536x", 
-    %s(large@2x)  => "2000x", 
+    %s(tiny@2x)   => "640x",
+    %s(small@2x)  => "960x",
+    %s(medium@2x) => "1536x",
+    %s(large@2x)  => "2000x",
     %s(large@2x)  => "3200x"
   }
 ```
 
+## Configuration
+- Retina support can be disabled by adding a configure block to your config
+```ruby
+PictureTag.configure do |config|
+  config.display_high_def = false
+end
+```
+
 
 ## TODO
 
 - Add optional paperclip integration functionality
-- Implement Retina support
+- Intergrate with Travis.ci
+- Implement Rails 4 support
 
 
 ## Authors
@@ -134,6 +143,7 @@ has_attached_file :image, {
 * Chad Crissman / [@crissmancd](https://github.com/crissmancd)
 * John Lucia / [@johnlucia](https://github.com/johnlucia)
 * Levi Brown / [@levibrown](https://github.com/levibrown)
+* Colton Fent / [@colto](https://github.com/colto)
 
 
 ## Contributions

data/lib/picture_tag-rails.rb

@@ -1,2 +1,21 @@
 require "picture_tag-rails/version"
 require 'picture_tag-rails/railtie'
+
+require_relative "./picture_tag-rails/configuration"
+
+module PictureTag
+
+  class << self
+    attr_accessor :configuration
+
+    def configuration
+      @configuration ||= Configuration.new
+    end
+
+    # Pattern inspired by http://robots.thoughtbot.com/mygem-configure-block/
+    def configure
+      #self.configuration ||= Configuration.new
+      yield(configuration)
+    end
+  end
+end

data/lib/picture_tag-rails/configuration.rb

@@ -0,0 +1,12 @@
+module PictureTag
+  class Configuration
+
+    attr_accessor :display_high_def
+
+    def initialize
+      @display_high_def = true
+    end
+
+  end
+
+end

data/lib/picture_tag-rails/version.rb

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

data/lib/picture_tag-rails/view_helpers.rb

@@ -1,6 +1,11 @@
 module PictureTag
+
   module ViewHelpers
 
+    def display_high_def
+      PictureTag.configuration.display_high_def
+    end
+
     def picture_tag(image_path, options={})
       sizes = determine_sizes(options)
 
@@ -11,7 +16,7 @@ module PictureTag
       html << add_default_source_and_image(image_path, sizes.last.first, options)
       html << "</picture>"
 
-      html
+      raw html
     end
 
     def build_file_path(image_path, size, prefix_size=false, options={})
@@ -30,13 +35,14 @@ module PictureTag
 
     def build_source_tag(image_path, size, media_query=nil, options={})
       file   = build_file_path(image_path, size, options[:prefix_size])
-      file2x = build_file_path(image_path, "#{size}@2x", options[:prefix_size])
-      srcset = image_path(file)    + " 1x, "
-      srcset << image_path(file2x) + " 2x"
+      file2x = build_file_path(image_path, "#{size}@2x", options[:prefix_size]) if display_high_def
+      srcset = image_path(file)    + " 1x"
+      srcset = image_path(file)    + " 1x, " if display_high_def
+      srcset << image_path(file2x) + " 2x" if display_high_def
       srcset = options[:default_image] if options[:default_image].eql?(image_path)
       "<source #{"media='#{media_query}' " if media_query}srcset='#{srcset}' />"
     end
-    
+
     def add_default_source_and_image(image_path, size, options)
       prefix_size = options[:prefix_size]
       if options[:default_image]
@@ -47,7 +53,7 @@ module PictureTag
         options[:prefix_size] = false
         size = options[:default_size]
       end
-      
+
       img_src = build_file_path(image_path, size, prefix_size, options)
       html    = build_source_tag(image_path, size, nil, options)
       html    << image_tag(img_src, normalize_options(options, image_path))
@@ -92,4 +98,4 @@ module PictureTag
     end
 
   end
-end
+end

data/picture_tag-rails.gemspec

@@ -16,6 +16,6 @@ Gem::Specification.new do |gem|
   gem.executables   = gem.files.grep(%r{^bin/}).map{ |f| File.basename(f) }
   gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
   gem.require_paths = ["lib"]
-  
-  gem.add_dependency 'rails', '>= 3.0'
+
+  gem.add_dependency 'rails', '>= 3.0', '<4.0.0'
 end

data/spec/lib/view_helpers_spec.rb

@@ -1,75 +1,102 @@
 require 'spec_helper'
 describe PictureTag::ViewHelpers, :type => :helper  do
-  
+
+  describe "display_high_def" do
+    it "defaults to true" do
+      PictureTag.configuration.display_high_def.should be_true
+    end
+  end
+
   describe "split image path" do
     let(:split_image_path) { helper.split_image_path_from_extension("/path/something.s-original.jpg") }
     it "removes the -original" do
       split_image_path.first.should eq "/path/something.s"
     end
-    
+
     it "splits jpg" do
       split_image_path.last.should eq "jpg"
     end
-    
+
   end
-  
+
   describe "building the source tag" do
-    
+
     it "builds using a media query" do
       helper.build_source_tag('test.jpg', 'small', "(min-width: 100px)").
       should eq "<source media='(min-width: 100px)' srcset='/images/test-small.jpg 1x, /images/test-small@2x.jpg 2x' />"
     end
-    
+
     it "builds without a media query" do
       helper.build_source_tag('/path/test.png', 'small').
       should eq "<source srcset='/path/test-small.png 1x, /path/test-small@2x.png 2x' />"
     end
-    
+
+    context "when display_high_def is set to false" do
+
+      before do
+        PictureTag.configure do |config|
+          config.display_high_def = false
+        end
+      end
+
+      after do
+        PictureTag.configure do |config|
+          config.display_high_def = true
+        end
+      end
+
+
+      it "builds the source tag" do
+        helper.build_source_tag('/path/test.png', 'small').
+        should eq "<source srcset='/path/test-small.png 1x' />"
+      end
+    end
+
     it "builds without an external path" do
       helper.build_source_tag('http://www.image/path/test.png', 'small',"(min-width: 100px)").
       should eq "<source media='(min-width: 100px)' srcset='http://www.image/path/test-small.png 1x, http://www.image/path/test-small@2x.png 2x' />"
     end
-    
+
     it "builds given a default image" do
       helper.build_source_tag('/images/test.png', 'small', nil, {:default_image => '/images/test.png'}).
       should eq "<source srcset='/images/test.png' />"
     end
-    
+
   end
-  
+
   describe "default source and image" do
     it "builds source and img" do
       helper.add_default_source_and_image('test.jpg', 'small', {}).
       should eq "<source srcset='/images/test-small.jpg 1x, /images/test-small@2x.jpg 2x' /><img alt=\"Test\" src=\"/images/test-small.jpg\" />"
     end
-    
+
     it "lets you specify a default image size" do
       helper.add_default_source_and_image('test.jpg', 'any_size', {:default_size => :large}).
       should eq "<source srcset='/images/test-large.jpg 1x, /images/test-large@2x.jpg 2x' /><img alt=\"Test\" src=\"/images/test-large.jpg\" />"
     end
-    
+
     it "lets you specify a default image path" do
       helper.add_default_source_and_image('test.jpg', 'large', {:default_image => '/images/test.png'}).
       should eq "<source srcset='/images/test.png' /><img alt=\"Test\" src=\"/images/test.png\" />"
     end
-    
+
     it "adds a class to the img tag" do
       helper.add_default_source_and_image('test.jpg', 'small', {:class => "span2"}).
       should eq "<source srcset='/images/test-small.jpg 1x, /images/test-small@2x.jpg 2x' /><img alt=\"Test\" class=\"span2\" src=\"/images/test-small.jpg\" />"
     end
-    
+
   end
-  
+
   describe "determine sizes" do
     let(:sizes) { {:huge => "(min-width: 1600px)", :small => "(min-width: 500px)"} }
     it "puts the hash into a sorted array" do
       helper.determine_sizes(:sizes => sizes).should eq [[:huge, "(min-width: 1600px)"], [:small, "(min-width: 500px)"]]
     end
-    
+
     it "excludes sizes larger than tha max_width" do
       helper.determine_sizes(:sizes => sizes, :max_width => "501px" ).should eq [[:small, "(min-width: 500px)"]]
     end
-    
+
     it "keeps with an equal max width" do
       helper.determine_sizes(:sizes => sizes, :max_width => "500px" ).should eq [[:small, "(min-width: 500px)"]]
     end
@@ -77,9 +104,9 @@ describe PictureTag::ViewHelpers, :type => :helper  do
     it "removes with a lesser max width" do
       helper.determine_sizes(:sizes => sizes, :max_width => "499px" ).should eq []
     end
-    
+
   end
-  
+
   describe "options" do
     def html
       "<picture>" +
@@ -95,11 +122,11 @@ describe PictureTag::ViewHelpers, :type => :helper  do
 
 
     it  "matches the complete html" do
-      helper.picture_tag('/images/cat.jpg').should eq html 
+      helper.picture_tag('/images/cat.jpg').should eq html
     end
 
     it  "matches the complete html with an alt tag" do
-      helper.picture_tag('/images/cat.jpg', :alt => "Kitty!").should eq html.gsub("Cat", "Kitty!") 
+      helper.picture_tag('/images/cat.jpg', :alt => "Kitty!").should eq html.gsub("Cat", "Kitty!")
     end
 
     it  "prefixes the size to the filename" do
@@ -117,11 +144,11 @@ describe PictureTag::ViewHelpers, :type => :helper  do
       helper.picture_tag('/images/cat.jpg', :sizes => {:hidden => "(min-width: 1px)"}).
       should eq h
     end
-    
+
     it "excludes source tags with a media query above the given amount" do
       helper.picture_tag("cat.jpg", :max_width => "500").split('source').should have(4).things
     end
-    
+
     describe "prefixes the size to the filename" do
       it "without x" do
         helper.build_file_path('/path/test.png', 'small', true).
@@ -137,13 +164,13 @@ describe PictureTag::ViewHelpers, :type => :helper  do
         helper.build_file_path('path/test.png', 'small@2x', true).
         should eq "path/small@2x-test.png"
       end
-      
+
       it "without a path" do
         helper.build_file_path('test.png', 'small@2x', true).
         should eq "small@2x-test.png"
       end
-      
+
     end
   end
-  
-end
+
+end

metadata

@@ -1,32 +1,35 @@
 --- !ruby/object:Gem::Specification
 name: picture_tag-rails
 version: !ruby/object:Gem::Version
-  version: 0.0.5
-  prerelease: 
+  version: 0.0.6
 platform: ruby
 authors:
 - Bookis Smuin
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-01 00:00:00.000000000 Z
+date: 2015-01-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '3.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.0'
+    - - <
+      - !ruby/object:Gem::Version
+        version: 4.0.0
 description: Rails View Helper picture_tag extension
 email:
 - vegan.bookis@gmail.com
@@ -42,6 +45,7 @@ files:
 - README.md
 - Rakefile
 - lib/picture_tag-rails.rb
+- lib/picture_tag-rails/configuration.rb
 - lib/picture_tag-rails/railtie.rb
 - lib/picture_tag-rails/version.rb
 - lib/picture_tag-rails/view_helpers.rb
@@ -50,33 +54,26 @@ files:
 - spec/spec_helper.rb
 homepage: ''
 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'
-      segments:
-      - 0
-      hash: -2348883054798486407
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -2348883054798486407
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 2.4.3
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: A Rails view helper extension to generate the proposed HTML5 picture tag
   markup.
 test_files: