rspec2-rails-views-matchers 0.2.1 → 0.2.2

data/CHANGELOG.md

@@ -4,12 +4,21 @@ Changelog
 unreleased(TODO)
 ----------------
 
+* improve documentation(look at changelog and code!)
 * add description
 * add :without to have\_tag?
-* ?make possible constructions like:
 
-      rendered.should have(3).tags('div').with(:class => 'some-class').and_content(/some content/)
+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)
+
+0.2.1
+-----
 
+* make possible use non-string as :text option(#10, thanks for idea to [Simon Schoeters](http://github.com/cimm))
 
 0.2.0
 -----

data/README.md

@@ -1,7 +1,7 @@
-Test views, be true! :) [![Build Status](http://travis-ci.org/kucaahbe/rspec2-rails-views-matchers.png)](http://travis-ci.org/kucaahbe/rspec2-rails-views-matchers)
+Test views, be true! :) [![Build Status](http://travis-ci.org/kucaahbe/rspec-html-matchers.png)](http://travis-ci.org/kucaahbe/rspec-html-matchers)
 =======================
 
-[![Mikhalok](https://github.com/kucaahbe/rspec2-rails-views-matchers/raw/master/mikhalok.jpg)](http://www.myspace.com/lyapis "Lyapis Trubetskoy ska-punk band")
+[![Mikhalok](https://github.com/kucaahbe/rspec-html-matchers/raw/master/mikhalok.jpg)](http://www.myspace.com/lyapis "Lyapis Trubetskoy ska-punk band")
 
 Why?
 ===
@@ -53,30 +53,30 @@ Simple example:
 Also included special matchers for form inputs:
 -----------------------------------------------
 
-- [have\_form](http://rdoc.info/github/kucaahbe/rspec2-rails-views-matchers/master/RSpec/Matchers:have_form)
-- [with\_checkbox](http://rdoc.info/github/kucaahbe/rspec2-rails-views-matchers/master/RSpec/Matchers:with_checkbox)
-- [with\_email\_field](http://rdoc.info/github/kucaahbe/rspec2-rails-views-matchers/master/RSpec/Matchers:with_email_field)
-- [with\_file\_field](http://rdoc.info/github/kucaahbe/rspec2-rails-views-matchers/master/RSpec/Matchers:with_file_field)
-- [with\_hidden\_field](http://rdoc.info/github/kucaahbe/rspec2-rails-views-matchers/master/RSpec/Matchers:with_hidden_field)
-- [with\_option](http://rdoc.info/github/kucaahbe/rspec2-rails-views-matchers/master/RSpec/Matchers:with_option)
-- [with\_password_field](http://rdoc.info/github/kucaahbe/rspec2-rails-views-matchers/master/RSpec/Matchers:with_password_field)
-- [with\_radio\_button](http://rdoc.info/github/kucaahbe/rspec2-rails-views-matchers/master/RSpec/Matchers:with_radio_button)
-- [with\_button](http://rdoc.info/github/kucaahbe/rspec2-rails-views-matchers/master/RSpec/Matchers:with_button)
-- [with\_select](http://rdoc.info/github/kucaahbe/rspec2-rails-views-matchers/master/RSpec/Matchers:with_select)
-- [with\_submit](http://rdoc.info/github/kucaahbe/rspec2-rails-views-matchers/master/RSpec/Matchers:with_submit)
-- [with\_text\_area](http://rdoc.info/github/kucaahbe/rspec2-rails-views-matchers/master/RSpec/Matchers:with_text_area)
-- [with\_text\_field](http://rdoc.info/github/kucaahbe/rspec2-rails-views-matchers/master/RSpec/Matchers:with_text_field)
-- [with\_url\_field](http://rdoc.info/github/kucaahbe/rspec2-rails-views-matchers/master/RSpec/Matchers:with_url_field)
-- [with\_number\_field](http://rdoc.info/github/kucaahbe/rspec2-rails-views-matchers/master/RSpec/Matchers:with_number_field)
-- [with\_range\_field](http://rdoc.info/github/kucaahbe/rspec2-rails-views-matchers/master/RSpec/Matchers:with_range_field)
-- [with\_date\_field](http://rdoc.info/github/kucaahbe/rspec2-rails-views-matchers/master/RSpec/Matchers:with_date_field)
+- [have\_form](http://rdoc.info/github/kucaahbe/rspec-html-matchers/master/RSpec/Matchers:have_form)
+- [with\_checkbox](http://rdoc.info/github/kucaahbe/rspec-html-matchers/master/RSpec/Matchers:with_checkbox)
+- [with\_email\_field](http://rdoc.info/github/kucaahbe/rspec-html-matchers/master/RSpec/Matchers:with_email_field)
+- [with\_file\_field](http://rdoc.info/github/kucaahbe/rspec-html-matchers/master/RSpec/Matchers:with_file_field)
+- [with\_hidden\_field](http://rdoc.info/github/kucaahbe/rspec-html-matchers/master/RSpec/Matchers:with_hidden_field)
+- [with\_option](http://rdoc.info/github/kucaahbe/rspec-html-matchers/master/RSpec/Matchers:with_option)
+- [with\_password_field](http://rdoc.info/github/kucaahbe/rspec-html-matchers/master/RSpec/Matchers:with_password_field)
+- [with\_radio\_button](http://rdoc.info/github/kucaahbe/rspec-html-matchers/master/RSpec/Matchers:with_radio_button)
+- [with\_button](http://rdoc.info/github/kucaahbe/rspec-html-matchers/master/RSpec/Matchers:with_button)
+- [with\_select](http://rdoc.info/github/kucaahbe/rspec-html-matchers/master/RSpec/Matchers:with_select)
+- [with\_submit](http://rdoc.info/github/kucaahbe/rspec-html-matchers/master/RSpec/Matchers:with_submit)
+- [with\_text\_area](http://rdoc.info/github/kucaahbe/rspec-html-matchers/master/RSpec/Matchers:with_text_area)
+- [with\_text\_field](http://rdoc.info/github/kucaahbe/rspec-html-matchers/master/RSpec/Matchers:with_text_field)
+- [with\_url\_field](http://rdoc.info/github/kucaahbe/rspec-html-matchers/master/RSpec/Matchers:with_url_field)
+- [with\_number\_field](http://rdoc.info/github/kucaahbe/rspec-html-matchers/master/RSpec/Matchers:with_number_field)
+- [with\_range\_field](http://rdoc.info/github/kucaahbe/rspec-html-matchers/master/RSpec/Matchers:with_range_field)
+- [with\_date\_field](http://rdoc.info/github/kucaahbe/rspec-html-matchers/master/RSpec/Matchers:with_date_field)
 
 and of course you can use the `without_` matchers (see the documentation).
 
 More info
 ---------
 
-You can find more on [RubyDoc](http://rubydoc.info/github/kucaahbe/rspec2-rails-views-matchers/master/RSpec/Matchers), take a look at {RSpec::Matchers#have\_tag have\_tag} method.
+You can find more on [RubyDoc](http://rubydoc.info/github/kucaahbe/rspec-html-matchers/master/RSpec/Matchers), take a look at {RSpec::Matchers#have\_tag have\_tag} method.
 
 Also, please read {file:CHANGELOG.md CHANGELOG}, it might be helpful.
 
@@ -94,6 +94,8 @@ Contributors
 - [Kelly Felkins](http://github.com/kellyfelkins)
 - [Ryan Wilcox](http://github.com/rwilcox)
 - [Simon Schoeters](https://github.com/cimm)
+- [Felix Tjandrawibawa](https://github.com/cemenghttps://github.com/cemeng)
+- [Szymon Przybył](https://github.com/apocalyptiq)
 
 MIT Licensed
 ============
@@ -104,4 +106,4 @@ Permission is hereby granted, free of charge, to any person obtaining a copy of
 
 The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
 
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

data/assets/quotes.html

@@ -4,3 +4,21 @@
 <p>one</p>
 <p>two</p>
 <p>three </p>
+<p>315</p>
+<p>
+    content with ignored spaces around
+  </p>
+<p>
+     content with   ignored              spaces          in
+</p>
+<p>
+     content&nbsp;with&nbsp;nbsp
+</p>
+<p>
+  content with&nbsp;nbsp &nbsp;and&nbsp;   spaces      &nbsp;     around
+</p>
+<pre> 1. bla   
+ 2. bla </pre>
+<!--
+vim:list
+-->

data/lib/rspec2-rails-views-matchers.rb

@@ -27,6 +27,8 @@ module RSpec
       MIN_MAX_ERROR_MSG        = %Q|:minimum shold be less than :maximum!|
       BAD_RANGE_ERROR_MSG      = %Q|Your :count range(%s) has no sence!|
 
+      PRESERVE_WHITESPACE_TAGS = %w( pre textarea )
+
       def initialize tag, options={}, &block
         @tag, @options, @block = tag.to_s, options, block
 
@@ -54,11 +56,11 @@ module RSpec
         case document
         when String
           @parent_scope = @current_scope = Nokogiri::HTML(document).css(@tag)
-          @document = document
+          @document     = document
         else
-          @parent_scope = document.current_scope
+          @parent_scope  = document.current_scope
           @current_scope = document.parent_scope.css(@tag)
-          @document = @parent_scope.to_html
+          @document      = @parent_scope.to_html
         end
 
         if tag_presents? and content_right? and count_right?
@@ -78,7 +80,7 @@ module RSpec
           @negative_failure_message = TAG_FOUND_MSG % [@document, @tag, @count]
           true
         else
-          @failure_message = TAG_NOT_FOUND_MSG % [@document, @tag]
+          @failure_message          = TAG_NOT_FOUND_MSG % [@document, @tag]
           false
         end
       end
@@ -115,7 +117,7 @@ module RSpec
             @negative_failure_message = REGEXP_FOUND_MSG % [text.inspect,@tag,@document]
             true
           else
-            @failure_message=REGEXP_NOT_FOUND_MSG % [text.inspect,@tag,@document]
+            @failure_message          = REGEXP_NOT_FOUND_MSG % [text.inspect,@tag,@document]
             false
           end
         else
@@ -123,7 +125,17 @@ module RSpec
           new_scope = @current_scope.css(":content('#{css_param}')",Class.new {
             def content node_set, text
               match_text = text.gsub(/\\000027/, "'")
-              node_set.find_all { |node| node.content == match_text }
+              node_set.find_all do |node|
+                actual_content = if PRESERVE_WHITESPACE_TAGS.include?(node.name)
+                                node.content
+                              else
+                                node.content.strip.squeeze(' ')
+                              end
+                # remove non-braking spaces:
+                actual_content.gsub!("\u00a0", ' ')
+                actual_content.gsub!("\302\240", ' ')
+                actual_content == match_text
+              end
             end
           }.new)
           unless new_scope.empty?
@@ -131,7 +143,7 @@ module RSpec
             @negative_failure_message = TEXT_FOUND_MSG % [text,@tag,@document]
             true
           else
-            @failure_message=TEXT_NOT_FOUND_MSG % [text,@tag,@document]
+            @failure_message          = TEXT_NOT_FOUND_MSG % [text,@tag,@document]
             false
           end
         end
@@ -205,6 +217,9 @@ module RSpec
     #   '<div class="one two">'.should have_tag('div', :with => { :class => ['two', 'one'] })
     #   '<div class="one two">'.should have_tag('div', :with => { :class => 'two one' })
     def have_tag tag, options={}, &block
+      if options.kind_of? String
+        options = { :text => options }
+      end
       @__current_scope_for_nokogiri_matcher = NokogiriMatcher.new(tag, options, &block)
     end
 

data/rspec2-rails-views-matchers.gemspec

@@ -3,12 +3,12 @@ $:.push File.expand_path("../lib", __FILE__)
 
 Gem::Specification.new do |s|
   s.name        = "rspec2-rails-views-matchers"
-  s.version     = '0.2.1'
+  s.version     = '0.2.2'
   s.platform    = Gem::Platform::RUBY
   s.authors     = ["kucaahbe"]
   s.email       = ["kucaahbe@ukr.net"]
-  s.homepage    = "http://github.com/kucaahbe/rspec2-rails-views-matchers"
-  s.summary     = %q{Nokogiri based 'have_tag' and 'with_tag' matchers for rspec 2.x.x}
+  s.homepage    = "http://github.com/kucaahbe/rspec-html-matchers"
+  s.summary     = %q{Nokogiri based 'have_tag' and 'with_tag' matchers for rspec 2.x.x (renamed to rspec-html-matchers)}
   s.description = <<DESC
 #{s.summary}. Does not depend on assert_select matcher, provides useful error messages.
 DESC

data/script/assets.rb

@@ -0,0 +1,38 @@
+class Asset
+  @@assets = {}
+
+  PATH = File.expand_path(File.join(File.dirname(__FILE__),'..','assets','*.html'))
+
+  def self.[] name
+    @@assets[name.to_s]
+  end
+
+  def self.<< asset
+    @@assets.merge! asset.name => asset
+  end
+
+  def self.list
+    @@assets.keys
+  end
+
+  attr_reader :name
+
+  def initialize name, path
+    @name = name
+    @path = path
+  end
+
+  def content
+    @content ||= IO.read(@path)
+    puts @content
+    return @content
+  end
+  alias_method :c, :content
+end
+
+puts 'assets list:'
+Dir[Asset::PATH].each do |asset_path|
+  asset_name = File.basename(asset_path,'.html')
+  puts asset_name
+  Asset << Asset.new(asset_name,asset_path)
+end

data/script/console

@@ -0,0 +1,9 @@
+#!/usr/bin/env ruby
+
+require 'rubygems'
+require 'bundler/setup'
+require 'nokogiri'
+require File.join(File.dirname(__FILE__),'assets.rb')
+require 'irb'
+
+IRB.start

data/spec/matchers/have_tag_spec.rb

@@ -2,7 +2,7 @@ require 'spec_helper'
 
 describe 'have_tag' do
   context "through css selector" do
-    let(:rendered) { IO.read(File.dirname(__FILE__)+"/../../assets/search_and_submit.html") }
+    let(:rendered) { asset('search_and_submit') }
 
     it "should find tags" do
       rendered.should have_tag('div')
@@ -94,7 +94,7 @@ describe 'have_tag' do
   end
 
   context "by count" do
-    let(:rendered) { IO.read(File.dirname(__FILE__)+"/../../assets/paragraphs.html") }
+    let(:rendered) { asset('paragraphs') }
 
     it "should find tags" do
       rendered.should have_tag('p', :count => 3)
@@ -192,7 +192,7 @@ describe 'have_tag' do
   end
 
   context "with content specified" do
-    let(:rendered) { IO.read(File.dirname(__FILE__)+"/../../assets/quotes.html") }
+    let(:rendered) { asset('quotes') }
 
     it "should find tags" do
       rendered.should have_tag('div',  :text => 'sample text')
@@ -200,6 +200,16 @@ describe 'have_tag' do
       rendered.should have_tag('div',  :text => /SAMPLE/i)
       rendered.should have_tag('span', :text => "sample with 'single' quotes")
       rendered.should have_tag('span', :text => %Q{sample with 'single' and "double" quotes})
+
+      rendered.should have_tag('p',    :text => 'content with ignored spaces around')
+      rendered.should have_tag('p',    :text => 'content with ignored spaces in')
+      rendered.should have_tag('p',    :text => 'content with nbsp')
+      rendered.should have_tag('p',    :text => 'content with nbsp  and  spaces   around')
+      rendered.should have_tag('pre',  :text => " 1. bla   \n 2. bla ")
+    end
+
+    it "should map a string argument to :text => string" do
+      rendered.should have_tag('div',  'sample text')
     end
 
     it "should not find tags" do
@@ -207,11 +217,19 @@ describe 'have_tag' do
       rendered.should_not have_tag('strong', :text => 'text does not present')
       rendered.should_not have_tag('p',      :text => /text does not present/)
       rendered.should_not have_tag('strong', :text => /text does not present/)
+
+      rendered.should_not have_tag('p',      :text => 'content with ignoredspaces around')
+      rendered.should_not have_tag('p',      :text => 'content with ignored  spaces around')
+      rendered.should_not have_tag('p',      :text => 'content withignored spaces in')
+      rendered.should_not have_tag('p',      :text => 'contentwith nbsp')
+      rendered.should_not have_tag('p',      :text => 'content with nbsp  and  spaces  around')
+      rendered.should_not have_tag('pre',    :text => "1. bla\n2. bla")
     end
 
     it "should invoke #to_s method for :text" do
       expect {
         rendered.should_not have_tag('p', :text => 100500 )
+        rendered.should have_tag('p', :text => 315 )
       }.to_not raise_exception
     end
 
@@ -237,7 +255,7 @@ describe 'have_tag' do
   end
 
   context "mixed matching" do
-    let(:rendered) { IO.read(File.dirname(__FILE__)+"/../../assets/special.html") }
+    let(:rendered) { asset('special') }
 
     it "should find tags by count and exact content" do
       rendered.should have_tag("td", :text => 'a', :count => 3)
@@ -278,7 +296,7 @@ describe 'have_tag' do
   end
 
   context "nested matching:" do
-    let(:rendered) { IO.read(File.dirname(__FILE__)+"/../../assets/ordered_list.html") }
+    let(:rendered) { asset('ordered_list') }
 
     it "should find tags" do
       rendered.should have_tag('ol') {

data/spec/spec_helper.rb

@@ -13,4 +13,5 @@ require 'rspec2-rails-views-matchers'
 Dir[File.expand_path(File.join(File.dirname(__FILE__),'support','**','*.rb'))].each {|f| require f}
 
 RSpec.configure do |config|
+  config.include Helpers
 end

data/spec/support/helpers.rb

@@ -0,0 +1,11 @@
+module Helpers
+
+  def asset name
+    IO.read(File.join( File.dirname(__FILE__), '..', '..', 'assets', "#{name}.html" ))
+  end
+
+  def raise_spec_error msg
+    raise_error RSpec::Expectations::ExpectationNotMetError, msg
+  end
+
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rspec2-rails-views-matchers
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,12 +9,12 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-10-20 00:00:00.000000000 +03:00
+date: 2011-11-14 00:00:00.000000000 +02:00
 default_executable: 
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &79862560 !ruby/object:Gem::Requirement
+  requirement: &68244790 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -22,10 +22,10 @@ dependencies:
         version: 2.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *79862560
+  version_requirements: *68244790
 - !ruby/object:Gem::Dependency
   name: nokogiri
-  requirement: &79861960 !ruby/object:Gem::Requirement
+  requirement: &68251300 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -33,10 +33,10 @@ dependencies:
         version: 1.4.4
   type: :runtime
   prerelease: false
-  version_requirements: *79861960
+  version_requirements: *68251300
 - !ruby/object:Gem::Dependency
   name: simplecov
-  requirement: &79861740 !ruby/object:Gem::Requirement
+  requirement: &68648510 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -44,10 +44,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *79861740
+  version_requirements: *68648510
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &79861110 !ruby/object:Gem::Requirement
+  requirement: &68650640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -55,9 +55,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *79861110
-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.
+  version_requirements: *68650640
+description: ! 'Nokogiri based ''have_tag'' and ''with_tag'' matchers for rspec 2.x.x
+  (renamed to rspec-html-matchers). Does not depend on assert_select matcher, provides
+  useful error messages.
 
 '
 email:
@@ -83,12 +84,14 @@ files:
 - lib/rspec2-rails-views-matchers.rb
 - mikhalok.jpg
 - rspec2-rails-views-matchers.gemspec
+- script/assets.rb
+- script/console
 - spec/matchers/form_matchers_spec.rb
 - spec/matchers/have_tag_spec.rb
 - spec/spec_helper.rb
-- spec/support/spec_error.rb
+- spec/support/helpers.rb
 has_rdoc: true
-homepage: http://github.com/kucaahbe/rspec2-rails-views-matchers
+homepage: http://github.com/kucaahbe/rspec-html-matchers
 licenses: []
 post_install_message: 
 rdoc_options: []
@@ -102,7 +105,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -719416209
+      hash: -724880049
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -111,11 +114,12 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -719416209
+      hash: -724880049
 requirements: []
 rubyforge_project: rspec2-rails-views-matchers
 rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
-summary: Nokogiri based 'have_tag' and 'with_tag' matchers for rspec 2.x.x
+summary: Nokogiri based 'have_tag' and 'with_tag' matchers for rspec 2.x.x (renamed
+  to rspec-html-matchers)
 test_files: []

data/spec/support/spec_error.rb

@@ -1,3 +0,0 @@
-def raise_spec_error msg
-  raise_error RSpec::Expectations::ExpectationNotMetError, msg
-end