diametric 0.1.2 → 0.1.3

data/spec/developer_query_spec.rb

@@ -36,7 +36,7 @@ describe Developer, :jruby => true do
     yoko.save(@conn)
     query = Diametric::Query.new(Developer, @conn, true).where(:name => "Yoko Harada")
     query_data = "[:find ?e :in $ [?name] :where [?e :developer/name ?name]]"
-    query.data.first.gsub(" ", "").should == query_data.gsub(" ", "")
+    query.data.first.to_edn.gsub(" ", "").should == query_data.gsub(" ", "")
     result = query.all
     result.size.should == 1
     result.first.nerd_rate.should == 50
@@ -57,9 +57,8 @@ describe Developer, :jruby => true do
 
     developer = Developer.reify(result.first.first, @conn.db, false)
     friends = developer.friends
-    friends.each do |f|
-      f.should be_a(Java::DatomicQuery::EntityMap)
-    end
+    friends.size.should == 1
+    friends.first.should be_a(Diametric::Persistence::Entity)
   end
 
   it "should find three developers" do
@@ -94,8 +93,8 @@ describe Developer, :jruby => true do
     ryan.save(@conn)
 
     query = Diametric::Query.new(Developer, @conn).filter(:>, :nerd_rate, 70)
-    query_data = "[:find ?e :in $ [?nerd_rate_value] :where [?e :developer/nerd_rate ?nerd_rate] [(> ?nerd_rate ?nerd_rate_value)]]"
-    query.data.first.gsub(" ", "").should == query_data.gsub(" ", "")
+    query_data = "[:find ?e :in $ [?nerd_ratevalue] :where [?e :developer/nerd_rate ?nerd_rate] [(> ?nerd_rate ?nerd_ratevalue)]]"
+    query.data.first.to_edn.gsub(" ", "").should == query_data.gsub(" ", "")
     result = query.all
     result.size.should == 2
   end
@@ -117,4 +116,16 @@ describe Developer, :jruby => true do
     result.size.should == 1
     result.first.friends.collect(&:name).should =~ ["Yoko Harada", "Clinton N. Dreisbach"]
   end
+
+  it "should not think found objects are dirty" do
+    david = Developer.new
+    david.name = "David Bock"
+    david.nerd_rate = 42
+    david.save(@conn)
+    query = Diametric::Query.new(Developer, @conn)
+    result = query.all
+    developer = Developer.reify(result.first.first, @conn.db, false)
+    developer.changed.should == []
+  end
+
 end

data/spec/diametric/entity_spec.rb

@@ -3,29 +3,6 @@ require 'diametric/entity'
 
 require 'rspec/expectations'
 
-RSpec::Matchers.define :be_an_equivalent_hash do |expected|
-  match do |actual|
-    status = true
-    expected.each do |k, v|
-      next if k == ":db/id"
-      status = false if actual[k].nil?
-      status = false unless actual[k] == v
-    end
-    status
-  end
-end
-
-RSpec::Matchers.define :be_an_equivalent_array do |expected|
-  match do |actual|
-    status = true
-    expected.each_with_index do |e, index|
-      next if e == "#db/id[:db.part/user]"
-      status = false unless actual[index] == e
-    end
-    status
-  end
-end
-
 describe Diametric::Entity do
   describe "in a class" do
     subject { Person }
@@ -241,34 +218,18 @@ describe Diametric::Entity do
     subject { Choice }
 
     it "should generate a schema" do
