simple_jsonapi_client 0.2.2 → 0.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: d1f5f8cbf5a1f22d67d52b72720a21e54df1beb2
-  data.tar.gz: b5a0a5beda4a430c7573a0286e548c974c66c265
+SHA256:
+  metadata.gz: 77440c85cfcb332cb551cc83519593535a11311e2407b3b0bccaa73f685b8054
+  data.tar.gz: dd8c4bfc2423d80ecf755437ea3f5d1fd03f5df6351b4795f5b26a591b2cea5f
 SHA512:
-  metadata.gz: f386decd929a9237e22abe4d18487595f0512402e60a12c159f87c97cf7b37d671ba0aeaa59a0fed37434ba1239cc6ff6b78048841f62568fbec36c122546d79
-  data.tar.gz: fc8a72c564192f6ef4ea316d8b8400ee3ecd1ef307cdb2a9a8900ac35e8d117ee5d3814786d0bc06bcd23f19b8c6a759d53ca173b5563585ef67aa67352961e5
+  metadata.gz: ca09436cd3d0b17591aa1b1538fd5052c8e525157a785bb2c000fa5e6d2cc59d5f35d325170352a5529e189d87be4239740ab5c2864375a081ceab5e2433b840
+  data.tar.gz: f15be7fd5273d834e47a86234c6f57df916df49de79c90f15e8c6b29d3686d2539c1540bdaecf2aa6c497972a66a7f621403fa758bd947ae85782c4bc5f84885

data/.travis.yml

@@ -4,5 +4,6 @@ services:
   - docker
 before_install:
   - bin/setup
+  - gem update bundler
 script:
   - rake

data/Dockerfile

@@ -1,6 +1,7 @@
 FROM ruby:2.4.0
 RUN apt-get update -qq
 RUN gem update bundler
+ENV BUNDLER_VERSION=2.0.2
 RUN mkdir /simple_jsonapi_client
 WORKDIR /simple_jsonapi_client
 ADD . .

data/lib/simple_jsonapi_client/base.rb

@@ -1,5 +1,4 @@
-require 'active_support/core_ext/hash/keys'
-require 'active_support/core_ext/hash/transform_values'
+require 'simple_jsonapi_client/utils'
 require 'simple_jsonapi_client/error'
 require 'simple_jsonapi_client/relationships/relationship'
 require 'simple_jsonapi_client/redirection/fetch_all'
@@ -208,12 +207,22 @@ module SimpleJSONAPIClient
       def interpret_empty_response(response, connection)
       end
 
-      def interpreted_relationships(relationships)
-        relationships.transform_values { |value|
-          if (relationship = relationship_from(value))
-            { data: relationship }
-          end
-        }
+      if {}.respond_to?(:transform_values)
+        def interpreted_relationships(relationships)
+          relationships.transform_values { |value|
+            if (relationship = relationship_from(value))
+              { data: relationship }
+            end
+          }
+        end
+      else
+        def interpreted_relationships(relationships)
+          Utils.transform_values(relationships) { |value|
+            if (relationship = relationship_from(value))
+              { data: relationship }
+            end
+          }
+        end
       end
 
       def relationship_from(value)
@@ -238,12 +247,12 @@ module SimpleJSONAPIClient
     attr_reader :id, :context
 
     def initialize(meta: nil, id:, attributes: nil, relationships: nil, included: {}, connection:, context: nil)
-      @meta = meta.symbolize_keys if meta
+      @meta = Utils.symbolize_keys(meta) if meta
       @id = id
       @included = included
       @connection = connection
       @context = context
-      @attributes = attributes.symbolize_keys if attributes
+      @attributes = Utils.symbolize_keys(attributes) if attributes
       @input_relationships = relationships
     end
 
@@ -267,7 +276,7 @@ module SimpleJSONAPIClient
       @relationships ||=
         begin
           if input_relationships
-            relationships_to_models(input_relationships.symbolize_keys)
+            relationships_to_models(Utils.symbolize_keys(input_relationships))
           else
             loaded_record.relationships
           end

data/lib/simple_jsonapi_client/errors/api_error.rb

@@ -1,4 +1,5 @@
 require 'delegate'
+require 'forwardable'
 
 module SimpleJSONAPIClient
   module Errors

data/lib/simple_jsonapi_client/redirection/fetch_all.rb

@@ -30,7 +30,7 @@ module SimpleJSONAPIClient
             current_response['data'].each do |record|
               yielder << record
             end
-            break unless (next_link = current_response.dig('links', 'next'))
+            break unless (next_link = Utils.hash_dig(current_response, 'links', 'next'))
             current_opts.merge!(url_opts: {}, url: next_link)
             current_opts.delete(:page_opts)
           end

data/lib/simple_jsonapi_client/utils.rb

@@ -0,0 +1,47 @@
+module SimpleJSONAPIClient
+  module Utils
+    class <<  self
+      # Implementation adapted from ActiveSupport
+      # Copyright (c) 2005-2019 David Heinemeier Hansson
+      # https://github.com/rails/rails/blob/b9ca94caea2ca6a6cc09abaffaad67b447134079/activesupport/lib/active_support/core_ext/hash/keys.rb
+      def symbolize_keys(hash)
+        result = {}
+        hash.each_key do |key|
+          result[(key.to_sym rescue key)] = hash[key]
+        end
+        result
+      end
+
+      def hash_dig(hash, *keys)
+        if hash.respond_to?(:dig)
+          hash.dig(*keys)
+        else
+          dig(hash, keys)
+        end
+      end
+
+      private
+
+      # Implementation adapted from the hash_dig gem, Copyright (c) 2015 Colin Kelley, MIT License
+      # https://github.com/Invoca/ruby_dig/blob/19fa8c1d2cc7706d015a3004f028169a2ff83391/lib/ruby_dig.rb
+      def dig(hash, key, *rest)
+        value = hash[key]
+        if value.nil? || rest.empty?
+          value
+        elsif value.is_a?(Hash) || value.is_a?(Array)
+          dig(value, *rest)
+        else
+          fail TypeError, "#{value.class} does not work with #dig" # should not happen with our use of #dig
+        end
+      end
+
+      def transform_values(hash)
+        result = {}
+        hash.each do |key, value|
+          result[key] = yield(value)
+        end
+        result
+      end
+    end
+  end
+end

data/lib/simple_jsonapi_client/version.rb

@@ -1,3 +1,3 @@
 module SimpleJSONAPIClient
-  VERSION = "0.2.2"
+  VERSION = "0.2.4"
 end

data/simple_jsonapi_client.gemspec

@@ -22,9 +22,8 @@ Gem::Specification.new do |spec|
 
   spec.add_dependency "faraday", "~> 0.12"
   spec.add_dependency "faraday_middleware", "~> 0.11"
-  spec.add_dependency "activesupport", ">= 3.1.12", "< 6"
 
-  spec.add_development_dependency "bundler", "~> 1.15"
+  spec.add_development_dependency "bundler", "~> 2.0.2"
   spec.add_development_dependency "rake", "~> 10.0"
   spec.add_development_dependency "rspec", "~> 3.0"
   spec.add_development_dependency "pry", "~> 0"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: simple_jsonapi_client
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.2.4
 platform: ruby
 authors:
 - Ariel Caplan
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-08-13 00:00:00.000000000 Z
+date: 2019-10-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
@@ -38,40 +38,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.11'
-- !ruby/object:Gem::Dependency
-  name: activesupport
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 3.1.12
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '6'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 3.1.12
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '6'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.15'
+        version: 2.0.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.15'
+        version: 2.0.2
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -151,6 +131,7 @@ files:
 - lib/simple_jsonapi_client/relationships/relationship.rb
 - lib/simple_jsonapi_client/relationships/singular_data_relationship.rb
 - lib/simple_jsonapi_client/relationships/singular_link_relationship.rb
+- lib/simple_jsonapi_client/utils.rb
 - lib/simple_jsonapi_client/version.rb
 - simple_jsonapi_client.gemspec
 homepage: https://github.com/amcaplan/simple_jsonapi_client
@@ -173,7 +154,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.7.8
 signing_key: 
 specification_version: 4
 summary: Framework for writing clients for JSONAPI APIs in Ruby.