motor-admin 0.3.5 → 0.3.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ce4fa10d33b3f41a5a0ba509b53d7815631c1980b521839ecc51f7f80ed548aa
-  data.tar.gz: 35d3b13d657714f909ab7fc56f088fc3270b0e40e1839aadc5cf227c99e78fc2
+  metadata.gz: eda6baf4fb621527782a8529725aa8b8d794a95e17739f657d8ce03bc377de65
+  data.tar.gz: 262bceb177a009a497c84ba318254efe97894d474c98d3fcb3c34d35581d05a9
 SHA512:
-  metadata.gz: b6c79c98ff08d7402cfc54ff91c661616f2b87bced25af12ff0637a99327fdb000455e9bd32fd78ffe611e3007acfd01104f74b39f5318a1dcdf2798151db733
-  data.tar.gz: ba7f58cfd0500b1aa6b9f7b7659afd718f05b548da8597384cc2d036b08c1d4a54c5aa291ddb05b9ebda05cb65bdf08d3bc19e6c6d553d9ab12b3bb0b12dd437
+  metadata.gz: 9b7500eb106243d61258e8c244a62c6a7cf0b70727a2a69c401fd727a49f7922b1d2e0df097e5ac6c5ba5c6ca176fedc95c46dee873b1308cf9445122ce2f7e1
+  data.tar.gz: 8fdaa674012474e2db6fd95679476aa0ebbf59bfb2d54589e5816d819b4ec6b327c43929a832bccc969b161e90a5efad59246dc68db9e9944c21cac1244b73c9

data/lib/motor/active_record_utils/active_record_filter.rb

@@ -5,14 +5,44 @@ module ActiveRecord
   end
 end
 
-ActiveRecord::QueryMethods.module_eval do
-  def build_arel_with_distinct_on(aliases = nil)
-    arel = build_arel_without_distinct_on(aliases)
-    arel.distinct_on(distinct_on_values) unless distinct_on_values.empty?
-    arel
+module Arel
+  module Attributes
+    class Relation < Attribute
+      attr_accessor :collection, :for_write
+
+      def initialize(relation, name, collection = false, for_write = false)
+        self[:relation] = relation
+        self[:name] = name
+        @collection = collection
+        @for_write = for_write
+      end
+
+      delegate :able_to_type_cast?, to: :relation
+
+      def table_name
+        nil
+      end
+
+      def eql?(other)
+        self.class == other.class &&
+          relation == other.relation &&
+          name == other.name &&
+          collection == other.collection
+      end
+
+      delegate :type_cast_for_database, to: :relation
+    end
   end
+end
 
-  alias_method :build_arel, :build_arel_with_distinct_on
+module Arel
+  module Visitors
+    class ToSql
+      def visit_Arel_Attributes_Relation(o, collector)
+        visit(o.relation, collector)
+      end
+    end
+  end
 end
 
 module ActiveRecord
@@ -64,29 +94,30 @@ module ActiveRecord
             end
           elsif reflection = klass._reflections[key.to_s]
             if value.is_a?(Hash)
-              relations << if reflection.polymorphic?
-                             value = value.dup
-                             join_klass = value.delete(:as).safe_constantize
-                             right_table = join_klass.arel_table
-                             left_table = reflection.active_record.arel_table
-
-                             on = right_table[join_klass.primary_key]
-                                  .eq(left_table[reflection.foreign_key])
-                                  .and(left_table[reflection.foreign_type].eq(join_klass.name))
-
-                             cross_boundry_joins = join_klass.left_outer_joins(ActiveRecord::PredicateBuilder.filter_joins(join_klass, value).flatten).send(
-                               :build_joins, []
-                             )
-
-                             [
-                               left_table.join(right_table, Arel::Nodes::OuterJoin).on(on).join_sources,
-                               cross_boundry_joins
-                             ]
-                           else
-                             {
-                               key => build_filter_joins(reflection.klass, value, [], custom)
-                             }
-                           end
+              relations <<
+                if reflection.polymorphic?
+                  value = value.dup
+                  join_klass = value.delete(:as).safe_constantize
+                  right_table = join_klass.arel_table
+                  left_table = reflection.active_record.arel_table
+
+                  on = right_table[join_klass.primary_key]
+                       .eq(left_table[reflection.foreign_key])
+                       .and(left_table[reflection.foreign_type].eq(join_klass.name))
+
+                  cross_boundry_joins = join_klass.left_outer_joins(ActiveRecord::PredicateBuilder.filter_joins(join_klass, value).flatten).send(
+                    :build_joins, []
+                  )
+
+                  [
+                    left_table.join(right_table, Arel::Nodes::OuterJoin).on(on).join_sources,
+                    cross_boundry_joins
+                  ]
+                else
+                  {
+                    key => build_filter_joins(reflection.klass, value, [], custom)
+                  }
+                end
             elsif value.is_a?(Array)
               value.each do |v|
                 relations << {
@@ -233,37 +264,6 @@ module ActiveRecord
         attribute.has_any_key(*Array(value).map { |x| Arel::Nodes.build_quoted(x) })
       when :in
         attribute.in(value)
-      when :intersects
-        # geometry_value = if value.is_a?(Hash) # GeoJSON
-        #   Arel::Nodes::NamedFunction.new('ST_GeomFromGeoJSON', [JSON.generate(value)])
-        # elsif # EWKB
-        # elsif # WKB
-        # elsif # EWKT
-        # elsif # WKT
-        # end
-
-        # TODO: us above if to determin if SRID sent
-        geometry_value = if value.is_a?(Hash)
-                           Arel::Nodes::NamedFunction.new('ST_SetSRID',
-                                                          [
-                                                            Arel::Nodes::NamedFunction.new('ST_GeomFromGeoJSON',
-                                                                                           [Arel::Nodes.build_quoted(JSON.generate(subvalue))]), 4326
-                                                          ])
-                         elsif value[0, 1] == "\x00" || value[0, 1] == "\x01" || value[0, 4] =~ /[0-9a-fA-F]{4}/
-                           Arel::Nodes::NamedFunction.new('ST_SetSRID',
-                                                          [
-                                                            Arel::Nodes::NamedFunction.new('ST_GeomFromEWKB',
-                                                                                           [Arel::Nodes.build_quoted(subvalue)]), 4326
-                                                          ])
-                         else
-                           Arel::Nodes::NamedFunction.new('ST_SetSRID',
-                                                          [
-                                                            Arel::Nodes::NamedFunction.new('ST_GeomFromText',
-                                                                                           [Arel::Nodes.build_quoted(subvalue)]), 4326
-                                                          ])
-                         end
-
-        Arel::Nodes::NamedFunction.new('ST_Intersects', [attribute, geometry_value])
       when :less_than, :lt
         attribute.lt(value)
       when :less_than_or_equal_to, :lteq, :lte

data/lib/motor/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Motor
-  VERSION = '0.3.5'
+  VERSION = '0.3.6'
 end

data/lib/motor.rb

@@ -10,7 +10,6 @@ require 'audited'
 require 'uri'
 require 'net/http'
 require 'net/https'
-require 'arel/extensions'
 
 module Motor
   PATH = Pathname.new(__dir__)

metadata

@@ -1,29 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: motor-admin
 version: !ruby/object:Gem::Version
-  version: 0.3.5
+  version: 0.3.6
 platform: ruby
 authors:
 - Pete Matsyburka
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-08-09 00:00:00.000000000 Z
+date: 2022-08-10 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: arel-extensions
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '6.0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '6.0'
 - !ruby/object:Gem::Dependency
   name: ar_lazy_preload
   requirement: !ruby/object:Gem::Requirement