graphiti_gql 0.2.20 → 0.2.23

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 17c54a15f86e3855f814dcea6a7093ceb0b0252de6685c57017a19f3c83160db
-  data.tar.gz: e0f018dbe747eaa43401f3f02ef77a526e3f5f2a0dad8964dd138bc083a38ad6
+  metadata.gz: c5dfc016180ec5fd536f236be63b24cad42471a74d44ab234dee1966f2de942e
+  data.tar.gz: f97bbe243fa4a205004abdbd522942005b09e87fa37ba1db465000b383e355d0
 SHA512:
-  metadata.gz: b863f5de471a4991d28f35c544567cf7420b78852c202c527b79399deb7e67f7c03e4f539cd628e9827354670e259ba44a8762191aaa88a97e3c474d753ff0de
-  data.tar.gz: e857d78632c3055263d4ae6287ab30836752c28cdd41836f411a82f4b64119b1420a79447c5a042c2829d24b57eec040d14a1eb9d2705aacc70935612ce5d5f8
+  metadata.gz: '08c76642c2b6be4401a6efcce4c9070c52eee1661c333bcefc30a328826a0558aa6ed013028cb4d173bb2b47565aeeda18c2648a946d6ebe1dbcde2147325ced'
+  data.tar.gz: d16a38a32815b6df020817bb5797ac26ce6507a443375955aad3c2c1fe8fe29192dbf0f01a854d6d565946daae1fe9a713c67df050bbc230c320c282a35e339f

data/Gemfile.lock

@@ -1,7 +1,8 @@
 PATH
   remote: .
   specs:
-    graphiti_gql (0.2.18)
+    graphiti_gql (0.2.23)
+      activemodel (> 6.0, < 8.0)
       graphiti (~> 1.3.9)
       graphql (~> 2.0)
       graphql-batch (~> 0.5)
@@ -47,13 +48,13 @@ GEM
     graphql-batch (0.5.1)
       graphql (>= 1.10, < 3)
       promise.rb (~> 0.7.2)
-    i18n (1.10.0)
+    i18n (1.12.0)
       concurrent-ruby (~> 1.0)
     jsonapi-renderer (0.2.2)
     jsonapi-serializable (0.3.1)
       jsonapi-renderer (~> 0.2.0)
     method_source (1.0.0)
-    minitest (5.15.0)
+    minitest (5.16.2)
     promise.rb (0.7.4)
     pry (0.13.1)
       coderay (~> 1.1)
@@ -75,14 +76,13 @@ GEM
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.11.0)
     rspec-support (3.11.0)
-    tzinfo (2.0.4)
+    tzinfo (2.0.5)
       concurrent-ruby (~> 1.0)
 
 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/active_resource.rb

@@ -74,6 +74,7 @@ module GraphitiGql
 
       def node(id = nil)
         if @resource.singular
+          data # fire query
           Node.new(underscore(data[data.keys.first]), @resource)
         else
           nodes.find { |n| n.id == id.to_s }

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
@@ -186,26 +196,14 @@ module GraphitiGql
   module ManyToManyExtras
     def self.prepended(klass)
       klass.class_eval do
-        attr_reader :join_table_alias, :edge_magic
-
-        class << self
-          attr_reader :edge_resource
-
-          def attribute(*args, &blk)
-            @edge_resource ||= Class.new(Graphiti::Resource) do
-              def self.abstract_class?
-                true
-              end
-            end
-            @edge_resource.attribute(*args, &blk)
-          end
-        end
+        attr_reader :join_table_alias, :edge_magic, :edge_resource
       end
     end
     
     def initialize(name, opts = {})
       @join_table_alias = opts[:join_table_alias]
       @edge_magic = opts[:edge_magic] == false ? false : true
+      @edge_resource = opts[:edge_resource]
       super
     end
 
@@ -269,7 +267,7 @@ module GraphitiGql
   module ActiveRecordAdapterExtras
     extend ActiveSupport::Concern
 
