graphiti_gql 0.2.19 → 0.2.22

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8ff3654600729760d759d234decc94aeb9fd1927b27017bf14de01c70080ec34
-  data.tar.gz: 9e9cc547ace2c05ffbd9952cbe8db82ae9ef499ecc5123deaf72f2087cd6147b
+  metadata.gz: 1a79d794e346a1f884170026503f4ca36a5c82529a47dd977b34335457d4a630
+  data.tar.gz: 0ee188c2f278895a47b27c8dbe57b1117dfe352350a99bec8a908702cc782411
 SHA512:
-  metadata.gz: 496ee06e3e0ba183c867367a759ce0114764c183f0af8df346d18bf8c28bb1c034ba9aa7dcf43d8e04bb11106b05143fdc2d6fd0ca220089489e276d59079a84
-  data.tar.gz: a2b5b3a60d06253dcb0aad59fe7f5358c700e360ecd24c421fed659ac2dccce45f3492797d42c74c72e743c7488a7f02417daf8f0352372f87b9faa49af21f96
+  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/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
@@ -269,7 +279,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 +287,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/version.rb

@@ -1,3 +1,3 @@
 module GraphitiGql
-  VERSION = "0.2.19"
+  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,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: graphiti_gql
 version: !ruby/object:Gem::Version
-  version: 0.2.19
+  version: 0.2.22
 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
@@ -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,20 +114,6 @@ 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:
 email:
 - richmolj@gmail.com
@@ -124,7 +130,6 @@ files:
 - LICENSE.txt
 - README.md
 - Rakefile
-- app/controllers/graphiti_gql/execution_controller.rb
 - bin/bundle
 - bin/byebug
 - bin/coderay
@@ -136,7 +141,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