rspec-html-matchers 0.2.3 → 0.2.4

data/CHANGELOG.md

@@ -5,15 +5,24 @@ unreleased(TODO)
 ----------------
 
 * improve documentation(look at changelog and code!)
-* add description
-* add :without to have\_tag?
+* add :without to have\_tag? like have_tag('div', :without => { :class => 'test' })
+
+0.2.4
+-----
+
+* added simple #description method for "it { should have_tag }" cases
+
+0.2.3
+-----
+
+* fix for unicode text matching (issue #13)
 
 0.2.2
 -----
 
 * leading and trailing whitespaces are ignored in tags where they should be ignored(#11, and again thanks to [Simon Schoeters](http://github.com/cimm))
 * whitespaces ignoring as browser does in :text matching
-* have_tag backwards compability(thanks to [Felix Tjandrawibawa](https://github.com/cemenghttps://github.com/cemeng), #12)
+* have_tag backwards compability(thanks to [Felix Tjandrawibawa](https://github.com/cemeng), #12)
 
 0.2.1
 -----

data/README.md

@@ -20,9 +20,11 @@ Install
 
 Add to your Gemfile (in the :test group :) ):
 
-    group :test do
-      gem 'rspec-html-matchers'
-    end
+```ruby
+group :test do
+  gem 'rspec-html-matchers'
+end
+```
 
 Instructions for [installing Nokogiri](http://nokogiri.org/tutorials/installing_nokogiri.html).
 
@@ -31,24 +33,61 @@ Usage
 
 Simple example:
 
-    view=<<-HTML
-    <h1>Simple Form</h1>
-    <form action="/users" method="post">
-    <p>
-      <input type="email" name="user[email]" />
-    </p>
-    <p>
-      <input type="submit" id="special_submit" />
-    </p>
-    </form>
-    HTML
-    
-    view.should have_tag('form', :with => { :action => '/users', :method => 'post' }) do
-      with_tag "input", :with => { :name => "user[email]", :type => 'email' }
-      with_tag "input#special_submit", :count => 1
-      without_tag "h1", :text => 'unneeded tag'
-      without_tag "p",  :text => /content/i
-    end
+```ruby
+view=<<-HTML
+<h1>Simple Form</h1>
+<form action="/users" method="post">
+<p>
+  <input type="email" name="user[email]" />
+</p>
+<p>
+  <input type="submit" id="special_submit" />
+</p>
+</form>
+HTML
+
+view.should have_tag('form', :with => { :action => '/users', :method => 'post' }) do
+  with_tag "input", :with => { :name => "user[email]", :type => 'email' }
+  with_tag "input#special_submit", :count => 1
+  without_tag "h1", :text => 'unneeded tag'
+  without_tag "p",  :text => /content/i
+end
+```
+
+Examples with more description:
+
+* tag matching (matches one or more tags):
+
+```ruby
+'<p class="qwe rty" id="qwerty">Paragraph</p>'.should have_tag('p')
+'<p class="qwe rty" id="qwerty">Paragraph</p>'.should have_tag(:p)
+'<p class="qwe rty" id="qwerty">Paragraph</p>'.should have_tag('p#qwerty')
+'<p class="qwe rty" id="qwerty">Paragraph</p>'.should have_tag('p.qwe.rty')
+
+'<p class="qwe rty" id="qwerty"><strong>Para</strong>graph</p>'.should have_tag('p strong')
+'<p class="qwe rty" id="qwerty"><strong>Para</strong>graph</p>'.should have_tag('p#qwerty strong')
+'<p class="qwe rty" id="qwerty"><strong>Para</strong>graph</p>'.should have_tag('p.qwe.rty strong')
+# or
+'<p class="qwe rty" id="qwerty"><strong>Para</strong>graph</p>'.should have_tag('p') do
+  with_tag('strong')
+end
+'<p class="qwe rty" id="qwerty"><strong>Para</strong>graph</p>'.should have_tag('p#qwerty') do
+  with_tag('strong')
+end
+'<p class="qwe rty" id="qwerty"><strong>Para</strong>graph</p>'.should have_tag('p.qwe.rty') do
+  with_tag('strong')
+end
+```
+
+* special case: classes matching:
+
+```ruby
+# all of this are equivalent:
+'<p class="qwe rty" id="qwerty">Paragraph</p>'.should have_tag('p', :with => { :class => 'qwe rty' })
+'<p class="qwe rty" id="qwerty">Paragraph</p>'.should have_tag('p', :with => { :class => 'rty qwe' })
+'<p class="qwe rty" id="qwerty">Paragraph</p>'.should have_tag('p', :with => { :class => ['rty', 'qwe'] })
+'<p class="qwe rty" id="qwerty">Paragraph</p>'.should have_tag('p', :with => { :class => ['qwe', 'rty'] })
+```
 
 Also included special matchers for form inputs:
 -----------------------------------------------
@@ -100,7 +139,7 @@ Contributors
 MIT Licensed
 ============
 
-Copyright (c) 2011 Dmitry Mjakotny
+Copyright (c) 2011-2012 Dmitrij Mjakotnyi
 
 Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
 

data/lib/rspec-html-matchers.rb

@@ -10,9 +10,11 @@ module RSpec
       attr_reader :failure_message, :negative_failure_message
       attr_reader :parent_scope, :current_scope
 
-      TAG_NOT_FOUND_MSG        = %Q|expected following:\n%s\nto have at least 1 element matching "%s", found 0.|
+      TAG_FOUND_DESC           = %Q|have at least 1 element matching "%s"|
+      TAG_NOT_FOUND_MSG        = %Q|expected following:\n%s\nto #{TAG_FOUND_DESC}, found 0.|
       TAG_FOUND_MSG            = %Q|expected following:\n%s\nto NOT have element matching "%s", found %s.|
-      WRONG_COUNT_MSG          = %Q|expected following:\n%s\nto have %s element(s) matching "%s", found %s.|
+      COUNT_DESC               = %Q|have %s element(s) matching "%s"|
+      WRONG_COUNT_MSG          = %Q|expected following:\n%s\nto #{COUNT_DESC}, found %s.|
       RIGHT_COUNT_MSG          = %Q|expected following:\n%s\nto NOT have %s element(s) matching "%s", but found.|
       BETWEEN_COUNT_MSG        = %Q|expected following:\n%s\nto have at least %s and at most %s element(s) matching "%s", found %s.|
       RIGHT_BETWEEN_COUNT_MSG  = %Q|expected following:\n%s\nto NOT have at least %s and at most %s element(s) matching "%s", but found %s.|
@@ -73,6 +75,15 @@ module RSpec
         end
       end
 
+      def description
+        # TODO should it be more complicated?
+        if @options.has_key?(:count)
+          COUNT_DESC % [@options[:count],@tag]
+        else
+          TAG_FOUND_DESC % @tag
+        end
+      end
+
       private
 
       def tag_presents?
@@ -243,7 +254,7 @@ module RSpec
     def have_form action_url, method, options={}, &block
       options[:with] ||= {}
       id = options[:with].delete(:id)
-      tag = 'form'; tag += '#'+id if id
+      tag = 'form'; tag << '#'+id if id
       options[:with].merge!(:action => action_url)
       options[:with].merge!(:method => method.to_s)
       have_tag tag, options, &block
@@ -396,7 +407,7 @@ module RSpec
     def with_select name, options={}, &block
       options[:with] ||= {}
       id = options[:with].delete(:id)
-      tag='select'; tag += '#'+id if id
+      tag='select'; tag << '#'+id if id
       options[:with].merge!(:name => name)
       @__current_scope_for_nokogiri_matcher.should have_tag(tag, options, &block)
     end
@@ -404,7 +415,7 @@ module RSpec
     def without_select name, options={}, &block
       options[:with] ||= {}
       id = options[:with].delete(:id)
-      tag='select'; tag += '#'+id if id
+      tag='select'; tag << '#'+id if id
       options[:with].merge!(:name => name)
       @__current_scope_for_nokogiri_matcher.should_not have_tag(tag, options, &block)
     end

data/rspec-html-matchers.gemspec

@@ -3,7 +3,7 @@ $:.push File.expand_path("../lib", __FILE__)
 
 Gem::Specification.new do |s|
   s.name        = "rspec-html-matchers"
-  s.version     = '0.2.3'
+  s.version     = '0.2.4'
   s.platform    = Gem::Platform::RUBY
   s.authors     = ["kucaahbe"]
   s.email       = ["kucaahbe@ukr.net"]

data/spec/matchers/have_tag_spec.rb

@@ -5,6 +5,12 @@ describe 'have_tag' do
   context "through css selector" do
     let(:rendered) { asset('search_and_submit') }
 
+    it "should have right description" do
+      have_tag('div').description.should == 'have at least 1 element matching "div"'
+      have_tag('div.class').description.should == 'have at least 1 element matching "div.class"'
+      have_tag('div#id').description.should == 'have at least 1 element matching "div#id"'
+    end
+
     it "should find tags" do
       rendered.should have_tag('div')
       rendered.should have_tag(:div)
@@ -97,6 +103,10 @@ describe 'have_tag' do
   context "by count" do
     let(:rendered) { asset('paragraphs') }
 
+    it "should have right description" do
+      have_tag('div', :count => 100500).description.should == 'have 100500 element(s) matching "div"'
+    end
+
     it "should find tags" do
       rendered.should have_tag('p', :count => 3)
       rendered.should have_tag('p', :count => 2..3)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rspec-html-matchers
 version: !ruby/object:Gem::Version
-  version: 0.2.3
+  version: 0.2.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,12 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-12-26 00:00:00.000000000 +02:00
-default_executable: 
+date: 2012-04-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &82198260 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -22,10 +21,15 @@ dependencies:
         version: 2.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *82198260
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 2.0.0
 - !ruby/object:Gem::Dependency
   name: nokogiri
-  requirement: &82197080 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -33,10 +37,15 @@ dependencies:
         version: 1.4.4
   type: :runtime
   prerelease: false
-  version_requirements: *82197080
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.4.4
 - !ruby/object:Gem::Dependency
   name: simplecov
-  requirement: &82195890 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -44,10 +53,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *82195890
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &82194340 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -55,7 +69,12 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *82194340
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: ! 'Nokogiri based ''have_tag'' and ''with_tag'' matchers for rspec 2.x.x.
   Does not depend on assert_select matcher, provides useful error messages.
 
@@ -89,7 +108,6 @@ files:
 - spec/matchers/have_tag_spec.rb
 - spec/spec_helper.rb
 - spec/support/helpers.rb
-has_rdoc: true
 homepage: http://github.com/kucaahbe/rspec-html-matchers
 licenses: []
 post_install_message: 
@@ -102,21 +120,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 982466547
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 982466547
 requirements: []
 rubyforge_project: rspec-html-matchers
-rubygems_version: 1.6.2
+rubygems_version: 1.8.18
 signing_key: 
 specification_version: 3
 summary: Nokogiri based 'have_tag' and 'with_tag' matchers for rspec 2.x.x