-      expected = []
-      if is_jruby?
-        expected = [
-                    { ":db/id" => subject.send(:tempid, ":db.part/db"),
-                      ":db/ident" => ":choice/item",
-                      ":db/valueType" => ":db.type/string",
-                      ":db/cardinality" => ":db.cardinality/one",
-                      ":db.install/_attribute" => ":db.part/db" },
-                    { ":db/id" => subject.send(:tempid, ":db.part/db"),
-                      ":db/ident" => ":choice/checked",
-                      ":db/valueType" => ":db.type/boolean",
-                      ":db/cardinality" => ":db.cardinality/one",
-                      ":db.install/_attribute" => ":db.part/db" }
-                   ]
-      else
-        expected = [
-                    { :"db/id" => subject.send(:tempid, :"db.part/db"),
-                      :"db/ident" => :"choice/item",
-                      :"db/valueType" => :"db.type/string",
-                      :"db/cardinality" => :"db.cardinality/one",
-                      :"db.install/_attribute" => :"db.part/db" },
-                    { :"db/id" => subject.send(:tempid, :"db.part/db"),
-                      :"db/ident" => :"choice/checked",
-                      :"db/valueType" => :"db.type/boolean",
-                      :"db/cardinality" => :"db.cardinality/one",
-                      :"db.install/_attribute" => :"db.part/db" }
-                   ]
-      end
+      expected = [
+                  { :"db/id" => subject.send(:tempid, :"db.part/db"),
+                    :"db/ident" => :"choice/item",
+                    :"db/valueType" => :"db.type/string",
+                    :"db/cardinality" => :"db.cardinality/one",
+                    :"db.install/_attribute" => :"db.part/db" },
+                  { :"db/id" => subject.send(:tempid, :"db.part/db"),
+                    :"db/ident" => :"choice/checked",
+                    :"db/valueType" => :"db.type/boolean",
+                    :"db/cardinality" => :"db.cardinality/one",
+                    :"db.install/_attribute" => :"db.part/db" }
+                 ]
       @created_schema = subject.schema
       expected.each do |e|
         @created_schema.shift.should be_an_equivalent_hash(e)
@@ -280,34 +241,18 @@ describe Diametric::Entity do
     subject { Customer }
 
     it "should generate a schema" do
-      expected = []
-      if is_jruby?
-        expected = [
-                    { ":db/id" => subject.send(:tempid, ":db.part/db"),
-                      ":db/ident" => ":customer/name",
-                      ":db/valueType" => ":db.type/string",
-                      ":db/cardinality" => ":db.cardinality/one",
-                      ":db.install/_attribute" => ":db.part/db" },
-                    { ":db/id" => subject.send(:tempid, ":db.part/db"),
-                      ":db/ident" => ":customer/id",
-                      ":db/valueType" => ":db.type/uuid",
-                      ":db/cardinality" => ":db.cardinality/one",
-                      ":db.install/_attribute" => ":db.part/db" }
-                   ]
-      else
-        expected = [
-                    { :"db/id" => subject.send(:tempid, :"db.part/db"),
-                      :"db/ident" => :"customer/name",
-                      :"db/valueType" => :"db.type/string",
-                      :"db/cardinality" => :"db.cardinality/one",
-                      :"db.install/_attribute" => :"db.part/db" },
-                    { :"db/id" => subject.send(:tempid, :"db.part/db"),
-                      :"db/ident" => :"customer/id",
-                      :"db/valueType" => :"db.type/uuid",
-                      :"db/cardinality" => :"db.cardinality/one",
-                      :"db.install/_attribute" => :"db.part/db" }
-                   ]
-      end
+      expected = [
+                  { :"db/id" => subject.send(:tempid, :"db.part/db"),
+                    :"db/ident" => :"customer/name",
+                    :"db/valueType" => :"db.type/string",
+                    :"db/cardinality" => :"db.cardinality/one",
+                    :"db.install/_attribute" => :"db.part/db" },
+                  { :"db/id" => subject.send(:tempid, :"db.part/db"),
+                    :"db/ident" => :"customer/id",
+                    :"db/valueType" => :"db.type/uuid",
+                    :"db/cardinality" => :"db.cardinality/one",
+                    :"db.install/_attribute" => :"db.part/db" }
+                 ]
       @created_schema = subject.schema
       expected.each do |e|
         @created_schema.shift.should be_an_equivalent_hash(e)
@@ -319,44 +264,23 @@ describe Diametric::Entity do
     subject { Account }
 
     it "should generate a schema" do
