sinatra_more 0.0.6 → 0.0.7

data/.gitignore

@@ -19,3 +19,4 @@ rdoc
 pkg
 
 ## PROJECT::SPECIFIC
+webrat.log

data/TODO

@@ -2,4 +2,4 @@
 * Pull from sinatra-helpers and make erb templates work (and credit keldredd)
   - http://github.com/kelredd/sinatra-helpers/tree/master/lib/sinatra_helpers/erb/
 * Become total warden solution (basically just require warden gem installed, do everything else)
-* Add support for plugin 
+* Remove dependency on activesupport! and enumerate dependencies in rake

data/VERSION

@@ -1 +1 @@
-0.0.6
+0.0.7

data/lib/sinatra_more/markup_plugin/asset_tag_helpers.rb

@@ -1,8 +1,25 @@
 module SinatraMore
   module AssetTagHelpers
-    def link_to(name, url='javascript:void(0)', options={})
-      options.reverse_merge!(:href => url)
-      content_tag(:a, name, options)
+    # flash_tag(:notice)
+    def flash_tag(kind, options={})
+      flash_text = flash[kind]
+      return '' if flash_text.blank?
+      options.reverse_merge!(:class => 'flash')
+      content_tag(:div, flash_text, options)
+    end
+    
+    # name, url='javascript:void(0)', options={}, &block
+    def link_to(*args, &block)
+      if block_given?
+        url, options = (args[0] || 'javascript:void(0);'), (args[1] || {})
+        options.reverse_merge!(:href => url)
+        link_content = capture_haml(&block)
+        haml_concat(content_tag(:a, link_content, options))
+      else
+        name, url, options = args.first, (args[1] || 'javascript:void(0);'), (args[2] || {})
+        options.reverse_merge!(:href => url)
+        content_tag(:a, name, options)
+      end
     end
 
     def image_tag(url, options={})

data/lib/sinatra_more/markup_plugin/form_builder/abstract_form_builder.rb

@@ -18,21 +18,22 @@ class AbstractFormBuilder
   end
   
   def text_field(field, options={})
-    options.reverse_merge!(:value => field_value(field))
+    options.reverse_merge!(:value => field_value(field), :id => field_id(field))
     @template.text_field_tag field_name(field), options
   end
   
   def text_area(field, options={})
-    options.reverse_merge!(:value => field_value(field))
+    options.reverse_merge!(:value => field_value(field), :id => field_id(field))
     @template.text_area_tag field_name(field), options
   end
   
   def password_field(field, options={})
-    options.reverse_merge!(:value => field_value(field))
+    options.reverse_merge!(:value => field_value(field), :id => field_id(field))
     @template.password_field_tag field_name(field), options
   end
   
   def file_field(field, options={})
+    options.reverse_merge!(:id => field_id(field))
     @template.file_field_tag field_name(field), options
   end
   
@@ -40,6 +41,12 @@ class AbstractFormBuilder
     @template.submit_tag caption, options
   end
   
+  protected
+  
+  def self.field_types
+    [:text_field, :text_area, :password_field, :file_field]
+  end
+  
   private
   
   def object_name

data/lib/sinatra_more/markup_plugin/form_builder/standard_form_builder.rb

@@ -1,35 +1,19 @@
 class StandardFormBuilder < AbstractFormBuilder
-  def text_field_block(field, options={})
-    @template.content_block_tag(:p) do
-      html =  label(field)
-      html << text_field(field, options)
-    end
-  end
-  
-  def text_area_block(field, options={})
-    @template.content_block_tag(:p) do
-      html =  label(field)
-      html << text_area(field, options)
-    end
-  end
-  
-  def password_field_block(field, options={})
-    @template.content_block_tag(:p) do
-      html =  label(field)
-      html << password_field(field, options)
-    end
-  end
-  
-  def file_field_block(field, options={})
-    @template.content_block_tag(:p) do
-      html =  label(field)
-      html << file_field(field, options)
+  self.field_types.each do |field_type|
+    class_eval <<-EOF
+    def #{field_type}_block(field, options={}, label_options={})
+      label_options.reverse_merge!(:caption => options.delete(:caption)) if options[:caption]
+      @template.content_block_tag(:p) do
+        html =  label(field, label_options)
+        html << #{field_type}(field, options)
+      end
     end
