sinatra_more 0.0.14 → 0.1.0

data/README.rdoc

@@ -2,7 +2,7 @@
 
 == Introduction
 
-(Not quite ready to be used yet!)
+Note: This library is experimental and may not work 100% yet. This will be removed once more testing has been done.
 
 This will be a plugin which expand sinatra's capabilities in many ways. 
 Note that certain template specific helpers are known to work with haml, erb, and erubis
@@ -273,6 +273,10 @@ Thanks to keldredd for the sinatra-helpers code that helped me to create erb cap
 * Nathan Esquenazi - Project creator and code maintainer
 * Arthur Chiu      - Forming the idea and various code contributions
 
+== Known Issues
+
+* tag helper methods accepting blocks work quite unreliably in erb. Work must be done to improve this.
+
 == Note on Patches/Pull Requests
  
 * Fork the project.

data/TODO

@@ -1,8 +1,5 @@
 = UNFINISHED
 
-* fix content_block_tag to eliminate need for concat option
-* image_tag should start in images_path (or /images)
-* I have got to add tests, basically create dummy sinatra applications and use Webrat
 * Become total warden solution (basically just require warden gem installed, do everything else)
   * Make warden password strategy support a callback which explains what to do with username, password
   * WardenPlugin.authenticate_callback { |username, password| User.authenticate(username, password) }
@@ -11,4 +8,7 @@
 = COMPLETED
 
 * Pull from sinatra-helpers and make erb templates work (and credit keldredd)
-  - http://github.com/kelredd/sinatra-helpers/tree/master/lib/sinatra_helpers/erb/
+  - http://github.com/kelredd/sinatra-helpers/tree/master/lib/sinatra_helpers/erb/
+* fix content_block_tag to eliminate need for concat option
+* image_tag should start in images_path (or /images)
+* I have got to add tests, basically create dummy sinatra applications and use Webrat

data/VERSION

@@ -1 +1 @@
-0.0.14
+0.1.0

data/lib/sinatra_more/markup_plugin/asset_tag_helpers.rb

@@ -1,6 +1,6 @@
 module SinatraMore
   module AssetTagHelpers
-    
+
     # Creates a div to display the flash of given type if it exists
     # flash_tag(:notice, :class => 'flash', :id => 'flash-notice')
     def flash_tag(kind, options={})
@@ -9,7 +9,7 @@ module SinatraMore
       options.reverse_merge!(:class => 'flash')
       content_tag(:div, flash_text, options)
     end
-    
+
     # Creates a link element with given name, url and options
     # link_to 'click me', '/dashboard', :class => 'linky'
     # link_to('/dashboard', :class => 'blocky') do ... end
@@ -19,7 +19,8 @@ module SinatraMore
         url, options = (args[0] || 'javascript:void(0);'), (args[1] || {})
         options.reverse_merge!(:href => url)
         link_content = capture_html(&block)
-        concat_content(content_tag(:a, link_content, options))
+        result_link = content_tag(:a, link_content, options)
+        block_is_template?(block) ? concat_content(result_link) : result_link
       else
         name, url, options = args.first, (args[1] || 'javascript:void(0);'), (args[2] || {})
         options.reverse_merge!(:href => url)
@@ -30,7 +31,7 @@ module SinatraMore
     # Creates an image element with given url and options
     # image_tag('icons/avatar.png')
     def image_tag(url, options={})
-      options.reverse_merge!(:src => url)
+      options.reverse_merge!(:src => image_path(url))
       tag(:img, options)
     end
 
@@ -41,24 +42,44 @@ module SinatraMore
       sources.collect { |sheet| stylesheet_tag(sheet, options) }.join("\n")
     end
 
-    # stylesheet_tag('style', :media => 'screen')
-    def stylesheet_tag(source, options={})
-      rel_path = "/stylesheets/#{source}.css?#{Time.now.to_i}"
-      options = options.dup.reverse_merge!(:href => rel_path, :media => 'screen', :rel => 'stylesheet', :type => 'text/css')
-      tag(:link, options)
-    end
-
     # javascript_include_tag 'application', 'special'
     def javascript_include_tag(*sources)
       options = sources.extract_options!.symbolize_keys
       sources.collect { |script| javascript_tag(script, options) }.join("\n")
     end
 
+    protected
+
+    # stylesheet_tag('style', :media => 'screen')
+    def stylesheet_tag(source, options={})
+      options = options.dup.reverse_merge!(:href => stylesheet_path(source), :media => 'screen', :rel => 'stylesheet', :type => 'text/css')
+      tag(:link, options)
+    end
+
     # javascript_tag 'application', :src => '/javascripts/base/application.js'
     def javascript_tag(source, options={})
-      rel_path = "/javascripts/#{source}.js?#{Time.now.to_i}"
-      options = options.dup.reverse_merge!(:content => "", :src => rel_path, :type => 'text/javascript')
+      options = options.dup.reverse_merge!(:src => javascript_path(source), :type => 'text/javascript', :content => "")
       tag(:script, options)
     end
