spyke 5.3.4 → 5.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: bc432f53eb0ef9df9998304c1eeca2bb19f9058f
-  data.tar.gz: d37e39c3ee6e644b4ca9fcad543ded7d22aa8882
+SHA256:
+  metadata.gz: 7de3203151c0bbf40af24c4ebb7926f60b497e61cd4a7edd3d5b0dcc12f302e5
+  data.tar.gz: 9cea6becd607f2f4a74258a5984055e619206f0df881c56fb444716e6e91b8af
 SHA512:
-  metadata.gz: 46f3daba4c88446b413c4faffb60680788070343448eb12fac5aa0c788f1c08c1b975c43f7538c627baf46759f88a3b7599daea1ff15858979a97a7af76ebc43
-  data.tar.gz: 13ae1021edb3d34e411768f69c0424834df1929f2b09c2ad02bec1f100817c141be43e79c85dc1c71bde26ce5667df78105c16c104d03516ff2bfffd787af358
+  metadata.gz: db5b33e37fe25bc7f2f56215ca904a37c40541804acaa8338c9b63d23ac10e9e7724f65b6abf4ac98501b354fd1d802cd0bff0483b3a2b64673797d299043750
+  data.tar.gz: 34252e5c0e56a6b7a3fc83343ed955d39f6dc46250da3c8e90817df01609adcb9e09105cc9bb6b96bfd4b8c66bf06d3dbcbc20fbf4ccc7cd11ef016800019c5a

data/.travis.yml

@@ -1,6 +1,5 @@
 notifications:
   email: false
 rvm:
-  - 2.3.1
-  - 2.5.1
+  - 2.6.6
 sudo: false

data/README.md

@@ -1,7 +1,7 @@
 # Spyke
 
 <p align="center">
-  <img src="http://upload.wikimedia.org/wikipedia/en/thumb/2/21/Spyke.jpg/392px-Spyke.jpg" width="20%" />
+  <img src="http://upload.wikimedia.org/wikipedia/en/thumb/2/21/Spyke.jpg/392px-Spyke.jpg" width="15%" />
   <br/>
   Interact with remote <strong>REST services</strong> in an <strong>ActiveRecord-like</strong> manner.
   <br /><br />
@@ -30,6 +30,7 @@ Add this line to your application's Gemfile:
 
 ```ruby
 gem 'spyke'
+gem 'multi_json' # or whatever is needed to parse responses
 ```
 
 Spyke uses Faraday to handle requests and expects it to parse the response body into a hash in the following format:
@@ -152,6 +153,19 @@ Post.request(:post, 'posts/3/log', time: '12:00')
 # => POST http://api.com/posts/3/log - { time: '12:00' }
 ```
 
+### Custom primary keys
+
+Custom primary keys can be defined with `self.primary_key = :custom_key`:
+
+```ruby
+class User < Spyke::Base
+  self.primary_key = :user_id
+
+  # When using custom URIs the :id parameter also has to be adjusted
+  uri 'people(/:user_id)'
+end
+```
+
 ### API-side validations
 
 Spyke expects errors to be formatted in the same way as the

data/lib/spyke/http.rb

@@ -41,20 +41,20 @@ module Spyke
         @uri ||= uri_template || default_uri
       end
 
-      private
-
-        def send_request(method, path, params)
-          connection.send(method) do |request|
-            if method == :get
-              request.url path.to_s, params
-            else
-              request.url path.to_s
-              request.body = params
-            end
+      def send_request(method, path, params)
+        connection.send(method) do |request|
+          if method == :get
+            request.url path.to_s, params
+          else
+            request.url path.to_s
+            request.body = params
           end
-          rescue Faraday::ConnectionFailed, Faraday::TimeoutError
-            raise ConnectionError
         end
+        rescue Faraday::ConnectionFailed, Faraday::TimeoutError
+          raise ConnectionError
+      end
+
+      private
 
         def scoped_request(method)
           uri = new.uri

data/lib/spyke/version.rb

@@ -1,3 +1,3 @@
 module Spyke
-  VERSION = '5.3.4'
+  VERSION = '5.4.0'
 end

data/test/custom_request_test.rb

@@ -63,9 +63,16 @@ module Spyke
     end
 
     def test_multiple_apis
-      endpoint = stub_request(:get, 'http://sashimi.com/other_recipes')
+      endpoint = stub_request(:get, 'http://sashimi.com/recipes')
       OtherRecipe.all.to_a
       assert_requested endpoint
     end
+
+    def test_multiple_apis_with_custom_fallback
+      fallback_endpoint = stub_request(:get, 'http://sushi.com/recipes')
+      primary_endpoint = stub_request(:get, 'http://sashimi.com/recipes').to_timeout
+      OtherRecipe.all.to_a
+      assert_requested fallback_endpoint
+    end
   end
 end

data/test/support/fixtures.rb

@@ -116,7 +116,15 @@ class OtherApi < Spyke::Base
   end
 end
 
-class OtherRecipe < OtherApi; end
+class OtherRecipe < OtherApi
+  uri 'recipes/(:id)'
+
+  def self.send_request(method, path, params)
+    super
+  rescue Spyke::ConnectionError
+    Recipe.send_request(method, path, params)
+  end
+end
 
 class Search
   def initialize(query)

data/test/test_helper.rb

@@ -9,7 +9,7 @@ end
 require 'spyke'
 require 'minitest/autorun'
 require 'minitest/reporters'
-require 'mocha/mini_test'
+require 'mocha/minitest'
 require 'multi_json'
 require 'pry'
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: spyke
 version: !ruby/object:Gem::Version
-  version: 5.3.4
+  version: 5.4.0
 platform: ruby
 authors:
 - Jens Balvig
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2019-05-31 00:00:00.000000000 Z
+date: 2020-12-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -245,7 +245,6 @@ files:
 - LICENSE.txt
 - README.md
 - Rakefile
-- circle.yml
 - lib/spyke.rb
 - lib/spyke/associations.rb
 - lib/spyke/associations/association.rb
@@ -290,7 +289,7 @@ homepage: https://github.com/balvig/spyke
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -305,9 +304,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.13
-signing_key: 
+rubygems_version: 3.0.3
+signing_key:
 specification_version: 4
 summary: Interact with REST services in an ActiveRecord-like manner
 test_files:

data/circle.yml

@@ -1,3 +0,0 @@
-machine:
-  ruby:
-    version: 2.2.2