rspec-webservice_matchers 1.2.2 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e62fe40def403875ad5bec7d114e96402e7d668c
-  data.tar.gz: e3e2a83066cec63b84ad9b02fb785c022f81bd48
+  metadata.gz: 10271047f0647b3f8bf5aeafbe665214615807f3
+  data.tar.gz: 8ad50cfcf15f9b85b528301fe04daf34e0f29b58
 SHA512:
-  metadata.gz: 95e971b5f599d637de0a5218c7140d24ad9f3650b9247da72ac22fea33b3516621fb642a91c0f2cf659b38a9102cd0035a6b74504ffa9bd2df9381502652c953
-  data.tar.gz: a1debd0244fd675b6e989a76ca507f4c5f6b21e96b64418fcf71f6a4711bfb1abea7da61cf9b2f04f030c6ae745cf528553a9b1efa73d32ccbeb9db4be1d8b8e
+  metadata.gz: 920c4cf683f0c68f552ad8b4cc3d03eb6ad9253d44c97e094f0e8047b313906bd61b254f5e69730199a01f2e327c50f01ee618a96b39643a112dc89b380b3bf3
+  data.tar.gz: 23e9d8e71ed8c1915071cc37e9061ec9627f372917eb06de06fdc149ff60fc72d30ab52cf7910232512a1cab2f7cc9ee6d7f02274becb64fe5c3968af8a57cdb

data/.travis.yml

@@ -1,4 +1,5 @@
 language: ruby
 rvm:
   - "1.9.3"
-  - "2.0.0"
+  - "2.0.0"
+  - "2.1.0"

data/lib/rspec/webservice_matchers.rb

@@ -39,17 +39,25 @@ module RSpec
 
     # Pass successfully if we get a 301 to the place we intend.
     RSpec::Matchers.define :redirect_permanently_to do |expected|
-      match do |url|
-        response = RSpec::WebserviceMatchers.connection.head(url)
-        response.status == 301 && response.headers['location'] == expected
+      match do |url_or_domain_name|
+        response = RSpec::WebserviceMatchers.connection.head(RSpec::WebserviceMatchers.make_url url_or_domain_name)
+        expected = RSpec::WebserviceMatchers.make_url(expected)
+        actual   = response.headers['location']
+        status   = response.status
+
+        (status == 301) && (%r|#{expected}/?| === actual)
       end
     end
 
     # Pass successfully if we get a 302 or 307 to the place we intend.
     RSpec::Matchers.define :redirect_temporarily_to do |expected|
       match do |url|
-        response = RSpec::WebserviceMatchers.connection.head(url)
-        [302, 307].include?(response.status) && response.headers['location'] == expected
+        response = RSpec::WebserviceMatchers.connection.head(RSpec::WebserviceMatchers.make_url(url))
+        expected = RSpec::WebserviceMatchers.make_url(expected)
+        actual   = response.headers['location']
+        status   = response.status
+
+        [302, 307].include?(status) && (%r|#{expected}/?| === actual)
       end
     end
 

data/lib/rspec/webservice_matchers/version.rb

@@ -1,5 +1,5 @@
 module RSpec
   module WebserviceMatchers
-    VERSION = "1.2.2"
+    VERSION = "1.3.0"
   end
 end

data/spec/rspec/webservice_matchers/redirect_spec.rb

@@ -10,12 +10,23 @@ describe 'redirect_permanently_to' do
     expect('http://weblaws.org').to redirect_permanently_to('http://www.weblaws.org/')
     expect('http://www.getquisitive.com/press-kit/').to redirect_permanently_to 'http://getquisitive.com/press-kit/'
   end
+
+  it 'handles domain names gracefully' do
+    expect('weblaws.org').to redirect_permanently_to('www.weblaws.org/')
+  end
+
+  it 'handles missing final slash' do
+    expect('weblaws.org').to redirect_permanently_to('www.weblaws.org')
+  end 
 end
 
+
 describe 'redirect_temporarily_to' do
   it 'passes when it gets a 302' do
     'http://www.oregonlaws.org/cms/about_us'.should redirect_temporarily_to 'http://www.weblaws.org/cms/about_us'
   end
 
+  # TODO: Set up the mock server and test these
+  it 'handles domain names gracefully'
   it 'passes when it gets a 307'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rspec-webservice_matchers
 version: !ruby/object:Gem::Version
-  version: 1.2.2
+  version: 1.3.0
 platform: ruby
 authors:
 - Robb Shecter
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-21 00:00:00.000000000 Z
+date: 2014-03-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler