ratpack 0.0.2 → 0.1.0

data/README.rdoc

@@ -23,8 +23,9 @@ See auto-generated documentation at {rdoc.info/projects/zeke/ratpack}[http://rdo
 
 == Colophon
 
-Thanks to the Sinatra page {Writing Extensions}[http://www.sinatrarb.com/extensions.html]
-Gem built with http://github.com/technicalpickles/jeweler/
+* Thanks to the Sinatra page on {Writing Extensions}[http://www.sinatrarb.com/extensions.html]
+* The url_for method was snagged from {http://github.com/emk/sinatra-url-for/}[github.com/emk/sinatra-url-for]
+* Gem built with {http://github.com/technicalpickles/jeweler/}[Jeweler]
 
 == Copyright
 

data/lib/sinatra/ratpack.rb

@@ -5,47 +5,61 @@ module Sinatra
 
     # Accepts a single filename or an array of filenames (with or without .js extension)
     # Assumes javascripts are in public/javascripts
-    def javscript_include_tag(string_or_array)
+    def javascript_include_tag(string_or_array, *args)
       files = string_or_array.is_a?(Array) ? string_or_array : [string_or_array]
+      options = {
+        :charset => "utf-8",
+        :type => "text/javascript",
+      }.merge(args.extract_options!)
+
       files.map do |file|
-        path = "/javascripts/#{ file.gsub(/\.js/i, "") }.js"
-        "<script type='text/javascript' src='#{path}'></script>"
+        path = "#{ file.gsub(/\.js/i, "") }.js" # Append .js if needed
+        path = "/javascripts/#{path}" unless path.include? "://" # Add stylesheets directory to path if not a full URL
+        options[:src] = url_for(path)
+        content_tag(:script, "", options)
       end.join("\n")
     end
   
     # Accepts a single filename or an array of filenames (with or without .css extension)
     # Assumes stylesheets are in public/stylesheets
-    def stylesheet_link_tag(string_or_array)
+    def stylesheet_link_tag(string_or_array, *args)
       files = string_or_array.is_a?(Array) ? string_or_array : [string_or_array]
+      options = {
+        :charset => "utf-8",
+        :media => "screen, projection",
+        :rel => "stylesheet",
+        :type => "text/css",
+      }.merge(args.extract_options!)
+
       files.map do |file|
-        path = "/stylesheets/#{ file.gsub(/\.css/i, "") }.css"
-        "<link rel='stylesheet' type='text/css' media='screen, projection' href='#{path}'>"
+        path = "#{ file.gsub(/\.css/i, "") }.css" # Append .css if needed
+        path = "/stylesheets/#{path}" unless path.include? "://" # Add stylesheets directory to path if not a full URL
+        options[:href] = url_for(path)
+        tag(:link, options)        
       end.join("\n")
     end
         
     # Accepts a full URL, an image filename, or a path underneath /public/images/
-    def image_tag(src,options={})
-      options[:src] = src.include?("://") ? src : "/images/#{src}"
+    def image_tag(src, options={})
+      options[:src] = url_for(src)
       tag(:img, options)
     end
     
     # Works like link_to, but href is optional. If no href supplied, content is used as href
     def link_to(content,href=nil,options={})
       href ||= content
-      options.update :href => href
+      options.update :href => url_for(href)
       content_tag :a, content, options
     end
   
     # Just like Rails' content_tag
     def content_tag(name,content,options={})
-      options = options.map{ |k,v| "#{k}='#{v}'" }.join(" ")
-      "<#{name} #{options}>#{content}</#{name}>"
+      "<#{name} #{options.to_html_attrs}>#{content}</#{name}>"
     end
   
     # Just like Rails' tag
     def tag(name,options={})
-      options = options.map{ |k,v| "#{k}='#{v}'" }.join(" ")
-      "<#{name} #{options} />"
+      "<#{name} #{options.to_html_attrs} />"
     end
 
     # Give this helper an array, and get back a string of <li> elements. 
@@ -59,8 +73,59 @@ module Sinatra
         all << content_tag(:li, item, :class => css.join(" "))
       end.join("\n")
     end
+    
+    # Construct a link to +url_fragment+, which should be given relative to
+    # the base of this Sinatra app.  The mode should be either
+    # <code>:path_only</code>, which will generate an absolute path within
+    # the current domain (the default), or <code>:full</code>, which will
+    # include the site name and port number.  (The latter is typically
+    # necessary for links in RSS feeds.)  Example usage:
+    #
+    #   url_for "/"                       # Returns "/myapp/"
+    #   url_for "/foo"                    # Returns "/myapp/foo"
+    #   url_for "/foo", :full             # Returns "http://example.com/myapp/foo"
+    #   url_for "http://bar.com"          # Returns "http://bar.com"
+    def url_for url_fragment, mode=:path_only
+      return url_fragment if url_fragment.include? "://"
+      url_fragment = "/#{url_fragment}" unless url_fragment.starts_with? "/"
+      case mode
+      when :path_only
+        base = request.script_name
+      when :full
+        scheme = request.scheme
+        if (scheme == 'http' && request.port == 80 ||
+            scheme == 'https' && request.port == 443)
+          port = ""
+        else
+          port = ":#{request.port}"
+        end
+        base = "#{scheme}://#{request.host}#{port}#{request.script_name}"
+      else
+        raise TypeError, "Unknown url_for mode #{mode}"
+      end
+      "#{base}#{url_fragment}"
+    end 
 
   end
 
   helpers Ratpack
+end
+
+class Array
+  def extract_options!
+    last.is_a?(::Hash) ? pop : {}
+  end
+end
+
+class Hash
+  def to_html_attrs
+    self.map{ |k,v| "#{k}=\"#{v}\"" }.sort.join(" ")
+  end
+end
+
+class String
+ def starts_with?(prefix)
+   prefix = prefix.to_s
+   self[0, prefix.length] == prefix
+ end
 end

data/test/ratpack_test.rb

@@ -0,0 +1,64 @@
+require 'sinatra_app'
+require 'test/unit'
+require 'rack/test'
+
+set :environment, :test
+
+class RatpackTest < Test::Unit::TestCase
+  include Rack::Test::Methods
+
+  def app
+    Sinatra::Application
+  end
+
+  def test_url_for
+    get '/url_for', {}, 'SCRIPT_NAME' => '/bar'
+    assert last_response.ok?
+    assert_equal last_response.body,  <<EOD
+/bar/
+/bar/foo
+http://example.org/bar/foo
+EOD
+  end
+    
+  def test_javascript_include_tag
+    get '/javascript_include_tag', {}, 'SCRIPT_NAME' => '/bar'
+    assert last_response.ok?
+    assert_equal last_response.body,  <<EOD
+<script charset="utf-8" src="/bar/javascripts/summer.js" type="text/javascript"></script>
+<script charset="utf-8" src="http://example.com/autumn.js" type="text/javascript"></script>
+<script charset="utf-8" src="/bar/javascripts/day.js" type="text/javascript"></script>
+<script charset="utf-8" src="/bar/javascripts/night.js" type="text/javascript"></script>
+EOD
+  end
+
+  def test_stylesheet_link_tag
+    get '/stylesheet_link_tag', {}, 'SCRIPT_NAME' => '/bar'
+    assert last_response.ok?
+    assert_equal last_response.body,  <<EOD
+<link charset="utf-8" href="/bar/stylesheets/winter.css" media="projection" rel="stylesheet" type="text/css" />
+<link charset="utf-8" href="/bar/stylesheets/summer.css" media="projection" rel="stylesheet" type="text/css" />
+<link charset="utf-8" href="http://example.com/autumn.css" media="screen, projection" rel="stylesheet" type="text/css" />
+EOD
+  end
+  
+  def test_image_tag
+    get '/image_tag', {}, 'SCRIPT_NAME' => '/bar'
+    assert last_response.ok?
+    assert_equal last_response.body,  <<EOD
+<img alt="[foo image]" src="/bar/images/foo.jpg" />
+EOD
+  end
+  
+  def test_link_to
+    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/no_label.xyz">no_label.xyz</a>
+<a href="http://foo.com/party/time">Party</a>
+<a href="/bar/cheezburger" title="food">Food</a>
+EOD
+  end
+  
+end

data/test/sinatra_app.rb

@@ -0,0 +1,49 @@
+path = File.expand_path("../lib" + File.dirname(__FILE__))
+$:.unshift(path) unless $:.include?(path)
+
+require 'rubygems'
+require 'sinatra'
+require 'sinatra/ratpack'
+
+get "/url_for" do
+  content_type "text/plain"
+  <<"EOD"
+#{url_for("/")}
+#{url_for("/foo")}
+#{url_for("/foo", :full)}
+EOD
+end
+
+get "/image_tag" do
+  content_type "text/plain"
+  <<"EOD"
+#{image_tag("/images/foo.jpg", :alt => "[foo image]")}
+EOD
+end
+
+get "/stylesheet_link_tag" do
+  content_type "text/plain"
+  <<"EOD"
+#{stylesheet_link_tag(%w(winter summer), :media => "projection")}
+#{stylesheet_link_tag("http://example.com/autumn.css")}
+EOD
+end
+
+get "/javascript_include_tag" do
+  content_type "text/plain"
+  <<"EOD"
+#{javascript_include_tag "summer.js"}
+#{javascript_include_tag "http://example.com/autumn.js"}
+#{javascript_include_tag %w(day night)}
+EOD
+end
+
+get "/link_to_tag" do
+  content_type "text/plain"
+  <<"EOD"
+#{link_to "Tatry Mountains Rescue Team", "/topr"}
+#{link_to "no_label.xyz"}
+#{link_to "Party", "http://foo.com/party/time"}
+#{link_to "Food", "/cheezburger", :title => "food"}
+EOD
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: ratpack
 version: !ruby/object:Gem::Version 
-  version: 0.0.2
+  version: 0.1.0
 platform: ruby
 authors: 
 - Zeke Sikelianos
@@ -9,18 +9,38 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-10-21 00:00:00 -07:00
+date: 2009-10-26 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: thoughtbot-shoulda
+  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 
+  name: sinatra
+  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: rack-test
   type: :development
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: "0"
+        version: 0.3.0
     version: 
 description: link_to, content_tag, stylesheet_link_tag, javascript_include_tag, etc
 email: zeke@sikelianos.com
@@ -32,16 +52,11 @@ extra_rdoc_files:
 - LICENSE
 - README.rdoc
 files: 
-- .document
-- .gitignore
+- lib/sinatra/ratpack.rb
+- test/ratpack_test.rb
+- test/sinatra_app.rb
 - LICENSE
 - README.rdoc
-- Rakefile
-- VERSION
-- lib/sinatra/ratpack.rb
-- ratpack.gemspec
-- test/helper.rb
-- test/test_ratpack.rb
 has_rdoc: true
 homepage: http://github.com/zeke/ratpack
 licenses: []
@@ -71,5 +86,5 @@ signing_key:
 specification_version: 3
 summary: A set of view helpers for Sinatra. Inspired by Rails' ActionView helpers
 test_files: 
-- test/helper.rb
-- test/test_ratpack.rb
+- test/ratpack_test.rb
+- test/sinatra_app.rb

data/.document

@@ -1,5 +0,0 @@
-README.rdoc
-lib/**/*.rb
-bin/*
-features/**/*.feature
-LICENSE

data/.gitignore

@@ -1,21 +0,0 @@
-## MAC OS
-.DS_Store
-
-## TEXTMATE
-*.tmproj
-tmtags
-
-## EMACS
-*~
-\#*
-.\#*
-
-## VIM
-*.swp
-
-## PROJECT::GENERAL
-coverage
-rdoc
-pkg
-
-## PROJECT::SPECIFIC

data/Rakefile

@@ -1,53 +0,0 @@
-require 'rubygems'
-require 'rake'
-
-begin
-  require 'jeweler'
-  Jeweler::Tasks.new do |gem|
-    gem.name = "ratpack"
-    gem.summary = %Q{A set of view helpers for Sinatra. Inspired by Rails' ActionView helpers}
-    gem.description = %Q{link_to, content_tag, stylesheet_link_tag, javascript_include_tag, etc}
-    gem.email = "zeke@sikelianos.com"
-    gem.homepage = "http://github.com/zeke/ratpack"
-    gem.authors = ["Zeke Sikelianos"]
-    gem.add_development_dependency "thoughtbot-shoulda", ">= 0"
-    # gem is a Gem::Specification... see http://www.rubygems.org/read/chapter/20 for additional settings
-  end
-  Jeweler::GemcutterTasks.new
-rescue LoadError
-  puts "Jeweler (or a dependency) not available. Install it with: sudo gem install jeweler"
-end
-
-require 'rake/testtask'
-Rake::TestTask.new(:test) do |test|
-  test.libs << 'lib' << 'test'
-  test.pattern = 'test/**/test_*.rb'
-  test.verbose = true
-end
-
-begin
-  require 'rcov/rcovtask'
-  Rcov::RcovTask.new do |test|
-    test.libs << 'test'
-    test.pattern = 'test/**/test_*.rb'
-    test.verbose = true
-  end
-rescue LoadError
-  task :rcov do
-    abort "RCov is not available. In order to run rcov, you must: sudo gem install spicycode-rcov"
-  end
-end
-
-task :test => :check_dependencies
-
-task :default => :test
-
-require 'rake/rdoctask'
-Rake::RDocTask.new do |rdoc|
-  version = File.exist?('VERSION') ? File.read('VERSION') : ""
-
-  rdoc.rdoc_dir = 'rdoc'
-  rdoc.title = "ratpack #{version}"
-  rdoc.rdoc_files.include('README*')
-  rdoc.rdoc_files.include('lib/**/*.rb')
-end

data/VERSION

@@ -1 +0,0 @@
-0.0.2

data/ratpack.gemspec

@@ -1,54 +0,0 @@
-# Generated by jeweler
-# DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in Rakefile, and run the gemspec command
-# -*- encoding: utf-8 -*-
-
-Gem::Specification.new do |s|
-  s.name = %q{ratpack}
-  s.version = "0.0.2"
-
-  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.authors = ["Zeke Sikelianos"]
-  s.date = %q{2009-10-21}
-  s.description = %q{link_to, content_tag, stylesheet_link_tag, javascript_include_tag, etc}
-  s.email = %q{zeke@sikelianos.com}
-  s.extra_rdoc_files = [
-    "LICENSE",
-     "README.rdoc"
-  ]
-  s.files = [
-    ".document",
-     ".gitignore",
-     "LICENSE",
-     "README.rdoc",
-     "Rakefile",
-     "VERSION",
-     "lib/sinatra/ratpack.rb",
-     "ratpack.gemspec",
-     "test/helper.rb",
-     "test/test_ratpack.rb"
-  ]
-  s.homepage = %q{http://github.com/zeke/ratpack}
-  s.rdoc_options = ["--charset=UTF-8"]
-  s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.5}
-  s.summary = %q{A set of view helpers for Sinatra. Inspired by Rails' ActionView helpers}
-  s.test_files = [
-    "test/helper.rb",
-     "test/test_ratpack.rb"
-  ]
-
-  if s.respond_to? :specification_version then
-    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
-    s.specification_version = 3
-
-    if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
-      s.add_development_dependency(%q<thoughtbot-shoulda>, [">= 0"])
-    else
-      s.add_dependency(%q<thoughtbot-shoulda>, [">= 0"])
-    end
-  else
-    s.add_dependency(%q<thoughtbot-shoulda>, [">= 0"])
-  end
-end
-

data/test/helper.rb

@@ -1,10 +0,0 @@
-require 'rubygems'
-require 'test/unit'
-require 'shoulda'
-
-$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
-$LOAD_PATH.unshift(File.dirname(__FILE__))
-require 'ratpack'
-
-class Test::Unit::TestCase
-end

data/test/test_ratpack.rb

@@ -1,7 +0,0 @@
-require 'helper'
-
-class TestRatpack < Test::Unit::TestCase
-  should "probably rename this file and start testing for real" do
-    flunk "hey buddy, you should probably rename this file and start testing for real"
-  end
-end