-    included do
+    prepended do
       alias_method :filter_precise_datetime_lt, :filter_lt
       alias_method :filter_precise_datetime_lte, :filter_lte
       alias_method :filter_precise_datetime_gt, :filter_gt
@@ -277,16 +275,59 @@ module GraphitiGql
       alias_method :filter_precise_datetime_eq, :filter_eq
       alias_method :filter_precise_datetime_not_eq, :filter_not_eq
     end
+
+    # TODO: integration specs mysql vs postgres for case sensitivity
+    def mysql?(scope)
+      mysql = ActiveRecord::ConnectionAdapters::Mysql2Adapter
+      scope.model.connection.is_a?(mysql)
+    end
+
+    def filter_string_eq(scope, attribute, value, is_not: false)
+      if mysql?(scope)
+        clause = { attribute => value }
+        is_not ? scope.where.not(clause) : scope.where(clause)
+      else
+        # og behavior
+        column = column_for(scope, attribute)
+        clause = column.lower.eq_any(value.map(&:downcase))
+      end
+    end
+
+    def filter_string_eql(scope, attribute, value, is_not: false)
+      if mysql?(scope)
+        value = "BINARY #{value}"
+      end
+      # og behavior
+      clause = {attribute => value}
+      is_not ? scope.where.not(clause) : scope.where(clause)
+    end
+ 
+    def sanitized_like_for(scope, attribute, value, &block)
+      escape_char = "\\"
+      column = column_for(scope, attribute)
+      map = value.map { |v|
+        v = v.downcase unless mysql?(scope)
+        v = Sanitizer.sanitize_like(v, escape_char)
+        block.call v
+      }
+      arel = column
+      arel = arel.lower unless mysql?(scope)
+      arel.matches_any(map, escape_char, true)
+    end
   end
   if defined?(Graphiti::Adapters::ActiveRecord)
-    Graphiti::Adapters::ActiveRecord.send(:include, ActiveRecordAdapterExtras)
+    Graphiti::Adapters::ActiveRecord.send(:prepend, ActiveRecordAdapterExtras)
   end
 
   Graphiti::Adapters::Abstract.class_eval do
     class << self
       alias :old_default_operators :default_operators
       def default_operators
-        old_default_operators.merge(precise_datetime: numerical_operators)
+        old_default_operators.merge({
+          precise_datetime: numerical_operators,
+          string_enum: [:eq, :not_eq],
+          integer_enum: [:eq, :not_eq],
+        })
       end
     end
   end

data/lib/graphiti_gql/loaders/many_to_many.rb

@@ -16,13 +16,15 @@ module GraphitiGql
 
       private
 
+      def thru_model
+        thru = @sideload.foreign_key.keys.first
+        reflection = @sideload.parent_resource.model.reflect_on_association(thru)
+        reflection.klass
+      end
+
       def add_join_table_magic(proxy)
         return unless @sideload.edge_magic
         if defined?(ActiveRecord) && proxy.resource.model.ancestors.include?(ActiveRecord::Base)
-          thru = @sideload.foreign_key.keys.first
-          reflection = @sideload.parent_resource.model.reflect_on_association(thru)
-          thru_model = reflection.klass
-
           thru_table_name = @sideload.join_table_alias || thru_model.table_name
           names = thru_model.column_names.map do |n|
             next if n == :id

data/lib/graphiti_gql/schema/fields/attribute.rb

@@ -3,12 +3,11 @@ module GraphitiGql
     module Fields
       class Attribute
         # If sideload is present, we're applying m2m metadata to an edge
-        def initialize(resource, name, config, sideload = nil)
+        def initialize(resource, name, config)
           @resource = resource
           @config = config
           @name = name
           @alias = config[:alias]
-          @sideload = sideload # is_edge: true
         end
 
         def apply(type)
