spyke 6.1.1 → 7.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d8a623ec5e619581883a58962e9961e7bc04f889e7c4dfdfd5712d2e7e82953b
-  data.tar.gz: e9730e060fbcd6cfb3bf4a718a779d9de490878da0728d1643fbb18f2004968f
+  metadata.gz: 6d4ddb1fd345f49012040e7f462f63003f1a1ff57ddc7173bb14cb5ca03c5bed
+  data.tar.gz: bd1674887dc87a21ca4bad570d7375299add2312a3af7183d466078b6510367f
 SHA512:
-  metadata.gz: ec2cacb0215d0d780484fb184e5e06aab71cc06e5b7312c41cbf337830e3ad5e1167a00fd255c0354d4293409763e03d076a53362654512f4da19fa925980485
-  data.tar.gz: 80607d11d9501f9b6f69cfbf311a099130c0904e37879b58a30df4794f758f131360b6c19eadd9d3086e5b8c284c4eed7399219f2edf82f8a260625c992a7997
+  metadata.gz: c83ab8e4a46d6afff3624e7a1b2baccef8b5fe97c875271268c0dd7c51b65a76e85e019cf4ed749b06ef5414566203f6e618e22aaafe12c6494ac39f113abc75
+  data.tar.gz: c2f0f2bb8bbce8cb8047be70f0f946305efdff464f6c0e4ad4a46b13cfc2fba19f87ff98c8139102a107e9c64e45035246f5f66d055ed7402772685ca16d348e

data/.circleci/config.yml

@@ -0,0 +1,85 @@
+# 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
+  coveralls: coveralls/coveralls@1.0.6
+  node: circleci/node@5.0.0
+
+# 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
+      faraday_version:
+        type: string
+    docker:
+      - image: cimg/ruby:<< parameters.ruby_version >>
+    executor: ruby/default
+    environment:
+      RAILS_TEST_VERSION: << parameters.rails_version >>
+      FARADAY_TEST_VERSION: << parameters.faraday_version >>
+      EUID: 0 # not sure why this is needed, but sudo npm fails
+    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
+      - node/install:
+          node-version: 10.0.0
+      - coveralls/upload:
+          parallel: true
+  coverage:
+    docker:
+      - image: circleci/node:10.0.0
+    steps:
+      - coveralls/upload:
+          parallel_finished: true
+
+workflows:
+  tests:
+    jobs:
+      - build:
+          matrix:
+            alias: Rails 4
+            parameters:
+              rails_version: ["~> 4.0"]
+              ruby_version: ["2.6.9"]
+              faraday_version: ["< 2.0"]
+      - build:
+          matrix:
+            alias: Rails 5
+            parameters:
+              rails_version: ["~> 5.0"]
+              ruby_version: ["2.6.9", "2.7.5"]
+              faraday_version: ["< 2.0", ">= 2.0"]
+      - build:
+          matrix:
+            alias: Rails 6
+            parameters:
+              rails_version: ["~> 6.0"]
+              ruby_version: ["2.6.9", "2.7.5", "3.0.3"]
+              faraday_version: ["< 2.0", ">= 2.0"]
+      - build:
+          matrix:
+            alias: Rails 7
+            parameters:
+              rails_version: ["~> 7.0"]
+              ruby_version: ["2.7.5", "3.0.3", "3.1.1"]
+              faraday_version: ["< 2.0", ">= 2.0"]
+      - coverage:
+          requires: ["Rails 4", "Rails 5", "Rails 6", "Rails 7"]

data/Gemfile

@@ -2,3 +2,7 @@ source 'https://rubygems.org'
 
 # Specify your gem's dependencies in spyke.gemspec
 gemspec
+
+if ENV['FARADAY_TEST_VERSION'] == '< 2.0'
+  gem 'faraday_middleware'
+end

data/README.md

@@ -1,15 +1,13 @@
-# Spyke
-
-<p align="center">
-  <img src="http://upload.wikimedia.org/wikipedia/en/thumb/2/21/Spyke.jpg/392px-Spyke.jpg" width="15%" />
+<div align="center">
+  <img src="spyke.svg" width="250" alt="Spyke" />
   <br/>
   Interact with remote <strong>REST services</strong> in an <strong>ActiveRecord-like</strong> manner.
   <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>