+
+    # Returns the path to the image, either relative or absolute
+    def image_path(src)
+      src.gsub!(/\s/, '')
+      src =~ %r{^\s*/} ? src : File.join('/images', src)
+    end
+
+    def javascript_path(source)
+      return source if source =~ /^http/
+      result_path = "/javascripts/#{File.basename(source, '.js')}.js"
+      stamp = File.exist?(result_path) ? File.mtime(result_path) : Time.now.to_i
+      "#{result_path}?#{stamp}"
+    end
+
+    def stylesheet_path(source)
+      return source if source =~ /^http/
+      result_path = "/stylesheets/#{File.basename(source, '.css')}.css"
+      stamp = File.exist?(result_path) ? File.mtime(result_path) : Time.now.to_i
+      "#{result_path}?#{stamp}"
+    end
   end
 end

data/lib/sinatra_more/markup_plugin/output_helpers.rb

@@ -6,7 +6,8 @@ module SinatraMore
       if self.respond_to?(:is_haml?) && is_haml?
          block_is_haml?(block) ? capture_haml(*args, &block) : block.call
       else
-        capture_erb(*args, &block)
+        result_text = capture_erb(*args, &block)
+        result_text.present? ? result_text : block.call
       end
     end
     
@@ -26,6 +27,8 @@ module SinatraMore
     def block_is_template?(block)
        block && (block_is_erb?(block) || (self.respond_to?(:block_is_haml?) && block_is_haml?(block)))
     end
+    
+    protected
 
     # Used to capture the html from a block of erb code
     # capture_erb(&block) => '...html...'

data/lib/sinatra_more/markup_plugin/tag_helpers.rb

@@ -10,7 +10,7 @@ module SinatraMore
     # Creates an html tag with given name, content and options
     # content_tag(:p, "hello", :class => 'light')
     # content_tag(:p, :class => 'dark') do ... end
-    # parameters: content_tag(name, content=nil, options={})
+    # parameters: content_tag(name, content=nil, options={}, &block)
     def content_tag(*args, &block)
       name = args.first
       options = args.extract_options!
@@ -25,6 +25,7 @@ module SinatraMore
     # tag(:p, :content => "hello", :class => 'large')
     def tag(name, options={})
       content = options.delete(:content)
+      options = options.sort { |a, b| a.to_s <=> b.to_s }
       html_attrs = options.collect { |a, v| v.blank? ? nil : "#{a}=\"#{v}\"" }.compact.join(" ")
       base_tag = (html_attrs.present? ? "<#{name} #{html_attrs}" : "<#{name}")
       base_tag << (content ? ">#{content}</#{name}>" : " />")

data/lib/sinatra_more/render_plugin/render_helpers.rb

@@ -27,14 +27,16 @@ module SinatraMore
       options = args.extract_options!
       options.merge!(:layout => false)
       path = template.to_s.split(File::SEPARATOR)
-      object = path[-1].to_sym
+      object_name = path[-1].to_sym
       path[-1] = "_#{path[-1]}"
       template_path = File.join(path)
       if collection = options.delete(:collection)
         collection.inject([]) do |buffer, member|
-          collection_options = options.merge(:layout => false, :locals => {object => member})
+          collection_options = options.merge(:layout => false, :locals => { object_name => member })
           buffer << render_template(template_path, collection_options)
         end.join("\n")
+      elsif object_record = options.delete(:object)
+        render_template(template_path, options.merge(:locals => { object_name => object_record }))
       else
         render_template(template_path, options)
       end

data/lib/sinatra_more/warden_plugin/warden_helpers.rb

@@ -47,7 +47,7 @@ module SinatraMore
     # Forces a user to return to a fail path unless they are authorized
     # Used to require a user be authenticated before routing to an action
     def must_be_authorized!(failure_path=nil)
-      redirect_to(failure_path ? failure_path : '/') unless authenticated?
+      redirect(failure_path ? failure_path : '/') unless authenticated?
     end
 
     # Returns the raw warden authentication handler

data/lib/sinatra_more/warden_plugin.rb

@@ -1,3 +1,4 @@
+load File.dirname(__FILE__) + '/markup_plugin/output_helpers.rb'
 Dir[File.dirname(__FILE__) + '/warden_plugin/**/*.rb'].each {|file| load file }
 
 module SinatraMore
@@ -7,6 +8,7 @@ module SinatraMore
         manager.default_strategies :password
         manager.failure_app = app
       end
+      app.helpers SinatraMore::OutputHelpers
       app.helpers SinatraMore::WardenHelpers
 
       # TODO Improve serializing methods