@@ -16,13 +15,11 @@ module GraphitiGql
           _config = @config
           _name = @name
           _alias = @alias 
-          _sideload = @sideload
           opts = @config.slice(:null, :deprecation_reason)
           type.field(_name, field_type, **opts)
           type.define_method _name do
             if (readable = _config[:readable]).is_a?(Symbol)
               obj = object
-              obj = object.node if _sideload
               resource = obj.instance_variable_get(:@__graphiti_resource)
               unless resource.send(readable)
                 path = Graphiti.context[:object][:current_path].join(".")
@@ -30,25 +27,10 @@ module GraphitiGql
               end
             end
 
-            edge_attrs = nil
-            if _sideload
-              edge_attrs = object.node.attributes
-                .select { |k, v| k.to_s.starts_with?("_edge_") }
-              edge_attrs.transform_keys! { |k| k.to_s.gsub("_edge_", "").to_sym }
-            end
-
             value = if _config[:proc]
-              if _sideload
-                instance_exec(edge_attrs, object.node, &_config[:proc])
-              else
-                instance_eval(&_config[:proc])
-              end
+              instance_eval(&_config[:proc])
             else
-              if _sideload
-                edge_attrs[_alias || _name]
-              else
-                object.send(_alias || _name)
-              end
+              object.send(_alias || _name)
             end
             return if value.nil?
             Graphiti::Types[_config[:type]][:read].call(value)

data/lib/graphiti_gql/schema/fields/to_many.rb

@@ -35,7 +35,7 @@ module GraphitiGql
         end
 
         def customized_edge?
-          @sideload.type == :many_to_many && @sideload.class.edge_resource
+          @sideload.type == :many_to_many && @sideload.edge_resource
         end
 
         def find_or_build_connection
@@ -59,21 +59,60 @@ module GraphitiGql
         end
 
         def build_edge_type_class(sideload_type)
-          prior_edge_type_class = sideload_type.edge_type_class
-          edge_type_class = Class.new(prior_edge_type_class)
-          edge_resource = @sideload.class.edge_resource
-          edge_resource.attributes.each_pair do |name, config|
-            next if name == :id
-            Schema::Fields::Attribute.new(edge_resource, name, config, @sideload).apply(edge_type_class)
+          klass = build_friendly_graphql_edge_type_class \
+            sideload_type.edge_type_class
+          name = edge_type_class_name(sideload_type)
+          klass.define_method(:graphql_name) { name }
+          klass.graphql_name(name)
+          edge_resource = @sideload.edge_resource
+          ResourceType.add_fields(klass, edge_resource, id: false)
+          ResourceType.add_relationships(edge_resource, klass)
+          klass
+        end
+
+        # Normally we reference 'object', but edges work differently
+        # This makes 'object' work everywhere
+        # Needed when evaluating fields/relationships for consistent interface
+        def build_friendly_graphql_edge_type_class(superklass)
+          klass = Class.new(superklass) do
+            alias :original_object :object
+            def object
+              return @_object if @_object # avoid conflict
+
+              node = original_object.node # the 'parent' record we joined with
+              edge_attrs = node.attributes.select { |k,v| k.to_s.starts_with?('_edge') }
+              edge_attrs.transform_keys! { |k| k.to_s.gsub('_edge_', '') }
+              edge_model = model.new(edge_attrs)
+              edge_model.instance_variable_set(:@__graphiti_resource, resource)
+              @_object = edge_model
+              @_object
+            end
+
+            def cursor
+              original_object.cursor
+            end
+
+            def node
+              original_object.node
+            end
           end
-          registered_parent = Schema.registry.get(@sideload.parent_resource.class)
+
+          # used in #object
+          thru = @sideload.foreign_key.keys.first
+          reflection = @sideload.parent_resource.model.reflect_on_association(thru)
+          thru_model = reflection.klass
+          edge_resource = @sideload.edge_resource.new
+          klass.define_method(:model) { thru_model }
+          klass.define_method(:resource) { edge_resource }
+
+          klass
+        end
+
+        def edge_type_class_name(sideload_type)
+          registered_parent = Schema.registry.get \
+            @sideload.parent_resource.class
           parent_name = registered_parent[:type].graphql_name
