json_api_resource 2.0.0 → 2.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1d1601705bb9dd846cb112a656fab64ad71f8128
-  data.tar.gz: 01986a0b6f6af3331de1394fb40f0c92d516ad38
+  metadata.gz: 1a98d0f34c68af51a8ca8102d654530cc3a7691f
+  data.tar.gz: 7732d5602b998a4cdfeeb3678a8cef65e9fb9438
 SHA512:
-  metadata.gz: d73fc8efe1f0d87995b012f40e900220eaa4fe1261e5468f3f69bce791ea4e3c98c443e96bd7e40dae642506ddf1737124ebf34551cf0c5c60ee8658b350c7a3
-  data.tar.gz: 89239740324124cc32de4f453dfc48eed9115a6958c89d156743d110856379f185a17ac51ffaa594541ba75d9d40ac41930cb82e05c168b40e9e428ff1c6e3c7
+  metadata.gz: b6f67e35c272601c73a80bb89fc3af1d817f5f029ba5d76dad4474cac1fe20fd27f045929c1f41478595938b5aa2ff3abc915a663e0c029292df3d41e254d7ec
+  data.tar.gz: cff9b7c9fab81866d7942adbd47d55f8a23534b63f8655e0507136ab0628d9991d60f5ec28eb5e7c69ccb948fb8d6ce326dcd2cc8ee1b9051b251480359f643f

data/lib/json_api_resource/executable.rb

@@ -27,6 +27,11 @@ module JsonApiResource
           end
         rescue Multiconnect::Error::UnsuccessfulRequest => e
           
+          empty_500_set
+          
+        end
+
+        def empty_500_set
           result = JsonApiClient::ResultSet.new
           result.meta = {status: 500}
 
@@ -40,7 +45,7 @@ module JsonApiResource
       private 
 
       def connection
-        @connection ||= Connections::ServerConnection.new( client: self.client, caching: false )
+        @connection ||= Connections::ServerConnection.new( client: self.client )
       end
     end
   end

data/lib/json_api_resource/queryable.rb

@@ -21,7 +21,7 @@ module JsonApiResource
         end
 
         def where(opts = {})
-          opts[:per_page] = opts.fetch(:per_page, self.per_page)
+          opts[:per_page] = opts.fetch(:per_page, self.per_page) if self.per_page
           execute(:where, opts)
         end
       end

data/lib/json_api_resource/resource.rb

@@ -86,7 +86,7 @@ module JsonApiResource
         super
       end
     rescue Multiconnect::Error::UnsuccessfulRequest => e
-      nil
+      empty_500_set
     end
 
     def respond_to_missing?(method_name, include_private = false)

data/lib/json_api_resource/version.rb

@@ -1,3 +1,3 @@
 module JsonApiResource
-  VERSION = "2.0.0"
+  VERSION = "2.1.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: json_api_resource
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.1.0
 platform: ruby
 authors:
 - Brandon Sislow
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-12 00:00:00.000000000 Z
+date: 2016-04-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json_api_client