padrino-assets 0.2.1 → 0.2.2

data/lib/padrino-assets/helpers.rb

@@ -41,7 +41,7 @@
       ##
       # Returns an HTML script tag for the specified sources
       #
-      # @overload include_javascript(sources, options={})
+      # @overload include_javascript(sources, options)
       #   @param [Array<String, Symbol>] sources
       #     Sources
       #   @param [Hash] options
@@ -51,7 +51,7 @@
       #   Script tag for +sources+ with specified +options+.
       #
       # @example
-      #   include_javascript :application, :jquery
+      #   include_javascripts :application, :jquery
       #   # => <script type="text/javascript" src="/assets/application.js"></script>
       #   # => <script type="text/javascript" src="/assets/jquery.js"></script>
       #
@@ -62,9 +62,9 @@
       # @api public
       def include_javascript(*sources)
         options = sources.extract_options!.symbolize_keys
-        options.reverse_merge!(type: 'text/javascript', content: '')
+        options.reverse_merge!(type: 'text/javascript')
         sources.collect do |source|
-          tag(:script, options.reverse_merge(src: asset_path(source, :js)))
+          content_tag(:script, nil, options.reverse_merge(src: asset_path(source, :js)))
         end.join("\n")
       end
       alias_method :include_javascripts,    :include_javascript
@@ -96,26 +96,26 @@
       #
       # @example
       #   image 'example.png'
-      #   # => <img src="/assets/example.png" alt="Example" />
+      #   # => <img src="/assets/example.png" alt="Example">
       #
       #   image 'example.png', size: '40x40'
-      #   # => <img src="/assets/example.png" width="40" height="40" alt="Example" />
+      #   # => <img src="/assets/example.png" width="40" height="40" alt="Example">
       #
       #   image 'example.png', width: 40
-      #   # => <img src="/assets/example.png" width="40" alt="Example" />
+      #   # => <img src="/assets/example.png" width="40" alt="Example">
       #
       #   image 'example.png', height: 40
-      #   # => <img src="/assets/example.png" height="40" alt="Example" />
+      #   # => <img src="/assets/example.png" height="40" alt="Example">
       #
       #   image 'example.png', alt: 'My Little Pony'
-      #   # => <img src="/assets/example.png" alt="My Little Pony" />
+      #   # => <img src="/assets/example.png" alt="My Little Pony">
       #
       #   image 'http://www.example.com/example.png'
-      #   # => <img src="http://www.example.com/example.png" />
+      #   # => <img src="http://www.example.com/example.png">
       #
       #   images 'example.png', 'example.jpg'
-      #   # => <img src="/assets/example.png" alt="Example" />
-      #   # => <img src="/assets/example.jpg" alt="Example" />
+      #   # => <img src="/assets/example.png" alt="Example">
+      #   # => <img src="/assets/example.jpg" alt="Example">
       #
       # @since 0.1.0
       # @api public
@@ -199,6 +199,11 @@
       # @api public
       def video(*sources)
         options = sources.extract_options!.symbolize_keys
+        sources = sources.first if sources.size == 1
+
+        if options[:poster]
+           options[:poster] = asset_path(options[:poster])
+        end
 
         if size = options.delete(:size)
           options[:width], options[:height] = size.split('x') if size =~ /^[0-9]+x[0-9]+$/
@@ -262,6 +267,7 @@
       # @api public
       def audio(*sources)
         options = sources.extract_options!.symbolize_keys
+        sources = sources.first if sources.size == 1
 
         if sources.is_a?(Array)
           content_tag(:audio, options) do

data/lib/padrino-assets/version.rb

@@ -1,5 +1,5 @@
 module Padrino
   module Assets
-    VERSION = '0.2.1'
+    VERSION = '0.2.2'
   end
 end

data/test/test_helpers.rb

@@ -52,7 +52,7 @@ describe 'Helpers' do
       asset.must_equal '/test/application.css'
     end
 
-    it 'should not interfere with a direct URI' do
+    it 'should not interfere with a reference URI' do
       asset = asset_path('/application.css')
       asset.must_equal '/application.css'
 
@@ -158,17 +158,17 @@ describe 'Helpers' do
       image.must_have_tag :img, width: '40', height: '40'
     end
 
-    it 'should allow you to set the width and height with size' do
+    it 'should allow you to set the :width and :height with size' do
       image = image 'application.jpg', size: '40x40'
       image.must_have_tag :img, width: '40', height: '40'
     end
 
-    it 'should allow you to set the width' do
+    it 'should allow you to set the :width' do
       image = image 'application.jpg', width: '40'
       image.must_have_tag :img, width: '40'
     end
 
-    it 'should allow you to set the height' do
+    it 'should allow you to set the :height' do
       image = image 'application.jpg', height: '40'
       image.must_have_tag :img, height: '40'
     end
@@ -180,15 +180,15 @@ describe 'Helpers' do
 
     it 'should automatically set an alternate text when none present' do
       image = image 'application.jpg'
-      image.must_have_tag :img, alt: 'application'
+      image.must_have_tag :img, alt: 'Application'
     end
 
-    it 'should allow you to set the class' do
+    it 'should allow you to set the :class' do
       image = image 'application.jpg', class: 'image'
       image.must_have_tag :img, class: 'image'
     end
 
-    it 'should allow you to set the identifier' do
+    it 'should allow you to set the :id' do
       image = image 'application.jpg', id: 'logo'
       image.must_have_tag :img, id: 'logo'
     end
@@ -197,4 +197,143 @@ describe 'Helpers' do
       respond_to?(:image_tag).must_equal true
     end
   end
