sinatra-static-assets 0.4.0 → 0.5.0

data/README.markdown

@@ -1,4 +1,4 @@
-# Sinatra Extension: StaticAssets  
+\# Sinatra Extension: StaticAssets  
 
 Gem *sinatra-static-assets* implements the following helpers methods:
 
@@ -9,7 +9,7 @@ Gem *sinatra-static-assets* implements the following helpers methods:
 
 To install it, run:
 
-    sudo gem install sinatra-static-assets -s http://gemcutter.com
+    sudo gem install sinatra-static-assets -s http://gemcutter.org
 
 All these methods are simple wrappers around the `url_for` method 
 from the [sinatra-url-for](http://github.com/emk/sinatra-url-for/) gem.
@@ -200,3 +200,6 @@ respectively.
 2\. In order to create a virual host add the following to */etc/hosts/*: 
 
     127.0.0.1       localhost.localdomain localhost hitch.local
+
+or, read [editing /etc/hosts is waste of my 
+time](http://www.taylorluk.com/articles/2009/08/12/hey-pac-man-sup-subdomains).

data/VERSION.yml

@@ -1,4 +1,5 @@
 --- 
 :major: 0
-:minor: 4
+:minor: 5
 :patch: 0
+:build: 

data/lib/sinatra/static_assets.rb

@@ -3,67 +3,81 @@ require 'sinatra/url_for'
 
 module Sinatra
   module StaticAssets
-    # In HTML <link> and <img> tags have no end tag.
-    # In XHTML, on the contrary, these tags must be properly closed.
-    #
-    # We can choose the appropriate behaviour with +closed+ option:
-    #
-    #   image_tag "/images/foo.png", :alt => "Foo itself", :closed => true
-    #
-    # The default value of +closed+ option is +false+.
-    #
-    def image_tag(source, options = {})
-      closed = options.delete(:closed)
-      options[:src] = url_for(source)
-      tag("img", options, closed)
-    end
+    module Helpers
+      # In HTML <link> and <img> tags have no end tag.
+      # In XHTML, on the contrary, these tags must be properly closed.
+      #
+      # We can choose the appropriate behaviour with +closed+ option:
+      #
+      #   image_tag "/images/foo.png", :alt => "Foo itself", :closed => true
+      #
+      # The default value of +closed+ option is +false+.
+      #
+      def image_tag(source, options = {})
+        options[:src] = url_for(source)
+        tag("img", options)
+      end
 
-    def stylesheet_link_tag(*sources)
-      list, options = extract_options(sources)
-      closed = options.delete(:closed)
-      list.collect { |source| stylesheet_tag(source, options, closed) }.join("\n")
-    end
+      def stylesheet_link_tag(*sources)
+        list, options = extract_options(sources)
+        list.collect { |source| stylesheet_tag(source, options) }.join("\n")
+      end
 
-    def javascript_script_tag(*sources)
-      list, options = extract_options(sources)
-      list.collect { |source| javascript_tag(source, options) }.join("\n")
-    end
-    
-    def link_to(desc, url)
-      "<a href='#{url_for(url)}'>#{desc}</a>"
-    end
-    
-    private
-    
-    def tag(name, options = {}, closed = false)
-      "<#{name}#{tag_options(options) if options}#{closed ? " />" : ">"}"
-    end
-    
-    def tag_options(options)
-      unless options.empty?
-        attrs = []
-        attrs = options.map { |key, value| %(#{key}="#{value}") }
-        " #{attrs.sort * ' '}" unless attrs.empty?
+      def javascript_script_tag(*sources)
+        list, options = extract_options(sources)
+        list.collect { |source| javascript_tag(source, options) }.join("\n")
       end
-    end
-    
-    def stylesheet_tag(source, options, closed = false)
-      tag("link", { :type => "text/css",
+
+      def link_to(desc, url, options = {})
+        tag("a", options.merge(:href => url_for(url))) do
+          desc
+        end
+      end
+
+      private
+
+      def tag(name, local_options = {})
+        start_tag = "<#{name}#{tag_options(local_options) if local_options}"
+        if block_given?
+          content = yield
+          "#{start_tag}>#{content}</#{name}>"
+        else
+          "#{start_tag}#{"/" if options.xhtml}>"
+        end
+      end
+
+      def tag_options(options)
+        unless options.empty?
+          attrs = []
+          attrs = options.map { |key, value| %(#{key}="#{Rack::Utils.escape_html(value)}") }
+          " #{attrs.sort * ' '}" unless attrs.empty?
+        end
+      end
+
+      def stylesheet_tag(source, options = {})
+        tag("link", { :type => "text/css",
             :charset => "utf-8", :media => "screen", :rel => "stylesheet",
-            :href => url_for(source) }.merge(options), closed)
-    end
-    
-    def javascript_tag(source, options)
-      tag("script", { :type => "text/javascript", :charset => "utf-8",
-            :src => url_for(source) }.merge(options), false) + "</script>"
-    end
-    
-    def extract_options(a)
-      opts = a.last.is_a?(::Hash) ? a.pop : {}
-      [a, opts]  
+            :href => url_for(source) }.merge(options))
+      end
+
+      def javascript_tag(source, options = {})
+        tag("script", { :type => "text/javascript", :charset => "utf-8",
+            :src => url_for(source) }.merge(options)) do
+            end
+      end
+
+      def extract_options(a)
+        opts = a.last.is_a?(::Hash) ? a.pop : {}
+        [a, opts]  
+      end
+
     end
 
+    def self.registered(app)
+      app.helpers StaticAssets::Helpers
+      app.disable :xhtml
+    end
   end
 
-  helpers StaticAssets
+  register StaticAssets
 end

data/test/sinatra_baseapp.rb

@@ -0,0 +1,26 @@
+path = File.expand_path("../lib" + File.dirname(__FILE__))
+$:.unshift(path) unless $:.include?(path)
+
+require 'rubygems'
+require 'sinatra/base'
+
+require 'sinatra/static_assets'
+
+module Sinatra
+  class XHTML < Sinatra::Base
+    helpers Sinatra::UrlForHelper
+    register Sinatra::StaticAssets
+
+    enable :xhtml
+    
+    get '/image_tag' do
+      content_type "text/plain"
+      "#{image_tag("/images/foo.jpg")}"
+    end
+
+    get '/link_tag' do
+      content_type "text/plain"
+      "#{stylesheet_link_tag("/stylesheets/winter.css")}"
+    end
+  end
+end

data/test/sinatra_static_assets_test.rb

@@ -50,7 +50,7 @@ EOD
     get '/link_to_tag', {}, 'SCRIPT_NAME' => '/bar'
     assert last_response.ok?
     assert_equal last_response.body,  <<EOD
-<a href='/bar/topr'>Tatry Mountains Rescue Team</a>
+<a href="/bar/topr">Tatry Mountains Rescue Team</a>
 EOD
   end
   

data/test/sinatra_static_assets_xhtml_test.rb

@@ -0,0 +1,25 @@
+require 'sinatra_baseapp'
+require 'test/unit'
+require 'rack/test'
+
+class SintraStaticAssetsXHTMLTest < Test::Unit::TestCase
+  include Rack::Test::Methods
+
+  def app
+    Sinatra::XHTML.new    
+  end
+  
+  def test_image_tag_closes
+    get '/image_tag'
+    assert last_response.ok?
+    assert_equal last_response.body, "<img src=\"/images/foo.jpg\"/>"
+  end
+
+  def test_link_tag_closes
+    get '/link_tag'
+    assert last_response.ok?
+    assert_equal last_response.body,
+      "<link charset=\"utf-8\" href=\"/stylesheets/winter.css\" media=\"screen\" rel=\"stylesheet\" type=\"text/css\"/>"
+  end
+  
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: sinatra-static-assets
 version: !ruby/object:Gem::Version 
-  version: 0.4.0
+  version: 0.5.0
 platform: ruby
 authors: 
 - Wlodek Bzyl
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-10-19 00:00:00 +02:00
+date: 2009-11-23 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -108,7 +108,9 @@ files:
 - examples/winter/winter.rb
 - lib/sinatra/static_assets.rb
 - test/sinatra_app.rb
+- test/sinatra_baseapp.rb
 - test/sinatra_static_assets_test.rb
+- test/sinatra_static_assets_xhtml_test.rb
 - LICENSE
 - README.markdown
 has_rdoc: true
@@ -140,9 +142,11 @@ signing_key:
 specification_version: 3
 summary: Sinatra extension providing helper methods to output tags for static assetgemspec.
 test_files: 
-- test/sinatra_static_assets_test.rb
+- test/sinatra_static_assets_xhtml_test.rb
 - test/sinatra_app.rb
+- test/sinatra_static_assets_test.rb
+- test/sinatra_baseapp.rb
 - examples/summer/summer.rb
-- examples/rsummer/summer.rb
 - examples/rwinter/winter.rb
 - examples/winter/winter.rb
+- examples/rsummer/summer.rb