graphiti-activegraph 1.3.1 → 1.3.3

data/lib/graphiti/active_graph/adapters/active_graph.rb

@@ -1,183 +1,183 @@
-module Graphiti::ActiveGraph
-  module Adapters
-    class ActiveGraph < Graphiti::Adapters::Abstract
-      def self.sideloading_classes
-        {
-          has_many: Graphiti::ActiveGraph::Adapters::ActiveGraph::HasManySideload,
-          has_one: Graphiti::ActiveGraph::Adapters::ActiveGraph::HasOneSideload,
-          polymorphic_belongs_to: Graphiti::ActiveGraph::Adapters::ActiveGraph::PolymorphicBelongsTo,
-          belongs_to: Graphiti::ActiveGraph::Adapters::ActiveGraph::HasOneSideload,
-        }
-      end
-
-      def base_scope(model)
-        model
-      end
-
-      def assign_attributes(model_instance, attributes)
-        model_instance.before_assign_resource_attr if model_instance.respond_to?(:before_assign_resource_attr)
-
-        # currently there is no possible way to assign association on activegraph without triggering save
-        # https://github.com/neo4jrb/activegraph/issues/1445
-        # using "=" operator bypasses validations and callbacks in case of associations
-        # once above issue is fixed, we can change the below code to assign instead of update
-
-        model_instance.update(attributes)
-      end
-
-      def paginate(scope, current_page, per_page, offset)
-        offset ||= (current_page - 1) * per_page
-        scope.skip(offset).limit(per_page)
-      end
-
-      def transaction(_model_class)
-        ::ActiveGraph::Base.transaction do
-          yield
-        end
-      end
-
-      def order(scope, attribute, direction, extra_field = false)
-        if extra_field
-          scope.query.order("#{attribute} #{direction}").proxy_as(scope.model, scope.identity)
-        else
-          scope.send(resource.relation_resource? ? :rel_order : :order, attribute => direction)
-        end
-      end
-
-      def count(scope, _attr)
-        scope.skip(0).limit(nil).count
-      end
-
-      def save(model_instance)
-        model_instance.save if model_instance.changed?
-        model_instance
-      end
-
-      def destroy(model_instance)
-        model_instance.destroy
-        model_instance
-      end
-
-      def resolve(scope, resolve_to_rel = false)
-        resolve_to_rel ? scope.to_a(false, true) : scope.to_a
-      end
-
-      # def associate_all(parent, children, association_name, association_type)
-      #   if association_type == :has_many
-      #     if !parent.send(:"#{association_name}").present?
-      #       parent.send(:"#{association_name}=", children)
-      #     else
-      #       parent.send(:"#{association_name}") << children
-      #     end
-      #   else
-      #     parent.send(:"#{association_name}=", children)
-      #   end
-      # end
-
-      def process_belongs_to(persistence, attributes)
-        []
-      end
-
-      def process_has_many(persistence, caller_model)
-        []
-      end
-
-      def persistence_attributes(persistence, attributes)
-        rel_attrs = {}
-        @persistence = persistence
-
-        del_empty_rels(rel_attrs) unless resource.relation_resource?
-        attributes_for_has_one(rel_attrs)
-        attributes_for_has_many(rel_attrs)
-
-        attributes.merge rel_attrs
-      end
-
-      def associate(parent, child, association_name, type)
-      end
-
-      def disassociate(parent, child, association_name, type)
-        parent.send(:"#{association_name}=", nil)
-      end
-
-      def clear_active_connections!
-      end
-
-      def filter_eq(scope, attribute, value)
-        scope.where(attribute => value)
-      end
-      alias filter_integer_eq filter_eq
-      alias filter_float_eq filter_eq
-      alias filter_big_decimal_eq filter_eq
-      alias filter_date_eq filter_eq
-      alias filter_boolean_eq filter_eq
-      alias filter_uuid_eq filter_eq
-      alias filter_enum_eq filter_eq
-
-      def filter_not_eq(scope, attribute, value)
-        scope.where_not(attribute => value)
-      end
-      alias filter_integer_not_eq filter_not_eq
-      alias filter_float_not_eq filter_not_eq
-      alias filter_big_decimal_not_eq filter_not_eq
-      alias filter_date_not_eq filter_not_eq
-      alias filter_boolean_not_eq filter_not_eq
-      alias filter_uuid_not_eq filter_not_eq
-      alias filter_enum_not_eq filter_not_eq
-
-      private
-
-      def del_empty_rels(rel_attrs)
-        relationships = @persistence.instance_variable_get(:@relationships)
-        relationships.each do |rel_name, rel_data|
-          rel_attrs[rel_name] = nil if rel_data.blank?
-        end
-      end
-
-      def attributes_for_has_one(rel_attrs)
-        @persistence.iterate(only: [:has_one]) do |x|
-          process_relationship_attrs(x, rel_attrs, false)
-        end
-      end
-
-      def attributes_for_has_many(rel_attrs)
-        @persistence.iterate(only: [:has_many]) do |x|
-          process_relationship_attrs(x, rel_attrs, true)
-        end
-      end
-
-      def process_relationship_attrs(x, rel_attrs, assign_multiple)
-        x[:object] = find_record(x)
-        resource = @persistence.instance_variable_get(:@resource)
-        meta = @persistence.instance_variable_get(:@meta)
-        # Relationship start/end nodes cannot be changed once persisted
-        unless meta[:method] == :update && resource.relation_resource?
-          if assign_multiple
-            rel_attrs[x[:foreign_key]] ||= []
-            rel_attrs[x[:foreign_key]] << resource_association_value(x)
-          else
-            rel_attrs[x[:foreign_key]] = resource_association_value(x)
-          end
-        end
-      end
-
-      def resource_association_value(rel_map)
-        if [:destroy, :disassociate].include?(rel_map[:meta][:method]) || rel_map[:attributes].blank?
-          nil
-        else
-          rel_map[:object]
-        end
-      end
-
-      def find_record(x)
-        if Graphiti.config.allow_sidepost
-          x[:object] = x[:resource]
-            .persist_with_relationships(x[:meta], x[:attributes], x[:relationships], self, x[:foreign_key])
-        else
-          id = x.dig(:attributes, :id)
-          x[:resource].model.find(id) if id
-        end
-      end
-    end
-  end
-end
+module Graphiti::ActiveGraph
+  module Adapters
+    class ActiveGraph < Graphiti::Adapters::Abstract
+      def self.sideloading_classes
+        {
+          has_many: Graphiti::ActiveGraph::Adapters::ActiveGraph::HasManySideload,
+          has_one: Graphiti::ActiveGraph::Adapters::ActiveGraph::HasOneSideload,
+          polymorphic_belongs_to: Graphiti::ActiveGraph::Adapters::ActiveGraph::PolymorphicBelongsTo,
+          belongs_to: Graphiti::ActiveGraph::Adapters::ActiveGraph::HasOneSideload,
+        }
+      end
+
+      def base_scope(model)
+        model
+      end
+
+      def assign_attributes(model_instance, attributes)
+        model_instance.before_assign_resource_attr if model_instance.respond_to?(:before_assign_resource_attr)
+
+        # currently there is no possible way to assign association on activegraph without triggering save
+        # https://github.com/neo4jrb/activegraph/issues/1445
+        # using "=" operator bypasses validations and callbacks in case of associations
+        # once above issue is fixed, we can change the below code to assign instead of update
+
+        model_instance.update(attributes)
+      end
+
+      def paginate(scope, current_page, per_page, offset)
+        offset ||= (current_page - 1) * per_page
+        scope.skip(offset).limit(per_page)
+      end
+
+      def transaction(_model_class)
+        ::ActiveGraph::Base.transaction do
+          yield
+        end
+      end
+
+      def order(scope, attribute, direction, extra_field = false)
+        if extra_field
+          scope.query.order("#{attribute} #{direction}").proxy_as(scope.model, scope.identity)
+        else
+          scope.send(resource.relation_resource? ? :rel_order : :order, attribute => direction)
+        end
+      end
+
+      def count(scope, _attr)
+        scope.skip(0).limit(nil).count
+      end
+
+      def save(model_instance)
+        model_instance.save if model_instance.changed?
+        model_instance
+      end
+
+      def destroy(model_instance)
+        model_instance.destroy
+        model_instance
+      end
+
+      def resolve(scope, resolve_to_rel = false)
+        resolve_to_rel ? scope.to_a(false, true) : scope.to_a
+      end
+
+      # def associate_all(parent, children, association_name, association_type)
+      #   if association_type == :has_many
+      #     if !parent.send(:"#{association_name}").present?
+      #       parent.send(:"#{association_name}=", children)
+      #     else
+      #       parent.send(:"#{association_name}") << children
+      #     end
+      #   else
+      #     parent.send(:"#{association_name}=", children)
+      #   end
+      # end
+
+      def process_belongs_to(persistence, attributes)
+        []
+      end
+
+      def process_has_many(persistence, caller_model)
+        []
+      end
+
+      def persistence_attributes(persistence, attributes)
+        rel_attrs = {}
+        @persistence = persistence
+
+        del_empty_rels(rel_attrs) unless resource.relation_resource?
+        attributes_for_has_one(rel_attrs)
+        attributes_for_has_many(rel_attrs)
+
+        attributes.merge rel_attrs
+      end
+
+      def associate(parent, child, association_name, type)
+      end
+
+      def disassociate(parent, child, association_name, type)
+        parent.send(:"#{association_name}=", nil)
+      end
+
+      def clear_active_connections!
+      end
+
+      def filter_eq(scope, attribute, value)
+        scope.where(attribute => value)
+      end
+      alias filter_integer_eq filter_eq
+      alias filter_float_eq filter_eq
+      alias filter_big_decimal_eq filter_eq
+      alias filter_date_eq filter_eq
+      alias filter_boolean_eq filter_eq
+      alias filter_uuid_eq filter_eq
+      alias filter_enum_eq filter_eq
+
+      def filter_not_eq(scope, attribute, value)
+        scope.where_not(attribute => value)
+      end
+      alias filter_integer_not_eq filter_not_eq
+      alias filter_float_not_eq filter_not_eq
+      alias filter_big_decimal_not_eq filter_not_eq
+      alias filter_date_not_eq filter_not_eq
+      alias filter_boolean_not_eq filter_not_eq
+      alias filter_uuid_not_eq filter_not_eq
+      alias filter_enum_not_eq filter_not_eq
+
+      private
+
+      def del_empty_rels(rel_attrs)
+        relationships = @persistence.instance_variable_get(:@relationships)
+        relationships.each do |rel_name, rel_data|
+          rel_attrs[rel_name] = nil if rel_data.blank?
+        end
+      end
+
+      def attributes_for_has_one(rel_attrs)
+        @persistence.iterate(only: [:has_one]) do |x|
+          process_relationship_attrs(x, rel_attrs, false)
+        end
+      end
+
+      def attributes_for_has_many(rel_attrs)
+        @persistence.iterate(only: [:has_many]) do |x|
+          process_relationship_attrs(x, rel_attrs, true)
+        end
+      end
+
+      def process_relationship_attrs(x, rel_attrs, assign_multiple)
+        x[:object] = find_record(x)
+        resource = @persistence.instance_variable_get(:@resource)
+        meta = @persistence.instance_variable_get(:@meta)
+        # Relationship start/end nodes cannot be changed once persisted
+        unless meta[:method] == :update && resource.relation_resource?
+          if assign_multiple
+            rel_attrs[x[:foreign_key]] ||= []
+            rel_attrs[x[:foreign_key]] << resource_association_value(x)
+          else
+            rel_attrs[x[:foreign_key]] = resource_association_value(x)
+          end
+        end
+      end
+
+      def resource_association_value(rel_map)
+        if [:destroy, :disassociate].include?(rel_map[:meta][:method]) || rel_map[:attributes].blank?
+          nil
+        else
+          rel_map[:object]
+        end
+      end
+
+      def find_record(x)
+        if Graphiti.config.allow_sidepost
+          x[:object] = x[:resource]
+            .persist_with_relationships(x[:meta], x[:attributes], x[:relationships], self, x[:foreign_key])
+        else
+          id = x.dig(:attributes, :id)
+          x[:resource].model.find(id) if id
+        end
+      end
+    end
+  end
+end

