cadet 0.0.6-java → 0.0.7-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e3d7acf972e736850cbd9038dde7cfb170298e65
-  data.tar.gz: 0b34b6f7005d1bab07ef284106bbf4da8313dc74
+  metadata.gz: f052829fbaf2513fb3cefa7a3574c4ec8b96b0b8
+  data.tar.gz: 15d0bcc566e85c75282a7a24721beb0bd4069aeb
 SHA512:
-  metadata.gz: bb374739e93440a6ef3df03a66e7c6e65f9368d33d49264255607d4ada17ac8909da0a4e07c280ffd89d965f3e9e202e966aa053f85b068c7b9f0bcae2103c03
-  data.tar.gz: caddb58750334570efe01cea6a6a92b0e7f6c4304c5e4585f8700ba37929f2a0cef4e8c2f0f36091d31a837f09572d7038ea67e31497c0e8a2f1ebfb1fb7699d
+  metadata.gz: 0d9520c3fad2f19c494e5bff35352f2df349c7c224969687af366a5b66f40613a17b8fabdcaf8651736a4284c6c6c7e74f85f0dfcb1935336cc8a62a51d378b0
+  data.tar.gz: 2d21fe45cbec47b08948aa72f6a12a89a7f84a87bdb46de4da828057f43efb58cd08de1127b152f50031b0b88463741de8944be85e23ddda5a3d8873e6d17d2c

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    cadet (0.0.1-java)
+    cadet (0.0.7-java)
 
 GEM
   remote: http://rubygems.org/
@@ -13,9 +13,9 @@ GEM
       rspec-expectations (~> 2.14.0)
       rspec-mocks (~> 2.14.0)
     rspec-core (2.14.7)
-    rspec-expectations (2.14.4)
+    rspec-expectations (2.14.5)
       diff-lcs (>= 1.1.3, < 2.0)
-    rspec-mocks (2.14.4)
+    rspec-mocks (2.14.6)
 
 PLATFORMS
   java

data/lib/cadet/batch_inserter/node.rb

@@ -2,16 +2,19 @@ module Cadet
   module BatchInserter
     class Node < Cadet::Node
       include_package "org.neo4j.graphdb"
+
       def create_outgoing(to, type, properties = {})
         @db.createRelationship(@underlying, to.underlying, DynamicRelationshipType.withName(type), properties)
       end
 
-      def set_property(prop, val)
-        @db.setNodeProperty @underlying, prop, val
+      def []= (property, value)
+        @db.setNodeProperty @underlying, property.to_s, val
       end
 
-      def get_relationships(direction, type)
+      def [] (property)
+        @db.getNodeProperties(@underlying)[property.to_s]
       end
+
     end
   end
 end

data/lib/cadet/batch_inserter/{batch_inserter.rb → session.rb}

@@ -25,24 +25,22 @@ module Cadet
       end
 
       def constraint(label, property)
-        index = @index_provider.nodeIndex label, {"type" => "exact"}
+        @db.createDeferredConstraint(DynamicLabel.label(label))
+          .assertPropertyIsUnique(property.to_s)
+          .create()
       end
 
       def find_node(label, property, value)
-        index = @index_provider.nodeIndex label, {"type" => "exact"}
-        result = IteratorUtil.firstOrNull(index.get(property, value))
-        if result
-          return Node.new(result, @db)
-        else
-          return nil
-        end
+        index = @index_provider.nodeIndex(label)
+
+        ( node = IteratorUtil.firstOrNull(index.get(property, value)) ) ?
+          Node.new(node, @db) : nil
       end
 
       def create_node(label, property, value)
-        n = Node.new(@db.createNode({property => value}, DynamicLabel.label(label)), @db)
-        index = @index_provider.nodeIndex label, {"type" => "exact"}
-        index.add(n.underlying, property, value)
-        n
+        Node.new(@db.createNode({property.to_s => value}, DynamicLabel.label(label)), @db).tap do |n|
+          index = @index_provider.nodeIndex(label).add(n.underlying, property, value)
+        end
       end
     end
   end

