sinatra-static-assets 0.5.0 → 1.0.0

data/.gitignore

@@ -0,0 +1,4 @@
+*.gem
+.bundle
+Gemfile.lock
+pkg/*

data/Gemfile

@@ -0,0 +1,4 @@
+source "http://rubygems.org"
+
+# Specify your gem's dependencies in sinatra-static-assets.gemspec
+gemspec

data/{README.markdown → README.md}

@@ -1,4 +1,4 @@
-\# Sinatra Extension: StaticAssets  
+# Sinatra Extension: StaticAssets
 
 Gem *sinatra-static-assets* implements the following helpers methods:
 
@@ -11,8 +11,8 @@ To install it, run:
 
     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.
+All these methods are simple wrappers around the `uri` method
+from the [sinatra](http://github.com/sinatra/sinatra) gem.
 
 ## When will you need it?
 
@@ -23,12 +23,12 @@ sub URI.
 
 Example: Suppose that we already have a virtual host `hitch.local`
 and two Sinatra applications that live in
-`/home/me/www/summer` and `/home/me/www/winter` 
+`/home/me/www/summer` and `/home/me/www/winter`
 directories, respectively.
-We want our Sinatra applications to be accessible from 
-the following sub URI: 
+We want our Sinatra applications to be accessible from
+the following sub URI:
 
-    http://hitch.local/summer 
+    http://hitch.local/summer
 
 and
 
@@ -40,7 +40,7 @@ we need to create a new configuration file with the following content:
     <VirtualHost *:80>
       ServerName hitch.local
       DocumentRoot /srv/www/hitch.local
-      
+
       RackBaseURI /summer
       RackBaseURI /winter
     </VirtualHost>
@@ -50,7 +50,7 @@ and a link to the applications directories in `/srv/www/hitch.local`:
     ln -s /home/me/www/summer/public /srv/www/hitch.local/summer
     ln -s /home/me/www/winter/public /srv/www/hitch.local/winter
 
-After restarting an Apache2 server and visiting, for example, the first 
+After restarting an Apache2 server and visiting, for example, the first
 application at `http://hitch.local/summer` we see that links to
 images, stylesheets and javascripts are broken.
 
@@ -60,7 +60,7 @@ images/stylesheets/javascripts with absolute URI:
     /images/tatry1.jpg    /stylesheets/app.css    /javascripts/app.js
 
 That setup **works** whenever we are running applications locally.
-The absolute URI above tells a browser to request images 
+The absolute URI above tells a browser to request images
 (stylesheets and javascripts) from:
 
     http://localhost:4567/images/tatry1.jpg
@@ -80,57 +80,55 @@ As a result the images are at:
 
     http://hitch.local/summer/images/tatry1.jpg
 
-but we request them from: 
+but we request them from:
 
     http://hitch.local/images/tatry1.jpg
 
-And this **does not work** because there is no application 
+And this **does not work** because there is no application
 dispatched to *images* sub URI.
 
-The recommended way to deal with an absolute URI 
+The recommended way to deal with an absolute URI
 is to use a helper method that automatically converts
 `/images/tatry1.jpg` to `/summer/images/tatry1.jpg`
-for application dispatched to `/summer` sub URI. 
+for application dispatched to `/summer` sub URI.
 
-In the above example you can simply remove the `<img>` 
-HTML tag and replace it with a Ruby inline code like this: 
+In the above example you can simply remove the `<img>`
+HTML tag and replace it with a Ruby inline code like this:
 
     <%= image_tag("/images/tatry1.jpg", :alt => "Błyszcz, 2159 m") %>
 
-See also, [How to fix broken images/CSS/JavaScript URIs in sub-URI 
+See also, [How to fix broken images/CSS/JavaScript URIs in sub-URI
 deployments](http://www.modrails.com/documentation/Users%20guide%20Apache.html#sub_uri_deployment_uri_fix)
 
 ## Usage examples
 
-In HTML `<link>` and `<img>` tags have no end tag.
+In HTML (and HTML5) `<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/tatry1.jpg", :alt => "Błyszcz, 2159 m", :closed => true
 
-The default value of *closed* option is `false`.
+The default value of *closed* option is `false`. We can change the default value with:
+
+    enable :xhtml
+
+We can pass mutliple stylesheets or scripts:
 
     stylesheet_link_tag "/stylesheets/screen.css", "/stylesheets/summer.css", :media => "projection"
     javascript_script_tag "/javascripts/jquery.js", "/javascripts/summer.js", :charset => "iso-8859-2"
     link_to "Tatry Mountains Rescue Team", "/topr"
 
-In order to use include the following in a Sinatra application: 
+In order to use include the following in a Sinatra application:
 
-    gem 'sinatra-static-assets'
     require 'sinatra/static_assets'
 
 Or, if subclassing `Sinatra::Base`, include helpers manually:
 
-    gem 'emk-sinatra-url-for'
-    require 'sinatra/url_for'
-      
-    gem 'sinatra-static-assets'
     require 'sinatra/static_assets'
-      
+
     class Summer < Sinatra::Base
-      helpers Sinatra::UrlForHelper
-      helpers Sinatra::StaticAssets
+      register Sinatra::StaticAssets
       # ...
     end
 
@@ -151,11 +149,11 @@ dispatches these applications to `/summer` and `/winter` sub URI:
 
     $LOAD_PATH.unshift('rwinter')
     require 'winter'
-    
+
     map '/summer' do
       run Sinatra::Summer.new
     end
-      
+
     map '/winter' do
       run Sinatra::Winter.new
     end
@@ -182,10 +180,10 @@ Next, create directories required by Passenger:
 and, finally, copy `config.ru` into `/srv/www/hitch.local` and
 update `LOAD_PATH` in the copied file.
 
-With everything in place, after restarting Apache2, 
+With everything in place, after restarting Apache2,
 the applications are accessible from the
 
-    http://hitch.local/summer    
+    http://hitch.local/summer
 
 and
 
@@ -197,9 +195,9 @@ respectively.
 
 1\. The `examples` directory contains *summer* and *winter* applications.
 
-2\. In order to create a virual host add the following to */etc/hosts/*: 
+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 
+or, read [editing /etc/hosts is waste of my
 time](http://www.taylorluk.com/articles/2009/08/12/hey-pac-man-sup-subdomains).

data/Rakefile

@@ -0,0 +1 @@
+require 'bundler/gem_tasks'

data/examples/rsummer/config.ru

@@ -1,4 +1,4 @@
-require 'summer'
+require './summer'
 
 use Rack::ShowExceptions
 use Rack::Lint

data/examples/rsummer/summer.rb

@@ -1,18 +1,15 @@
 # -*- coding: utf-8 -*-
 
 require 'sinatra/base'
-
-gem 'sinatra-static-assets'
 require 'sinatra/static_assets'
 
 module Sinatra
   class Summer < Sinatra::Base
-    helpers Sinatra::UrlForHelper
-    helpers Sinatra::StaticAssets
-    
+    register Sinatra::StaticAssets
+
     set :app_file,  __FILE__
-    set :static, true  
-    
+    set :static, true
+
     get '/?' do
       @title = "Tatra Mountains, Błyszcz (2159 m)"
       erb :index

data/examples/rwinter/winter.rb

@@ -7,12 +7,11 @@ require 'sinatra/static_assets'
 
 module Sinatra
   class Winter < Sinatra::Base
-    helpers Sinatra::UrlForHelper
-    helpers Sinatra::StaticAssets
-    
+    register Sinatra::StaticAssets
+
     set :app_file,  __FILE__
-    set :static, true  
-    
+    set :static, true
+
     get '/?' do
       @title = "Tatra Mountains, Dolina Gąsienicowa (1500 m)"
       erb :index

data/examples/summer/config.ru

@@ -1,4 +1,4 @@
-require 'summer'
+require './summer'
 
 use Rack::ShowExceptions
 run Sinatra::Application

data/examples/summer/summer.rb

@@ -1,8 +1,6 @@
 # -*- coding: utf-8 -*-
 
 require 'sinatra'
-
-gem 'sinatra-static-assets'
 require 'sinatra/static_assets'
 
 get "/?" do

data/examples/winter/config.ru

@@ -1,4 +1,4 @@
-require 'winter'
+require './winter'
 
 use Rack::ShowExceptions
 run Sinatra::Application

data/examples/winter/winter.rb

@@ -3,7 +3,6 @@
 require 'rubygems'
 require 'sinatra'
 
-gem 'sinatra-static-assets'
 require 'sinatra/static_assets'
 
 get "/?" do

data/lib/sinatra/static_assets.rb

@@ -1,5 +1,4 @@
 require 'sinatra/base'
-require 'sinatra/url_for'
 
 module Sinatra
   module StaticAssets
@@ -28,6 +27,8 @@ module Sinatra
         list.collect { |source| javascript_tag(source, options) }.join("\n")
       end
 
+      alias :javascript_include_tag :javascript_script_tag
+
       def link_to(desc, url, options = {})
         tag("a", options.merge(:href => url_for(url))) do
           desc
@@ -36,6 +37,10 @@ module Sinatra
 
       private
 
+      def url_for(addr, absolute = false)
+        uri(addr, absolute == :full ? true : false, true)
+      end
+
       def tag(name, local_options = {})
         start_tag = "<#{name}#{tag_options(local_options) if local_options}"
         if block_given?
@@ -49,7 +54,8 @@ module Sinatra
       def tag_options(options)
         unless options.empty?
           attrs = []
-          attrs = options.map { |key, value| %(#{key}="#{Rack::Utils.escape_html(value)}") }
+          #attrs = options.map { |key, value| %(#{key}="#{Rack::Utils.escape_html(value)}") }
+          attrs = options.map { |key, value| %(#{key}="#{value}") }
           " #{attrs.sort * ' '}" unless attrs.empty?
         end
       end
@@ -68,7 +74,7 @@ module Sinatra
 
       def extract_options(a)
         opts = a.last.is_a?(::Hash) ? a.pop : {}
-        [a, opts]  
+        [a, opts]
       end
 
     end

data/lib/sinatra/version.rb

@@ -0,0 +1,5 @@
+module Sinatra
+  module StaticAssets
+    VERSION = "1.0.0"
+  end
+end

data/sinatra-static-assets.gemspec

@@ -0,0 +1,27 @@
+# -*- encoding: utf-8 -*-
+
+$:.push File.expand_path("../lib", __FILE__)
+
+Gem::Specification.new do |s|
+  s.name        = "sinatra-static-assets"
+  s.version     = "1.0.0"
+  s.authors     = ["Włodek Bzyl"]
+  s.email       = ["matwb@ug.edu.pl"]
+  s.homepage    = ""
+  s.summary     = %q{A Sinatra extension.}
+  s.description = %q{This Sinatra extensions provides following helper methods:
+    - image_tag
+    - stylesheet_link_tag
+    - javascript_script_tag}
+
+  s.add_runtime_dependency 'sinatra', '>= 1.1.0'
+
+  s.add_development_dependency 'rack'
+  s.add_development_dependency 'rack-test'
+
+  s.rubyforge_project = "sinatra-static-assets"
+
+  s.files         = `git ls-files`.split("\n")
+  s.test_files    = `git ls-files -- {test}/*`.split("\n")
+  s.require_paths = ["lib"]
+end

data/test/sinatra_app.rb

@@ -4,7 +4,6 @@ $:.unshift(path) unless $:.include?(path)
 require 'rubygems'
 
 require 'sinatra'
-require 'sinatra/url_for'
 require 'sinatra/static_assets'
 
 get "/url_for" do

data/test/sinatra_baseapp.rb

@@ -8,11 +8,10 @@ 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")}"

data/test/sinatra_static_assets_test.rb

@@ -1,4 +1,4 @@
-require 'sinatra_app'
+require './test/sinatra_app'
 require 'test/unit'
 require 'rack/test'
 
@@ -20,7 +20,7 @@ class SintraStaticAssetsTest < Test::Unit::TestCase
 http://example.org/bar/foo
 EOD
   end
-  
+
   def test_image_tag_returns_sub_uri
     get '/image_tag', {}, 'SCRIPT_NAME' => '/bar'
     assert last_response.ok?
@@ -37,7 +37,7 @@ EOD
 <link charset="utf-8" href="/bar/stylesheets/summer.css" media="projection" rel="stylesheet" type="text/css">
 EOD
   end
-  
+
   def test_javascript_script_tag_returns_sub_uri
     get '/javascript_script_tag', {}, 'SCRIPT_NAME' => '/bar'
     assert last_response.ok?
@@ -45,7 +45,7 @@ EOD
 <script charset="iso-8859-2" src="/bar/javascripts/summer.js" type="text/javascript"></script>
 EOD
   end
-  
+
   def test_link_to_tag_returns_sub_uri
     get '/link_to_tag', {}, 'SCRIPT_NAME' => '/bar'
     assert last_response.ok?
@@ -53,5 +53,5 @@ EOD
 <a href="/bar/topr">Tatry Mountains Rescue Team</a>
 EOD
   end
-  
+
 end

data/test/sinatra_static_assets_xhtml_test.rb

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

metadata

@@ -1,73 +1,63 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: sinatra-static-assets
-version: !ruby/object:Gem::Version 
-  version: 0.5.0
+version: !ruby/object:Gem::Version
+  version: 1.0.0
+  prerelease: 
 platform: ruby
-authors: 
-- Wlodek Bzyl
+authors:
+- Włodek Bzyl
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2009-11-23 00:00:00 +01:00
+date: 2011-07-10 00:00:00.000000000 +02:00
 default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
-  name: rack
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: 1.0.0
-    version: 
-- !ruby/object:Gem::Dependency 
+dependencies:
+- !ruby/object:Gem::Dependency
   name: sinatra
+  requirement: &21435680 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.1.0
   type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: 0.9.1
-    version: 
-- !ruby/object:Gem::Dependency 
-  name: emk-sinatra-url-for
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: 0.2.1
-    version: 
-- !ruby/object:Gem::Dependency 
+  prerelease: false
+  version_requirements: *21435680
+- !ruby/object:Gem::Dependency
+  name: rack
+  requirement: &21435280 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: *21435280
+- !ruby/object:Gem::Dependency
   name: rack-test
+  requirement: &21434720 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: 0.3.0
-    version: 
-description: |
-  This Sinatra extensions provides following helper methods:
-    - image_tag
-    - stylesheet_link_tag
-    - javascript_script_tag
-
-email: matwb@univ.gda.pl
+  prerelease: false
+  version_requirements: *21434720
+description: ! "This Sinatra extensions provides following helper methods:\n    -
+  image_tag\n    - stylesheet_link_tag\n    - javascript_script_tag"
+email:
+- matwb@ug.edu.pl
 executables: []
-
 extensions: []
-
-extra_rdoc_files: 
+extra_rdoc_files: []
+files:
+- .gitignore
+- Gemfile
 - LICENSE
-- README.markdown
-files: 
-- VERSION.yml
+- README.md
+- Rakefile
 - examples/rconfig.ru
 - examples/rsummer/config.ru
 - examples/rsummer/public/images/tatry1.jpg
@@ -107,46 +97,35 @@ files:
 - examples/winter/views/layout.erb
 - examples/winter/winter.rb
 - lib/sinatra/static_assets.rb
+- lib/sinatra/version.rb
+- sinatra-static-assets.gemspec
 - 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
-homepage: http://github.com/wbzyl/sinatra-static-assets
+homepage: ''
 licenses: []
-
 post_install_message: 
-rdoc_options: 
-- --charset=UTF-8
-require_paths: 
+rdoc_options: []
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
-  version: 
-required_rubygems_version: !ruby/object:Gem::Requirement 
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
-  version: 
+required_ruby_version: !ruby/object:Gem::Requirement
+  none: false
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
+  none: false
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: sinatra-static-assets
-rubygems_version: 1.3.5
+rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
-summary: Sinatra extension providing helper methods to output tags for static assetgemspec.
-test_files: 
-- 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/rwinter/winter.rb
-- examples/winter/winter.rb
-- examples/rsummer/summer.rb
+summary: A Sinatra extension.
+test_files: []

data/VERSION.yml

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