spyke 5.4.1 → 6.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 46c56a1975e770acc9b1e9d40abdfbfd7d59b15705da333d293d0ecb18678628
-  data.tar.gz: bbc4a65e7cc6293ce9e93410eae69dd4003ede73364207c17bff79c1736770a2
+  metadata.gz: '0503658448e2cd567bfa85ec96f1a339dbb7c59690bff9b3cda1c2a0d727bab7'
+  data.tar.gz: 4ecd65b52680c1dce5f30eddad68fa544a781ea5f30984c55804aa839d93fe91
 SHA512:
-  metadata.gz: 6e741d1302b7a404d2f052329814b74af2aab61f17a5edff94b06f1bb5fadf78a8bbb43c93dbd2ed4a48064721dad8e57a28d53fde35b5d14f7a44f19fe01a31
-  data.tar.gz: 9a7cbdf9fd0b504c9772dd5388ff949b1ab5abe666277e11efc8e347e3aae22e5337cba0b506388f90f9cc2b68f5ddb97bf4dd8b08b50694a43e1f2d99c32a9a
+  metadata.gz: b143845d229f8b712b2d6f1d5d14ba36939a2bab6b90e835f35e5a499a1b06ee93087ecce81f46b9ebc9e7a4c92b9988d53c1ff2798f378e4e76fd9b12ceeb88
+  data.tar.gz: 22b3baeeac2cbaa4c0667c805eb4a33f011e6d0c333777b89766ba857e19f322374e215412d42b92c993b6f64ca80b2fb9cd89d14efaa42279d50ce3bdd2d68b

data/.travis.yml

@@ -2,4 +2,6 @@ notifications:
   email: false
 rvm:
   - 2.6.6
+  - 2.7.2
+  - 3.0.0
 sudo: false

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
@@ -105,7 +113,12 @@ module Spyke
         errors_hash.each do |field, field_errors|
           field_errors.each do |error_attributes|
             error = NormalizedValidationError.new(error_attributes)
-            errors.add(field.to_sym, error.message, error.options)
+
+            if errors.method(:add).arity == -2
+              errors.add(field.to_sym, error.message, **error.options)
+            else
+              errors.add(field.to_sym, error.message, error.options)
+            end
           end
         end
       end

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.1'
+  VERSION = '6.1.0'
 end

data/spyke.gemspec

@@ -25,7 +25,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'addressable', '>= 2.5.2'
 
   spec.add_development_dependency 'actionpack', '>= 4.0.0'
-  spec.add_development_dependency 'bundler', '~> 1.6'
+  spec.add_development_dependency 'bundler', '>= 1.6'
   spec.add_development_dependency 'coveralls', '~> 0.7'
   spec.add_development_dependency 'minitest'
   spec.add_development_dependency 'minitest-line'

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.1
+  version: 6.1.0
 platform: ruby
 authors:
 - Jens Balvig
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-02-25 00:00:00.000000000 Z
+date: 2021-12-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -110,14 +110,14 @@ dependencies:
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '1.6'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '1.6'
 - !ruby/object:Gem::Dependency