graphiti 1.7.0 → 1.7.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 48e9df9f78bfe2d9b9303f304541894222fa4eb3d925f2ac68a01e3b0567fbb4
-  data.tar.gz: d8d010bca5894bc11cc0bfb76f9d88deaf6d95d7b413d937765b58d87fefe1cc
+  metadata.gz: 0ef6f59bab6be83f8be9f2dd2f2350d49abac04ad0ca7338bb1d52aa88cec27d
+  data.tar.gz: 2c904533a08f64faa13b5aed12467da757c87ed842ba8680ecf86052ddd37e86
 SHA512:
-  metadata.gz: 56ec9608ea8de6b8a8be491e27a8dc0ef83b297a3178e617495d8a63098d8df2d408b944e4f314eacd98e8e87e278e01fa287b68e07961228086ffb21259d509
-  data.tar.gz: f2077122a2b0a4996a0326f21fcae529724dd6438303f42822eb73605b58801c1c8466d012d8f3edf5899cb82ed234373fcc989f4630b012d7e045c32e40894d
+  metadata.gz: f30b06bb304bef743ce7926df28187f8772b5c803e8407c7cacaa810cff9ac9880046efa8c73f3d2e911a9088f04ca613fd32e7a1e1c3f41ae755b68cc25a4f3
+  data.tar.gz: 13b6980e5be70675eabed5cf9d799a02281072abf93e35cc8a0266d58adf1d029d7e114394ba973a1e5531ab66d7f091ecaa97005dd001cb320ca1e3961d9146

data/CHANGELOG.md

@@ -1,5 +1,20 @@
 graphiti changelog
 
+## [1.7.2](https://github.com/graphiti-api/graphiti/compare/v1.7.1...v1.7.2) (2024-06-11)
+
+
+### Bug Fixes
+
+* require necessary ActiveSupport parts in proper order ([bb2a488](https://github.com/graphiti-api/graphiti/commit/bb2a48874a6533522df6eb027d0df8ec14c80a20))
+
+## [1.7.1](https://github.com/graphiti-api/graphiti/compare/v1.7.0...v1.7.1) (2024-04-18)
+
+
+### Bug Fixes
+
+* properly display .find vs .all in debugger statements ([d2a7a03](https://github.com/graphiti-api/graphiti/commit/d2a7a038a649818979d52ccd898e68dba78b051f))
+* rescue error from sideloads updated_at calculation, defaulting to the current time ([661e3b5](https://github.com/graphiti-api/graphiti/commit/661e3b5212e2649870a200067d0d5d52fa962637))
+
 # [1.7.0](https://github.com/graphiti-api/graphiti/compare/v1.6.4...v1.7.0) (2024-03-27)
 
 

data/README.md

@@ -1,6 +1,7 @@
-![Build Status](https://travis-ci.org/graphiti-api/graphiti.svg?branch=master)
+[![CI](https://github.com/graphiti-api/graphiti/actions/workflows/ci.yml/badge.svg)](https://github.com/graphiti-api/graphiti/actions/workflows/ci.yml)
 [![Gem Version](https://badge.fury.io/rb/graphiti.svg)](https://badge.fury.io/rb/graphiti)
 [![Ruby Style Guide](https://img.shields.io/badge/code_style-standard-brightgreen.svg)](https://github.com/testdouble/standard)
+[![semantic-release: angular](https://img.shields.io/badge/semantic--release-angular-e10079?logo=semantic-release)](https://github.com/semantic-release/semantic-release)
 
 <p align="center">
   <a href="https://www.graphiti.dev/guides">

data/lib/graphiti/debugger.rb

@@ -36,7 +36,7 @@ module Graphiti
               json[:sideload] = sideload.name
             end
             if params
-              query = "#{payload[:resource].class.name}.all(#{JSON.pretty_generate(params)}).data"
+              query = "#{payload[:resource].class.name}.#{payload[:action]}(#{JSON.pretty_generate(params)}).data"
               logs << [query, :cyan, true]
               logs << ["The error occurred when running the above query. Copy/paste it into a rake task or Rails console session to reproduce. Keep in mind you may have to set context.", :yellow, true]
             else
@@ -64,7 +64,7 @@ module Graphiti
           query = if sideload.class.scope_proc
             "#{payload[:resource].class.name}: Manual sideload via .scope"
           else
-            "#{payload[:resource].class.name}.all(#{params.inspect})"
+            "#{payload[:resource].class.name}.#{payload[:action]}(#{params.inspect})"
           end
           logs << ["    #{query}", :cyan, true]
           json[:query] = query
@@ -82,7 +82,7 @@ module Graphiti
           title = "Top Level Data Retrieval (+ sideloads):"
           logs << [title, :green, true]
           json[:title] = title
-          query = "#{payload[:resource].class.name}.all(#{params.inspect})"
+          query = "#{payload[:resource].class.name}.#{payload[:action]}(#{params.inspect})"
           logs << [query, :cyan, true]
           json[:query] = query
           logs << ["Returned Models: #{results}"] if debug_models

data/lib/graphiti/scope.rb

@@ -92,16 +92,17 @@ module Graphiti
     end
 
     def updated_at
-      updated_ats = sideload_resource_proxies.map(&:updated_at)
-
+      updated_time = nil
       begin
+        updated_ats = sideload_resource_proxies.map(&:updated_at)
         updated_ats << @object.maximum(:updated_at)
+        updated_time = updated_ats.compact.max
       rescue => e
-        Graphiti.log("error calculating last_modified_at for #{@resource.class}")
+        Graphiti.log(["error calculating last_modified_at for #{@resource.class}", :red])
         Graphiti.log(e)
       end
 
-      updated_ats.compact.max
+      updated_time || Time.now
     end
     alias_method :last_modified_at, :updated_at
 
@@ -128,9 +129,10 @@ module Graphiti
     def broadcast_data
       opts = {
         resource: @resource,
-        params: @opts[:params],
+        params: @opts[:params] || @query.params,
         sideload: @opts[:sideload],
-        parent: @opts[:parent]
+        parent: @opts[:parent],
+        action: @query.action
         # Set once data is resolved within block
         #   results: ...
       }

data/lib/graphiti/util/cache_debug.rb

@@ -12,7 +12,7 @@ module Graphiti
       end
 
       def name
-        "#{Graphiti.context[:object].request.method} #{Graphiti.context[:object].request.url}"
+        "#{Graphiti.context[:object]&.request&.method} #{Graphiti.context[:object]&.request&.url}"
       end
 
       def key

data/lib/graphiti/version.rb

@@ -1,3 +1,3 @@
 module Graphiti
-  VERSION = "1.7.0"
+  VERSION = "1.7.2"
 end

data/lib/graphiti.rb

@@ -1,13 +1,16 @@
 require "json"
 require "forwardable"
 require "uri"
+
+require "active_support/version"
+require "active_support/deprecation"
+require "active_support/deprecator" if ::ActiveSupport.version >= Gem::Version.new("7.1")
 require "active_support/core_ext/string"
 require "active_support/core_ext/enumerable"
 require "active_support/core_ext/class/attribute"
 require "active_support/core_ext/hash/conversions" # to_xml
 require "active_support/concern"
 require "active_support/time"
-require "active_support/deprecation"
 
 require "dry-types"
 require "graphiti_errors"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: graphiti
 version: !ruby/object:Gem::Version
-  version: 1.7.0
+  version: 1.7.2
 platform: ruby
 authors:
 - Lee Richmond
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2024-03-27 00:00:00.000000000 Z
+date: 2024-06-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jsonapi-serializable
@@ -361,7 +361,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.26
+rubygems_version: 3.3.27
 signing_key: 
 specification_version: 4
 summary: Easily build jsonapi.org-compatible APIs