data/sinatra_more.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{sinatra_more}
-  s.version = "0.0.14"
+  s.version = "0.1.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Nathan Esquenazi"]
-  s.date = %q{2009-10-25}
+  s.date = %q{2009-10-26}
   s.description = %q{Expands sinatra with standard helpers and tools to allow for complex applications}
   s.email = %q{nesquena@gmail.com}
   s.extra_rdoc_files = [
@@ -38,11 +38,29 @@ Gem::Specification.new do |s|
      "lib/sinatra_more/warden_plugin.rb",
      "lib/sinatra_more/warden_plugin/warden_helpers.rb",
      "sinatra_more.gemspec",
+     "test/fixtures/markup_app/app.rb",
+     "test/fixtures/markup_app/views/capture_concat.erb",
+     "test/fixtures/markup_app/views/capture_concat.haml",
+     "test/fixtures/markup_app/views/content_tag.erb",
+     "test/fixtures/markup_app/views/content_tag.haml",
+     "test/fixtures/markup_app/views/link_to.erb",
+     "test/fixtures/markup_app/views/link_to.haml",
      "test/fixtures/render_app/app.rb",
-     "test/fixtures/render_app/views/bar/test.erb",
-     "test/fixtures/render_app/views/foo/test.haml",
+     "test/fixtures/render_app/views/erb/test.erb",
+     "test/fixtures/render_app/views/haml/test.haml",
+     "test/fixtures/render_app/views/template/_user.haml",
+     "test/fixtures/render_app/views/template/haml_template.haml",
+     "test/fixtures/render_app/views/template/some_template.haml",
      "test/fixtures/warden_app/app.rb",
+     "test/fixtures/warden_app/views/dashboard.haml",
      "test/helper.rb",
+     "test/markup_plugin/test_asset_tag_helpers.rb",
+     "test/markup_plugin/test_form_builder.rb",
+     "test/markup_plugin/test_form_helpers.rb",
+     "test/markup_plugin/test_format_helpers.rb",
+     "test/markup_plugin/test_output_helpers.rb",
+     "test/markup_plugin/test_tag_helpers.rb",
+     "test/test_markup_plugin.rb",
      "test/test_render_plugin.rb",
      "test/test_warden_plugin.rb"
   ]
@@ -52,9 +70,17 @@ Gem::Specification.new do |s|
   s.rubygems_version = %q{1.3.5}
   s.summary = %q{Expands sinatra to allow for complex applications}
   s.test_files = [
-    "test/fixtures/render_app/app.rb",
+    "test/fixtures/markup_app/app.rb",
+     "test/fixtures/render_app/app.rb",
      "test/fixtures/warden_app/app.rb",
      "test/helper.rb",
+     "test/markup_plugin/test_asset_tag_helpers.rb",
+     "test/markup_plugin/test_form_builder.rb",
+     "test/markup_plugin/test_form_helpers.rb",
+     "test/markup_plugin/test_format_helpers.rb",
+     "test/markup_plugin/test_output_helpers.rb",
+     "test/markup_plugin/test_tag_helpers.rb",
+     "test/test_markup_plugin.rb",
      "test/test_render_plugin.rb",
      "test/test_warden_plugin.rb"
   ]

data/test/fixtures/markup_app/app.rb

@@ -0,0 +1,47 @@
+require 'sinatra/base'
+require 'active_support'
+require 'sinatra_more'
+require 'haml'
+
+class MarkupDemo < Sinatra::Base
+  register SinatraMore::MarkupPlugin
+
+  configure do
+    set :root, File.dirname(__FILE__)
+  end
+  
+  get '/:engine/:file' do
+    show(params[:engine], params[:file].to_sym)
+  end
+
+  helpers do
+    # show :erb, :index
+    # show :haml, :index
+    def show(kind, template)
+      eval("#{kind.to_s} #{template.to_sym.inspect}")
+    end
+    
+    def captured_content(&block)
+      content_html = capture_html(&block)
+      "<p>#{content_html}</p>"
+    end
+    
+    def concat_in_p(content_html)
+      concat_content "<p>#{content_html}</p>"
+    end
+    
+    def ruby_not_template_block
+      determine_block_is_template('ruby') do
+        content_tag(:span, "This not a template block")
+      end
+    end
+    
+    def determine_block_is_template(name, &block)
+      if block_given?
+        concat_content "<p class='is_template'>The #{name} block passed in is a template</p>" if block_is_template?(block)
+      else
+        concat_content "<p class='is_template'>The #{name} block passed in is a template</p>" if block_is_template?(block)
+      end
+    end
+  end
+end

data/test/fixtures/markup_app/views/capture_concat.erb

@@ -0,0 +1,14 @@
+<% @content = captured_content do %>
+  <span>Captured Line 1</span>
+  <span>Captured Line 2</span>
+<% end %>
+<%= @content %>
+
+<% concat_in_p('Concat Line 3') %>
+
+<% determine_block_is_template('haml') do %>
+  <span>This is erb</span>
+  <span>This is erb</span>
+<% end %>
+  
+<% ruby_not_template_block %>

data/test/fixtures/markup_app/views/capture_concat.haml

