spyke 5.4.3 → 6.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c76cac75e27368d88332f307ad042deb3038232fa0e01f9dd74064fce975fce9
-  data.tar.gz: 0bcb6c9dce2c00ae43800407d0f60593c30849a3649c1b4729baf07eb56877b9
+  metadata.gz: 10bea427bfa06776d0a764b34c1259215b730c9f06275ff50feeb29dd99dd9bb
+  data.tar.gz: b8fbfce6f60b4818db3a260fb2b18a76c9a296fdde55e9183c0c12def9e8599f
 SHA512:
-  metadata.gz: 03efb5a7687d3ff25a72eaf0abcc8f3eb03b3035b1942bb02ea7b36eb14443ad3eb168483669df84764514d52a36ed79bfda3c9be770e54a7b09056cc9b075b4
-  data.tar.gz: b1927128da543354a1927ea2b38b09a7019331026751a2dc96b4dc2e1411073ebdac61f92b72bef40306a420dc08194ff74274b10b0b9e620699b8a2b38ca5a8
+  metadata.gz: a5da8c94843a8e150d10ac52a135bb6ab273894fefe83ebbda9cba47f7274b6a04da966066c454887ff905be73f626a36642ef02e92737c7a7f88883e5ae38d2
+  data.tar.gz: d315a1efe8885fdbe78739dc53aedfd545095e09db8fddc205f038a06918b815f28b3da30ac5ff7a303cc1bbca2151f70d1a021cbe4ca50e855d960e8ed10777

data/.circleci/config.yml

@@ -0,0 +1,54 @@
+# Use the latest 2.1 version of CircleCI pipeline process engine.
+# See: https://circleci.com/docs/2.0/configuration-reference
+version: 2.1
+
+# Orbs are reusable packages of CircleCI configuration that you may share across projects, enabling you to create encapsulated, parameterized commands, jobs, and executors that can be used across multiple projects.
+# See: https://circleci.com/docs/2.0/orb-intro/
+orbs:
+  ruby: circleci/ruby@0.1.2
+
+# Define a job to be invoked later in a workflow.
+# See: https://circleci.com/docs/2.0/configuration-reference/#jobs
+jobs:
+  build:
+    parameters:
+      ruby_version:
+        type: string
+      rails_version:
+        type: string
+    docker:
+      - image: cimg/ruby:<< parameters.ruby_version >>
+    executor: ruby/default
+    environment:
+      RAILS_TEST_VERSION: << parameters.rails_version >>
+    steps:
+      - checkout
+      - run:
+          name: Which ruby?
+          command: ruby -v
+      - run:
+          name: Which bundler?
+          command: bundle -v
+      - ruby/bundle-install
+      - run:
+          name: Run tests
+          command: bundle exec rake
+
+workflows:
+  tests:
+    jobs:
+      - build:
+          matrix:
+            parameters:
+              rails_version: ["~> 5.0"]
+              ruby_version: ["2.6.6", "2.7.2"]
+      - build:
+          matrix:
+            parameters:
+              rails_version: ["~> 6.0"]
+              ruby_version: ["2.6.6", "2.7.2", "3.0.0"]
+      - build:
+          matrix:
+            parameters:
+              rails_version: ["~> 7.0"]
+              ruby_version: ["2.7.2", "3.0.0"]

data/README.md

@@ -7,8 +7,8 @@
   <br /><br />
   <a href="https://rubygems.org/gems/spyke"><img src="https://badge.fury.io/rb/spyke.svg?style=flat" alt="Gem Version"></a>
   <a href="https://codeclimate.com/github/balvig/spyke"><img src="https://codeclimate.com/github/balvig/spyke/badges/gpa.svg" /></a>
-  <a href='https://coveralls.io/r/balvig/spyke?branch=master'><img src='https://img.shields.io/coveralls/balvig/spyke.svg?style=flat' /></a>
-  <a href="https://travis-ci.org/balvig/spyke"><img src="https://travis-ci.org/balvig/spyke.svg?branch=master" /></a>
+  <a href='https://coveralls.io/github/balvig/spyke'><img src="https://coveralls.io/repos/github/balvig/spyke/badge.svg" /></a>
+  <a href="https://circleci.com/gh/balvig/spyke"><img src="https://circleci.com/gh/balvig/spyke.svg?style=shield" /></a>  
 </p>
 
 ---