-</p>
+  <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>
+</div>
 
 ---
 
@@ -50,10 +48,10 @@ So, for example for an API that returns JSON like this:
 ```ruby
 # config/initializers/spyke.rb
 
-class JSONParser < Faraday::Response::Middleware
-  def parse(body)
-    json = MultiJson.load(body, symbolize_keys: true)
-    {
+class JSONParser < Faraday::Middleware
+  def on_complete(env)
+    json = MultiJson.load(env.body, symbolize_keys: true)
+    env.body = {
       data: json[:result],
       metadata: json[:extra],
       errors: json[:errors]
@@ -62,7 +60,8 @@ class JSONParser < Faraday::Response::Middleware
 end
 
 Spyke::Base.connection = Faraday.new(url: 'http://api.com') do |c|
-  c.request   :json
+  c.request   :multipart
+  c.request   :json # if using Faraday 1.x, please add `faraday_middleware` to your dependencies first
   c.use       JSONParser
   c.adapter   Faraday.default_adapter
 end
@@ -204,7 +203,7 @@ but this can be disabled or customized:
 ```ruby
 class Article < Spyke::Base
   # Default
-  include_root_in_json  true # { article: { title: ...} }
+  include_root_in_json true # { article: { title: ...} }
 
   # Custom
   include_root_in_json :post # { post: { title: ...} }
@@ -244,9 +243,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/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/attributes.rb

@@ -12,7 +12,7 @@ module Spyke
         case
         when value.is_a?(Spyke::Base)         then value.attributes.to_params
         when value.is_a?(Array)               then value.map { |v| parse_value(v) }
-        when value.respond_to?(:content_type) then Faraday::UploadIO.new(value.path, value.content_type)
+        when value.respond_to?(:content_type) then Faraday::Multipart::FilePart.new(value.path, value.content_type)
         else value
         end
       end

data/lib/spyke/http.rb

@@ -1,5 +1,3 @@
-require 'faraday'
-require 'faraday_middleware'
 require 'spyke/config'
 require 'spyke/path'
 require 'spyke/result'
@@ -114,10 +112,10 @@ module Spyke
           field_errors.each do |error_attributes|
             error = NormalizedValidationError.new(error_attributes)
 
-            if errors.method(:add).arity == -2
-              errors.add(field.to_sym, error.message, **error.options)
-            else
+            if ActiveSupport::VERSION::MAJOR < 5
               errors.add(field.to_sym, error.message, error.options)
+            else
+              errors.add(field.to_sym, error.message, **error.options)
             end
           end
         end

data/lib/spyke/scope_registry.rb

@@ -1,17 +1,28 @@
 module Spyke
   class ScopeRegistry
-    extend ActiveSupport::PerThreadRegistry
+    # https://github.com/balvig/spyke/pull/128
+    if ActiveSupport::VERSION::MAJOR >= 7
+      class << self
+        delegate :value_for, :set_value_for, to: :new
+      end
+
+      thread_mattr_accessor :registry
+    else
+      extend ActiveSupport::PerThreadRegistry
+
+      attr_accessor :registry
+    end
 
     def initialize
-      @registry = Hash.new { |hash, key| hash[key] = {} }
+      self.registry ||= Hash.new { |hash, key| hash[key] = {} }
     end
 
     def value_for(scope_type, variable_name)
-      @registry[scope_type][variable_name]
+      registry[scope_type][variable_name]
     end
 
     def set_value_for(scope_type, variable_name, value)
-      @registry[scope_type][variable_name] = value
+      registry[scope_type][variable_name] = value
     end
   end
 end

data/lib/spyke/version.rb

@@ -1,3 +1,3 @@
 module Spyke
-  VERSION = '6.1.1'
+  VERSION = '7.0.0'
 end

data/lib/spyke.rb

@@ -1,5 +1,21 @@
 require 'active_support'
 require 'active_support/core_ext'
+
+require 'faraday'
+require 'faraday/multipart'
+
+if Gem.loaded_specs["faraday"].version < Gem::Version.new("2.0")
+  begin
+    require 'faraday_middleware'
+  rescue LoadError => e
+    puts <<~MSG
+      Please add `faraday_middleware` to your Gemfile when using Faraday 1.x. Alternatively,
+      upgrade to Faraday `~> 2` to avoid this dependency.
+    MSG
+    raise e
+  end
+end
+
 require 'spyke/base'
 require 'spyke/instrumentation' if defined?(Rails)
 require 'spyke/version'

data/spyke.gemspec

@@ -18,15 +18,14 @@ 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 'faraday', '>= 0.9.0', '< 2.0'
-  spec.add_dependency 'faraday_middleware', '>= 0.9.1', '< 2.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', ENV.fetch('FARADAY_TEST_VERSION', '>= 1.0.0'), '< 3.0'
+  spec.add_dependency 'faraday-multipart', '~> 1.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 'minitest'
   spec.add_development_dependency 'minitest-line'
   spec.add_development_dependency 'minitest-reporters'
@@ -34,5 +33,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'multi_json'
   spec.add_development_dependency 'pry'
   spec.add_development_dependency 'rake'
+  spec.add_development_dependency 'simplecov'
+  spec.add_development_dependency 'simplecov-lcov'
   spec.add_development_dependency 'webmock'
 end

data/spyke.svg

@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" width="180" height="70" viewBox="0 0 180 70" xml:space="preserve">
+<desc>Created with Fabric.js 4.6.0</desc>
+<defs>
+</defs>
+<g transform="matrix(0.83 0 0 0.8 31.5 36)" id="6X9shhn5tjKNE9PTybgYf"  >
+<path style="stroke: rgb(252,0,51); stroke-width: 3; stroke-dasharray: none; stroke-linecap: butt; stroke-dashoffset: 0; stroke-linejoin: miter; stroke-miterlimit: 4; fill: rgb(255,255,255); fill-opacity: 0; fill-rule: nonzero; opacity: 1;" vector-effect="non-scaling-stroke"  transform=" translate(0, 0)" d="M -19.8939 12.44496 L 19.8939 -12.44496 L 19.8939 12.44496" stroke-linecap="round" />
+</g>
+<g transform="matrix(1 0 0 1 48 26)" id="qfktuO63U17zxOoFBmSIk"  >
+<path style="stroke: rgb(23,172,60); stroke-width: 0; stroke-dasharray: none; stroke-linecap: butt; stroke-dashoffset: 0; stroke-linejoin: miter; stroke-miterlimit: 4; fill: rgb(252,0,51); fill-rule: nonzero; opacity: 1;" vector-effect="non-scaling-stroke"  transform=" translate(-4, -4)" d="M 4 0 C 6.208 0 8 1.792 8 4 C 8 6.208 6.208 8 4 8 C 1.7919999999999998 8 0 6.208 0 4 C 0 1.7919999999999998 1.792 0 4 0 z" stroke-linecap="round" />
+</g>
+<g transform="matrix(1 0 0 1 48 45)" id="CoP4qh0-57aRlWWd5gWpq"  >
+<path style="stroke: rgb(23,172,60); stroke-width: 0; stroke-dasharray: none; stroke-linecap: butt; stroke-dashoffset: 0; stroke-linejoin: miter; stroke-miterlimit: 4; fill: rgb(252,0,51); fill-rule: nonzero; opacity: 1;" vector-effect="non-scaling-stroke"  transform=" translate(-4, -4)" d="M 4 0 C 6.208 0 8 1.792 8 4 C 8 6.208 6.208 8 4 8 C 1.7919999999999998 8 0 6.208 0 4 C 0 1.7919999999999998 1.792 0 4 0 z" stroke-linecap="round" />
+</g>
+<g transform="matrix(1 0 0 1 16 45)" id="0AYtWnywiPmVyWgmd3Nax"  >
+<path style="stroke: rgb(23,172,60); stroke-width: 0; stroke-dasharray: none; stroke-linecap: butt; stroke-dashoffset: 0; stroke-linejoin: miter; stroke-miterlimit: 4; fill: rgb(252,0,51); fill-rule: nonzero; opacity: 1;" vector-effect="non-scaling-stroke"  transform=" translate(-4, -4)" d="M 4 0 C 6.208 0 8 1.792 8 4 C 8 6.208 6.208 8 4 8 C 1.7919999999999998 8 0 6.208 0 4 C 0 1.7919999999999998 1.792 0 4 0 z" stroke-linecap="round" />
+</g>
+<g transform="matrix(1.01 0 0 1.02 111 35.5)" id="0CUp8y4TleogKJWzIB5ti"  >
+<path style="stroke: none; stroke-width: 1; stroke-dasharray: none; stroke-linecap: butt; stroke-dashoffset: 0; stroke-linejoin: miter; stroke-miterlimit: 4; fill: rgb(0,0,0); fill-rule: nonzero; opacity: 1;" vector-effect="non-scaling-stroke"  transform=" translate(-115.71, -44.78)" d="M 72.39608287 59.952 L 72.39608287 59.952 Q 69.77208287 59.952 67.88608287 59.1525 Q 66.00008287 58.353 64.99558287 57.3075 Q 63.99108287 56.262 63.99108287 55.524 L 63.99108287 55.524 Q 63.99108287 55.196 64.17558287 54.827 Q 64.36008287 54.458 64.64708287 54.2325 Q 64.93408287 54.007 65.22108287 54.007 L 65.22108287 54.007 Q 65.63108287 54.007 66.06158287 54.5195 Q 66.49208287 55.032 67.20958287 55.7085 Q 67.92708287 56.385 69.11608287 56.8975 Q 70.30508287 57.41 72.23208287 57.41 L 72.23208287 57.41 Q 74.15908287 57.41 75.53258287 56.7745 Q 76.90608287 56.139 77.62358287 54.8885 Q 78.34108287 53.638 78.34108287 51.752 L 78.34108287 51.752 Q 78.34108287 49.784 77.60308287 48.5745 Q 76.86508287 47.365 75.65558287 46.6065 Q 74.44608287 45.848 73.01108287 45.2945 Q 71.57608287 44.741 70.12058287 44.1875 Q 68.66508287 43.634 67.45558287 42.7935 Q 66.24608287 41.953 65.48758287 40.5795 Q 64.72908287 39.206 64.72908287 37.074 L 64.72908287 37.074 Q 64.72908287 34.819 65.54908287 33.384 Q 66.36908287 31.949 67.66058287 31.129 Q 68.95208287 30.309 70.46908287 29.9605 Q 71.98608287 29.612 73.42108287 29.612 L 73.42108287 29.612 Q 74.56908287 29.612 75.77858287 29.7965 Q 76.98808287 29.981 78.01308287 30.309 Q 79.03808287 30.637 79.67358287 31.088 Q 80.30908287 31.539 80.30908287 32.113 L 80.30908287 32.113 Q 80.30908287 32.4 80.16558287 32.7485 Q 80.02208287 33.097 79.77608287 33.3635 Q 79.53008287 33.63 79.12008287 33.63 L 79.12008287 33.63 Q 78.75108287 33.63 78.09508287 33.2405 Q 77.43908287 32.851 76.31158287 32.4615 Q 75.18408287 32.072 73.38008287 32.072 L 73.38008287 32.072 Q 71.90408287 32.072 70.53058287 32.5025 Q 69.15708287 32.933 68.29608287 33.958 Q 67.43508287 34.983 67.43508287 36.828 L 67.43508287 36.828 Q 67.43508287 38.468 68.19358287 39.4725 Q 68.95208287 40.477 70.16158287 41.092 Q 71.37108287 41.707 72.80608287 42.2195 Q 74.24108287 42.732 75.69658287 43.3675 Q 77.15208287 44.003 78.36158287 44.9665 Q 79.57108287 45.93 80.30908287 47.488 Q 81.04708287 49.046 81.04708287 51.506 L 81.04708287 51.506 Q 81.04708287 54.417 79.94008287 56.2825 Q 78.83308287 58.148 76.88558287 59.05 Q 74.93808287 59.952 72.39608287 59.952 Z M 87.23808287 59.665 L 87.23808287 59.665 Q 86.70508287 59.665 86.29508287 59.3985 Q 85.88508287 59.132 85.88508287 58.599 L 85.88508287 58.599 L 85.88508287 30.678 Q 85.88508287 30.268 86.19258287 30.0015 Q 86.50008287 29.735 87.03308287 29.694 L 87.03308287 29.694 L 94.57708287 29.694 Q 96.95508287 29.694 98.88208287 30.555 Q 100.80908287 31.416 101.91608287 33.3225 Q 103.02308287 35.229 103.02308287 38.386 L 103.02308287 38.386 L 103.02308287 38.796 Q 103.02308287 41.994 101.89558287 43.9005 Q 100.76808287 45.807 98.82058287 46.668 Q 96.87308287 47.529 94.49508287 47.529 L 94.49508287 47.529 L 88.59108287 47.529 L 88.59108287 58.599 Q 88.59108287 59.132 88.16058287 59.3985 Q 87.73008287 59.665 87.23808287 59.665 Z M 88.59108287 32.195 L 88.59108287 45.192 L 94.49508287 45.192 Q 97.24208287 45.192 98.77958287 43.6545 Q 100.31708287 42.117 100.31708287 38.919 L 100.31708287 38.919 L 100.31708287 38.427 Q 100.31708287 35.229 98.77958287 33.712 Q 97.24208287 32.195 94.49508287 32.195 L 94.49508287 32.195 L 88.59108287 32.195 Z M 115.15908287 59.665 L 115.15908287 59.665 Q 114.66708287 59.665 114.23658287 59.3985 Q 113.80608287 59.132 113.80608287 58.599 L 113.80608287 58.599 L 113.80608287 48.185 Q 113.80608287 47.98 113.76508287 47.857 L 113.76508287 47.857 L 105.27808287 31.58 Q 105.15508287 31.334 105.11408287 31.1495 Q 105.07308287 30.965 105.07308287 30.842 L 105.07308287 30.842 Q 105.07308287 30.473 105.29858287 30.227 Q 105.52408287 29.981 105.87258287 29.8375 Q 106.22108287 29.694 106.54908287 29.694 L 106.54908287 29.694 Q 106.87708287 29.694 107.14358287 29.899 Q 107.41008287 30.104 107.61508287 30.514 L 107.61508287 30.514 L 115.15908287 45.479 L 122.74408287 30.514 Q 122.99008287 30.104 123.25658287 29.899 Q 123.52308287 29.694 123.81008287 29.694 L 123.81008287 29.694 Q 124.17908287 29.694 124.50708287 29.8375 Q 124.83508287 29.981 125.06058287 30.227 Q 125.28608287 30.473 125.28608287 30.842 L 125.28608287 30.842 Q 125.28608287 30.965 125.24508287 31.1495 Q 125.20408287 31.334 125.12208287 31.58 L 125.12208287 31.58 L 116.59408287 47.857 Q 116.51208287 47.98 116.51208287 48.185 L 116.51208287 48.185 L 116.51208287 58.599 Q 116.51208287 59.132 116.10208287 59.3985 Q 115.69208287 59.665 115.15908287 59.665 Z M 130.49308287 59.665 L 130.49308287 59.665 Q 129.96008287 59.665 129.55008287 59.3985 Q 129.14008287 59.132 129.14008287 58.599 L 129.14008287 58.599 L 129.14008287 30.678 Q 129.14008287 30.145 129.55008287 29.9195 Q 129.96008287 29.694 130.49308287 29.694 L 130.49308287 29.694 Q 130.98508287 29.694 131.41558287 29.9195 Q 131.84608287 30.145 131.84608287 30.678 L 131.84608287 30.678 L 131.84608287 45.192 L 143.69508287 30.104 Q 143.98208287 29.694 144.55608287 29.694 L 144.55608287 29.694 Q 144.88408287 29.694 145.23258287 29.899 Q 145.58108287 30.104 145.80658287 30.4115 Q 146.03208287 30.719 146.03208287 31.088 L 146.03208287 31.088 Q 146.03208287 31.211 145.99108287 31.3955 Q 145.95008287 31.58 145.82708287 31.703 L 145.82708287 31.703 L 137.01208287 42.65 L 147.09808287 57.82 Q 147.26208287 58.066 147.26208287 58.353 L 147.26208287 58.353 Q 147.26208287 58.722 147.03658287 59.0295 Q 146.81108287 59.337 146.46258287 59.5215 Q 146.11408287 59.706 145.70408287 59.706 L 145.70408287 59.706 Q 145.41708287 59.706 145.15058287 59.5625 Q 144.88408287 59.419 144.67908287 59.132 L 144.67908287 59.132 L 135.20808287 44.905 L 131.84608287 49.169 L 131.84608287 58.599 Q 131.84608287 59.132 131.41558287 59.3985 Q 130.98508287 59.665 130.49308287 59.665 Z M 166.40908287 59.665 L 151.81308287 59.665 Q 151.36208287 59.665 150.97258287 59.3985 Q 150.58308287 59.132 150.58308287 58.599 L 150.58308287 58.599 L 150.58308287 30.719 Q 150.58308287 30.227 150.97258287 29.9605 Q 151.36208287 29.694 151.81308287 29.694 L 151.81308287 29.694 L 166.40908287 29.694 Q 166.94208287 29.694 167.18808287 30.0835 Q 167.43408287 30.473 167.43408287 30.883 L 167.43408287 30.883 Q 167.43408287 31.416 167.16758287 31.8055 Q 166.90108287 32.195 166.40908287 32.195 L 166.40908287 32.195 L 153.28908287 32.195 L 153.28908287 43.47 L 159.72608287 43.47 Q 160.21808287 43.47 160.48458287 43.839 Q 160.75108287 44.208 160.75108287 44.7 L 160.75108287 44.7 Q 160.75108287 45.069 160.50508287 45.438 Q 160.25908287 45.807 159.72608287 45.807 L 159.72608287 45.807 L 153.28908287 45.807 L 153.28908287 57.164 L 166.40908287 57.164 Q 166.90108287 57.164 167.16758287 57.533 Q 167.43408287 57.902 167.43408287 58.435 L 167.43408287 58.435 Q 167.43408287 58.886 167.18808287 59.2755 Q 166.94208287 59.665 166.40908287 59.665 L 166.40908287 59.665 Z" stroke-linecap="round" />
+</g>
+</svg>

data/test/activemodel_dirty_test.rb

@@ -6,7 +6,7 @@ module Spyke
       recipe = RecipeWithDirty.new(title: 'Cheeseburger')
 
       # If @attributes is set on recipe ActiveModel::Dirty will crash
-      assert_equal false, recipe.attribute_changed_in_place?(:title)
+      assert_equal({}, recipe.changes)
     end
   end
 end

data/test/attributes_test.rb

@@ -18,8 +18,13 @@ module Spyke
     end
 
     def test_initializing_using_unpermitted_strong_params
-      assert_raises ActionController::UnfilteredParameters do
-        Ingredient.new(strong_params(name: 'Flour'))
+      if ActiveSupport::VERSION::MAJOR < 5
+        ingredient = Ingredient.new(strong_params(name: 'Flour'))
+        assert_equal({}, ingredient.attributes)
+      else
+        assert_raises ActionController::UnfilteredParameters do
+          Ingredient.new(strong_params(name: 'Flour'))
+        end
       end
     end
 
@@ -129,7 +134,7 @@ module Spyke
     end
 
     def test_converting_files_to_faraday_io
-      Faraday::UploadIO.stubs(:new).with('/photo.jpg', 'image/jpeg').returns('UploadIO')
+      Faraday::Multipart::FilePart.stubs(:new).with('/photo.jpg', 'image/jpeg').returns('UploadIO')
       file = mock
       file.stubs(:path).returns('/photo.jpg')
       file.stubs(:content_type).returns('image/jpeg')
