neo4j 2.0.1-java → 2.2.0-java

data/lib/neo4j/rails/attributes.rb

@@ -18,7 +18,8 @@ module Neo4j
       included do
         include ActiveModel::Dirty # track changes to attributes
         include ActiveModel::MassAssignmentSecurity # handle attribute hash assignment
-
+        
+        
         class << self
           attr_accessor :attribute_defaults
         end
@@ -238,10 +239,12 @@ module Neo4j
       module ClassMethods
         # Returns all defined properties
         def columns
-          self._decl_props.keys
+          columns = []
+          props = Marshal.load( Marshal.dump(self._decl_props ))
+          props.each { |k,v| v.store(:name, k ); columns << Column.new(v) }
+          columns
         end
 
-
         # Declares a property.
         # It support the following hash options:
         # <tt>:default</tt>,<tt>:null</tt>,<tt>:limit</tt>,<tt>:type</tt>,<tt>:index</tt>,<tt>:converter</tt>.

data/lib/neo4j/rails/column.rb

@@ -0,0 +1,26 @@
+#
+# This is a way to wrap model attributes as Active Record-like column objects, providing a name and type for the column. 
+# This helps when using view generators, such as twitter-bootstrap-rails. 
+#
+
+
+module Neo4j
+  module Rails
+    
+    class Column
+      
+      attr_reader :name, :type, :index, :converter
+      
+      def initialize(args)
+           raise ArgumentError, "Column must passed a :name" if args[:name].nil?
+           args[:type] ||= "String" # default the type to String. 
+           args.each do |k,v|
+             instance_variable_set("@#{k}", v.to_s) unless v.nil?
+           end
+      end
+      
+    end 
+    
+  end #rails
+end #neo4j
+    

data/lib/neo4j/rails/finders.rb

@@ -57,7 +57,7 @@ module Neo4j
           if self._decl_props[field.to_sym] && self._decl_props[field.to_sym][:type] == Fixnum
             module_eval <<-RUBY, __FILE__, __LINE__
               def self.all_by_#{field}(value)
-                find_with_indexer(:#{field} => value)
+                find_with_indexer_or_traversal(:#{field} => value)
               end
   	  		  def self.find_by_#{field}(value)
 	  	        all_by_#{field}(value).first
@@ -66,7 +66,7 @@ module Neo4j
           else
             module_eval <<-RUBY, __FILE__, __LINE__
               def self.all_by_#{field}(value)
-                find_with_indexer("#{field}: \\"\#{value}\\"")
+                find_with_indexer_or_traversal("#{field}: \\"\#{value}\\"")
               end
 
               def self.find_by_#{field}(value)
@@ -175,13 +175,19 @@ module Neo4j
             if ids
               [find_with_ids(ids)].flatten
             else
-              find_with_indexer(*args, &block)
+              find_with_indexer_or_traversal(*args, &block)
             end
           end
         end
 
         def first(*args, &block)
-          all(*args, &block).first
+          found = all(*args, &block).first
+          if found && args.first.is_a?(Hash) && args.first.include?(:id)
+            # if search for an id then all the other properties must match
+            args.first.find{|k,v| k != :id && found.send(k) != v} ? nil : found
+          else
+            found
+          end
         end
 
         def last(*args)
@@ -245,6 +251,28 @@ module Neo4j
           entity.is_a?(self) and entity.reachable_from_ref_node?
         end
 
+        
+        def use_traversal_finder?(*args)
+          # Conditions for using a traversal:
+          # 1. the first argument is a hash
+          return false unless args.first.is_a?(Hash)
+          
+          # 2. no support for :condition hash
+          return false if args.first.include?(:conditions)
+          
+          # 3. there is at least one property which does not have a lucene index
+          args.first.keys.find{|k| !index?(k)}
+        end
+
+
+        def find_with_indexer_or_traversal(*args, &block)
+          if use_traversal_finder?(*args)
+            find_with_traversal(args.first)
+          else
+            find_with_indexer(*args, &block)
+          end
+        end
+
         def find_with_indexer(*args, &block)
           hits = if args.first.is_a?(Hash) && args.first.include?(:conditions)
                    params = args.first.clone
@@ -262,6 +290,22 @@ module Neo4j
           hits
         end
 
+        def find_with_traversal(conditions)
+          this = self
+          all.query do |cypher|
+            conditions.each_pair do |k,v|
+              if this._decl_rels.keys.include?(k)
+                n = node(v.id)
+                rel_name = rel(this._decl_rels[k].rel_type)
+                this._decl_rels[k].dir == :outgoing ? cypher > rel_name > n : cypher < rel_name < n
+              else
+                cypher[k] == v
+              end
+            end
+            cypher
+          end
+        end
+
         # Find the first object or create/initialize it.
         #
         # @example Find or perform an action.

data/lib/neo4j/rails/ha_console/ha_console.rb

@@ -0,0 +1,68 @@
+require 'neo4j-enterprise'
+require 'fileutils'
+require 'tmpdir'
+
+module Neo4j
+
+  module Rails
+
+    # Configures Neo4j HA and Zookeeper in order to be used from a rails console
+    # @see Railtie
+    module HaConsole
+      class << self
+        def machine_id
+          (defined? IRB) ? 2 : 1
+        end
+
+        def proj_root
+          Object::Rails.root
+        end
+
+        def storage_path(id = machine_id)
+          File.expand_path("db/ha_neo_#{id}", proj_root)
+        end
+
+        def config_machine(id = machine_id)
+          puts "config_machine #{id}"
+          # override this default config with this machine configuration
+          Neo4j.config['ha.db'] = true
+          Neo4j.config['ha.server_id'] = id
+          Neo4j.config['ha.server'] = "localhost:600#{machine_id}"
+          Neo4j.config['ha.pull_interval'] = "2"
+          Neo4j.config[:storage_path] = storage_path(id)
+
+          copy_config unless File.exist?(config_dir)
+          require "#{config_dir}/zookeeper"
+        end
+
+        def config_dir
+          File.expand_path("neo4j_ha_console/zookeeper", Dir.tmpdir)
+        end
+
+        def copy_config
+          source_dir = File.expand_path("zookeeper", File.dirname(__FILE__))
+          system("mkdir -p #{File.expand_path("..", config_dir)}")
+          system("cp -r #{source_dir} #{config_dir}")
+        end
+
+        def zookeeper_running?
+          Zookeeper.pid_file?
+        end
+
+        def start_zookeeper
+          Zookeeper.start unless zookeeper_running?
+        end
+
+        def shutdown_zookeeper
+          if zookeeper_running?
+            Zookeeper.shutdown
+          else
+            puts "Can't shutdown zookeeper - no PID file found for zookeeper process at #{Zookeeper.pid_file}"
+          end
+        end
+
+      end
+    end
+  end
+end
+

data/lib/neo4j/rails/ha_console/railtie.rb

@@ -0,0 +1,21 @@
+require File.expand_path('../ha_console', __FILE__)
+
+module Neo4j
+
+  module Rails
+
+    module HaConsole
+
+      # Include this in your config/application.rb in order to run a rails console
+      # It avoids the Neo4j limitation of only having one process accessing the database by using HA clustering/neo4j-enterprise
+      class Railtie < Object::Rails::Railtie
+        config.before_configuration do
+          Neo4j::Rails::HaConsole.config_machine
+          Neo4j::Rails::HaConsole.start_zookeeper
+          config.neo4j.storage_path = Neo4j::Rails::HaConsole.storage_path
+          puts "HA: #{Neo4j.config['ha.db']}, server_id: #{Neo4j.config['ha.server_id']}, master: #{Neo4j.ha_master?}, storage_path=#{config.neo4j.storage_path}"
+        end
+      end
+    end
+  end
+end

data/lib/neo4j/rails/ha_console/zookeeper/clean.sh

@@ -0,0 +1,4 @@
+#!/bin/sh
+
+rm -rf db
+rm -rf data/zookeeper1/version-2

data/lib/neo4j/rails/ha_console/zookeeper/conf/server1.cfg

@@ -0,0 +1,11 @@
+#server1.cfg
+tickTime=2000
+initLimit=10
+syncLimit=5
+ 
+dataDir=data/zookeeper1
+clientPort=2181
+ 
+server.1=localhost:2888:3888
+#server.2=localhost:2889:3889
+#server.3=localhost:2890:3890

data/lib/neo4j/rails/ha_console/zookeeper/data/zookeeper1/myid

@@ -0,0 +1 @@
+1

data/lib/neo4j/rails/ha_console/zookeeper/start_zookeeper.sh

@@ -0,0 +1,17 @@
+#!/bin/sh
+
+# Only follow symlinks if readlink supports it
+if readlink -f "$0" > /dev/null 2>&1
+then
+  ZOOBIN=`readlink -f "$0"`
+else
+  ZOOBIN="$0"
+fi
+
+ZOOMAIN="org.apache.zookeeper.server.quorum.QuorumPeerMain"
+
+ZOOBINDIR=`dirname "$ZOOBIN"`
+JARDIR=`cd "${ZOOBINDIR}/lib"; pwd`
+
+CLASSPATH=$JARDIR/log4j-1.2.16.jar:$JARDIR/zookeeper-3.3.2.jar
+java -cp "$CLASSPATH" $ZOOMAIN conf/server1.cfg

data/lib/neo4j/rails/ha_console/zookeeper/zookeeper.rb

@@ -0,0 +1,62 @@
+module Neo4j
+  module Rails
+    module HaConsole
+      module Zookeeper
+        class << self
+          def shutdown
+            return unless pid_file?
+            file = File.open(pid_file, "rb")
+            pid = file.read.to_s.chomp
+            IO.popen("pkill -TERM -P #{pid}")
+            puts "Zookeeper: shutdown #{pid}"
+            system("rm -f #{pid_file}")
+          end
+
+          def clean
+            dir = File.expand_path("data/zookeeper1/version-2", File.dirname(__FILE__))
+            puts "Zookeeper: clean #{dir}"
+            system("rm -rf #{dir}")
+          end
+
+          def pid_file
+            File.expand_path("zookeeper.pid", File.dirname(__FILE__)).to_s
+          end
+
+          def pid_file?
+            x = File.exist?(pid_file)
+            puts "Zookeeper: pid file #{x} at #{pid_file}"
+            x
+          end
+
+          def lib_dir
+            File.expand_path("lib", File.dirname(__FILE__))
+          end
+
+          def copy_jars
+            puts "Zookeeper: Copy JARs"
+            files = $CLASSPATH.find_all{|x| x =~ /\.jar$/}.collect{|y| y.sub('file:', '')}
+            zookeeper = files.find{|f| f =~ /\/zookeeper/}
+            raise "zookeper JAR not found in a GEM, did you forget to include neo4j-enterprise in your Gemfile (development)" unless zookeeper
+
+            log4j = files.find{|f| f =~ /\/log4j/}
+            raise "log4j not found in a GEM, did you forget to include neo4j-enterprise in your Gemfile (development)" unless log4j
+
+
+            system("mkdir -p #{lib_dir}")
+            FileUtils.cp(zookeeper, lib_dir)
+            FileUtils.cp(log4j, lib_dir)
+          end
+
+          def start
+            puts "Zookeeper: start, check jars?"
+            copy_jars unless File.exist?(lib_dir)
+            zookeeper_exec = File.expand_path("start_zookeeper.sh", File.dirname(__FILE__)).to_s
+            Dir.chdir(File.dirname(__FILE__))
+            pipe = IO.popen(zookeeper_exec)
+            File.open(pid_file, 'w') { |f| f.write(pipe.pid) }
+          end
+        end
+      end
+    end
+  end
+end

data/lib/neo4j/rails/has_n.rb

@@ -63,6 +63,9 @@ module Neo4j
           define_has_n_methods_for(args.first, options)
         end
 
+
+        alias_method :has_many, :has_n
+
         # Declares ONE incoming or outgoing relationship
         #
         # @example

data/lib/neo4j/rails/persistence.rb

@@ -160,11 +160,13 @@ module Neo4j
         else
           true
         end
+      rescue => e
+        Neo4j::Rails::Transaction.fail if Neo4j::Rails::Transaction.running?
+        raise e
       ensure
         @_create_or_updating = nil
       end
 
-
       def set_deleted_properties
         @_deleted = true
       end

data/lib/neo4j/rails/rails.rb

@@ -13,6 +13,7 @@ require 'neo4j/rails/observer'
 require 'neo4j/rails/compositions'
 require 'neo4j/rails/accept_id'
 require 'neo4j/rails/timestamps'
+require 'neo4j/rails/column'
 require 'neo4j/rails/attributes'
 require 'neo4j/rails/nested_attributes'
 require 'neo4j/rails/serialization'
@@ -27,4 +28,4 @@ require 'neo4j/rails/has_n'
 require 'neo4j/rails/rack_middleware'
 require 'neo4j/rails/versioning/versioning'
 require 'neo4j/rails/model'
-require 'neo4j/rails/relationship'
+require 'neo4j/rails/relationship'

data/lib/neo4j/version.rb

@@ -1,3 +1,3 @@
 module Neo4j
-  VERSION = "2.0.1"
+  VERSION = "2.2.0"
 end