@@ -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
@@ -246,9 +244,3 @@ Completed 200 OK in 75ms (Views: 64.6ms | Spyke: 40.3ms | ActiveRecord: 0ms)
 
 For more examples of how Spyke can be used, check out [fixtures.rb](https://github.com/balvig/spyke/blob/master/test/support/fixtures.rb) and the
 [test suite](https://github.com/balvig/spyke/tree/master/test).
-
-
-## Contributing
-
-If possible please take a look at the [tests marked "wishlisted"](https://github.com/balvig/spyke/search?l=ruby&q=wishlisted&utf8=%E2%9C%93)!
-These are features/fixes I'd like to implement but haven't gotten around to doing yet :)

data/bin/console

@@ -0,0 +1,13 @@
+#!/usr/bin/env ruby
+
+require 'bundler/setup'
+require 'spyke'
+require 'pry'
+
+# Require support files via `bin/console -t`
+if ARGV.any? { |o| %w(-t --test).include? o }
+  require_relative '../test/support/fixtures.rb'
+  Spyke::Base.connection.response :logger
+end
+
+Pry.start

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/attribute_assignment.rb

@@ -94,9 +94,9 @@ module Spyke
 
       def method_missing(name, *args, &block)
         case
-        when association?(name) then association(name).load
-        when attribute?(name)   then attribute(name)
-        when predicate?(name)   then predicate(name)
+        when association?(name) then association(name, *args).load
+        when attribute?(name)   then attribute(name, *args)
+        when predicate?(name)   then predicate(name, *args)
         when setter?(name)      then set_attribute(name, args.first)
         else super
         end

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/version.rb

@@ -1,3 +1,3 @@
 module Spyke
-  VERSION = '5.4.3'
+  VERSION = '6.1.2'
 end

data/spyke.gemspec

@@ -18,15 +18,15 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
-  spec.add_dependency 'activesupport', '>= 4.0.0'
-  spec.add_dependency 'activemodel', '>= 4.0.0'
+  spec.add_dependency 'activesupport', ENV.fetch('RAILS_TEST_VERSION', '>= 4.0.0')
+  spec.add_dependency 'activemodel', ENV.fetch('RAILS_TEST_VERSION', '>= 4.0.0')
   spec.add_dependency 'faraday', '>= 0.9.0', '< 2.0'
   spec.add_dependency 'faraday_middleware', '>= 0.9.1', '< 2.0'
   spec.add_dependency 'addressable', '>= 2.5.2'
 
-  spec.add_development_dependency 'actionpack', '>= 4.0.0'
+  spec.add_development_dependency 'actionpack', ENV.fetch('RAILS_TEST_VERSION', '>= 4.0.0')
   spec.add_development_dependency 'bundler', '>= 1.6'
-  spec.add_development_dependency 'coveralls', '~> 0.7'
+  spec.add_development_dependency 'coveralls_reborn', '~> 0.23.0'
   spec.add_development_dependency 'minitest'
   spec.add_development_dependency 'minitest-line'
   spec.add_development_dependency 'minitest-reporters'

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/attributes_test.rb

@@ -157,7 +157,6 @@ module Spyke
     end
 
     def test_rejecting_wrong_number_of_args
-      skip 'wishlisted'
       stub_request(:any, /.*/)
       recipe = Recipe.new(description: 'Delicious')
       assert_raises ArgumentError do

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

@@ -1,3 +1,5 @@
+require 'multi_json'
+
 # Dummy api
 class JSONParser < Faraday::Response::Middleware
   def parse(body)
@@ -79,6 +81,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 +122,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
 

data/test/test_helper.rb

@@ -10,7 +10,6 @@ require 'spyke'
 require 'minitest/autorun'
 require 'minitest/reporters'
 require 'mocha/minitest'
-require 'multi_json'
 require 'pry'
 
 # Require support files

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: spyke
 version: !ruby/object:Gem::Version
-  version: 5.4.3
+  version: 6.1.2
 platform: ruby
 authors:
 - Jens Balvig
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-04-19 00:00:00.000000000 Z
+date: 2021-12-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -121,19 +121,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '1.6'
 - !ruby/object:Gem::Dependency
-  name: coveralls
+  name: coveralls_reborn
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.7'
+        version: 0.23.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.7'
+        version: 0.23.0
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
@@ -249,16 +249,18 @@ dependencies:
 description: Interact with REST services in an ActiveRecord-like manner
 email:
 - jens@balvig.com
-executables: []
+executables:
+- console
 extensions: []
 extra_rdoc_files: []
 files:
+- ".circleci/config.yml"
 - ".gitignore"
-- ".travis.yml"
 - Gemfile
 - LICENSE.txt
 - README.md
 - Rakefile
+- bin/console
 - lib/spyke.rb
 - lib/spyke/associations.rb
 - lib/spyke/associations/association.rb
@@ -318,7 +320,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

data/.travis.yml

@@ -1,7 +0,0 @@
-notifications:
-  email: false
-rvm:
-  - 2.6.6
-  - 2.7.2
-  - 3.0.0
-sudo: false