flexirest 1.13.1 → 1.13.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 152b5d789cff3ee4ccd09c6090d4f5bee5b431a96fb34797d5d189882585c235
-  data.tar.gz: 91c220948c05caec4b7f625d618c1b3e180272013a8dee3157bd66cbaf039bbb
+  metadata.gz: d8b2caeda24cf6df9d105be2899483c18887dfa8903e54e0142d05f4be406ba4
+  data.tar.gz: 4072891a3796efbfa0323977dc922c57acbf77cce41f94ed50f95a63911dc70e
 SHA512:
-  metadata.gz: 7440c4c8b5122e296360ece864f8ffd9ba59ae83429badd94c587ce700ecab20e823b3cff166c2623ecde5a5f5697737caf1684ac3237f5b20a63213d2dc42e0
-  data.tar.gz: e54a1e79e49dca9a29ed9c6d04ee43ea7a0da4943b6b873ff30d9df8377605d418a84ad391cccaad60d65102f9d43936b191bb2a5f6c4f8889ca011381e7a529
+  metadata.gz: f07a2703870fbcd9c4d7b1862ccd95b8cf38a6e67c0caeca51706361b1bd871c4b49698fb69719747890e18adf22f1b809d8c3cf8e13d977758f88780d23db24
+  data.tar.gz: 3d4051535dda8ecac777686b506008cdb104aa832cd1fa4ac668ae01c1d129d53f92ac863ca69e3abebc3da55f6275a19ab259d3bdabf2bf477f9bf4059f73c4

data/CHANGELOG.md

@@ -1,5 +1,11 @@
 # Changelog
 
+## 1.13.2
+
+Bugfix:
+
+- multi_json 1.21 renamed its module to `MultiJSON` and replaced `load`/`dump` with `parse`/`generate`, deprecating the old names with one-time warnings that appeared in host applications' test output. Flexirest now calls the current API (and `symbolize_names` rather than the deprecated `symbolize_keys`), so it requires multi_json >= 1.21
+
 ## 1.13.1
 
 Bugfix:

data/flexirest.gemspec

@@ -42,7 +42,7 @@ Gem::Specification.new do |spec|
   # rather than assume the host application provides it.
   spec.add_runtime_dependency "ostruct"
   spec.add_runtime_dependency "mime-types"
-  spec.add_runtime_dependency "multi_json"
+  spec.add_runtime_dependency "multi_json", ">= 1.21"
   spec.add_runtime_dependency "crack"
   spec.add_runtime_dependency "faraday", "~> 2.7"
 

data/lib/flexirest/lazy_association_loader.rb

@@ -87,7 +87,7 @@ module Flexirest
 
     def ensure_lazy_loaded
       if @object.nil?
-        method = MultiJson.load(MultiJson.dump(@request.method),:symbolize_keys => true)
+        method = MultiJSON.parse(MultiJSON.generate(@request.method), symbolize_names: true)
         method[:method] = :get
         method[:options][:url] = @url
         method[:options][:overridden_name] = @options[:overridden_name]

data/lib/flexirest/proxy_base.rb

@@ -99,7 +99,7 @@ module Flexirest
           if incoming_content_type && incoming_content_type["xml"]
             result.body = yield Crack::XML.parse(result.body)
           else
-            result.body = yield MultiJson.load(result.body)
+            result.body = yield MultiJSON.parse(result.body)
           end
         end
         result

data/lib/flexirest/request.rb

@@ -872,9 +872,9 @@ module Flexirest
         body = @response.body
       elsif is_json_response?
         begin
-          body = @response.body.blank? ? {} : MultiJson.load(@response.body)
+          body = @response.body.blank? ? {} : MultiJSON.parse(@response.body)
           body = {} if body.nil?
-        rescue MultiJson::ParseError
+        rescue MultiJSON::ParseError
           raise ResponseParseException.new(status:@response.status, body:@response.body, headers:@response.headers)
         end
 

data/lib/flexirest/version.rb

@@ -1,3 +1,3 @@
 module Flexirest
-  VERSION = "1.13.1"
+  VERSION = "1.13.2"
 end

data/spec/lib/base_without_validation_spec.rb

@@ -520,11 +520,11 @@ describe Flexirest::BaseWithoutValidation do
     let(:location) { EmptyExample.new(place:"Room 1408") }
     let(:lazy) { Laz }
     let(:object) { EmptyExample.new(name:"Programming 101", location:location, students:[student1, student2]) }
-    let(:json_parsed_object) { MultiJson.load(object.to_json) }
+    let(:json_parsed_object) { MultiJSON.parse(object.to_json) }
 
     it "should be able to export to valid json" do
       expect(object.to_json).to_not be_blank
-      expect{MultiJson.load(object.to_json)}.to_not raise_error
+      expect{MultiJSON.parse(object.to_json)}.to_not raise_error
     end
 
     it "should not be using Object's #to_json method" do

data/spec/lib/json_api_spec.rb