-      expected = []
-      if is_jruby?
-        expected = [
-                    { ":db/id" => subject.send(:tempid, ":db.part/db"),
-                      ":db/ident" => ":account/name",
-                      ":db/valueType" => ":db.type/string",
-                      ":db/cardinality" => ":db.cardinality/one",
-                      ":db.install/_attribute" => ":db.part/db" },
-                    { ":db/id" => subject.send(:tempid, ":db.part/db"),
-                      ":db/ident" => ":account/deposit",
-                      ":db/valueType" => ":db.type/double",
-                      ":db/cardinality" => ":db.cardinality/many",
-                      ":db.install/_attribute" => ":db.part/db" },
-                    { ":db/id" => subject.send(:tempid, ":db.part/db"),
-                      ":db/ident" => ":account/amount",
-                      ":db/valueType" => ":db.type/double",
-                      ":db/cardinality" => ":db.cardinality/one",
-                      ":db.install/_attribute" => ":db.part/db" }
-                   ]
-      else
-        expected = [
-                    { :"db/id" => subject.send(:tempid, :"db.part/db"),
-                      :"db/ident" => :"account/name",
-                      :"db/valueType" => :"db.type/string",
-                      :"db/cardinality" => :"db.cardinality/one",
-                      :"db.install/_attribute" => :"db.part/db" },
-                    { :"db/id" => subject.send(:tempid, :"db.part/db"),
-                      :"db/ident" => :"account/deposit",
-                      :"db/valueType" => :"db.type/double",
-                      :"db/cardinality" => :"db.cardinality/many",
-                      :"db.install/_attribute" => :"db.part/db" },
-                    { :"db/id" => subject.send(:tempid, :"db.part/db"),
-                      :"db/ident" => :"account/amount",
-                      :"db/valueType" => :"db.type/double",
-                      :"db/cardinality" => :"db.cardinality/one",
-                      :"db.install/_attribute" => :"db.part/db" }
-                   ]
-      end
+      expected = [
+                  { :"db/id" => subject.send(:tempid, :"db.part/db"),
+                    :"db/ident" => :"account/name",
+                    :"db/valueType" => :"db.type/string",
+                    :"db/cardinality" => :"db.cardinality/one",
+                    :"db.install/_attribute" => :"db.part/db" },
+                  { :"db/id" => subject.send(:tempid, :"db.part/db"),
+                    :"db/ident" => :"account/deposit",
+                    :"db/valueType" => :"db.type/double",
+                    :"db/cardinality" => :"db.cardinality/many",
+                    :"db.install/_attribute" => :"db.part/db" },
+                  { :"db/id" => subject.send(:tempid, :"db.part/db"),
+                    :"db/ident" => :"account/amount",
+                    :"db/valueType" => :"db.type/double",
+                    :"db/cardinality" => :"db.cardinality/one",
+                    :"db.install/_attribute" => :"db.part/db" }
+                 ]
       @created_schema = subject.schema
       expected.each do |e|
         @created_schema.shift.should be_an_equivalent_hash(e)
@@ -439,27 +363,27 @@ describe Diametric::Entity do
 
       it "should create peer schema" do
         expected = [
-        { ":db/id" => subject.send(:tempid, ":db.part/db"),
-          ":db/ident" => ":district/name",
-          ":db/valueType" => ":db.type/string",
-          ":db/cardinality" => ":db.cardinality/one",
-          ":db/unique" => ":db.unique/identity",
-          ":db/doc" => "A unique district name (upsertable)",
-          ":db.install/_attribute" => ":db.part/db" },
-        { ":db/id" => subject.send(:tempid, ":db.part/db"),
-          ":db/ident" => ":district/region",
-          ":db/valueType" => ":db.type/ref",
-          ":db/cardinality" => ":db.cardinality/one",
-          ":db/doc" => "A district region enum value",
-          ":db.install/_attribute" => ":db.part/db" },
-        [ ":db/add", "#db/id[:db.part/user]", ":db/ident", ":district.region/n"],
-        [ ":db/add", "#db/id[:db.part/user]", ":db/ident", ":district.region/ne"],
-        [ ":db/add", "#db/id[:db.part/user]", ":db/ident", ":district.region/e"],
-        [ ":db/add", "#db/id[:db.part/user]", ":db/ident", ":district.region/se"],
-        [ ":db/add", "#db/id[:db.part/user]", ":db/ident", ":district.region/s"],
-        [ ":db/add", "#db/id[:db.part/user]", ":db/ident", ":district.region/sw"],
-        [ ":db/add", "#db/id[:db.part/user]", ":db/ident", ":district.region/w"],
-        [ ":db/add", "#db/id[:db.part/user]", ":db/ident", ":district.region/nw"]
+        { :"db/id" => subject.send(:tempid, :"db.part/db"),
+          :"db/ident" => :"district/name",
+          :"db/valueType" => :"db.type/string",
+          :"db/cardinality" => :"db.cardinality/one",
+          :"db/unique" => :"db.unique/identity",
+          :"db/doc" => "A unique district name (upsertable)",
+          :"db.install/_attribute" => :"db.part/db" },
+        { :"db/id" => subject.send(:tempid, :"db.part/db"),
+          :"db/ident" => :"district/region",
+          :"db/valueType" => :"db.type/ref",
+          :"db/cardinality" => :"db.cardinality/one",
+          :"db/doc" => "A district region enum value",
+          :"db.install/_attribute" => :"db.part/db" },
+        [ :"db/add", "#db/id[:db.part/user]", :"db/ident", :"district.region/n"],
+        [ :"db/add", "#db/id[:db.part/user]", :"db/ident", :"district.region/ne"],
+        [ :"db/add", "#db/id[:db.part/user]", :"db/ident", :"district.region/e"],
+        [ :"db/add", "#db/id[:db.part/user]", :"db/ident", :"district.region/se"],
+        [ :"db/add", "#db/id[:db.part/user]", :"db/ident", :"district.region/s"],
+        [ :"db/add", "#db/id[:db.part/user]", :"db/ident", :"district.region/sw"],
+        [ :"db/add", "#db/id[:db.part/user]", :"db/ident", :"district.region/w"],
+        [ :"db/add", "#db/id[:db.part/user]", :"db/ident", :"district.region/nw"]
       ]
         @created_schema = District.schema
         expected.each do |e|