data/lib/cadet/cadet_index/index.rb

@@ -7,19 +7,20 @@ module Cadet
         @index = {}
         @lucene_index = lucene_index
       end
-      def add(node, prop, value)
-        @index[prop] ||= {}
-        @index[prop][value] = node
+      def add(node, property, value)
+        @index[property] ||= {}
+        @index[property][value] = node
       end
       def get(property, value)
         @index[property] ||= {}
         [@index[property][value]]
       end
       def flush
-        index = @lucene_index.nodeIndex @name, @type
+        index = @lucene_index.nodeIndex(@name, @type)
+
         @index.each do |property, mappings|
           mappings.each do |value, node|
-            index.add(node, {property => value})
+            index.add(node, {property.to_s => value})
           end
         end
       end

data/lib/cadet/cadet_index/index_provider.rb

@@ -7,7 +7,7 @@ module Cadet
         @indexes = {}
         @lucene_index = LuceneBatchInserterIndexProviderNewImpl.new(db)
       end
-      def nodeIndex(name, type)
+      def nodeIndex(name, type = {"type" => "exact"})
         @indexes[name] ||= Cadet::CadetIndex::Index.new(@lucene_index, name, type)
       end
       def shutdown

data/lib/cadet/dynamic_label.rb

@@ -0,0 +1,9 @@
+module Cadet
+  class DynamicLabel
+    @dynamic_labels = {}
+
+    def self.label(name)
+      @dynamic_labels[name] ||= org.neo4j.graphdb.DynamicLabel.label(name.to_s)
+    end
+  end
+end

data/lib/cadet/dynamic_relationshiptype.rb

@@ -0,0 +1,9 @@
+module Cadet
+  class DynamicRelationshipType
+    @dynamic_relationship_types = {}
+
+    def self.withName(name)
+      @dynamic_relationship_types[name] ||= org.neo4j.graphdb.DynamicRelationshipType.withName(name.to_s)
+    end
+  end
+end

data/lib/cadet/node.rb

@@ -1,5 +1,5 @@
 module Cadet
-  class Node < PropertyContainer
+  class Node
     attr_accessor :underlying
     include_package "org.neo4j.graphdb"
 
@@ -12,16 +12,20 @@ module Cadet
       @underlying.addLabel(DynamicLabel.label(label))
       self
     end
+    def labels
+      @underlying.getLabels().map(&:name)
+    end
 
-    def set_property(property, value)
-      @underlying.setProperty(property, value)
+    def []= (property, value)
+      @underlying.setProperty(property.to_s, value)
     end
-    def get_property(property)
-      @underlying.getProperty(property)
+
+    def [] (property)
+      @underlying.getProperty(property.to_s)
     end
 
     def get_relationships(direction, type)
-      @underlying.getRelationships(direction, type)
+      @underlying.getRelationships(direction, DynamicRelationshipType.withName(type))
     end
     def create_outgoing(to, type)
       @underlying.createRelationshipTo(to.underlying, DynamicRelationshipType.withName(type))
@@ -33,5 +37,8 @@ module Cadet
       Cadet::RelationshipTraverser.new(self, Direction::INCOMING, type)
     end
 
+    def == other_node
+      @underlying.getId == other_node.underlying.getId
+    end
   end
 end

data/lib/cadet/relationship_traverser.rb

@@ -7,22 +7,16 @@ module Cadet
       @node = node
       @type = type
       @direction = direction
-
-      @relationships = node.get_relationships(direction, DynamicRelationshipType.withName(type))
     end
 
     def each
-      @relationships.each do |rel|
-        yield Node.new rel.getOtherNode(@node.node)
+      @node.get_relationships(@direction, @type).each do |rel|
+        yield Node.new(rel.getOtherNode(@node.underlying))
       end
     end
 
     def << (othernode)