+
+  describe 'video' do
+    it 'should accept multiple sources' do
+      videos = videos 'test.webm', 'test.mov'
+      videos.must_have_tag :source, src: '/assets/test.webm'
+      videos.must_have_tag :source, src: '/assets/test.mov'
+    end
+
+    it 'should accept multiple sources with attributes' do
+      videos = videos 'test.webm', 'test.mov', width: '40', height: '40'
+      videos.must_have_tag :video, width: '40', height: '40'
+      videos.must_have_tag :source, src: '/assets/test.webm'
+      videos.must_have_tag :source, src: '/assets/test.mov'
+    end
+
+    it 'should accept a single source' do
+      video = video 'test.webm'
+      video.must_have_tag :video, src: '/assets/test.webm'
+    end
+
+    it 'should accept a single source with attributes' do
+      video = video 'test.webm', width: '40', height: '40'
+      video.must_have_tag :video, src: '/assets/test.webm', width: '40', height: '40'
+    end
+
+    it 'should allow you to set the :class' do
+      video = video 'test.webm', class: 'video'
+      video.must_have_tag :video, class: 'video'
+    end
+
+    it 'should allow you to set the :id' do
+      video = video 'test.webm', id: 'video'
+      video.must_have_tag :video, id: 'video'
+    end
+
+    it 'should allow you to set the :width and :height with :size' do
+      video = video 'test.webm', size: '40x40'
+      video.must_have_tag :video, width: '40', height: '40'
+    end
+
+    it 'should allow you to set the :width' do
+      video = video 'test.webm', width: '40'
+      video.must_have_tag :video, width: '40'
+    end
+
+    it 'should allow you to set the :height' do
+      video = video 'test.webm', height: '40'
+      video.must_have_tag :video, height: '40'
+    end
+
+    it 'should allow :poster to use an absolute URI' do
+      video = video 'test.webm', poster: 'http://test.com/poster.jpg'
+      video.must_have_tag :video, poster: 'http://test.com/poster.jpg'
+    end
+
+    it 'should use asset_path when :poster is present' do
+      video = video 'test.webm', poster: 'poster.jpg'
+      video.must_have_tag :video, poster: '/assets/poster.jpg'
+    end
+
+    it 'should allow you to set the :preload method' do
+      video = video 'test.webm', preload: 'auto'
+      video.must_have_tag :video, preload: 'auto'
+    end
+
+    it 'should allow you to set :muted to true' do
+      video = video 'test.webm', muted: true
+      video.must_have_tag :video, muted: 'muted'
+    end
+
+    it 'should allow you to set :autoplay to true' do
+      video = video 'test.webm', autoplay: true
+      video.must_have_tag :video, autoplay: 'autoplay'
+    end
+
+    it 'should allow you to set :loop to true' do
+      video = video 'test.webm', loop: true
+      video.must_have_tag :video, loop: 'loop'
+    end
+
+    it 'should allow you to set :controls to true' do
+      video = video 'test.webm', controls: true
+      video.must_have_tag :video, controls: 'controls'
+    end
+
+    it 'should be aliased for compatibility' do
+      respond_to?(:video_tag).must_equal true
+    end
+  end
+
+  describe 'audio' do
+    it 'should accept multiple sources' do
+      audios = audios 'test.ogg', 'test.aac'
+      audios.must_have_tag :source, src: '/assets/test.ogg'
+      audios.must_have_tag :source, src: '/assets/test.aac'
+    end
+
+    it 'should accept multiple sources with attributes' do
+      audios = audios 'test.ogg', 'test.aac', id: 'audio'
+      audios.must_have_tag :audio, id: 'audio'
+      audios.must_have_tag :source, src: '/assets/test.ogg'
+      audios.must_have_tag :source, src: '/assets/test.aac'
+    end
+
+    it 'should accept a single source' do
+      audio = audio 'test.ogg'
+      audio.must_have_tag :audio, src: '/assets/test.ogg'
+    end
+
+    it 'should accept a single source with attributes' do
+      audio = audio 'test.ogg', id: 'audio'
+      audio.must_have_tag :audio, src: '/assets/test.ogg', id: 'audio'
+    end
+
+    it 'should allow you to set the :class' do
+      audio = audio 'test.ogg', class: 'audio'
+      audio.must_have_tag :audio, class: 'audio'
+    end
+
+    it 'should allow you to set the :id' do
+      audio = audio 'test.ogg', id: 'audio'
+      audio.must_have_tag :audio, id: 'audio'
+    end
+
+    it 'should allow you to set :autoplay to true' do
+      audio = audio 'test.ogg', autoplay: true
+      audio.must_have_tag :audio, autoplay: 'autoplay'
+    end
+
+    it 'should allow you to set :loop to true' do
+      audio = audio 'test.ogg', loop: true
+      audio.must_have_tag :audio, loop: 'loop'
+    end
+
+    it 'should allow you to set :controls to true' do
+      audio = audio 'test.ogg', controls: true
+      audio.must_have_tag :audio, controls: 'controls'
+    end
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: padrino-assets
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-01-18 00:00:00.000000000Z
+date: 2012-01-23 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sprockets
-  requirement: &8090840 !ruby/object:Gem::Requirement
+  requirement: &6755340 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: 2.3.0
   type: :runtime
   prerelease: false
-  version_requirements: *8090840
+  version_requirements: *6755340
 - !ruby/object:Gem::Dependency
   name: padrino-core
-  requirement: &8090580 !ruby/object:Gem::Requirement
+  requirement: &6755090 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *8090580
+  version_requirements: *6755090
 - !ruby/object:Gem::Dependency
   name: padrino-helpers
-  requirement: &8090300 !ruby/object:Gem::Requirement
+  requirement: &6754830 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *8090300
+  version_requirements: *6754830
 - !ruby/object:Gem::Dependency
   name: minitest
-  requirement: &8090060 !ruby/object:Gem::Requirement
+  requirement: &6754570 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *8090060
+  version_requirements: *6754570
 - !ruby/object:Gem::Dependency
   name: webrat
-  requirement: &8089830 !ruby/object:Gem::Requirement
+  requirement: &6754330 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,7 +65,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *8089830
+  version_requirements: *6754330
 description: A plugin for the Padrino web framework which uses Sprockets to manage
   and compile assets
 email: