padrino-helpers 0.9.24 → 0.9.25

data/test/test_format_helpers.rb

@@ -24,8 +24,25 @@ class TestFormatHelpers < Test::Unit::TestCase
     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
+      actual_text = simple_format("Look me! A class!", :class => 'description')
+      assert_equal "<p class=\"description\">Look me! A class!</p>", actual_text
+    end
+
+    context 'wrapped in a custom tag' do
+      should "format simple text into html format" do
+        actual_text = simple_format("Here is some basic text...\n...with a line break.", :tag => :div)
+        assert_equal "<div>Here is some basic text...\n<br />...with a line break.</div>", 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.", :tag => :div)
+        assert_equal "<div>We want to put a paragraph...</div>\n\n<div>...right there.</div>", actual_text
+      end
+
+      should "support defining a class for the paragraphs" do
+        actual_text = simple_format("Look me! A class!", :class => 'description', :tag => :div)
+        assert_equal "<div class=\"description\">Look me! A class!</div>", actual_text
+      end
     end
   end
 

data/test/test_output_helpers.rb

@@ -18,6 +18,12 @@ 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
+
+    should "work for slim templates" do
+      visit '/slim/content_for'
+      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
 
   context 'for #capture_html method' do
@@ -32,6 +38,12 @@ class TestOutputHelpers < Test::Unit::TestCase
       assert_have_selector 'p span', :content => "Captured Line 1"
       assert_have_selector 'p span', :content => "Captured Line 2"
     end
+
+    should "work for slim templates" do
+      visit '/slim/capture_concat'
+      assert_have_selector 'p span', :content => "Captured Line 1"
+      assert_have_selector 'p span', :content => "Captured Line 2"
+    end
   end
 
   context 'for #concat_content method' do
@@ -44,6 +56,11 @@ class TestOutputHelpers < Test::Unit::TestCase
       visit '/haml/capture_concat'
       assert_have_selector 'p', :content => "Concat Line 3", :count => 1
     end
+
+    should "work for slim templates" do
+      visit '/slim/capture_concat'
+      assert_have_selector 'p', :content => "Concat Line 3", :count => 1
+    end
   end
 
   context 'for #block_is_template?' do
@@ -59,5 +76,41 @@ class TestOutputHelpers < Test::Unit::TestCase
       assert_have_selector 'p', :content => "The haml block passed in is a template", :class => 'is_template'
       assert_have_no_selector 'p', :content => "The ruby block passed in is a template", :class => 'is_template'
     end
+
+    should_eventually "work for slim templates" do
+      visit '/slim/capture_concat'
+      assert_have_selector 'p', :content => "The slim block passed in is a template", :class => 'is_template'
+      # TODO Get SLIM template detection working (fix block_is_erb? method)
+      # assert_have_no_selector 'p', :content => "The ruby block passed in is a template", :class => 'is_template'
+    end
+  end
+
+  context 'for #current_engine method' do
+    should 'detect correctly current engine for erb' do
+      visit '/erb/current_engine'
+      assert_have_selector 'p.start', :content => "erb"
+      assert_have_selector 'p.haml',  :content => "haml"
+      assert_have_selector 'p.erb',   :content => "erb"
+      assert_have_selector 'p.slim',  :content => "slim"
+      assert_have_selector 'p.end',   :content => "erb"
+    end
+
+    should 'detect correctly current engine for haml' do
+      visit '/haml/current_engine'
+      assert_have_selector 'p.start', :content => "haml"
+      assert_have_selector 'p.haml',  :content => "haml"
+      assert_have_selector 'p.erb',   :content => "erb"
+      assert_have_selector 'p.slim',  :content => "slim"
+      assert_have_selector 'p.end',   :content => "haml"
+    end
+
+    should 'detect correctly current engine for slim' do
+      visit '/slim/current_engine'
+      assert_have_selector 'p.start', :content => "slim"
+      assert_have_selector 'p.haml',  :content => "haml"
+      assert_have_selector 'p.erb',   :content => "erb"
+      assert_have_selector 'p.slim',  :content => "slim"
+      assert_have_selector 'p.end',   :content => "slim"
+    end
   end
 end

data/test/test_render_helpers.rb

@@ -46,4 +46,15 @@ class TestRenderHelpers < Test::Unit::TestCase
       assert_have_selector 'p', :content => "Extra is bar"
     end
   end
+
+  context 'for #current_engine method' do
+    should 'detect correctly current engine for a padrino application' do
+      visit '/current_engine'
+      assert_have_selector 'p.start', :content => "haml"
+      assert_have_selector 'p.haml',  :content => "haml"
+      assert_have_selector 'p.erb',   :content => "erb"
+      assert_have_selector 'p.slim',  :content => "slim"
+      assert_have_selector 'p.end',   :content => "haml"
+    end
+  end
 end

data/test/test_tag_helpers.rb

@@ -10,21 +10,26 @@ class TestTagHelpers < Test::Unit::TestCase
     should("support tags with no content no attributes") do
       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')
       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
