skink 0.2.0 → 0.3.0

data/lib/skink/client/base.rb

@@ -1,9 +1,12 @@
 require 'skink'
+require 'skink/client/utils'
 
 module Skink
 module Client
 
 class Base
+  include Utils
+
   def with_header(name, value)
     raise NotImplementedError
   end
@@ -56,31 +59,9 @@ class Base
     if name.match(/with_(\w+)_header/)
       with_header(normalize_header_name($1), *args)
     else
-      super
+      super(name, *args)
     end
   end
-
-private
-  def normalize_header_name(name)
-    # c.f http://en.wikipedia.org/wiki/List_of_HTTP_header_fields
-
-    case name
-    # special cases
-    when /^content_md5$/i
-      return "Content-MD5"
-    when /^te$/i
-      return "TE"
-    when /^dnt$/i
-      return "DNT"
-    when /^etag$/i
-      return "ETag"
-    when /^www_authenticate$/i
-      return "WWW-Authenticate"
-    end
-
-    # otherwise this should work
-    name.split("_").map(&:capitalize).join("-")
-  end
 end
 
 end

data/lib/skink/client/response.rb

@@ -1,7 +1,14 @@
+require 'skink/client/utils'
+
+require 'nokogiri'
+require 'jsonpath'
+
 module Skink
 module Client
 
 class Response
+  include Utils
+
   def status_code
     raise NotImplementedError
   end
@@ -10,9 +17,76 @@ class Response
     raise NotImplementedError
   end
 
+  def find_header header
+    case header
+    when String
+      headers[headers.keys.detect {|key| key.match(/^#{header}$/i)}] rescue nil
+    when Symbol
+      headers[headers.keys.detect {|key| key.match(/^#{header.to_s.gsub('_', '-')}$/i)}] rescue nil
+    end
+  end
+
+  def has_header? header
+    if find_header(header)
+      true
+    elsif header.respond_to? :keys
+      header.all? do |key, value|
+         value === find_header(key)
+      end
+    else
+      false
+    end
+  end
+
   def body
     raise NotImplementedError
   end
+
+  def xml_doc
+    @xml_doc ||= Nokogiri::XML.parse body
+  end
+
+  def xpath path
+    xml_doc.xpath path
+  end
+
+  def has_xpath? path, value = nil
+    elems = xpath(path)
+    if value
+      block = ->(elem) {value === elem.to_s}
+    else
+      block = nil
+    end
+
+    elems.any?(&block)
+  end
+
+  def json_doc
+    @json_doc ||= MultiJson.load body
+  end
+
+  def jsonpath path
+    JsonPath.new(path).on json_doc
+  end
+
+  def has_jsonpath? path, value = nil
+    elems = jsonpath(path)
+    if value
+      block = ->(elem) {value === elem}
+    else
+      block = nil
+    end
+
+    elems.any?(&block)
+  end
+
+  def method_missing(name, *args)
+    if name.match(/has_(\w+)_header\?/)
+      headers[normalize_header_name($1)] === args.first
+    else
+      super
+    end
+  end
 end
 
 end

data/lib/skink/client/utils.rb

@@ -0,0 +1,28 @@
+module Skink
+module Client
+
+module Utils
+  def normalize_header_name(name)
+    # c.f http://en.wikipedia.org/wiki/List_of_HTTP_header_fields
+
+    case name
+    # special cases
+    when /^content_md5$/i
+      return "Content-MD5"
+    when /^te$/i
+      return "TE"
+    when /^dnt$/i
+      return "DNT"
+    when /^etag$/i
+      return "ETag"
+    when /^www_authenticate$/i
+      return "WWW-Authenticate"
+    end
+
+    # otherwise this should work
+    name.split("_").map(&:capitalize).join("-")
+  end
+end
+
+end
+end

data/lib/skink/dsl.rb

@@ -41,7 +41,11 @@ module Skink
 
     Skink::Client::Base.instance_methods(false).each do |method|
       define_method method do |*args, &block|
-        Skink.client.send method, *args, &block
+        begin
+          Skink.client.send method, *args, &block
+        rescue NoMethodError
+          super(*args) if method == :method_missing
+        end
       end
     end
   end

data/lib/skink/rack_test_client/rack_test_response.rb

@@ -13,6 +13,10 @@ class RackTestResponse < Client::Response
     native_response.status
   end
 
+  def has_status_code? code
+    native_response.status == code
+  end
+
   def headers
     native_response.header
   end

data/lib/skink/resourceful_client/resourceful_response.rb

@@ -13,8 +13,12 @@ class ResourcefulResponse < Client::Response
     native_response.code
   end
 
+  def has_status_code? code
+    native_response.code == code
+  end
+
   def headers
-    native_response.headers
+    native_response.headers.to_hash
   end
 
   def body

data/lib/skink/version.rb

@@ -1,3 +1,3 @@
 module Skink
-  VERSION = "0.2.0"
+  VERSION = "0.3.0"
 end

data/skink.gemspec

@@ -14,6 +14,8 @@ Gem::Specification.new do |gem|
 
   gem.add_dependency "rack-test"
   gem.add_dependency "openlogic-resourceful"
+  gem.add_dependency "nokogiri"
+  gem.add_dependency "jsonpath"
 
   gem.add_development_dependency "rspec"
   gem.add_development_dependency "sinatra"

data/spec/skink_dsl_spec.rb

@@ -3,13 +3,13 @@ require_relative './spec_helper'
 shared_examples "a REST API test language" do
   it "is able to test a HEAD" do
     head "/"
-    response.status_code.should == 200
+    response.should have_status_code 200
     response.body.size.should == 0
   end
 
   it "is able to test a GET" do
     get "/"
-    response.status_code.should == 200
+    response.should have_status_code 200
     response.body.should == "Hello, world!"
   end
 
@@ -17,7 +17,7 @@ shared_examples "a REST API test language" do
     body = "<ping/>"
     with_content_type_header "application/xml"
     post "/", body
-    response.status_code.should == 200
+    response.should have_status_code 200
     response.body.should == body
   end
 
@@ -25,39 +25,70 @@ shared_examples "a REST API test language" do
     body = "{\"ping\": \"hello\"}"
     with_content_type_header "application/json"
     put "/", body
-    response.status_code.should == 200
+    response.should have_status_code 200
     response.body.should == body
   end
 
   it "is able to test a DELETE" do
     delete "/"
-    response.status_code.should == 200
+    response.should have_status_code 200
     response.body.should == "Deleted"
   end
 
   it "is able to test a request with additional headers" do
     with_accept_header "application/json"
     get "/foo"
-    response.status_code.should == 200
+    response.should have_status_code 200
     response.body.should == "{\"foo\": 42}"
   end
 
   it "is able to test requests which require basic authentication" do
     with_basic_auth "admin", "admin"
     get "/protected"
-    response.status_code.should == 200
+    response.should have_status_code 200
     response.body.should == "Welcome, authenticated client."
   end
 
   it "is able to test requests which require basic authentication for specified realm" do
     get "/protected"
-    response.status_code.should == 401
+    response.should have_status_code 401
 
     with_basic_auth "admin", "admin", "Restricted Area"
     get "/protected"
-    response.status_code.should == 200
+    response.should have_status_code 200
     response.body.should == "Welcome, authenticated client."
   end
+
+  it "is able to test the presence of specified response headers" do
+    with_accept_header "application/json"
+    get "/json_doc"
+    response.should have_header(:content_type)
+    response.should have_header("Content-Type")
+    response.should_not have_header("This-Is-Not-A-Header-Name")
+  end
+
+  it "is able to test the value of specified response headers" do
+    with_accept_header "application/xml"
+    get "/xml_doc"
+    response.should have_header(content_type: %r{charset})
+    response.should_not have_header(content_type: %r{json})
+  end
+
+  it "is able to test for the presence of elements in the response body" do
+    with_accept_header "application/xml"
+    get "/xml_doc"
+    response.should have_xpath "//foo/foo"
+    response.should_not have_xpath "//bar/foo"
+    response.should have_xpath "//foo", /Some/
+    response.should_not have_xpath "//foo", /bar/
+
+    with_accept_header "application/json"
+    get "/json_doc"
+    response.should have_jsonpath "root.foo.foo"
+    response.should_not have_jsonpath "shazbot.mcgillicuddy"
+    response.should have_jsonpath "root.foo.foo", /ow/
+    response.should_not have_jsonpath "root.foo.foo", /oo/
+  end
 end
 
 describe Skink::DSL do

data/spec/test_server.rb

@@ -38,3 +38,11 @@ get '/protected' do
   protected!
   "Welcome, authenticated client."
 end
+
+get '/xml_doc', :provides => :xml do
+  "<root><foo attr=\"true\">Some text<foo/></foo></root>"
+end
+
+get '/json_doc', :provides => :json do
+  '{"root": {"foo": {"foo": "howdy"}}}'
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: skink
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-09-14 00:00:00.000000000 Z
+date: 2012-09-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack-test
@@ -43,6 +43,38 @@ dependencies:
     - - ! '>='
       - !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
+  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
+  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
@@ -90,6 +122,7 @@ files:
 - lib/skink.rb
 - lib/skink/client/base.rb
 - lib/skink/client/response.rb
+- lib/skink/client/utils.rb
 - lib/skink/dsl.rb
 - lib/skink/integrations/rails.rb
 - lib/skink/integrations/rspec.rb