sinatra_more 0.3.9 → 0.3.10

data/README.rdoc

@@ -134,6 +134,10 @@ methods should be very familiar to anyone who has used rails view helpers.
   * Creates a link element with given name, url and options
   * <tt>link_to 'click me', '/dashboard', :class => 'linky'</tt>
   * <tt>link_to('/dashboard', :class => 'blocky') { ...content... }</tt>
+* <tt>mail_to(email, caption=nil, mail_options={})</tt>
+  * Creates a mailto link tag to the specified email_address
+  * <tt>mail_to "me@demo.com"</tt> # => <a href="mailto:me@demo.com">me@demo.com</a>
+  * <tt>mail_to "me@demo.com", "My Email"</tt> # => <a href="mailto:me@demo.com">My Email</a>
 * <tt>image_tag(url, options={})</tt>
   * Creates an image element with given url and options
   * <tt>image_tag('icons/avatar.png')</tt>
@@ -190,6 +194,9 @@ methods should be very familiar to anyone who has used rails view helpers.
 * <tt>submit_tag(caption, options={})</tt>
   * Constructs a submit button from the given options
   * <tt>submit_tag "Create", :class => 'success'</tt>
+* <tt>button_tag(caption, options={})</tt>
+  * Constructs an input (type => 'button') from the given options
+  * <tt>button_tag "Cancel", :class => 'clear'</tt>
 * <tt>image_submit_tag(source, options={})</tt>
   * Constructs an image submit button from the given options
   * <tt>image_submit_tag "submit.png", :class => 'success'</tt>
@@ -221,8 +228,13 @@ A form_tag might look like:
   * 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>
+* <tt>fields_for(object, settings={}, &block)</tt>
+  * Constructs fields for a given object for use in an existing form
+  * Defaults to StandardFormBuilder but you can easily create your own!
+  * <tt>fields_for @user.assignment do |assignment| ... end</tt>
+  * <tt>fields_for :assignment do |assigment| ... end</tt>
 
-The following are fields provided by AbstractFormBuilder that can be used within a form_for:
+The following are fields provided by AbstractFormBuilder that can be used within a form_for or fields_for:
 
 * <tt>error_messages(options={})</tt>
   * Displays list html for the errors on form object
@@ -269,9 +281,13 @@ A form_for using these basic fields might look like:
     %p
       = f.label :is_admin, :caption => "Admin User?"
       = f.check_box :is_admin
-    $p
+    %p
       = f.label :color, :caption => "Favorite Color?"
       = f.select :color, :options => ['red', 'black']
+    %p
+      - fields_for @user.location do |location|
+        = location.text_field :street
+        = location.text_field :city
     %p
       = f.submit "Create", :class => 'button'
   
@@ -454,12 +470,6 @@ In addition, the strategy used expects that you have an <tt>authenticate</tt> me
 
 Using this plugin you also do need to define your own routes for managing warden sessions. An example is below:
 
-  get '/unauthenticated/?' do
-    flash[:notice] = "That username and password are not correct!"
-    status 401
-    haml_template 'session/login'
-  end
-
   get '/login/?' do
     haml_template 'session/login'
   end
@@ -468,6 +478,12 @@ Using this plugin you also do need to define your own routes for managing warden
     authenticate_user!
     redirect "/dashboard"
   end
+  
+  post '/unauthenticated/?' do
+    flash[:notice] = "That username and password are not correct!"
+    status 401
+    haml_template 'session/login'
+  end
 
   get '/logout/?' do
     logout_user!

data/TODO

@@ -1,8 +1,7 @@
 = UNFINISHED
 
 * Add support for model, routes, migration generator types based on components
-* Add support for fields_for tag in formbuilder
-* Add support for button tag method, mail_to helper
+* Add support for form.fields_for (one-to-one, nested and many associations like in rails)
 * Add support for check_box_group, radio_button_group which create a set of checkboxes or radio buttons
 * Become total warden solution (basically just require warden gem installed, do everything else)
   * Look into removing overlapping methods and simply leverage sinatra_warden
@@ -19,6 +18,8 @@
 
 = COMPLETED
 
+* Add support for button tag method, mail_to helper
+* Add support for simple fields_for tag helper
 * Add content_for / yield tags similar to rails
 * Created application generator using thor
 * Add support for a MailerPlugin which will make sending emails a breeze (http://github.com/hiroshi/pony)

data/VERSION

@@ -1 +1 @@
-0.3.9
+0.3.10

data/lib/sinatra_more/markup_plugin/asset_tag_helpers.rb

@@ -28,6 +28,16 @@ module SinatraMore
       end
     end
 
+    # Creates a mail link element with given name and caption
+    # mail_to "me@demo.com"             => <a href="mailto:me@demo.com">me@demo.com</a>
+    # mail_to "me@demo.com", "My Email" => <a href="mailto:me@demo.com">My Email</a>
+    def mail_to(email, caption=nil, mail_options={})
+      html_options = mail_options.slice!(:cc, :bcc, :subject, :body)
+      mail_query = Rack::Utils.build_query(mail_options).gsub(/\+/, '%20').gsub('%40', '@')
+      mail_href = "mailto:#{email}"; mail_href << "?#{mail_query}" if mail_query.present?
+      link_to (caption || email), mail_href, html_options
+    end
+
     # Creates an image element with given url and options
     # image_tag('icons/avatar.png')
     def image_tag(url, options={})

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

@@ -53,7 +53,7 @@ class AbstractFormBuilder
   # f.check_box :remember_me, :value => 'true', :uncheck_value => '0'
   def check_box(field, options={})
     unchecked_value = options.delete(:uncheck_value) || '0'
-    options.reverse_merge!(:id => field_id(field))
+    options.reverse_merge!(:id => field_id(field), :value => '1')
     options.merge!(:checked => true) if values_matches_field?(field, options[:value])
     html = @template.check_box_tag field_name(field), options
     html << hidden_field(field, :value => unchecked_value, :id => nil)
@@ -98,7 +98,7 @@ class AbstractFormBuilder
   # Returns true if the value matches the value in the field
   # field_has_value?(:gender, 'male')
   def values_matches_field?(field, value)
-    value.present? && field_value(field).to_s == value.to_s
+    value.present? && (field_value(field).to_s == value.to_s || field_value(field).to_s == 'true')
   end
 
   # Returns the value for the object's field

data/lib/sinatra_more/markup_plugin/form_helpers.rb

@@ -1,6 +1,7 @@
 module SinatraMore
   module FormHelpers
     # Constructs a form for object using given or default form_builder
+    # form_for :user, '/register' do |f| ... end
     # form_for @user, '/register', :id => 'register' do |f| ... end
     def form_for(object, url, settings={}, &block)
       builder_class = configured_form_builder_class(settings[:builder])
@@ -8,6 +9,16 @@ module SinatraMore
       form_tag(url, settings) { form_html }
     end
 
+    # Constructs form fields for an object using given or default form_builder
+    # Used within an existing form to allow alternate objects within one form
+    # fields_for @user.assignment do |assignment| ... end
+    # fields_for :assignment do |assigment| ... end
+    def fields_for(object, settings={}, &block)
+      builder_class = configured_form_builder_class(settings[:builder])
+      fields_html = capture_html(builder_class.new(self, object), &block)
+      concat_content fields_html
+    end
+
     # Constructs a form without object based on options
     # form_tag '/register' do ... end
     def form_tag(url, options={}, &block)
@@ -125,6 +136,13 @@ module SinatraMore
       input_tag(:submit, options)
     end
 
+    # Constructs a button input from the given options
+    # button_tag "Cancel", :class => 'clear'
+    def button_tag(caption, options = {})
+      options.reverse_merge!(:value => caption)
+      input_tag(:button, options)
+    end
+
     # Constructs a submit button from the given options
     # submit_tag "Create", :class => 'success'
     def image_submit_tag(source, options={})

data/lib/sinatra_more/support_lite.rb

@@ -1,43 +1,9 @@
 # This is for adding specific methods that are required by sinatra_more if activesupport isn't required
 
-unless String.method_defined?(:titleize)
+unless String.method_defined?(:titleize) && Hash.method_defined?(:slice)
   require 'active_support/inflector'
   require 'active_support/core_ext/blank'
   require 'active_support/core_ext/class/attribute_accessors'
+  require 'active_support/core_ext/hash'
+  require 'active_support/core_ext/array'
 end
-
-unless Hash.method_defined?(:reverse_merge!)
-  module HashExtensions
-    def reverse_merge(other_hash)
-      other_hash.merge(self)
-    end
-    def reverse_merge!(other_hash)
-      replace(reverse_merge(other_hash))
-    end
-  end
-end
-
-unless Hash.method_defined?(:symbolize_keys!)
-  module HashExtensions
-    def symbolize_keys
-      inject({}) do |options, (key, value)|
-        options[(key.to_sym rescue key) || key] = value
-        options
-      end
-    end
-    def symbolize_keys!
-      self.replace(self.symbolize_keys)
-    end
-  end
-end
-
-unless Array.method_defined?(:extract_options!)
-  module ArrayExtensions
-    def extract_options!
-      last.is_a?(::Hash) ? pop : {}
-    end
-  end
-end
-
-Hash.send(:include, HashExtensions) if defined?(HashExtensions)
-Array.send(:include, ArrayExtensions) if defined?(ArrayExtensions)

data/sinatra_more.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{sinatra_more}
-  s.version = "0.3.9"
+  s.version = "0.3.10"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Nathan Esquenazi"]
-  s.date = %q{2009-11-10}
+  s.date = %q{2009-11-11}
   s.default_executable = %q{sinatra_gen}
   s.description = %q{Expands sinatra with standard helpers and tools to allow for complex applications}
   s.email = %q{nesquena@gmail.com}
@@ -98,12 +98,16 @@ Gem::Specification.new do |s|
      "test/fixtures/markup_app/views/content_for.haml",
      "test/fixtures/markup_app/views/content_tag.erb",
      "test/fixtures/markup_app/views/content_tag.haml",
+     "test/fixtures/markup_app/views/fields_for.erb",
+     "test/fixtures/markup_app/views/fields_for.haml",
      "test/fixtures/markup_app/views/form_for.erb",
      "test/fixtures/markup_app/views/form_for.haml",
      "test/fixtures/markup_app/views/form_tag.erb",
      "test/fixtures/markup_app/views/form_tag.haml",
      "test/fixtures/markup_app/views/link_to.erb",
      "test/fixtures/markup_app/views/link_to.haml",
+     "test/fixtures/markup_app/views/mail_to.erb",
+     "test/fixtures/markup_app/views/mail_to.haml",
      "test/fixtures/render_app/app.rb",
      "test/fixtures/render_app/views/erb/test.erb",
      "test/fixtures/render_app/views/haml/test.haml",

data/test/fixtures/markup_app/app.rb

@@ -46,6 +46,12 @@ class MarkupUser
   def session_id; 45; end
   def gender; 'male'; end
   def remember_me; '1'; end
+  def permission; Permission.new; end
+end
+
+class Permission
+  def can_edit; true; end
+  def can_delete; false; end
 end
 
 class Errors < Array

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

@@ -0,0 +1,8 @@
+<% @user = MarkupUser.new %>
+<% form_for @user , '/demo1', :id => 'demo-fields-for' do |f| %>
+  <%= f.text_field :gender %>
+  <% fields_for @user.permission do |permission| %>
+    <%= permission.check_box :can_edit %>
+    <%= permission.check_box :can_delete %>
+  <% end %>
+<% end %>

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

@@ -0,0 +1,6 @@
+- @user = MarkupUser.new
+- form_for @user , '/demo1', :id => 'demo-fields-for' do |f|
+  = f.text_field :gender
+  - fields_for @user.permission do |permission|
+    = permission.check_box :can_edit
+    = permission.check_box :can_delete

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

@@ -51,6 +51,7 @@
   <% end %>
   <% field_set_tag(:class => 'buttons') do %>
     <%= submit_tag "Login" %>
+    <%= button_tag "Cancel" %>
     <%= image_submit_tag "buttons/submit.png" %>
   <% end %>
 <% end %>

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

@@ -41,4 +41,5 @@
       = check_box_tag :remember_me, :value => "1", :checked => true
   - field_set_tag(:class => 'buttons') do
     = submit_tag "Login"
+    = button_tag "Cancel"
     = image_submit_tag "buttons/submit.png"

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

@@ -0,0 +1,3 @@
+<p class='simple'><%= mail_to 'test@demo.com' %></p>
+
+<p class='captioned'><%= mail_to 'test@demo.com', "Click my Email" %></p>

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

@@ -0,0 +1,3 @@
+%p.simple= mail_to 'test@demo.com'
+
+%p.captioned= mail_to 'test@demo.com', "Click my Email"

data/test/fixtures/warden_app/app.rb

@@ -59,6 +59,11 @@ class WardenDemo < Sinatra::Base
     must_be_authorized!('/login')
     "<h1>Valid Authorized Page</h1>"
   end
+  
+  post '/unauthenticated/?' do
+    status 401
+    '<h2>Unauthenticated</h2>'
+  end
 
   get '/current_user' do
     if current_user

data/test/markup_plugin/test_asset_tag_helpers.rb

@@ -46,6 +46,38 @@ class TestAssetTagHelpers < Test::Unit::TestCase
     end
   end
 
+  context 'for #mail_to method' do
+    should "display link element for mail to no caption" do
+      actual_html = mail_to('test@demo.com')
+      assert_has_tag(:a, :href => "mailto:test@demo.com", :content => 'test@demo.com') { actual_html }
+    end
+
+    should "display link element for mail to with caption" do
+      actual_html = mail_to('test@demo.com', "My Email", :class => 'demo')
+      assert_has_tag(:a, :href => "mailto:test@demo.com", :content => 'My Email', :class => 'demo') { actual_html }
+    end
+
+    should "display link element for mail to with caption and mail options" do
+      actual_html = mail_to('test@demo.com', "My Email", :subject => 'demo test', :class => 'demo', :cc => 'foo@test.com')
+      assert_has_tag(:a, :class => 'demo') { actual_html }
+      assert_match /mailto\:test\@demo.com\?/, actual_html
+      assert_match /cc=foo\@test\.com/, actual_html
+      assert_match /subject\=demo\%20test/, actual_html
+    end
+
+    should "display mail link element in haml" do
+      visit '/haml/mail_to'
+      assert_have_selector 'p.simple a', :href => 'mailto:test@demo.com', :content => 'test@demo.com'
+      assert_have_selector 'p.captioned a', :href => 'mailto:test@demo.com', :content => 'Click my Email'
+    end
+
+    should "display mail link element in erb" do
+      visit '/erb/mail_to'
+      assert_have_selector 'p.simple a', :href => 'mailto:test@demo.com', :content => 'test@demo.com'
+      assert_have_selector 'p.captioned a', :href => 'mailto:test@demo.com', :content => 'Click my Email'
+    end
+  end
+
   context 'for #image_tag method' do
     should "display image tag absolute link with no options" do
       assert_has_tag('img', :src => "/absolute/pic.gif") { image_tag('/absolute/pic.gif') }

data/test/markup_plugin/test_form_builder.rb

@@ -34,7 +34,7 @@ class TestFormBuilder < Test::Unit::TestCase
       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
+    should "display correct form html with method :put" do
       actual_html = form_for(@user, '/update', :method => 'put') { "Demo" }
       assert_has_tag('form', :action => '/update', :method => 'post') { actual_html }
       assert_has_tag('form input', :type => 'hidden', :name => "_method", :value => 'put') { actual_html }
@@ -61,7 +61,7 @@ class TestFormBuilder < Test::Unit::TestCase
       assert_has_tag('form p input[type=text]') { actual_html }
     end
 
-    should "display fail for form with no object" do
+    should "display fail for form with nil object" do
       assert_raises(RuntimeError) { form_for(@not_real, '/register', :id => 'register', :method => 'post') { "Demo" } }
     end
 
@@ -80,6 +80,38 @@ class TestFormBuilder < Test::Unit::TestCase
     end
   end
 
+  context 'for #fields_for method' do
+    should 'display correct fields html' do
+      actual_html = fields_for(@user) { |f| f.text_field(:first_name) }
+      assert_has_tag(:input, :type => 'text', :name => 'user[first_name]', :id => 'user_first_name') { actual_html }
+    end
+
+    should 'display correct fields html with symbol object' do
+      actual_html = fields_for(:markup_user) { |f| f.text_field(:first_name) }
+      assert_has_tag(:input, :type => 'text', :name => 'markup_user[first_name]', :id => 'markup_user_first_name') { actual_html }
+    end
+
+    should "display fail for nil object" do
+      assert_raises(RuntimeError) { fields_for(@not_real) { |f| "Demo" } }
+    end
+
+    should 'display correct simple fields in haml' do
+      visit '/haml/fields_for'
+      assert_have_selector :form, :action => '/demo1', :id => 'demo-fields-for'
+      assert_have_selector '#demo-fields-for input', :type => 'text', :name => 'markup_user[gender]', :value => 'male'
+      assert_have_selector '#demo-fields-for input', :type => 'checkbox', :name => 'permission[can_edit]', :value => '1', :checked => 'checked'
+      assert_have_selector '#demo-fields-for input', :type => 'checkbox', :name => 'permission[can_delete]'
+    end
+
+    should "display correct simple fields in erb" do
+      visit '/erb/fields_for'
+      assert_have_selector :form, :action => '/demo1', :id => 'demo-fields-for'
+      assert_have_selector '#demo-fields-for input', :type => 'text', :name => 'markup_user[gender]', :value => 'male'
+      assert_have_selector '#demo-fields-for input', :type => 'checkbox', :name => 'permission[can_edit]', :value => '1', :checked => 'checked'
+      assert_have_selector '#demo-fields-for input', :type => 'checkbox', :name => 'permission[can_delete]'
+    end
+  end
+
   # ===========================
   # AbstractFormBuilder
   # ===========================
@@ -186,14 +218,26 @@ class TestFormBuilder < Test::Unit::TestCase
     end
 
     should "display correct checkbox html as checked when object value matches" do
-      @user.stubs(:show_favorites => '1')
+      @user.stubs(:show_favorites => 'human')
+      actual_html = standard_builder.check_box(:show_favorites, :value => 'human')
+      assert_has_tag('input[type=checkbox]', :checked => 'checked', :name => 'user[show_favorites]') { actual_html }
+    end
+
+    should "display correct checkbox html as checked when object value is true" do
+      @user.stubs(:show_favorites => true)
       actual_html = standard_builder.check_box(:show_favorites, :value => '1')
       assert_has_tag('input[type=checkbox]', :checked => 'checked', :name => 'user[show_favorites]') { actual_html }
     end
 
     should "display correct checkbox html as unchecked when object value doesn't match" do
-      @user.stubs(:show_favories => '0')
-      actual_html = standard_builder.check_box(:show_favorites, :value => 'female')
+      @user.stubs(:show_favorites => 'alien')
+      actual_html = standard_builder.check_box(:show_favorites, :value => 'human')
+      assert_has_no_tag('input[type=checkbox]', :checked => 'checked') { actual_html }
+    end
+
+    should "display correct checkbox html as unchecked when object value is false" do
+      @user.stubs(:show_favorites => false)
+      actual_html = standard_builder.check_box(:show_favorites, :value => '1')
       assert_has_no_tag('input[type=checkbox]', :checked => 'checked') { actual_html }
     end
 

data/test/markup_plugin/test_form_helpers.rb

@@ -364,6 +364,23 @@ class TestFormHelpers < Test::Unit::TestCase
     end
   end
 
+  context 'for #button_tag method' do
+    should "display submit tag in ruby" do
+      actual_html = button_tag("Cancel", :class => 'clear')
+      assert_has_tag(:input, :type => 'button', :class => "clear", :value => 'Cancel') { actual_html }
+    end
+
+    should "display submit tag in erb" do
+      visit '/erb/form_tag'
+      assert_have_selector 'form.advanced-form input[type=button]', :count => 1, :value => "Cancel"
+    end
+
+    should "display submit tag in haml" do
+      visit '/haml/form_tag'
+      assert_have_selector 'form.advanced-form input[type=button]', :count => 1, :value => "Cancel"
+    end
+  end
+
   context 'for #image_submit_tag method' do
     should "display image submit tag in ruby with relative path" do
       actual_html = image_submit_tag('buttons/ok.png', :class => 'success')

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: sinatra_more
 version: !ruby/object:Gem::Version 
-  version: 0.3.9
+  version: 0.3.10
 platform: ruby
 authors: 
 - Nathan Esquenazi
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-11-10 00:00:00 -08:00
+date: 2009-11-11 00:00:00 -08:00
 default_executable: sinatra_gen
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -191,12 +191,16 @@ files:
 - test/fixtures/markup_app/views/content_for.haml
 - test/fixtures/markup_app/views/content_tag.erb
 - test/fixtures/markup_app/views/content_tag.haml
+- test/fixtures/markup_app/views/fields_for.erb
+- test/fixtures/markup_app/views/fields_for.haml
 - test/fixtures/markup_app/views/form_for.erb
 - test/fixtures/markup_app/views/form_for.haml
 - test/fixtures/markup_app/views/form_tag.erb
 - test/fixtures/markup_app/views/form_tag.haml
 - test/fixtures/markup_app/views/link_to.erb
 - test/fixtures/markup_app/views/link_to.haml
+- test/fixtures/markup_app/views/mail_to.erb
+- test/fixtures/markup_app/views/mail_to.haml
 - test/fixtures/render_app/app.rb
 - test/fixtures/render_app/views/erb/test.erb
 - test/fixtures/render_app/views/haml/test.haml