Merge pull request #181 from sparkapi/addressable

Name addressable gem as runtime dep

Author: bhornseth

.github/workflows/ci.yml

@@ -9,7 +9,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        ruby: [ '2.5', '2.6', '2.7', '3.0', '3.1' ]
+        ruby: [ '2.7', '3.0', '3.1' ]
 
     steps:
       - name: repo checkout

.ruby-version

@@ -1 +1 @@
-2.5.7
+2.7.2

CHANGELOG

@@ -1,8 +1,17 @@
+v1.6.1
+ - forward port of v1.5.7
+ - add addressable as a named runtime dependency (fixes regression from
+   v1.5.2)
+
 v1.6.0
  - Adding support for Ruby 3.1
  - Add support for psych 4.0 yaml loading
  - Lock Faraday down to < 2.0
 
+v1.5.7
+ - add addressable as a named runtime dependency (fixes regression from
+   v1.5.2)
+
 v1.5.6
  - Modify usage of HighLine so that it does not pollute the global namespace
 

VERSION

@@ -1 +1 @@
-1.6.0
+1.6.1

script/bootstrap

@@ -2,6 +2,7 @@
 
 ruby -v
 echo "==> Installing gems..."
-bundle check --path vendor/bundle 2>&1 > /dev/null || {
-  bundle install  --quiet --path vendor/bundle
+bundle config set path 'vendor/bundle'
+bundle check 2>&1 > /dev/null || {
+  bundle install
 }

spark_api.gemspec

@@ -30,6 +30,7 @@ Gem::Specification.new do |s|
   s.executables        = ["spark_api"]
   s.require_paths      = ["lib"]
 
+  s.add_dependency 'addressable'
   s.add_dependency 'faraday', '>= 0.17.3', '< 2.0'
   s.add_dependency 'multi_json', '~> 1.0'
   s.add_dependency 'json', '>= 1.7'

spec/unit/spark_api/models/defaultable_spec.rb

@@ -44,8 +44,9 @@ class TestClass < Base
     end
 
     it "passes options to 'default'" do
-      expect(TestClass).to receive(:default).with(foo: true)
-      TestClass.find(TestClass::DEFAULT_ID, foo: true)
+      args = { foo: true }
+      expect(TestClass).to receive(:default).with(args)
+      TestClass.find(TestClass::DEFAULT_ID, args)
     end
 
     it "calls Finders.find when given a normal id" do