padrino-helpers 0.2.0 → 0.2.1

data/README.rdoc

@@ -389,8 +389,30 @@ passing javascript information from a js template to a javascript function.
 
 There is also an alias for escape_html called <tt>h</tt> for even easier usage within templates.
 
+Format helpers also includes a number of useful text manipulation functions such as <tt>simple_format</tt>,
+<tt>pluralize</tt>, <tt>word_wrap</tt>, and <tt>truncate</tt>. 
+
+  simple_format("hello\nworld") # => "<p>hello<br/>world</p>"
+  pluralize(2, 'person') => '2 people'
+  word_wrap('Once upon a time', :line_width => 8) => "Once upon\na time"
+  truncate("Once upon a time in a world far far away", :length => 8) => "Once upon..."
+
+These helpers can be invoked from any route or view within your application.
+
 The list of defined helpers in the 'format helpers' category:
 
+* <tt>simple_format(text, html_options)</tt>
+  * Returns text transformed into HTML using simple formatting rules.
+  * <tt>simple_format("hello\nworld")</tt> => "<p>hello<br/>world</p>"
+* <tt>pluralize(count, singular, plural = nil)</tt>
+  * Attempts to pluralize the singular word unless count is 1.
+  * <tt>pluralize(2, 'person')</tt> => '2 people'
+* <tt>word_wrap(text, *args)</tt>
+  * Wraps the text into lines no longer than line_width width.
+  * <tt>word_wrap('Once upon a time', :line_width => 8)</tt> => "Once upon\na time"
+* <tt>truncate(text, *args)</tt>
+  * Truncates a given text after a given :length if text is longer than :length (defaults to 30).
+  * <tt>truncate("Once upon a time in a world far far away", :length => 8)</tt> => "Once upon..."
 * <tt>escape_html</tt> (alias <tt>h</tt> and <tt>h!</tt>)
   * (from RackUtils) Escape ampersands, brackets and quotes to their HTML/XML entities.
 * <tt>relative_time_ago(date)</tt>

data/VERSION

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

data/lib/padrino-helpers/asset_tag_helpers.rb

@@ -84,8 +84,9 @@ module Padrino
       def javascript_path(source)
         return source if source =~ /^http/
         source.gsub!(/\.js$/, '')
-        result_path = "#{source}.js" if source =~ %r{^/} # absolute path
-        result_path ||= uri_root_path("javascripts", "#{source}.js")
+        source_name = source; source_name << ".js" unless source =~ /\.js\w{2,4}$/
+        result_path = source_name if source =~ %r{^/} # absolute path
+        result_path ||= uri_root_path("javascripts", source_name)
         stamp = File.exist?(result_path) ? File.mtime(result_path) : Time.now.to_i
         "#{result_path}?#{stamp}"
       end
@@ -94,8 +95,9 @@ module Padrino
       def stylesheet_path(source)
         return source if source =~ /^http/
         source.gsub!(/\.css$/, '')
-        result_path = "#{source}.css" if source =~ %r{^/} # absolute path
-        result_path ||= uri_root_path("stylesheets", "#{source}.css")
+        source_name = source; source_name << ".css" unless source =~ /\.css$/
+        result_path = source_name if source =~ %r{^/} # absolute path
+        result_path ||= uri_root_path("stylesheets", source_name)
         stamp = File.exist?(result_path) ? File.mtime(result_path) : Time.now.to_i
         "#{result_path}?#{stamp}"
       end

data/lib/padrino-helpers/format_helpers.rb

@@ -16,6 +16,54 @@ module Padrino
         h text
       end
 
+      # Returns text transformed into HTML using simple formatting rules. Two or more consecutive newlines(\n\n) are considered
+      # as a paragraph and wrapped in <p> tags. One newline (\n) is considered as a linebreak and a <br /> tag is appended.
+      # This method does not remove the newlines from the text.
+      # simple_format("hello\nworld") # => "<p>hello<br/>world</p>"
+      def simple_format(text, html_options={})
+        start_tag = tag('p', html_options.merge(:open => true))
+        text = text.to_s.dup
+        text.gsub!(/\r\n?/, "\n")                    # \r\n and \r -> \n
+        text.gsub!(/\n\n+/, "</p>\n\n#{start_tag}")  # 2+ newline  -> paragraph
+        text.gsub!(/([^\n]\n)(?=[^\n])/, '\1<br />') # 1 newline   -> br
+        text.insert 0, start_tag
+        text << "</p>"
+      end
+
+      # Attempts to pluralize the singular word unless count is 1. If plural is supplied, it will use that when count is > 1,
+      # otherwise it will use the Inflector to determine the plural form
+      # pluralize(2, 'person') => '2 people'
+      def pluralize(count, singular, plural = nil)
+        "#{count || 0} " + ((count == 1 || count == '1') ? singular : (plural || singular.pluralize))
+      end
+
+      # Truncates a given text after a given :length if text is longer than :length (defaults to 30).
+      # The last characters will be replaced with the :omission (defaults to "…") for a total length not exceeding :length.
+      # truncate("Once upon a time in a world far far away", :length => 8) => "Once upon..."
+      def truncate(text, *args)
+        options = args.extract_options!
+        options.reverse_merge!(:length => 30, :omission => "...")
+        if text
+          len = options[:length] - options[:omission].length
+          chars = text
+          (chars.length > options[:length] ? chars[0...len] + options[:omission] : text).to_s
+        end
+      end
+
+      # Wraps the text into lines no longer than line_width width.
+      # This method breaks on the first whitespace character that does not exceed line_width (which is 80 by default).
+      # word_wrap('Once upon a time', :line_width => 8) => "Once upon\na time"
+      def word_wrap(text, *args)
+        options = args.extract_options!
+        unless args.blank?
+          options[:line_width] = args[0] || 80
+        end
+        options.reverse_merge!(:line_width => 80)
+
+        text.split("\n").collect do |line|
+          line.length > options[:line_width] ? line.gsub(/(.{1,#{options[:line_width]}})(\s+|$)/, "\\1\n").strip : line
+        end * "\n"
+      end
 
       # Smart time helper which returns relative text representing times for recent dates
       # and absolutes for dates that are far removed from the current date

data/lib/padrino-helpers/tag_helpers.rb

@@ -24,11 +24,11 @@ module Padrino
       # tag(:br, :style => 'clear:both')
       # tag(:p, :content => "hello", :class => 'large')
       def tag(name, options={})
-        content = options.delete(:content)
+        content, open_tag = options.delete(:content), options.delete(:open)
         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}>" : " />")
+        base_tag << (open_tag ? ">" : (content ? ">#{content}</#{name}>" : " />"))
       end
 
       protected

data/padrino-helpers.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{padrino-helpers}
-  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 = ["Padrino Team", "Nathan Esquenazi", "Davide D'Agostino", "Arthur Chiu"]
-  s.date = %q{2009-11-23}
+  s.date = %q{2009-11-30}
   s.description = %q{Tag helpers, asset helpers, form helpers, form builders and many more helpers for padrino}
   s.email = %q{nesquena@gmail.com}
   s.extra_rdoc_files = [

data/test/test_asset_tag_helpers.rb

@@ -147,6 +147,16 @@ class TestAssetTagHelpers < Test::Unit::TestCase
       actual_html = javascript_include_tag('example/demo/application')
       assert_has_tag('script', :src => "/javascripts/example/demo/application.js?#{time.to_i}", :type => "text/javascript") { actual_html }
     end
+    should "display javascript item for path containing js" do
+      time = stop_time_for_test
+      actual_html = javascript_include_tag 'test/jquery.json'
+      assert_has_tag('script', :src => "/javascripts/test/jquery.json?#{time.to_i}", :type => "text/javascript") { actual_html }
+    end
+    should "display javascript item for path containing period" do
+      time = stop_time_for_test
+      actual_html = javascript_include_tag 'test/jquery.min'
+      assert_has_tag('script', :src => "/javascripts/test/jquery.min.js?#{time.to_i}", :type => "text/javascript") { actual_html }
+    end
     should "display javascript item with absolute path" do
       time = stop_time_for_test
       actual_html = javascript_include_tag('/js/application')

data/test/test_format_helpers.rb

@@ -8,6 +8,68 @@ class TestFormatHelpers < Test::Unit::TestCase
 
   include Padrino::Helpers::FormatHelpers
 
+  context 'for #simple_format method' do
+    should "format simple text into html format" do
+      actual_text = simple_format("Here is some basic text...\n...with a line break.")
+      assert_equal "<p>Here is some basic text...\n<br />...with a line break.</p>", actual_text
+    end
+
+    should "format more text into html format" do
+      actual_text = simple_format("We want to put a paragraph...\n\n...right there.")
+      assert_equal "<p>We want to put a paragraph...</p>\n\n<p>...right there.</p>", actual_text
+    end
+
+    should "support defining a class for the paragraphs" do
+      actual_text = simple_format("Look ma! A class!", :class => 'description')
+      assert_equal "<p class=\"description\">Look ma! A class!</p>", actual_text
+    end
+  end
+
+  context 'for #pluralize method' do
+    should "return singular count for 1 item collections" do
+      actual_text = pluralize(1, 'person')
+      assert_equal '1 person', actual_text
+    end
+    should "return plural count for empty collections" do
+      actual_text = pluralize(0, 'person')
+      assert_equal '0 people', actual_text
+    end
+    should "return plural count for many collections" do
+      actual_text =  pluralize(2, 'person')
+      assert_equal '2 people', actual_text
+    end
+    should "return pluralized word specified as argument" do
+      actual_text =  pluralize(3, 'person', 'users')
+      assert_equal '3 users', actual_text
+    end
+  end
+
+  context 'for #word_wrap method' do
+    should "return proper formatting for 8 max width" do
+      actual_text = word_wrap('Once upon a time', :line_width => 8)
+      assert_equal "Once\nupon a\ntime", actual_text
+    end
+    should "return proper formatting for 1 max width" do
+      actual_text = word_wrap('Once upon a time', :line_width => 1)
+      assert_equal "Once\nupon\na\ntime", actual_text
+    end
+  end
+
+  context 'for #truncate method' do
+    should "support default truncation" do
+      actual_text = truncate("Once upon a time in a world far far away")
+      assert_equal "Once upon a time in a world...", actual_text
+    end
+    should "support specifying length" do
+      actual_text = truncate("Once upon a time in a world far far away", :length => 14)
+      assert_equal "Once upon a...", actual_text
+    end
+    should "support specifying omission text" do
+      actual_text = truncate("And they found that many people were sleeping better.", :length => 25, :omission => "(clipped)")
+      assert_equal "And they found t(clipped)", actual_text
+    end
+  end
+
   context 'for #h and #h! method' do
     should "escape the simple html" do
       assert_equal '&lt;h1&gt;hello&lt;/h1&gt;', h('<h1>hello</h1>')

data/test/test_tag_helpers.rb

@@ -25,6 +25,10 @@ class TestTagHelpers < Test::Unit::TestCase
       actual_html = tag(:p, :content => "Demo", :class => 'large', :id => 'intro')
       assert_has_tag('p#intro.large', :content => "Demo") { actual_html }
     end
+    should "support open tags" do
+      actual_html = tag(:p, :class => 'demo', :open => true)
+      assert_equal "<p class=\"demo\">", actual_html
+    end
   end
 
   context 'for #content_tag method' do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: padrino-helpers
 version: !ruby/object:Gem::Version 
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors: 
 - Padrino Team
@@ -12,7 +12,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-11-23 00:00:00 -08:00
+date: 2009-11-30 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency