alphasights-sinatra-sprockets 0.0.3 → 0.0.4

data/lib/sinatra/sprockets/helpers.rb

@@ -6,36 +6,36 @@ module Sinatra
                            defer reversed ismap seemless muted required
                            autofocus novalidate formnovalidate open pubdate).to_set
       BOOLEAN_ATTRIBUTES.merge(BOOLEAN_ATTRIBUTES.map {|attribute| attribute.to_sym })
-      
+
       def favicon_link_tag(source='favicon.ico', options={})
         tag('link', {
           :rel  => 'shortcut icon',
           :type => 'image/vnd.microsoft.icon',
           :href => asset_path(source)
-        }.merge(options.symbolize_keys))
+        }.merge(options))
       end
-      
+
       def image_tag(source, options = {})
-        options.symbolize_keys!
-        
-        options[:src] = asset_path(source)
-        
+        digest = options.key?(:digest)  ? options.delete(:digest)  : config.digest_assets?
+
+        options[:src] = asset_path(source, digest: digest)
+
         if size = options.delete(:size)
           options[:width], options[:height] = size.split("x") if size =~ %r{^\d+x\d+$}
         end
-        
+
         tag("img", options)
       end
-      
+
       def video_tag(sources, options = {})
-        options.symbolize_keys!
-        
+        options
+
         options[:poster] = asset_path(options[:poster]) if options[:poster]
-        
+
         if size = options.delete(:size)
           options[:width], options[:height] = size.split("x") if size =~ %r{^\d+x\d+$}
         end
-        
+
         if sources.is_a?(Array)
           content_tag("video", options) do
             sources.map { |source| tag("source", :src => source) }.join
@@ -45,19 +45,19 @@ module Sinatra
           tag("video", options)
         end
       end
-      
+
       def audio_tag(source, options = {})
-        options.symbolize_keys!
+        options
         options[:src] = asset_path(source)
         tag("audio", options)
       end
-      
+
       def javascript_include_tag(*sources)
         options = sources.extract_options!
         debug = options.key?(:debug) ? options.delete(:debug) : config.debug_assets?
         body  = options.key?(:body)  ? options.delete(:body)  : false
         digest  = options.key?(:digest)  ? options.delete(:digest)  : config.digest_assets?
-        
+
         sources.collect do |source|
           if debug && asset = asset_paths.asset_for(source, 'js')
             asset.to_a.map { |dep|
@@ -70,13 +70,13 @@ module Sinatra
           end
         end.join("\n")
       end
-      
+
       def stylesheet_link_tag(*sources)
         options = sources.extract_options!
         debug   = options.key?(:debug) ? options.delete(:debug) : config.debug_assets?
         body    = options.key?(:body)  ? options.delete(:body)  : false
         digest  = options.key?(:digest)  ? options.delete(:digest)  : config.digest_assets?
-        
+
         sources.collect do |source|
           if debug && asset = asset_paths.asset_for(source, 'css')
             asset.to_a.map { |dep|
@@ -89,17 +89,17 @@ module Sinatra
           end
         end.join("\n")
       end
-    
+
       def asset_path(source, options={})
         source = source.logical_path if source.respond_to?(:logical_path)
         path = asset_paths.compute_public_path(source, config.prefix, options.merge(:body => true))
         options[:body] ? "#{path}?body=1" : path
       end
-    
+
       def tag(name, options = nil, open = false, escape = true)
         "<#{name}#{tag_options(options, escape) if options}#{open ? ">" : " />"}"
       end
-    
+
       def content_tag(name, content_or_options_with_block = nil, options = nil, escape = true, &block)
         if block_given?
           options = content_or_options_with_block if content_or_options_with_block.is_a?(Hash)
@@ -108,17 +108,17 @@ module Sinatra
           content_tag_string(name, content_or_options_with_block, options, escape)
         end
       end
-    
+
       private
-    
+
       def asset_paths
         @asset_paths ||= AssetPaths.new(Sinatra::Sprockets.config)
       end
-    
+
       def config
         Sinatra::Sprockets.config
       end
-    
+
       def tag_options(options, escape = true)
         unless options.blank?
           attrs = []
@@ -142,7 +142,7 @@ module Sinatra
           " #{attrs.sort * ' '}" unless attrs.empty?
         end
       end
-    
+
       def content_tag_string(name, content, options, escape = true)
         tag_options = tag_options(options, escape) if options
         "<#{name}#{tag_options}>#{escape ? ERB::Util.h(content) : content}</#{name}>"

data/lib/sinatra/sprockets/version.rb

@@ -1,5 +1,5 @@
 module Sinatra
   module Sprockets
-    VERSION = "0.0.3"
+    VERSION = "0.0.4"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: alphasights-sinatra-sprockets
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-03-15 00:00:00.000000000 Z
+date: 2012-03-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sprockets
-  requirement: &70339178669640 !ruby/object:Gem::Requirement
+  requirement: &70221410951920 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,7 +21,7 @@ dependencies:
         version: '2.0'
   type: :runtime
   prerelease: false
-  version_requirements: *70339178669640
+  version_requirements: *70221410951920
 description: Use Sprockets effectively with Sinatra.
 email:
 - jessereiss@gmail.com