data/lib/graphiti/active_graph/concerns/path_relationships.rb

@@ -1,44 +1,44 @@
-module Graphiti::ActiveGraph::Concerns
-  module PathRelationships
-    def add_path_id_to_relationships!(params)
-      return params if path_relationships_updated?
-      detect_conflict(:id, @params[:id]&.to_s, attributes[:id]&.to_s)
-      path_map.each do |rel_name, path_value|
-        body_value = relationships.dig(rel_name, :attributes, :id)
-        if body_value
-          detect_conflict(rel_name, path_value&.to_s, body_value&.to_s)
-        else
-          update_params(params, rel_name, path_value)
-          update_realationships(rel_name, path_value)
-        end
-      end
-      path_relationships_updated!
-      params
-    end
-
-    private
-
-    def path_relationships_updated!
-      @path_relationships_updated = true
-    end
-
-    def path_relationships_updated?
-      @path_relationships_updated.present?
-    end
-
-    def update_params(params, rel_name, path_value)
-      params[:data] ||= {}
-      params[:data][:relationships] ||= {}
-      params[:data][:relationships][rel_name] = {
-        data: {
-          type: derive_resource_type(rel_name),
-          id: path_value
-        }
-      }
-    end
-
-    def update_realationships(rel_name, path_value)
-      relationships[rel_name] = { meta: {}, attributes: { id: path_value } }
-    end
-  end
-end
+module Graphiti::ActiveGraph::Concerns
+  module PathRelationships
+    def add_path_id_to_relationships!(params)
+      return params if path_relationships_updated?
+      detect_conflict(:id, @params[:id]&.to_s, attributes[:id]&.to_s)
+      path_map.each do |rel_name, path_value|
+        body_value = relationships.dig(rel_name, :attributes, :id)
+        if body_value
+          detect_conflict(rel_name, path_value&.to_s, body_value&.to_s)
+        else
+          update_params(params, rel_name, path_value)
+          update_realationships(rel_name, path_value)
+        end
+      end
+      path_relationships_updated!
+      params
+    end
+
+    private
+
+    def path_relationships_updated!
+      @path_relationships_updated = true
+    end
+
+    def path_relationships_updated?
+      @path_relationships_updated.present?
+    end
+
+    def update_params(params, rel_name, path_value)
+      params[:data] ||= {}
+      params[:data][:relationships] ||= {}
+      params[:data][:relationships][rel_name] = {
+        data: {
+          type: derive_resource_type(rel_name),
+          id: path_value
+        }
+      }
+    end
+
+    def update_realationships(rel_name, path_value)
+      relationships[rel_name] = { meta: {}, attributes: { id: path_value } }
+    end
+  end
+end

data/lib/graphiti/active_graph/concerns/relationships.rb

@@ -1,15 +1,15 @@
-module Graphiti::ActiveGraph::Concerns
-  module Relationships
-    def relationship?(name)
-      relationships[name.to_sym].present?
-    end
-
-    def relationship_id(name)
-      relationships[name]&.dig(:attributes, :id)
-    end
-
-    def relationship_ids(name)
-      Array.wrap(relationships[name]).pluck(:attributes).pluck(:id)
-    end
-  end
-end
+module Graphiti::ActiveGraph::Concerns
+  module Relationships
+    def relationship?(name)
+      relationships[name.to_sym].present?
+    end
+
+    def relationship_id(name)
+      relationships[name]&.dig(:attributes, :id)
+    end
+
+    def relationship_ids(name)
+      Array.wrap(relationships[name]).pluck(:attributes).pluck(:id)
+    end
+  end
+end