lib/mack/view_helpers/form_helpers.rb lib/mack/view_helpers/link_helpers.rb test/unit/view_helpers/form_helpers_spec.rb test/unit/view_helpers/link_helpers_spec.rb @@ -1,3 +1,5 @@ +* [#85] Refactored out Mack::ViewHelpers::HtmlHelpers into Mack::ViewHelpers::HtmlHelpers, Mack::ViewHelpers::FormHelpers and + Mack::ViewHelpers::linkHelpers * [#84] Added Mack::Distributed.lookup(url) to retrieve specific distributed services. * [#83] Added mail_to HTML helper. * [#82] Added ACL support to mack-distributed CHANGELOG @@ -2,59 +2,6 @@ module Mack module ViewHelpers # :nodoc: module HtmlHelpers - # This is just an alias to - # - # Examples: - # <%= link_to("http://www.mackframework.com") %> # => <a href="http://www.mackframework.com">http://www.mackframework.com</a> - # <%= link_to("Mack", "http://www.mackframework.com") %> # => <a href="http://www.mackframework.com">Mack</a> - # <%= link_to("Mack", "http://www.mackframework.com", :target => "_blank") %> # => <a href="http://www.mackframework.com" target="_blank">Mack</a> - # <%= link_to("Mack", "http://www.mackframework.com", :target => "_blank", :rel => :nofollow) %> # => <a href="http://www.mackframework.com" target="_blank" rel="nofollow">Mack</a> - # If you pass in :method as an option it will be a JavaScript form that will post to the specified link with the - # methd specified. - # <%= link_to("Mack", "http://www.mackframework.com", :method => :delete) %> - # If you use the :method option you can also pass in a :confirm option. The :confirm option will generate a - # javascript confirmation window. If 'OK' is selected the the form will submit. If 'cancel' is selected, then - # nothing will happen. This is extremely useful for 'delete' type of links. - # <%= link_to("Mack", "http://www.mackframework.com", :method => :delete, :confirm => "Are you sure?") %> - def link_to(link_text, url = link_text, html_options = {}) - options = {:href => url}.merge(html_options) - a(link_text, options) - end - - # Used in views to create href links. It takes link_text, url, and a Hash that gets added - # to the href as options. - # - # Examples: - # a("http://www.mackframework.com") # => <a href="http://www.mackframework.com">http://www.mackframework.com</a> - # a("Mack", :href => "http://www.mackframework.com") # => <a href="http://www.mackframework.com">Mack</a> - # a("Mack", :href => "http://www.mackframework.com", :target => "_blank") # => <a href="http://www.mackframework.com" target="_blank">Mack</a> - # a("Mack", :href => "http://www.mackframework.com", :target => "_blank", :rel => :nofollow) # => <a href="http://www.mackframework.com" target="_blank" rel="nofollow">Mack</a> - # If you pass in :method as an option it will be a JavaScript form that will post to the specified link with the - # methd specified. - # a("Mack", :href => "http://www.mackframework.com", :method => :delete) - # If you use the :method option you can also pass in a :confirm option. The :confirm option will generate a - # javascript confirmation window. If 'OK' is selected the the form will submit. If 'cancel' is selected, then - # nothing will happen. This is extremely useful for 'delete' type of links. - # a("Mack", :href => "http://www.mackframework.com", :method => :delete, :confirm => "Are you sure?") - def a(link_text, options = {}) - options = {:href => link_text}.merge(options) - if options[:method] - meth = nil - confirm = nil - - meth = %{var f = document.createElement('form'); f.style.display = 'none'; this.parentNode.appendChild(f); f.method = 'POST'; f.action = this.href;var s = document.createElement('input'); s.setAttribute('type', 'hidden'); s.setAttribute('name', '_method'); s.setAttribute('value', '#{options[:method]}'); f.appendChild(s);f.submit()} - options.delete(:method) - - if options[:confirm] - confirm = %{if (confirm('#{options[:confirm]}'))} - options.delete(:confirm) - end - - options[:onclick] = (confirm ? (confirm + " { ") : "") << meth << (confirm ? (" } ") : "") << ";return false;" - end - content_tag(:a, options, link_text) - end - # Builds an HTML tag. # # Examples: @@ -84,74 +31,12 @@ module Mack non_content_tag(:img, {:src => image_src}.merge(options)) end - # Builds an HTML submit tag - def submit_tag(value = "Submit", options = {}) - non_content_tag(:input, {:type => :submit, :value => value}.merge(options)) - end - - # Wraps an image tag with a link tag. - # - # Examples: - # <%= link_image_to("/images/foo.jpg", "#" %> # => <a href="#"><img src="/images/foo.jpg"></a> - def link_image_to(image_url, url, image_options = {}, html_options = {}) - link_to(img(image_url, image_options), url, html_options) - end - # Example: # <%= rss_tag(posts_index_url(:format => :xml)) %> def rss_tag(url) "<link rel=\"alternate\" type=\"application/rss+xml\" title=\"RSS\" href=\"#{url}\">" end - def form(action, options = {}, &block) - options = {:method => :post, :action => action}.merge(options) - if options[:id] - options = {:class => options[:id]}.merge(options) - end - if options[:multipart] - options = {:enctype => "multipart/form-data"}.merge(options) - options.delete(:multipart) - end - meth = nil - unless options[:method] == :get || options[:method] == :post - meth = "<input name=\"_method\" type=\"hidden\" value=\"#{options[:method]}\" />\n" - options[:method] = :post - end - concat("<form#{build_options(options)}>\n", block.binding) - concat(meth, block.binding) unless meth.blank? - yield - concat("</form>", block.binding) - # content_tag(:form, options, &block) - end - - # Builds a mailto href. By default it will generate - # JavaScript to help prevent phishing. To turn this off - # pass in the option :format => :plain - # - # mail_to("Saul Frami", "frami.saul@klocko.ca") # => - # <script>document.write(String.fromCharCode(60,97,32,104,114,101, - # 102,61,34,109,97,105,108,116,111,58,102,114,97,109,105,46,115,97,117, - # 108,64,107,108,111,99,107,111,46,99,97,34,62,83,97,117,108,32,70,114,97,109,105,60,47,97,62));</script> - def mail_to(text, email_address = nil, options = {}) - email_address = text if email_address.blank? - options = {:format => :js}.merge(options) - format = options[:format] - options - [:format] - link = link_to(text, "mailto:#{email_address}", options) - if format == :js - y = '' - link.size.times {y << 'a'} - js_link = "<script>" - c_code = [] - link.each_byte {|c| c_code << c} - js_link << "document.write(String.fromCharCode(#{c_code.join(",")}));" - js_link << "</script>" - return js_link - else - return link - end - end - private def build_options(options) opts = "" lib/mack/view_helpers/html_helpers.rb @@ -1,17 +1,8 @@ require 'pathname' require Pathname(__FILE__).dirname.expand_path.parent.parent + 'spec_helper' -module HTMLSpecHelpers - include Mack::ViewHelpers::HtmlHelpers - - def my_url - return "http://www.mackframework.com" - end - -end - describe Mack::ViewHelpers::HtmlHelpers do - include HTMLSpecHelpers + include Mack::ViewHelpers describe "mail_to" do @@ -29,62 +20,6 @@ describe Mack::ViewHelpers::HtmlHelpers do end - describe "submit_tag" do - - it "should build a simple submit tag" do - submit_tag.should == %{<input type="submit" value="Submit" />} - end - - it "should allow you to change the value" do - submit_tag("Login").should == %{<input type="submit" value="Login" />} - end - - it "should take options" do - submit_tag("Login", {:class => :foo}).should == %{<input class="foo" type="submit" value="Login" />} - end - - end - - describe "a" do - - it "should return content when a(...) is called" do - link_to(my_url).should_not be_nil - link_to(my_url).should_not be_empty - end - - it "should return proper html when called without options" do - a(my_url).should == %{<a href="#{my_url}">#{my_url}</a>} - end - - it "should return proper html when called with options" do - a("Mack", :href => my_url).should == %{<a href="#{my_url}">Mack</a>} - a("Mack", :href => my_url, :target => "_blank").should == %{<a href="#{my_url}" target=\"_blank">Mack</a>} - - result = %{<a href="#{my_url}" onclick="var f = document.createElement('form'); f.style.display = 'none'; this.parentNode.appendChild(f); f.method = 'POST'; f.action = this.href;var s = document.createElement('input'); s.setAttribute('type', 'hidden'); s.setAttribute('name', '_method'); s.setAttribute('value', 'delete'); f.appendChild(s);f.submit();return false;">Mack</a>} - a("Mack", :href => my_url, :method => :delete).should == result - - result = %{<a href="#{my_url}" onclick="if (confirm('Are you sure?')) { var f = document.createElement('form'); f.style.display = 'none'; this.parentNode.appendChild(f); f.method = 'POST'; f.action = this.href;var s = document.createElement('input'); s.setAttribute('type', 'hidden'); s.setAttribute('name', '_method'); s.setAttribute('value', 'update'); f.appendChild(s);f.submit() } ;return false;">Mack</a>} - link = a("Mack", :href => my_url, :method => :update, :confirm => "Are you sure?") - link.should == result - end - end - - describe "link_to" do - it "should return content when link_to(...) is called" do - a(my_url).should_not be_nil - a(my_url).should_not be_empty - end - - it "should return proper html when link_to(...) is called" do - link_to(my_url).should == a(my_url) - link_to("Mack", my_url).should == a("Mack", :href => my_url) - link_to("Mack", my_url, :target => "_blank").should == a("Mack", :href => my_url, :target => "_blank") - link_to("Mack", my_url, :method => :delete).should == a("Mack", :href => my_url, :method => :delete) - link_to("Mack", my_url, :method => :update, :confirm => "Are you sure?").should == - a("Mack", :href => my_url, :method => :update, :confirm => "Are you sure?") - end - end - describe "rss_tag" do it "should return content when rss() is called" do rss_tag("foo_bar").should_not be_nil test/unit/view_helpers/html_helpers_spec.rb e773d47ce14b37d1bb8dded88c3944328fb2f8e0 Mark Bates mark@markbates.com http://github.com/markbates/mack/commit/727e04e0c5dae38476648eeac6641c72cd7ebd5a 727e04e0c5dae38476648eeac6641c72cd7ebd5a 2008-08-08T12:16:13-07:00 2008-08-08T12:16:13-07:00 Refactored out Mack::ViewHelpers::HtmlHelpers into Mack::ViewHelpers::HtmlHelpers, Mack::ViewHelpers::FormHelpers and Mack::ViewHelpers::linkHelpers [#85 state:resolved] d954e8094a576508e1afd8ab67a66a7d73ecb9fe Mark Bates mark@markbates.com