geoff-importer 0.0.2 → 0.1.0

data/.gitignore

@@ -16,3 +16,4 @@ test/tmp
 test/version_tmp
 tmp
 db/*
+.DS_Store

data/.ruby-gemset

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

data/.ruby-version

@@ -0,0 +1 @@
+jruby-1.7.0

data/geoff-importer.gemspec

@@ -21,7 +21,9 @@ Gem::Specification.new do |gem|
   gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
   gem.require_paths = ["lib"]
 
-  gem.add_dependency("neo4j-community", '>= 1.8.M05', '< 1.9')
+  gem.add_dependency("neo4j-community",  '1.8.0')
+  gem.add_dependency("neo4j-advanced",   '1.8.0')
+  gem.add_dependency("neo4j-enterprise", '1.8.0')
   
   gem.add_development_dependency 'jruby-openssl'
   gem.add_development_dependency 'rake'

data/lib/geoff-importer.rb

@@ -1,6 +1,9 @@
 require 'fileutils'
 require 'neo4j-community'
-Dir["lib/jars/*"].each {|file| require file }
+require 'neo4j-advanced'
+require 'neo4j-enterprise'
+
+Dir[File.join("#{File.dirname(__FILE__)}", "jars", "*.jar")].each { |file| require file }
 
 require "geoff-importer/version"
 require "geoff-importer/importer"

data/lib/geoff-importer/importer.rb

@@ -18,13 +18,16 @@ class Geoff
 
     Subgraph   = org.neo4j.geoff.Subgraph
     EmbeddedDB = Java::OrgNeo4jKernel::EmbeddedGraphDatabase
+    HaDb       = Java::OrgNeo4jKernel::HighlyAvailableGraphDatabase
 
     class << self
-      def import geoff, db, node_map = {}
-        set_geoff geoff
-        set_db db
+      def import geoff, db, node_map = {}, options = {}
+        @options = options
+        
+        set_geoff(geoff)
+        set_db(db)
 
-        import_geoff node_map
+        import_geoff(node_map)
         shutdown if db.is_a? String
       end
 
@@ -63,7 +66,23 @@ class Geoff
 
       def start_db(db_path)
         Geoff.log 'starting database'
-        @graph_db = EmbeddedDB.new(db_path)
+        @graph_db = if ha_enabled?
+          start_ha_db(db_path)
+        else
+         start_embedded_db(db_path)
+        end
+      end
+
+      def start_embedded_db(db_path)
+        EmbeddedDB.new(db_path)
+      end
+
+      def start_ha_db(db_path)
+        HaDb.new(db_path, @options)
+      end
+
+      def ha_enabled?
+        !!@options['ha.db']
       end
 
       def shutdown

data/lib/geoff-importer/version.rb

@@ -1,5 +1,5 @@
 class Geoff
   module Importer
-    VERSION = "0.0.2"
+    VERSION = "0.1.0"
   end
 end

data/spec/integration/importer_spec.rb

@@ -3,13 +3,11 @@ require 'geoff-importer'
 
 describe Geoff::Importer do
   let(:db_path)       { './db/test'}
-  let(:geoff_string)  { '(A) {"name": "Alice"}' }
-
+  let(:geoff_string)  { '(A) {"name": "Alice", "test_array":["value1", "value2"]}' }
 
   context 'running db' do
     it 'raises error if db is passed in as string' do
       db = Java::OrgNeo4jKernel::EmbeddedGraphDatabase.new(db_path)
-      # debugger
       expect { Geoff::Importer.import(geoff_string, db_path) }.to raise_error
       db.shutdown
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: geoff-importer
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.1.0
   prerelease:
 platform: ruby
 authors:
@@ -9,29 +9,53 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2012-12-06 00:00:00.000000000 Z
+date: 2013-06-03 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.0
+    none: false
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
       - !ruby/object:Gem::Version
-        version: 1.8.M05
-    - - !binary |-
-        PA==
+        version: 1.8.0
+    none: false
+  prerelease: false
+  type: :runtime
+- !ruby/object:Gem::Dependency
+  name: neo4j-advanced
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
       - !ruby/object:Gem::Version
-        version: '1.9'
+        version: 1.8.0
     none: false
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '='
       - !ruby/object:Gem::Version
-        version: 1.8.M05
-    - - !binary |-
-        PA==
+        version: 1.8.0
+    none: false
+  prerelease: false
+  type: :runtime
+- !ruby/object:Gem::Dependency
+  name: neo4j-enterprise
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 1.8.0
+    none: false
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
       - !ruby/object:Gem::Version
-        version: '1.9'
+        version: 1.8.0
     none: false
   prerelease: false
   type: :runtime
@@ -115,7 +139,8 @@ files:
 - .gitignore
 - .rbenv-version
 - .rspec
-- .rvmrc
+- .ruby-gemset
+- .ruby-version
 - Gemfile
 - LICENSE.txt
 - README.md

data/.rvmrc

@@ -1,54 +0,0 @@
-#!/usr/bin/env bash
-
-# This is an RVM Project .rvmrc file, used to automatically load the ruby
-# development environment upon cd'ing into the directory
-
-# First we specify our desired <ruby>[@<gemset>], the @gemset name is optional,
-# Only full ruby name is supported here, for short names use:
-#     echo "rvm use jruby" > .rvmrc
-environment_id="jruby-1.7.0@geoff"
-export JRUBY_OPTS='-J-Xms1024m -J-Xmx1024m -J-XX:+UseConcMarkSweepGC -J-XX:MaxPermSize=512m -J-Djruby.thread.pooling=true'
-
-# Uncomment the following lines if you want to verify rvm version per project
-# rvmrc_rvm_version="1.16.19 (stable)" # 1.10.1 seams as a safe start
-# eval "$(echo ${rvm_version}.${rvmrc_rvm_version} | awk -F. '{print "[[ "$1*65536+$2*256+$3" -ge "$4*65536+$5*256+$6" ]]"}' )" || {
-#   echo "This .rvmrc file requires at least RVM ${rvmrc_rvm_version}, aborting loading."
-#   return 1
-# }
-
-# Uncomment following line if you want options to be set only for given project.
-# PROJECT_JRUBY_OPTS=( --1.9 )
-# The variable PROJECT_JRUBY_OPTS requires the following to be run in shell:
-#    chmod +x ${rvm_path}/hooks/after_use_jruby_opts
-
-# First we attempt to load the desired environment directly from the environment
-# file. This is very fast and efficient compared to running through the entire
-# CLI and selector. If you want feedback on which environment was used then
-# insert the word 'use' after --create as this triggers verbose mode.
-if [[ -d "${rvm_path:-$HOME/.rvm}/environments"
-  && -s "${rvm_path:-$HOME/.rvm}/environments/$environment_id" ]]
-then
-  \. "${rvm_path:-$HOME/.rvm}/environments/$environment_id"
-  [[ -s "${rvm_path:-$HOME/.rvm}/hooks/after_use" ]] &&
-    \. "${rvm_path:-$HOME/.rvm}/hooks/after_use" || true
-else
-  # If the environment file has not yet been created, use the RVM CLI to select.
-  rvm --create  "$environment_id" || {
-    echo "Failed to create RVM environment '${environment_id}'."
-    return 1
-  }
-fi
-
-# If you use bundler, this might be useful to you:
-# if [[ -s Gemfile ]] && {
-#   ! builtin command -v bundle >/dev/null ||
-#   builtin command -v bundle | GREP_OPTIONS= \grep $rvm_path/bin/bundle >/dev/null
-# }
-# then
-#   printf "%b" "The rubygem 'bundler' is not installed. Installing it now.\n"
-#   gem install bundler
-# fi
-# if [[ -s Gemfile ]] && builtin command -v bundle >/dev/null
-# then
-#   bundle install | GREP_OPTIONS= \grep -vE '^Using|Your bundle is complete'
-# fi