graphiti_gql 0.2.21 → 0.2.22

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 933f1a2f88f12ad842f261023b05c8f5cc764ffbe61e7c6686ad88e2d013f8c8
-  data.tar.gz: 89f3c1c9fd1dcaa5160e1b0f9df9e81c0ff869a55d2842db365a1dfd14c942fe
+  metadata.gz: 1a79d794e346a1f884170026503f4ca36a5c82529a47dd977b34335457d4a630
+  data.tar.gz: 0ee188c2f278895a47b27c8dbe57b1117dfe352350a99bec8a908702cc782411
 SHA512:
-  metadata.gz: 2de7c71483561731e957887da213322caf2c10b9d6836660b15ecd6572c743dffc1f34de139d15ff05dae13392b28186e35b01a2ee409cbe5c22f86c4a75066e
-  data.tar.gz: 973e35034e8c7a2b01eb5301f8db86df99a1631adfadf35e6e608f95fa31aec08d89da68df8833edc460af5525a8c3e240ff70d3576fc5180ef98614e87f58d3
+  metadata.gz: d4eb9c8bb29c513cc9b8eed6e7dafffbefa1de88ab9e1dbc32d1f921b0664ee066c671d36c05eeb15614accded9ba56d4247010ea9c83bf55e0f76ae4d036b31
+  data.tar.gz: 014ee03255a4c2b26bbe178d6c60f4f071955a288dac725aa75ae84dcd6624bde251442ea3f7e7811bae4ec9b7f463f024cdcc5c3c4f6f90ec8575e7eb071999

data/Gemfile.lock

@@ -1,7 +1,8 @@
 PATH
   remote: .
   specs:
-    graphiti_gql (0.2.18)
+    graphiti_gql (0.2.21)
+      activemodel (> 6.0, < 8.0)
       graphiti (~> 1.3.9)
       graphql (~> 2.0)
       graphql-batch (~> 0.5)
@@ -82,7 +83,6 @@ PLATFORMS
   arm64-darwin-21
 
 DEPENDENCIES
-  activemodel (~> 7.0)
   bundler (~> 2.3)
   graphiti_gql!
   pry

data/graphiti_gql.gemspec

@@ -38,9 +38,9 @@ Gem::Specification.new do |spec|
   spec.add_dependency "graphql", "~> 2.0"
   spec.add_dependency "graphql-batch", "~> 0.5"
   spec.add_dependency "graphiti", "~> 1.3.9"
+  spec.add_dependency "activemodel", ["> 6.0", "< 8.0"]
 
   spec.add_development_dependency "bundler", "~> 2.3"
   spec.add_development_dependency "rake", "~> 10.0"
   spec.add_development_dependency "rspec", "~> 3.0"
-  spec.add_development_dependency "activemodel", "~> 7.0"
 end

data/lib/graphiti_gql/graphiti_hax.rb

@@ -16,7 +16,10 @@ module GraphitiGql
   module ResourceExtras
     extend ActiveSupport::Concern
 
-    included do
+    prepended do
+      extend ActiveModel::Callbacks
+      define_model_callbacks :query
+
       class << self
         attr_accessor :graphql_name, :singular
       end
@@ -57,7 +60,14 @@ module GraphitiGql
       @selections
     end
 
+    def around_scoping(original_scope, query_hash)
+      run_callbacks :query do
+        super { |scope| yield scope }
+      end
+    end
+
     class_methods do
+
       def attribute(*args)
         super(*args).tap do
           opts = args.extract_options!
@@ -85,7 +95,7 @@ module GraphitiGql
       end
     end
   end
-  Graphiti::Resource.send(:include, ResourceExtras)
+  Graphiti::Resource.send(:prepend, ResourceExtras)
 
   module FilterExtras
     def filter_param

data/lib/graphiti_gql/version.rb

@@ -1,3 +1,3 @@
 module GraphitiGql
-  VERSION = "0.2.21"
+  VERSION = "0.2.22"
 end

data/lib/graphiti_gql.rb

@@ -1,6 +1,7 @@
 require "active_support/core_ext/object/json"
 require "graphql"
 require 'graphql/batch'
+require 'active_model'
 require "graphiti_gql/graphiti_hax"
 require "graphiti_gql/version"
 require "graphiti_gql/errors"

metadata

@@ -1,11 +1,11 @@
 --- !ruby/object:Gem::Specification
 name: graphiti_gql
 version: !ruby/object:Gem::Version
-  version: 0.2.21
+  version: 0.2.22
 platform: ruby
 authors:
 - Lee Richmond
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
 date: 2022-08-09 00:00:00.000000000 Z
@@ -52,6 +52,26 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 1.3.9
+- !ruby/object:Gem::Dependency
+  name: activemodel
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">"
+      - !ruby/object:Gem::Version
+        version: '6.0'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '8.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">"
+      - !ruby/object:Gem::Version
+        version: '6.0'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '8.0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -94,21 +114,7 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.0'
-- !ruby/object:Gem::Dependency
-  name: activemodel
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '7.0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '7.0'
-description: 
+description:
 email:
 - richmolj@gmail.com
 executables: []
@@ -169,7 +175,7 @@ licenses:
 - MIT
 metadata:
   homepage_uri: https://www.graphiti.dev
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -184,8 +190,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3.1
-signing_key: 
+rubygems_version: 3.3.7
+signing_key:
 specification_version: 4
 summary: GraphQL support for Graphiti
 test_files: []