@@ -479,7 +479,7 @@ describe 'JSON API' do
 
     it 'should be able to call #.create on class' do
       expect_any_instance_of(Flexirest::Connection).to receive(:post) { |_, path, data|
-        hash = MultiJson.load(data)
+        hash = MultiJSON.parse(data)
         expect(path).to eq('/articles')
         expect(hash['data']).to_not be_nil
         expect(hash['data']['id']).to be_nil
@@ -490,7 +490,7 @@ describe 'JSON API' do
 
     it 'should be able to call #.create with params on class' do
       expect_any_instance_of(Flexirest::Connection).to receive(:post) { |_, path, data|
-        hash = MultiJson.load(data)
+        hash = MultiJSON.parse(data)
         expect(path).to eq('/articles')
         expect(hash['data']).to_not be_nil
         expect(hash['data']['id']).to be_nil
@@ -505,7 +505,7 @@ describe 'JSON API' do
 
     it 'should perform a post request in proper json api format' do
       expect_any_instance_of(Flexirest::Connection).to receive(:post) { |_, path, data|
-        hash = MultiJson.load(data)
+        hash = MultiJSON.parse(data)
         expect(path).to eq('/articles')
         expect(hash['data']).to_not be_nil
         expect(hash['data']['id']).to be_nil
@@ -533,7 +533,7 @@ describe 'JSON API' do
 
     it 'should perform a patch request in proper json api format' do
       expect_any_instance_of(Flexirest::Connection).to receive(:patch) { |_, path, data|
-        hash = MultiJson.load(data)
+        hash = MultiJSON.parse(data)
         expect(path).to eq('/articles/1')
         expect(hash['data']).to_not be_nil
         expect(hash['data']['id']).to_not be_nil
@@ -554,7 +554,7 @@ describe 'JSON API' do
 
     it 'should have placed the right type value in the request' do
       expect_any_instance_of(Flexirest::Connection).to receive(:patch) { |_, _, data|
-        hash = MultiJson.load(data)
+        hash = MultiJSON.parse(data)
         expect(hash['data']['type']).to eq(JsonAPIExample::ArticleAlias.alias_type.to_s)
         expect(hash['data']['relationships']['author']['data']['type']).to eq(JsonAPIExample::AuthorAlias.alias_type.to_s)
       }.and_return(::FaradayResponseMock.new(OpenStruct.new(body: '{}', response_headers: {})))

data/spec/lib/multi_json_api_spec.rb

@@ -0,0 +1,58 @@
+require 'spec_helper'
+
+describe "multi_json API" do
+  before :each do
+    class MultiJsonChildExample < Flexirest::Base
+      base_url "http://www.example.com"
+
+      get :find, "/child/:id"
+    end
+
+    class MultiJsonExampleClient < Flexirest::Base
+      base_url "http://www.example.com"
+
+      get :find, "/find/:id"
+      get :parent, "/parent", lazy: { children: MultiJsonChildExample }, fake: "{\"children\": [\"http://www.example.com/child/1\"]}"
+    end
+  end
+
+  # multi_json warns once per process for each deprecated entry point, so a
+  # warning emitted by an earlier spec would make a later one look clean.
+  # Message expectations on the deprecated surface - the legacy MultiJson module
+  # (whose const_missing serves MultiJson::ParseError) and the load/dump aliases
+  # on MultiJSON itself - hold regardless of spec order.
+  def expect_no_deprecated_json_api
+    [MultiJson, MultiJSON].each do |target|
+      %i[load dump decode encode const_missing].each do |name|
+        expect(target).to_not receive(name) if target.respond_to?(name)
+      end
+    end
+  end
+
+  def response_for(body)
+    ::FaradayResponseMock.new(OpenStruct.new(status: 200, response_headers: { "Content-Type" => "application/json" }, body: body))
+  end
+
+  it "parses a response body" do
+    expect_any_instance_of(Flexirest::Connection).to receive(:get).with(any_args).and_return(response_for("{\"name\":\"Billy\"}"))
+    expect_no_deprecated_json_api
+
+    expect(MultiJsonExampleClient.find(id: 1).name).to eq("Billy")
+  end
+
+  it "reports a body it cannot parse" do
+    expect_any_instance_of(Flexirest::Connection).to receive(:get).with(any_args).and_return(response_for("{\"name\": Billy"))
+    expect_no_deprecated_json_api
+
+    expect { MultiJsonExampleClient.find(id: 1) }.to raise_error(Flexirest::ResponseParseException)
+  end
+
+  it "loads a lazy association" do
+    loader = MultiJsonExampleClient.parent.children.first
+    expect(loader).to be_an_instance_of(Flexirest::LazyAssociationLoader)
+    expect_any_instance_of(Flexirest::Connection).to receive(:get).with(any_args).and_return(response_for("{\"name\":\"Jane\"}"))
+    expect_no_deprecated_json_api
+
+    expect(loader.name).to eq("Jane")
+  end
+end

data/spec/lib/request_spec.rb

@@ -206,7 +206,7 @@ describe Flexirest::Request do
     class CallbackBodyExampleClient < ExampleClient
       base_url "http://www.example.com"
       before_request do |name, request|
-        request.body = MultiJson.dump(request.post_params)
+        request.body = MultiJSON.generate(request.post_params)
       end
 
       post :save, "/save"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: flexirest
 version: !ruby/object:Gem::Version
-  version: 1.13.1
+  version: 1.13.2
 platform: ruby
 authors:
 - Andy Jeffries
@@ -225,14 +225,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.21'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.21'
 - !ruby/object:Gem::Dependency
   name: crack
   requirement: !ruby/object:Gem::Requirement
@@ -390,6 +390,7 @@ files:
 - spec/lib/lazy_loader_spec.rb
 - spec/lib/logger_spec.rb
 - spec/lib/mapping_spec.rb
+- spec/lib/multi_json_api_spec.rb
 - spec/lib/plain_response_spec.rb
 - spec/lib/proxy_spec.rb
 - spec/lib/recording_spec.rb
@@ -444,6 +445,7 @@ test_files:
 - spec/lib/lazy_loader_spec.rb
 - spec/lib/logger_spec.rb
 - spec/lib/mapping_spec.rb
+- spec/lib/multi_json_api_spec.rb
 - spec/lib/plain_response_spec.rb
 - spec/lib/proxy_spec.rb
 - spec/lib/recording_spec.rb