padrino-helpers 0.12.8.1 → 0.12.9

data/test/test_rendering.rb

@@ -151,6 +151,18 @@ describe "Rendering" do
       assert_equal 'layout404 file', body
     end
 
+    it 'should work with set content type not contained in rack-types' do
+      create_view "index.md.erb", "Hello"
+      mock_app do
+        get("/") {
+          content_type "text/x-markdown; charset=UTF-8"
+          render "index.erb", { :layout => nil }
+        }
+      end
+      get "/"
+      assert_equal "Hello", body
+    end
+
     it 'should not use html file when DEFAULT_RENDERING_OPTIONS[:strict_format] == true' do
       create_layout :foo, "html file", :format => :html
 
@@ -572,12 +584,14 @@ describe "Rendering" do
 
     it 'should renders erb with blocks' do
       mock_app do
-        def container
-          @_out_buf << "THIS."
-          yield
-          @_out_buf << "SPARTA!"
+        helpers do
+          def container
+            @_out_buf << "THIS."
+            yield
+            @_out_buf << "SPARTA!"
+          end
+          def is; "IS."; end
         end
-        def is; "IS."; end
         get '/' do
           render :erb, '<% container do %> <%= is %> <% end %>'
         end
@@ -675,7 +689,7 @@ describe "Rendering" do
       class Application < Sinatra::Base
         register Padrino::Rendering
         get '/' do
-          render :post, :views => File.dirname(__FILE__)+'/fixtures/apps/views/blog' 
+          render :post, :views => File.dirname(__FILE__)+'/fixtures/apps/views/blog'
         end
       end
       @app = Application.new
@@ -736,4 +750,14 @@ describe "Rendering" do
       assert_equal "application/xml;charset=utf-8", response['Content-Type']
     end
   end
+
+  describe 'rendering with helpers that use render' do
+    %W{erb haml slim}.each do |engine|
+      it "should work with #{engine}" do
+        @app = RenderDemo
+        get "/double_dive_#{engine}"
+        assert_response_has_tag '.outer .wrapper form .inner .core'
+      end
+    end
+  end
 end

data/test/test_tag_helpers.rb

@@ -8,27 +8,29 @@ describe "TagHelpers" do
 
   describe 'for #tag method' do
     it 'should support tags with no content no attributes' do
-      assert_has_tag(:br) { tag(:br) }
+      assert_html_has_tag(tag(:br), :br)
     end
 
     it '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 }
+      assert_html_has_tag(actual_html, :br, :class => 'yellow', :style=>'clear:both')
     end
 
     it 'should support selected attribute by using "selected" if true' do
       actual_html = tag(:option, :selected => true)
-      assert_has_tag('option', :selected => 'selected') { actual_html }
+      # fix nokogiri 1.6.8 on jRuby
+      actual_html = content_tag(:select, actual_html)
+      assert_html_has_tag(actual_html, 'option', :selected => 'selected')
     end
 
     it 'should support data attributes' do
       actual_html = tag(:a, :data => { :remote => true, :method => 'post'})
-      assert_has_tag(:a, 'data-remote' => 'true', 'data-method' => 'post') { actual_html }
+      assert_html_has_tag(actual_html, :a, 'data-remote' => 'true', 'data-method' => 'post')
     end
 
     it 'should support nested attributes' do
       actual_html = tag(:div, :data => {:dojo => {:type => 'dijit.form.TextBox', :props => 'readOnly: true'}})
-      assert_has_tag(:div, 'data-dojo-type' => 'dijit.form.TextBox', 'data-dojo-props' => 'readOnly: true') { actual_html }
+      assert_html_has_tag(actual_html, :div, 'data-dojo-type' => 'dijit.form.TextBox', 'data-dojo-props' => 'readOnly: true')
     end
 
     it 'should support open tags' do
@@ -45,87 +47,87 @@ describe "TagHelpers" do
   describe 'for #content_tag method' do
     it 'should support tags with content as parameter' do
       actual_html = content_tag(:p, "Demo", :class => 'large', :id => 'thing')
-      assert_has_tag('p.large#thing', :content => "Demo") { actual_html }
+      assert_html_has_tag(actual_html, 'p.large#thing', :content => "Demo")
     end
 
     it '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 }
+      assert_html_has_tag(actual_html, 'p.large#star', :content => "Demo")
     end
 
     it 'should escape non-html-safe content' do
       actual_html = content_tag(:p, :class => 'large', :id => 'star') { "<>" }
-      assert_has_tag('p.large#star') { actual_html }
+      assert_html_has_tag(actual_html, 'p.large#star')
       assert_match('&lt;&gt;', actual_html)
     end
 
     it 'should not escape html-safe content' do
       actual_html = content_tag(:p, :class => 'large', :id => 'star') { "<>" }
-      assert_has_tag('p.large#star', :content => "<>") { actual_html }
+      assert_html_has_tag(actual_html, 'p.large#star', :content => "<>")
     end
 
     it 'should convert to a string if the content is not a string' do
       actual_html = content_tag(:p, 97)
-      assert_has_tag('p', :content => "97") { actual_html }
+      assert_html_has_tag(actual_html, 'p', :content => "97")
     end
 
     it 'should support tags with erb' do
-      visit '/erb/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"
-      assert_have_selector :p, :content => "Test 4"
-      assert_have_selector :p, :content => "one"
-      assert_have_selector :p, :content => "two"
-      assert_have_no_selector :p, :content => "failed"
+      get "/erb/content_tag"
+      assert_response_has_tag :p, :content => "Test 1", :class => 'test', :id => 'test1'
+      assert_response_has_tag :p, :content => "Test 2"
+      assert_response_has_tag :p, :content => "Test 3"
+      assert_response_has_tag :p, :content => "Test 4"
+      assert_response_has_tag :p, :content => "one"
+      assert_response_has_tag :p, :content => "two"
+      assert_response_has_no_tag :p, :content => "failed"
     end
 
     it 'should support tags with haml' do
-      visit '/haml/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"
-      assert_have_selector :p, :content => "one"
-      assert_have_selector :p, :content => "two"
-      assert_have_no_selector :p, :content => "failed"
+      get "/haml/content_tag"
+      assert_response_has_tag :p, :content => "Test 1", :class => 'test', :id => 'test1'
+      assert_response_has_tag :p, :content => "Test 2"
+      assert_response_has_tag :p, :content => "Test 3", :class => 'test', :id => 'test3'
+      assert_response_has_tag :p, :content => "Test 4"
+      assert_response_has_tag :p, :content => "one"
+      assert_response_has_tag :p, :content => "two"
+      assert_response_has_no_tag :p, :content => "failed"
     end
 
     it '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"
-      assert_have_selector :p, :content => "one"
-      assert_have_selector :p, :content => "two"
-      assert_have_no_selector :p, :content => "failed"
+      get "/slim/content_tag"
+      assert_response_has_tag :p, :content => "Test 1", :class => 'test', :id => 'test1'
+      assert_response_has_tag :p, :content => "Test 2"
+      assert_response_has_tag :p, :content => "Test 3", :class => 'test', :id => 'test3'
+      assert_response_has_tag :p, :content => "Test 4"
+      assert_response_has_tag :p, :content => "one"
+      assert_response_has_tag :p, :content => "two"
+      assert_response_has_no_tag :p, :content => "failed"
     end
   end
 
   describe 'for #input_tag method' do
     it 'should support field with type' do
-      assert_has_tag('input[type=text]') { input_tag(:text) }
+      assert_html_has_tag(input_tag(:text), 'input[type=text]')
     end
 
     it '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 }
+      assert_html_has_tag(actual_html, 'input.first#texter[type=text]')
     end
 
     it '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 }
+      assert_html_has_tag(actual_html, 'input[type=checkbox]', :checked => 'checked')
     end
 
     it '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 }
+      assert_html_has_no_tag(actual_html, 'input[type=checkbox][checked=false]')
     end
 
     it '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 }
+      assert_html_has_tag(actual_html, 'input[type=checkbox]', :disabled => 'disabled')
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: padrino-helpers
 version: !ruby/object:Gem::Version
-  version: 0.12.8.1
+  version: 0.12.9
 platform: ruby
 authors:
 - Padrino Team
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-09-06 00:00:00.000000000 Z
+date: 2018-02-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: padrino-support
@@ -19,48 +19,62 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.12.8.1
+        version: 0.12.9
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.12.8.1
+        version: 0.12.9
 - !ruby/object:Gem::Dependency
   name: tilt
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 1.4.1
+        version: !binary |-
+          MS40LjE=
+    - - <
+      - !ruby/object:Gem::Version
+        version: !binary |-
+          Mw==
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: !binary |-
+          MS40LjE=
+    - - <
       - !ruby/object:Gem::Version
-        version: 1.4.1
+        version: !binary |-
+          Mw==
 - !ruby/object:Gem::Dependency
   name: i18n
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0.6'
-    - - ">="
+        version: !binary |-
+          MC42
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.6.7
+        version: !binary |-
+          MC42Ljc=
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0.6'
-    - - ">="
+        version: !binary |-
+          MC42
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.6.7
+        version: !binary |-
+          MC42Ljc=
 description: Tag helpers, asset helpers, form helpers, form builders and many more
   helpers for padrino
 email: padrinorb@gmail.com
@@ -69,9 +83,9 @@ extensions: []
 extra_rdoc_files:
 - README.rdoc
 files:
-- ".document"
-- ".gitignore"
-- ".yardopts"
+- .document
+- .gitignore
+- .yardopts
 - LICENSE.txt
 - README.rdoc
 - Rakefile
@@ -225,22 +239,22 @@ licenses:
 metadata: {}
 post_install_message: 
 rdoc_options:
-- "--charset=UTF-8"
+- --charset=UTF-8
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: 1.3.6
 requirements: []
 rubyforge_project: padrino-helpers
-rubygems_version: 2.5.1
+rubygems_version: 2.6.14
 signing_key: 
 specification_version: 4
 summary: Helpers for padrino