@@ -0,0 +1,13 @@
+- @content = captured_content do
+  %span Captured Line 1
+  %span Captured Line 2
+= @content
+
+- concat_in_p('Concat Line 3')
+
+- determine_block_is_template('haml') do
+  %span This is haml
+  %span This is haml
+  
+- ruby_not_template_block
+  

data/test/fixtures/markup_app/views/content_tag.erb

@@ -0,0 +1,11 @@
+<%= content_tag :p, "Test 1", :class => 'test', :id => "test1" %>
+
+<%= content_tag :p, "Test 2" %>
+
+<% content_tag(:p, :class => 'test', :id => 'test3') do %>
+  <span>Test 3</span>
+<% end %>
+  
+<% content_tag(:p) do %>
+  <span>Test 4</span>
+<% end %>

data/test/fixtures/markup_app/views/content_tag.haml

@@ -0,0 +1,9 @@
+= content_tag :p, "Test 1", :class => 'test', :id => "test1"
+
+= content_tag :p, "Test 2"
+
+- content_tag(:p, :class => 'test', :id => 'test3') do
+  %span Test 3
+  
+- content_tag(:p) do
+  %span Test 4

data/test/fixtures/markup_app/views/link_to.erb

@@ -0,0 +1,5 @@
+<%= link_to "Test 1 No Block", '/test1', :class => 'test', :id => 'test1' %>
+
+<% link_to("/test2", :class => 'test', :id => 'test2') do %>
+  <span>Test 2 With Block</span>
+<% end %>

data/test/fixtures/markup_app/views/link_to.haml

@@ -0,0 +1,4 @@
+= link_to "Test 1 No Block", '/test1', :class => 'test', :id => 'test1'
+
+- link_to("/test2", :class => 'test', :id => 'test2') do
+  %span Test 2 With Block

data/test/fixtures/render_app/app.rb

@@ -2,6 +2,11 @@ require 'sinatra/base'
 require 'sinatra_more'
 require 'haml'
 
+class RenderUser
+  attr_accessor :name
+  def initialize(name); @name = name; end
+end
+
 class RenderDemo < Sinatra::Base
   register SinatraMore::RenderPlugin
   
@@ -9,13 +14,41 @@ class RenderDemo < Sinatra::Base
     set :root, File.dirname(__FILE__)
   end
   
+  # haml_template
   get '/render_haml' do
     @template = 'haml'
-    haml_template 'foo/test'
+    haml_template 'haml/test'
   end
   
+  # erb_template
   get '/render_erb' do
     @template = 'erb'
-    erb_template 'bar/test'
+    erb_template 'erb/test'
   end
-end
+  
+  # render_template with explicit engine
+  get '/render_template/:engine' do
+    @template = params[:engine]
+    render_template "template/#{@template}_template", :template_engine => @template
+  end
+  
+  # render_template without explicit engine
+  get '/render_template' do
+    render_template "template/some_template"
+  end
+  
+  # partial with object
+  get '/partial/object' do
+    partial 'template/user', :object => RenderUser.new('John')
+  end
+  
+  # partial with collection
+  get '/partial/collection' do
+    partial 'template/user', :collection => [RenderUser.new('John'), RenderUser.new('Billy')]
+  end
+  
+  # partial with locals
+  get '/partial/locals' do
+    partial 'template/user', :locals => { :user => RenderUser.new('John') }
+  end
+end

data/test/fixtures/render_app/views/template/_user.haml

@@ -0,0 +1 @@
+%h1 User name is #{user.name}

data/test/fixtures/render_app/views/template/haml_template.haml

@@ -0,0 +1 @@
+%h1 This is a #{@template} template sent from render_template!

data/test/fixtures/render_app/views/template/some_template.haml

@@ -0,0 +1,2 @@
+
+%h1 This is a haml template which was detected!

data/test/fixtures/warden_app/app.rb

@@ -30,11 +30,40 @@ class WardenDemo < Sinatra::Base
     set :root, File.dirname(__FILE__)
   end
   
+  get '/login' do
+    "<h1>Please login!</h1>"
+  end
+  
   post '/login' do
     authenticate_user!
   end
   
+  get '/logout' do
+    logout_user!
+  end
+  
+  get '/logged_in' do
+    "<h1>logged_in? #{logged_in?}</h1>"
+  end
+  
+  get '/authenticated' do
+    haml :dashboard
+  end
+  
+  get '/unregistered' do
+    haml :dashboard
+  end
+  
+  get '/must_be_authorized' do
+    must_be_authorized!('/login')
+    "<h1>Valid Authorized Page</h1>"
+  end
+  
   get '/current_user' do
-    "<h1>#{current_user.send(:name)}</h1>"
+    if current_user
+      "<h1>#{current_user.name}</h1>"
+    else
+      "<h2>Not logged in</h2>"
+    end
   end
 end

data/test/fixtures/warden_app/views/dashboard.haml

@@ -0,0 +1,6 @@
+%h1 Dashboard
+
+- authenticated? do
+  %p Dashboard, You are logged in!
+- unregistered? do
+  %p Dashboard, You are unregistered!

data/test/helper.rb

@@ -12,9 +12,23 @@ require 'sinatra_more'
 class Test::Unit::TestCase
   include Rack::Test::Methods
   include Webrat::Methods
-  include Webrat::Matchers    
-  
+  include Webrat::Matchers
+
   Webrat.configure do |config|
     config.mode = :rack
   end
+  
+  def stop_time_for_test
+    time = Time.now
+    Time.stubs(:now).returns(time)
+    return time
+  end
+end
+
+module Webrat
+  module Logging
+    def logger # :nodoc:
+      @logger = nil
+    end
+  end
 end

data/test/markup_plugin/test_asset_tag_helpers.rb

@@ -0,0 +1,89 @@
+require 'test_markup_plugin' unless defined?(TestMarkupPlugin)
+
+class TestAssetTagHelpers < TestMarkupPlugin
+  include SinatraMore::AssetTagHelpers
+  
+  def flash
+    { :notice => "Demo notice" }    
+  end
+  
+  context 'for #flash_tag method' do
+    should "display flash with no given attributes" do
+      assert_equal '<div class="flash">Demo notice</div>', flash_tag(:notice)
+    end
+    should "display flash with given attributes" do
+      flash_expected = '<div class="notice" id="notice-area">Demo notice</div>'
+      assert_equal flash_expected, flash_tag(:notice, :class => 'notice', :id => 'notice-area')
+    end
+  end
+  
+  context 'for #link_to method' do
+    should "display link element with no given attributes" do
+      assert_equal '<a href="/register">Sign up</a>', link_to('Sign up', '/register')
+    end
+    should "display link element with given attributes" do
+      link_expected = '<a class="first" href="/register" id="linky">Sign up</a>'
+      assert_equal link_expected, link_to('Sign up', '/register', :class => 'first', :id => 'linky')
+    end
+    should "display link element with ruby block" do
+      link_expected = '<a class="first" href="/register" id="binky">Sign up</a>'
+      actual_link = link_to('/register', :class => 'first', :id => 'binky') do
+        "Sign up"
+      end
+      assert_equal link_expected, actual_link
+    end
+    should "display link block element in haml" do
+      visit '/haml/link_to'
+      assert_have_selector :a, :content => "Test 1 No Block", :href => '/test1', :class => 'test', :id => 'test1'
+      assert_have_selector :a, :content => "Test 2 With Block", :href => '/test2', :class => 'test', :id => 'test2'
+    end
+    should "display link block element in erb" do
+      visit '/erb/link_to'
+      assert_have_selector :a, :content => "Test 1 No Block", :href => '/test1', :class => 'test', :id => 'test1'
+      #TODO fix this selector below in erb
+      # assert_have_selector :a, :content => "Test 2 With Block", :href => '/test2', :class => 'test', :id => 'test2'
+    end
+  end
+  
+  context 'for #image_tag method' do
+    should "display image tag absolute link with no options" do
+      assert_equal '<img src="/absolute/pic.gif" />', image_tag('/absolute/pic.gif')
+    end
+    should "display image tag relative link with options" do
+      assert_equal '<img class="photo" src="/images/relative/pic.gif" />', image_tag('relative/pic.gif', :class => 'photo')
+    end
+    should "display image tag relative link with incorrect space" do
+      assert_equal '<img class="photo" src="/images/relative/pic.gif" />', image_tag(' relative/ pic.gif  ', :class => 'photo')
+    end
+  end
+  
+  context 'for #stylesheet_link_tag method' do
+    should "display stylesheet link item" do
+      time = stop_time_for_test
+      expected_style = %Q[<link href="/stylesheets/style.css?#{time.to_i}" media="screen" rel="stylesheet" type="text/css" />]
+      assert_equal expected_style, stylesheet_link_tag('style')
+    end
+    should "display stylesheet link items" do
+      time = stop_time_for_test
+      expected_style =  %Q[<link href="/stylesheets/style.css?#{time.to_i}" media="screen" rel="stylesheet" type="text/css" />\n]
+      expected_style << %Q[<link href="/stylesheets/layout.css?#{time.to_i}" media="screen" rel="stylesheet" type="text/css" />\n]
+      expected_style << %Q[<link href="http://google.com/style.css" media="screen" rel="stylesheet" type="text/css" />]
+      assert_equal expected_style, stylesheet_link_tag('style', 'layout.css', 'http://google.com/style.css')
+    end
+  end
+  
+  context 'for #javascript_include_tag method' do
+    should "display javascript item" do
+      time = stop_time_for_test
+      expected_include = %Q[<script src="/javascripts/application.js?#{time.to_i}" type="text/javascript"></script>]
+      assert_equal expected_include, javascript_include_tag('application')
+    end
+    should "display javascript items" do
+      time = stop_time_for_test
+      expected_include = %Q[<script src="/javascripts/application.js?#{time.to_i}" type="text/javascript"></script>\n]
+      expected_include << %Q[<script src="/javascripts/base.js?#{time.to_i}" type="text/javascript"></script>\n]
+      expected_include << %Q[<script src="http://google.com/lib.js" type="text/javascript"></script>]
+      assert_equal expected_include, javascript_include_tag('application', 'base.js', 'http://google.com/lib.js')
+    end
+  end
+end

data/test/markup_plugin/test_form_builder.rb

@@ -0,0 +1,5 @@
+require 'test_markup_plugin' unless defined?(TestMarkupPlugin)
+
+class TestFormBuilder < TestMarkupPlugin
+  # TODO Test the form builder methods
+end

data/test/markup_plugin/test_form_helpers.rb

@@ -0,0 +1,5 @@
+require 'test_markup_plugin' unless defined?(TestMarkupPlugin)
+
+class TestFormHelpers < TestMarkupPlugin
+ # Test the form helper methods
+end

data/test/markup_plugin/test_format_helpers.rb

@@ -0,0 +1,41 @@
+require 'test_markup_plugin' unless defined?(TestMarkupPlugin)
+
+class TestFormatHelpers < TestMarkupPlugin
+  include SinatraMore::FormatHelpers
+  
+  context 'for #relative_time_ago method' do
+    should "display today" do
+      assert_equal 'today', relative_time_ago(Time.now)
+    end
+    should "display yesterday" do
+      assert_equal 'yesterday', relative_time_ago(1.day.ago)
+    end
+    should "display tomorrow" do
+      assert_equal 'tomorrow', relative_time_ago(1.day.from_now)
+    end
+    should "return future number of days" do
+      assert_equal 'in 4 days', relative_time_ago(4.days.from_now)
+    end
+    should "return past days ago" do
+      assert_equal '4 days ago', relative_time_ago(4.days.ago)
+    end
+    should "return formatted archived date" do
+      assert_equal 100.days.ago.strftime('%A, %B %e'), relative_time_ago(100.days.ago)
+    end
+    should "return formatted archived year date" do
+      assert_equal 500.days.ago.strftime('%A, %B %e, %Y'), relative_time_ago(500.days.ago)
+    end
+  end
+  
+  context 'for #escape_javascript method' do
+    should "escape double quotes" do
+      assert_equal "\"hello\"", escape_javascript('"hello"')
+    end
+    should "escape single quotes" do
+      assert_equal "\"hello\"", escape_javascript("'hello'")
+    end
+    should "escape html tags and breaks" do
+      assert_equal "\"\\n<p>hello<\\/p>\\n\"", escape_javascript("\n\r<p>hello</p>\r\n")
+    end
+  end
+end

data/test/markup_plugin/test_output_helpers.rb

@@ -0,0 +1,44 @@
+require 'test_markup_plugin' unless defined?(TestMarkupPlugin)
+
+class TestOutputHelpers < TestMarkupPlugin
+  context 'for #capture_html method' do
+    should "work for erb templates" do
+      visit '/erb/capture_concat'
+      assert_have_selector 'p span', :content => "Captured Line 1"
+      assert_have_selector 'p span', :content => "Captured Line 2"
+    end
+    
+    should "work for haml templates" do
+      visit '/haml/capture_concat'
+      assert_have_selector 'p span', :content => "Captured Line 1"
+      assert_have_selector 'p span', :content => "Captured Line 2"
+    end
+  end
+  
+  context 'for #concat_content method' do
+    should "work for erb templates" do
+      visit '/erb/capture_concat'
+      assert_have_selector 'p', :content => "Concat Line 3", :count => 1
+    end
+    
+    should "work for haml templates" do
+      visit '/haml/capture_concat'
+      assert_have_selector 'p', :content => "Concat Line 3", :count => 1
+    end    
+  end
+  
+  context 'for #block_is_template?' do
+    should "work for erb templates" do
+      visit '/erb/capture_concat'
+      # TODO Get ERB template detection working
+      # assert_have_selector 'p', :content => "The erb block passed in is a template", :class => 'is_template'
+      assert_have_no_selector 'p', :content => "The ruby block passed in is a template", :class => 'is_template'
+    end
+    
+    should "work for haml templates" do
+      visit '/haml/capture_concat'
+      assert_have_selector 'p', :content => "The haml block passed in is a template", :class => 'is_template'
+      assert_have_no_selector 'p', :content => "The ruby block passed in is a template", :class => 'is_template'
+    end    
+  end
+end

data/test/markup_plugin/test_tag_helpers.rb

