spyke 5.4.2 → 6.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a67a8bfd8ac985172e534108b72f8a03a206daeb7fbd33a04c94f22b45e0126c
-  data.tar.gz: 360d138ed27015204ad9a7b9be20e068b214cb1e1c4dfcea9e23da08a68f02cb
+  metadata.gz: d8a623ec5e619581883a58962e9961e7bc04f889e7c4dfdfd5712d2e7e82953b
+  data.tar.gz: e9730e060fbcd6cfb3bf4a718a779d9de490878da0728d1643fbb18f2004968f
 SHA512:
-  metadata.gz: 8aac5b80d13d31fc9ecf437f0437dc98c59de493591ebc4307882570bea75e934e208ae991f881ab45b628e4cd177857d63dbe8546d66e6faa79c32cfe7c320a
-  data.tar.gz: e7857930a37776d02a75493597d6859268b8955fcad572993f5666598177e352b5b5d0ca8200ab65411839ec857afe9782d7ec59d7431943a1a3e4a9b859d294
+  metadata.gz: ec2cacb0215d0d780484fb184e5e06aab71cc06e5b7312c41cbf337830e3ad5e1167a00fd255c0354d4293409763e03d076a53362654512f4da19fa925980485
+  data.tar.gz: 80607d11d9501f9b6f69cfbf311a099130c0904e37879b58a30df4794f758f131360b6c19eadd9d3086e5b8c284c4eed7399219f2edf82f8a260625c992a7997

data/README.md

@@ -131,8 +131,6 @@ Post.find(4) # => GET http://api.com/posts/4
 Custom request methods and the `with` scope methods allow you to
 perform requests for non-REST actions:
 
-The `.with` scope:
-
 ```ruby
 Post.with('posts/recent') # => GET http://api.com/posts/recent
 Post.with(:recent) # => GET http://api.com/posts/recent
@@ -172,7 +170,7 @@ Spyke expects errors to be formatted in the same way as the
 [ActiveModel::Errors details hash](https://cowbell-labs.com/2015-01-22-active-model-errors-details.html), ie:
 
 ```ruby
-{ title: [{ error: 'blank'}, { error: 'too_short', count: 10 }]}
+{ title: [{ error: 'blank'}, { error: 'too_short', count: 10 }] }
 ```
 
 If the API you're using returns errors in a different format you can

data/lib/spyke/associations/builder.rb

@@ -29,7 +29,7 @@ module Spyke
           candidates << type_name
 
           candidates.each do |candidate|
-            constant = ActiveSupport::Dependencies.safe_constantize(candidate)
+            constant = candidate.safe_constantize
             return constant if candidate == constant.to_s
           end
           raise NameError.new("uninitialized constant #{candidates.first}", candidates.first)

data/lib/spyke/http.rb

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

data/lib/spyke/relation.rb

@@ -5,7 +5,7 @@ module Spyke
     include Enumerable
 
     attr_reader :klass
-    attr_accessor :params
+    attr_reader :params
     delegate :to_ary, :[], :any?, :empty?, :last, :size, :metadata, to: :find_some
 
     def initialize(klass, options = {})
@@ -21,6 +21,10 @@ module Spyke
       relation
     end
 
+    def params=(params)
+      @params = params.symbolize_keys
+    end
+
     def with(uri)
       if uri.is_a? Symbol
         @options[:uri] = File.join @options[:uri], uri.to_s

data/lib/spyke/version.rb

@@ -1,3 +1,3 @@
 module Spyke
-  VERSION = '5.4.2'
+  VERSION = '6.1.1'
 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/scopes_test.rb

@@ -61,6 +61,14 @@ module Spyke
       assert_requested endpoint
     end
 
+    def test_where_with_stringified_keys
+      endpoint = stub_request(:get, 'http://sushi.com/recipes/1/image')
+
+      RecipeImage.where("recipe_id" => 1).to_a
+
+      assert_requested endpoint
+    end
+
     def test_chainable_class_method
       endpoint = stub_request(:get, 'http://sushi.com/recipes?status=published&per_page=3')
 

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
@@ -119,10 +120,10 @@ end
 class OtherRecipe < OtherApi
   uri 'recipes/(:id)'
 
-  def self.send_request(method, path, params)
+  def self.request(method, path, params)
     super
   rescue Spyke::ConnectionError
-    Recipe.send_request(method, path, params)
+    Recipe.request(method, path, params)
   end
 end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: spyke
 version: !ruby/object:Gem::Version
-  version: 5.4.2
+  version: 6.1.1
 platform: ruby
 authors:
 - Jens Balvig
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-03-15 00:00:00.000000000 Z
+date: 2021-12-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -318,7 +318,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.2.3
 signing_key:
 specification_version: 4
 summary: Interact with REST services in an ActiveRecord-like manner