neo4j 3.0.2 → 3.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 75e9394211348d0302d6f68dac0f87653eb95f28
-  data.tar.gz: 289355ac0ac9c885ae57eb12395046a1b612b5ae
+  metadata.gz: 4d902cb2867667c62e30b5a4c0ca2aa5341b06cc
+  data.tar.gz: 95ce7ebf16a229a510ab76aeb1e40b69275e1dc3
 SHA512:
-  metadata.gz: 6d85f48c40cb8d3af253ae0eae9ed40d10b351eb0dc993d962987426d54f395495b7a1940f970c8c25b4847693d658fa22a5e6c003ea85cdb36fc04da51b2e04
-  data.tar.gz: 8cd671cfc2c868f184388c4b37df8490b7d07b7dcc0421e3bce21ea1ee0caee1626e0b3800128e736f8002497a0868996e2517880b69f076d63d5664d9487096
+  metadata.gz: 265e6724e37c3a89d7af59dcc2484915cd0d39b60e1cf642bd22ed1f0a6d997aa09163186148e78803f7cec552be2c07f0ce9eb503f572208c116313da6db764
+  data.tar.gz: c84429373e502d634d4b29c6a0ab864af15e4def869260693bfba8789c4a610c2406f2dd611d6d84317ca2a55199c267d642342f1610966d5a210a351ae873eb

data/CHANGELOG

@@ -1,8 +1,17 @@
+== 3.0.3
+* Gemspec has been updated to require neo4j-core 3.0.5
+* Added `find_in_batches`
+* Pagination has been updated to allow better ordering. Relaunch of neo4j-will_paginate as neo4j-will_paginate_redux is imminent!
+* Everything is better: `create`'s handling of blocks, better behavior from `count`, better ActiveRel from_class/to_class checks, better handling of rel_class strings, and more
+* Added a new find_or_create_by class method
+
+Big thanks to new contributors Miha Rekar and Michael Perez! Also check out or Github issues, where we're discussing changes for 3.1.0. https://github.com/neo4jrb/neo4j/issues
+
 == 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 
+* 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

data/Gemfile

@@ -2,7 +2,7 @@ source 'http://rubygems.org'
 
 gemspec
 
-#gem 'neo4j-core', path: '../neo4j-core'
+gem 'neo4j-core', github: 'neo4jrb/neo4j-core' if ENV["TRAVIS"]
 #gem 'neo4j-core', git: 'https://github.com/neo4jrb/neo4j-core'
 #gem 'orm_adapter', :path => '../orm_adapter'
 

data/README.md

