neo4j 1.0.0.beta.30-java → 1.0.0.beta.31-java

data/bin/neo4j-jars

@@ -0,0 +1,26 @@
+#!/usr/bin/env ruby
+
+require 'neo4j'
+
+if ARGV.length == 0
+  puts <<TEXT
+A tool for copying jar files needed by the application server, like trinidad
+It copies the jar files to the lib folder of the current directory
+Usage: neo4j-jars [-ha|-backup]
+  -ha      copies the High Available cluster Jars
+  -backup  copies the online backup jars
+  -local   copies only the jars for running a local neo4j db
+TEXT
+exit
+end
+
+Neo4j.load_online_backup if ARGV.include?('-backup')
+Neo4j.load_ha_jars if ARGV.include?('-ha')
+
+lib_dir = File.join(Dir.pwd, 'lib')
+raise "Expected a lib folder where to copy the jars file, mkdir #{lib_dir}? " unless File.exist?(lib_dir)
+
+files = $CLASSPATH.find_all{|x| x =~ /neo4j\/jars/}.collect{|y| y.sub('file:', '')}
+files.each {|file| FileUtils.cp(file, lib_dir)}
+
+puts "copied #{files.size} files to #{lib_dir}"

data/lib/neo4j/index/indexer.rb

@@ -183,9 +183,9 @@ module Neo4j
       #
       def add_index(entity, field, value)
         return false unless @field_types.has_key?(field)
-        value = indexed_value_for(field, value)
+        conv_value = indexed_value_for(field, value)
         index = index_for_field(field.to_s)
-        index.add(entity, field, value)
+        index.add(entity, field, conv_value)
         @parent_indexers.each { |i| i.add_index(entity, field, value) }
       end
 

data/lib/neo4j/property/class_methods.rb

@@ -52,7 +52,6 @@ module Neo4j
         props.each do |prop|
           pname = prop.to_sym
           _decl_props[pname] ||= {}
-          _decl_props[pname][:defined] = true
 
           define_method(pname) do
             Neo4j::TypeConverters.to_ruby(self.class, pname, self[pname])
@@ -77,7 +76,7 @@ module Neo4j
       #
       def property?(prop_name)
         return false if _decl_props[prop_name.to_sym].nil?
-        _decl_props[prop_name.to_sym][:defined] == true
+        !_decl_props[prop_name.to_sym].nil?
       end
     end
   end

data/lib/neo4j/rails/mapping/property.rb

@@ -23,7 +23,6 @@ module Neo4j
 						_decl_props[property] = options
 						handle_property_options_for(property, options)
 						define_property_methods_for(property, options)
-						_decl_props[property][:defined] = true  # TODO is this needed ?
 					end
 					
 					def handle_property_options_for(property, options)

data/lib/neo4j/rails/timestamps.rb

@@ -46,7 +46,7 @@ module Neo4j
 				when "Time"
 					Time.now
 				end
-				
+
 				send("#{attribute}=", value)
 			end
 			
@@ -56,7 +56,7 @@ module Neo4j
 					
 					# ensure there's always a type on the timestamp properties
 					if Neo4j::Config[:timestamps] && TIMESTAMP_PROPERTIES.include?(property)
-						_decl_props[property][:type] = Time
+						_decl_props[property][:type] ||= Time
 					end
 				end
 			end

data/lib/neo4j/version.rb

@@ -1,3 +1,3 @@
 module Neo4j
-  VERSION = "1.0.0.beta.30"
+  VERSION = "1.0.0.beta.31"
 end

data/neo4j.gemspec

@@ -23,7 +23,7 @@ It comes included with the Apache Lucene document database.
 
   s.require_path = 'lib'
   s.files = Dir.glob("{bin,lib,config}/**/*") + %w(README.rdoc CHANGELOG CONTRIBUTORS Gemfile neo4j.gemspec)
-  s.executables = 'neo4j-shell'
+  s.executables = ['neo4j-shell', 'neo4j-jars']
   s.has_rdoc = true
   s.extra_rdoc_files = %w( README.rdoc )
   s.rdoc_options = ["--quiet", "--title", "Neo4j.rb", "--line-numbers", "--main", "README.rdoc", "--inline-source"]

metadata

@@ -2,7 +2,7 @@
 name: neo4j
 version: !ruby/object:Gem::Version 
   prerelease: 6
-  version: 1.0.0.beta.30
+  version: 1.0.0.beta.31
 platform: java
 authors: 
   - Andreas Ronge
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-02-16 00:00:00 +01:00
+date: 2011-02-17 00:00:00 +01:00
 default_executable: 
 dependencies: 
   - !ruby/object:Gem::Dependency 
@@ -63,11 +63,13 @@ description: "You can think of Neo4j as a high-performance graph engine with all
 email: andreas.ronge@gmail.com
 executables: 
   - neo4j-shell
+  - neo4j-jars
 extensions: []
 
 extra_rdoc_files: 
   - README.rdoc
 files: 
+  - bin/neo4j-jars
   - bin/neo4j-shell
   - bin/neo4j-shell~
   - lib/neo4j.rb
@@ -210,7 +212,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: neo4j
-rubygems_version: 1.4.2
+rubygems_version: 1.5.0
 signing_key: 
 specification_version: 3
 summary: A graph database for JRuby