rspec-tag_matchers 0.1.1 → 0.1.2

data/.travis.yml

@@ -4,5 +4,6 @@ rvm:
   - 1.9.2
   - 1.9.3
   - ree
-  - rbx-2.0
+  - rbx-18mode
+  - rbx-19mode
   - jruby

data/README.rdoc

@@ -17,10 +17,27 @@ containing HTML (this includes Nokogiri classes). They assume Rails conventions.
     it { should have_checkbox.for(:user => :terms_of_service) }
   end
 
+== Getting Started
+
+* Add +rspec-tag_matchers+ to your +Gemfile+:
+
+    group :test do
+      gem "rspec-tag_matchers"
+    end
+
+* Add the tag matchers to the RSpec context. In +spec_helper+:
+
+    RSpec.configure do |config|
+      config.include RSpec::TagMatchers
+    end
+
+* Now you can use the tag matchers in your RSpec tests. The included matchers are documented
+  here: http://rdoc.info/github/dcuddeback/rspec-tag_matchers/master/RSpec/TagMatchers.
+
 == Status
 
 <tt>rspec-tag_matchers</tt> is tested against Ruby 1.8.7, 1.9.2, 1.9.3, REE,
-Rubinius (1.8 mode) and JRuby.
+Rubinius (1.8 and 1.9 modes) and JRuby.
 
 {<img src="https://secure.travis-ci.org/dcuddeback/rspec-tag_matchers.png?branch=master" />}[http://travis-ci.org/dcuddeback/rspec-tag_matchers]
 

data/VERSION

@@ -1 +1 @@
-0.1.1
+0.1.2

data/lib/rspec/tag_matchers/has_form.rb

@@ -1,5 +1,5 @@
 module RSpec::TagMatchers
-  # Matches +<form>+ tags in HTML.
+  # Matches <tt><form></tt> tags in HTML.
   #
   # @modifier with_verb
   #   Adds a criteria that the form must have the given HTTP verb.

data/lib/rspec/tag_matchers/has_input.rb

@@ -1,7 +1,7 @@
 require 'deep_flattening'
 
 module RSpec::TagMatchers
-  # Matches +<input>+ tags in HTML.
+  # Matches <tt><input></tt> tags in HTML.
   #
   # @modifier for
   #   Adds a criteria that the input must be for the given attribute.

data/lib/rspec/tag_matchers/has_select.rb

@@ -1,5 +1,5 @@
 module RSpec::TagMatchers
-  # Matches +<select>+ tags in HTML.
+  # Matches <tt><select></tt> tags in HTML.
   #
   # @example Matching a select tag for a user's role
   #   it { should have_select.for(:user => :role) }

data/lib/rspec/tag_matchers/has_tag.rb

@@ -6,12 +6,21 @@ module RSpec::TagMatchers
   # @modifier with_attribute
   #   Adds a criteria that an element must match the given attributes.
   #
+  # @modifier with_content
+  #   Adds a criteria that an element's content must match the given content.
+  #
+  # @modifier with_count
+  #   Adds a criteria that the element must be found a certain number of times.
+  #
   # @modifier with_criteria
   #   Adds an arbitrary criteria.
   #
   # @example Matching anchor tags
   #   it { should have_tag(:a) }
   #
+  # @example Matching contents of a tag
+  #   it { should have_tag(:a).with_content("my site") }
+  #
   # @example Matching anchor tags that link to "/"
   #   it { should have_tag(:a).with_attribute(:href => "/") }
   #
@@ -130,9 +139,10 @@ module RSpec::TagMatchers
     # @return [Boolean]
     def matches?(rendered)
       @rendered = rendered
-      Nokogiri::HTML::Document.parse(@rendered.to_s).css(@name).select do |element|
-        matches_attributes?(element) && matches_criteria?(element)
-      end.length > 0
+      matches = Nokogiri::HTML::Document.parse(@rendered.to_s).css(@name).select do |element|
+        matches_attributes?(element) && matches_content?(element) && matches_criteria?(element)
+      end
+      matches_count?(matches)
     end
 
     # Adds a constraint that the matched elements must match certain attributes.  The +attributes+
@@ -157,6 +167,20 @@ module RSpec::TagMatchers
     end
     alias :with_attributes :with_attribute
 
+    # Adds a constraint on the matched element's content.
+    #
+    # @example
+    #   have_tag(:p).with_content("Welcome!")
+    #   have_tag(:p).with_content(/^Hello, \w+$/)
+    #
+    # @param  [String, Regexp] content  The expected contents of the matched element.
+    #
+    # @return [self]
+    def with_content(content)
+      @content = content
+      self
+    end
+
     # Adds an arbitrary criteria to the matched elements. The criteria can be a method name or a
     # block. The method or block should accept a single Nokogiri::XML::Node object as its argument
     # and return whether or not the element passed as an argument matches the criteria.
@@ -174,6 +198,19 @@ module RSpec::TagMatchers
       self
     end
 
+    # Adds a constraint that the matched elements appear a given number of times.  The criteria must be a Fixnum
+    #
+    # @example
+    #   have_div.with_count(2)
+    #
+    # @param  [Fixnum]  method  The name of the method to be called.
+    #
+    # @return [self]
+    def with_count(count)
+      @count = count
+      self
+    end
+
     protected
 
     # Tests with +attribute+ matches +expected+ according the the attribute matching rules described
@@ -224,6 +261,22 @@ module RSpec::TagMatchers
       end
     end
 
+    # Answers whether or not +element+ matches the content set by {#with_content}.
+    #
+    # @param [Nokogiri::XML::Node]  element   The element to be tested.
+    #
+    # @return [Boolean]
+    def matches_content?(element)
+      return true if @content.nil?
+
+      case @content
+      when String
+        element.content == @content
+      when Regexp
+        element.content =~ @content
+      end
+    end
+
     # Answers whether or not +element+ matches the custom criteria set by {#with_criteria}.
     #
     # @param [Nokogiri::XML::Node]  element   The element to be tested.
@@ -240,11 +293,20 @@ module RSpec::TagMatchers
       end
     end
 
+    # Answers whether or not +element+ appears the number of times set by {#with_count}.
+    #
+    # @param [Array] matches  The matched elements to be tested.
+    #
+    # @return [Boolean]
+    def matches_count?(matches)
+      @count ? matches.length == @count : matches.length > 0
+    end
+
     # Provides extra description that can be appended to the basic description.
     #
     # @return [String]
     def extra_description
-      attributes_description
+      attributes_description + content_description + count_description
     end
 
     # Returns a description of the attribute criteria. For example, the description of an attribute
@@ -272,7 +334,7 @@ module RSpec::TagMatchers
       )
     end
 
-    # Provides a prefix that can be used before a list of attribute criteria. Possible oututs are
+    # Provides a prefix that can be used before a list of attribute criteria. Possible outputs are
     # <tt>"with attribute"</tt>, <tt>"with attributes"</tt>, <tt>"without attribute"</tt>, and
     # <tt>"without attributes"</tt>.
     #
@@ -319,5 +381,21 @@ module RSpec::TagMatchers
         "#{key}=#{value.inspect}"
       end
     end
+
+    # Returns a string describing the contents that the element must match.
+    #
+    # @return [String]
+    def content_description
+      @content ? "with content #{@content.inspect}" : ""
+    end
+
+    # Returns a string describing the number of times the element must be matched.  For example, the
+    # description of an attribute criteria of <tt>with_count(2)</tt> will look like <tt>'2
+    # times'</tt>.
+    #
+    # @return [String]
+    def count_description
+      @count ? "#{@count} times" : ""
+    end
   end
 end

data/rspec-tag_matchers.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{rspec-tag_matchers}
-  s.version = "0.1.1"
+  s.version = "0.1.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = [%q{David Cuddeback}]
-  s.date = %q{2012-02-18}
+  s.date = %q{2012-04-02}
   s.description = %q{A collection of RSpec matchers that understand Rails conventions, allowing for more concise specs.}
   s.email = %q{david.cuddeback@gmail.com}
   s.extra_rdoc_files = [

data/spec/lib/rspec/tag_matchers/has_tag_spec.rb

@@ -57,6 +57,53 @@ describe RSpec::TagMatchers::HasTag do
     end
   end
 
+  describe "content matching" do
+    context "matches with string" do
+      context 'have_tag(:foo).with_content("bar")' do
+        subject { have_tag(:foo).with_content("bar") }
+        it      { should     match("<foo>bar</foo>") }
+        it      { should     match("<foo><span>bar</span></foo>") }
+        it      { should     match("<foo><span>b</span>ar</foo>") }
+        it      { should_not match("<foo>1bar</foo>") }
+        it      { should_not match("<foo>bar2</foo>") }
+        it      { should_not match("<foo>1bar2</foo>") }
+      end
+    end
+
+    context "matches with regexp" do
+      context 'have_tag(:foo).with_content(/bar/)' do
+        subject { have_tag(:foo).with_content(/bar/) }
+        it      { should     match("<foo>bar</foo>") }
+        it      { should     match("<foo>123bar456</foo>") }
+        it      { should     match("<foo>123<span>b</span>ar456</foo>") }
+        it      { should_not match("<foo></foo>") }
+      end
+    end
+  end
+
+  describe "count matching" do
+    context 'have_tag(:foo).with_count(1)' do
+      subject { have_tag(:foo).with_count(1) }
+      it      { should     match("<foo></foo>") }
+      it      { should_not match("<foo></foo><foo></foo>") }
+      it      { should_not match("<foo></foo><foo></foo><foo></foo>") }
+    end
+
+    context 'have_tag(:foo).with_count(2)' do
+      subject { have_tag(:foo).with_count(2) }
+      it      { should_not match("<foo></foo>") }
+      it      { should     match("<foo></foo><foo></foo>") }
+      it      { should_not match("<foo></foo><foo></foo><foo></foo>") }
+    end
+
+    context 'have_tag(:foo).with_count(3)' do
+      subject { have_tag(:foo).with_count(3) }
+      it      { should_not match("<foo></foo>") }
+      it      { should_not match("<foo></foo><foo></foo>") }
+      it      { should     match("<foo></foo><foo></foo><foo></foo>") }
+    end
+  end
+
   describe "attribute value matching" do
     context "true matches presence of attribute" do
       context 'have_tag(:foo).with_attribute(:bar => true)' do
@@ -346,6 +393,25 @@ describe RSpec::TagMatchers::HasTag do
         its(:description) { should == 'have "foo" tag with attribute bar=anything and without attribute baz' }
       end
     end
+
+    context "for matchers with content criteria" do
+      context 'have_tag(:foo).with_content("bar")' do
+        subject { have_tag(:foo).with_content("bar") }
+        its(:description) { should == 'have "foo" tag with content "bar"' }
+      end
+
+      context 'have_tag(:foo).with_content(/bar/)' do
+        subject { have_tag(:foo).with_content(/bar/) }
+        its(:description) { should == 'have "foo" tag with content /bar/' }
+      end
+    end
+
+    context "for matchers with count criteria" do
+      context 'have_tag(:foo).with_count(2)' do
+        subject { have_tag(:foo).with_count(2) }
+        its(:description) { should == 'have "foo" tag 2 times'}
+      end
+    end
   end
 
   describe "#failure_message" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rspec-tag_matchers
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-02-18 00:00:00.000000000Z
+date: 2012-04-02 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
-  requirement: &2154865400 !ruby/object:Gem::Requirement
+  requirement: &2153537300 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2154865400
+  version_requirements: *2153537300
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &2154864620 !ruby/object:Gem::Requirement
+  requirement: &2153536760 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2154864620
+  version_requirements: *2153536760
 - !ruby/object:Gem::Dependency
   name: yard
-  requirement: &2154864000 !ruby/object:Gem::Requirement
+  requirement: &2153536120 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2154864000
+  version_requirements: *2153536120
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &2154863260 !ruby/object:Gem::Requirement
+  requirement: &2153535280 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2154863260
+  version_requirements: *2153535280
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &2154862600 !ruby/object:Gem::Requirement
+  requirement: &2153534540 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2154862600
+  version_requirements: *2153534540
 - !ruby/object:Gem::Dependency
   name: guard
-  requirement: &2154861880 !ruby/object:Gem::Requirement
+  requirement: &2153533480 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2154861880
+  version_requirements: *2153533480
 - !ruby/object:Gem::Dependency
   name: guard-rspec
-  requirement: &2154861180 !ruby/object:Gem::Requirement
+  requirement: &2153532360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +87,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2154861180
+  version_requirements: *2153532360
 - !ruby/object:Gem::Dependency
   name: guard-bundler
-  requirement: &2154859720 !ruby/object:Gem::Requirement
+  requirement: &2153531700 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,7 +98,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2154859720
+  version_requirements: *2153531700
 description: A collection of RSpec matchers that understand Rails conventions, allowing
   for more concise specs.
 email: david.cuddeback@gmail.com
@@ -156,7 +156,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 95040879081577537
+      hash: -1376525107478153861
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: