neo4j 2.0.1-java → 2.2.0-java

data/lib/neo4j/version.rb~

@@ -0,0 +1,3 @@
+module Neo4j
+  VERSION = "2.2.0.rc1"
+end

data/lib/orm_adapter/adapters/neo4j.rb

@@ -32,19 +32,66 @@ module Neo4j
         end
 
         # Find the first instance matching conditions
-        def find_first(conditions)
-          klass.first(conditions)
+        def find_first(options = {})
+          conditions, order = extract_conditions!(options)
+          if !order.empty?
+            find_with_order(conditions, order).first
+          else
+            klass.first(conditions)
+          end
         end
 
+
         # Find all models matching conditions
-        def find_all(conditions)
-          klass.all(conditions)
+        def find_all(options = {})
+          conditions, order, limit, offset = extract_conditions!(options)
+          result = if !order.empty?
+            find_with_order(conditions, order)
+          else
+            klass.all(conditions)
+          end
+
+          if limit && offset
+            result.drop(offset).first(limit)
+          elsif limit
+            result.first(limit)
+          else
+            result.to_a
+          end
+
         end
 
         # Create a model using attributes
-        def create!(attributes)
+        def create!(attributes = {})
           klass.create!(attributes)
         end
+
+        # @see OrmAdapter::Base#destroy
+        def destroy(object)
+          object.destroy && true if valid_object?(object)
+        end
+
+        private
+
+        def find_with_order(conditions, order)
+          conditions = wild_card_condition if conditions.nil? || conditions.empty?
+
+          result = klass.all(conditions)
+          order.inject(result) do |r,spec|
+            if spec.is_a?(Array)
+              spec[1]==:desc ? r.desc(spec[0]) : r.asc(spec[0])
+            else
+              r.asc(spec)
+            end
+          end
+        end
+
+        def wild_card_condition
+          index_key = klass._decl_props.keys.find{|k| klass.index?(k) }
+          raise "Can't perform a order query when there is no lucene index (try cypher or declare an index) on #{klass}" unless index_key
+          "#{index_key}: *"
+        end
+
       end
     end
   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", '2.0.1')
+  s.add_dependency("neo4j-wrapper", '2.2.0')
 end

metadata

@@ -1,201 +1,326 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: neo4j
-version: !ruby/object:Gem::Version 
-  prerelease: 
-  version: 2.0.1
+version: !ruby/object:Gem::Version
+  prerelease:
+  version: 2.2.0
 platform: java
-authors: 
-  - Andreas Ronge
-autorequire: 
+authors:
+- Andreas Ronge
+autorequire:
 bindir: bin
 cert_chain: []
-
-date: 2012-06-07 00:00:00 Z
-dependencies: 
-  - !ruby/object:Gem::Dependency 
-    name: orm_adapter
-    prerelease: false
-    requirement: &id001 !ruby/object:Gem::Requirement 
-      none: false
-      requirements: 
-        - - ">="
-          - !ruby/object:Gem::Version 
-            version: 0.0.3
-    type: :runtime
-    version_requirements: *id001
-  - !ruby/object:Gem::Dependency 
-    name: activemodel
-    prerelease: false
-    requirement: &id002 !ruby/object:Gem::Requirement 
-      none: false
-      requirements: 
-        - - ">="
-          - !ruby/object:Gem::Version 
-            version: 3.0.0
-        - - <
-          - !ruby/object:Gem::Version 
-            version: "3.3"
-    type: :runtime
-    version_requirements: *id002
-  - !ruby/object:Gem::Dependency 
-    name: railties
-    prerelease: false
-    requirement: &id003 !ruby/object:Gem::Requirement 
-      none: false
-      requirements: 
-        - - ">="
-          - !ruby/object:Gem::Version 
-            version: 3.0.0
-        - - <
-          - !ruby/object:Gem::Version 
-            version: "3.3"
-    type: :runtime
-    version_requirements: *id003
-  - !ruby/object:Gem::Dependency 
-    name: neo4j-wrapper
-    prerelease: false
-    requirement: &id004 !ruby/object:Gem::Requirement 
-      none: false
-      requirements: 
-        - - "="
-          - !ruby/object:Gem::Version 
-            version: 2.0.1
-    type: :runtime
-    version_requirements: *id004
-description: |
-  You can think of Neo4j as a high-performance graph engine with all the features of a mature and robust database.
-  The programmer works with an object-oriented, flexible network structure rather than with strict and static tables 
-  yet enjoys all the benefits of a fully transactional, enterprise-strength database.
-  It comes included with the Apache Lucene document database.
-
+date: 2012-10-02 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: orm_adapter
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.0.3
+    none: false
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.0.3
+    none: false
+  prerelease: false
+  type: :runtime
+- !ruby/object:Gem::Dependency
+  name: activemodel
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 3.0.0
+    - - !binary |-
+        PA==
+      - !ruby/object:Gem::Version
+        version: '3.3'
+    none: false
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 3.0.0
+    - - !binary |-
+        PA==
+      - !ruby/object:Gem::Version
+        version: '3.3'
+    none: false
+  prerelease: false
+  type: :runtime
+- !ruby/object:Gem::Dependency
+  name: railties
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 3.0.0
+    - - !binary |-
+        PA==
+      - !ruby/object:Gem::Version
+        version: '3.3'
+    none: false
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 3.0.0
+    - - !binary |-
+        PA==
+      - !ruby/object:Gem::Version
+        version: '3.3'
+    none: false
+  prerelease: false
+  type: :runtime
+- !ruby/object:Gem::Dependency
+  name: neo4j-wrapper
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 2.2.0
+    none: false
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 2.2.0
+    none: false
+  prerelease: false
+  type: :runtime
+description: ! "You can think of Neo4j as a high-performance graph engine with all\
+  \ the features of a mature and robust database.\nThe programmer works with an object-oriented,\
+  \ flexible network structure rather than with strict and static tables \nyet enjoys\
+  \ all the benefits of a fully transactional, enterprise-strength database.\nIt comes\
+  \ included with the Apache Lucene document database.\n"
 email: andreas.ronge@gmail.com
-executables: 
-  - neo4j-shell
-  - neo4j-jars
-  - neo4j-upgrade
+executables:
+- neo4j-shell
+- neo4j-jars
+- neo4j-upgrade
 extensions: []
-
-extra_rdoc_files: 
-  - README.rdoc
-files: 
-  - bin/neo4j-jars
-  - bin/neo4j-shell
-  - bin/neo4j-shell~
-  - bin/neo4j-upgrade
-  - lib/neo4j.rb
-  - lib/Gemfile~
-  - lib/test.rb~
-  - lib/config2.yml~
-  - lib/perf.rb~
-  - lib/generators/neo4j.rb
-  - lib/generators/neo4j/model/model_generator.rb
-  - lib/generators/neo4j/model/templates/model.erb
-  - lib/orm_adapter/adapters/neo4j.rb
-  - lib/neo4j/paginated.rb
-  - lib/neo4j/version.rb
-  - lib/neo4j/type_converters/serialize_converter.rb
-  - lib/neo4j/tasks/neo4j.rb
-  - lib/neo4j/tasks/upgrade_v2/upgrade_v2.rake
-  - lib/neo4j/tasks/upgrade_v2/lib/upgrade_v2.rb
-  - lib/neo4j/rails/attributes.rb
-  - lib/neo4j/rails/rack_middleware.rb
-  - lib/neo4j/rails/model.rb
-  - lib/neo4j/rails/validations.rb
-  - lib/neo4j/rails/identity.rb
-  - lib/neo4j/rails/persistence.rb
-  - lib/neo4j/rails/node_persistance.rb
-  - lib/neo4j/rails/serialization.rb
-  - lib/neo4j/rails/railtie.rb
-  - lib/neo4j/rails/rails.rb
-  - lib/neo4j/rails/relationship_persistence.rb
-  - lib/neo4j/rails/observer.rb
-  - lib/neo4j/rails/nested_attributes.rb
-  - lib/neo4j/rails/transaction.rb
-  - lib/neo4j/rails/timestamps.rb
-  - lib/neo4j/rails/callbacks.rb
-  - lib/neo4j/rails/has_n.rb
-  - lib/neo4j/rails/tx_methods.rb
-  - lib/neo4j/rails/accept_id.rb
-  - lib/neo4j/rails/finders.rb
-  - lib/neo4j/rails/relationship.rb
-  - lib/neo4j/rails/compositions.rb
-  - lib/neo4j/rails/relationships/rels_dsl.rb
-  - lib/neo4j/rails/relationships/node_dsl.rb
-  - lib/neo4j/rails/relationships/relationships.rb
-  - lib/neo4j/rails/relationships/storage.rb
-  - lib/neo4j/rails/versioning/versioning.rb
-  - 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/nioneo_logical.log.1
-  - 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/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.1
-  - lib/db/index/lucene.log.active
-  - config/locales/en.yml
-  - config/neo4j/config.yml
-  - README.rdoc
-  - CHANGELOG
-  - CONTRIBUTORS
-  - Gemfile
-  - neo4j.gemspec
+extra_rdoc_files:
+- README.rdoc
+files:
+- !binary |-
+  YmluL25lbzRqLWphcnM=
+- !binary |-
+  YmluL25lbzRqLXNoZWxs
+- !binary |-
+  YmluL25lbzRqLXVwZ3JhZGU=
+- !binary |-
+  bGliL25lbzRqLnJi
+- !binary |-
+  bGliL2RiL2FjdGl2ZV90eF9sb2c=
+- !binary |-
+  bGliL2RiL21lc3NhZ2VzLmxvZw==
+- !binary |-
+  bGliL2RiL25lb3N0b3Jl
+- !binary |-
+  bGliL2RiL25lb3N0b3JlLmlk
+- !binary |-
+  bGliL2RiL25lb3N0b3JlLm5vZGVzdG9yZS5kYg==
+- !binary |-
+  bGliL2RiL25lb3N0b3JlLm5vZGVzdG9yZS5kYi5pZA==
+- !binary |-
+  bGliL2RiL25lb3N0b3JlLnByb3BlcnR5c3RvcmUuZGI=
+- !binary |-
+  bGliL2RiL25lb3N0b3JlLnByb3BlcnR5c3RvcmUuZGIuYXJyYXlz
+- !binary |-
+  bGliL2RiL25lb3N0b3JlLnByb3BlcnR5c3RvcmUuZGIuYXJyYXlzLmlk
+- !binary |-
+  bGliL2RiL25lb3N0b3JlLnByb3BlcnR5c3RvcmUuZGIuaWQ=
+- !binary |-
+  bGliL2RiL25lb3N0b3JlLnByb3BlcnR5c3RvcmUuZGIuaW5kZXg=
+- !binary |-
+  bGliL2RiL25lb3N0b3JlLnByb3BlcnR5c3RvcmUuZGIuaW5kZXguaWQ=
+- !binary |-
+  bGliL2RiL25lb3N0b3JlLnByb3BlcnR5c3RvcmUuZGIuaW5kZXgua2V5cw==
+- !binary |-
+  bGliL2RiL25lb3N0b3JlLnByb3BlcnR5c3RvcmUuZGIuaW5kZXgua2V5cy5p
+  ZA==
+- !binary |-
+  bGliL2RiL25lb3N0b3JlLnByb3BlcnR5c3RvcmUuZGIuc3RyaW5ncw==
+- !binary |-
+  bGliL2RiL25lb3N0b3JlLnByb3BlcnR5c3RvcmUuZGIuc3RyaW5ncy5pZA==
+- !binary |-
+  bGliL2RiL25lb3N0b3JlLnJlbGF0aW9uc2hpcHN0b3JlLmRi
+- !binary |-
+  bGliL2RiL25lb3N0b3JlLnJlbGF0aW9uc2hpcHN0b3JlLmRiLmlk
+- !binary |-
+  bGliL2RiL25lb3N0b3JlLnJlbGF0aW9uc2hpcHR5cGVzdG9yZS5kYg==
+- !binary |-
+  bGliL2RiL25lb3N0b3JlLnJlbGF0aW9uc2hpcHR5cGVzdG9yZS5kYi5pZA==
+- !binary |-
+  bGliL2RiL25lb3N0b3JlLnJlbGF0aW9uc2hpcHR5cGVzdG9yZS5kYi5uYW1l
+  cw==
+- !binary |-
+  bGliL2RiL25lb3N0b3JlLnJlbGF0aW9uc2hpcHR5cGVzdG9yZS5kYi5uYW1l
+  cy5pZA==
+- !binary |-
+  bGliL2RiL25pb25lb19sb2dpY2FsLmxvZy5hY3RpdmU=
+- !binary |-
+  bGliL2RiL25pb25lb19sb2dpY2FsLmxvZy52MA==
+- !binary |-
+  bGliL2RiL3RtX3R4X2xvZy4x
+- !binary |-
+  bGliL2RiL2luZGV4L2x1Y2VuZS1zdG9yZS5kYg==
+- !binary |-
+  bGliL2RiL2luZGV4L2x1Y2VuZS5sb2cuYWN0aXZl
+- !binary |-
+  bGliL2RiL2luZGV4L2x1Y2VuZS5sb2cudjA=
+- !binary |-
+  bGliL2dlbmVyYXRvcnMvbmVvNGoucmI=
+- !binary |-
+  bGliL2dlbmVyYXRvcnMvbmVvNGovbW9kZWwvbW9kZWxfZ2VuZXJhdG9yLnJi
+- !binary |-
+  bGliL2dlbmVyYXRvcnMvbmVvNGovbW9kZWwvdGVtcGxhdGVzL21vZGVsLmVy
+  Yg==
+- !binary |-
+  bGliL25lbzRqL3BhZ2luYXRlZC5yYg==
+- !binary |-
+  bGliL25lbzRqL3ZlcnNpb24ucmI=
+- !binary |-
+  bGliL25lbzRqL3ZlcnNpb24ucmJ+
+- !binary |-
+  bGliL25lbzRqL3JhaWxzL2FjY2VwdF9pZC5yYg==
+- !binary |-
+  bGliL25lbzRqL3JhaWxzL2F0dHJpYnV0ZXMucmI=
+- !binary |-
+  bGliL25lbzRqL3JhaWxzL2NhbGxiYWNrcy5yYg==
+- !binary |-
+  bGliL25lbzRqL3JhaWxzL2NvbHVtbi5yYg==
+- !binary |-
+  bGliL25lbzRqL3JhaWxzL2NvbXBvc2l0aW9ucy5yYg==
+- !binary |-
+  bGliL25lbzRqL3JhaWxzL2ZpbmRlcnMucmI=
+- !binary |-
+  bGliL25lbzRqL3JhaWxzL2hhX2NvbnNvbGUucmI=
+- !binary |-
+  bGliL25lbzRqL3JhaWxzL2hhc19uLnJi
+- !binary |-
+  bGliL25lbzRqL3JhaWxzL2lkZW50aXR5LnJi
+- !binary |-
+  bGliL25lbzRqL3JhaWxzL21vZGVsLnJi
+- !binary |-
+  bGliL25lbzRqL3JhaWxzL25lc3RlZF9hdHRyaWJ1dGVzLnJi
+- !binary |-
+  bGliL25lbzRqL3JhaWxzL25vZGVfcGVyc2lzdGFuY2UucmI=
+- !binary |-
+  bGliL25lbzRqL3JhaWxzL29ic2VydmVyLnJi
+- !binary |-
+  bGliL25lbzRqL3JhaWxzL3BlcnNpc3RlbmNlLnJi
+- !binary |-
+  bGliL25lbzRqL3JhaWxzL3JhY2tfbWlkZGxld2FyZS5yYg==
+- !binary |-
+  bGliL25lbzRqL3JhaWxzL3JhaWxzLnJi
+- !binary |-
+  bGliL25lbzRqL3JhaWxzL3JhaWx0aWUucmI=
+- !binary |-
+  bGliL25lbzRqL3JhaWxzL3JlbGF0aW9uc2hpcC5yYg==
+- !binary |-
+  bGliL25lbzRqL3JhaWxzL3JlbGF0aW9uc2hpcF9wZXJzaXN0ZW5jZS5yYg==
+- !binary |-
+  bGliL25lbzRqL3JhaWxzL3NlcmlhbGl6YXRpb24ucmI=
+- !binary |-
+  bGliL25lbzRqL3JhaWxzL3RpbWVzdGFtcHMucmI=
+- !binary |-
+  bGliL25lbzRqL3JhaWxzL3RyYW5zYWN0aW9uLnJi
+- !binary |-
+  bGliL25lbzRqL3JhaWxzL3R4X21ldGhvZHMucmI=
+- !binary |-
+  bGliL25lbzRqL3JhaWxzL3ZhbGlkYXRpb25zLnJi
+- !binary |-
+  bGliL25lbzRqL3JhaWxzL2hhX2NvbnNvbGUvaGFfY29uc29sZS5yYg==
+- !binary |-
+  bGliL25lbzRqL3JhaWxzL2hhX2NvbnNvbGUvcmFpbHRpZS5yYg==
+- !binary |-
+  bGliL25lbzRqL3JhaWxzL2hhX2NvbnNvbGUvem9va2VlcGVyL2NsZWFuLnNo
+- !binary |-
+  bGliL25lbzRqL3JhaWxzL2hhX2NvbnNvbGUvem9va2VlcGVyL3N0YXJ0X3pv
+  b2tlZXBlci5zaA==
+- !binary |-
+  bGliL25lbzRqL3JhaWxzL2hhX2NvbnNvbGUvem9va2VlcGVyL3pvb2tlZXBl
+  ci5yYg==
+- !binary |-
+  bGliL25lbzRqL3JhaWxzL2hhX2NvbnNvbGUvem9va2VlcGVyL2NvbmYvc2Vy
+  dmVyMS5jZmc=
+- !binary |-
+  bGliL25lbzRqL3JhaWxzL2hhX2NvbnNvbGUvem9va2VlcGVyL2RhdGEvem9v
+  a2VlcGVyMS9teWlk
+- !binary |-
+  bGliL25lbzRqL3JhaWxzL3JlbGF0aW9uc2hpcHMvbm9kZV9kc2wucmI=
+- !binary |-
+  bGliL25lbzRqL3JhaWxzL3JlbGF0aW9uc2hpcHMvcmVsYXRpb25zaGlwcy5y
+  Yg==
+- !binary |-
+  bGliL25lbzRqL3JhaWxzL3JlbGF0aW9uc2hpcHMvcmVsc19kc2wucmI=
+- !binary |-
+  bGliL25lbzRqL3JhaWxzL3JlbGF0aW9uc2hpcHMvc3RvcmFnZS5yYg==
+- !binary |-
+  bGliL25lbzRqL3JhaWxzL3ZhbGlkYXRpb25zL2Fzc29jaWF0ZWQucmI=
+- !binary |-
+  bGliL25lbzRqL3JhaWxzL3ZhbGlkYXRpb25zL25vbl9uaWwucmI=
+- !binary |-
+  bGliL25lbzRqL3JhaWxzL3ZhbGlkYXRpb25zL3VuaXF1ZW5lc3MucmI=
+- !binary |-
+  bGliL25lbzRqL3JhaWxzL3ZlcnNpb25pbmcvdmVyc2lvbmluZy5yYg==
+- !binary |-
+  bGliL25lbzRqL3Rhc2tzL25lbzRqLnJi
+- !binary |-
+  bGliL25lbzRqL3Rhc2tzL3VwZ3JhZGVfdjIvdXBncmFkZV92Mi5yYWtl
+- !binary |-
+  bGliL25lbzRqL3Rhc2tzL3VwZ3JhZGVfdjIvbGliL3VwZ3JhZGVfdjIucmI=
+- !binary |-
+  bGliL25lbzRqL3R5cGVfY29udmVydGVycy9zZXJpYWxpemVfY29udmVydGVy
+  LnJi
+- !binary |-
+  bGliL29ybV9hZGFwdGVyL2FkYXB0ZXJzL25lbzRqLnJi
+- !binary |-
+  Y29uZmlnL2xvY2FsZXMvZW4ueW1s
+- !binary |-
+  Y29uZmlnL25lbzRqL2NvbmZpZy55bWw=
+- README.rdoc
+- CHANGELOG
+- CONTRIBUTORS
+- Gemfile
+- neo4j.gemspec
 homepage: http://github.com/andreasronge/neo4j/tree
 licenses: []
-
-post_install_message: 
-rdoc_options: 
-  - --quiet
-  - --title
-  - Neo4j.rb
-  - --line-numbers
-  - --main
-  - README.rdoc
-  - --inline-source
-require_paths: 
-  - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+post_install_message:
+rdoc_options:
+- --quiet
+- --title
+- Neo4j.rb
+- --line-numbers
+- --main
+- README.rdoc
+- --inline-source
+require_paths:
+- lib
+required_ruby_version: !ruby/object:Gem::Requirement
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: 1.8.7
   none: false
-  requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: 1.8.7
-required_rubygems_version: !ruby/object:Gem::Requirement 
+required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      segments:
+      - 0
+      hash: 2
+      version: !binary |-
+        MA==
   none: false
-  requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
 requirements: []
-
 rubyforge_project: neo4j
-rubygems_version: 1.8.15
-signing_key: 
+rubygems_version: 1.8.24
+signing_key:
 specification_version: 3
 summary: A graph database for JRuby
 test_files: []
-
-has_rdoc: true