sinatra_more 0.2.1 → 0.2.2

data/README.rdoc

@@ -167,6 +167,11 @@ methods should be very familiar to anyone who has used rails view helpers.
 * <tt>radio_button_tag(name, options={})</tt>
   * Constructs a radio button input from the given options
   * <tt>radio_button_tag :gender, :value => 'male'</tt>
+* <tt>select_tag(name, settings={})</tt>
+  * Constructs a select tag with options from the given settings
+  * <tt>select_tag(:favorite_color, :options => ['1', '2', '3'], :selected => '1')</tt>
+  * <tt>select_tag(:more_color, :options => [['label', '1'], ['label2', '2']])</tt>
+  * <tt>select_tag(:multiple_color, :options => [...], :multiple => true)</tt>
 * <tt>file_field_tag(name, options={})</tt>
   * Constructs a file field input from the given options
   * <tt>file_field_tag :photo, :class => 'long'</tt>
@@ -188,6 +193,9 @@ A form_tag might look like:
       %p
         = label_tag :password, :class => 'first'
         = password_field_tag :password, :value => params[:password]
+      %p
+        = label_tag :strategy
+        = select_tag :strategy, :options => ['delete', 'destroy'], :selected => 'delete'
       %p
         = check_box_tag :confirm_delete
     - field_set_tag(:class => 'buttons') do
@@ -225,6 +233,8 @@ The following are fields provided by AbstractFormBuilder that can be used within
   * <tt>f.file_field :photo, :class => 'long'</tt>
 * <tt>submit(caption, options={})</tt>
   * <tt>f.submit "Update", :class => 'long'</tt>
+* <tt>image_submit(source, options={})</tt>
+  * <tt>f.submit "submit.png", :class => 'long'</tt>
   
 A form_for using these basic fields might look like:
 
@@ -257,6 +267,8 @@ There is also a StandardFormBuilder which builds on the abstract fields that can
   * <tt>file_field_block(:photo, :class => 'big')</tt>
 * <tt>submit_block(caption, options={})</tt>
   * <tt>submit_block(:username, :class => 'big')</tt>
+* <tt>image_submit_block(source, options={})</tt>
+  * <tt>image_submit_block('submit.png', :class => 'big')</tt>
   
 A form_for using these standard fields might look like:
 

data/TODO

@@ -6,8 +6,7 @@
   * 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 formhelpers/fields (radio_button_tag, select_tag)
-* Add support for missing formbuilder fields (radio_button, select, and standard_form_builder methods i.e check_box_group)
+* 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
@@ -20,6 +19,8 @@
 
 = COMPLETED
 
+* 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
 * Remove dependency on activesupport! and enumerate dependencies in rakefile (as much as possible, need inflectors)
 * Pull from sinatra-helpers and make erb templates work (and credit keldredd)

data/VERSION

@@ -1 +1 @@
-0.2.1
+0.2.2

data/lib/sinatra_more/markup_plugin/form_helpers.rb

@@ -82,6 +82,17 @@ module SinatraMore
       input_tag(:password, options)
     end
 
+    # Constructs a check_box from the given options
+    # options = [['caption', 'value'], ['Green', 'green1'], ['Blue', 'blue1'], ['Black', "black1"]]
+    # options = ['option', 'red', 'yellow' ]
+    # select_tag(:favorite_color, :options => ['red', 'yellow'], :selected => 'green1')
+    def select_tag(name, options={})
+      options.reverse_merge!(:name => name)
+      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)
+    end
+
     # Constructs a check_box from the given options
     # check_box_tag :remember_me, :value => 'Yes'
     def check_box_tag(name, options={})
@@ -119,6 +130,14 @@ module SinatraMore
 
     protected
 
+    # 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)))
+      end
+    end
+
     # returns the hidden method field for 'put' and 'delete' forms
     # Only 'get' and 'post' are allowed within browsers;
     # 'put' and 'delete' are just specified using hidden fields with form action still 'put'.

data/lib/sinatra_more/markup_plugin/tag_helpers.rb

@@ -4,7 +4,6 @@ module SinatraMore
     # input_tag :text, :class => "test"
     def input_tag(type, options = {})
       options.reverse_merge!(:type => type)
-      [:checked, :disabled].each { |attr| options[attr] = attr.to_s if options[attr]  }
       tag(:input, options)
     end
 
@@ -25,9 +24,17 @@ module SinatraMore
     # tag(:p, :content => "hello", :class => 'large')
     def tag(name, options={})
       content = options.delete(:content)
+      identity_tag_attributes.each { |attr| options[attr] = attr.to_s if options[attr]  }
       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}>" : " />")
     end
+
+    protected
+
+    # Returns a list of attributes which can only contain an identity value (i.e selected)
+    def identity_tag_attributes
+      [:checked, :disabled, :selected, :multiple]
+    end
   end
 end

data/sinatra_more.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{sinatra_more}
-  s.version = "0.2.1"
+  s.version = "0.2.2"
 
   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_tag.erb

@@ -8,6 +8,8 @@
     <%= password_field_tag :password %>
     <%= check_box_tag :remember_me %>
     <%= label_tag :gender %>
+    <%= label_tag :color %>
+    <%= select_tag :color, :options => ['green', 'orange', 'purple'] %>
     <%= radio_button_tag :gender, :value => 'male' %>
     <%= radio_button_tag :gender, :value => 'female' %>
     <%= submit_tag %>
@@ -39,6 +41,10 @@
       <%= radio_button_tag :gender, :value => 'male', :checked => true %>
       <%= radio_button_tag :remember_me, :value => 'female' %>
     <p>
+    <p>
+      <%= label_tag :fav_color %>
+      <%= select_tag :fav_color, :options => [ ['green', '1'], ['orange', '2'], ['purple', '3'] ], :selected => '2' %>
+    </p>
     <p>
       <%= check_box_tag :remember_me, :value => '1', :checked => true %>
     <p>

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

@@ -6,7 +6,9 @@
     = text_field_tag :username
     = label_tag :password
     = password_field_tag :password
-    = label_tag :gender
+    = label_tag  :color
+    = select_tag :color, :options => ['green', 'orange', 'purple']
+    = label_tag  :gender
     = radio_button_tag :gender, :value => 'male'
     = radio_button_tag :gender, :value => 'female'
     = check_box_tag :remember_me
@@ -32,6 +34,9 @@
     %p
       = label_tag :photo, :class => 'photo'
       = file_field_tag :photo, :class => 'upload'
+    %p
+      = label_tag :fav_color
+      = select_tag :fav_color, :options => [ ['green', '1'], ['orange', '2'], ['purple', '3'] ], :selected => '2'
     %p
       = check_box_tag :remember_me, :value => "1", :checked => true
   - field_set_tag(:class => 'buttons') do

data/test/markup_plugin/test_form_helpers.rb

@@ -113,14 +113,14 @@ class TestFormHelpers < Test::Unit::TestCase
 
     should "display label tag in erb for simple form" do
       visit '/erb/form_tag'
-      assert_have_selector 'form.simple-form label', :count => 3
+      assert_have_selector 'form.simple-form label', :count => 4
       assert_have_selector 'form.simple-form label', :content => "Username", :for => 'username'
       assert_have_selector 'form.simple-form label', :content => "Password", :for => 'password'
       assert_have_selector 'form.simple-form label', :content => "Gender", :for => 'gender'
     end
     should "display label tag in erb for advanced form" do
       visit '/erb/form_tag'
-      assert_have_selector 'form.advanced-form label', :count => 5
+      assert_have_selector 'form.advanced-form label', :count => 6
       assert_have_selector 'form.advanced-form label.first', :content => "Nickname", :for => 'username'
       assert_have_selector 'form.advanced-form label.first', :content => "Password", :for => 'password'
       assert_have_selector 'form.advanced-form label.about', :content => "About Me", :for => 'about'
@@ -130,14 +130,14 @@ class TestFormHelpers < Test::Unit::TestCase
 
     should "display label tag in haml for simple form" do
       visit '/haml/form_tag'
-      assert_have_selector 'form.simple-form label', :count => 3
+      assert_have_selector 'form.simple-form label', :count => 4
       assert_have_selector 'form.simple-form label', :content => "Username", :for => 'username'
       assert_have_selector 'form.simple-form label', :content => "Password", :for => 'password'
       assert_have_selector 'form.simple-form label', :content => "Gender", :for => 'gender'
     end
     should "display label tag in haml for advanced form" do
       visit '/haml/form_tag'