@@ -472,5 +396,4 @@ describe Diametric::Entity do
       end
     end
   end
-
 end

data/spec/diametric/peer_api_spec.rb

@@ -15,9 +15,9 @@ if is_jruby?
       end
 
       it 'should get tempid' do
-        subject.tempid(":db.part/db").to_s.should match(/#db\/id\[:db.part\/db\s-\d+\]/)
-        subject.tempid(":db.part/user").to_s.should match(/#db\/id\[:db.part\/user\s-\d+\]/)
-        subject.tempid(":db.part/user", -1).to_s.should match(/#db\/id\[:db.part\/user\s-1\]/)
+        subject.tempid(:"db.part/db").to_s.should match(/#db\/id\[:db.part\/db\s-\d+\]/)
+        subject.tempid(:"db.part/user").to_s.should match(/#db\/id\[:db.part\/user\s-\d+\]/)
+        subject.tempid(:"db.part/user", -1).to_s.should match(/#db\/id\[:db.part\/user\s-1\]/)
       end
 
       it "should return uuid from squuid" do
@@ -34,21 +34,21 @@ if is_jruby?
     context Diametric::Persistence::Connection do
       @db_name = "test-#{SecureRandom.uuid}"
       let(:connection) { Diametric::Persistence::Peer.connect("datomic:mem://#{@db_name}") }
-      let(:tempid) { Diametric::Persistence::Peer.tempid(":db.part/db") }
+      let(:tempid) { Diametric::Persistence::Peer.tempid(:"db.part/db") }
       let(:tx_data) {
         [{
-           ":db/id" => tempid,
-           ":db/ident" => ":person/name",
-           ":db/valueType" => ":db.type/string",
-           ":db/cardinality" => ":db.cardinality/one",
-           ":db/doc" => "A person's name",
-           ":db.install/_attribute" => ":db.part/db"
+           :"db/id" => tempid,
+           :"db/ident" => :"person/name",
+           :"db/valueType" => :"db.type/string",
+           :"db/cardinality" => :"db.cardinality/one",
+           :"db/doc" => "A person's name",
+           :"db.install/_attribute" => :"db.part/db"
          }]
       }
       let(:user_data) {
-        [{":db/id" => user_part_tempid, ":person/name" => "Alice"},
-         {":db/id" => user_part_tempid, ":person/name" => "Bob"},
-         {":db/id" => user_part_tempid, ":person/name" => "Chris"}]
+        [{:"db/id" => user_part_tempid, :"person/name" => "Alice"},
+         {:"db/id" => user_part_tempid, :"person/name" => "Bob"},
+         {:"db/id" => user_part_tempid, :"person/name" => "Chris"}]
       }
 
       it 'should transact schema' do
@@ -79,17 +79,17 @@ if is_jruby?
       before do
         tx_data =
           [{
-             ":db/id" => Diametric::Persistence::Peer.tempid(":db.part/db"),
-             ":db/ident" => ":person/name",
-             ":db/valueType" => ":db.type/string",
-             ":db/cardinality" => ":db.cardinality/one",
-             ":db/doc" => "A person's name",
-             ":db.install/_attribute" => ":db.part/db"
+             :"db/id" => Diametric::Persistence::Peer.tempid(:"db.part/db"),
+             :"db/ident" => :"person/name",
+             :"db/valueType" => :"db.type/string",
+             :"db/cardinality" => :"db.cardinality/one",
+             :"db/doc" => "A person's name",
+             :"db.install/_attribute" => :"db.part/db"
            }]
         user_data = 
-          [{":db/id" => Diametric::Persistence::Peer.tempid(":db.part/user"), ":person/name" => "Alice"},
-           {":db/id" => Diametric::Persistence::Peer.tempid(":db.part/user"), ":person/name" => "Bob"},
-           {":db/id" => Diametric::Persistence::Peer.tempid(":db.part/user"), ":person/name" => "Chris"}]
+          [{:"db/id" => Diametric::Persistence::Peer.tempid(:"db.part/user"), :"person/name" => "Alice"},
+           {:"db/id" => Diametric::Persistence::Peer.tempid(:"db.part/user"), :"person/name" => "Bob"},
+           {:"db/id" => Diametric::Persistence::Peer.tempid(:"db.part/user"), :"person/name" => "Chris"}]
         @db_name = "test-#{SecureRandom.uuid}"
         @connection = Diametric::Persistence::Peer.connect("datomic:mem://#{@db_name}")
 
@@ -560,5 +560,5 @@ if is_jruby?
 end
 
 def user_part_tempid
-  Diametric::Persistence::Peer.tempid(":db.part/user")
+  Diametric::Persistence::Peer.tempid(:"db.part/user")
 end

data/spec/diametric/persistence/peer_spec.rb

@@ -2,26 +2,88 @@ require 'spec_helper'
 require 'diametric/persistence/peer'
 require 'securerandom'
 
-describe Diametric::Persistence::Peer, :jruby do
-  before do
-    @db_uri = "datomic:mem://hello-#{SecureRandom.uuid}"
+describe Diametric::Persistence::Peer, :integration => true, :jruby => true do
+  context Rat do
+    before do
+      datomic_uri = "datomic:mem://rat-#{SecureRandom.uuid}"
+      @conn = Diametric::Persistence::Peer.connect(datomic_uri)
+      Rat.create_schema(@conn).get
+    end
+
+    after do
+      @conn.release
+    end
+
+    it_behaves_like "persistence API" do
+      let(:model_class) { Rat }
+    end
   end
 
-  it "can connect to a Datomic database" do
-    connection = subject.connect(:uri => @db_uri)
-    connection.should be_a(Diametric::Persistence::Connection)
+  context ScarletMacaw do
+    before do
+      datomic_uri = "datomic:mem://scarlet-macaw-#{SecureRandom.uuid}"
+      @conn = Diametric::Persistence::Peer.connect(datomic_uri)
+      ScarletMacaw.create_schema(@conn).get
+    end
+
+    after do
+      @conn.release
+    end
+
+    it_behaves_like "supports various types" do
+      let(:model_class) { ScarletMacaw }
+    end
   end
 
-  it_behaves_like "persistence API" do
-    let(:model_class) { Rat }
+  context MyWords do
+    before do
+      datomic_uri = "datomic:mem://my-words-#{SecureRandom.uuid}"
+      @conn = Diametric::Persistence::Peer.connect(datomic_uri)
+      MyWords.create_schema(@conn).get
+    end
 
+    after do
+      @conn.release
+    end
+
+    it_behaves_like "supports cardinality many" do
+      let(:model_class) { MyWords }
+    end
+  end
+
+  context Cage do
+    before do
+      datomic_uri = "datomic:mem://cage-#{SecureRandom.uuid}"
+      @conn = Diametric::Persistence::Peer.connect(datomic_uri)
+      Cage.create_schema(@conn).get
+      Rat.create_schema(@conn).get
+    end
+
+    after do
+      @conn.release
+    end
+
+    it_behaves_like "supports has_one association" do
+      let(:parent_class) { Cage }
+      let(:child_class) { Rat }
+    end
+  end
+
+  context BigCage do
     before do
-      @connection = Diametric::Persistence::Peer.connect(:uri => @db_uri)
-      Diametric::Persistence::Peer.create_schemas(@connection)
+      datomic_uri = "datomic:mem://big-cage-#{SecureRandom.uuid}"
+      @conn = Diametric::Persistence::Peer.connect(datomic_uri)
+      BigCage.create_schema(@conn).get
+      Rat.create_schema(@conn).get
     end
 
     after do
-      @connection.release
+      @conn.release
+    end
+
+    it_behaves_like "supporting has_many association" do
+      let(:parent_class) { BigCage }
+      let(:child_class) { Rat }
     end
   end
 end