rspec-api-expectations 0.5.0 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fda99c3899642eb3cfc68d5be22833ec6608111b
-  data.tar.gz: b30aa6e5fc91427c927090f942874034ba466267
+  metadata.gz: fdb96efa9b4427fe2fd324119952bf272f20db25
+  data.tar.gz: d84e07314ec0cbeed9246ae39a0a09d45cb3f9bb
 SHA512:
-  metadata.gz: 43a66db64f8b79f52fffd84116419779e09202f154033a1d4261c13bbc6cedf72c2aa8f643c4d178acb897f8a308198e293b5ea67eacf29cd8e13928b1893c5f
-  data.tar.gz: 4c6a318a4b16cc27086e9abd70830a9e1395048fc68e2f57ab72f44e36afeed8a6e2d54c28b8069c5b636e1950ae41b297a2b8501f727201197083f9804ba444
+  metadata.gz: 23adb51e77acc3689557ef246ee4e4e683d55211ccc34546f14b535e3f31fff676e7e38135622b9e7dfb4459c1458cb0a0c979f8b3d15dd1baacab07f6a3904a
+  data.tar.gz: 973f03448725f9132f58c5ece33acabd56802353b7115cef3461d4e984f45ebbe36444fbceeaad4099ffa575eb41b583eb20755bbebd1b163b2cfb69043c79ee

data/README.md

@@ -1,8 +1,11 @@
 RSpec API Expectations
 ======================
 
-RSpecApi::Expectations provides the `expect_resourceful` helper to any
-RSpec example group tagged as `:rspec_api_resource`.
+RSpecApi::Expectations lets you express expectations on the response of web APIs:
+
+    expect_response response, status: :ok, type: :json, collection: true
+
+More documentation and examples about RSpecApi are available at [http://rspec-api.github.io](http://rspec-api.github.io)
 
 [![Build Status](https://travis-ci.org/rspec-api/rspec-api-expectations.png?branch=master)](https://travis-ci.org/rspec-api/rspec-api-expectations)
 [![Code Climate](https://codeclimate.com/github/rspec-api/rspec-api-expectations.png)](https://codeclimate.com/github/rspec-api/rspec-api-expectations)
@@ -12,92 +15,149 @@ RSpec example group tagged as `:rspec_api_resource`.
 Basic example
 -------------
 
-    require 'faraday'
-    response = Faraday.new('http://example.com/').get('/concerts')
+    # 1. Make a request to the GitHub API:
 
-    describe 'GET http://example.com/concerts', :rspec_api_resource do
-      expect_resourceful response, status: :ok, type: :json, array: true
+    require 'faraday'
+    conn = Faraday.new 'https://api.github.com/' do |c|
+      c.use Faraday::Adapter::NetHttp
     end
+    conn.headers[:user_agent] = 'RSpec API'
+    conn.authorization :token, ENV['RSPEC_API_GITHUB_TOKEN']
+    response = conn.get '/repositories'
+
+    # 2. Expect the response to be successful and to return a JSON collection,
+    #    where each object has an ID key/value (number), a name key/value
+    #    (string) and a url key/value (string in URL format)
+
+    require 'rspec-api/expectations'
+
+    describe 'List all public repositories', rspec_api: true do
+      expect_response response, status: :ok, type: :json, collection: true,
+        attributes: {id: {type: :number}, name: {type: :string},
+                     url: {type: {string: :url}}}
+
+Running the example above returns the following successful output:
 
-The example above makes a `GET `'http://example.com/concerts'` request, then
-check that the response:
+    GET https://api.github.com/repositories
+      responds with a status code that
+        should be 200
+      responds with headers that
+        should include 'Content-Type': 'application/json; charset=utf-8'
+      responds with a body that
+        should be a collection
+        should have attributes {:id=>{:type=>:number}, :name=>{:type=>:string}, :url=>{:type=>{:string=>:url}}}
 
-* has a status code of 200 OK
-* has the 'Content-Type' header set to 'application/json'
-* has a JSON Array of Hashes (also called 'objects') in the body
+    Finished in 0.13086 seconds
+    4 examples, 0 failures
 
-Running the test above in RSpec produces the following output:
+Note that, in order run the example, above, you need to get a GitHub Personal Access Token:
+
+* Browse to your [GitHub settings](https://github.com/settings/applications)
+* Click on 'Create new token' under 'Personal Access Token' (name it as you want)
+* Copy the generated token and store it on your machine as the environment variable called `RSPEC_API_GITHUB_TOKEN`:
+  * On OSX and bash, accomplish this by running the command `export RSPEC_API_GITHUB_TOKEN=` followed by your pasted key (no spaces after `=`)
 
-...
 
 Available expectations
 ======================
 
 The purpose of RSpecApi::Expectations is to give developers a tool to quickly
-test that API endpoints respect some best practices that are common to
-RESTful resourceful web APIs.
-
-A list of best practices is available in [this great article by ...]; they
-span from something as simple as "the status of a successful GET request should
-be 200 OK" to something more complex as "the headers of a GET request for a
-paginated list should include a link to the previous page".
-
-RSpecApi::Expectations makes it easy to test whether any web API respects these
-best practices by means of the `expect_resourceful` method. Here are all the
-available expectations that can be tested with this method:
+test that API endpoints respect some [best practices](http://www.vinaysahni.com/best-practices-for-a-pragmatic-restful-api)
+that are common to RESTful resourceful web APIs.
 
 Status
 ------
 
-    expect_resourceful response, status: :ok
+    expect_response response, status: :ok
 
 Expects a specific HTTP status code in the response.
-The status can be specified either as a number or as a [symbol](...)
+The status can be specified either as a number (200) or as a symbol (:ok).
 
 Content Type
 ------------
 
-    expect_resourceful response, type: :json
+    expect_response response, type: :json
 
 Expects a specific 'Content-Type' header in the response.
-The status can be specified either as a string or as a [symbol](...).
-By default, the expectation (best practice) is 'application/json'.
-Note that this expectation always passes if the response status indicates
-that there is no content at all (e.g. if the status is '204 No Content').
+The status can be specified either as a string or as a symbol.
+The expectation always passes when the response does not have a content
+(e.g. if the status is '204 No Content').
+
+
+Page Links
+----------
+
+    expect_response response, page_links: true
+
+Expects a 'Link' header in the response to denote pagination, in accordance to [RFC 5988](http://tools.ietf.org/html/rfc5988#page-6).
+The expectation passes if a link with rel="prev" is found.
 
 Collection
 ----------
 
-    expect_resourceful response, collection: true
+    expect_response response, collection: true
+
+Expects a collection of JSON objects in the response body.
+For example, the expectation above passes if the body is
+`[{"name":"foo"},{"name":"bar"}]`.
+
+JSONP Callback
+--------------
+
+    expect_response response, callback: 'alert'
 
-Expects the response body to either contain one or a collection of resources.
-By default, the expectation is `collection: false`.
+Expects a response body with a JSON wrapped in the given JSONP callback.
+For example, the expectation above passes if the body is
+`alert({"name": "foo"})`.
 
-An example of a JSON response with one resource is:
-`{"id": 1, "name": "foo"}`.
-An example of a JSON response with a collection of resources is:
-`[{"id": 1, "name": "foo"}, {"id": 2, "name": "bar"}]`.
+Sort
+----
 
-More to add
------------
+    expect_response response, sort: {by: :id, verse: :desc}
 
-  ....
+Expects a response body with a JSON collection sorted by the given option.
+For example, the expectation above passes if the body is
+`[{"id": 2, "foo"},{"id": 1, "bar"}]`.
+
+Filter
+------
+
+    expect_response response, filter: {by: :name, value: "foo"}
+
+Expects a response body with a JSON collection filtered by the given option.
+For example, the expectation above passes if the body is
+`[{"id": 1, "foo"},{"id": 2, "foo"}]`.
+
+Filter
+------
+
+    expect_response response, attributes: [:id, name: {type: :string}]
+
+Expects a response body that includes the given attributes.
+For example, the expectation above passes if the body is
+`[{"id": 1, "foo"},{"id": 2, "bar"}]`.
 
 
 How to install
 ==============
 
-Add `gem 'rspec-api-expectations'` to your `Gemfile` and run `bundle`.
-Or install yourself by running `gem install rspec-api-expectations`.
+To install on your system, run `gem install rspec-api-expectations`.
+To use inside a bundled Ruby project, add this line to the Gemfile:
 
-Version changes respect [Semantic Versioning](http://semver.org).
-To ensure `bundle update` won't cause problems in your repository,
-always indicate the patch version until version 1.0.0 is released, e.g.:
+    gem 'rspec-api-expectations', '~> 0.6.0'
+
+The rspec-api-expectations gem follows [Semantic Versioning](http://semver.org).
+Any new release that is fully backward-compatible bumps the *patch* version (0.0.x).
+Any new version that breaks compatibility bumps the *minor* version (0.x.0)
+
+Indicating the full version in your Gemfile (*major*.*minor*.*patch*) guarantees
+that your project won’t occur in any error when you `bundle update` and a new
+version of RSpecApi::Expectations is released.
 
-    gem 'rspec-api-expectations', '~> 0.5.0'
 
 How to contribute
 =================
 
 Don’t hesitate to send me code comments, issues or pull requests through GitHub!
+
 All feedback is appreciated. Thanks :)

data/lib/rspec-api/expectations.rb

@@ -1,2 +1,26 @@
-require 'rspec-api/resourceful'
-require 'rspec-api/configure'
+require 'rspec/core'
+require 'rspec-api/expectations/response'
+
+module RSpecApi
+  module Expectations
+    include Response
+  end
+end
+
+# RSpecApi::Matchers adds matchers to test RESTful APIs.
+#
+# To have these matchers available inside of an RSpec `describe` block, tag that
+# block with the `:rspec_api` metadata:
+#
+#  describe "Artists", rspec_api: true do
+#     ... # here you can write `expect(response).to have_status :ok`, etc.
+#  end
+RSpec.configuration.extend RSpecApi::Expectations, rspec_api: true
+
+# You can also explicitly include the RSpec::Api module inside the example group:
+#
+#  describe "Artists" do
+#     include RSpecApi::Matchers
+#     ... # here you can write `expect(response).to have_status :ok`, etc.
+#  end
+#

data/lib/rspec-api/expectations/body.rb

@@ -1,37 +1,36 @@
-require 'rspec-api/matchers'
-require 'rack/utils'
+require 'rspec-api/expectations/body/collection'
+require 'rspec-api/expectations/body/jsonp'
+require 'rspec-api/expectations/body/sort'
+require 'rspec-api/expectations/body/filter'
+require 'rspec-api/expectations/body/attributes'
 
 module RSpecApi
   module Expectations
-    module BodyExpectations
-      def expect_a_collection(response, is_collection)
-        if is_collection
-          expect(response).to be_a_collection
-        else
-          expect(response).not_to be_a_collection
-        end
-      end
-
-      def expect_callback_wrapped(response, callback)
-        expect(response).to be_a_jsonp callback
-      end
-
-      def expect_a_sorted(response, sort = {})
-        expect(response).to be_sorted sort
-      end
+    module Response
+      # Creates an example group for expectations on the response body of the
+      # last API request and runs it to verify that it matches best practices:
+      # * if response is succesful and has a body
+      #   -  the body should be a JSON-marshalled Array or Hash
+      #   -  if request has a callback parameter, the body should be JSONP
+      #   -  if request has a sort parameter, the body should be sorted
+      #   -  if request has a filter parameter, the body should be filtered
+      #   -  if some attributes are expected, the body should include them
+      module Body
+        def expect_body(response, expectations = {})
+          context 'responds with a body that' do
+            extend Collection
+            extend Jsonp
+            extend Sort
+            extend Filter
+            extend Attributes
 
-      def expect_a_filtered(response, filter = {})
-        expect(response).to be_filtered filter[:value], filter.except(:value)
-      end
-
-      def expect_attributes(response, attributes)
-        expect(response).to have_attributes attributes
-      end
-
-    private
-
-      def successful?(response)
-        response.status < 400 && !Rack::Utils::STATUS_WITH_NO_ENTITY_BODY.include?(response.status)
+            expect_a_collection response, expectations
+            expect_a_callback_wrapped response, expectations
+            expect_a_sorted response, expectations
+            expect_a_filtered response, expectations
+            expect_attributes response, expectations
+          end if expectations.any?
+        end
       end
     end
   end

data/lib/rspec-api/expectations/body/attributes.rb

@@ -0,0 +1,25 @@
+require 'rspec-api/matchers'
+
+module RSpecApi
+  module Expectations
+    module Response
+      module Body
+        module Attributes
+          def expect_attributes(response, expectations = {})
+            include RSpecApi::Matchers
+
+            if should_check_attributes(response, expectations)
+              it { expect(response).to have_attributes expectations[:attributes] }
+            end
+          end
+
+        private
+
+          def should_check_attributes(response, expectations)
+            expectations.key?(:attributes) && success?(response) && has_entity_body?(response)
+          end
+        end
+      end
+    end
+  end
+end

data/lib/rspec-api/expectations/body/collection.rb

@@ -0,0 +1,29 @@
+require 'rspec-api/matchers'
+
+module RSpecApi
+  module Expectations
+    module Response
+      module Body
+        module Collection
+          def expect_a_collection(response, expectations = {})
+            include RSpecApi::Matchers
+
+            if should_check_collection(response, expectations)
+              if expectations[:collection]
+                it { expect(response).to be_a_collection }
+              else
+                it { expect(response).not_to be_a_collection }
+              end
+            end
+          end
+
+        private
+
+          def should_check_collection(response, expectations)
+            expectations.key?(:collection) && success?(response) && has_entity_body?(response)
+          end
+        end
+      end
+    end
+  end
+end

data/lib/rspec-api/expectations/body/filter.rb

@@ -0,0 +1,25 @@
+require 'rspec-api/matchers'
+
+module RSpecApi
+  module Expectations
+    module Response
+      module Body
+        module Filter
+          def expect_a_filtered(response, expectations = {})
+            include RSpecApi::Matchers
+
+            if should_check_filtered(response, expectations)
+              it { expect(response).to be_filtered expectations[:filter] }
+            end
+          end
+
+        private
+
+          def should_check_filtered(response, expectations)
+            expectations.key?(:filter)
+          end
+        end
+      end
+    end
+  end
+end

data/lib/rspec-api/expectations/body/jsonp.rb

@@ -0,0 +1,25 @@
+require 'rspec-api/matchers'
+
+module RSpecApi
+  module Expectations
+    module Response
+      module Body
+        module Jsonp
+          def expect_a_callback_wrapped(response, expectations = {})
+            include RSpecApi::Matchers
+
+            if should_check_callback_wrapped(response, expectations)
+              it { expect(response).to be_wrapped_in_callback expectations[:callback] }
+            end
+          end
+
+        private
+
+          def should_check_callback_wrapped(response, expectations)
+            expectations.key?(:callback)
+          end
+        end
+      end
+    end
+  end
+end

data/lib/rspec-api/expectations/body/sort.rb

@@ -0,0 +1,25 @@
+require 'rspec-api/matchers'
+
+module RSpecApi
+  module Expectations
+    module Response
+      module Body
+        module Sort
+          def expect_a_sorted(response, expectations = {})
+            include RSpecApi::Matchers
+
+            if should_check_sorted(response, expectations)
+              it { expect(response).to be_sorted expectations[:sort] }
+            end
+          end
+
+        private
+
+          def should_check_sorted(response, expectations)
+            expectations.key?(:sort)
+          end
+        end
+      end
+    end
+  end
+end

data/lib/rspec-api/expectations/headers.rb

@@ -1,18 +1,22 @@
-require 'rspec-api/matchers'
-require 'rack/utils'
+require 'rspec-api/expectations/headers/content_type'
+require 'rspec-api/expectations/headers/page_links'
 
 module RSpecApi
   module Expectations
-    module HeadersExpectations
-      def expect_content_type_header(response, type)
-        expect(response).to include_content_type type
-      end
+    module Response
+      # Creates an example group for expectations on the response headers of
+      # last API request and runs it to verify that it matches best practices:
+      # * if request has entity body, the Content-Type header should be JSON
+      # * if request has pages, the Link header should have a 'rel=prev' link
+      module Headers
+        def expect_headers(response, expectations = {})
+          context 'responds with headers that' do
+            extend ContentType
+            extend PageLinks
 
-      def expect_prev_page_link_header(response, has_prev_page)
-        if has_prev_page == false
-          expect(response).not_to have_prev_page_link
-        else
-          expect(response).to have_prev_page_link
+            expect_content_type response, expectations
+            expect_page_links response, expectations
+          end if expectations.any?
         end
       end
     end

data/lib/rspec-api/expectations/headers/content_type.rb

@@ -0,0 +1,25 @@
+require 'rspec-api/matchers'
+
+module RSpecApi
+  module Expectations
+    module Response
+      module Headers
+        module ContentType
+          def expect_content_type(response, expectations = {})
+            include RSpecApi::Matchers
+
+            if should_check_content_type(response, expectations)
+              it { expect(response).to have_content_type expectations[:type] }
+            end
+          end
+
+        private
+
+          def should_check_content_type(response, expectations)
+            expectations.key?(:type) && has_entity_body?(response)
+          end
+        end
+      end
+    end
+  end
+end

data/lib/rspec-api/expectations/headers/page_links.rb

@@ -0,0 +1,29 @@
+require 'rspec-api/matchers'
+
+module RSpecApi
+  module Expectations
+    module Response
+      module Headers
+        module PageLinks
+          def expect_page_links(response, expectations = {})
+            include RSpecApi::Matchers
+
+            if should_check_page_links(response, expectations)
+              if expectations[:page_links]
+                it { expect(response).to have_page_links }
+              else
+                it { expect(response).not_to have_page_links }
+              end
+            end
+          end
+
+        private
+
+          def should_check_page_links(response, expectations)
+            expectations.key?(:page_links)
+          end
+        end
+      end
+    end
+  end
+end

data/lib/rspec-api/expectations/response.rb

@@ -0,0 +1,43 @@
+require 'active_support/core_ext/hash/slice'
+require 'rack/utils'
+require 'rspec-api/expectations/status'
+require 'rspec-api/expectations/headers'
+require 'rspec-api/expectations/body'
+
+module RSpecApi
+  module Expectations
+    module Response
+      include Status
+      include Headers
+      include Body
+
+      def expect_response(response, expectations)
+        expect_status response, expectations.slice(*on_status)
+        expect_headers response, expectations.slice(*on_headers)
+        expect_body response, expectations.slice(*on_body)
+      end
+
+    private
+
+      def on_status
+        [:status]
+      end
+
+      def on_headers
+        [:type, :page_links]
+      end
+
+      def on_body
+        [:collection, :callback, :sort, :filter, :attributes]
+      end
+
+      def success?(response)
+        response.status && response.status < 400
+      end
+
+      def has_entity_body?(response)
+        !Rack::Utils::STATUS_WITH_NO_ENTITY_BODY.include?(response.status)
+      end
+    end
+  end
+end

data/lib/rspec-api/expectations/status.rb

@@ -1,10 +1,17 @@
-require 'rspec-api/matchers'
+require 'rspec-api/expectations/status/code'
 
 module RSpecApi
   module Expectations
-    module StatusExpectations
-      def expect_status(response, status)
-        expect(response).to have_status status
+    module Response
+      # Creates an example group for expectations on the HTTP status code of the
+      # last API request and runs it to verify that it matches +status+.
+      module Status
+        def expect_status(response, expectations = {})
+          context 'responds with a status code that' do
+            extend Code
+            expect_status_code response, expectations
+          end if expectations.any?
+        end
       end
     end
   end

data/lib/rspec-api/expectations/status/code.rb

@@ -0,0 +1,25 @@
+require 'rspec-api/matchers'
+
+module RSpecApi
+  module Expectations
+    module Response
+      module Status
+        module Code
+          def expect_status_code(response, expectations = {})
+            include RSpecApi::Matchers
+
+            if should_check_status_code(response, expectations)
+              it { expect(response).to have_status expectations[:status] }
+            end
+          end
+
+        private
+
+          def should_check_status_code(response, expectations)
+            expectations.key?(:status)
+          end
+        end
+      end
+    end
+  end
+end

data/lib/rspec-api/expectations/version.rb

@@ -1,5 +1,5 @@
 module RSpecApi
   module Expectations
-    VERSION = '0.5.0'
+    VERSION = '0.6.0'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rspec-api-expectations
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.6.0
 platform: ruby
 authors:
 - claudiob
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-09 00:00:00.000000000 Z
+date: 2013-11-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -44,14 +44,14 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.5.0
+        version: 0.6.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.5.0
+        version: 0.6.1
 - !ruby/object:Gem::Dependency
   name: rack
   requirement: !ruby/object:Gem::Requirement
@@ -129,16 +129,20 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- lib/rspec-api/configure.rb
+- lib/rspec-api/expectations/body/attributes.rb
+- lib/rspec-api/expectations/body/collection.rb
+- lib/rspec-api/expectations/body/filter.rb
+- lib/rspec-api/expectations/body/jsonp.rb
+- lib/rspec-api/expectations/body/sort.rb
 - lib/rspec-api/expectations/body.rb
+- lib/rspec-api/expectations/headers/content_type.rb
+- lib/rspec-api/expectations/headers/page_links.rb
 - lib/rspec-api/expectations/headers.rb
+- lib/rspec-api/expectations/response.rb
+- lib/rspec-api/expectations/status/code.rb
 - lib/rspec-api/expectations/status.rb
 - lib/rspec-api/expectations/version.rb
 - lib/rspec-api/expectations.rb
-- lib/rspec-api/resourceful/body.rb
-- lib/rspec-api/resourceful/headers.rb
-- lib/rspec-api/resourceful/status.rb
-- lib/rspec-api/resourceful.rb
 - lib/rspec-api-expectations.rb
 - MIT-LICENSE
 - README.md

data/lib/rspec-api/configure.rb

@@ -1,8 +0,0 @@
-require 'rspec'
-require 'rspec-api/resourceful'
-
-# Make `expect_resourceful` available in every RSpec ExampleGroup tagged
-# as `rspec_api_resource`
-RSpec.configure do |c|
-  c.extend(RSpecApi::Expectations::Resourceful, rspec_api_resource: true)
-end

data/lib/rspec-api/resourceful.rb

@@ -1,34 +0,0 @@
-require 'active_support/core_ext/hash/slice'
-require 'rspec-api/resourceful/status'
-require 'rspec-api/resourceful/headers'
-require 'rspec-api/resourceful/body'
-
-module RSpecApi
-  module Expectations
-    module Resourceful
-      include ResourcefulStatus
-      include ResourcefulHeaders
-      include ResourcefulBody
-
-      def expect_resourceful(response, expectations)
-        expect_resourceful_status response, expectations.slice(*on_status)
-        expect_resourceful_headers response, expectations.slice(*on_headers)
-        expect_resourceful_body response, expectations.slice(*on_body)
-      end
-
-    private
-
-      def on_status
-        [:status]
-      end
-
-      def on_headers
-        [:type, :has_prev_page]
-      end
-
-      def on_body
-        [:collection, :callback, :sort, :filter, :attributes]
-      end
-    end
-  end
-end

data/lib/rspec-api/resourceful/body.rb

@@ -1,27 +0,0 @@
-require 'rspec-api/expectations/body'
-require 'rack/utils'
-
-module RSpecApi
-  module Expectations
-    module ResourcefulBody
-      # Creates an example group for expectations on the response body of the
-      # last API request and runs it to verify that it matches best practices:
-      # * if response is succesful and has a body
-      #   -  the body should be a JSON-marshalled Array or Hash
-      #   -  if request has a callback parameter, the body should be JSONP
-      #   -  if request has a sort parameter, the body should be sorted
-      #   -  if request has a filter parameter, the body should be filtered
-      #   -  if some attributes are expected, the body should include them
-      def expect_resourceful_body(response, expectations = {})
-        include BodyExpectations
-        context 'responds with a body that' do
-          it { expect_a_collection response, expectations[:collection] } if expectations.key?(:collection)  && response.status && response.status < 400 && !Rack::Utils::STATUS_WITH_NO_ENTITY_BODY.include?(response.status)
-          it { expect_callback_wrapped response, expectations[:callback] } if expectations[:callback]
-          it { expect_a_sorted response, expectations[:sort] } if expectations[:sort]
-          it { expect_a_filtered response, expectations[:filter] } if expectations[:filter]
-          it { expect_attributes response, expectations[:attributes] } if expectations[:attributes] && response.status && response.status < 400 && !Rack::Utils::STATUS_WITH_NO_ENTITY_BODY.include?(response.status)
-        end if expectations.any?
-      end
-    end
-  end
-end

data/lib/rspec-api/resourceful/headers.rb

@@ -1,20 +0,0 @@
-require 'rspec-api/expectations/headers'
-
-module RSpecApi
-  module Expectations
-    module ResourcefulHeaders
-      # Creates an example group for expectations on the response headers of
-      # last API request and runs it to verify that it matches best practices:
-      # * if request has entity body, the Content-Type header should be JSON
-      # * if request has pages, the Link header should have a 'rel=prev' link
-      def expect_resourceful_headers(response, expectations = {})
-        include HeadersExpectations
-
-        context 'responds with headers that' do
-          it { expect_content_type_header response, expectations[:type] } if expectations[:type] && !Rack::Utils::STATUS_WITH_NO_ENTITY_BODY.include?(response.status)
-          it { expect_prev_page_link_header response, expectations[:has_prev_page] } if expectations.key?(:has_prev_page)
-        end if expectations.any?
-      end
-    end
-  end
-end

data/lib/rspec-api/resourceful/status.rb

@@ -1,17 +0,0 @@
-require 'rspec-api/expectations/status'
-
-module RSpecApi
-  module Expectations
-    module ResourcefulStatus
-      # Creates an example group for expectations on the HTTP status code of the
-      # last API request and runs it to verify that it matches +status+.
-      def expect_resourceful_status(response, expectations = {})
-        include StatusExpectations
-
-        context 'responds with a status code that' do
-          it { expect_status response, expectations[:status] } if expectations[:status]
-        end if expectations.any?
-      end
-    end
-  end
-end