-      assert_have_selector 'form.advanced-form label', :count => 5
+      assert_have_selector 'form.advanced-form label', :count => 6
       assert_have_selector 'form.advanced-form label.first', :content => "Nickname", :for => 'username'
       assert_have_selector 'form.advanced-form label.first', :content => "Password", :for => 'password'
       assert_have_selector 'form.advanced-form label.about', :content => "About Me", :for => 'about'
@@ -289,6 +289,60 @@ class TestFormHelpers < Test::Unit::TestCase
     end
   end
 
+  context "for #select_tag method" do
+    should "display select tag in ruby" do
+      actual_html = select_tag(:favorite_color, :options => ['green', 'blue', 'black'])
+      assert_has_tag(:select, :name => 'favorite_color') { 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 }
+    end
+
+    should "display select tag in ruby with extended attributes" do
+      actual_html = select_tag(:favorite_color, :disabled => true, :options => ['only', 'option'])
+      assert_has_tag(:select, :disabled => 'disabled') { actual_html }
+    end
+
+    should "display select tag in ruby with multiple attribute" do
+      actual_html = select_tag(:favorite_color, :multiple => true, :options => ['only', 'option'])
+      assert_has_tag(:select, :multiple => 'multiple', :name => 'favorite_color[]') { actual_html }
+    end
+
+    should "display options with values and selected" do
+      options = [['Green', 'green1'], ['Blue', 'blue1'], ['Black', "black1"]]
+      actual_html = select_tag(:favorite_color, :options => options, :selected => 'green1')
+      assert_has_tag(:select, :name => 'favorite_color') { actual_html }
+      assert_has_tag('select option', :selected => 'selected', :count => 1) { actual_html }
+      assert_has_tag('select option', :content => 'Green', :value => 'green1', :selected => 'selected') { actual_html }
+      assert_has_tag('select option', :content => 'Blue', :value => 'blue1') { actual_html }
+      assert_has_tag('select option', :content => 'Black', :value => 'black1') { actual_html }
+    end
+
+    should "display select tag in erb" do
+      visit '/erb/form_tag'
+      assert_have_selector 'form.simple-form select', :count => 1, :name => 'color'
+      assert_have_selector('select option', :content => 'green',  :value => 'green')
+      assert_have_selector('select option', :content => 'orange', :value => 'orange')
+      assert_have_selector('select option', :content => 'purple', :value => 'purple')
+      assert_have_selector 'form.advanced-form select', :name => 'fav_color'
+      assert_have_selector('select option', :content => 'green',  :value => '1')
+      assert_have_selector('select option', :content => 'orange', :value => '2', :selected => 'selected')
+      assert_have_selector('select option', :content => 'purple', :value => '3')
+    end
+
+    should "display select tag in haml" do
+      visit '/haml/form_tag'
+      assert_have_selector 'form.simple-form select', :count => 1, :name => 'color'
+      assert_have_selector('select option', :content => 'green',  :value => 'green')
+      assert_have_selector('select option', :content => 'orange', :value => 'orange')
+      assert_have_selector('select option', :content => 'purple', :value => 'purple')
+      assert_have_selector 'form.advanced-form select', :name => 'fav_color'
+      assert_have_selector('select option', :content => 'green',  :value => '1')
+      assert_have_selector('select option', :content => 'orange', :value => '2', :selected => 'selected')
+      assert_have_selector('select option', :content => 'purple', :value => '3')
+    end
+  end
+
   context 'for #submit_tag method' do
     should "display submit tag in ruby" do
       actual_html = submit_tag("Update", :class => 'success')

data/test/markup_plugin/test_tag_helpers.rb

@@ -11,9 +11,13 @@ class TestTagHelpers < Test::Unit::TestCase
       assert_has_tag(:br) { tag(:br) }
     end
     should("support tags with no content with attributes") do
-      actual_html = tag(:br, :style => 'clear:both', :class => 'yellow') 
+      actual_html = tag(:br, :style => 'clear:both', :class => 'yellow')
       assert_has_tag(:br, :class => 'yellow', :style=>'clear:both') { actual_html }
     end
+    should "support selected attribute by using 'selected' if true" do
+      actual_html = tag(:option, :selected => true)
+      assert_has_tag('option', :selected => 'selected') { actual_html }
+    end
     should "support tags with content no attributes" do
       assert_has_tag(:p, :content => "Demo String") { tag(:p, :content => "Demo String") }
     end

metadata

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