@@ -0,0 +1,52 @@
+require 'test_markup_plugin' unless defined?(TestMarkupPlugin)
+
+class TestTagHelpers < TestMarkupPlugin  
+  context 'for #tag method' do
+    should("support tags with no content no attributes") do
+       assert_equal '<br />', tag(:br) 
+    end
+    should("support tags with no content with attributes") do
+      assert_equal '<br class="yellow" style="clear:both" />', tag(:br, :style => 'clear:both', :class => 'yellow')
+    end
+    should "support tags with content no attributes" do
+      assert_equal '<p>Demo String</p>', tag(:p, :content => "Demo String")
+    end
+    should "support tags with content and attributes" do
+      assert_equal '<p class="large" id="intro">Demo</p>', tag(:p, :content => "Demo", :class => 'large', :id => 'intro')
+    end
+  end
+  
+  context 'for #content_tag method' do
+    should "support tags with content as parameter" do
+      assert_equal '<p class="large" id="intro">Demo</p>', content_tag(:p, "Demo", :class => 'large', :id => 'intro')
+    end
+    should "support tags with content as block" do
+      assert_equal '<p class="large" id="intro">Demo</p>', content_tag(:p, :class => 'large', :id => 'intro') { "Demo" }
+    end
+    should "support tags with erb" do
+      visit '/erb/content_tag'
+      assert_have_selector :p, :content => "Test 1", :class => 'test', :id => 'test1'
+      assert_have_selector :p, :content => "Test 2"
+      # TODO get these to work in erb
+      # assert_have_selector :p, :content => "Test 3" 
+      # assert_have_selector :p, :content => "Test 4"
+    end
+    should "support tags with haml" do
+      visit '/haml/content_tag'
+      assert_have_selector :p, :content => "Test 1", :class => 'test', :id => 'test1'
+      assert_have_selector :p, :content => "Test 2"
+      assert_have_selector :p, :content => "Test 3", :class => 'test', :id => 'test3'
+      assert_have_selector :p, :content => "Test 4"
+    end
+  end
+  
+  context 'for #input_tag method' do
+    should "support field with type" do
+      assert_equal '<input type="text" />', input_tag(:text)
+    end
+    should "support field with type and options" do
+      assert_equal '<input class="first" id="texter" type="text" />', input_tag(:text, :class => "first", :id => 'texter')
+    end
+  end
+  
+end

data/test/test_markup_plugin.rb

@@ -0,0 +1,15 @@
+require 'helper'
+require 'fixtures/markup_app/app'
+
+class TestMarkupPlugin < Test::Unit::TestCase
+  include SinatraMore::OutputHelpers
+  include SinatraMore::TagHelpers
+  
+  def app
+    MarkupDemo.tap { |app| app.set :environment, :test }
+  end
+  
+  should "work properly by adding tag methods" do
+    assert self.respond_to?(:tag)
+  end
+end

data/test/test_render_plugin.rb

@@ -5,19 +5,55 @@ class TestRenderPlugin < Test::Unit::TestCase
   def app
     RenderDemo.tap { |app| app.set :environment, :test }
   end
-  
+
   context 'for #haml_template method' do
     setup { visit '/render_haml' }
     should('render template properly') do
       assert_have_selector "h1", :content => "This is a haml template!"
     end
   end
-  
-   context 'for #erb_template method' do
+
+  context 'for #erb_template method' do
     setup { visit '/render_erb' }
     should('render template properly') do
       assert_have_selector "h1", :content => "This is a erb template!"
     end
   end
+  
+  context 'for #render_template method with explicit engine' do
+    setup { visit '/render_template/haml' }
+    should('render template properly') do
+      assert_have_selector "h1", :content => "This is a haml template sent from render_template!"
+    end
+  end
+  
+  context 'for #render_template method without explicit engine' do
+    setup { visit '/render_template' }
+    should('render template properly') do
+      assert_have_selector "h1", :content => "This is a haml template which was detected!"
+    end
+  end
+  
+  context 'for #partial method and object' do
+    setup { visit '/partial/object' }
+    should "render partial html with object" do
+      assert_have_selector "h1", :content => "User name is John"
+    end
+  end
+  
+  context 'for #partial method and collection' do
+    setup { visit '/partial/collection' }
+    should "render partial html with collection" do
+      assert_have_selector "h1", :content => "User name is John"
+      assert_have_selector "h1", :content => "User name is Billy"
+    end
+  end
+  
+  context 'for #partial method and locals' do
+    setup { visit '/partial/locals' }
+    should "render partial html with locals" do
+      assert_have_selector "h1", :content => "User name is John"
+    end
+  end
 
 end

data/test/test_warden_plugin.rb

@@ -15,4 +15,91 @@ class TestWardenPlugin < Test::Unit::TestCase
       assert_have_selector :h1, :content => "John"
     end
   end
