sinatra_more 0.2.2 → 0.2.3

data/README.rdoc

@@ -231,6 +231,10 @@ The following are fields provided by AbstractFormBuilder that can be used within
   * <tt>f.password_field :secret, :class => 'long'</tt>
 * <tt>file_field(field, options={})</tt>
   * <tt>f.file_field :photo, :class => 'long'</tt>
+* <tt>select(field, options={})</tt>
+  * <tt>f.select(:state, :options => ['California', 'Texas', 'Wyoming'])</tt>
+  * <tt>f.select(:state, :collection => @states, :fields => [:name, :id])</tt>
+  * <tt>f.select(:state, :options => [...], :include_blank => true)</tt>
 * <tt>submit(caption, options={})</tt>
   * <tt>f.submit "Update", :class => 'long'</tt>
 * <tt>image_submit(source, options={})</tt>
@@ -252,6 +256,9 @@ A form_for using these basic fields might look like:
     %p
       = f.label :is_admin, :caption => "Admin User?"
       = f.check_box :is_admin
+    $p
+      = f.label :color, :caption => "Favorite Color?"
+      = f.select :color, :options => ['red', 'black']
     %p
       = f.submit "Create", :class => 'button'
   
@@ -265,6 +272,10 @@ There is also a StandardFormBuilder which builds on the abstract fields that can
   * <tt>password_field_block(:code, :class => 'big')</tt>
 * <tt>file_field_block(field, options={}, label_options={})</tt>
   * <tt>file_field_block(:photo, :class => 'big')</tt>
+* <tt>check_box_block(field, options={}, label_options={})</tt>
+  * <tt>check_box_block(:remember_me, :class => 'big')</tt>
+* <tt>select_block(field, options={}, label_options={})</tt>
+  * <tt>select_block(:country, :option => ['USA', 'Canada'])</tt>
 * <tt>submit_block(caption, options={})</tt>
   * <tt>submit_block(:username, :class => 'big')</tt>
 * <tt>image_submit_block(source, options={})</tt>
@@ -276,6 +287,8 @@ A form_for using these standard fields might look like:
     = f.error_messages
     = f.text_field_block :name, :caption => "Full name"
     = f.text_field_block :email
+    = f.check_box_block  :remember_me
+    = f.select_block     :fav_color, :options => ['red', 'blue']
     = f.password_field_block :password
     = f.submit_block "Create", :class => 'button'
 

data/VERSION

@@ -1 +1 @@
-0.2.2
+0.2.3

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

@@ -43,6 +43,13 @@ class AbstractFormBuilder
     @template.password_field_tag field_name(field), options
   end
 
+  # f.select :color, :options => ['red', 'green'], :include_blank => true
+  # f.select :color, :collection => @colors, :fields => [:name, :id]
+  def select(field, options={})
+    options.reverse_merge!(:id => field_id(field), :selected => field_value(field))
+    @template.select_tag field_name(field), options
+  end
+
   # f.check_box :remember_me, :value => 'true', :uncheck_value => '0'
   def check_box(field, options={})
     unchecked_value = options.delete(:uncheck_value) || '0'
@@ -79,7 +86,7 @@ class AbstractFormBuilder
 
   # Returns the known field types for a formbuilder
   def self.field_types
-    [:text_field, :text_area, :password_field, :file_field, :hidden_field, :check_box]
+    [:hidden_field, :text_field, :text_area, :password_field, :file_field, :radio_button, :check_box, :select]
   end
 
   # Returns the object's models name

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

@@ -1,10 +1,12 @@
 class StandardFormBuilder < AbstractFormBuilder
 
   # text_field_block(:username, { :class => 'long' }, { :class => 'wide-label' })
-  # text_area_block(:username, { :class => 'long' }, { :class => 'wide-label' })
-  # password_field_block(:username, { :class => 'long' }, { :class => 'wide-label' })
-  # file_field_block(:username, { :class => 'long' }, { :class => 'wide-label' })
-  (self.field_types - [:hidden_field]).each do |field_type|
+  # text_area_block(:summary, { :class => 'long' }, { :class => 'wide-label' })
+  # password_field_block(:password, { :class => 'long' }, { :class => 'wide-label' })
+  # file_field_block(:photo, { :class => 'long' }, { :class => 'wide-label' })
+  # check_box_block(:remember_me, { :class => 'long' }, { :class => 'wide-label' })
+  # select_block(:color, :options => ['green', 'black'])
+  (self.field_types - [ :hidden_field, :radio_button ]).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]

data/lib/sinatra_more/markup_plugin/form_helpers.rb

@@ -86,8 +86,12 @@ module SinatraMore
     # options = [['caption', 'value'], ['Green', 'green1'], ['Blue', 'blue1'], ['Black', "black1"]]
     # options = ['option', 'red', 'yellow' ]
     # select_tag(:favorite_color, :options => ['red', 'yellow'], :selected => 'green1')
+    # select_tag(:country, :collection => @countries, :fields => [:name, :code])
     def select_tag(name, options={})
       options.reverse_merge!(:name => name)
+      collection, fields = options.delete(:collection), options.delete(:fields)
+      options[:options] = options_from_collection(collection, fields) if collection
+      options[:options].unshift('') if options.delete(:include_blank)
       select_options_html = options_for_select(options.delete(:options), options.delete(:selected))
       options.merge!(:name => "#{options[:name]}[]") if options[:multiple]
       content_tag(:select, select_options_html, options)
@@ -130,11 +134,19 @@ module SinatraMore
 
     protected
 
+    # Returns an array of option items for a select field based on the given collection
+    # fields is an array containing the fields to display from each item in the collection
+    def options_from_collection(collection, fields)
+      return '' if collection.blank?
+      collection.collect { |item| [ item.send(fields.first), item.send(fields.last) ] }
+    end
+
     # Returns the options tags for a select based on the given option items
     def options_for_select(option_items, selected_value=nil)
       return '' if option_items.blank?
       option_items.collect do |caption, value|
-        content_tag(:option, caption, :value => (value || caption), :selected => (selected_value == (value || caption)))
+        value ||= caption
+        content_tag(:option, caption, :value => value, :selected => selected_value.to_s =~ /#{value}|#{caption}/)
       end
     end
 

data/sinatra_more.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{sinatra_more}
-  s.version = "0.2.2"
+  s.version = "0.2.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Nathan Esquenazi"]

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

@@ -27,6 +27,11 @@
     <%= f.radio_button :gender, :value => 'female' %>
   </p>
   <p>
+    <%= f.label :country, :caption => "Your country" %>
+    <%= f.select :country, :options => ['USA', 'Canada', 'Mexico'], :selected => 'USA', :class => 'selector' %>
+  </p>
+  <p>
+    <%= f.label :remember_me %>
     <%= f.check_box :remember_me, :value => '1' %>
   </p>
   <p><%= f.submit "Create", :class => 'success', :id => 'demo-button' %></p>
@@ -40,6 +45,8 @@
   <%= f.password_field_block :code, { :class => 'input' } %>
   <%= f.text_area_block :about, { :class => 'textarea' } %>
   <%= f.file_field_block :photo, { :class => 'upload' } %>
+  <%= f.check_box_block :remember_me, { :class => 'checker' } %>
+  <%= 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 %>

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

@@ -17,10 +17,14 @@
     = f.label :about, :caption => "About Me"
     = f.text_area :about, :class => 'user-about'  
   %p
-    = f.label :gender, :caption => "Your gender:"
+    = f.label :gender, :caption => "Your gender"
     = f.radio_button :gender, :value => 'male'
     = f.radio_button :gender, :value => 'female'
   %p
+    = f.label :country, :caption => "Your country"
+    = f.select :country, :options => ['USA', 'Canada', 'Mexico'], :selected => 'USA', :class => 'selector'
+  %p
+    = f.label :remember_me
     = f.check_box :remember_me, :value => "1"
   %p
     = f.submit "Create", :class => 'success', :id => 'demo-button'
