neo4j-advanced 1.6.0.alpha-java → 1.6.1.alpha.1-java

data/.gitignore

@@ -1,5 +1,20 @@
-*.gem
-*.swp
+# ignore netbeans specific stuff
+nbproject
+
+# ignore Rubymine
+.idea
+
+.rvmrc
 .bundle
+tmp
+db/
+
+# jedit
+*~
+
+# vim
+.*.sw[a-z]
+
 Gemfile.lock
-pkg/*
+coverage
+

data/Gemfile

@@ -2,3 +2,8 @@ source "http://rubygems.org"
 
 # Specify your gem's dependencies in neo4j-community.gemspec
 gemspec
+
+group 'test' do
+  gem "rspec", "= 2.6.0"
+  gem "neo4j"
+end

data/Rakefile

@@ -1 +1,40 @@
 require "bundler/gem_tasks"
+
+def source_file
+  gz_file = Dir.new('tmp').entries.find { |x| x =~ /gz$/ }
+  File.expand_path("./tmp/#{gz_file}")
+end
+
+def unpack_lib_dir
+  gz_file = Dir.new('tmp').entries.find { |x| x =~ /gz$/ }
+  dir = gz_file.gsub('-unix.tar.gz', '')
+  File.expand_path("./tmp/#{dir}/lib")
+end
+
+def jar_files_to_copy
+  Dir.new(unpack_lib_dir).entries.find_all {|x| x =~ /\.jar/}
+end
+
+desc "Delete old Jar files"
+task :delete_old_jar do
+  root = File.expand_path("./lib/neo4j-advanced/jars")
+  files = Dir.new(root).entries.find_all{|f| f =~ /\.jar/}
+  files.each do |file|
+    system "rm #{root}/#{file}"
+  end
+end
+
+def include_jar?(file)
+  include_only = %w[neo4j-advanced neo4j-management]
+  include_only.each do |i|
+    return true if file.start_with?(i) 
+  end
+  false
+end
+
+desc "Upgrade using downloaded ...tar.gz file in ./tmp"
+task :upgrade => [:delete_old_jar] do
+  system "cd tmp; tar xf #{source_file}"
+  jars = File.expand_path("./lib/neo4j-advanced/jars")
+  jar_files_to_copy.each {|f| system "cp #{unpack_lib_dir}/#{f} #{jars}" if include_jar?(f)}
+end

data/lib/neo4j-advanced/version.rb

@@ -1,6 +1,6 @@
 module Neo4j
   module Advanced
-    VERSION = "1.6.0.alpha"
-    NEO_VERSION = "1.6.M02"
+    VERSION = "1.6.1.alpha.1"
+    NEO_VERSION = "1.6.1"
   end
 end

data/lib/neo4j-advanced.rb

@@ -5,12 +5,13 @@ module Neo4j
   module Advanced
 
     def self.jars_root
-      "#{File.dirname(__FILE__)}/neo4j-advanced/jars"
+      File.join("#{File.dirname(__FILE__)}", "neo4j-advanced", "jars")
     end
 
     def self.load_jars!
       require 'java'
-      puts jars_root
+      require 'neo4j-community'
+      ::Neo4j::Community.ensure_version!(Advanced::NEO_VERSION, 'advanced')
       Dir["#{jars_root}/*.jar"].each {|jar| require jar }
     end
 

data/neo4j-advanced.gemspec

@@ -9,7 +9,7 @@ Gem::Specification.new do |s|
   s.email       = ["dnagir@gmail.com", "andreas.ronge@gmail.com"]
   s.homepage    = "https://github.com/dnagir/neo4j-advanced"
   s.summary     = "The neo4j Advanced edition v#{Neo4j::Advanced::NEO_VERSION} JAR files"
-  s.description = s.summary
+  s.description = "The Java Jar files for the Neo4j Advanced edition, adding advanced monitoring – licensed under the AGPL, see http://neo4j.org/licensing-guide/ "
 
   s.rubyforge_project = "neo4j-advanced"
 
@@ -19,6 +19,7 @@ Gem::Specification.new do |s|
   s.require_paths = ["lib"]
 
   s.platform      = 'java'
+  s.add_runtime_dependency "neo4j-community", "~> 1.6.0.alpha.9"
 
   # specify any dependencies here; for example:
   # s.add_development_dependency "rspec"

data/spec/neo4j_spec.rb

@@ -0,0 +1,10 @@
+require File.join(File.dirname(__FILE__), 'spec_helper')
+
+describe Neo4j, :type => :transactional do
+
+  after(:each) { Neo4j.threadlocal_ref_node = nil }
+
+  it "#management returns by default a management for Primitives" do
+    (Neo4j.management.get_number_of_node_ids_in_use > 0).should be true
+  end
+end

data/spec/spec_helper.rb

@@ -0,0 +1,82 @@
+require 'rubygems'
+require "bundler/setup"
+require 'rspec'
+require 'fileutils'
+require 'tmpdir'
+
+$LOAD_PATH.unshift File.join(File.dirname(__FILE__), "..", "lib")
+
+require 'neo4j'
+require 'neo4j-advanced'
+
+require 'logger'
+Neo4j::Config[:logger_level] = Logger::ERROR
+Neo4j::Config[:storage_path] = File.join(Dir.tmpdir, "neo4j-rspec-db")
+Neo4j::Config[:debug_java] = true
+
+Neo4j::Config[:identity_map] = (ENV['IDENTITY_MAP'] == "true") # faster tests
+Neo4j::IdentityMap.enabled = (ENV['IDENTITY_MAP'] == "true") # this is normally set in the rails rack middleware
+
+def rm_db_storage
+  FileUtils.rm_rf Neo4j::Config[:storage_path]
+  raise "Can't delete db" if File.exist?(Neo4j::Config[:storage_path])
+end
+
+def finish_tx
+  return unless @tx
+  @tx.success
+  @tx.finish
+  @tx = nil
+end
+
+def new_tx
+  finish_tx if @tx
+  @tx = Neo4j::Transaction.new
+end
+
+# ensure the translations get picked up for tests
+I18n.load_path += Dir[File.join(File.dirname(__FILE__), '..', 'config', 'locales', '*.{rb,yml}')]
+
+# Requires supporting ruby files with custom matchers and macros, etc,
+# in spec/support/ and its subdirectories.
+Dir["#{File.dirname(__FILE__)}/support/**/*.rb"].each {|f| require f}
+
+# load all fixture classes
+Dir["#{File.dirname(__FILE__)}/fixture/**/*.rb"].each {|f| require f}
+
+# set database storage location
+Neo4j::Config[:storage_path] = File.join(Dir.tmpdir, 'neo4j-rspec-tests')
+
+RSpec.configure do |c|
+  $name_counter = 0
+
+  c.filter_run_excluding :identity_map => true if not Neo4j::IdentityMap.enabled
+
+  c.before(:each, :type => :transactional) do
+    new_tx
+  end
+
+  c.after(:each, :type => :transactional) do
+    finish_tx
+    Neo4j::Rails::Model.close_lucene_connections
+  end
+
+  c.after(:each) do
+    finish_tx
+    Neo4j::Rails::Model.close_lucene_connections
+    Neo4j::Transaction.run do
+      Neo4j::Index::IndexerRegistry.delete_all_indexes
+    end
+    Neo4j::Transaction.run do
+      Neo4j.threadlocal_ref_node = Neo4j::Node.new :name => "ref_#{$name_counter}"
+      $name_counter += 1
+    end
+  end
+
+  c.before(:all) do
+    rm_db_storage unless Neo4j.running?
+  end
+
+end
+
+

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: neo4j-advanced
 version: !ruby/object:Gem::Version
