neo4j-core 2.2.3-java → 2.2.4-java

data/Gemfile

@@ -1,8 +1,7 @@
-source :gemcutter
+source 'https://rubygems.org'
 
 gemspec
-
-gem 'neo4j-advanced',  '>= 1.8.1', '< 2.0', :require => false
+gem 'neo4j-advanced',   '>= 1.8.1', '< 2.0', :require => false
 gem 'neo4j-enterprise', '>= 1.8.1', '< 2.0', :require => false
 
 group 'development' do

data/config/neo4j/config.yml

@@ -30,7 +30,9 @@ migration_thread: false
 
 # If online backup should be available, if it is the Online JAR file will be loaded,
 # Notice it must be either 'true' or 'false' as string
-enable_online_backup: 'false'
+# To set a different port than the default port of 9999 use online_backup_port
+online_backup_enabled: 'false'
+#online_backup_port: '9999'
 
 #use the clustered Neo4j GraphDatabase (org.neo4j.kernel.ha.HighlyAvailableGraphDatabase)
 #enable_ha: true

data/lib/neo4j-core/database.rb

@@ -46,31 +46,32 @@ module Neo4j
         !!Neo4j::Config[:enable_ha]
       end
 
-
+      SEMAPHORE = Mutex.new
       # Private start method, use Neo4j.start instead
       # @see Neo4j#start
       def start
-        return if running?
-        @running = true
-        @storage_path = Config.storage_path
-        Java::JavaLang::System.setProperty("neo4j.ext.udc.source", "neo4rb")
-
-        begin
-          if self.class.locked?
-            start_readonly_graph_db
-          elsif self.class.ha_enabled?
-            start_ha_graph_db
-            Neo4j.migrate! if Neo4j.respond_to?(:migrate!)
-          else
-            start_local_graph_db
-            Neo4j.migrate! if Neo4j.respond_to?(:migrate!)
+        SEMAPHORE.synchronize do
+          return if running?
+          @storage_path = Config.storage_path
+          Java::JavaLang::System.setProperty("neo4j.ext.udc.source", "neo4rb")
+
+          begin
+            if self.class.locked?
+              start_readonly_graph_db
+            elsif self.class.ha_enabled?
+              start_ha_graph_db
+              Neo4j.migrate! if Neo4j.respond_to?(:migrate!)
+            else
+              start_local_graph_db
+              Neo4j.migrate! if Neo4j.respond_to?(:migrate!)
+            end
+          rescue
+            @running = false
+            raise
           end
-        rescue
-          @running = false
-          raise
-        end
 
-        at_exit { shutdown }
+          at_exit { shutdown }
+        end
       end
 
 
@@ -149,10 +150,10 @@ module Neo4j
       # @private
       def start_external_db(external_graph_db)
         begin
-          @running = true
           @graph = external_graph_db
           @graph.register_transaction_event_handler(@event_handler)
           @lucene = @graph.index
+          @running = true
           @event_handler.neo4j_started(self)
           Neo4j.logger.info("Started with external db")
         rescue
@@ -167,6 +168,7 @@ module Neo4j
         Neo4j.logger.info "Starting Neo4j in readonly mode since the #{@storage_path} is locked"
         @graph = Java::OrgNeo4jKernel::EmbeddedReadOnlyGraphDatabase.new(@storage_path, Config.to_java_map)
         @lucene = @graph.index
+        @running = true
       end
 
       def start_local_graph_db
@@ -174,6 +176,7 @@ module Neo4j
         @graph = self.class.default_embedded_db.new(@storage_path, Config.to_java_map)
         @graph.register_transaction_event_handler(@event_handler)
         @lucene = @graph.index
+        @running = true
         @event_handler.neo4j_started(self)
       end
 
@@ -189,6 +192,7 @@ module Neo4j
         #@graph = Java::OrgNeo4jKernelHa::HighlyAvailableGraphDatabase.new(@storage_path, Neo4j.config.to_java_map)
         @graph.register_transaction_event_handler(@event_handler)
         @lucene = @graph.index
+        @running = true
         @event_handler.neo4j_started(self)
       end
 

data/lib/neo4j-core/event_handler.rb

@@ -121,7 +121,7 @@ module Neo4j
         classes_changed(class_change_map)
       rescue Exception => e
         # since these exceptions gets swallowed
-        puts "ERROR in before commit hook #{e}"
+        puts "ERROR in before commit hook: #{e.class} - #{e}"
         puts e.backtrace.join("\n")
       end
 

data/lib/neo4j-core/index/lucene_query.rb

@@ -235,12 +235,12 @@ module Neo4j
               if Array === value
                 value.each do |v|
                   term = Java::OrgApacheLuceneIndex::Term.new(key.to_s, v.to_s)
-                  term_query = Java::OrgApacheLuceneSearch::TermQuery.new(term)
+                  term_query = Java::OrgApacheLuceneSearch::WildcardQuery.new(term)
                   and_query.add(term_query, Java::OrgApacheLuceneSearch::BooleanClause::Occur::SHOULD)
                 end
               else
                 term = Java::OrgApacheLuceneIndex::Term.new(key.to_s, value.to_s)
-                term_query = Java::OrgApacheLuceneSearch::TermQuery.new(term)
+                term_query = Java::OrgApacheLuceneSearch::WildcardQuery.new(term)
                 and_query.add(term_query, Java::OrgApacheLuceneSearch::BooleanClause::Occur::MUST)
               end
             end

data/lib/neo4j-core/property/property.rb

@@ -88,7 +88,7 @@ module Neo4j
       # @param [String, Symbol] key of the property to set
       # @param [String,Fixnum,Float,true,false, Array] value to set
       def []=(key, value)
-        raise "Not valid Neo4j Property value #{value.class}, valid: #{VALID_PROPERTY_VALUE_CLASSES.join(', ')}" unless valid_property?(value)
+        raise "Not valid Neo4j Property value #{value.class}, valid: #{VALID_PROPERTY_VALUE_CLASSES.to_a.join(', ')}" unless valid_property?(value)
 
         k = key.to_s
         if value.nil?
@@ -115,4 +115,4 @@ module Neo4j
 
     end
   end
-end
+end

data/lib/neo4j-core/relationship/relationship.rb

@@ -13,6 +13,12 @@ module Neo4j
       def _start_node
         get_start_node
       end
+      
+      # Same as Java::OrgNeo4jGraphdb::Relationship#getNodes
+      # @see http://api.neo4j.org/1.6.1/org/neo4j/graphdb/Relationship.html#getNodes()
+      def _nodes
+        get_nodes
+      end
 
       # Same as Java::OrgNeo4jGraphdb::Relationship#getOtherNode
       # @see http://api.neo4j.org/1.6.1/org/neo4j/graphdb/Relationship.html#getOtherNode()

data/lib/neo4j-core/rels/traverser.rb

@@ -59,7 +59,7 @@ module Neo4j
         # @param [Neo4j::Node] between a node or an object that implements the Neo4j::Core::Equal mixin
         # @return self
         def between(between)
-          @between = between
+          @between = between._java_node
           self
         end
 

data/lib/neo4j-core/version.rb

@@ -1,5 +1,5 @@
 module Neo4j
   module Core
-    VERSION = "2.2.3"
+    VERSION = "2.2.4"
   end
 end

data/lib/neo4j/neo4j.rb

@@ -31,15 +31,15 @@ module Neo4j
     # @param [String] config_file (optionally) if this is nil or not given use the Neo4j::Config, otherwise setup the Neo4j::Config file using the provided YAML configuration file.
     # @param [Java::OrgNeo4jKernel::EmbeddedGraphDatabase] external_db (optionally) use this Java Neo4j instead of creating a new neo4j database service.
     def start(config_file=nil, external_db = $NEO4J_SERVER)
-      return if @db && @db.running?
-
-      Neo4j.config.default_file = config_file if config_file
-      if external_db
-        @db ||= Neo4j::Core::Database.new
-        self.db.start_external_db(external_db)
-      else
-        db.start
-      end
+        return if @db && @db.running?
+
+        Neo4j.config.default_file = config_file if config_file
+        if external_db
+          @db ||= Neo4j::Core::Database.new
+          self.db.start_external_db(external_db)
+        else
+          db.start
+        end
     end
 
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: neo4j-core
 version: !ruby/object:Gem::Version
-  version: 2.2.3
+  version: 2.2.4
   prerelease:
 platform: java
 authors:
@@ -9,27 +9,25 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2012-12-28 00:00:00.000000000 Z
+date: 2013-05-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: neo4j-community
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 1.8.1
-    - - !binary |-
-        PA==
+    - - <
       - !ruby/object:Gem::Version
         version: '1.9'
     none: false
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 1.8.1
-    - - !binary |-
-        PA==
+    - - <
       - !ruby/object:Gem::Version
         version: '1.9'
     none: false
@@ -122,18 +120,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: 1.8.7
   none: false
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       segments:
       - 0
-      version: !binary |-
-        MA==
+      version: '0'
       hash: 2
   none: false
 requirements: []