skink 0.6.1 → 0.7.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 941fa126a27124a0c69684155e7b5482b0188cdb
+  data.tar.gz: ca72b6a3d47a69f8d0b435600655f10ffe2a5e79
+SHA512:
+  metadata.gz: 7430e23e6475b2059b720e6d5815e083b62e30d0ee2d668dc61ab86f959da4726555e2419ae1059ec7b07c75f9c53bbe5ae835c267d518d59643ef89e31d3173
+  data.tar.gz: 277dd7fcb03156e969c3011acfcb314af21799410d83abd815428b97f836fece8749de1b9ab4c0bd9bb2c287f455df49617ae8c3753e7ada2b4b39c63297eb69

data/.travis.yml

@@ -1,6 +1,8 @@
 language: ruby
 rvm:
-  - "1.9.2"
-  - "1.9.3"
-  - "2.0.0"
-  - rbx-19mode
+  - 1.9.2
+  - 1.9.3
+  - 2.0.0
+  - 2.1.0
+  - jruby-19mode
+  - rbx-2.2.1

data/lib/skink/client/response.rb

@@ -2,6 +2,8 @@ require 'skink/client/utils'
 
 require 'nokogiri'
 require 'jsonpath'
+require 'link_header'
+require 'hash_deep_merge'
 
 module Skink
 module Client
@@ -82,6 +84,31 @@ class Response
     elems.any?(&block)
   end
 
+  def link_header
+    raise NotImplementedError
+  end
+
+  def links
+    if link_header
+      LinkHeader.parse(link_header).to_a.map do |linkarr|
+        {url: linkarr[0]}.merge Hash[linkarr[1]]
+      end
+    end
+  end
+  
+  # example match keys for the link header:
+  # :url => "http://example.com",
+  # :rel => "search"
+  def has_link_header?(opts=nil)
+    if opts.nil?
+      links.any?
+    else
+      links.any? do |link|
+        link == link.deep_merge(opts)
+      end
+    end
+  end
+
   def method_missing(name, *args)
     if name.match(/has_(\w+)_header\?/)
       headers[normalize_header_name($1)] === args.first

data/lib/skink/rack_test_client/rack_test_response.rb

@@ -25,6 +25,10 @@ class RackTestResponse < Client::Response
     end
   end
 
+  def link_header
+    headers["Link"]
+  end
+
   def body
     native_response.body
   end

data/lib/skink/resourceful_client/resourceful_response.rb

@@ -21,6 +21,10 @@ class ResourcefulResponse < Client::Response
     native_response.headers.to_hash
   end
 
+  def link_header
+    headers['Link'].join(',')
+  end
+
   def body
     native_response.body || ""
   end

data/lib/skink/version.rb

@@ -1,3 +1,3 @@
 module Skink
-  VERSION = "0.6.1"
+  VERSION = "0.7.0"
 end

data/skink.gemspec

@@ -16,6 +16,8 @@ Gem::Specification.new do |gem|
   gem.add_dependency "openlogic-resourceful"
   gem.add_dependency "nokogiri"
   gem.add_dependency "jsonpath"
+  gem.add_dependency "hash-deep-merge"
+  gem.add_dependency "link_header"
 
   gem.add_development_dependency "rspec"
   gem.add_development_dependency "sinatra"

data/spec/skink_dsl_spec.rb

@@ -77,6 +77,9 @@ shared_examples "a REST API test language" do
     response.should have_header(:content_type)
     response.should have_header("Content-Type")
     response.should_not have_header("This-Is-Not-A-Header-Name")
+    
+    response.should have_link_header
+    response.should have_link_header({url: 'http://link.example.com'})
   end
 
   it "has a helpful failure message for have_header" do
@@ -95,6 +98,7 @@ shared_examples "a REST API test language" do
     response.should_not have_header(content_type: %r{json})
   end
 
+
   it "is able to test for content in the response body" do
     get "/"
     response.should have_content "Hello, world!"

data/spec/support/matchers/response_matchers.rb

@@ -37,6 +37,30 @@ RSpec::Matchers.define :have_header do |expected|
   end
 end
 
+RSpec::Matchers.define :have_link_header do |expected|
+  match do |response|
+    response.has_link_header? expected
+  end
+
+  failure_message_for_should do |response|
+    if expected.respond_to? :keys
+      "expected response headers #{response.headers.inspect} to have link header header #{normalize_header_name(expected.keys.first)} matching #{expected.values.first.inspect}"
+    else
+      "expected response headers #{response.headers.inspect} to have header #{normalize_header_name(expected)}"
+    end
+  end
+
+  failure_message_for_should_not do |response|
+    if expected.respond_to? :keys
+      "expected response headers #{response.headers.inspect} to not have link header #{normalize_header_name(expected.keys.first)} matching #{expected.values.first.inspect}"
+    else
+      "expected response headers #{response.headers.inspect} to not have link header #{normalize_header_name(expected)}"
+    end
+  end
+end
+
+
+
 RSpec::Matchers.define :have_content do |expected|
   match do |response|
     expected === response.body

data/spec/test_server.rb

@@ -69,5 +69,6 @@ get '/xml_doc_with_pathological_namespaces', :provides => :xml do
 end
 
 get '/json_doc', :provides => :json do
+  response.headers["Link"] = "<http://link.example.com>; rel=\"search\""
   '{"root": {"foo": {"foo": "howdy"}}}'
 end

metadata

@@ -1,128 +1,141 @@
 --- !ruby/object:Gem::Specification
 name: skink
 version: !ruby/object:Gem::Version
-  version: 0.6.1
-  prerelease: 
+  version: 0.7.0
 platform: ruby
 authors:
 - Todd Thomas
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2013-12-05 00:00:00.000000000 Z
+date: 2013-12-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack-test
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-  type: :runtime
   prerelease: false
+  type: :runtime
+- !ruby/object:Gem::Dependency
+  name: openlogic-resourceful
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: openlogic-resourceful
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-  type: :runtime
   prerelease: false
+  type: :runtime
+- !ruby/object:Gem::Dependency
+  name: nokogiri
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: nokogiri
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-  type: :runtime
   prerelease: false
+  type: :runtime
+- !ruby/object:Gem::Dependency
+  name: jsonpath
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: jsonpath
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-  type: :runtime
   prerelease: false
+  type: :runtime
+- !ruby/object:Gem::Dependency
+  name: hash-deep-merge
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: rspec
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-  type: :development
   prerelease: false
+  type: :runtime
+- !ruby/object:Gem::Dependency
+  name: link_header
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: sinatra
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-  type: :development
   prerelease: false
+  type: :runtime
+- !ruby/object:Gem::Dependency
+  name: rspec
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: rake
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
+  prerelease: false
   type: :development
+- !ruby/object:Gem::Dependency
+  name: sinatra
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   prerelease: false
+  type: :development
+- !ruby/object:Gem::Dependency
+  name: rake
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  prerelease: false
+  type: :development
 description: A Ruby DSL for testing REST APIs.
 email:
 - todd.thomas@openlogic.com
@@ -155,33 +168,26 @@ files:
 - spec/test_server.rb
 homepage: https://github.com/toddthomas/skink.git
 licenses: []
-post_install_message: 
+metadata: {}
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -875101598988712592
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -875101598988712592
 requirements: []
-rubyforge_project: 
-rubygems_version: 1.8.25
-signing_key: 
-specification_version: 3
+rubyforge_project:
+rubygems_version: 2.1.9
+signing_key:
+specification_version: 4
 summary: Skink is Capybara's smaller, more primitive companion.
 test_files:
 - spec/skink_dsl_spec.rb