graphiti_gql 0.2.18 → 0.2.21

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 90e832970f0f3329260d83e026c58493b76711ed1fbb7eee3914978014cd4684
-  data.tar.gz: 993170a348f371cebc8bb101c21b48ca26f6df2ef82c9422061081a6da878880
+  metadata.gz: 933f1a2f88f12ad842f261023b05c8f5cc764ffbe61e7c6686ad88e2d013f8c8
+  data.tar.gz: 89f3c1c9fd1dcaa5160e1b0f9df9e81c0ff869a55d2842db365a1dfd14c942fe
 SHA512:
-  metadata.gz: a84908687fd25d4324b6e9d1bc9bc9ef83a3388ca49ad33c829c71828e98992b3fd04476df6d1927ea3d6f17c87b5de89bbb6aa24f60d351f101c7f69b12ec53
-  data.tar.gz: ad12bf08064111c18ee81b2b4006195c38311846f81310bb158126b0b89c257dabce3b60c32fe7114bace33dca19475e2af0b9d9d5976749cd1eafdcf2bf3e37
+  metadata.gz: 2de7c71483561731e957887da213322caf2c10b9d6836660b15ecd6572c743dffc1f34de139d15ff05dae13392b28186e35b01a2ee409cbe5c22f86c4a75066e
+  data.tar.gz: 973e35034e8c7a2b01eb5301f8db86df99a1631adfadf35e6e608f95fa31aec08d89da68df8833edc460af5525a8c3e240ff70d3576fc5180ef98614e87f58d3

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    graphiti_gql (0.2.15)
+    graphiti_gql (0.2.18)
       graphiti (~> 1.3.9)
       graphql (~> 2.0)
       graphql-batch (~> 0.5)

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

@@ -269,7 +269,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 +277,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/schema/fields/attribute.rb

@@ -3,7 +3,8 @@ module GraphitiGql
     module Fields
       class Attribute
         # If sideload is present, we're applying m2m metadata to an edge
-        def initialize(name, config, sideload = nil)
+        def initialize(resource, name, config, sideload = nil)
+          @resource = resource
           @config = config
           @name = name
           @alias = config[:alias]
@@ -57,14 +58,34 @@ module GraphitiGql
         private
 
         def field_type
-          field_type = Graphiti::Types[@config[:type]][:graphql_type]
-          if !field_type
-            canonical_graphiti_type = Graphiti::Types.name_for(@config[:type])
-            field_type = GQL_TYPE_MAP[canonical_graphiti_type.to_sym]
-            field_type = String if @name == :id
+          if [:integer_enum, :string_enum].any? { |t| @config[:type] == t }
+            return find_or_create_enum_type
+          else
+            field_type = Graphiti::Types[@config[:type]][:graphql_type]
+            if !field_type
+              canonical_graphiti_type = Graphiti::Types.name_for(@config[:type])
+              field_type = GQL_TYPE_MAP[canonical_graphiti_type.to_sym]
+              field_type = String if @name == :id
+            end
+            field_type = [field_type] if @config[:type].to_s.starts_with?("array_of")
+            field_type
+          end
+        end
+
+        def find_or_create_enum_type
+          resource_type_name = Schema.registry.key_for(@resource, interface: false)
+          enum_type_name = "#{resource_type_name}_#{@name}"
+          if (registered = Schema.registry[enum_type_name])
+            registered[:type]
+          else
+            klass = Class.new(GraphQL::Schema::Enum)
+            klass.graphql_name(enum_type_name)
+            @config[:allow].each do |allowed|
+              klass.value(allowed)
+            end
+            Schema.registry[enum_type_name] = { type: klass }
+            klass
           end
-          field_type = [field_type] if @config[:type].to_s.starts_with?("array_of")
-          field_type
         end
       end
     end

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

@@ -64,7 +64,7 @@ module GraphitiGql
           edge_resource = @sideload.class.edge_resource
           edge_resource.attributes.each_pair do |name, config|
             next if name == :id
-            Schema::Fields::Attribute.new(name, config, @sideload).apply(edge_type_class)
+            Schema::Fields::Attribute.new(edge_resource, name, config, @sideload).apply(edge_type_class)
           end
           registered_parent = Schema.registry.get(@sideload.parent_resource.class)
           parent_name = registered_parent[:type].graphql_name

data/lib/graphiti_gql/schema/resource_type.rb

@@ -90,7 +90,7 @@ module GraphitiGql
       def add_fields(type, resource)
         resource.attributes.each_pair do |name, config|
           if config[:readable]
-            Fields::Attribute.new(name, config).apply(type)
+            Fields::Attribute.new(@resource, name, config).apply(type)
           end
         end
       end

data/lib/graphiti_gql/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: graphiti_gql
 version: !ruby/object:Gem::Version
-  version: 0.2.18
+  version: 0.2.21
 platform: ruby
 authors:
 - Lee Richmond
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-08-01 00:00:00.000000000 Z
+date: 2022-08-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: graphql
@@ -124,7 +124,6 @@ files:
 - LICENSE.txt
 - README.md
 - Rakefile
-- app/controllers/graphiti_gql/execution_controller.rb
 - bin/bundle
 - bin/byebug
 - bin/coderay
@@ -136,7 +135,6 @@ files:
 - bin/rake
 - bin/rspec
 - bin/setup
-- config/routes.rb
 - graphiti_gql.gemspec
 - lib/graphiti_gql.rb
 - lib/graphiti_gql/active_resource.rb

data/app/controllers/graphiti_gql/execution_controller.rb

@@ -1,18 +0,0 @@
-module GraphitiGql
-  class ExecutionController < GraphitiGql.config.application_controller
-    def execute
-      params = request.params # avoid strong_parameters
-      variables = params[:variables] || {}
-      result = GraphitiGql.run params[:query],
-        params[:variables],
-        graphql_context
-      render json: result
-    end
-
-    private
-
-    def default_context
-      defined?(:current_user)
-    end
-  end
-end

data/config/routes.rb

@@ -1,6 +0,0 @@
-GraphitiGql::Engine.routes.draw do
-  # Default json so our error handler takes effect
-  scope defaults: {format: :json} do
-    post "/" => "execution#execute"
-  end
-end