-  version: 1.6.0.alpha
+  version: 1.6.1.alpha.1
   prerelease: 6
 platform: java
 authors:
@@ -10,9 +10,21 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-01-10 00:00:00.000000000 Z
-dependencies: []
-description: The neo4j Advanced edition v1.6.M02 JAR files
+date: 2012-02-27 00:00:00.000000000Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: neo4j-community
+  requirement: &24220380 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.6.0.alpha.9
+  type: :runtime
+  prerelease: false
+  version_requirements: *24220380
+description: ! 'The Java Jar files for the Neo4j Advanced edition, adding advanced
+  monitoring – licensed under the AGPL, see http://neo4j.org/licensing-guide/ '
 email:
 - dnagir@gmail.com
 - andreas.ronge@gmail.com
@@ -25,25 +37,12 @@ files:
 - README.md
 - Rakefile
 - lib/neo4j-advanced.rb
-- lib/neo4j-advanced/jars/geronimo-jta_1.1_spec-1.1.1.jar
-- lib/neo4j-advanced/jars/lucene-core-3.1.0.jar
-- lib/neo4j-advanced/jars/neo4j-advanced-1.6.M02.jar
-- lib/neo4j-advanced/jars/neo4j-community-1.6.M02.jar
-- lib/neo4j-advanced/jars/neo4j-cypher-1.6.M02.jar
-- lib/neo4j-advanced/jars/neo4j-graph-algo-1.6.M02.jar
-- lib/neo4j-advanced/jars/neo4j-graph-matching-1.6.M02.jar
-- lib/neo4j-advanced/jars/neo4j-jmx-1.6.M02.jar
-- lib/neo4j-advanced/jars/neo4j-kernel-1.6.M02.jar
-- lib/neo4j-advanced/jars/neo4j-lucene-index-1.6.M02.jar
-- lib/neo4j-advanced/jars/neo4j-management-1.6.M02.jar
-- lib/neo4j-advanced/jars/neo4j-shell-1.6.M02.jar
-- lib/neo4j-advanced/jars/neo4j-udc-1.6.M02.jar
-- lib/neo4j-advanced/jars/org.apache.servicemix.bundles.jline-0.9.94_1.jar
-- lib/neo4j-advanced/jars/scala-library-2.9.0-1.jar
-- lib/neo4j-advanced/jars/server-api-1.6.M02.jar
+- lib/neo4j-advanced/jars/neo4j-advanced-1.6.1.jar
+- lib/neo4j-advanced/jars/neo4j-management-1.6.1.jar
 - lib/neo4j-advanced/version.rb
-- lib/neo4j-jars.rb
 - neo4j-advanced.gemspec
+- spec/neo4j_spec.rb
+- spec/spec_helper.rb
 homepage: https://github.com/dnagir/neo4j-advanced
 licenses: []
 post_install_message: 
@@ -67,6 +66,5 @@ rubyforge_project: neo4j-advanced
 rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
-summary: The neo4j Advanced edition v1.6.M02 JAR files
+summary: The neo4j Advanced edition v1.6.1 JAR files
 test_files: []
-has_rdoc: 

data/lib/neo4j-jars.rb

@@ -1 +0,0 @@
-require "neo4j-advanced"