rspec2-rails-views-matchers 0.0.2 → 0.0.3

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    rspec2-rails-views-matchers (0.0.2)
+    rspec2-rails-views-matchers (0.0.3)
       nokogiri (~> 1.4.4)
       rspec (>= 2.0.0)
 

data/README.md

@@ -12,23 +12,23 @@ Install
 
 add to your Gemfile(in group :test :) ):
 
-    gem 'rspec2-rails-views-matchers'
+>     gem 'rspec2-rails-views-matchers'
 
 Usage
 -----
 
 some examples:
 
-    rendered.should have_tag('form',:with => {:action => user_path, :method => 'post'}) {
-      with_tag "input", :with => { :name => "user[email]",    :type => 'email' }
-      with_tag "input", :with => { :name => "user[password]", :type => 'password' }
-      with_tag "input", :with => { :name => "user[password_confirmation]", :type => 'password' }
-      with_tag "input#special_submit", :count => 1
-      without_tag "h1", :text => 'unneeded tag'
-      without_tag "p",  :text => /content/i
-    }
+>     rendered.should have_tag('form',:with => {:action => user_path, :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
 
 More info
 ---------
 
-[On RubyDoc](http://rubydoc.info/gems/rspec2-rails-views-matchers)
+You can find [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.
+
+Also, please read {file:docs/CHANGELOG.md CHANGELOG}, it might be helpful.

data/Rakefile

@@ -1,14 +1,7 @@
 require 'bundler'
 require 'rspec/core/rake_task'
-require 'rake/rdoctask'
 Bundler::GemHelper.install_tasks
 
 task :default => :spec
 
 RSpec::Core::RakeTask.new
-
-Rake::RDocTask.new(:rdoc) do |rd|
-  rd.main = "README.rdoc"
-  rd.rdoc_files.include("README.rdoc", "lib/**/*.rb")
-  rd.options << "--all"
-end

data/docs/CHANGELOG.md

@@ -8,6 +8,22 @@ unreleased(TODO)
 * add description
 * raise exception when wrong parametres specified(:count and :minimum simultaneously)
 * organize code
+* add more matchers(have\_form,with\_input)?
+
+0.0.3
+-----
+
+* now following will work:
+
+>     rendered.should have_tag('div') do
+>       with_tag('p')
+>     end
+
+* tags can be specified via symbol
+* classes can be specified via array or string(class-names separated by spaces), so following will work:
+
+>     '<div class="one two">'.should have_tag('div', :with => { :class => ['two', 'one'] })
+>     '<div class="one two">'.should have_tag('div', :with => { :class => 'two one' })
 
 0.0.2
 ------

data/lib/rspec/rails/views/matchers/have_tag.rb

@@ -10,9 +10,18 @@ module RSpec
       attr_reader :parent_scope, :current_scope
 
       def initialize tag, options={}, &block
-        @tag, @options, @block = tag, options, block
+        @tag, @options, @block = tag.to_s, options, block
 
 	if attrs = @options.delete(:with)
+	  if classes=attrs.delete(:class)
+	    classes = case classes
+		      when Array
+			classes.join('.')
+		      when String
+			classes.gsub("\s",'.')
+		      end
+	    @tag << '.'+classes
+	  end
 	  html_attrs_string=''
 	  attrs.each_pair { |k,v| html_attrs_string << %Q{[#{k.to_s}='#{v.to_s}']} }
 	  @tag << html_attrs_string
@@ -23,7 +32,8 @@ module RSpec
 	@options[:maximum] ||= @options.delete(:max)
       end
 
-      def matches?(document)
+      def matches? document, &block
+	@block = block if block
 
 	case document
 	when String
@@ -104,11 +114,12 @@ module RSpec
     #
     # @param [String] tag     css selector for tag you want to match
     # @param [Hash]   options options hash(see below)
+    # @option options [Hash]   :with  hash with other attributes, within this, key :class have special meaning, you may specify it as array of expected classes or string of classes separated by spaces, order does not matter
     # @option options [Fixnum] :count count of matched tags(DO NOT USE :count with :minimum(:min) or :maximum(:max)*)
     # @option options [Range]  :count count of matched tags should be between range minimum and maximum values
-    # @option options [Fixnum] :minimum
+    # @option options [Fixnum] :minimum minimum count of elements to match
     # @option options [Fixnum] :min same as :minimum
-    # @option options [Fixnum] :maximum
+    # @option options [Fixnum] :maximum maximum count of elements to match
     # @option options [Fixnum] :max same as :maximum
     #
     #
@@ -116,7 +127,7 @@ module RSpec
     #   rendered.should have_tag('div')
     #   rendered.should have_tag('h1.header')
     #   rendered.should have_tag('div#footer')
-    #   rendered.should have_tag('input#email', with => { :name => 'user[email]', :type => 'email' } )
+    #   rendered.should have_tag('input#email', :with => { :name => 'user[email]', :type => 'email' } )
     #   rendered.should have_tag('div', :count => 3)            # matches exactly 3 'div' tags
     #   rendered.should have_tag('div', :count => 3..7)         # something like have_tag('div', :minimum => 3, :maximum => 7)
     #   rendered.should have_tag('div', :minimum => 3)          # matches more(or equal) than 3 'div' tags
@@ -128,6 +139,8 @@ module RSpec
     #       <h1>some html document</h1>
     #     </body>
     #    </html>".should have_tag('body') { with_tag('h1', :text => 'some html document') }
+    #   '<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
       @__current_scope_for_nokogiri_matcher = NokogiriMatcher.new(tag, options, &block)
     end

data/lib/version.rb

@@ -6,7 +6,7 @@ module RSpec#:nodoc:
       # @private
       module Matchers#:nodoc:
 	# @private
-        VERSION = "0.0.2"
+        VERSION = "0.0.3"
       end
     end
   end

data/spec/matchers/have_tag_spec.rb

@@ -9,7 +9,7 @@ describe 'have_tag' do
 
     before :each do
       render_html <<HTML
-<div>
+<div class="class-one class-two">
   some content
   <div id="div">some other div</div>
   <p class="paragraph">la<strong>lala</strong></p>
@@ -23,6 +23,7 @@ HTML
 
     it "should find tags" do
       rendered.should have_tag('div')
+      rendered.should have_tag(:div)
       rendered.should have_tag('div#div')
       rendered.should have_tag('p.paragraph')
       rendered.should have_tag('div p strong')
@@ -30,6 +31,7 @@ HTML
 
     it "should not find tags" do
       rendered.should_not have_tag('span')
+      rendered.should_not have_tag(:span)
       rendered.should_not have_tag('span#id')
       rendered.should_not have_tag('span#class')
       rendered.should_not have_tag('div div span')
@@ -51,11 +53,34 @@ HTML
 
       it "should find tags" do
 	rendered.should have_tag('input#search',:with => {:type => "text"})
-	rendered.should have_tag('input',:with => {:type => "submit", :value => "Save"})
+	rendered.should have_tag(:input ,:with => {:type => "submit", :value => "Save"})
+      end
+
+      it "should find tags that have classes specified via array(or string)" do
+	rendered.should have_tag('div',:with => {:class => %w(class-one class-two)})
+	rendered.should have_tag('div',:with => {:class => 'class-two class-one'})
+      end
+
+      it "should not find tags that have classes specified via array" do
+	rendered.should_not have_tag('div',:with => {:class => %w(class-other class-two)})
+      end
+
+      it "should not find tags that have classes specified via array and display appropriate message" do
+	expect do
+	  rendered.should have_tag('div',:with => {:class => %w(class-other class-two)})
+	end.should raise_spec_error(
+	  %Q{expected following:\n#{rendered}\nto have at least 1 element matching "div.class-other.class-two", found 0.}
+	)
+	expect do
+	  rendered.should have_tag('div',:with => {:class => 'class-other class-two'})
+	end.should raise_spec_error(
+	  %Q{expected following:\n#{rendered}\nto have at least 1 element matching "div.class-other.class-two", found 0.}
+	)
       end
 
       it "should not find tags" do
 	rendered.should_not have_tag('input#search',:with => {:type => "some_other_type"})
+	rendered.should_not have_tag(:input, :with => {:type => "some_other_type"})
       end
 
       it "should not find tags and display appropriate message" do
@@ -226,6 +251,14 @@ HTML
       }
     end
 
+    it "should handle do; end" do
+      expect do
+	rendered.should have_tag('ol') do
+	  with_tag('div')
+	end
+      end.should raise_spec_error(/have at least 1 element matching "div", found 0/)
+    end
+
     it "should not find tags and display appropriate message" do
       ordered_list_regexp = @ordered_list.gsub(/(\n?\s{2,}|\n\s?)/,'\n*\s*')
       expect {

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: rspec2-rails-views-matchers
 version: !ruby/object:Gem::Version 
-  hash: 27
+  hash: 25
   prerelease: 
   segments: 
   - 0
   - 0
-  - 2
-  version: 0.0.2
+  - 3
+  version: 0.0.3
 platform: ruby
 authors: 
 - kucaahbe
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-02-23 00:00:00 +02:00
+date: 2011-03-02 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency