neo4j 1.1.0.beta.3-java → 1.1.0-java

data/CHANGELOG

@@ -1,4 +1,27 @@
-== 0.4.4 / 2010-08-01
+== 1.1.0 / 2011-05-13
+* Support for embedding neo4j.rb by providing an already running db instance (#168)
+* Neo4j::Rails::Relationships should be ActiveModel compliant (#156)
+* Support for incoming relationships in Neo4j::Rails::Model (#157)
+* to_json method for models no tags √ resolved (#154)
+* Implement hash so that it will work with Sets (#160)
+* Modified the traverser to allow iterating over paths not just over end_nodes (#161)
+* Create method should take a block to initialize itself (#162)
+* Upgrade to 1.3 neo4j java library (#164)
+* Default `nodes' invocation for Algo path finders (#165)
+* Property and index class methods modified to take arbitrary number of symbols optionally followed by options hash (#166)
+* BUG: Setting property :system on Neo4j::Rails::Model should work (#163)
+* BUG: update_attributes should convert values according to Type (#155)
+* BUG: Neo4j::RelationshipMixin#relationship_type broken #(169)
+* BUG: Relationship.load(nil) == Relationship.load(0) (#167)
+* BUG: Full text search returns nil in rails model (#153)
+
+== 1.0.0 / 2011-03-02
+* Complete rewrite of everything.
+* Replaced the lucene module with using the java neo4j-lucene integration instead
+* Lots of improvements of the API
+* Better ActiveModel/Rails integration
+
+    == 0.4.4 / 2010-08-01
 * Fixed bug on traversing when using the RelationshipMixin (#121)
 * BatchInserter and JRuby 1.6 - Fix iteration error with trying to modify in-place hash
 

data/lib/neo4j/database.rb

@@ -64,13 +64,28 @@ module Neo4j
     def start_ha_graph_db
       Neo4j.logger.info "starting Neo4j in HA mode, machine id: #{Neo4j.config['ha.machine_id']} at #{Neo4j.config['ha.server']} db #{@storage_path}"
       Neo4j.load_ha_jars # those jars are only needed for the HighlyAvailableGraphDatabase
-      Neo4j.load_online_backup if Neo4j.config[:online_backup_enabled]      
+      Neo4j.load_online_backup if Neo4j.config[:online_backup_enabled]
       @graph = org.neo4j.kernel.HighlyAvailableGraphDatabase.new(@storage_path, Neo4j.config.to_java_map)
       @graph.register_transaction_event_handler(@event_handler)
       @lucene = @graph.index #org.neo4j.index.impl.lucene.LuceneIndexProvider.new
       @event_handler.neo4j_started(self)
     end
 
+    def start_external_db(external_graph_db)
+      begin
+        @running = true
+        @graph = external_graph_db
+        Neo4j.migrate!
+        @graph.register_transaction_event_handler(@event_handler)
+        @lucene = @graph.index #org.neo4j.index.impl.lucene.LuceneIndexProvider.new
+        @event_handler.neo4j_started(self)
+        Neo4j.logger.info("Started with external db")
+      rescue
+        @running = false
+        raise
+      end
+    end
+
     def running? #:nodoc:
       @running
     end
@@ -100,8 +115,8 @@ module Neo4j
         @graph.unregister_transaction_event_handler(@event_handler) unless read_only?
         @event_handler.neo4j_shutdown(self)
         @graph.shutdown
-        @graph   = nil
-        @lucene  = nil
+        @graph = nil
+        @lucene = nil
         @running = false
         @neo4j_manager = nil
       end

data/lib/neo4j/neo4j.rb

@@ -16,13 +16,22 @@ module Neo4j
   class << self
     # Start Neo4j using the default database.
     # This is usally not required since the database will be started automatically when it is used.
+    # If the global variable $NEO4J_SERVER is defined then it will use that as the Java Graph DB. This can
+    # be used if you want to embed neo4j.rb and already got an instance of the Java Neo4j Database service.
     #
     # ==== Parameters
     # 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.
-    #
-    def start(config_file=nil)
+    # 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
-      db.start unless db.running?
+      if external_db
+        @db ||= Database.new
+        self.db.start_external_db(external_db)
+      else
+        db.start
+      end
     end
 
 
@@ -41,10 +50,11 @@ module Neo4j
     def read_only?
       @db && @db.graph && @db.graph.read_only?
     end
-    
+
     # Returns a started db instance. Starts it's not running.
+    # if $NEO4J_SERVER is defined then use that Java Neo4j Database service instead of creating a new one.
     def started_db
-      db.start unless db.running?
+      start unless db.running?
       db
     end
 
@@ -166,6 +176,6 @@ module Neo4j
     def event_handler(this_db = db)
       this_db.event_handler
     end
-    
+
   end
 end

data/lib/neo4j/relationship.rb

@@ -165,6 +165,7 @@ module Neo4j
       # Same as load but does not return the node as a wrapped Ruby object.
       #
       def _load(rel_id, db = Neo4j.started_db)
+        return nil if rel_id.nil?
         rel = db.graph.get_relationship_by_id(rel_id.to_i)
         rel.hasProperty('_classname')  # since we want a IllegalStateException which is otherwise not triggered
         rel

data/lib/neo4j/relationship_mixin/relationship_mixin.rb

@@ -108,7 +108,7 @@ module Neo4j
     # the relationship type (of type Symbol)
     #
     def relationship_type
-      get_type.name.to_sym
+      @_java_rel.getType.name.to_sym
     end
 
     # --------------------------------------------------------------------------
@@ -139,4 +139,4 @@ module Neo4j
       end
     end
   end
-end
+end

data/lib/neo4j/version.rb

@@ -1,3 +1,3 @@
 module Neo4j
-  VERSION = "1.1.0.beta.3"
+  VERSION = "1.1.0"
 end

metadata

@@ -1,8 +1,8 @@
 --- !ruby/object:Gem::Specification 
 name: neo4j
 version: !ruby/object:Gem::Version 
-  prerelease: 6
-  version: 1.1.0.beta.3
+  prerelease: 
+  version: 1.1.0
 platform: java
 authors: 
   - Andreas Ronge
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-05-10 00:00:00 +02:00
+date: 2011-05-13 00:00:00 +02:00
 default_executable: 
 dependencies: 
   - !ruby/object:Gem::Dependency 
@@ -211,9 +211,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
-    - - ">"
+    - - ">="
       - !ruby/object:Gem::Version 
-        version: 1.3.1
+        version: "0"
 requirements: []
 
 rubyforge_project: neo4j