@@ -157,7 +162,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/custom_request_test.rb

@@ -70,7 +70,7 @@ module Spyke
 
     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
+      _primary_endpoint = stub_request(:get, 'http://sashimi.com/recipes').to_timeout
       OtherRecipe.all.to_a
       assert_requested fallback_endpoint
     end

data/test/fallbacks_test.rb

@@ -7,6 +7,12 @@ module Spyke
       stub_request(:get, "http://sushi.com/recipes?published=true").to_timeout
     end
 
+    def test_find_without_fallback
+      assert_raises ConnectionError do
+        Recipe.find(1)
+      end
+    end
+
     def test_find_with_default_fallback
       assert_raises ResourceNotFound do
         Recipe.with_fallback.find(1)

data/test/scope_registry_test.rb

@@ -0,0 +1,11 @@
+require 'test_helper'
+
+module Spyke
+  class ScopeRegistryTest < MiniTest::Test
+    def test_setting_and_fetching_values
+      ScopeRegistry.set_value_for('foo', 'bar', 1)
+
+      assert_equal 1, ScopeRegistry.value_for('foo', 'bar')
+    end
+  end
+end

data/test/support/fixtures.rb

@@ -1,18 +1,21 @@
+require 'multi_json'
+
 # Dummy api
-class JSONParser < Faraday::Response::Middleware
-  def parse(body)
-    json = MultiJson.load(body, symbolize_keys: true)
-    {
+class JSONParser < Faraday::Middleware
+  def on_complete(env)
+    json = MultiJson.load(env.body, symbolize_keys: true)
+    env.body = {
       data: json[:result],
       metadata: json[:metadata],
       errors: json[:errors]
     }
   rescue MultiJson::ParseError => exception
-    { errors: { base: [ error: exception.message ] } }
+    env.body = { errors: { base: [ error: exception.message ] } }
   end
 end
 
 Spyke::Base.connection = Faraday.new(url: 'http://sushi.com') do |faraday|
+  faraday.request   :multipart
   faraday.request   :json
   faraday.use       JSONParser
   faraday.adapter   Faraday.default_adapter

data/test/test_helper.rb

@@ -1,7 +1,10 @@
-# Coverage
-require 'coveralls'
-Coveralls.wear!
-SimpleCov.formatter = Coveralls::SimpleCov::Formatter
+require 'simplecov'
+require 'simplecov-lcov'
+SimpleCov::Formatter::LcovFormatter.config do |c|
+  c.report_with_single_file = true
+  c.single_report_path = 'coverage/lcov.info'
+end
+SimpleCov.formatter = SimpleCov::Formatter::LcovFormatter
 SimpleCov.start do
   add_filter 'test'
 end
@@ -10,7 +13,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: 6.1.1
+  version: 7.0.0
 platform: ruby
 authors:
 - Jens Balvig
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-12-16 00:00:00.000000000 Z
+date: 2022-04-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -44,40 +44,34 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.9.0
+        version: 1.0.0
     - - "<"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '3.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.9.0
+        version: 1.0.0
     - - "<"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '3.0'
 - !ruby/object:Gem::Dependency
-  name: faraday_middleware
+  name: faraday-multipart
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.9.1
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.9.1
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: addressable
   requirement: !ruby/object:Gem::Requirement
@@ -121,21 +115,21 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '1.6'
 - !ruby/object:Gem::Dependency
-  name: coveralls
+  name: minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0.7'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0.7'
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: minitest
+  name: minitest-line
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -149,7 +143,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: minitest-line
+  name: minitest-reporters
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -163,7 +157,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: minitest-reporters
+  name: mocha
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -177,7 +171,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: mocha
+  name: multi_json
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -191,7 +185,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: multi_json
+  name: pry
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -205,7 +199,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: pry
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -219,7 +213,21 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: simplecov
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: simplecov-lcov
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -249,16 +257,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
@@ -286,6 +296,7 @@ files:
 - lib/spyke/scoping.rb
 - lib/spyke/version.rb
 - spyke.gemspec
+- spyke.svg
 - test/activemodel_dirty_test.rb
 - test/associations_test.rb
 - test/attributes_test.rb
@@ -295,6 +306,7 @@ files:
 - test/fallbacks_test.rb
 - test/orm_test.rb
 - test/path_test.rb
+- test/scope_registry_test.rb
 - test/scopes_test.rb
 - test/support/fixtures.rb
 - test/support/webmock.rb
@@ -332,6 +344,7 @@ test_files:
 - test/fallbacks_test.rb
 - test/orm_test.rb
 - test/path_test.rb
+- test/scope_registry_test.rb
 - test/scopes_test.rb
 - test/support/fixtures.rb
 - test/support/webmock.rb

data/.travis.yml

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