-          edge_type_class_name = "#{parent_name}To#{sideload_type.graphql_name}Edge"
-          edge_type_class.define_method :graphql_name do
-            edge_type_class_name
-          end
-          edge_type_class.graphql_name(edge_type_class_name)
-          edge_type_class
+          "#{parent_name}To#{sideload_type.graphql_name}Edge"
         end
       end
     end

data/lib/graphiti_gql/schema/query.rb

@@ -30,30 +30,9 @@ module GraphitiGql
       end
 
       def add_relationships
-        each_relationship do |type, sideload_type, sideload|
-          if [:has_many, :many_to_many, :has_one].include?(sideload.type)
-            Fields::ToMany.new(sideload, sideload_type).apply(type)
-          else
-            Fields::ToOne.new(sideload, sideload_type).apply(type)
-          end
-        end
-      end
-
-      def each_relationship
         registry.resource_types.each do |registered|
-          registered[:resource].sideloads.each do |name, sl|
-            next unless sl.readable?
-
-            registered_sl = if sl.type == :polymorphic_belongs_to
-              PolymorphicBelongsToInterface
-                .new(registered[:resource], sl)
-                .build
-            else
-              registry.get(sl.resource.class)
-            end
-
-            yield registered[:type], registered_sl[:type], sl
-          end
+          resource, type = registered[:resource], registered[:type]
+          ResourceType.add_relationships(resource, type)
         end
       end
     end

data/lib/graphiti_gql/schema/resource_type.rb

@@ -14,6 +14,36 @@ module GraphitiGql
         end
       end
 
+      def self.add_fields(type, resource, id: true)
+        resource.attributes.each_pair do |name, config|
+          next if name == :id && id == false
+          if config[:readable]
+            Fields::Attribute.new(resource, name, config).apply(type)
+          end
+        end
+      end
+
+      def self.add_relationships(resource, type)
+        resource.sideloads.each do |name, sideload|
+          next unless sideload.readable?
+
+          registered_sl = if sideload.type == :polymorphic_belongs_to
+            PolymorphicBelongsToInterface
+              .new(resource, sideload)
+              .build
+          else
+            Schema.registry.get(sideload.resource.class)
+          end
+          sideload_type = registered_sl[:type]
+
+          if [:has_many, :many_to_many, :has_one].include?(sideload.type)
+            Fields::ToMany.new(sideload, sideload_type).apply(type)
+          else
+            Fields::ToOne.new(sideload, sideload_type).apply(type)
+          end
+        end
+      end
+
       def initialize(resource, implements: nil)
         @resource = resource
         @implements = implements
@@ -86,14 +116,10 @@ module GraphitiGql
       def name
         registry.key_for(@resource)
       end
-  
+
       def add_fields(type, resource)
-        resource.attributes.each_pair do |name, config|
-          if config[:readable]
-            Fields::Attribute.new(@resource, name, config).apply(type)
-          end
-        end
-      end
+        self.class.add_fields(type, resource)
+      end 
 
       def build_connection_class
         klass = Class.new(GraphQL::Types::Relay::BaseConnection)

data/lib/graphiti_gql/version.rb

@@ -1,3 +1,3 @@
 module GraphitiGql
-  VERSION = "0.2.20"
+  VERSION = "0.2.23"
 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,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: graphiti_gql
 version: !ruby/object:Gem::Version
-  version: 0.2.20
+  version: 0.2.23
 platform: ruby
 authors:
 - Lee Richmond
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-08-01 00:00:00.000000000 Z
+date: 2022-08-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: graphql
@@ -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: []