neo4j 3.0.1 → 3.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 99403c4083f1e8b94fca74b9a70367a182f51b88
-  data.tar.gz: 4bf1f031533437c899b09e80f71d130f035d5b88
+  metadata.gz: 75e9394211348d0302d6f68dac0f87653eb95f28
+  data.tar.gz: 289355ac0ac9c885ae57eb12395046a1b612b5ae
 SHA512:
-  metadata.gz: 62d115d92d918698a84f92a5b589409becf59791181a0cf3bc124ea6c736b5bd3d3fa6c63eab3d3f95a9043c15ebd5bce4b2ece0237ff54fc56fe0cadfa2e35d
-  data.tar.gz: 744d4bf8e8e872cace8c9b316ed3176bdc6a8efea1765fbcb42bf8ae5067a445892a0365eff4ed783ee6359a99efbe99fa29242cbc49ca45bd2872e78151767e
+  metadata.gz: 6d85f48c40cb8d3af253ae0eae9ed40d10b351eb0dc993d962987426d54f395495b7a1940f970c8c25b4847693d658fa22a5e6c003ea85cdb36fc04da51b2e04
+  data.tar.gz: 8cd671cfc2c868f184388c4b37df8490b7d07b7dcc0421e3bce21ea1ee0caee1626e0b3800128e736f8002497a0868996e2517880b69f076d63d5664d9487096

data/CHANGELOG

@@ -1,3 +1,13 @@
+== 3.0.2
+* "Model#all" now evaluates lazily, models no longer include Enumerable
+* Faster, more efficient uniqueness validations
+* Adjusted many common queries to use params, will improve performance
+* ActiveRel fixes: create uses Core Query instead of Core's `rels` method, `{ classname: #{_classname} }` no longer inserted into every query, find related node IDs without loading the nodes 
+* Allow inheritance when checking model class on a relation (Andrew Jones)
+* Provided migrations will use Rake.original_dir instead of Rails.env to provide better compatibility with frameworks other than Rails
+* rel_class option in ActiveNode models will now accept string of a model name
+* Additional bug fixes
+
 == 3.0.1
 * Removed reference to neo4j-core from Gemfile and set neo4j.gemspec to use neo4j-core ~>3.0.0
 

data/README.md

