activegraph 10.0.0.pre.beta.4 → 10.0.0.pre.beta.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ef0444b21eb9130b0047fa423911cff404686bb29a7af0e63b66dd093d822f2b
-  data.tar.gz: d359a53fbe4ecfec871b596ecd3aeae4293f9369059090cec06f78e2d8a6c77c
+  metadata.gz: f768ee99674bbc10fb6c1094921b8f6f7840cfdd6c2d2ae442e4cc33d243690a
+  data.tar.gz: 46d381583be9bd03f45d8b6f684d2bc3ae0e394ebcbd2685d57cda834f354e24
 SHA512:
-  metadata.gz: 736e716587d1b7cb30f44263ac05108793b1819765c4e362240421022a3581b96bbbd186ca132846ade50a643f59edb422e2cb9c492c31d6c517556fb96e2c08
-  data.tar.gz: e985e8b8223a56a02c581f50e180851fee59b3fcbad402560f59746df6e64c3bfa8d4ccbf813571235ff5e5af1585b28939c51d835e13b8fd6b516dbe121b66c
+  metadata.gz: fbd8b19f5894b9b5b528887aff9616f62d08818c90a03e1b9144850c1c832061f6af598a4d5ebf8a1d9e9751bfb6a1ba7bfa730df83a43070e0f95081a799347
+  data.tar.gz: 4c02f0e0ab88bffdafb794a892aacd46351118bb7dbe179a1fab56dc2febe9a6bee08d2d0c6850580c039b493e5eb76cc4a77b57a272c09d2f4a286f134d237b

data/lib/active_graph/core/label.rb

@@ -21,8 +21,8 @@ module ActiveGraph
       # Creates a neo4j constraint on a property
       # See http://docs.neo4j.org/chunked/stable/query-constraints.html
       # @example
-      #   label = ActiveGraph::Label.create(:person, driver)
-      #   label.create_constraint(:name, {type: :unique}, driver)
+      #   label = ActiveGraph::Label.create(:person)
+      #   label.create_constraint(:name, {type: :unique})
       #
       def create_constraint(property, constraints)
         cypher = case constraints[:type]
@@ -41,9 +41,9 @@ module ActiveGraph
       # Drops a neo4j constraint on a property
       # See http://docs.neo4j.org/chunked/stable/query-constraints.html
       # @example
-      #   label = ActiveGraph::Label.create(:person, driver)
-      #   label.create_constraint(:name, {type: :unique}, driver)
-      #   label.drop_constraint(:name, {type: :unique}, driver)
+      #   label = ActiveGraph::Label.create(:person)
+      #   label.create_constraint(:name, {type: :unique})
+      #   label.drop_constraint(:name, {type: :unique})
       #
       def drop_constraint(property, constraint)
         cypher = case constraint[:type]
@@ -97,16 +97,6 @@ module ActiveGraph
 
       private
 
-      # Store schema threads on the driver so that we can easily wait for all
-      # threads on a driver regardless of label
-      def schema_threads
-        self.class.schema_threads
-      end
-
-      def schema_threads=(array)
-        self.class.set_schema_threads(array)
-      end
-
       class << self
         def indexes
           ActiveGraph::Base.indexes
@@ -130,19 +120,6 @@ module ActiveGraph
             end
           end
         end
-
-        def wait_for_schema_changes
-          schema_threads.map(&:join)
-          set_schema_threads(driver, [])
-        end
-
-        def schema_threads
-          ActiveGraph::Transaction.instance_variable_get('@_schema_threads') || []
-        end
-
-        def set_schema_threads(array)
-          ActiveGraph::Transaction.instance_variable_set('@_schema_threads', array)
-        end
       end
 
       def schema_query(cypher)

data/lib/active_graph/core/query.rb

@@ -394,7 +394,7 @@ module ActiveGraph
 
       protected
 
-      attr_accessor :driver, :options, :_params
+      attr_accessor :options, :_params
 
       def add_clauses(clauses)
         @clauses += clauses

data/lib/active_graph/migrations/schema.rb

@@ -9,8 +9,8 @@ module ActiveGraph
 
         def synchronize_schema_data(schema_data, remove_missing)
           queries = []
-          queries += drop_and_create_queries(fetch_constraint_descriptions(driver), schema_data[:constraints], remove_missing)
-          queries += drop_and_create_queries(fetch_index_descriptions(driver), schema_data[:indexes], remove_missing)
+          queries += drop_and_create_queries(fetch_constraint_descriptions, schema_data[:constraints], remove_missing)
+          queries += drop_and_create_queries(fetch_index_descriptions, schema_data[:indexes], remove_missing)
           ActiveGraph::Base.queries do
             queries.each { |query| append query }
           end
@@ -18,11 +18,11 @@ module ActiveGraph
 
         private
 
-        def fetch_constraint_descriptions(driver)
+        def fetch_constraint_descriptions
           ActiveGraph::Base.query('CALL db.constraints()').map(&:description)
         end
 
-        def fetch_index_descriptions(driver)
+        def fetch_index_descriptions
           result = ActiveGraph::Base.query('CALL db.indexes()')
           if result.columns.include?(:description)
             v3_indexes(result)

data/lib/active_graph/node/has_n.rb

@@ -441,13 +441,7 @@ module ActiveGraph::Node
       end
 
       def define_has_many_setter(name)
-        define_method("#{name}=") do |other_nodes|
-          association_proxy_cache.clear
-
-          clear_deferred_nodes_for_association(name)
-
-          ActiveGraph::Base.transaction { association_proxy(name).replace_with(other_nodes) }
-        end
+        define_setter(name, "#{name}=")
       end
 
       def define_has_many_id_methods(name)
@@ -455,16 +449,26 @@ module ActiveGraph::Node
           association_proxy(name).result_ids
         end
 
-        define_method_unless_defined("#{name.to_s.singularize}_ids=") do |ids|
-          clear_deferred_nodes_for_association(name)
-          association_proxy(name).replace_with(Array(ids).reject(&:blank?))
-        end
+        define_setter(name, "#{name.to_s.singularize}_ids=")
 
         define_method_unless_defined("#{name.to_s.singularize}_neo_ids") do
           association_proxy(name).pluck(:neo_id)
         end
       end
 
+      def define_setter(name, setter_name)
+        define_method_unless_defined(setter_name) do |others|
+          association_proxy_cache.clear # TODO: Should probably just clear for this association...
+          clear_deferred_nodes_for_association(name)
+          others = Array(others).reject(&:blank?)
+          if persisted?
+            ActiveGraph::Base.transaction { association_proxy(name).replace_with(others) }
+          else
+            defer_create(name, others, clear: true)
+          end
+        end
+      end
+
       def define_method_unless_defined(method_name, &block)
         define_method(method_name, block) unless method_defined?(method_name)
       end
@@ -492,9 +496,7 @@ module ActiveGraph::Node
           association_proxy(name).result_ids.first
         end
 
-        define_method_unless_defined("#{name}_id=") do |id|
-          association_proxy(name).replace_with(id)
-        end
+        define_setter(name, "#{name}_id=")
 
         define_method_unless_defined("#{name}_neo_id") do
           association_proxy(name).pluck(:neo_id).first
@@ -520,17 +522,7 @@ module ActiveGraph::Node
       end
 
       def define_has_one_setter(name)
-        define_method("#{name}=") do |other_node|
-          if persisted?
-            other_node.save if other_node.respond_to?(:persisted?) && !other_node.persisted?
-            association_proxy_cache.clear # TODO: Should probably just clear for this association...
-            ActiveGraph::Base.transaction { association_proxy(name).replace_with(other_node) }
-            # handle_non_persisted_node(other_node)
-          else
-            defer_create(name, other_node, clear: true)
-            other_node
-          end
-        end
+        define_setter(name, "#{name}=")
       end
 
       def define_class_method(*args, &block)
@@ -545,8 +537,7 @@ module ActiveGraph::Node
         query_proxy = previous_query_proxy || default_association_query_proxy
         ActiveGraph::Node::Query::QueryProxy.new(association_target_class(name),
                                                  associations[name],
-                                                 {driver: neo4j_driver,
-                                                  query_proxy: query_proxy,
+                                                 {query_proxy: query_proxy,
                                                   context: "#{query_proxy.context || self.name}##{name}",
                                                   optional: query_proxy.optional?,
                                                   association_labels: options[:labels],
@@ -578,7 +569,7 @@ module ActiveGraph::Node
 
       def default_association_query_proxy
         ActiveGraph::Node::Query::QueryProxy.new("::#{self.name}".constantize, nil,
-                                                 driver: neo4j_driver, query_proxy: nil, context: self.name.to_s)
+                                                 query_proxy: nil, context: self.name.to_s)
       end
 
       def build_association(macro, direction, name, options)

data/lib/active_graph/node/query/query_proxy.rb

@@ -33,7 +33,6 @@ module ActiveGraph
         # @option options [String, Symbol] :rel_var Same as above but pertaining to a relationship identifier
         # @option options [Range, Integer, Symbol, Hash] :rel_length A Range, a Integer, a Hash or a Symbol to indicate the variable-length/fixed-length
         #   qualifier of the relationship. See http://neo4jrb.readthedocs.org/en/latest/Querying.html#variable-length-relationships.
-        # @option options [Neo4j::Driver] :driver The driver to be used for this query
         # @option options [ActiveGraph::Node] :source_object The node instance at the start of the QueryProxy chain
         # @option options [QueryProxy] :query_proxy An existing QueryProxy chain upon which this new object should be built
         #
@@ -317,12 +316,6 @@ module ActiveGraph
           "result_#{(association || model).try(:name)}#{index}".downcase.tr(':', '').to_sym
         end
 
-        def _driver
-          (@driver || (@model && @model.neo4j_driver)).tap do |driver|
-            fail 'No driver found!' if driver.nil?
-          end
-        end
-
         def _association_arrow(properties = {}, create = false)
           @association && @association.arrow_cypher(@rel_var, properties, create, false, @rel_length)
         end
@@ -357,9 +350,9 @@ module ActiveGraph
         private
 
         def instance_vars_from_options!(options)
-          @node_var, @driver, @source_object, @starting_query, @optional,
+          @node_var, @source_object, @starting_query, @optional,
               @start_object, @query_proxy, @chain_level, @association_labels,
-              @rel_length = options.values_at(:node, :driver, :source_object, :starting_query, :optional,
+              @rel_length = options.values_at(:node, :source_object, :starting_query, :optional,
                                               :start_object, :query_proxy, :chain_level, :association_labels, :rel_length)
         end
 

data/lib/active_graph/node/unpersisted.rb

@@ -10,7 +10,7 @@ module ActiveGraph
       def defer_create(association_name, object, options = {})
         clear_deferred_nodes_for_association(association_name) if options[:clear]
 
-        deferred_nodes_for_association(association_name) << object
+        deferred_nodes_for_association(association_name).concat(Array(object))
       end
 
       def deferred_nodes_for_association(association_name)

data/lib/active_graph/relationship/query.rb

@@ -7,16 +7,14 @@ module ActiveGraph::Relationship
     module ClassMethods
       # Returns the object with the specified neo4j id.
       # @param [String,Integer] id of node to find
-      # @param [Neo4j::Driver] driver optional
-      def find(id, driver = self.neo4j_driver)
+      def find(id)
         fail "Unknown argument #{id.class} in find method (expected String or Integer)" if !(id.is_a?(String) || id.is_a?(Integer))
-        find_by_id(id, driver)
+        find_by_id(id)
       end
 
       # Loads the relationship using its neo_id.
-      def find_by_id(key, driver = nil)
-        options = driver ? {driver: driver} : {}
-        query ||= ActiveGraph::Base.new_query(options)
+      def find_by_id(key)
+        query = ActiveGraph::Base.new_query
         result = query.match('()-[r]-()').where('ID(r)' => key.to_i).limit(1).return(:r).first
         fail RecordNotFound.new("Couldn't find #{name} with 'id'=#{key.inspect}", name, key) if result.blank?
         result.r

data/lib/active_graph/shared.rb

@@ -10,18 +10,6 @@ module ActiveGraph
     include ActiveModel::Serializers::JSON
 
     module ClassMethods
-      # TODO: Deprecate neo4j_driver_name(name)
-
-      # remove?
-      def neo4j_driver
-        ActiveGraph::Base.driver
-      end
-
-      # remove?
-      def current_transaction
-        ActiveGraph::Base.current_transaction
-      end
-
       # This should be used everywhere.  Should make it easy
       # to support a driver-per-model system
       def neo4j_query(*args)

data/lib/active_graph/version.rb

@@ -1,3 +1,3 @@
 module ActiveGraph
-  VERSION = '10.0.0-beta.4'
+  VERSION = '10.0.0-beta.5'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: activegraph
 version: !ruby/object:Gem::Version
-  version: 10.0.0.pre.beta.4
+  version: 10.0.0.pre.beta.5
 platform: ruby
 authors:
 - Andreas Ronge, Brian Underwood, Chris Grigg, Heinrich Klobuczek
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-04-02 00:00:00.000000000 Z
+date: 2020-04-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel