picture_tag-rails 0.0.2 → 0.0.4

data/README.md

@@ -8,7 +8,7 @@ from the W3C HTML Responsive Images Extension Proposal.
 
 ## Current Version
 
-0.0.1
+0.0.4
 
 
 ## Requirements
@@ -40,10 +40,6 @@ gem install picture_tag-rails
 
 Add to some Ruby file in your Rails app.
 
-```ruby
-require 'picture_tag'
-```
-
 Use it in your views as you would the `image_tag()` helper.
 
 ```erb
@@ -86,6 +82,12 @@ To override the default media queries and names:
 <%= picture_tag(image_path, sizes: { itty_bitty: "(min-width: 10px)" }) %>
 ```
 
+To prefix (opposed to suffix) the filename with size ('/images/small-kitty.jpg'):
+
+```erb
+<%= picture_tag(image_path, prefix_sizes: true}) %>
+```
+
 All `image_tag` options are valid for `picture_tag`.
 See [image_tag Docs](http://api.rubyonrails.org/classes/ActionView/Helpers/AssetTagHelper.html)
 

data/lib/picture_tag-rails/version.rb

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

data/lib/picture_tag-rails/view_helpers.rb

@@ -1,54 +1,79 @@
 module PictureTag
   module ViewHelpers
-    
+
     def picture_tag(image_path, options={})
-      filename, extension = split_image_path_from_extension(image_path)
       sizes = determine_sizes(options)
-      
+
       html = "<picture>"
-      sizes.each do |size, media_query| 
-        html << build_source_tag(filename, size, extension, media_query)
+      sizes.each do |size, media_query|
+        html << build_source_tag(image_path, size, media_query, options)
       end
-      html << add_default_source_and_image(filename, sizes.last.first, extension, options)
+      html << add_default_source_and_image(image_path, sizes.last.first, options)
       html << "</picture>"
-      
+
       html
     end
-  
-    def split_image_path_from_extension(image_path)
-      image_path.gsub!('-original', '')
-      image_path.split(/\.(?=[^\.]+(?: |$))| /) # Splits on last period before the first whitespace.
+
+    def build_file_path(image_path, size, prefix_size=false)
+      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}"
+      else
+        "#{filename}-#{size}.#{extension}"
+      end
     end
-  
-    def build_source_tag(filename, size, extension, media_query=nil)
-      srcset = image_path("#{filename}-#{size}.#{extension}") + " 1x, "
-      srcset << image_path("#{filename}-#{size}@2x.#{extension}") + " 2x"
+
+    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"
       "<source #{"media='#{media_query}' " if media_query}srcset='#{srcset}' />"
     end
-  
-    def add_default_source_and_image(filename, size, extension, options)
-      html = build_source_tag(filename, size, extension)    
-      options[:alt] ||= filename.split('/').last.capitalize
-      html << image_tag("#{filename}-#{size}.#{extension}", options)
+
+    def add_default_source_and_image(image_path, size, options)
+      img_src = build_file_path(image_path, size, options[:prefix_size])
+      html    = build_source_tag(image_path, size, nil, options)
+      html    << image_tag(img_src, normalize_options(options, image_path))
       html
     end
-    
+
+    def normalize_options(options, image_path)
+      options[:alt] ||= alt_tag(image_path)
+      options[:prefix_size] = nil
+      options[:max_width]   = nil
+      options
+    end
+
+    def alt_tag(image_path)
+      filename, extension = split_image_path_from_extension(image_path)
+      filename.split('/').last.capitalize
+    end
+
     def determine_sizes(options)
       sizes = options.delete(:sizes) || default_sizes
       max_width = options[:max_width].to_i if options[:max_width]
       sizes = sizes.delete_if {|k,query| query.match(/\d+/)[0].to_i > max_width } if max_width
       sizes = sizes.sort_by {|k,v| k.to_s }
     end
-  
+
+    def split_image_path_from_extension(image_path)
+      image_path.gsub!('-original', '')
+      # Splits on last period before the first whitespace.
+      image_path.split(/\.(?=[^\.]+(?: |$))| /)
+    end
+
     def default_sizes
       {
-        :huge   => "(min-width: 1600px)", 
-        :large  => "(min-width: 1000px)", 
-        :medium => "(min-width: 768px)", 
+        :huge   => "(min-width: 1600px)",
+        :large  => "(min-width: 1000px)",
+        :medium => "(min-width: 768px)",
         :small  => "(min-width: 480px)",
         :tiny   => "(min-width: 320px)"
       }
     end
-  
+
   end
 end

data/spec/lib/view_helpers_spec.rb

@@ -16,29 +16,29 @@ describe PictureTag::ViewHelpers, :type => :helper  do
   describe "building the source tag" do
     
     it "builds using a media query" do
-      helper.build_source_tag('test', 'small', 'jpg', "(min-width: 100px)").
+      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', 'small', 'png').
+      helper.build_source_tag('/path/test.png', 'small').
       should eq "<source srcset='/path/test-small.png 1x, /path/test-small@2x.png 2x' />"
     end
     
     it "builds without an external path" do
-      helper.build_source_tag('http://www.image/path/test', 'small', 'png',"(min-width: 100px)").
+      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
   end
   
   describe "default source and image" do
     it "builds source and img" do
-      helper.add_default_source_and_image('test', 'small', 'jpg', {}).
+      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 "adds a class to the img tag" do
-      helper.add_default_source_and_image('test', 'small', 'jpg', {:class => "span2"}).
+      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
     
@@ -86,6 +86,11 @@ describe PictureTag::ViewHelpers, :type => :helper  do
       helper.picture_tag('/images/cat.jpg', :alt => "Kitty!").should eq html.gsub("Cat", "Kitty!") 
     end
 
+    it  "prefixes the size to the filename" do
+      html = helper.picture_tag('/images/cat.jpg', :prefix_size => true)
+      html.should match /src=\"\/images\/tiny-cat.jpg/i
+    end
+
     it "overwrites the default sizes if sizes given" do
       h = "<picture>" +
       "<source media='(min-width: 1px)' srcset='/images/cat-hidden.jpg 1x, /images/cat-hidden@2x.jpg 2x' />" +
@@ -100,6 +105,29 @@ describe PictureTag::ViewHelpers, :type => :helper  do
     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).
+        should eq "/path/small-test.png"
+      end
+
+      it "with @2x" do
+        helper.build_file_path('/path/test.png', 'small@2x', true).
+        should eq "/path/small@2x-test.png"
+      end
+
+      it "without a slash" 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

data/spec/spec_helper.rb

@@ -10,4 +10,4 @@ end
 Config::Application.initialize!
 
 require 'rspec/rails'
-require 'picture_tag'
+require 'picture_tag-rails'

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: picture_tag-rails
 version: !ruby/object:Gem::Version 
-  hash: 27
+  hash: 23
   prerelease: 
   segments: 
   - 0
   - 0
-  - 2
-  version: 0.0.2
+  - 4
+  version: 0.0.4
 platform: ruby
 authors: 
 - Bookis Smuin
@@ -15,12 +15,10 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-09-26 00:00:00 Z
+date: 2012-09-28 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: rails
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  version_requirements: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -30,8 +28,10 @@ dependencies:
         - 3
         - 0
         version: "3.0"
+  prerelease: false
   type: :runtime
-  version_requirements: *id001
+  name: rails
+  requirement: *id001
 description: Rails View Helper picture_tag extension
 email: 
 - vegan.bookis@gmail.com