padrino 0.13.3.2 → 0.13.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 33ebc108b35d53b9a5fa0e4097a256c8e8fc0b9b
-  data.tar.gz: c27c573824973aa75a37a96832e71504a1075d61
+  metadata.gz: 3b7fbd5dce917ef5755f98ce35de3e65d46b54f8
+  data.tar.gz: 3eb8130a12322ac230f5a87a375fb11b49857449
 SHA512:
-  metadata.gz: 326ad2b22b475b10ed66c407049a66c6320e326d731cc6d2db9b9e4ff159d94b1f8eae77d27d7dd92a2e8882e07cc0a1d333ebe00e7a42d3ff1cbb0c0a369a22
-  data.tar.gz: 59a84f526d8350fa4bfc78456e832438d35b1fb6ad39c2baa96453781c451d060d4244dcf3f174b6fa191c690f1421581fa18b10136982d9d036ed6bf4c65d3f
+  metadata.gz: 6e096cb4b7b819a5f951617f2f9b0da49f2bad4b820c8a6f93f8ab725a083988c8d018f6aea3f033d0f4370fca55d8affd1739bd6c7429e53b02e5381d3c0c17
+  data.tar.gz: fc4448f9e4c05d4f0b040e945343abc09416052d9c2b9b011fa7e2c6a33fd45c9831509c2b1d817f45f05177245e51479c798b38712db51e607025cd8e950732

data/test/ext/minitest-spec.rb

@@ -1,22 +1,4 @@
 class MiniTest::Spec
-  # assert_has_tag(:h1, :content => "yellow") { "<h1>yellow</h1>" }
-  # In this case, block is the html to evaluate
-  def assert_has_tag(name, attributes = {})
-    html = yield if block_given?
-    assert html.html_safe?, 'output in not #html_safe?'
-    matcher = HaveSelector.new(name, attributes)
-    assert matcher.matches?(html), matcher.failure_message
-  end
-
-  # assert_has_no_tag(:h1, :content => "yellow") { "<h1>green</h1>" }
-  # In this case, block is the html to evaluate
-  def assert_has_no_tag(name, attributes = {}, &block)
-    html = yield if block_given?
-    assert html.html_safe?, 'output in not #html_safe?'
-    matcher = HaveSelector.new(name, attributes)
-    assert !matcher.matches?(html), matcher.negative_failure_message
-  end
-
   # Assert_file_exists('/tmp/app')
   def assert_file_exists(file_path)
     assert File.file?(file_path), "File at path '#{file_path}' does not exist!"

data/test/padrino/test-methods.rb

@@ -0,0 +1,55 @@
+require 'oga'
+
+module Padrino
+  module TestMethods
+    def assert_html_has_tag(html, tag, attributes={})
+      assert html.html_safe?, 'output in not #html_safe?'
+      assert_has_selector(html, tag, attributes)
+    end
+
+    def assert_html_has_no_tag(html, tag, attributes={})
+      assert html.html_safe?, 'output in not #html_safe?'
+      assert_has_no_selector(html, tag, attributes)
+    end
+
+    def assert_response_has_tag(tag, attributes={})
+      assert_has_selector(last_response.body, tag, attributes)
+    end
+
+    def assert_response_has_no_tag(tag, attributes={})
+      assert_has_no_selector(last_response.body, tag, attributes)
+    end
+
+    def assert_has_selector(html, selector, attributes)
+      count_requirement = attributes.delete(:count)
+      message = "'#{selector}' with attributes #{attributes} in html\n#{html}"
+      matched_count = html_matched_tags(html, selector.to_s, attributes)
+      if count_requirement
+        assert_equal count_requirement, matched_count, "count of tags #{message}"
+      else
+        assert matched_count > 0, "expected a tag #{message}"
+      end
+    end
+
+    def assert_has_no_selector(html, selector, attributes)
+      message = "'#{selector}' with attributes #{attributes} in html\n#{html}"
+      matched_count = html_matched_tags(html, selector.to_s, attributes)
+      assert matched_count == 0, "expected no tags #{message}"
+    end
+
+    private
+
+    def html_matched_tags(html, selector, attributes)
+      @dom ||= Oga.parse_html(html)
+      content_requirement = attributes.delete(:content)
+      attributes.each do |name, value|
+        selector += %{[#{name}="#{value}"]}
+      end
+      tags = @dom.css(selector.to_s.gsub(/\[([^"']*?)=([^'"]*?)\]/, '[\1="\2"]'))
+      if content_requirement
+        tags = tags.select{ |tag| (tag.get('content') || tag.text).index(content_requirement) }
+      end
+      tags.count
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: padrino
 version: !ruby/object:Gem::Version
-  version: 0.13.3.2
+  version: 0.13.3.3
 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: 2016-11-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: padrino-support
@@ -19,98 +19,98 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.13.3.2
+        version: 0.13.3.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.13.3.2
+        version: 0.13.3.3
 - !ruby/object:Gem::Dependency
   name: padrino-core
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.13.3.2
+        version: 0.13.3.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.13.3.2
+        version: 0.13.3.3
 - !ruby/object:Gem::Dependency
   name: padrino-helpers
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.13.3.2
+        version: 0.13.3.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.13.3.2
+        version: 0.13.3.3
 - !ruby/object:Gem::Dependency
   name: padrino-cache
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.13.3.2
+        version: 0.13.3.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.13.3.2
+        version: 0.13.3.3
 - !ruby/object:Gem::Dependency
   name: padrino-mailer
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.13.3.2
+        version: 0.13.3.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.13.3.2
+        version: 0.13.3.3
 - !ruby/object:Gem::Dependency
   name: padrino-gen
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.13.3.2
+        version: 0.13.3.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.13.3.2
+        version: 0.13.3.3
 - !ruby/object:Gem::Dependency
   name: padrino-admin
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.13.3.2
+        version: 0.13.3.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.13.3.2
+        version: 0.13.3.3
 description: The Godfather of Sinatra provides a full-stack agnostic framework on
   top of Sinatra
 email: padrinorb@gmail.com
@@ -130,6 +130,7 @@ files:
 - subgems.rb
 - test/ext/minitest-spec.rb
 - test/ext/rack-test-methods.rb
+- test/padrino/test-methods.rb
 - test/test_padrino.rb
 homepage: http://www.padrinorb.com
 licenses:
@@ -152,7 +153,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.6
 requirements: []
 rubyforge_project: padrino
-rubygems_version: 2.5.1
+rubygems_version: 2.6.6
 signing_key: 
 specification_version: 4
 summary: The Godfather of Sinatra