@@ -34,5 +38,7 @@
   = f.password_field_block :code, { :class => 'input' }
   = f.text_area_block :about, { :class => 'textarea' }
   = f.file_field_block :photo, { :class => 'upload' }
+  = f.check_box_block :remember_me, { :class => 'checker' }
+  = f.select_block :state, :options => ['California', 'Texas'], :class => 'selector'
   = f.submit_block "Create", { :class => 'button' }
   = f.image_submit_block "buttons/ok.png", { :class => 'image' }

data/test/markup_plugin/test_form_builder.rb

@@ -9,7 +9,10 @@ class TestFormBuilder < Test::Unit::TestCase
   end
 
   def setup
-    @user = stub(:errors => stub(:full_messages => ["1", "2"], :none? => false), :class => 'User', :first_name => "Joe", :session_id => 54)
+    error_stub = stub(:full_messages => ["1", "2"], :none? => false)
+    role_types = [stub(:name => 'Admin', :id => 1), stub(:name => 'Moderate', :id => 2),  stub(:name => 'Limited', :id => 3)]
+    @user = stub(:errors => error_stub, :class => 'User', :first_name => "Joe", :session_id => 54)
+    @user.stubs(:role_types => role_types, :role => "1")
     @user_none = stub(:errors => stub(:none? => true), :class => 'User')
   end
 
@@ -292,6 +295,53 @@ class TestFormBuilder < Test::Unit::TestCase
     end
   end
 
+  context 'for #select method' do
+    should "display correct select html" do
+      actual_html = standard_builder.select(:state, :options => ['California', 'Texas', 'Wyoming'], :class => 'selecty')
+      assert_has_tag('select.selecty', :id => 'user_state', :name => 'user[state]') { actual_html }
+      assert_has_tag('select.selecty option', :count => 3) { actual_html }
+      assert_has_tag('select.selecty option', :value => 'California', :content => 'California') { actual_html }
+      assert_has_tag('select.selecty option', :value => 'Texas',      :content => 'Texas')      { actual_html }
+      assert_has_tag('select.selecty option', :value => 'Wyoming',    :content => 'Wyoming')    { actual_html }
+    end
+
+    should "display correct select html with selected item if it matches value" do
+      @user.stubs(:state => 'California')
+      actual_html = standard_builder.select(:state, :options => ['California', 'Texas', 'Wyoming'])
+      assert_has_tag('select', :id => 'user_state', :name => 'user[state]') { actual_html }
+      assert_has_tag('select option', :selected => 'selected', :count => 1) { actual_html }
+      assert_has_tag('select option', :value => 'California', :selected => 'selected') { actual_html }
+    end
+
+    should "display correct select html with include_blank" do
+      actual_html = standard_builder.select(:state, :options => ['California', 'Texas', 'Wyoming'], :include_blank => true)
+      assert_has_tag('select', :id => 'user_state', :name => 'user[state]') { actual_html }
+      assert_has_tag('select option', :count => 4) { actual_html }
+      assert_has_tag('select option:first-child', :content => '') { actual_html }
+    end
+
+    should "display correct select html with collection passed in" do
+      actual_html = standard_builder.select(:role, :collection => @user.role_types, :fields => [:name, :id])
+      assert_has_tag('select', :id => 'user_role', :name => 'user[role]') { actual_html }
+      assert_has_tag('select option', :count => 3) { actual_html }
+      assert_has_tag('select option', :value => '1', :content => 'Admin', :selected => 'selected')     { actual_html }
+      assert_has_tag('select option', :value => '2', :content => 'Moderate')  { actual_html }
+      assert_has_tag('select option', :value => '3', :content => 'Limited')   { actual_html }
+    end
+
+    should "display correct select in haml" do
+      visit '/haml/form_for'
+      assert_have_selector '#demo textarea', :name => 'markup_user[about]', :id => 'markup_user_about', :class => 'user-about'
+      assert_have_selector '#demo2 textarea', :name => 'markup_user[about]', :id => 'markup_user_about', :class => 'textarea'
+    end
+
+    should "display correct select in erb" do
+      visit '/erb/form_for'
+      assert_have_selector '#demo textarea', :name => 'markup_user[about]', :id => 'markup_user_about', :class => 'user-about'
+      assert_have_selector '#demo2 textarea', :name => 'markup_user[about]', :id => 'markup_user_about', :class => 'textarea'
+    end
+  end
+
   context 'for #submit method' do
     should "display correct submit button html with no options" do
       actual_html = standard_builder.submit
@@ -424,6 +474,50 @@ class TestFormBuilder < Test::Unit::TestCase
     end
   end
 
+  context 'for #check_box_block method' do
+    should "display correct check box block html" do
+      actual_html = standard_builder.check_box_block(:remember_me, :class => 'large', :caption => "Remember session")
+      assert_has_tag('p label', :for => 'user_remember_me', :content => "Remember session: ") { actual_html }
+      assert_has_tag('p input.large[type=checkbox]', :id => 'user_remember_me', :name => 'user[remember_me]') { actual_html }
+    end
+
+    should "display correct check box block in haml" do
+      visit '/haml/form_for'
+      assert_have_selector '#demo2 p label', :for => 'markup_user_remember_me', :content => "Remember Me: "
+      assert_have_selector '#demo2 p input.checker', :type => 'checkbox', :name => 'markup_user[remember_me]'
+    end
+
+    should "display correct check box block in erb" do
+      visit '/erb/form_for'
+      assert_have_selector '#demo2 p label', :for => 'markup_user_remember_me', :content => "Remember Me: "
+      assert_have_selector '#demo2 p input.checker', :type => 'checkbox', :name => 'markup_user[remember_me]'
+    end
+  end
+
+  context 'for #select_block method' do
+    should "display correct select_block block html" do
+      actual_html = standard_builder.select_block(:country, :options => ['USA', 'Canada'], :class => 'large', :caption => "Your country")
+      assert_has_tag('p label', :for => 'user_country', :content => "Your country: ") { actual_html }
+      assert_has_tag('p select', :id => 'user_country', :name => 'user[country]') { actual_html }
+      assert_has_tag('p select option', :content => 'USA')   { actual_html }
+      assert_has_tag('p select option', :content => 'Canada') { actual_html }
+    end
+
+    should "display correct select_block block in haml" do
+      visit '/haml/form_for'
+      assert_have_selector '#demo2 p label', :for => 'markup_user_state', :content => "State: "
+      assert_have_selector '#demo2 p select', :name => 'markup_user[state]', :id => 'markup_user_state'
+      assert_have_selector '#demo2 p select option',  :content => 'California'
+      assert_have_selector '#demo2 p select option',  :content => 'Texas'
+    end
+
+    should "display correct select_block block in erb" do
+      visit '/erb/form_for'
+      assert_have_selector '#demo2 p label', :for => 'markup_user_state', :content => "State: "
+      assert_have_selector '#demo2 p select', :name => 'markup_user[state]', :id => 'markup_user_state'
+    end
+  end
+
   context 'for #submit_block method' do
     should "display correct submit block html" do
       actual_html = standard_builder.submit_block("Update", :class => 'large')

data/test/markup_plugin/test_form_helpers.rb

@@ -291,8 +291,9 @@ class TestFormHelpers < Test::Unit::TestCase
 
   context "for #select_tag method" do
     should "display select tag in ruby" do
-      actual_html = select_tag(:favorite_color, :options => ['green', 'blue', 'black'])
+      actual_html = select_tag(:favorite_color, :options => ['green', 'blue', 'black'], :include_blank => true)
       assert_has_tag(:select, :name => 'favorite_color') { actual_html }
+      assert_has_tag('select option:first-child', :content => '') { actual_html }
       assert_has_tag('select option', :content => 'green', :value => 'green') { actual_html }
       assert_has_tag('select option', :content => 'blue', :value => 'blue') { actual_html }
       assert_has_tag('select option', :content => 'black', :value => 'black') { actual_html }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: sinatra_more
 version: !ruby/object:Gem::Version 
-  version: 0.2.2
+  version: 0.2.3
 platform: ruby
 authors: 
 - Nathan Esquenazi