+    EOF
   end
-  
+
   def submit_block(caption)
     @template.content_block_tag(:p) do
       @template.submit_tag(caption)
     end
   end
-end
+end

data/lib/sinatra_more/markup_plugin/form_helpers.rb

@@ -16,6 +16,14 @@ module SinatraMore
       # TODO make this work with erb!!
       haml_concat content_tag('form', capture_haml(&block), options)
     end
+    
+    def field_set_tag(legend=nil, options={}, &block)
+      # TODO make this work with erb!!
+      field_set_content = ''
+      field_set_content << content_tag(:legend, legend)  if legend.present?
+      field_set_content << capture_haml(&block)
+      haml_concat content_tag('fieldset', field_set_content, options)
+    end
 
     # error_messages_for @user
     def error_messages_for(record, options={})
@@ -31,9 +39,16 @@ module SinatraMore
     end
 
     # label_tag :username
-    def label_tag(name, options={})
-      options.reverse_merge!(:caption => name.to_s.titleize)
-      content_tag(:label, options.delete(:caption) + ": ", :for => name)
+    def label_tag(name, options={}, &block)
+      options.reverse_merge!(:caption => name.to_s.titleize, :for => name)
+      caption_text = options.delete(:caption) + ": "
+      # TODO make this work with erb!!
+      if block_given? # label with inner content
+        label_content = caption_text + capture_haml(&block)
+        haml_concat(content_tag(:label, label_content, options))
+      else # regular label
+        content_tag(:label, caption_text, options)
+      end
     end
 
     # text_field_tag :username

data/sinatra_more.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{sinatra_more}
-  s.version = "0.0.6"
+  s.version = "0.0.7"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Nathan Esquenazi"]
@@ -31,14 +31,19 @@ Gem::Specification.new do |s|
      "lib/sinatra_more/markup_plugin/form_builder/standard_form_builder.rb",
      "lib/sinatra_more/markup_plugin/form_helpers.rb",
      "lib/sinatra_more/markup_plugin/format_helpers.rb",
-     "lib/sinatra_more/markup_plugin/render_helpers.rb",
      "lib/sinatra_more/markup_plugin/tag_helpers.rb",
      "lib/sinatra_more/render_plugin.rb",
+     "lib/sinatra_more/render_plugin/render_helpers.rb",
      "lib/sinatra_more/warden_plugin.rb",
      "lib/sinatra_more/warden_plugin/warden_helpers.rb",
      "sinatra_more.gemspec",
+     "test/fixtures/render_app/app.rb",
+     "test/fixtures/render_app/views/bar/test.erb",
+     "test/fixtures/render_app/views/foo/test.haml",
+     "test/fixtures/warden_app/app.rb",
      "test/helper.rb",
-     "test/test_sinatra_more.rb"
+     "test/test_render_plugin.rb",
+     "test/test_warden_plugin.rb"
   ]
   s.homepage = %q{http://github.com/nesquena/sinatra_more}
   s.rdoc_options = ["--charset=UTF-8"]
@@ -46,8 +51,11 @@ 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/helper.rb",
-     "test/test_sinatra_more.rb"
+    "test/fixtures/render_app/app.rb",
+     "test/fixtures/warden_app/app.rb",
+     "test/helper.rb",
+     "test/test_render_plugin.rb",
+     "test/test_warden_plugin.rb"
   ]
 
   if s.respond_to? :specification_version then

data/test/fixtures/render_app/app.rb

@@ -0,0 +1,21 @@
+require 'sinatra/base'
+require 'sinatra_more'
+require 'haml'
+
+class RenderDemo < Sinatra::Base
+  register SinatraMore::RenderPlugin
+  
+  configure do
+    set :root, File.dirname(__FILE__)
+  end
+  
+  get '/render_haml' do
+    @template = 'haml'
+    haml_template 'foo/test'
+  end
+  
+  get '/render_erb' do
+    @template = 'erb'
+    erb_template 'bar/test'
+  end
+end

data/test/fixtures/render_app/views/bar/test.erb

@@ -0,0 +1 @@
+<h1>This is a <%= @template %> template!</h1>

data/test/fixtures/render_app/views/foo/test.haml

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

data/test/fixtures/warden_app/app.rb

@@ -0,0 +1,40 @@
+require 'sinatra/base'
+require 'sinatra_more'
+require 'warden'
+
+class User
+  attr_accessor :id, :name, :username, :password
+  
+  def initialize(id, name, username, password)
+    self.id, self.name, self.username, self.password = id, name, username, password
+  end
+  
+  def self.find(id)
+    return self.john_user if id == self.john_user.id
+  end
+  
+  def self.authenticate(username, password)
+    return self.john_user if username == self.john_user.username && password == self.john_user.password
+  end
+  
+  def self.john_user
+    @john ||= User.new(21, "John", 'john21', 'secret')
+  end
+end
+
+class WardenDemo < Sinatra::Base
+  use Rack::Session::Cookie
+  register SinatraMore::WardenPlugin
+  
+  configure do
+    set :root, File.dirname(__FILE__)
+  end
+  
+  post '/login' do
+    authenticate_user!
+  end
+  
+  get '/current_user' do
+    "<h1>#{current_user.send(:name)}</h1>"
+  end
+end

data/test/helper.rb

@@ -1,10 +1,20 @@
 require 'rubygems'
 require 'test/unit'
 require 'shoulda'
+require 'mocha'
+require 'rack/test'
+require 'webrat'
 
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 $LOAD_PATH.unshift(File.dirname(__FILE__))
 require 'sinatra_more'
 
 class Test::Unit::TestCase
+  include Rack::Test::Methods
+  include Webrat::Methods
+  include Webrat::Matchers    
+  
+  Webrat.configure do |config|
+    config.mode = :rack
+  end
 end

data/test/test_render_plugin.rb

@@ -0,0 +1,23 @@
+require 'helper'
+require 'fixtures/render_app/app'
+
+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
+    setup { visit '/render_erb' }
+    should('render template properly') do
+      assert_have_selector "h1", :content => "This is a erb template!"
+    end
+  end
+
+end

data/test/test_warden_plugin.rb

@@ -0,0 +1,18 @@
+require 'helper'
+require 'fixtures/warden_app/app'
+
+class TestWardenPlugin < Test::Unit::TestCase
+  def app
+    WardenDemo.tap { |app| app.set :environment, :test }
+  end
+  
+  context 'for authenticate_user! helper' do
+    setup do
+      visit '/login', :post, :username => 'john21', :password => 'secret'
+      visit '/current_user'
+    end
+    should "return name of logged_in user" do
+      assert_have_selector :h1, :content => "John"
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: sinatra_more
 version: !ruby/object:Gem::Version 
-  version: 0.0.6
+  version: 0.0.7
 platform: ruby
 authors: 
 - Nathan Esquenazi
@@ -46,14 +46,19 @@ files:
 - lib/sinatra_more/markup_plugin/form_builder/standard_form_builder.rb
 - lib/sinatra_more/markup_plugin/form_helpers.rb
 - lib/sinatra_more/markup_plugin/format_helpers.rb
-- lib/sinatra_more/markup_plugin/render_helpers.rb
 - lib/sinatra_more/markup_plugin/tag_helpers.rb
 - lib/sinatra_more/render_plugin.rb
+- lib/sinatra_more/render_plugin/render_helpers.rb
 - lib/sinatra_more/warden_plugin.rb
 - lib/sinatra_more/warden_plugin/warden_helpers.rb
 - sinatra_more.gemspec
+- test/fixtures/render_app/app.rb
+- test/fixtures/render_app/views/bar/test.erb
+- test/fixtures/render_app/views/foo/test.haml
+- test/fixtures/warden_app/app.rb
 - test/helper.rb
-- test/test_sinatra_more.rb
+- test/test_render_plugin.rb
+- test/test_warden_plugin.rb
 has_rdoc: true
 homepage: http://github.com/nesquena/sinatra_more
 licenses: []
@@ -83,5 +88,8 @@ signing_key:
 specification_version: 3
 summary: Expands sinatra to allow for complex applications
 test_files: 
+- test/fixtures/render_app/app.rb
+- test/fixtures/warden_app/app.rb
 - test/helper.rb
-- test/test_sinatra_more.rb
+- test/test_render_plugin.rb
+- test/test_warden_plugin.rb

data/test/test_sinatra_more.rb

@@ -1,7 +0,0 @@
-require 'helper'
-
-class TestSinatraMore < 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