-      if @direction == Direction::OUTGOING
-        @node.create_outgoing othernode, @type
-      elsif @direction == Direction::INCOMING
-        othernode.create_outgoing @node, @type
-      end
+      @direction == Direction::OUTGOING ? @node.create_outgoing(othernode, @type) : othernode.create_outgoing(@node, @type)
     end
   end
 end

data/lib/cadet/session.rb

@@ -17,23 +17,19 @@ module Cadet
     end
 
     def create_node(label, property, value)
-      n = Node.new @db.createNode
-      n.add_label label
-      n[property] = value
-      n
+      Node.new(@db.createNode).tap do |n|
+        n.add_label label
+        n[property] = value
+      end
     end
 
     def find_node(label, property, value)
-      node = IteratorUtil.firstOrNull @db.findNodesByLabelAndProperty(DynamicLabel.label(label), property, value)
-      node ? Node.new(node) : null
+      ( node = IteratorUtil.firstOrNull(@db.findNodesByLabelAndProperty(DynamicLabel.label(label), property, value)) ) ?
+        Node.new(node) : nil
     end
 
     def get_node(label, property, value)
-      n = find_node(label, property, value)
-      if n.nil?
-        n = create_node(label, property, value)
-      end
-      n
+      find_node(label, property, value) || create_node(label, property, value)
     end
 
     def transaction
@@ -49,8 +45,8 @@ module Cadet
     def constraint(label, property)
       @db.schema
         .constraintFor(DynamicLabel.label(label))
-        .assertPropertyIsUnique(property)
-        .create
+        .assertPropertyIsUnique(property.to_s)
+        .create()
     end
 
     def method_missing(name, *args)

data/lib/cadet/test/session.rb

@@ -0,0 +1,22 @@
+module Cadet
+  module Test
+    class Session < Cadet::Session
+      include_package "org.neo4j.graphdb"
+      include_package "org.neo4j.unsafe.batchinsert"
+      include_package "org.neo4j.index.impl.lucene"
+      include_package "org.neo4j.helpers.collection"
+      include_package "org.neo4j.graphdb.GraphDatabaseService"
+      include_package "org.neo4j.graphdb.Node"
+      include_package "org.neo4j.graphdb.Transaction"
+      include_package "org.neo4j.graphdb.factory.GraphDatabaseSettings"
+      include_package "org.neo4j.test"
+
+
+
+      def self.open
+        new TestGraphDatabaseFactory.new.newImpermanentDatabase
+      end
+
+    end
+  end
+end

data/lib/cadet/version.rb

@@ -1,3 +1,3 @@
 module Cadet
-  VERSION = "0.0.6"
+  VERSION = "0.0.7"
 end

data/lib/cadet.rb

@@ -1,20 +1,20 @@
 require 'java'
 
-[
-"concurrentlinkedhashmap-lru-1.3.1.jar",
-"lucene-core-3.6.2.jar",
-"neo4j-graph-algo-2.0.0.jar",
-"neo4j-graph-matching-2.0.0.jar",
-"neo4j-kernel-2.0.0.jar",
-"neo4j-lucene-index-2.0.0.jar",
-"neo4j-shell-2.0.0.jar"
-].each { |file| require "neo4j/#{file}" }
+require "neo4j/concurrentlinkedhashmap-lru-1.3.1.jar"
+require "neo4j/lucene-core-3.6.2.jar"
+require "neo4j/neo4j-kernel-2.0.1-tests.jar"
+require "neo4j/neo4j-kernel-2.0.1.jar"
+require "neo4j/neo4j-lucene-index-2.0.1.jar"
+require "neo4j/neo4j-shell-2.0.1.jar"
+require "neo4j/neo4j-kernel-2.0.1-tests.jar"
 
 require 'cadet/session'
-require 'cadet/property_container'
 require 'cadet/node'
 require 'cadet/relationship_traverser'
-require 'cadet/batch_inserter/batch_inserter'
+require 'cadet/batch_inserter/session'
 require 'cadet/batch_inserter/node'
 require 'cadet/cadet_index/index_provider'
 require 'cadet/cadet_index/index'
