sinatra_more 0.2.0 → 0.2.1

data/README.rdoc

@@ -173,6 +173,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>image_submit_tag(source, options={})</tt>
+  * Constructs an image submit button from the given options
+  * <tt>image_submit_tag "submit.png", :class => 'success'</tt>
 
 A form_tag might look like:
 

data/VERSION

@@ -1 +1 @@
-0.2.0
+0.2.1

data/lib/sinatra_more/markup_plugin/asset_tag_helpers.rb

@@ -48,6 +48,12 @@ module SinatraMore
       sources.collect { |script| javascript_tag(script, options) }.join("\n")
     end
 
+    # Returns the path to the image, either relative or absolute
+    def image_path(src)
+      src.gsub!(/\s/, '')
+      src =~ %r{^\s*(/|http)} ? src : File.join('/images', src)
+    end
+
     protected
 
     # stylesheet_tag('style', :media => 'screen')
@@ -62,12 +68,6 @@ module SinatraMore
       tag(:script, options)
     end
 
-    # Returns the path to the image, either relative or absolute
-    def image_path(src)
-      src.gsub!(/\s/, '')
-      src =~ %r{^\s*/} ? src : File.join('/images', src)
-    end
-
     def javascript_path(source)
       return source if source =~ /^http/
       result_path = "/javascripts/#{File.basename(source, '.js')}.js"

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

@@ -70,6 +70,11 @@ class AbstractFormBuilder
     @template.submit_tag caption, options
   end
 
+  # f.simage_submitubmit "buttons/submit.png", :class => 'large'
+  def image_submit(source, options={})
+    @template.image_submit_tag source, options
+  end
+
   protected
 
   # Returns the known field types for a formbuilder

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

@@ -1,5 +1,5 @@
 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' })
@@ -17,7 +17,13 @@ class StandardFormBuilder < AbstractFormBuilder
 
   # submit_block("Update")
   def submit_block(caption, options={})
-    submit_html = @template.submit_tag(caption, options)
+    submit_html = self.submit(caption, options)
+    @template.content_tag(:p, submit_html)
+  end
+
+  # image_submit_block("submit.png")
+  def image_submit_block(source, options={})
+    submit_html = self.image_submit(source, options)
     @template.content_tag(:p, submit_html)
   end
 end

data/lib/sinatra_more/markup_plugin/form_helpers.rb

@@ -110,6 +110,13 @@ module SinatraMore
       input_tag(:submit, options)
     end
 
+    # Constructs a submit button from the given options
+    # submit_tag "Create", :class => 'success'
+    def image_submit_tag(source, options={})
+      options.reverse_merge!(:src => image_path(source))
+      input_tag(:image, options)
+    end
+
     protected
 
     # returns the hidden method field for 'put' and 'delete' forms

data/lib/sinatra_more/support_lite.rb

@@ -2,6 +2,7 @@
 
 unless String.method_defined?(:titleize)
   require 'active_support/inflector'
+  require 'active_support/core_ext/blank'
 end
 
 unless Hash.method_defined?(:reverse_merge!)

data/sinatra_more.gemspec

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

@@ -30,6 +30,7 @@
     <%= f.check_box :remember_me, :value => '1' %>
   </p>
   <p><%= f.submit "Create", :class => 'success', :id => 'demo-button' %></p>
+  <p><%= f.image_submit "buttons/post.png", :class => 'success', :id => 'image-button' %></p>
 <% end %>
 
 <% form_for MarkupUser.new, '/another_demo', :id => 'demo2', :method => 'get' do |f| %>
@@ -39,5 +40,6 @@
   <%= f.password_field_block :code, { :class => 'input' } %>
   <%= f.text_area_block :about, { :class => 'textarea' } %>
   <%= f.file_field_block :photo, { :class => 'upload' } %>
-  <%= f.submit_block "Create", { :class => 'button', :class => 'button' } %>
+  <%= 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

@@ -24,6 +24,8 @@
     = f.check_box :remember_me, :value => "1"
   %p
     = f.submit "Create", :class => 'success', :id => 'demo-button'
+  %p
+    = f.image_submit "buttons/post.png", :class => 'success', :id => 'image-button'
 
 - form_for MarkupUser.new, '/another_demo', :id => 'demo2', :method => 'get' do |f|
   = f.error_messages :header_message => "custom MarkupUser cannot be saved!"
@@ -32,4 +34,5 @@
   = f.password_field_block :code, { :class => 'input' }
   = f.text_area_block :about, { :class => 'textarea' }
   = f.file_field_block :photo, { :class => 'upload' }
-  = f.submit_block "Create", { :class => 'button' }
+  = f.submit_block "Create", { :class => 'button' }
+  = f.image_submit_block "buttons/ok.png", { :class => 'image' }

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

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

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

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

data/test/helper.rb

@@ -13,6 +13,7 @@ require 'sinatra_more'
 class Test::Unit::TestCase
   include SinatraMore::OutputHelpers
   include SinatraMore::TagHelpers
+  include SinatraMore::AssetTagHelpers
   include Rack::Test::Methods
   include Webrat::Methods
   include Webrat::Matchers

data/test/markup_plugin/test_asset_tag_helpers.rb

@@ -53,6 +53,9 @@ class TestAssetTagHelpers < Test::Unit::TestCase
     should "display image tag relative link with options" do
       assert_has_tag('img.photo', :src => "/images/relative/pic.gif") { image_tag('relative/pic.gif', :class => 'photo') }
     end
+    should "display image tag uri link with options" do
+      assert_has_tag('img.photo', :src => "http://demo.org/pic.gif") { image_tag('http://demo.org/pic.gif', :class => 'photo') }
+    end
     should "display image tag relative link with incorrect spacing" do
       assert_has_tag('img.photo', :src => "/images/relative/pic.gif") { image_tag(' relative/ pic.gif  ', :class => 'photo') }
     end

data/test/markup_plugin/test_form_builder.rb

@@ -316,6 +316,30 @@ class TestFormBuilder < Test::Unit::TestCase
     end
   end
 
+  context 'for #image_submit method' do
+    should "display correct image submit button html with no options" do
+      actual_html = standard_builder.image_submit('buttons/ok.png')
+      assert_has_tag('input[type=image]', :src => "/images/buttons/ok.png") { actual_html }
+    end
+
+    should "display correct image submit button html" do
+      actual_html = standard_builder.image_submit('/system/ok.png', :class => 'large')
+      assert_has_tag('input.large[type=image]', :src => "/system/ok.png") { actual_html }
+    end
+
+    should "display correct image submit button in haml" do
+      visit '/haml/form_for'
+      assert_have_selector '#demo input', :type => 'image', :id => 'image-button', :src => '/images/buttons/post.png'
+      assert_have_selector '#demo2 input', :type => 'image', :class => 'image', :src => "/images/buttons/ok.png"
+    end
+
+    should "display correct image submit button in erb" do
+      visit '/erb/form_for'
+      assert_have_selector '#demo input', :type => 'image', :id => 'image-button', :src => '/images/buttons/post.png'
+      assert_have_selector '#demo2 input', :type => 'image', :class => 'image', :src => "/images/buttons/ok.png"
+    end
+  end
+
   # ===========================
   # StandardFormBuilder
   # ===========================
@@ -416,4 +440,21 @@ class TestFormBuilder < Test::Unit::TestCase
       assert_have_selector '#demo2 p input', :type => 'submit', :class => 'button'
     end
   end
+
+  context 'for #image_submit_block method' do
+    should "display correct image submit block html" do
+      actual_html = standard_builder.image_submit_block("buttons/ok.png", :class => 'large')
+      assert_has_tag('p input.large[type=image]', :src => '/images/buttons/ok.png') { actual_html }
+    end
+
+    should "display correct image submit block in haml" do
+      visit '/haml/form_for'
+      assert_have_selector '#demo2 p input', :type => 'image', :class => 'image', :src => '/images/buttons/ok.png'
+    end
+
+    should "display correct image submit block in erb" do
+      visit '/erb/form_for'
+      assert_have_selector '#demo2 p input', :type => 'image', :class => 'image', :src => '/images/buttons/ok.png'
+    end
+  end
 end

data/test/markup_plugin/test_form_helpers.rb

@@ -308,4 +308,26 @@ class TestFormHelpers < Test::Unit::TestCase
     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')
+      assert_has_tag(:input, :type => 'image', :class => "success", :src => '/images/buttons/ok.png') { actual_html }
+    end
+
+    should "display image submit tag in ruby with absolute path" do
+      actual_html = image_submit_tag('/system/ok.png', :class => 'success')
+      assert_has_tag(:input, :type => 'image', :class => "success", :src => '/system/ok.png') { actual_html }
+    end
+
+    should "display image submit tag in erb" do
+      visit '/erb/form_tag'
+      assert_have_selector 'form.advanced-form input[type=image]', :count => 1, :src => "/images/buttons/submit.png"
+    end
+
+    should "display image submit tag in haml" do
+      visit '/haml/form_tag'
+      assert_have_selector 'form.advanced-form input[type=image]', :count => 1, :src => "/images/buttons/submit.png"
+    end
+  end
+
 end

metadata

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