@@ -2,19 +2,20 @@
 
 Neo4j.rb is an Active Model compliant Ruby/JRuby wrapper for [the Neo4j graph database](http://www.neo4j.org/). It uses the [neo4j-core](https://github.com/neo4jrb/neo4j-core) and [active_attr](https://github.com/cgriego/active_attr) gems.
 
-## Documentation version 3.0.0
+## Modern (3.X) Documentation
 
 * [Wiki](https://github.com/neo4jrb/neo4j/wiki/Neo4j.rb-v3-Introduction)
 
-## Documentation Old stable version 2.x
+## Legacy (2.x) Documentation
 
 * [README](https://github.com/neo4jrb/neo4j/tree/2.x)
 * [Wiki](https://github.com/neo4jrb/neo4j/wiki/Neo4j%3A%3ARails-Introduction)
 
 ## Support
 
+* Open an [issue](https://github.com/neo4jrb/neo4j/issues), post to [Stack Overflow](http://stackoverflow.com/questions/tagged/neo4j+ruby), or contact one of the developers.
 * [Neo4j.rb mailing list](https://groups.google.com/forum/#!forum/neo4jrb)
-* Consulting support ? ask any of the developers
+* Consulting support? Ask any of the developers, info below.
 
 ## Developers
 

data/lib/neo4j/active_node/has_n/association.rb

@@ -23,7 +23,6 @@ module Neo4j
         # Return cypher partial query string for the relationship part of a MATCH (arrow / relationship definition)
         def arrow_cypher(var = nil, properties = {}, create = false)
           validate_origin!
-
           relationship_type = relationship_type(create)
           relationship_name_cypher = ":`#{relationship_type}`" if relationship_type
           properties_string = get_properties_string(properties)
@@ -55,7 +54,7 @@ module Neo4j
         def relationship_type(create = false)
           case
           when @relationship_class
-            @relationship_class._type
+            relationship_class_type
           when @relationship_type
             @relationship_type
           when @origin
@@ -69,6 +68,16 @@ module Neo4j
           @relationship_class
         end
 
+        def relationship_class_type
+          @relationship_class = @relationship_class.constantize if @relationship_class.class == String || @relationship_class == Symbol
+          @relationship_class._type
+        end
+
+        def inject_classname(properties)
+          properties[Neo4j::Config.class_name_property] = @relationship_class.name if @relationship_class
+          properties
+        end
+
         private
 
         def get_direction(relationship_cypher, create)
@@ -88,7 +97,6 @@ module Neo4j
         end
 
         def get_properties_string(properties)
-          properties[Neo4j::Config.class_name_property] = @relationship_class.name if @relationship_class
           p = properties.map do |key, value|
             "#{key}: #{value.inspect}"
           end.join(', ')
@@ -124,8 +132,8 @@ module Neo4j
 
         def validate_option_combinations(options)
           raise ArgumentError, "Cannot specify both :type and :origin (#{base_declaration})" if options[:type] && options[:origin]
-          raise ArgumentError, "Cannot specify both :type and :rel_class (#{base_declaration})" if options[:type] && options[:rel_class]
-          raise ArgumentError, "Cannot specify both :origin and :rel_class (#{base_declaration}" if options[:origin] && options[:rel_class]
+          # raise ArgumentError, "Cannot specify both :type and :rel_class (#{base_declaration})" if options[:type] && options[:rel_class] see issue #494
+          # raise ArgumentError, "Cannot specify both :origin and :rel_class (#{base_declaration}" if options[:origin] && options[:rel_class]
         end
 
         # Determine if model class as derived from the association name would be different than the one specified via the model_class key

data/lib/neo4j/active_node/id_property.rb

@@ -115,6 +115,10 @@ module Neo4j::ActiveNode
 
     module ClassMethods
 
+      def find_by_neo_id(id)
+        Neo4j::Node.load(id)
+      end
+
       def find_by_id(id)
         self.where(id_property_name => id).first
       end

data/lib/neo4j/active_node/labels.rb

@@ -13,7 +13,16 @@ module Neo4j
       # @return the labels
       # @see Neo4j-core
       def labels
-        @_persisted_obj.labels
+        if @_persisted_obj.labels.nil?
+          r = queried_labels
+          @_persisted_obj.labels = r
+        else
+          @_persisted_obj.labels
+        end
+      end
+
+      def queried_labels
+        self.class.query_as(:result).where("ID(result)" => self.neo_id).return("LABELS(result) as result_labels").first.result_labels.map(&:to_sym)
       end
 
       # adds one or more labels
@@ -63,11 +72,9 @@ module Neo4j
 
         # Find all nodes/objects of this class
         def all
-          self.query_as(:n).pluck(:n)
+          self.as(:n)
         end
 
-
-
         # Returns the object with the specified neo4j id.
         # @param [String,Fixnum] id of node to find
         def find(id)

data/lib/neo4j/active_node/node_wrapper.rb

@@ -3,6 +3,7 @@ class Neo4j::Node
 
     # this is a plugin in the neo4j-core so that the Ruby wrapper will be wrapped around the Neo4j::Node objects
     def wrapper
+      self.props.symbolize_keys!
       most_concrete_class = sorted_wrapper_classes
       return self unless most_concrete_class
       wrapped_node = most_concrete_class.new

data/lib/neo4j/active_node/query.rb

@@ -17,18 +17,10 @@ module Neo4j
       # @param var [Symbol, String] The variable name to specify in the query
       # @return [Neo4j::Core::Query]
       def query_as(var)
-        self.class.query_as(var).where("ID(#{var}) = #{self.neo_id}")
+        self.class.query_as(var).where("ID(#{var})" => self.neo_id)
       end
 
       module ClassMethods
-        include Enumerable
-
-        #attr_writer :query_proxy
-
-        def each
-          self.query_as(:n).pluck(:n).each {|o| yield o }
-        end
-
         # Returns a Query object with all nodes for the model matched as the specified variable name
         #
         # @example Return the registration number of all cars owned by a person over the age of 30

data/lib/neo4j/active_node/query/query_proxy.rb

@@ -135,7 +135,7 @@ module Neo4j
         def create(other_nodes, properties)
           raise "Can only create associations on associations" unless @association
           other_nodes = [other_nodes].flatten
-
+          properties = @association.inject_classname(properties)
           other_nodes = other_nodes.map do |other_node|
             case other_node
             when Integer, String
@@ -145,7 +145,7 @@ module Neo4j
             end
           end.compact
 
-          raise ArgumentError, "Node must be of the association's class when model is specified" if @model && other_nodes.any? {|other_node| other_node.class != @model }
+          raise ArgumentError, "Node must be of the association's class when model is specified" if @model && other_nodes.any? {|other_node| !other_node.is_a?(@model) }
           other_nodes.each do |other_node|
             #Neo4j::Transaction.run do
               other_node.save if not other_node.persisted?

data/lib/neo4j/active_node/query/query_proxy_methods.rb

@@ -37,7 +37,7 @@ module Neo4j
         def include?(other, target=nil)
           raise(InvalidParameterError, ':include? only accepts nodes') unless other.respond_to?(:neo_id)
           query_with_target(target) do |target|
-            self.where("#{target}.#{other.class.primary_key} = {other_node_id}").params(other_node_id: other.id).query.return("count(#{target}) as count").first.count > 0
+            self.where("ID(#{target}) = {other_node_id}").params(other_node_id: other.neo_id).query.return("count(#{target}) as count").first.count > 0
           end
         end
 
@@ -59,7 +59,7 @@ module Neo4j
         def exists_query_start(origin, condition, target)
           case
           when condition.class == Fixnum
-            self.where("ID(#{target}) = #{condition}")
+            self.where("ID(#{target}) = {exists_condition}").params(exists_condition: condition)
           when condition.class == Hash
             self.where(condition.keys.first => condition.values.first)
           else

data/lib/neo4j/active_node/query_methods.rb

@@ -31,22 +31,17 @@ module Neo4j
       alias_method :length, :count
 
       def empty?
-        !self.exists?
+        !self.all.exists?
       end
 
       alias_method :blank?, :empty?
 
-      def include?(other)
-        raise(InvalidParameterError, ':include? only accepts nodes') unless other.respond_to?(:neo_id)
-        self.query_as(:n).where(n: {primary_key => other.id}).return("count(n) AS count").first.count > 0
-      end
-
       private
 
       def exists_query_start(node_condition)
         case node_condition
         when Fixnum
-          self.query_as(:n).where("ID(n) = #{node_condition}")
+          self.query_as(:n).where("ID(n)" => node_condition)
         when Hash
           self.where(node_condition.keys.first => node_condition.values.first)
         else

data/lib/neo4j/active_node/validations.rb

@@ -33,10 +33,9 @@ module Neo4j
 
           conditions[attribute] = options[:case_sensitive] ? value : /^#{Regexp.escape(value.to_s)}$/i
 
-          # prevent that same object is returned
-          # TODO: add negative condtion to not return current record
-          found = record.class.where(conditions).to_a.select{|f| f.neo_id != record.neo_id}
-          record.errors.add(attribute, :taken, options.except(:case_sensitive, :scope).merge(:value => value)) if found.count > 0
+          found = record.class.as(:result).where(conditions)
+          found = found.where("NOT ID(result) = {record_neo_id}").params(record_neo_id: record.neo_id) if record.persisted?
+          record.errors.add(attribute, :taken, options.except(:case_sensitive, :scope).merge(:value => value)) if found.exists?
         end
 
         def message(instance)

data/lib/neo4j/active_rel/persistence.rb

@@ -24,7 +24,7 @@ module Neo4j::ActiveRel
       set_timestamps
       properties = convert_properties_to :db, props
       rel = _create_rel(from_node, to_node, properties)
-      init_on_load(rel, from_node, to_node, @rel_type)
+      init_on_load(rel._persisted_obj, from_node, to_node, @rel_type)
       true
     end
 
@@ -62,7 +62,7 @@ module Neo4j::ActiveRel
       props = self.class.default_property_values(self)
       props.merge!(args[0]) if args[0].is_a?(Hash)
       set_classname(props)
-      from_node.create_rel(type, to_node, props)
+      _rel_creation_query(from_node, to_node, props)
     end
 
     def class_as_constant(type)
@@ -80,5 +80,19 @@ module Neo4j::ActiveRel
     def allows_any_class?(type)
       self.class.send(type) == :any || self.class.send(type) == false
     end
+
+    private
+
+    def _rel_creation_query(from_node, to_node, props)
+      from_class = from_node.class
+      to_class = to_node.class
+      Neo4j::Session.query.match(n1: from_class.mapped_label_name, n2: to_class.mapped_label_name)
+        .where("n1.#{from_class.primary_key} = {from_node_id}")
+        .where("n2.#{to_class.primary_key} = {to_node_id}")
+        .params(from_node_id: from_node.id, to_node_id: to_node.id)
+        .create("(n1)-[r:`#{type}`]->(n2)")
+        .with('r').set(r: props).return(:r).first.r
+    end
+
   end
 end

data/lib/neo4j/active_rel/query.rb

@@ -14,7 +14,7 @@ module Neo4j::ActiveRel
 
       # Loads the relationship using its neo_id.
       def find_by_id(key, session = Neo4j::Session.current!)
-        Neo4j::Relationship.load(key.to_i, session)
+        session.query.match("()-[r]-()").where("ID(r)" => key.to_i).limit(1).return(:r).first.r
       end
 
       # Performs a very basic match on the relationship.

data/lib/neo4j/active_rel/related_node.rb

@@ -1,22 +1,40 @@
 module Neo4j::ActiveRel
   # A container for ActiveRel's :inbound and :outbound methods. It provides lazy loading of nodes.
+  # It's important (or maybe not really IMPORTANT, but at least worth mentioning) that calling method_missing
+  # will result in a query to load the node if the node is not already loaded.
   class RelatedNode
 
     class InvalidParameterError < StandardError; end
 
+    # ActiveRel's related nodes can be initialized with nothing, an integer, or a fully wrapped node.
+    #
+    # Initialization with nothing happens when a new, non-persisted ActiveRel object is first initialized.
+    #
+    # Initialization with an integer happens when a relationship is loaded from the database. It loads using the ID
+    # because that is provided by the Cypher response and does not require an extra query.
+    #
+    # Initialization with a node doesn't appear to happen in the code. TODO: maybe find out why this is an option.
     def initialize(node = nil)
       @node = valid_node_param?(node) ? node : (raise InvalidParameterError, 'RelatedNode must be initialized with either a node ID or node' )
     end
 
+    # Loads the node if needed, then conducts comparison.
     def == (obj)
       loaded if @node.is_a?(Fixnum)
       @node == obj
     end
 
+    # Returns the neo_id of a given node without loading.
+    def neo_id
+      loaded? ? @node.neo_id : @node
+    end
+
+    # Loads a node from the database or returns the node if already laoded
     def loaded
       @node = @node.respond_to?(:neo_id) ? @node : Neo4j::Node.load(@node)
     end
 
+    # @return [Boolean] indicates whether a node has or has not been fully loaded from the database
     def loaded?
       @node.respond_to?(:neo_id)
     end

data/lib/neo4j/migration.rb

@@ -13,11 +13,19 @@ module Neo4j
       print string unless !!ENV['silenced']
     end
 
+    def default_path
+      Rails.root if defined? Rails
+    end
+
+    def joined_path(path)
+      File.join(path, 'db', 'neo4j-migrate')
+    end
+
     class AddIdProperty < Neo4j::Migration
       attr_reader :models_filename
 
-      def initialize
-        @models_filename = File.join(Rails.root.join('db', 'neo4j-migrate'), 'add_id_property.yml')
+      def initialize(path = default_path)
+        @models_filename = File.join(joined_path(path), 'add_id_property.yml')
       end
 
       def migrate
@@ -109,9 +117,9 @@ module Neo4j
 
     class AddClassnames < Neo4j::Migration
 
-      def initialize
+      def initialize(path = default_path)
         @classnames_filename = 'add_classnames.yml'
-        @classnames_filepath = File.join(Rails.root.join('db', 'neo4j-migrate'), classnames_filename)
+        @classnames_filepath = File.join(joined_path(path), classnames_filename)
       end
 
       def migrate

data/lib/neo4j/tasks/migration.rake

@@ -3,15 +3,16 @@ require 'neo4j/migration'
 namespace :neo4j do
   desc "Run a script against the database to perform system-wide changes"
   task :migrate, [:task_name, :subtask] => :environment do |_, args|
+    path = Rake.original_dir
     migration_task = args[:task_name]
     task_name_constant = migration_task.split('_').map { |word| word.capitalize }.join('')
     begin
     migration_class = "Neo4j::Migration::#{task_name_constant}".constantize
     rescue NameError
-      load File.join(Rails.root.join('db', 'neo4j-migrate'), "#{migration_task}.rb")
+      load File.join(path, 'db', 'neo4j-migrate', "#{migration_task}.rb")
       migration_class = "#{task_name_constant}".constantize
     end
-    migration = migration_class.new
+    migration = migration_class.new(path)
 
     subtask = args[:subtask]
     if subtask

data/lib/neo4j/version.rb

@@ -1,3 +1,3 @@
 module Neo4j
-  VERSION = "3.0.1"
+  VERSION = "3.0.2"
 end

data/neo4j.gemspec

@@ -31,7 +31,7 @@ A Neo4j OGM (Object-Graph-Mapper) for use in Ruby on Rails and Rack frameworks,
   s.add_dependency("activesupport", "~> 4")
   s.add_dependency("railties", "~> 4")
   s.add_dependency('active_attr', "~> 0.8")
-  s.add_dependency("neo4j-core", "~> 3.0.0")
+  s.add_dependency("neo4j-core", "~> 3.0.2")
 
   if RUBY_PLATFORM =~ /java/
     s.add_dependency("neo4j-community", '~> 2.0')

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: neo4j
 version: !ruby/object:Gem::Version
-  version: 3.0.1
+  version: 3.0.2
 platform: ruby
 authors:
 - Andreas Ronge
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-29 00:00:00.000000000 Z
+date: 2014-10-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: orm_adapter
@@ -86,14 +86,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.0.0
+        version: 3.0.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.0.0
+        version: 3.0.2
 description: |
   A Neo4j OGM (Object-Graph-Mapper) for use in Ruby on Rails and Rack frameworks, intended as a complete replacement for ActiveRecord.
 email: andreas.ronge@gmail.com