neo4j 2.0.0.alpha.7-java → 2.0.0.alpha.8-java

data/CHANGELOG

@@ -1,3 +1,16 @@
+== 2.0.0.alpha.8 / 2012-04-27
+* Fix for "relationship to :all assigned twice for single instance" #178
+* Fix for callback fire more then once (=> performance increase) #172
+* Support for lucene search on array properties, #118
+* Support for creating unique entities (get_or_create) #143
+* Support for specifying has_n/has_one relationship with Strings instead of Class #160
+* Support for serializer of hash and arrays on properties #185
+* Fix for Neo4j::Rails::Relationship default property, #195
+* Added support for pagination, see the neo4j-will_paginate gem
+* Fixed Rails generators
+* Added Cypher DSL support for is_a?
+* Fix for "write_attribute persistes, contrary to AR convention" closes #182
+
 == 2.0.0.alpha.7 / 2012-04-19
 * fix for Neo4j::Config bug - did not work from rails to set the db location, closes #191
 * has_n and has_one method generate class method returning the name of the relationship as a Symbol, closes #170

data/Gemfile

@@ -2,6 +2,9 @@ source :gemcutter
 
 gemspec
 
+#gem 'neo4j-core', :path => '/home/andreas/projects/neo4j-core'
+#gem 'neo4j-wrapper', :path => '/home/andreas/projects/neo4j-wrapper'
+
 group 'development' do
   gem 'guard'
   gem 'ruby_gntp', :require => false # GrowlNotify for Mac

data/README.rdoc

@@ -11,6 +11,12 @@ It uses two powerful and mature Java libraries:
 
 == Documentation
 
