rocket_pants 1.10.0 → 1.11.0

data/lib/rocket_pants/controller/respondable.rb

@@ -26,7 +26,7 @@ module RocketPants
     end
 
     def self.invalid?(object)
-      object.respond_to?(:invalid?) && object.invalid?
+      object.respond_to?(:errors) && object.errors.present?
     end
 
     def self.paginated?(object)
@@ -165,6 +165,13 @@ module RocketPants
     end
     alias expose exposes
 
+    # Fixes head to return the correct content type for you api.
+    #
+    # See the ActionController build in version for definitions.
+    def head(status, options = {})
+      super status, options.merge(content_type: 'application/json')
+    end
+
     # Hooks in to allow you to perform pre-processing of objects
     # when they are exposed. Used for plugins to the controller.
     #

data/lib/rocket_pants/rspec_matchers.rb

@@ -40,7 +40,14 @@ module RocketPants
     end
 
     def self.differ
-      @_differ ||= RSpec::Expectations::Differ.new
+      return @_differ if instance_variable_defined?(:@_differ)
+      if defined?(RSpec::Support::Differ)
+        @_differ = RSpec::Expectations::Differ
+      elsif defined?(RSpec::Expectations::Differ)
+        @_differ = RSpec::Expectations::Differ.new
+      else
+        @_differ = nil
+      end
     end
 
     matcher :_be_api_error do |error_type|
@@ -96,13 +103,18 @@ module RocketPants
         normalised_response == @decoded
       end
 
-      failure_message_for_should do |response|
+      should_failure_method     = respond_to?(:failure_message) ? :failure_message : :failure_message_for_should
+      should_not_failure_method = respond_to?(:failure_message_when_negated) ? :failure_message_when_negated : :failure_message_for_should_not
+
+      send(should_failure_method) do |response|
         message = "expected api to have exposed #{normalised_response.inspect}, got #{@decoded.inspect} instead."
-        message << "\n\nDiff: #{RSpecMatchers.differ.diff_as_object(@decoded, normalised_response)}"
+        if differ = RSpecMatchers.differ
+          message << "\n\nDiff: #{differ.diff_as_object(@decoded, normalised_response)}"
+        end
         message
       end
 
-      failure_message_for_should_not do |response|
+      send(should_not_failure_method) do |response|
         "expected api to not have exposed #{normalised_response.inspect}"
       end
 

metadata

@@ -1,18 +1,20 @@
 --- !ruby/object:Gem::Specification
 name: rocket_pants
 version: !ruby/object:Gem::Version
-  version: 1.10.0
+  version: 1.11.0
+  prerelease: 
 platform: ruby
 authors:
 - Darcy Laycock
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-14 00:00:00.000000000 Z
+date: 2015-04-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionpack
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -23,6 +25,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -33,6 +36,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: railties
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -43,6 +47,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -53,6 +58,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: will_paginate
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -60,6 +66,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -67,6 +74,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: hashie
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -77,6 +85,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -87,6 +96,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: api_smith
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -94,6 +104,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -101,6 +112,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: moneta
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -108,6 +120,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -115,34 +128,51 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '2.4'
+    - - <
+      - !ruby/object:Gem::Version
+        version: '4.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '2.4'
+    - - <
+      - !ruby/object:Gem::Version
+        version: '4.0'
 - !ruby/object:Gem::Dependency
   name: rspec-rails
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '2.4'
+    - - <
+      - !ruby/object:Gem::Version
+        version: '4.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '2.4'
+    - - <
+      - !ruby/object:Gem::Version
+        version: '4.0'
 - !ruby/object:Gem::Dependency
   name: rr
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -150,6 +180,7 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -157,6 +188,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: webmock
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -164,6 +196,7 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -171,6 +204,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -181,6 +215,7 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -191,6 +226,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -198,6 +234,7 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -205,6 +242,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: reversible_data
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -212,6 +250,7 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -219,6 +258,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: kaminari
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -226,6 +266,7 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -238,7 +279,6 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- lib/rocket_pants.rb
 - lib/rocket_pants/active_record.rb
 - lib/rocket_pants/base.rb
 - lib/rocket_pants/cache_middleware.rb
@@ -264,27 +304,29 @@ files:
 - lib/rocket_pants/rspec_matchers.rb
 - lib/rocket_pants/tasks/rocket_pants.rake
 - lib/rocket_pants/test_helper.rb
+- lib/rocket_pants.rb
 homepage: http://github.com/Sutto/rocket_pants
 licenses: []
-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'
 required_rubygems_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: 1.3.6
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.3.0
+rubygems_version: 1.8.23.2
 signing_key: 
-specification_version: 4
+specification_version: 3
 summary: JSON API love for Rails and ActionController
 test_files: []

checksums.yaml

@@ -1,15 +0,0 @@
----
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    MDhmNzVjODAxNTU5ZjA2ZmFkMTRjOGViNTRhOWZjMmE0ZDJhMWI4Nw==
-  data.tar.gz: !binary |-
-    OTQxYTc0YmQyZDlmZmY5MDBjYzBiN2JmMTI3YzA3MWUwMjlhY2FhZg==
-SHA512:
-  metadata.gz: !binary |-
-    NDUxN2RkODUyMTNkYjlkNzViMGU5Y2RjZmFhYzU2MzQ0ZWViMmVmMWZjOThk
-    MTZmNzhkN2FmZmJmNDJkNDFlNTY2MTdiNTUwZTU2M2UyMzhjNmU2NzkwOTVl
-    NTI0NTYyNjZkNjg5M2NhYTRiZmRjYjljOGI0OTI5NmI4NzE4YTc=
-  data.tar.gz: !binary |-
-    YWFlZWRkZTJhM2Q1ZmEwNDZhYzUwMTgwNDI1ODBjZmMyNTRkYzk2NDE3ZjJm
-    MmUzOTcyZmNmNTIyM2E4MzAwYjFlM2I0Y2Q0ZWZjMjZkNGFmYzM1YjRlYWUx
-    MzRmMTAwMDkxZDQyMTcwZDU2Yzc3ZTVlNDAxZDMxNzExNGQxYTE=