rspec-sitemap-matchers 0.0.1 → 0.1.1

data/README.md

@@ -44,10 +44,13 @@ These matchers can be used on `File`s, `String`s and any arbitary `IO` instance
 The matchers also support more specific attribution matching, such as priorities as per the Sitemap protocol. These can be chained together:
 
     it { should include_url('http://www.example.com').priority(0.5) }
+    it { should include_url('http://www.example.com').changefreq('weekly') }
+    it { should include_url('http://www.example.com').lastmod('2012-07-16T19:20+01:00') }
+
+Note: You can chanin multiple attribute matchers together, like `.lastod('…').changefreq('…')` etc.
 
 ## Planned features
 
-* More chainable attribute modifiers, such as `lastmod` and `changefreq`
 * Stricter markup and structure validation
 * Encoding validation matcher (Sitemaps must be UTF-8 encoded)
 * `be_a_valid_sitemap` matcher
@@ -64,4 +67,4 @@ The matchers also support more specific attribution matching, such as priorities
 
 ## Copyright
 
-Copyright © 2012 Attila Györffy and [Unboxed Consulting](http://www.unboxedconsulting.com). See LICENSE for details.
+Copyright © 2012 Attila Györffy, [Unboxed Consulting](http://www.unboxedconsulting.com) and [contributors](http://github.com/unboxed/rspec-sitemap-matchers/graphs/contributors). See LICENSE for details.

data/lib/rspec/sitemap/matchers/include_url.rb

@@ -1,5 +1,8 @@
 module RSpec::Sitemap::Matchers
   class IncludeUrl
+
+    ALLOWED_ATTRS = %w(priority changefreq lastmod)
+
     def initialize(expected_location)
       @expected_location = expected_location
     end
@@ -29,7 +32,21 @@ module RSpec::Sitemap::Matchers
       self
     end
 
-  private
+    def lastmod(expected_lastmod)
+      expected_attributes.merge!(:lastmod => expected_lastmod)
+      self
+    end
+
+    def changefreq(expected_changefreq)
+      expected_attributes.merge!(:changefreq => expected_changefreq)
+      self
+    end
+
+    ALLOWED_ATTRS.each do |attr|
+      alias_method "with_#{attr}".to_sym, attr.to_sym
+    end
+
+    private
 
     def expected_attributes
       @expected_attributes ||= {}
@@ -43,8 +60,8 @@ module RSpec::Sitemap::Matchers
 
     def matched_attributes
       attributes = {}
-      matched_node.children.each do |node|
-        attributes[node.name.to_sym] = node.text
+      unless matched_node.nil?
+        matched_node.children.each { |node| attributes[node.name.to_sym] = node.text }
       end
       attributes
     end

data/lib/rspec/sitemap/matchers/version.rb

@@ -1,7 +1,7 @@
 module RSpec
   module Sitemap
     module Matchers
-      VERSION = "0.0.1"
+      VERSION = "0.1.1"
     end
   end
 end

data/spec/rspec/sitemap/matchers/include_url_spec.rb

@@ -6,20 +6,6 @@ module RSpec::Sitemap::Matchers
   
     describe "#matches?" do
 
-      shared_examples_for "a matcher that passes or fails" do
-        it "passes" do
-          sitemap.should include_url('http://www.example.com')
-        end
-
-        it "fails" do
-          expect {
-            sitemap.should include_url('http://www.not-an-example.com')
-          }.to raise_error { |error|
-            error.message.should match("to include a URL to http://www.not-an-example.com")
-          }
-        end
-      end
-
       context "on a File" do
         it_should_behave_like "a matcher that passes or fails" do
           let(:sitemap) { fixture('basic') }
@@ -43,32 +29,43 @@ module RSpec::Sitemap::Matchers
       end
     end
 
+    describe "#failure_message" do
+
+      let(:sitemap) { fixture('basic').read }
+
+      it "should not raise error when attributes are queried on missing url" do
+        expect {
+          # not included url
+          sitemap.should include_url('http://www.example.org').priority(0.5)
+        }.to_not raise_error NoMethodError
+      end
+    end
+
     describe "#priority" do
-      context "when it is set" do
-        let(:sitemap) { fixture('with_valid_priority') }
-        it "passes" do
-          sitemap.should include_url('http://www.example.com').priority('0.5')
-        end
 
-        it "fails" do
-          expect {
-            sitemap.should include_url('http://www.example.com').priority('0.8')
-          }.to raise_error { |error|
-            error.message.should match('to include a URL to http://www.example.com with a priority of 0.8 but it was set to 0.5')
-          }
-        end
+      it_should_behave_like "an attribute matcher", "priority", 0.5, 0.8 do
+        let(:passing_sitemap) { fixture('with_valid_priority') }
+        let(:failing_sitemap) { fixture('basic') }
       end
 
-      context "when it is NOT set" do
-        let(:sitemap) { fixture('basic') }
-        it "fails" do
-          expect {
-            sitemap.should include_url('http://www.example.com').priority('0.5')
-          }.to raise_error { |error|
-            error.message.should match('to include a URL to http://www.example.com with a priority of 0.5 but the priority was not set')
-          }
-        end
+    end
+
+    describe "#changefreq" do
+
+      it_should_behave_like "an attribute matcher", "changefreq", "weekly", "daily" do
+        let(:passing_sitemap) { fixture('with_valid_priority') }
+        let(:failing_sitemap) { fixture('basic') }
       end
+
+    end
+
+    describe "#lastmod" do
+
+      it_should_behave_like "an attribute matcher", "lastmod", "2012-11-27T16:40:53+01:00", "not prova" do
+        let(:passing_sitemap) { fixture('with_valid_priority') }
+        let(:failing_sitemap) { fixture('basic') }
+      end
+
     end
   end
 end

data/spec/spec_helper.rb

@@ -7,6 +7,7 @@
 
 require 'rspec/sitemap/matchers'
 require 'support/fixture_helper'
+require 'support/shared_examples'
 
 RSpec.configure do |config|
   config.treat_symbols_as_metadata_keys_with_true_values = true

data/spec/support/fixtures/sitemaps/with_valid_priority.xml

@@ -3,5 +3,7 @@
   <url>
     <loc>http://www.example.com</loc>
     <priority>0.5</priority>
+    <lastmod>2012-11-27T16:40:53+01:00</lastmod>
+    <changefreq>weekly</changefreq>
   </url>
 </urlset>

data/spec/support/shared_examples.rb

@@ -0,0 +1,47 @@
+shared_examples_for "a matcher that passes or fails" do
+  it "passes" do
+    sitemap.should include_url('http://www.example.com')
+  end
+
+  it "fails" do
+    expect {
+      sitemap.should include_url('http://www.not-an-example.com')
+    }.to raise_error { |error|
+      error.message.should match("to include a URL to http://www.not-an-example.com")
+    }
+  end
+end
+
+shared_examples_for "an attribute matcher" do |attribute, expected, not_expected|
+
+  context "when #{attribute} is set" do
+
+    it "passes" do
+      passing_sitemap.should include_url('http://www.example.com').send(attribute, expected)
+    end
+
+    it "passes when invoked with with_ syntax" do
+      passing_sitemap.should include_url('http://www.example.com').send("with_#{attribute}", expected)
+    end
+
+    it "fails" do
+      expect {
+        passing_sitemap.should include_url('http://www.example.com').send(attribute, not_expected)
+      }.to raise_error { |error|
+        error.message.should include("to include a URL to http://www.example.com with a #{attribute} of #{not_expected} but it was set to #{expected}")
+      }
+    end
+  end
+
+  context "when #{attribute} is NOT set" do
+
+    it "fails" do
+      expect {
+        failing_sitemap.should include_url('http://www.example.com').send(attribute, expected)
+      }.to raise_error { |error|
+        error.message.should include("to include a URL to http://www.example.com with a #{attribute} of #{expected} but the #{attribute} was not set")
+      }
+    end
+  end
+
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rspec-sitemap-matchers
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.1.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-09-03 00:00:00.000000000 Z
+date: 2012-12-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -81,6 +81,7 @@ files:
 - spec/support/fixture_helper.rb
 - spec/support/fixtures/sitemaps/basic.xml
 - spec/support/fixtures/sitemaps/with_valid_priority.xml
+- spec/support/shared_examples.rb
 homepage: http://github.com/unboxed/rspec-sitemap-matchers
 licenses: []
 post_install_message: 
@@ -95,7 +96,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -4581193510046784126
+      hash: 292912089253574170
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -104,10 +105,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -4581193510046784126
+      hash: 292912089253574170
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: Sitemap protocol matchers for RSpec
@@ -117,3 +118,4 @@ test_files:
 - spec/support/fixture_helper.rb
 - spec/support/fixtures/sitemaps/basic.xml
 - spec/support/fixtures/sitemaps/with_valid_priority.xml
+- spec/support/shared_examples.rb