padrino-helpers 0.10.2 → 0.10.3

data/lib/padrino-helpers/tag_helpers.rb

@@ -10,27 +10,25 @@ module Padrino
         '"' => """
       }
 
-      ##
-      # Creates an html input field with given type and options
-      #
-      # ==== Examples
-      #
-      #   input_tag :text, :class => "test"
-      #
-      def input_tag(type, options = {})
-        options.reverse_merge!(:type => type)
-        tag(:input, options)
-      end
-
       ##
       # Creates an html tag with given name, content and options
       #
-      # ==== Examples
+      # @overload content_tag(name, content, options)
+      #   @param [Symbol]  name     The html type of tag.
+      #   @param [String]  content  The contents in the tag.
+      #   @param [Hash]    options  The html options to include in this tag.
+      # @overload content_tag(name, options, &block)
+      #   @param [Symbol]  name     The html type of tag.
+      #   @param [Hash]    options  The html options to include in this tag.
+      #   @param [Proc]    block    The block returning html content
+      #
+      # @return [String] The html generated for the tag.
       #
+      # @example
       #   content_tag(:p, "hello", :class => 'light')
-      #   content_tag(:p, :class => 'dark') do ... end
-      #   content_tag(name, content=nil, options={}, &block)
+      #   content_tag(:p, :class => 'dark') { ... }
       #
+      # @api public
       def content_tag(*args, &block)
         name = args.first
         options = args.extract_options!
@@ -39,14 +37,41 @@ module Padrino
         block_is_template?(block) ? concat_content(tag_result) : tag_result
       end
 
+      ##
+      # Creates an html input field with given type and options
+      #
+      # @param [Symbol] type
+      #   The html type of tag to create.
+      # @param [Hash] options
+      #   The html options to include in this tag.
+      #
+      # @return [String] The html for the input tag.
+      #
+      # @example
+      #   input_tag :text, :class => "test"
+      #   input_tag :password, :size => "20"
+      #
+      # @api semipublic
+      def input_tag(type, options = {})
+        options.reverse_merge!(:type => type)
+        tag(:input, options)
+      end
+
       ##
       # Creates an html tag with the given name and options
       #
-      # ==== Examples
+      # @param [Symbol] type
+      #   The html type of tag to create.
+      # @param [Hash] options
+      #   The html options to include in this tag.
+      #
+      # @return [String] The html for the input tag.
       #
+      # @example
       #   tag(:br, :style => 'clear:both')
       #   tag(:p, :content => "hello", :class => 'large')
       #
+      # @api public
       def tag(name, options={})
         content, open_tag = options.delete(:content), options.delete(:open)
         content = content.join("\n") if content.respond_to?(:join)

data/lib/padrino-helpers/translation_helpers.rb

@@ -4,6 +4,13 @@ module Padrino
       ##
       # Delegates to I18n.translate with no additional functionality.
       #
+      # @param [Symbol] *args
+      #   The keys to retrieve.
+      #
+      # @return [String]
+      #  The translation for the specified keys.
+      #
+      # @api public
       def translate(*args)
         I18n.translate(*args)
       end
@@ -12,6 +19,13 @@ module Padrino
       ##
       # Delegates to I18n.localize with no additional functionality.
       #
+      # @param [Symbol] *args
+      #   The keys to retrieve.
+      #
+      # @return [String]
+      #  The translation for the specified keys.
+      #
+      # @api public
       def localize(*args)
         I18n.localize(*args)
       end

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

@@ -9,3 +9,6 @@
 <% end %>
 
 <div class='demo2'><%= yield_content :demo2, "Johnny", "Smith" %></div>
+
+<div class="demo_has_content"><%= content_for?(:demo).to_s %>
+<div class="fake_has_content"><%= content_for?(:fake).to_s %>

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

@@ -7,3 +7,6 @@
   %h1 This is content yielded with name #{fname + " " + lname}
 
 .demo2= yield_content :demo2, "Johnny", "Smith"
+
+.demo_has_content= content_for?(:demo)
+.fake_has_content= content_for?(:fake)

data/test/fixtures/markup_app/views/content_for.slim

@@ -7,3 +7,6 @@
   h1 This is content yielded with name #{fname + " " + lname}
 
 .demo2== yield_content :demo2, "Johnny", "Smith"
+
+.demo_has_content== content_for?(:demo)
+.fake_has_content== content_for?(:fake)

data/test/helper.rb

@@ -1,13 +1,11 @@
 require File.expand_path('../../../load_paths', __FILE__)
-require 'test/unit'
-require 'shoulda'
-require 'mocha'
+require File.join(File.dirname(__FILE__), '..', '..', 'padrino-core', 'test', 'mini_shoulda')
 require 'rack/test'
 require 'webrat'
 require 'padrino-helpers'
 require 'active_support/time'
 
-class Test::Unit::TestCase
+class MiniTest::Spec
   include Padrino::Helpers::OutputHelpers
   include Padrino::Helpers::TagHelpers
   include Padrino::Helpers::AssetTagHelpers
@@ -44,16 +42,6 @@ class Test::Unit::TestCase
     assert matcher.matches?(html), matcher.failure_message
   end
 
-  # Silences the output by redirecting to stringIO
-  # silence_logger { ...commands... } => "...output..."
-  def silence_logger(&block)
-    orig_stdout = $stdout
-    $stdout = log_buffer = StringIO.new
-    block.call
-    $stdout = orig_stdout
-    log_buffer.rewind && log_buffer.read
-  end
-
   # Asserts that a file matches the pattern
   def assert_match_in_file(pattern, file)
     assert File.exist?(file), "File '#{file}' does not exist!"
@@ -71,7 +59,7 @@ end
 
 module Webrat
   module Logging
-    def logger # # @private
+    def logger # @private
       @logger = nil
     end
   end

data/test/test_asset_tag_helpers.rb

@@ -1,7 +1,7 @@
 require File.expand_path(File.dirname(__FILE__) + '/helper')
 require File.expand_path(File.dirname(__FILE__) + '/fixtures/markup_app/app')
 
-class TestAssetTagHelpers < Test::Unit::TestCase
+describe "AssetTagHelpers" do
   include Padrino::Helpers::AssetTagHelpers
 
   def app

data/test/test_form_builder.rb

@@ -1,7 +1,7 @@
 require File.expand_path(File.dirname(__FILE__) + '/helper')
 require File.expand_path(File.dirname(__FILE__) + '/fixtures/markup_app/app')
 
-class TestFormBuilder < Test::Unit::TestCase
+describe "FormBuilder" do
   include Padrino::Helpers::FormHelpers
 
   # Dummy form builder for testing
@@ -51,9 +51,7 @@ class TestFormBuilder < Test::Unit::TestCase
     should "display form specifying default builder setting" do
       self.expects(:settings).returns(stub(:default_builder => 'FakeFormBuilder')).once
       actual_html = ""
-      assert_nothing_raised do
-        actual_html = form_for(@user, '/register', :id => 'register', :"accept-charset" => "UTF-8", :method => 'post') { |f| f.foo_field }
-      end
+      actual_html = form_for(@user, '/register', :id => 'register', :"accept-charset" => "UTF-8", :method => 'post') { |f| f.foo_field }
       assert_has_tag('form', :"accept-charset" => "UTF-8", :action => '/register', :method => 'post') { actual_html }
       assert_has_tag('span', :content => "bar") { actual_html }
     end
@@ -88,7 +86,7 @@ class TestFormBuilder < Test::Unit::TestCase
 
     should "support changing form builder type" do
       form_html = proc { form_for(@user, '/register', :"accept-charset" => "UTF-8", :builder => "AbstractFormBuilder") { |f| f.text_field_block(:name) } }
-      assert_raise(NoMethodError) { form_html.call }
+      assert_raises(NoMethodError) { form_html.call }
     end
 
     should "support using default standard builder" do

data/test/test_form_helpers.rb

@@ -1,7 +1,7 @@
 require File.expand_path(File.dirname(__FILE__) + '/helper')
 require File.expand_path(File.dirname(__FILE__) + '/fixtures/markup_app/app')
 
-class TestFormHelpers < Test::Unit::TestCase
+describe "FormHelpers" do
   include Padrino::Helpers::FormHelpers
 
   def app

data/test/test_format_helpers.rb

@@ -1,7 +1,7 @@
 require File.expand_path(File.dirname(__FILE__) + '/helper')
 require File.expand_path(File.dirname(__FILE__) + '/fixtures/markup_app/app')
 
-class TestFormatHelpers < Test::Unit::TestCase
+describe "FormatHelpers" do
   def app
     MarkupDemo.tap { |app| app.set :environment, :test }
   end

data/test/test_locale.rb

@@ -1,6 +1,6 @@
 require File.expand_path(File.dirname(__FILE__) + '/helper')
 
-class TestLocales < Test::Unit::TestCase 
+describe "Locale Helpers" do
   Dir[File.expand_path("../../lib/padrino-helpers/locale/*.yml", __FILE__)].each do |file|
     base_original = YAML.load_file(file)
     name = File.basename(file, '.yml')

data/test/test_number_helpers.rb

@@ -1,4 +1,4 @@
-class TestNumberHelpers < Test::Unit::TestCase
+describe "NumberHelpers" do
   include Padrino::Helpers::NumberHelpers
 
   def kilobytes(number)

data/test/test_output_helpers.rb

@@ -1,7 +1,7 @@
 require File.expand_path(File.dirname(__FILE__) + '/helper')
 require File.expand_path(File.dirname(__FILE__) + '/fixtures/markup_app/app')
 
-class TestOutputHelpers < Test::Unit::TestCase
+describe "OutputHelpers" do
   def app
     MarkupDemo.tap { |app| app.set :environment, :test }
   end
@@ -24,7 +24,27 @@ class TestOutputHelpers < Test::Unit::TestCase
       assert_have_selector '.demo h1', :content => "This is content yielded from a content_for"
       assert_have_selector '.demo2 h1', :content => "This is content yielded with name Johnny Smith"
     end
-  end
+  end # content_for
+
+  context "for #content_for? method" do
+    should 'work for erb templates' do
+      visit '/erb/content_for'
+      assert_have_selector '.demo_has_content', :content => "true"
+      assert_have_selector '.fake_has_content', :content => "false"
+    end
+
+    should "work for haml templates" do
+      visit '/haml/content_for'
+      assert_have_selector '.demo_has_content', :content => "true"
+      assert_have_selector '.fake_has_content', :content => "false"
+    end
+
+    should "work for slim templates" do
+      visit '/slim/content_for'
+      assert_have_selector '.demo_has_content', :content => "true"
+      assert_have_selector '.fake_has_content', :content => "false"
+    end
+  end # content_for?
 
   context 'for #capture_html method' do
     should "work for erb templates" do

data/test/test_render_helpers.rb

@@ -1,7 +1,7 @@
 require File.expand_path(File.dirname(__FILE__) + '/helper')
 require File.expand_path(File.dirname(__FILE__) + '/fixtures/render_app/app')
 
-class TestRenderHelpers < Test::Unit::TestCase
+describe "RenderHelpers" do
   def app
     RenderDemo.tap { |app| app.set :environment, :test }
   end

data/test/test_tag_helpers.rb

@@ -1,7 +1,7 @@
 require File.expand_path(File.dirname(__FILE__) + '/helper')
 require File.expand_path(File.dirname(__FILE__) + '/fixtures/markup_app/app')
 
-class TestTagHelpers < Test::Unit::TestCase
+describe "TagHelpers" do
   def app
     MarkupDemo.tap { |app| app.set :environment, :test }
   end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: padrino-helpers
 version: !ruby/object:Gem::Version 
-  hash: 51
+  hash: 49
   prerelease: 
   segments: 
   - 0
   - 10
-  - 2
-  version: 0.10.2
+  - 3
+  version: 0.10.3
 platform: ruby
 authors: 
 - Padrino Team
@@ -18,7 +18,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-08-31 00:00:00 -07:00
+date: 2011-10-03 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -29,12 +29,12 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        hash: 51
+        hash: 49
         segments: 
         - 0
         - 10
-        - 2
-        version: 0.10.2
+        - 3
+        version: 0.10.3
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
@@ -63,7 +63,8 @@ extra_rdoc_files:
 files: 
 - .document
 - .gitignore
-- LICENSE
+- .yardopts
+- LICENSE.txt
 - README.rdoc
 - Rakefile
 - lib/padrino-helpers.rb
@@ -81,6 +82,7 @@ files:
 - lib/padrino-helpers/locale/hu.yml
 - lib/padrino-helpers/locale/it.yml
 - lib/padrino-helpers/locale/ja.yml
+- lib/padrino-helpers/locale/lv.yml
 - lib/padrino-helpers/locale/nl.yml
 - lib/padrino-helpers/locale/no.yml
 - lib/padrino-helpers/locale/pl.yml