+==== Version >= 2.0
+
+* {Github Wiki}[https://github.com/andreasronge/neo4j/wiki]
+* {YARD}[http://rdoc.info/github/andreasronge/neo4j/master/frames]
+* RSpecs - There are 2023 RSpecs (478/neo4j-core, 425/neo4j-wrapper and 1120/this gem - 2012 April)
+
 ==== Version < 2.0.alpha.5
 
 * {Guides and API}[http://neo4j.rubyforge.org/guides/index.html]
@@ -18,11 +24,6 @@ It uses two powerful and mature Java libraries:
 * {Blog: Neo4j and Rails 3}[http://blog.jayway.com/2011/03/02/neo4j-rb-1-0-0-and-rails-3/]
 * {Kvitter Example Application}[https://github.com/andreasronge/kvitter/]
 
-==== Version >= 2.0
-
-* {YARD}[http://rdoc.info/github/andreasronge/neo4j/master/frames]
-* RSpecs - There are 2023 RSpecs (478/neo4j-core, 425/neo4j-wrapper and 1120/this gem - 2012 April)
-
 === Presentation Materials and other URLs
 
 * {JRubyConf 2012 May}[http://jrubyconf.com/#speakers]

data/lib/db/active_tx_log

@@ -0,0 +1 @@
+tm_tx_log.1

data/lib/db/index/lucene/node/Person_fulltext/_0.fnm

@@ -0,0 +1 @@
+����_id_
name_e
name

data/lib/db/index/lucene/node/Person_fulltext/_0.frq

@@ -0,0 +1 @@
+

data/lib/db/index/lucene/node/Person_fulltext/_0.nrm

@@ -0,0 +1 @@
+NRM�|||

data/lib/db/messages.log

@@ -0,0 +1,304 @@
+2012-04-25 06:42:58.885+0000: WARNING! Deprecated configuration options used. See manual for details
+2012-04-25 06:42:58.888+0000: enable_online_backup has been replaced with online_backup_enabled and online_backup_port
+2012-04-25 06:42:58.947+0000: Creating new db @ /home/andreas/projects/neo4j/lib/db/neostore
+2012-04-25 06:42:59.281+0000: Opened [/home/andreas/projects/neo4j/lib/db/nioneo_logical.log.1] clean empty log, version=0, lastTxId=1
+2012-04-25 06:42:59.296+0000: TM new log: tm_tx_log.1
+2012-04-25 06:42:59.333+0000: Opened [/home/andreas/projects/neo4j/lib/db/index/lucene.log.1] clean empty log, version=0, lastTxId=1
+2012-04-25 06:42:59.340+0000: --- STARTUP diagnostics START ---
+2012-04-25 06:42:59.341+0000: Neo4j Kernel properties:
+    read_only=false
+    neo4j.ext.udc.host=udc.neo4j.org
+    logical_log=/home/andreas/projects/neo4j/lib/db/nioneo_logical.log
+    min_node_cache_size=0
+    intercept_committing_transactions=false
+    node_auto_indexing=false
+    remote_shell_name=shell
+    cache_type=soft
+    intercept_deserialized_transactions=false
+    ha.db=NO
+    use_adaptive_cache=YES
+    lucene_searcher_cache_size=2147483647
+    neo4j.ext.udc.interval=86400000
+    use_memory_mapped_buffers=true
+    ha.coordinators=localhost:2181,localhost:2182,localhost:2183
+    timestamps=YES
+    rebuild_idgenerators_fast=true
+    neostore.propertystore.db.index.keys.mapped_memory=1M
+    max_node_cache_size=1500
+    neostore.propertystore.db.strings.mapped_memory=130M
+    neostore.propertystore.db.arrays.mapped_memory=130M
+    gcr_cache_min_log_interval=60s
+    relationship_grab_size=100
+    relationship_auto_indexing=false
+    remote_shell_read_only=false
+    lucene_writer_cache_size=2147483647
+    storage_path=db
+    node_cache_array_fraction=1.0
+    allow_store_upgrade=false
+    execution_guard_enabled=false
+    relationship_cache_array_fraction=1.0
+    migration_thread=NO
+    remote_logging_host=127.0.0.1
+    store_dir=/home/andreas/projects/neo4j/lib/db
+    remote_logging_port=4560
+    enable_rules=YES
+    gc_monitor_threshold=200ms
+    load_kernel_extensions=true
+    array_block_size=120
+    neostore.relationshipstore.db.mapped_memory=50M
+    dump_configuration=false
+    gc_monitor_wait_time=100ms
+    neostore.nodestore.db.mapped_memory=25M
+    neo4j.ext.udc.first_delay=600000
+    remote_shell_enabled=true
+    min_relationship_cache_size=0
+    max_relationship_cache_size=3500
+    neo4j.ext.udc.reg=unreg
+    remote_shell_port=9332
+    adaptive_cache_heap_ratio=0.77
+    identity_map=NO
+    adaptive_cache_manager_decrease_ratio=1.15
+    ha.server_id=2
+    neo_store=/home/andreas/projects/neo4j/lib/db/neostore
+    adaptive_cache_worker_sleep_time=3000
+    neostore.propertystore.db.index.mapped_memory=1M
+    adaptive_cache_manager_increase_ratio=1.1
+    backup_slave=false
+    neostore.propertystore.db.mapped_memory=90M
+    string_block_size=120
+    grab_file_lock=true
+    remote_logging_enabled=false
+    ha.server=localhost:6002
+    neo4j.ext.udc.enabled=true
+2012-04-25 06:42:59.345+0000: Diagnostics providers:
+    org.neo4j.kernel.configuration.Config
+    org.neo4j.kernel.info.DiagnosticsManager
+    SYSTEM_MEMORY
+    JAVA_MEMORY
+    OPERATING_SYSTEM
+    JAVA_VIRTUAL_MACHINE
+    CLASSPATH
+    LIBRARY_PATH
+    SYSTEM_PROPERTIES
+    LINUX_SCHEDULERS
+2012-04-25 06:42:59.346+0000: System memory information:
+    Total Physical memory: 3.87 GB
+    Free Physical memory: 1.99 GB
+    Committed virtual memory: 907.15 MB
+    Total swap space: 4.88 GB
+    Free swap space: 4.88 GB
+2012-04-25 06:42:59.349+0000: JVM memory information:
+    Free  memory: 55.76 MB
+    Total memory: 108.56 MB
+    Max   memory: 444.50 MB
+    Garbage Collector: PS Scavenge: [PS Eden Space, PS Survivor Space]
+    Garbage Collector: PS MarkSweep: [PS Eden Space, PS Survivor Space, PS Old Gen, PS Perm Gen]
+    Memory Pool: Code Cache (Non-heap memory): committed=2.63 MB, used=2.52 MB, max=48.00 MB, threshold=0.00 B
+    Memory Pool: PS Eden Space (Heap memory): committed=62.00 MB, used=38.18 MB, max=154.00 MB, threshold=?
+    Memory Pool: PS Survivor Space (Heap memory): committed=5.31 MB, used=5.30 MB, max=5.31 MB, threshold=?
+    Memory Pool: PS Old Gen (Heap memory): committed=41.25 MB, used=9.33 MB, max=333.38 MB, threshold=0.00 B
+    Memory Pool: PS Perm Gen (Non-heap memory): committed=25.81 MB, used=25.69 MB, max=166.00 MB, threshold=0.00 B
+2012-04-25 06:42:59.357+0000: Operating system information:
+    Operating System: Linux; version: 3.0.0-17-generic; arch: amd64; cpus: 2
+    Max number of file descriptors: 4096
+    Number of open file descriptors: 58
+    Process id: 2694@andreas-dell
+    Byte order: LITTLE_ENDIAN
+2012-04-25 06:42:59.362+0000: JVM information:
+    VM Name: OpenJDK 64-Bit Server VM
+    VM Vendor: Oracle Corporation
+    VM Version: 21.0-b17
+    JIT compiler: HotSpot 64-Bit Tiered Compilers
+    VM Arguments: [-Djdk.home=, -Djruby.home=/home/andreas/.rvm/rubies/jruby-1.6.7, -Djruby.script=jruby, -Djruby.shell=/bin/sh, -Djffi.boot.library.path=/home/andreas/.rvm/rubies/jruby-1.6.7/lib/native/ppc-Linux:/home/andreas/.rvm/rubies/jruby-1.6.7/lib/native/x86_64-Linux:/home/andreas/.rvm/rubies/jruby-1.6.7/lib/native/i386-Linux, -Xmx500m, -Xss2048k, -Djruby.memory.max=500m, -Djruby.stack.max=2048k, -Xbootclasspath/a:/home/andreas/.rvm/rubies/jruby-1.6.7/lib/jruby.jar]
+2012-04-25 06:42:59.363+0000: Java classpath:
+     [loader.0] file:/home/andreas/.rvm/gems/jruby-1.6.7@global/gems/json-1.6.5-java/lib/json/ext/parser.jar
+     [loader.2] file:/usr/lib/jvm/java-7-openjdk-common/jre/lib/ext/sunpkcs11.jar
+     [bootstrap] /usr/lib/jvm/java-7-openjdk-amd64/jre/lib/plugin.jar
+     [bootstrap] /usr/lib/jvm/java-7-openjdk-amd64/jre/lib/jce.jar
+     [loader.0] file:/home/andreas/.rvm/gems/jruby-1.6.7/gems/neo4j-community-1.7.0-java/lib/neo4j-community/jars/neo4j-kernel-1.7.jar
+     [bootstrap] /home/andreas/.rvm/rubies/jruby-1.6.7/lib/jruby.jar
+     [bootstrap] /usr/lib/jvm/java-7-openjdk-amd64/jre/lib/charsets.jar
+     [loader.2] file:/usr/lib/jvm/java-7-openjdk-common/jre/lib/ext/localedata.jar
+     [bootstrap] /usr/lib/jvm/java-7-openjdk-amd64/jre/lib/jsse.jar
+     [loader.0] file:/home/andreas/.rvm/gems/jruby-1.6.7/gems/neo4j-community-1.7.0-java/lib/neo4j-community/jars/neo4j-udc-1.7.jar
+     [bootstrap] /usr/lib/jvm/java-7-openjdk-amd64/jre/lib/sunrsasign.jar
+     [bootstrap] /usr/lib/jvm/java-7-openjdk-amd64/jre/lib/rhino.jar
+     [loader.2] file:/usr/lib/jvm/java-7-openjdk-common/jre/lib/ext/dnsns.jar
+     [loader.0] file:/home/andreas/.rvm/gems/jruby-1.6.7/gems/neo4j-community-1.7.0-java/lib/neo4j-community/jars/neo4j-graph-algo-1.7.jar
+     [loader.0] file:/home/andreas/.rvm/gems/jruby-1.6.7/gems/neo4j-community-1.7.0-java/lib/neo4j-community/jars/org.apache.servicemix.bundles.jline-0.9.94_1.jar
+     [loader.0] file:/home/andreas/.rvm/gems/jruby-1.6.7/gems/neo4j-community-1.7.0-java/lib/neo4j-community/jars/lucene-core-3.5.0.jar
+     [loader.0] file:/home/andreas/.rvm/gems/jruby-1.6.7/gems/neo4j-community-1.7.0-java/lib/neo4j-community/jars/neo4j-cypher-1.7.jar
+     [loader.2] file:/usr/lib/x86_64-linux-gnu/jni/libjava-access-bridge-jni.so.0.0.0
+     [loader.0] file:/home/andreas/.rvm/gems/jruby-1.6.7@global/gems/json-1.6.5-java/lib/json/ext/generator.jar
+     [loader.0] file:/home/andreas/.rvm/gems/jruby-1.6.7/gems/neo4j-community-1.7.0-java/lib/neo4j-community/jars/geronimo-jta_1.1_spec-1.1.1.jar
+     [loader.0] file:/home/andreas/.rvm/gems/jruby-1.6.7/gems/neo4j-community-1.7.0-java/lib/neo4j-community/jars/scala-library-2.9.0-1.jar
+     [loader.2] file:/usr/lib/jvm/java-7-openjdk-common/jre/lib/ext/sunjce_provider.jar
+     [bootstrap] /usr/lib/jvm/java-7-openjdk-amd64/jre/lib/netx.jar
+     [bootstrap] /usr/lib/jvm/java-7-openjdk-amd64/jre/classes
+     [loader.2] file:/usr/share/java/gnome-java-bridge.jar
+     [loader.0] file:/home/andreas/.rvm/gems/jruby-1.6.7/gems/neo4j-community-1.7.0-java/lib/neo4j-community/jars/server-api-1.7.jar
+     [bootstrap] /usr/lib/jvm/java-7-openjdk-amd64/jre/lib/rt.jar
+     [loader.2] file:/usr/lib/jvm/java-7-openjdk-common/jre/lib/ext/pulse-java.jar
+     [loader.0] file:/home/andreas/.rvm/gems/jruby-1.6.7/gems/neo4j-community-1.7.0-java/lib/neo4j-community/jars/neo4j-graph-matching-1.7.jar
+     [loader.0] file:/home/andreas/.rvm/gems/jruby-1.6.7/gems/neo4j-community-1.7.0-java/lib/neo4j-community/jars/neo4j-shell-1.7.jar
+     [bootstrap] /usr/lib/jvm/java-7-openjdk-common/jre/lib/resources.jar
+     [loader.0] file:/home/andreas/.rvm/gems/jruby-1.6.7/gems/neo4j-community-1.7.0-java/lib/neo4j-community/jars/neo4j-jmx-1.7.jar
+     [classpath + loader.1] file:/home/andreas/projects/neo4j/lib/
+     [loader.0] file:/home/andreas/.rvm/gems/jruby-1.6.7/gems/neo4j-community-1.7.0-java/lib/neo4j-community/jars/neo4j-lucene-index-1.7.jar
+     [loader.2] file:/usr/lib/jvm/java-7-openjdk-common/jre/lib/ext/zipfs.jar
+2012-04-25 06:42:59.367+0000: Library path:
+    /usr/java/packages/lib/amd64
+    /usr/lib/x86_64-linux-gnu/jni
+    /lib/x86_64-linux-gnu
+    /usr/lib/x86_64-linux-gnu
+    /usr/lib/jni
+    /lib
+    /usr/lib
+2012-04-25 06:42:59.367+0000: System.properties:
+    jruby.home = /home/andreas/.rvm/rubies/jruby-1.6.7
+    sun.boot.library.path = /usr/lib/jvm/java-7-openjdk-amd64/jre/lib/amd64
+    path.separator = :
+    file.encoding.pkg = sun.io
+    user.country = US
+    sun.java.launcher = SUN_STANDARD
+    sun.os.patch.level = unknown
+    user.dir = /home/andreas/projects/neo4j/lib
+    jdk.home = 
+    sun.jnu.encoding = UTF-8
+    jruby.memory.max = 500m
+    sun.management.compiler = HotSpot 64-Bit Tiered Compilers
+    jffi.boot.library.path = /home/andreas/.rvm/rubies/jruby-1.6.7/lib/native/ppc-Linux:/home/andreas/.rvm/rubies/jruby-1.6.7/lib/native/x86_64-Linux:/home/andreas/.rvm/rubies/jruby-1.6.7/lib/native/i386-Linux
+    user.home = /home/andreas
+    user.timezone = Europe/Stockholm
+    file.encoding = UTF-8
+    jruby.stack.max = 2048k
+    jruby.script = jruby
+    user.name = andreas
+    jruby.shell = /bin/sh
+    sun.java.command = org/jruby/Main /home/andreas/.rvm/rubies/jruby-1.6.7/bin/irb
+    sun.arch.data.model = 64
+    user.language = en
+    awt.toolkit = sun.awt.X11.XToolkit
+    file.separator = /
+    sun.io.unicode.encoding = UnicodeLittle
+    sun.cpu.endian = little
+    sun.desktop = gnome
+    sun.cpu.isalist = 
+2012-04-25 06:42:59.368+0000: Linux scheduler information:
+    none
+    none
+    none
+    none
+    none
+    none
+    none
+    none
+    none
+    none
+    none
+    none
+    none
+    none
+    none
+    none
+    none
+    none
+    none
+    none
+    none
+    none
+    none
+    none
+    noop deadline [cfq] 
+    noop deadline [cfq] 
+2012-04-25 06:42:59.372+0000: --- STARTUP diagnostics END ---
+2012-04-25 06:42:59.446+0000: Extension org.neo4j.kernel.KernelExtension[kernel jmx] loaded ok
+2012-04-25 06:42:59.712+0000: Extension org.neo4j.kernel.KernelExtension[shell] loaded ok
+2012-04-25 06:42:59.714+0000: Extension org.neo4j.kernel.KernelExtension[kernel udc] loaded ok
+2012-04-25 06:42:59.717+0000: --- STARTUP diagnostics for KernelDiagnostics:Versions START ---
+2012-04-25 06:42:59.717+0000: Graph Database: org.neo4j.kernel.EmbeddedGraphDatabase StoreId[time:1335336178947, id:-2172206710464518899, store version: 13561656364791302]
+2012-04-25 06:42:59.717+0000: Kernel version: Neo4j - Graph Database Kernel 1.7
+2012-04-25 06:42:59.717+0000: Neo4j component versions:
+2012-04-25 06:42:59.718+0000:   Neo4j - Graph Database Kernel 1.7
+2012-04-25 06:42:59.718+0000: --- STARTUP diagnostics for KernelDiagnostics:Versions END ---
+2012-04-25 06:42:59.720+0000: --- STARTUP diagnostics for NEO_STORE_VERSIONS START ---
+2012-04-25 06:42:59.720+0000: Store versions:
+    Store versions:
+      NeoStore v0.A.0
+      NodeStore v0.A.0
+      RelationshipStore v0.A.0
+      RelationshipTypeStore v0.A.0
+      PropertyStore v0.A.0
+      PropertyIndexStore v0.A.0
+      StringPropertyStore v0.A.0
+      ArrayPropertyStore v0.A.0
+2012-04-25 06:42:59.720+0000: --- STARTUP diagnostics for NEO_STORE_VERSIONS END ---
+2012-04-25 06:42:59.720+0000: --- STARTUP diagnostics for NEO_STORE_ID_USAGE START ---
+2012-04-25 06:42:59.720+0000: Id usage:
+    Id usage:
+      NodeStore: used=1 high=0
+      RelationshipStore: used=0 high=-1
+      RelationshipTypeStore: used=0 high=-1
+      PropertyStore: used=0 high=-1
+      PropertyIndexStore: used=0 high=-1
+      StringPropertyStore: used=1 high=0
+      ArrayPropertyStore: used=1 high=0
+2012-04-25 06:42:59.721+0000: --- STARTUP diagnostics for NEO_STORE_ID_USAGE END ---
+2012-04-25 06:42:59.721+0000: --- STARTUP diagnostics for KernelDiagnostics:StoreFiles START ---
+2012-04-25 06:42:59.721+0000: Storage files:
+    neostore.relationshiptypestore.db.names: 38.00 B
+    neostore.id: 9.00 B
+    neostore.relationshiptypestore.db.names.id: 9.00 B
+    neostore.nodestore.db.id: 9.00 B
+    nioneo_logical.log.1: 16.00 B
+    neostore.propertystore.db.index: 0.00 B
+    neostore.propertystore.db.strings.id: 9.00 B
+    nioneo_logical.log.active: 4.00 B
+    neostore.propertystore.db.strings: 128.00 B
+    neostore.relationshiptypestore.db.id: 9.00 B
+    neostore: 54.00 B
+    neostore.nodestore.db: 9.00 B
+    neostore.propertystore.db.index.keys.id: 9.00 B
+    neostore.propertystore.db.arrays.id: 9.00 B
+    messages.log: 12.14 kB
+    neostore.relationshipstore.db.id: 9.00 B
+    neostore.propertystore.db.arrays: 128.00 B
+    neostore.relationshipstore.db: 0.00 B
+    neostore.propertystore.db.index.id: 9.00 B
+    neostore.propertystore.db.id: 9.00 B
+    neostore.propertystore.db: 0.00 B
+    index:
+      lucene-store.db: 40.00 B
+      lucene.log.1: 16.00 B
+      lucene.log.active: 4.00 B
+    - Total: 60.00 B
+    tm_tx_log.1: 0.00 B
+    neostore.relationshiptypestore.db: 0.00 B
+    lock: 0.00 B
+    active_tx_log: 11.00 B
+    neostore.propertystore.db.index.keys: 38.00 B
+2012-04-25 06:42:59.723+0000: --- STARTUP diagnostics for KernelDiagnostics:StoreFiles END ---
+2012-04-25 06:42:59.725+0000: Started - database is now available
+2012-04-25 06:42:59.725+0000: GC Monitor started. 
+2012-04-25 07:42:59.916+0000: GC Monitor: Application threads blocked for an additional 238ms [total block time: 0.238s]
+2012-04-25 09:43:00.185+0000: GC Monitor: Application threads blocked for an additional 123ms [total block time: 0.361s]
+2012-04-25 13:16:52.462+0000: GC Monitor: Application threads blocked for an additional 1977426ms [total block time: 1977.787s]
+2012-04-25 13:17:15.740+0000: GC Monitor: Application threads blocked for an additional 609ms [total block time: 1978.396s]
+2012-04-25 13:43:00.715+0000: GC Monitor: Application threads blocked for an additional 142ms [total block time: 1978.538s]
+2012-04-25 14:43:01.047+0000: GC Monitor: Application threads blocked for an additional 248ms [total block time: 1978.786s]
+2012-04-25 17:43:01.553+0000: GC Monitor: Application threads blocked for an additional 135ms [total block time: 1978.921s]
+2012-04-26 06:37:25.006+0000: GC Monitor: Application threads blocked for an additional 44031287ms [total block time: 46010.207s]
+2012-04-26 08:37:26.005+0000: GC Monitor: Application threads blocked for an additional 825ms [total block time: 46011.03s]
+2012-04-26 09:37:26.201+0000: GC Monitor: Application threads blocked for an additional 112ms [total block time: 46011.145s]
+2012-04-26 11:37:26.540+0000: GC Monitor: Application threads blocked for an additional 160ms [total block time: 46011.305s]
+2012-04-26 13:37:26.871+0000: GC Monitor: Application threads blocked for an additional 152ms [total block time: 46011.457s]
+2012-04-26 15:37:27.191+0000: GC Monitor: Application threads blocked for an additional 115ms [total block time: 46011.57s]
+2012-04-26 16:37:27.342+0000: GC Monitor: Application threads blocked for an additional 105ms [total block time: 46011.676s]
+2012-04-26 18:37:27.643+0000: GC Monitor: Application threads blocked for an additional 146ms [total block time: 46011.824s]
+2012-04-26 19:10:15.054+0000: GC Monitor: Application threads blocked for an additional 927ms [total block time: 46012.754s]
+2012-04-26 19:37:27.802+0000: GC Monitor: Application threads blocked for an additional 144ms [total block time: 46012.895s]
+2012-04-26 19:42:40.923+0000: Stopping - database is now unavailable
+2012-04-26 19:42:40.932+0000: TM shutting down
+2012-04-26 19:42:40.963+0000: GC Monitor stopped. 
+2012-04-26 19:42:41.226+0000: Closed log /home/andreas/projects/neo4j/lib/db/index/lucene.log
+2012-04-26 19:42:41.257+0000: Closed log /home/andreas/projects/neo4j/lib/db/nioneo_logical.log

data/lib/generators/neo4j/model/model_generator.rb

@@ -54,14 +54,11 @@ class Neo4j::Generators::ModelGenerator < Neo4j::Generators::Base #:nodoc:
     options[:indices]
   end
 
-  def indices_statements
-    puts "indices_statements #{options[:indices].inspect}"
-    txt = ""
-    options[:indices].each do |key|
-      txt << %Q{
-  index :#{key}}
+
+  def index_fragment(property)
+    if options[:indices].include?(property)
+      ", :index => :exact"
     end
-    txt
   end
 
 	def parent?

data/lib/generators/neo4j/model/templates/model.erb

@@ -1,9 +1,7 @@
 class <%= class_name %> < <%= parent? ? options[:parent].classify : "Neo4j::Rails::Model" %>
 <% attributes.each do |attribute| -%>
-  property :<%= attribute.name %><%= ", :type => #{attribute.type_class}" unless attribute.type_class == 'any' %>
+  property :<%= attribute.name %><%= ", :type => #{attribute.type_class}" unless attribute.type_class == 'any' %><%= index_fragment(attribute.name) %>
 <% end -%>
-<%= indices_statements if indices? -%>
-
 <%= has_n_statements if has_n? -%>
 <%= has_one_statements if has_one? -%>
 

data/lib/neo4j.rb

@@ -15,8 +15,9 @@ require 'active_model'
 require 'neo4j-core'
 require 'neo4j-wrapper'
 
+require 'neo4j/type_converters/serialize_converter'
 require 'neo4j/rails/rails'
-
+require 'neo4j/paginated'
 
 require 'orm_adapter/adapters/neo4j'
 Dir["#{File.dirname(__FILE__)}/tasks/**/*.rake"].each { |ext| load ext } if defined?(Rake) && respond_to?(:namespace)

data/lib/neo4j/paginated.rb

@@ -0,0 +1,23 @@
+module Neo4j
+
+  # The class provides the pagination based on the given source.
+  # The source must be an Enumerable implementing methods drop, first and count (or size).
+  # This can be used to paginage any Enumerable collection and
+  # provides the integration point for other gems, like will_paginate and kaminari.
+  class Paginated
+    include Enumerable
+    attr_reader :items, :total, :current_page
+
+    def initialize(items, total, current_page)
+      @items, @total, @current_page = items, total, current_page
+    end
+
+    def self.create_from(source, page, per_page)
+      partial = source.drop((page-1) * per_page).first(per_page)
+      Paginated.new(partial, source.count, page)
+    end
+
+    delegate :each, :to => :items
+    delegate :size, :[], :to => :items
+  end
+end

data/lib/neo4j/rails/accept_id.rb

@@ -57,7 +57,7 @@ module Neo4j::Rails
         class_eval %Q{
           def #{association_name}_id=(id)
             relation_target_class = self.class._decl_rels[:#{association_name}].target_class
-            association_class =  relation_target_class <= self.class ?  Neo4j::Rails::Model : relation_target_class
+            association_class =  (relation_target_class.nil? || relation_target_class <= self.class) ?  Neo4j::Rails::Model : relation_target_class
             self.#{association_name} = id.present? ? association_class.find(id) : nil
           end
         }, __FILE__, __LINE__

data/lib/neo4j/rails/attributes.rb

@@ -26,16 +26,16 @@ module Neo4j
         self.attribute_defaults ||= {}
 
         # save the original [] and []= to use as read/write to Neo4j
-        alias_method :read_attribute, :[]
-        alias_method :write_attribute, :[]=
+        alias_method :read_property_from_db, :[]
+        alias_method :write_property_from_db, :[]=
 
         # wrap the read/write in type conversion
-        alias_method_chain :read_local_property, :type_conversion
-        alias_method_chain :write_local_property, :type_conversion
+        alias_method_chain :read_attribute, :type_conversion
+        alias_method_chain :write_attribute, :type_conversion
 
         # whenever we refer to [] or []=. use our local properties store
-        alias_method :[], :read_local_property
-        alias_method :[]=, :write_local_property
+        alias_method :[], :read_attribute
+        alias_method :[]=, :write_attribute
 
         def self.inherited(sub_klass)
           super
@@ -188,7 +188,7 @@ module Neo4j
 
       def property_changed?
         return !@_properties.empty? unless persisted?
-        !!@_properties.keys.find { |k| self._java_node[k] != @_properties[k] }
+        !!@_properties.keys.find { |k| self._java_entity[k] != @_properties[k] }
       end
 
       # Return true if method_name is the name of an appropriate attribute
@@ -199,22 +199,22 @@ module Neo4j
 
 
       # Wrap the getter in a conversion from Java to Ruby
-      def read_local_property_with_type_conversion(property)
-        self.class._converter(property).to_ruby(read_local_property_without_type_conversion(property))
+      def read_attribute_with_type_conversion(property)
+        self.class._converter(property).to_ruby(read_attribute_without_type_conversion(property))
       end
 
       # Wrap the setter in a conversion from Ruby to Java
-      def write_local_property_with_type_conversion(property, value)
+      def write_attribute_with_type_conversion(property, value)
         @_properties_before_type_cast[property.to_sym]=value if self.class._decl_props.has_key? property.to_sym
         conv_value = self.class._converter(property.to_sym).to_java(value)
-        write_local_property_without_type_conversion(property, conv_value)
+        write_attribute_without_type_conversion(property, conv_value)
       end
 
 
       # The behaviour of []= changes with a Rails Model, where nothing gets written
       # to Neo4j until the object is saved, during which time all the validations
       # and callbacks are run to ensure correctness
-      def write_local_property(key, value)
+      def write_attribute(key, value)
         key_s = key.to_s
         if !@_properties.has_key?(key_s) || @_properties[key_s] != value
           attribute_will_change!(key_s)
@@ -225,12 +225,12 @@ module Neo4j
 
       # Returns the locally stored value for the key or retrieves the value from
       # the DB if we don't have one
-      def read_local_property(key)
+      def read_attribute(key)
         key = key.to_s
         if @_properties.has_key?(key)
           @_properties[key]
         else
-          @_properties[key] = (persisted? && _java_entity.has_property?(key)) ? read_attribute(key) : attribute_defaults[key]
+          @_properties[key] = (!new_record? && _java_entity.has_property?(key)) ? read_property_from_db(key) : attribute_defaults[key]
         end
       end
 
@@ -244,7 +244,8 @@ module Neo4j
 
         # Declares a property.
         # It support the following hash options:
-        # <tt>:default</tt>,<tt>:null</tt>,<tt>:limit</tt>,<tt>:type</tt>,<tt>:index</tt>,<tt>:converter</tt>
+        # <tt>:default</tt>,<tt>:null</tt>,<tt>:limit</tt>,<tt>:type</tt>,<tt>:index</tt>,<tt>:converter</tt>.
+        # Notice that you do not have to declare properties. You can always set and read properties using the <tt>[]</tt> and <tt>[]=</tt> operators.
         #
         # @example Set the property type,
         #   class Person < Neo4j::RailsModel
@@ -255,11 +256,12 @@ module Neo4j
         #   class Person < Neo4j::RailsModel
         #     property :age, :default => 0
         #   end
+        #
         # @example
         #   class Person < Neo4j::RailsModel
+        #     # Property must be there
         #     property :age, :null => false
         #   end
-        # Property must be there
         #
         # @example Property has a length limit
         #   class Person < Neo4j::RailsModel
@@ -294,6 +296,8 @@ module Neo4j
         #     property :name, :converter => MyConverter
         #   end
         #
+        # @see Neo4j::TypeConverters::SerializeConverter SerializeConverter for using type => :serialize
+        # @see http://rdoc.info/github/andreasronge/neo4j-wrapper/Neo4j/TypeConverters for converters defined in neo4j-wrapper gem (which is included).
         def property(*args)
           options = args.extract_options!
           args.each do |property_sym|
@@ -362,20 +366,24 @@ module Neo4j
       end
 
 
+      def _classname
+        self.class.to_s
+      end
+
       protected
 
 
       # Ensure any defaults are stored in the DB
       def write_default_attributes
         self.class.attribute_defaults.each do |attribute, value|
-          write_attribute(attribute, Neo4j::TypeConverters.convert(value, attribute, self.class, false)) unless changed_attributes.has_key?(attribute) || _java_node.has_property?(attribute)
+          write_property_from_db(attribute, Neo4j::TypeConverters.convert(value, attribute, self.class, false)) unless changed_attributes.has_key?(attribute) || _java_entity.has_property?(attribute)
         end
       end
 
       # Write attributes to the Neo4j DB only if they're altered
       def write_changed_attributes
         @_properties.each do |attribute, value|
-          write_attribute(attribute, value) if changed_attributes.has_key?(attribute)
+          write_property_from_db(attribute, value) if changed_attributes.has_key?(attribute)
         end
       end
 
@@ -390,25 +398,27 @@ module Neo4j
         end
       end
 
-      # TODO THIS IS ONLY NEEDED IN ACTIVEMODEL < 3.2, ?
-      # To get ActiveModel::Dirty to work, we need to be able to call undeclared
-      # properties as though they have get methods
-      def method_missing(method_id, *args, &block)
-        method_name = method_id.to_s
-        if property?(method_name)
-          self[method_name]
-        else
-          super
+      if ActiveModel::VERSION::STRING < "3.2.0"
+        # THIS IS ONLY NEEDED IN ACTIVEMODEL < 3.2
+        # To get ActiveModel::Dirty to work, we need to be able to call undeclared
+        # properties as though they have get methods
+        def method_missing(method_id, *args, &block)
+          method_name = method_id.to_s
+          if property?(method_name)
+            self[method_name]
+          else
+            super
+          end
         end
       end
 
+
       def _invalid_attribute_name?(attr_name)
         attr_name.to_s[0] == ?_ && !self.class._decl_props.include?(attr_name.to_sym)
       end
 
 
 
-
       # Instantiates objects for all attribute classes that needs more than one constructor parameter. This is done
       # by calling new on the column type or aggregation type (through composed_of) object with these parameters.
       # So having the pairs written_on(1) = "2004", written_on(2) = "6", written_on(3) = "24", will instantiate
@@ -505,12 +515,8 @@ module Neo4j
         @changed_attributes.clear
       end
 
-      def _classname
-        self.class.to_s
-      end
-
       def _classname=(value)
-        write_local_property_without_type_conversion("_classname", value)
+        write_attribute_without_type_conversion("_classname", value)
       end
 
     end

data/lib/neo4j/rails/has_n.rb

@@ -14,7 +14,7 @@ module Neo4j
         # See also Neo4j::NodeMixin#has_n which only work with persisted relationships.
         #
         # @example
-        #   class Thing
+        #   class Thing < Neo4j::Rails::Model
         #     has_n(:things)
         #   end
         #
@@ -25,6 +25,7 @@ module Neo4j
         # @example declare a to relationship
         #  class Company
         #    has_n(:employees).to(Person)
+        #    # alternative - has_n(:employees).to("Person")
         #  end
         #
         #  c = Company.new
@@ -45,6 +46,17 @@ module Neo4j
         # @example advanced traversal, using Neo4j::Core::Traversal
         #  c._outgoing(Company.employees).outgoing(:friends).depth.each{ }
         #
+        # @example declare incoming
+        #   class Person < Neo4j::Rails::Model
+        #     has_n(:likes).to(Song)
+        #   end
+        #
+        #   class Song < Neo4j::Rails::Model
+        #     has_n(:people_liking_this_song).from(Person.likes)  # or from(Person, likes)
+        #   end
+        #
+        #   Song.people_liking_this_song.build # creates a Person
+        #
         # @see Neo4j::Rails::Relationships::NodesDSL
         def has_n(*args)
           options = args.extract_options!
@@ -56,6 +68,7 @@ module Neo4j
         # @example
         #  class Person
         #    has_one(:friend).to(OtherClass)
+        #    has_one(:root).from("SomeOtherClassAsString")
         #  end
         #
         # @example

data/lib/neo4j/rails/persistence.rb

@@ -102,8 +102,26 @@ module Neo4j
           end
         end
 
+        # Get the indexed entity, creating it (exactly once) if no indexed entity exist.
+        #
+        # @example Creating a Unique node
+        #
+        #   class MyNode < Neo4j::Rails::Model
+        #     property :email, :index => :exact, :unique => true
+        #   end
+        #
+        #   node = MyNode.get_or_create(:email =>'jimmy@gmail.com', :name => 'jimmy')
+        #
+        # @see #put_if_absent
+        def get_or_create(*args)
+          props = args.first
+          raise "Can't get or create entity since #{props.inspect} does not included unique key #{props[unique_factory_key]}'" unless props[unique_factory_key]
+          index = index_for_type(_decl_props[unique_factory_key][:index])
+          Neo4j::Core::Index::UniqueFactory.new(unique_factory_key, index) { |*| create!(*args) }.get_or_create(unique_factory_key, props[unique_factory_key])
+        end
+
         # Same as #create, but raises an error if there is a problem during save.
-        # Returns the object whether saved successfully or not.
+        # @return [Neo4j::Rails::Model, Neo4j::Rails::Relationship]
         def create!(*args)
           new(*args).tap do |o|
             yield o if block_given?
@@ -119,6 +137,11 @@ module Neo4j
         end
       end
 
+      # Returns if the entity is currently being updated or created
+      def create_or_updating?
+        !!@_create_or_updating
+      end
+
       protected
 
       def update
@@ -128,6 +151,8 @@ module Neo4j
       end
 
       def create_or_update
+        # since the same model can be created or updated twice from a relationship we have to have this guard
+        @_create_or_updating = true
         result = persisted? ? update : create
         unless result != false
           Neo4j::Rails::Transaction.fail if Neo4j::Rails::Transaction.running?
@@ -135,8 +160,11 @@ module Neo4j
         else
           true
         end
+      ensure
+        @_create_or_updating = nil
       end
 
+
       def set_deleted_properties
         @_deleted = true
       end

data/lib/neo4j/rails/relationship_persistence.rb

@@ -42,9 +42,9 @@ module Neo4j
       # @see http://rdoc.info/github/andreasronge/neo4j-core/Neo4j/Core/Relationship#other_node-instance_method
       def other_node(node)
         if persisted?
-          _java_rel._other_node(node._java_node)
+          _java_rel._other_node(node._java_entity)
         else
-          @_start_node == (node._java_node || node) ? @_end_node : @_start_node
+          @_start_node == (node._java_entity || node) ? @_end_node : @_start_node
         end
       end
 
@@ -104,7 +104,7 @@ module Neo4j
       end
 
       def _persist_node(start_or_end_node)
-        (start_or_end_node.new_record? || start_or_end_node.relationships_changed?) ? start_or_end_node.save : true
+        ((start_or_end_node.new_record? || start_or_end_node.relationships_changed?) && !start_or_end_node.create_or_updating?) ? start_or_end_node.save : true
       end
 
     end

data/lib/neo4j/rails/relationships/relationships.rb

@@ -73,7 +73,7 @@ module Neo4j
       end
 
       # Allow to access persisted and unpersisted relationships - like the #outgoing and #incoming method.
-      # To only find all the persisted relationship, node._java_node.rels
+      # To only find all the persisted relationship, node._java_entity.rels
       #
       # @example
       #   node.outgoing(:foo) << node2

data/lib/neo4j/rails/transaction.rb

@@ -11,6 +11,26 @@ module Neo4j
     #      ...
     #  end
     class Transaction
+
+      # Acquires a write lock for entity for this transaction. The lock (returned from this method) can be released manually, but if not it's released automatically when the transaction finishes.
+      # There is no implementation for this here because it's an java method
+      #
+      # @param [Neo4j::Relationship, Neo4j::Node] java_entity the entity to acquire a lock for. If another transaction currently holds a write lock to that entity this call will wait until it's released.
+      # @return [Java::OrgNeo4jGraphdb::Lock] a Lock which optionally can be used to release this lock earlier than when the transaction finishes. If not released (with Lock.release() it's going to be released with the transaction finishes.
+      # @see http://api.neo4j.org/current/org/neo4j/graphdb/Transaction.html#acquireWriteLock(Java::OrgNeo4jGraphdb::PropertyContainer)
+      # @see http://api.neo4j.org/current/org/neo4j/graphdb/Lock.html
+      def acquire_write_lock(java_entity)
+      end
+
+      # Acquires a read lock for entity for this transaction. The lock (returned from this method) can be released manually, but if not it's released automatically when the transaction finishes.
+      # There is no implementation for this here because it's an java method
+      # @param [Neo4j::Relationship, Neo4j::Node] java_entity the entity to acquire a lock for. If another transaction currently hold a write lock to that entity this call will wait until it's released.
+      # @return [Java::OrgNeo4jGraphdb::Lock]  a Lock which optionally can be used to release this lock earlier than when the transaction finishes. If not released (with Lock.release() it's going to be released with the transaction finishes.
+      # @see http://api.neo4j.org/current/org/neo4j/graphdb/Transaction.html#acquireReadLock(Java::OrgNeo4jGraphdb::PropertyContainer)
+      # @see http://api.neo4j.org/current/org/neo4j/graphdb/Lock.html
+      def acquire_read_lock(java_entity)
+      end
+
       class << self
         def current
           Thread.current[:neo4j_transaction]

data/lib/neo4j/type_converters/serialize_converter.rb

@@ -0,0 +1,39 @@
+#require "activesupport/lib/active_support/core_ext/hash/keys.rb"
+
+module Neo4j
+  module TypeConverters
+    # Serialize using YAML
+    #
+    # @example Usage from Neo4j::Rails::Model
+    #   class Person < Neo4j::Rails::Model
+    #     property :stuff, :type => :serialize
+    #   end
+    #   Person.new(:stuff => {:complex => :things})
+    #
+    # @see http://rdoc.info/github/andreasronge/neo4j-wrapper/Neo4j/TypeConverters for converters defined in neo4j-wrapper gem (which is included).
+    class SerializeConverter
+      # serializes to sting
+      class << self
+
+        def convert?(type)
+          type == :serialize
+        end
+
+        def to_java(value)
+          return nil unless value
+          YAML.dump(value)
+        end
+
+        def to_ruby(value)
+          # from db, to object
+          return nil unless value
+          YAML.load(value)
+        end
+
+        def index_as
+          String
+        end
+      end
+    end
+  end
+end

data/lib/neo4j/version.rb

@@ -1,3 +1,3 @@
 module Neo4j
-  VERSION = "2.0.0.alpha.7"
+  VERSION = "2.0.0.alpha.8"
 end

data/neo4j.gemspec

@@ -32,5 +32,5 @@ It comes included with the Apache Lucene document database.
   s.add_dependency('orm_adapter', ">= 0.0.3")
   s.add_dependency("activemodel", ">= 3.0.0", "< 3.3")
   s.add_dependency("railties", ">= 3.0.0", "< 3.3")
-  s.add_dependency("neo4j-wrapper", '0.0.8')
+  s.add_dependency("neo4j-wrapper", '0.0.11')
 end

metadata

@@ -2,7 +2,7 @@
 name: neo4j
 version: !ruby/object:Gem::Version 
   prerelease: 6
-  version: 2.0.0.alpha.7
+  version: 2.0.0.alpha.8
 platform: java
 authors: 
   - Andreas Ronge
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-04-19 00:00:00 Z
+date: 2012-04-27 00:00:00 Z
 dependencies: 
   - !ruby/object:Gem::Dependency 
     name: orm_adapter
@@ -59,7 +59,7 @@ dependencies:
       requirements: 
         - - "="
           - !ruby/object:Gem::Version 
-            version: 0.0.8
+            version: 0.0.11
     type: :runtime
     version_requirements: *id004
 description: |
@@ -93,7 +93,9 @@ files:
   - lib/tasks/upgrade_v2/upgrade_v2.rake
   - lib/tasks/upgrade_v2/lib/upgrade_v2.rb
   - lib/orm_adapter/adapters/neo4j.rb
+  - lib/neo4j/paginated.rb
   - lib/neo4j/version.rb
+  - lib/neo4j/type_converters/serialize_converter.rb
   - lib/neo4j/rails/attributes.rb
   - lib/neo4j/rails/rack_middleware.rb
   - lib/neo4j/rails/model.rb
@@ -124,6 +126,44 @@ files:
   - lib/neo4j/rails/validations/associated.rb
   - lib/neo4j/rails/validations/uniqueness.rb
   - lib/neo4j/rails/validations/non_nil.rb
+  - lib/db/neostore.relationshiptypestore.db.names
+  - lib/db/neostore.id
+  - lib/db/neostore.relationshiptypestore.db.names.id
+  - lib/db/neostore.nodestore.db.id
+  - lib/db/neostore.propertystore.db.index
+  - lib/db/neostore.propertystore.db.strings.id
+  - lib/db/nioneo_logical.log.active
+  - lib/db/neostore.propertystore.db.strings
+  - lib/db/neostore.relationshiptypestore.db.id
+  - lib/db/neostore
+  - lib/db/neostore.nodestore.db
+  - lib/db/neostore.propertystore.db.index.keys.id
+  - lib/db/neostore.propertystore.db.arrays.id
+  - lib/db/messages.log
+  - lib/db/neostore.relationshipstore.db.id
+  - lib/db/neostore.propertystore.db.arrays
+  - lib/db/neostore.relationshipstore.db
+  - lib/db/neostore.propertystore.db.index.id
+  - lib/db/neostore.propertystore.db.id
+  - lib/db/index.db
+  - lib/db/neostore.propertystore.db
+  - lib/db/tm_tx_log.1
+  - lib/db/neostore.relationshiptypestore.db
+  - lib/db/lock
+  - lib/db/active_tx_log
+  - lib/db/neostore.propertystore.db.index.keys
+  - lib/db/index/lucene-store.db
+  - lib/db/index/lucene.log.active
+  - lib/db/index/lucene/node/Person_fulltext/_0.fdx
+  - lib/db/index/lucene/node/Person_fulltext/segments.gen
+  - lib/db/index/lucene/node/Person_fulltext/_0.frq
+  - lib/db/index/lucene/node/Person_fulltext/_0.nrm
+  - lib/db/index/lucene/node/Person_fulltext/_0.fdt
+  - lib/db/index/lucene/node/Person_fulltext/_0.tis
+  - lib/db/index/lucene/node/Person_fulltext/_0.tii
+  - lib/db/index/lucene/node/Person_fulltext/segments_1
+  - lib/db/index/lucene/node/Person_fulltext/_0.prx
+  - lib/db/index/lucene/node/Person_fulltext/_0.fnm
   - config/locales/en.yml
   - config/neo4j/config.yml
   - README.rdoc