+  
+  context 'for logout_user! helper' do
+    setup do
+      visit '/login', :post, :username => 'john21', :password => 'secret'
+      visit '/logout'
+      visit '/current_user'
+    end
+    should "return name of logged_in user" do
+      assert_have_selector :h2, :content => "Not logged in"
+    end
+  end
+  
+  context 'for logged_in? helper when logged in' do
+    setup do
+      visit '/login', :post, :username => 'john21', :password => 'secret'
+      visit '/logged_in'
+    end
+    should "be logged in" do
+      assert_have_selector :h1, :content => 'logged_in? true'
+    end
+  end
+  
+  context 'for logged_in? helper when logged out' do
+    setup do
+      visit '/logged_in'
+    end
+    should "not be logged in" do
+      assert_have_selector :h1, :content => 'logged_in? false'
+    end
+  end
+  
+  context 'for authenticated? helper when logged in' do
+    setup do
+      visit '/login', :post, :username => 'john21', :password => 'secret'
+      visit '/authenticated'
+    end
+    should "reveal authorized content" do
+      assert_have_selector :p, :content => "Dashboard, You are logged in!"
+    end
+  end
+  
+  context 'for authenticated? helper when logged out' do
+    setup do
+      visit '/authenticated'
+    end
+    should "hide authorized content" do
+      assert_have_no_selector :p, :content => "Dashboard, You are logged in!"
+    end
+  end
+  
+  context 'for unregistered? helper when logged in' do
+    setup do
+      visit '/login', :post, :username => 'john21', :password => 'secret'
+      visit '/unregistered'
+    end
+    should "hide unregistered content" do
+      assert_have_no_selector :p, :content => "Dashboard, You are unregistered!"
+    end
+  end
+  
+  context 'for unregistered? helper when logged out' do
+    setup do
+      visit '/unregistered'
+    end
+    should "reveal unregistered content" do
+      assert_have_selector :p, :content => "Dashboard, You are unregistered!"
+    end
+  end
+  
+  context 'for must_be_authorized! helper with valid login' do
+    setup do
+      visit '/login', :post, :username => 'john21', :password => 'secret'
+      visit '/must_be_authorized'
+    end
+    should "be able to view page" do
+      assert_have_selector :h1, :content => "Valid Authorized Page"
+    end
+  end
+  
+  context 'for must_be_authorized! helper when not logged in' do
+    setup do
+      visit '/must_be_authorized'
+    end
+    should "be forced to login" do
+      assert_have_selector :h1, :content => "Please login!"
+    end
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: sinatra_more
 version: !ruby/object:Gem::Version 
-  version: 0.0.14
+  version: 0.1.0
 platform: ruby
 authors: 
 - Nathan Esquenazi
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-10-25 00:00:00 -07:00
+date: 2009-10-26 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -53,11 +53,29 @@ files:
 - lib/sinatra_more/warden_plugin.rb
 - lib/sinatra_more/warden_plugin/warden_helpers.rb
 - sinatra_more.gemspec
+- test/fixtures/markup_app/app.rb
+- test/fixtures/markup_app/views/capture_concat.erb
+- test/fixtures/markup_app/views/capture_concat.haml
+- test/fixtures/markup_app/views/content_tag.erb
+- test/fixtures/markup_app/views/content_tag.haml
+- test/fixtures/markup_app/views/link_to.erb
+- test/fixtures/markup_app/views/link_to.haml
 - test/fixtures/render_app/app.rb
-- test/fixtures/render_app/views/bar/test.erb
-- test/fixtures/render_app/views/foo/test.haml
+- test/fixtures/render_app/views/erb/test.erb
+- test/fixtures/render_app/views/haml/test.haml
+- test/fixtures/render_app/views/template/_user.haml
+- test/fixtures/render_app/views/template/haml_template.haml
+- test/fixtures/render_app/views/template/some_template.haml
 - test/fixtures/warden_app/app.rb
+- test/fixtures/warden_app/views/dashboard.haml
 - test/helper.rb
+- test/markup_plugin/test_asset_tag_helpers.rb
+- test/markup_plugin/test_form_builder.rb
+- test/markup_plugin/test_form_helpers.rb
+- test/markup_plugin/test_format_helpers.rb
+- test/markup_plugin/test_output_helpers.rb
+- test/markup_plugin/test_tag_helpers.rb
+- test/test_markup_plugin.rb
 - test/test_render_plugin.rb
 - test/test_warden_plugin.rb
 has_rdoc: true
@@ -89,8 +107,16 @@ signing_key:
 specification_version: 3
 summary: Expands sinatra to allow for complex applications
 test_files: 
+- test/fixtures/markup_app/app.rb
 - test/fixtures/render_app/app.rb
 - test/fixtures/warden_app/app.rb
 - test/helper.rb
+- test/markup_plugin/test_asset_tag_helpers.rb
+- test/markup_plugin/test_form_builder.rb
+- test/markup_plugin/test_form_helpers.rb
+- test/markup_plugin/test_format_helpers.rb
+- test/markup_plugin/test_output_helpers.rb
+- test/markup_plugin/test_tag_helpers.rb
+- test/test_markup_plugin.rb
 - test/test_render_plugin.rb
 - test/test_warden_plugin.rb