@@ -1,7 +1,11 @@
-# Welcome to Neo4j.rb [![Build Status](https://secure.travis-ci.org/neo4jrb/neo4j.png?branch=master)](http://travis-ci.org/neo4jrb/neo4j) [![Coverage Status](https://coveralls.io/repos/neo4jrb/neo4j/badge.png?branch=master)](https://coveralls.io/r/neo4jrb/neo4j?branch=master) [![Code Climate](https://codeclimate.com/github/neo4jrb/neo4j.png)](https://codeclimate.com/github/andreasronge/neo4j)
+# Welcome to Neo4j.rb
+[![Build Status](https://secure.travis-ci.org/neo4jrb/neo4j.png?branch=master)](http://travis-ci.org/neo4jrb/neo4j) [![Coverage Status](https://coveralls.io/repos/neo4jrb/neo4j/badge.png?branch=master)](https://coveralls.io/r/neo4jrb/neo4j?branch=master) [![Code Climate](https://codeclimate.com/github/neo4jrb/neo4j.png)](https://codeclimate.com/github/andreasronge/neo4j)
 
 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.
 
+Winner of a 2014 Graphie for "Best Community Contribution" at Neo4j's [Graph Connect](http://graphconnect.com) conference!
+![2014 Graphie](http://i.imgur.com/CkOoTTYm.jpg)
+
 ## Modern (3.X) Documentation
 
 * [Wiki](https://github.com/neo4jrb/neo4j/wiki/Neo4j.rb-v3-Introduction)

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

@@ -27,7 +27,7 @@ module Neo4j
           relationship_name_cypher = ":`#{relationship_type}`" if relationship_type
           properties_string = get_properties_string(properties)
           relationship_cypher = get_relationship_cypher(var, relationship_name_cypher, properties_string)
-          get_direction(relationship_cypher, create) 
+          get_direction(relationship_cypher, create)
         end
 
         def target_class_name
@@ -73,8 +73,12 @@ module Neo4j
           @relationship_class._type
         end
 
+        def relationship_class_name
+          @relationship_class_name ||= @relationship_class.respond_to?(:constantize) ? @relationship_class : @relationship_class.name
+        end
+
         def inject_classname(properties)
-          properties[Neo4j::Config.class_name_property] = @relationship_class.name if @relationship_class
+          properties[Neo4j::Config.class_name_property] = relationship_class_name if @relationship_class
           properties
         end
 
@@ -117,7 +121,7 @@ module Neo4j
           @relationship_class = options[:rel_class]
           @relationship_type  = options[:type] && options[:type].to_sym
         end
-        
+
         # Return basic details about association as declared in the model
         # @example
         #   has_many :in, :bands

data/lib/neo4j/active_node/persistence.rb

@@ -68,12 +68,13 @@ module Neo4j::ActiveNode
     end
 
     module ClassMethods
-      # Creates a saves a new node
+      # Creates and saves a new node
       # @param [Hash] props the properties the new node should have
-      def create(props = {})
+      def create(props = {}, &block)
         association_props = extract_association_attributes!(props)
 
         new(props).tap do |obj|
+          yield obj if block_given?
           obj.save
           association_props.each do |prop, value|
             obj.send("#{prop}=", value)
@@ -82,7 +83,7 @@ module Neo4j::ActiveNode
       end
 
       # Same as #create, but raises an error if there is a problem during save.
-      def create!(*args)
+      def create!(*args, &block)
         props = args[0] || {}
         association_props = extract_association_attributes!(props)
 
@@ -95,6 +96,16 @@ module Neo4j::ActiveNode
         end
       end
 
+      # Finds the first node with the given attributes, or calls create if none found
+      def find_or_create_by(attributes, &block)
+        find_by(attributes) || create(attributes, &block)
+      end
+
+      # Same as #find_or_create_by, but calls #create! so it raises an error if there is a problem during save.
+      def find_or_create_by!(attributes, &block)
+        find_by(attributes) || create!(attributes, &block)
+      end
+
       def load_entity(id)
         Neo4j::Node.load(id)
       end

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

@@ -174,12 +174,11 @@ module Neo4j
         end
 
         attr_reader :context
+        attr_reader :node_var
 
         protected
         # Methods are underscored to prevent conflict with user class methods
 
-        attr_reader :node_var
-
         def _add_params(params)
           @params = @params.merge(params)
         end

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

@@ -21,7 +21,7 @@ module Neo4j
           raise(InvalidParameterError, ':count accepts `distinct` or nil as a parameter') unless distinct.nil? || distinct == :distinct
           query_with_target(target) do |target|
             q = distinct.nil? ? target : "DISTINCT #{target}"
-            self.query.return("count(#{q}) AS count").first.count
+            self.query.pluck("count(#{q}) AS #{target}").first
           end
         end
 

data/lib/neo4j/active_node/query_methods.rb

@@ -36,6 +36,23 @@ module Neo4j
 
       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
+
+      def find_in_batches(options = {})
+        self.query_as(:n).return(:n).find_in_batches(:n, primary_key, options) do |batch|
+          yield batch.map(&:n)
+        end
+      end
+
+      def find_each(options = {})
+        self.query_as(:n).return(:n).find_each(:n, primary_key, options) do |batch|
+          yield batch.n
+        end
+      end
+
       private
 
       def exists_query_start(node_condition)

data/lib/neo4j/active_rel/persistence.rb

@@ -54,7 +54,7 @@ module Neo4j::ActiveRel
       [from_node, to_node].each do |node|
         type = from_node == node ? :_from_class : :_to_class
         next if allows_any_class?(type)
-        raise ModelClassInvalidError, "Node class was #{node.class}, expected #{self.class.send(type)}" unless class_as_constant(type) == node.class
+        raise ModelClassInvalidError, "Node class was #{node.class}, expected #{self.class.send(type)}" unless class_as_constant(type) == node.class || node.class.ancestors.include?(class_as_constant(type))
       end
     end
 

data/lib/neo4j/active_rel/query.rb

@@ -23,7 +23,11 @@ module Neo4j::ActiveRel
       # @example Match with a string
       #   MyRelClass.where('r1.grade > r1')
       def where(args={})
-        Neo4j::Session.query.match("#{cypher_string(:outbound)}-[r1:`#{self._type}`]->#{cypher_string(:inbound)}").where(where_string(args)).pluck(:r1)
+        where_query.where(where_string(args)).pluck(:r1)
+      end
+
+      def array_load(ids_array)
+        where_query.where("ID(r1) IN {ids_array}").params(ids_array: ids_array).pluck(:r1)
       end
 
       # Performs a basic match on the relationship, returning all results.
@@ -42,6 +46,10 @@ module Neo4j::ActiveRel
 
       private
 
+      def where_query
+        Neo4j::Session.query.match("#{cypher_string(:outbound)}-[r1:`#{self._type}`]->#{cypher_string(:inbound)}")
+      end
+
       def all_query
         Neo4j::Session.query.match("#{cypher_string}-[r1:`#{self._type}`]->#{cypher_string(:inbound)}")
       end

data/lib/neo4j/paginated.rb

@@ -7,10 +7,16 @@ module Neo4j
       @items, @total, @current_page = items, total, current_page
     end
 
-    def self.create_from(source, page, per_page)
+    def self.create_from(source, page, per_page, order = nil)
       #partial = source.drop((page-1) * per_page).first(per_page)
+      target = source.node_var
       partial = source.skip(page-1).limit(per_page)
-      Paginated.new(partial, source.count, page)
+      ordered_partial, ordered_source = if order
+                                          [partial.order_by(order), source.query.with("#{target} as #{target}").pluck("COUNT(#{target})").first]
+                                        else
+                                          [partial, source.count]
+                                        end
+      Paginated.new(ordered_partial, ordered_source, page)
     end
 
     delegate :each, :to => :items

data/lib/neo4j/version.rb

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

data/neo4j.gemspec

@@ -11,7 +11,7 @@ Gem::Specification.new do |s|
 
   s.authors  = "Andreas Ronge"
   s.email    = 'andreas.ronge@gmail.com'
-  s.homepage = "https://github.com/andreasronge/neo4j/"
+  s.homepage = "https://github.com/neo4jrb/neo4j/"
   s.rubyforge_project = 'neo4j'
   s.summary = "A graph database for Ruby"
   s.license = 'MIT'
@@ -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.2")
+  s.add_dependency("neo4j-core", "~> 3.0.5")
 
   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.2
+  version: 3.0.3
 platform: ruby
 authors:
 - Andreas Ronge
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-23 00:00:00.000000000 Z
+date: 2014-11-03 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.2
+        version: 3.0.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.0.2
+        version: 3.0.5
 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
@@ -160,7 +160,7 @@ files:
 - lib/rails/generators/neo4j/model/templates/model.erb
 - lib/rails/generators/neo4j_generator.rb
 - neo4j.gemspec
-homepage: https://github.com/andreasronge/neo4j/
+homepage: https://github.com/neo4jrb/neo4j/
 licenses:
 - MIT
 metadata: {}
@@ -187,7 +187,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: neo4j
-rubygems_version: 2.2.2
+rubygems_version: 2.4.2
 signing_key: 
 specification_version: 4
 summary: A graph database for Ruby