spyke 6.0.0 → 6.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 23653781200f18b330b2e78e4dd4adf51d928f1835b600be6a7c836f23d8ec15
-  data.tar.gz: 69b1d6472dde425e63e267e21b1b2660e2407bc805a60456ee2b89f055e8760d
+  metadata.gz: '0503658448e2cd567bfa85ec96f1a339dbb7c59690bff9b3cda1c2a0d727bab7'
+  data.tar.gz: 4ecd65b52680c1dce5f30eddad68fa544a781ea5f30984c55804aa839d93fe91
 SHA512:
-  metadata.gz: 1fc271dceb9578df58082af323786c241cdd4c23e0b78611b2839c64a50d30cdad780156c5afd79df55601265ca3468a4bdfe60b6c041f573d44133a0a39a8d6
-  data.tar.gz: a52dd019cc4f8fdf21ab95708ed04f666411f0cf3d4f6c4c24d3702c1308fcc562c4eacc4ec2c354fada1d26ab8e6d495b1e0d6c113922542b67efcdee9d95fe
+  metadata.gz: b143845d229f8b712b2d6f1d5d14ba36939a2bab6b90e835f35e5a499a1b06ee93087ecce81f46b9ebc9e7a4c92b9988d53c1ff2798f378e4e76fd9b12ceeb88
+  data.tar.gz: 22b3baeeac2cbaa4c0667c805eb4a33f011e6d0c333777b89766ba857e19f322374e215412d42b92c993b6f64ca80b2fb9cd89d14efaa42279d50ce3bdd2d68b

data/lib/spyke/http.rb

@@ -46,7 +46,8 @@ module Spyke
         def send_request(method, path, params)
           connection.send(method) do |request|
             if method == :get
-              request.url path.to_s, params
+              path, params = merge_query_params(path, params)
+              request.url path, params
             else
               request.url path.to_s
               request.body = params
@@ -56,6 +57,13 @@ module Spyke
           raise ConnectionError
         end
 
+        def merge_query_params(path, params)
+          parsed_uri = Addressable::URI.parse(path.to_s)
+          path = parsed_uri.path
+          params = params.merge(parsed_uri.query_values || {})
+          [path, params]
+        end
+
         def scoped_request(method)
           uri = new.uri
           params = current_scope.params.except(*uri.variables)

data/lib/spyke/version.rb

@@ -1,3 +1,3 @@
 module Spyke
-  VERSION = '6.0.0'
+  VERSION = '6.1.0'
 end

data/test/associations_test.rb

@@ -241,6 +241,15 @@ module Spyke
       assert_requested endpoint
     end
 
+
+    def test_using_where_with_custom_uri_including_query_params
+      endpoint = stub_request(:get, 'http://sushi.com/featured_ingredients?filter[group_id]=1&filter[status]=published')
+
+      Group.new(id: 1).featured_ingredients.where(filter: { status: 'published' }).to_a
+
+      assert_requested endpoint
+    end
+
     def test_path_inferred_from_name
       endpoint = stub_request(:get, 'http://sushi.com/recipes/1/gallery_images')
       Recipe.new(id: 1).gallery_images.to_a

data/test/path_test.rb

@@ -21,13 +21,13 @@ module Spyke
     end
 
     def test_required_variables
-      assert_raises Spyke::InvalidPathError, 'Missing required variables: user_id in /users/:user_id/recipes/(:id)' do
+      assert_raises InvalidPathError, 'Missing required variables: user_id in /users/:user_id/recipes/(:id)' do
         Path.new('/users/:user_id/recipes/(:id)', id: 2).to_s
       end
     end
 
     def test_mix_of_required_and_unrequired_variables
-      assert_raises Spyke::InvalidPathError, 'Missing required variables: part2, part4' do
+      assert_raises InvalidPathError, 'Missing required variables: part2, part4' do
         Path.new('/1/profiles(/:part1)/:part2(/:part3)/:part4.xml').to_s
       end
     end

data/test/support/fixtures.rb

@@ -79,6 +79,7 @@ end
 
 class Group < Spyke::Base
   has_many :ingredients, uri: nil
+  has_many :featured_ingredients, uri: 'featured_ingredients?filter[group_id]=:group_id', class_name: "Ingredient"
   accepts_nested_attributes_for :ingredients
 
   def self.build_default

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: spyke
 version: !ruby/object:Gem::Version
-  version: 6.0.0
+  version: 6.1.0
 platform: ruby
 authors:
 - Jens Balvig
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-05-12 00:00:00.000000000 Z
+date: 2021-12-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport