picture_tag-rails 0.0.4 → 0.0.5

data/.travis.yml

@@ -0,0 +1,5 @@
+language: ruby
+rvm:
+  - "1.9.3"
+# uncomment this line if your project needs to run something other than `rake`:
+script: bundle exec rspec spec

data/README.md

@@ -1,4 +1,6 @@
 # Picture-Tag Rails
+[![Build Status](https://travis-ci.org/G5/picture_tag-rails.png?branch=master)](https://travis-ci.org/G5/picture_tag-rails)
+[![Code Climate](https://codeclimate.com/github/G5/picture_tag-rails.png)](https://codeclimate.com/github/G5/picture_tag-rails)
 
 A Rails view helper extension to generate HTML5 `<picture>` tag markup
 from the W3C HTML Responsive Images Extension Proposal.
@@ -8,7 +10,7 @@ from the W3C HTML Responsive Images Extension Proposal.
 
 ## Current Version
 
-0.0.4
+0.0.5
 
 
 ## Requirements
@@ -85,9 +87,16 @@ To override the default media queries and names:
 To prefix (opposed to suffix) the filename with size ('/images/small-kitty.jpg'):
 
 ```erb
-<%= picture_tag(image_path, prefix_sizes: true}) %>
+<%= picture_tag(image_path, prefix_size: true}) %>
 ```
 
+To preload a custom default placeholder image:
+
+```erb
+<%= picture_tag(image_path, default_image: '/images/placeholder.png'}) %>
+```
+
+
 All `image_tag` options are valid for `picture_tag`.
 See [image_tag Docs](http://api.rubyonrails.org/classes/ActionView/Helpers/AssetTagHelper.html)
 
@@ -123,6 +132,8 @@ has_attached_file :image, {
 
 * Bookis Smuin / [@bookis](https://github.com/bookis)
 * Chad Crissman / [@crissmancd](https://github.com/crissmancd)
+* John Lucia / [@johnlucia](https://github.com/johnlucia)
+* Levi Brown / [@levibrown](https://github.com/levibrown)
 
 
 ## Contributions
@@ -174,4 +185,4 @@ MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
 NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
 LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
 OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

data/lib/picture_tag-rails/version.rb

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

data/lib/picture_tag-rails/view_helpers.rb

@@ -14,12 +14,15 @@ module PictureTag
       html
     end
 
-    def build_file_path(image_path, size, prefix_size=false)
+    def build_file_path(image_path, size, prefix_size=false, options={})
       filename, extension = split_image_path_from_extension(image_path)
       if prefix_size
         # Splits on last '/' before the first whitespace.
         path, file = filename.split(/\/(?=[^\/]+(?: |$))| /)
         file ? "#{path}/#{size}-#{file}.#{extension}" : "#{size}-#{path}.#{extension}"
+      elsif options[:default_image]
+        #binding.pry
+        image_path
       else
         "#{filename}-#{size}.#{extension}"
       end
@@ -30,11 +33,22 @@ module PictureTag
       file2x = build_file_path(image_path, "#{size}@2x", options[:prefix_size])
       srcset = image_path(file)    + " 1x, "
       srcset << image_path(file2x) + " 2x"
+      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)
-      img_src = build_file_path(image_path, size, options[:prefix_size])
+      prefix_size = options[:prefix_size]
+      if options[:default_image]
+        prefix_size = false
+        image_path = options[:default_image]
+        size = nil
+      elsif options[:default_size]
+        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))
       html
@@ -42,8 +56,10 @@ module PictureTag
 
     def normalize_options(options, image_path)
       options[:alt] ||= alt_tag(image_path)
-      options[:prefix_size] = nil
-      options[:max_width]   = nil
+      options[:prefix_size]   = nil
+      options[:max_width]     = nil
+      options[:default_size]  = nil
+      options[:default_image] = nil
       options
     end
 

data/spec/lib/view_helpers_spec.rb

@@ -29,6 +29,12 @@ describe PictureTag::ViewHelpers, :type => :helper  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
@@ -37,6 +43,16 @@ describe PictureTag::ViewHelpers, :type => :helper  do
       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\" />"

metadata

@@ -1,48 +1,41 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: picture_tag-rails
-version: !ruby/object:Gem::Version 
-  hash: 23
+version: !ruby/object:Gem::Version
+  version: 0.0.5
   prerelease: 
-  segments: 
-  - 0
-  - 0
-  - 4
-  version: 0.0.4
 platform: ruby
-authors: 
+authors:
 - Bookis Smuin
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2012-09-28 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
-  version_requirements: &id001 !ruby/object:Gem::Requirement 
+date: 2013-04-01 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: rails
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 7
-        segments: 
-        - 3
-        - 0
-        version: "3.0"
-  prerelease: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '3.0'
   type: :runtime
-  name: rails
-  requirement: *id001
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '3.0'
 description: Rails View Helper picture_tag extension
-email: 
+email:
 - vegan.bookis@gmail.com
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - .gitignore
+- .travis.yml
 - Gemfile
 - Guardfile
 - LICENSE.txt
@@ -55,39 +48,37 @@ files:
 - picture_tag-rails.gemspec
 - spec/lib/view_helpers_spec.rb
 - spec/spec_helper.rb
-homepage: ""
+homepage: ''
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+      segments:
       - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+      hash: -2348883054798486407
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+      segments:
       - 0
-      version: "0"
+      hash: -2348883054798486407
 requirements: []
-
 rubyforge_project: 
 rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
-summary: A Rails view helper extension to generate the proposed HTML5 picture tag markup.
-test_files: 
+summary: A Rails view helper extension to generate the proposed HTML5 picture tag
+  markup.
+test_files:
 - spec/lib/view_helpers_spec.rb
 - spec/spec_helper.rb