+require 'cadet/dynamic_relationshiptype'
+require 'cadet/dynamic_label'
+require 'cadet/test/session'

data/spec/spec_helper.rb

@@ -1 +1,9 @@
 require 'cadet'
+
+def quick_neo4j
+  db = Cadet::Test::Session.open
+    db.transaction do |tx|
+      yield db, tx
+    end
+  db.close
+end

data/spec/unit/cadet_spec.rb

@@ -1,18 +1,32 @@
 require 'spec_helper'
+require 'tmpdir'
 
 describe Cadet do
 
-  it "should create a node, (and also test that transaction works in the process)" do
-    db = Cadet::Session.open("./tmp")
-    db.transaction do
-      n = db.create_node
+  it "should set a node's property" do
+    quick_neo4j do |db|
+        javad = db.get_node :Person, :name, "Javad"
+        javad[:name].should == "Javad"
     end
-    db.close
   end
 
-  it "should _not_ create a node, as we are not in a transaction" do
-    db = Cadet::Session.open("./tmp")
-    expect { db.create_node }.to raise_error(org.neo4j.graphdb.NotInTransactionException)
-    db.close
+  it "should set a node's label" do
+    quick_neo4j do |db|
+        javad = db.get_node :Person, :name, "Javad"
+        javad.add_label "Member"
+        javad.labels.should == ["Person", "Member"]
+    end
   end
+
+  it "should add outgoing relationship's to a node" do
+    quick_neo4j do |db|
+        javad = db.get_node :Person, :name, "Javad"
+        ellen = db.get_node :Person, :name, "Ellen"
+
+        javad.outgoing(:knows) << ellen
+
+        javad.outgoing(:knows).to_a.should == [ellen]
+    end
+  end
+
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cadet
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.7
 platform: java
 authors:
 - Javad Karabi
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2014-02-05 00:00:00.000000000 Z
+date: 2014-02-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -51,24 +51,25 @@ files:
 - Rakefile
 - cadet.gemspec
 - lib/cadet.rb
-- lib/cadet/batch_inserter/batch_inserter.rb
 - lib/cadet/batch_inserter/node.rb
+- lib/cadet/batch_inserter/session.rb
 - lib/cadet/cadet_index/index.rb
 - lib/cadet/cadet_index/index_provider.rb
+- lib/cadet/dynamic_label.rb
+- lib/cadet/dynamic_relationshiptype.rb
 - lib/cadet/node.rb
-- lib/cadet/property_container.rb
 - lib/cadet/relationship_traverser.rb
 - lib/cadet/session.rb
+- lib/cadet/test/session.rb
 - lib/cadet/version.rb
 - lib/neo4j/README.txt
 - lib/neo4j/concurrentlinkedhashmap-lru-1.3.1.jar
 - lib/neo4j/geronimo-jta_1.1_spec-1.1.1.jar
 - lib/neo4j/lucene-core-3.6.2.jar
-- lib/neo4j/neo4j-graph-algo-2.0.0.jar
-- lib/neo4j/neo4j-graph-matching-2.0.0.jar
-- lib/neo4j/neo4j-kernel-2.0.0.jar
-- lib/neo4j/neo4j-lucene-index-2.0.0.jar
-- lib/neo4j/neo4j-shell-2.0.0.jar
+- lib/neo4j/neo4j-kernel-2.0.1-tests.jar
+- lib/neo4j/neo4j-kernel-2.0.1.jar
+- lib/neo4j/neo4j-lucene-index-2.0.1.jar
+- lib/neo4j/neo4j-shell-2.0.1.jar
 - spec/spec_helper.rb
 - spec/unit/cadet_spec.rb
 homepage: https://github.com/karabijavad/cadet

data/lib/cadet/property_container.rb

@@ -1,13 +0,0 @@
-module Cadet
-  class PropertyContainer #subclasses must implement set_property, get_property
-
-    def []= (property, value)
-      set_property property, value
-    end
-
-    def [] (property)
-      get_property property
-    end
-
-  end
-end