sinatra_more 0.2.3 → 0.2.4

data/README.rdoc

@@ -208,6 +208,7 @@ A form_tag might look like:
   * Supports form methods 'put' and 'delete' through hidden field
   * Defaults to StandardFormBuilder but you can easily create your own!
   * <tt>form_for(@user, '/register', :id => 'register') { |f| ...field-elements... }</tt>
+  * <tt>form_for(:user, '/register', :id => 'register') { |f| ...field-elements... }</tt>
 
 The following are fields provided by AbstractFormBuilder that can be used within a form_for:
 

data/Rakefile

@@ -14,7 +14,6 @@ begin
     gem.authors = ["Nathan Esquenazi"]
     gem.add_runtime_dependency     "sinatra",       ">= 0.9.2"
     gem.add_runtime_dependency     "activesupport", ">= 2.2.2"
-    gem.add_runtime_dependency     "warden",        ">= 0.4.0"
     gem.add_development_dependency "haml",          ">= 2.2.1"
     gem.add_development_dependency "shoulda",       ">= 2.10.2"
     gem.add_development_dependency "mocha",         ">= 0.9.7"

data/TODO

@@ -1,24 +1,21 @@
 = UNFINISHED
 
+* Add support for a MailerPlugin which will make sending emails a breeze (http://github.com/hiroshi/pony)
+* Add support for fields_for tag in formbuilder
+* Add support for button tag method, mail_to helper
+* Add support for check_box_group, radio_button_group which create a set of checkboxes or radio buttons
+* Look into creating sinatra generators using rubigen (http://github.com/drnic/rubigen)
+  * http://github.com/quirkey/sinatra-gen
+  * http://github.com/monkrb/monk
 * Become total warden solution (basically just require warden gem installed, do everything else)
   * Look into removing overlapping methods and simply leverage sinatra_warden
   * Take advantage of shared strategies: http://github.com/hassox/warden_strategies/tree/master/lib/
   * Make warden password strategy support a callback which explains what to do with username, password
   * WardenPlugin.authenticate_callback { |username, password| User.authenticate(username, password) }
-* Add support for fields_for tag in formbuilder
-* Add support for missing formbuilder fields (select, and standard_form_builder methods i.e check_box_group)
-* Look into creating sinatra generators using rubigen (http://github.com/drnic/rubigen)
-  * http://github.com/quirkey/sinatra-gen
-  * http://github.com/monkrb/monk
-* Look into adding any missing helpers from:
-  * http://github.com/brianjlandau/nice-n-easy
-  * http://github.com/brianjlandau/nice-n-easy/blob/master/lib/sinatra/nice_easy_helpers.rb
-  * http://github.com/kelredd/sinatra-helpers/blob/master/lib/sinatra_helpers/erb/links.rb
-  * http://github.com/kelredd/sinatra-helpers/blob/master/lib/sinatra_helpers/erb/forms.rb
-  * http://github.com/twilson63/sinatra-formhelpers/blob/master/lib/sinatra/formhelpers.rb
 
 = COMPLETED
 
+* Add support for missing formbuilder fields (select, and standard_form_builder methods i.e check_box_group)
 * Add support for missing formhelpers/fields (radio_button_tag, select_tag)
 * Add support for select_tag :multiple => true
 * Add support for forms with method => put, delete using hidden field

data/VERSION

@@ -1 +1 @@
-0.2.3
+0.2.4

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

@@ -3,9 +3,8 @@ class AbstractFormBuilder
 
   def initialize(template, object)
     raise "FormBuilder template must be initialized!" unless template
-    raise "FormBuilder object must be initialized!" unless object
     @template = template
-    @object   = object
+    @object   = build_object(object)
   end
 
   # f.error_messages
@@ -92,7 +91,7 @@ class AbstractFormBuilder
   # Returns the object's models name
   #   => user_assignment
   def object_name
-    object.class.to_s.underscore
+    object.is_a?(Symbol) ? object : object.class.to_s.underscore
   end
 
   # Returns true if the value matches the value in the field
@@ -119,4 +118,11 @@ class AbstractFormBuilder
   def field_id(field, value=nil)
     value.blank? ? "#{object_name}_#{field}" : "#{object_name}_#{field}_#{value}"
   end
+  
+  # Either a symbol or a record
+  def build_object(explicit_object)
+    explicit_object.is_a?(Symbol) ? explicit_object.to_s.classify.constantize.new : explicit_object
+    raise "FormBuilder object must be initialized or use a symbol instead! (i.e :user)" unless explicit_object
+    explicit_object
+  end
 end

data/lib/sinatra_more/warden_plugin.rb

@@ -5,6 +5,7 @@ Dir[File.dirname(__FILE__) + '/warden_plugin/**/*.rb'].each {|file| load file }
 module SinatraMore
   module WardenPlugin
     def self.registered(app)
+      raise "WardenPlugin::Error - Install with 'sudo gem install warden' or require 'warden' in your app." unless Warden::Manager
       app.use Warden::Manager do |manager|
         manager.default_strategies :password
         manager.failure_app = app

data/sinatra_more.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{sinatra_more}
-  s.version = "0.2.3"
+  s.version = "0.2.4"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Nathan Esquenazi"]
-  s.date = %q{2009-10-28}
+  s.date = %q{2009-10-29}
   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 = [
@@ -97,7 +97,6 @@ Gem::Specification.new do |s|
     if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<sinatra>, [">= 0.9.2"])
       s.add_runtime_dependency(%q<activesupport>, [">= 2.2.2"])
-      s.add_runtime_dependency(%q<warden>, [">= 0.4.0"])
       s.add_development_dependency(%q<haml>, [">= 2.2.1"])
       s.add_development_dependency(%q<shoulda>, [">= 2.10.2"])
       s.add_development_dependency(%q<mocha>, [">= 0.9.7"])
@@ -106,7 +105,6 @@ Gem::Specification.new do |s|
     else
       s.add_dependency(%q<sinatra>, [">= 0.9.2"])
       s.add_dependency(%q<activesupport>, [">= 2.2.2"])
-      s.add_dependency(%q<warden>, [">= 0.4.0"])
       s.add_dependency(%q<haml>, [">= 2.2.1"])
       s.add_dependency(%q<shoulda>, [">= 2.10.2"])
       s.add_dependency(%q<mocha>, [">= 0.9.7"])
@@ -116,7 +114,6 @@ Gem::Specification.new do |s|
   else
     s.add_dependency(%q<sinatra>, [">= 0.9.2"])
     s.add_dependency(%q<activesupport>, [">= 2.2.2"])
-    s.add_dependency(%q<warden>, [">= 0.4.0"])
     s.add_dependency(%q<haml>, [">= 2.2.1"])
     s.add_dependency(%q<shoulda>, [">= 2.10.2"])
     s.add_dependency(%q<mocha>, [">= 0.9.7"])

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

@@ -49,4 +49,8 @@
   <%= f.select_block :state, :options => ['California', 'Texas'], :class => 'selector' %>
   <%= f.submit_block "Create", { :class => 'button' } %>
   <%= f.image_submit_block "buttons/ok.png", { :class => 'image' } %>
+<% end %>
+
+<% form_for :markup_user, '/third_demo', :id => 'demo3', :method => 'get' do |f| %>
+  <%= f.text_field_block :username %>
 <% end %>

data/test/markup_plugin/test_form_builder.rb

@@ -26,6 +26,13 @@ class TestFormBuilder < Test::Unit::TestCase
       assert_has_tag('form', :action => '/register', :id => 'register', :method => 'post', :content => "Demo") { actual_html }
       assert_has_tag('form input[type=hidden]', :name => '_method', :count => 0) { actual_html } # no method action field
     end
+    
+    should "display correct form html with fake object" do
+      actual_html = form_for(:markup_user, '/register', :id => 'register', :method => 'post') { |f| f.text_field :username }
+      assert_has_tag('form', :action => '/register', :id => 'register', :method => 'post') { actual_html }
+      assert_has_tag('form input', :type => 'text', :name => 'markup_user[username]') { actual_html }
+      assert_has_tag('form input[type=hidden]', :name => '_method', :count => 0) { actual_html } # no method action field
+    end
 
     should "display correct form html with method :post" do
       actual_html = form_for(@user, '/update', :method => 'put') { "Demo" }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: sinatra_more
 version: !ruby/object:Gem::Version 
-  version: 0.2.3
+  version: 0.2.4
 platform: ruby
 authors: 
 - Nathan Esquenazi
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-10-28 00:00:00 -07:00
+date: 2009-10-29 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -32,16 +32,6 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: 2.2.2
     version: 
-- !ruby/object:Gem::Dependency 
-  name: warden
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: 0.4.0
-    version: 
 - !ruby/object:Gem::Dependency 
   name: haml
   type: :development