+
     should "support tags with content and attributes" do
       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
@@ -36,10 +41,12 @@ class TestTagHelpers < Test::Unit::TestCase
       actual_html = content_tag(:p, "Demo", :class => 'large', :id => 'thing')
       assert_has_tag('p.large#thing', :content => "Demo") { actual_html }
     end
+
     should "support tags with content as block" do
       actual_html = content_tag(:p, :class => 'large', :id => 'star') { "Demo" }
       assert_has_tag('p.large#star', :content => "Demo") { actual_html }
     end
+
     should "support tags with erb" do
       visit '/erb/content_tag'
       assert_have_selector :p, :content => "Test 1", :class => 'test', :id => 'test1'
@@ -47,6 +54,7 @@ class TestTagHelpers < Test::Unit::TestCase
       assert_have_selector :p, :content => "Test 3"
       assert_have_selector :p, :content => "Test 4"
     end
+
     should "support tags with haml" do
       visit '/haml/content_tag'
       assert_have_selector :p, :content => "Test 1", :class => 'test', :id => 'test1'
@@ -54,24 +62,36 @@ class TestTagHelpers < Test::Unit::TestCase
       assert_have_selector :p, :content => "Test 3", :class => 'test', :id => 'test3'
       assert_have_selector :p, :content => "Test 4"
     end
+
+    should "support tags with slim" do
+      visit '/slim/content_tag'
+      assert_have_selector :p, :content => "Test 1", :class => 'test', :id => 'test1'
+      assert_have_selector :p, :content => "Test 2"
+      assert_have_selector :p, :content => "Test 3", :class => 'test', :id => 'test3'
+      assert_have_selector :p, :content => "Test 4"
+    end
   end
 
   context 'for #input_tag method' do
     should "support field with type" do
       assert_has_tag('input[type=text]') { input_tag(:text) }
     end
+
     should "support field with type and options" do
       actual_html = input_tag(:text, :class => "first", :id => 'texter')
       assert_has_tag('input.first#texter[type=text]') { actual_html }
     end
+
     should "support checked attribute by using 'checked' if true" do
       actual_html = input_tag(:checkbox, :checked => true)
       assert_has_tag('input[type=checkbox]', :checked => 'checked') { actual_html }
     end
+
     should "remove checked attribute if false" do
       actual_html = input_tag(:checkbox, :checked => false)
       assert_has_no_tag('input[type=checkbox][checked=false]') { actual_html }
     end
+
     should "support disabled attribute by using 'disabled' if true" do
       actual_html = input_tag(:checkbox, :disabled => true)
       assert_has_tag('input[type=checkbox]', :disabled => 'disabled') { actual_html }

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: padrino-helpers
 version: !ruby/object:Gem::Version 
-  hash: 11
+  hash: 9
   prerelease: 
   segments: 
   - 0
   - 9
-  - 24
-  version: 0.9.24
+  - 25
+  version: 0.9.25
 platform: ruby
 authors: 
 - Padrino Team
@@ -18,7 +18,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-04-28 00:00:00 +02:00
+date: 2011-04-27 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -29,12 +29,12 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        hash: 11
+        hash: 9
         segments: 
         - 0
         - 9
-        - 24
-        version: 0.9.24
+        - 25
+        version: 0.9.25
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
@@ -69,7 +69,6 @@ files:
 - Rakefile
 - padrino-helpers.gemspec
 - lib/padrino-helpers/asset_tag_helpers.rb
-- lib/padrino-helpers/dom_helpers.rb
 - lib/padrino-helpers/form_builder/abstract_form_builder.rb
 - lib/padrino-helpers/form_builder/standard_form_builder.rb
 - lib/padrino-helpers/form_helpers.rb
@@ -95,6 +94,7 @@ files:
 - lib/padrino-helpers/output_helpers/abstract_handler.rb
 - lib/padrino-helpers/output_helpers/erb_handler.rb
 - lib/padrino-helpers/output_helpers/haml_handler.rb
+- lib/padrino-helpers/output_helpers/slim_handler.rb
 - lib/padrino-helpers/output_helpers.rb
 - lib/padrino-helpers/render_helpers.rb
 - lib/padrino-helpers/tag_helpers.rb
@@ -103,23 +103,42 @@ files:
 - test/fixtures/markup_app/app.rb
 - test/fixtures/markup_app/views/capture_concat.erb
 - test/fixtures/markup_app/views/capture_concat.haml
+- test/fixtures/markup_app/views/capture_concat.slim
 - test/fixtures/markup_app/views/content_for.erb
 - test/fixtures/markup_app/views/content_for.haml
+- test/fixtures/markup_app/views/content_for.slim
 - test/fixtures/markup_app/views/content_tag.erb
 - test/fixtures/markup_app/views/content_tag.haml
+- test/fixtures/markup_app/views/content_tag.slim
+- test/fixtures/markup_app/views/current_engine.erb
+- test/fixtures/markup_app/views/current_engine.haml
+- test/fixtures/markup_app/views/current_engine.slim
 - test/fixtures/markup_app/views/fields_for.erb
 - test/fixtures/markup_app/views/fields_for.haml
+- test/fixtures/markup_app/views/fields_for.slim
 - test/fixtures/markup_app/views/form_for.erb
 - test/fixtures/markup_app/views/form_for.haml
+- test/fixtures/markup_app/views/form_for.slim
 - test/fixtures/markup_app/views/form_tag.erb
 - test/fixtures/markup_app/views/form_tag.haml
+- test/fixtures/markup_app/views/form_tag.slim
 - test/fixtures/markup_app/views/link_to.erb
 - test/fixtures/markup_app/views/link_to.haml
+- test/fixtures/markup_app/views/link_to.slim
 - test/fixtures/markup_app/views/mail_to.erb
 - test/fixtures/markup_app/views/mail_to.haml
+- test/fixtures/markup_app/views/mail_to.slim
 - test/fixtures/markup_app/views/meta_tag.erb
 - test/fixtures/markup_app/views/meta_tag.haml
+- test/fixtures/markup_app/views/meta_tag.slim
+- test/fixtures/markup_app/views/partials/_erb.erb
+- test/fixtures/markup_app/views/partials/_haml.haml
+- test/fixtures/markup_app/views/partials/_slim.slim
 - test/fixtures/render_app/app.rb
+- test/fixtures/render_app/views/current_engine.haml
+- test/fixtures/render_app/views/current_engines/_erb.erb
+- test/fixtures/render_app/views/current_engines/_haml.haml
+- test/fixtures/render_app/views/current_engines/_slim.slim
 - test/fixtures/render_app/views/erb/test.erb
 - test/fixtures/render_app/views/haml/test.haml
 - test/fixtures/render_app/views/template/_user.haml
@@ -127,7 +146,6 @@ files:
 - test/fixtures/render_app/views/template/some_template.haml
 - test/helper.rb
 - test/test_asset_tag_helpers.rb
-- test/test_dom_helpers.rb
 - test/test_form_builder.rb
 - test/test_form_helpers.rb
 - test/test_format_helpers.rb

data/lib/padrino-helpers/dom_helpers.rb

@@ -1,46 +0,0 @@
-module Padrino
-  module Helpers
-    module DomHelpers
-      ##
-      # Create DOM id from given object. You can also specify optional prefix.
-      #
-      # ==== Examples
-      #
-      #   @user = User.new
-      #   dom_id(@user, "new")  # => "new_user"
-      #
-      #   @user.save
-      #   @user.id              # => 10
-      #   dom_id(@user)         # => user_10
-      #   dom_id(@user, "edit") # => edit_user_10
-      #
-      def dom_id(object, prefix=nil)
-        chain = []
-        chain << prefix if prefix
-        chain << object.class.to_s.underscore.gsub("/", "_")
-        chain << object.id if object.respond_to?('id') && object.id
-        chain.join('_')
-      end
-
-      ##
-      # Create DOM class name from given object. You can also specify optional
-      # prefix.
-      #
-      # ==== Examples
-      #
-      #   @user = User.new
-      #   dom_class(@user, "new") # => new_user
-      #   dom_class(@user)        # => user
-      #
-      #   @user.save
-      #   @user.id                # => 11
-      #   dom_class(@user)        # => user
-      def dom_class(object, prefix=nil)
-        chain = []
-        chain << prefix if prefix
-        chain << object.class.to_s.underscore.gsub("/", "_")
-        chain.join('_')
-      end
-    end # DomHelpers
-  end # Helpers
-end # Padrino

data/test/test_dom_helpers.rb

@@ -1,37 +0,0 @@
-require File.expand_path(File.dirname(__FILE__) + '/helper')
-
-class TestObject
-  attr_accessor :id
-end
-
-class TestDomHelpers < Test::Unit::TestCase
-  include Padrino::Helpers::DomHelpers
-
-  class SecondTestObject
-    attr_accessor :id
-  end
-
-  context 'for #dom_id method' do
-    should "return DOM id based on name of given object" do
-      assert_equal dom_id(TestObject.new), "test_object"
-      assert_equal dom_id(TestDomHelpers::SecondTestObject.new), "test_dom_helpers_second_test_object"
-    end
-    should "prepend given prefix to generated id" do
-      assert_equal dom_id(TestObject.new, "new"), "new_test_object"
-    end
-    should "append object #id to generated id if it's not empty" do
-      test_obj = TestObject.new
-      test_obj.id = 10
-      assert_equal dom_id(test_obj), "test_object_10"
-    end
-  end
-
-  context 'for #dom_class method' do
-    should "return DOM class name based on name of given object" do
-      assert_equal dom_class(TestObject.new), "test_object"
-    end
-    should "prepend given prefix to generated class name" do
-      assert_equal dom_class(TestObject.new, "new"), "new_test_object"
-    end
-  end
-end