diametric 0.1.1-java → 0.1.2-java

data/spec/diametric/persistence/peer_many2many_spec.rb

@@ -21,7 +21,7 @@ describe Diametric::Persistence::Peer, :jruby do
     author.update(:books => [book])
     result = Diametric::Persistence::Peer.q("[:find ?e ?name ?books :in $ :where [?e :author/name ?name] [?e :author/books ?books]]", @conn.db)
     boo_dbid = result.first[2]
-    boo = Author.from_dbid_or_entity(boo_dbid, @conn)
+    boo = Author.reify(boo_dbid, @conn)
     boo.title.should == "Candy"
   end
 
@@ -35,11 +35,12 @@ describe Diametric::Persistence::Peer, :jruby do
     author.update(:books => [book1, book2])
     result = Diametric::Persistence::Peer.q("[:find ?e ?name ?books :in $ :where [?e :author/name ?name] [?e :author/books ?books]]", @conn.db)
     result.size.should == 2
-    boo_dbid = result[0][2]
-    boo = Book.from_dbid_or_entity(boo_dbid, @conn)
+    result_in_array = result.to_a
+    boo_dbid = result_in_array[0][2]
+    boo = Book.reify(boo_dbid, @conn)
     boo.title.should match(/Honey|Chips/)
-    foo_dbid = result[1][2]
-    foo = Book.from_dbid_or_entity(boo_dbid, @conn)
+    foo_dbid = result_in_array[1][2]
+    foo = Book.reify(boo_dbid, @conn)
     foo.title.should match(/Honey|Chips/)
   end
 
@@ -58,19 +59,19 @@ describe Diametric::Persistence::Peer, :jruby do
     result = Diametric::Persistence::Peer.q("[:find ?e :in $ [?name] :where [?e :author/name ?name]]", @conn.db, ["Ms. Wilber"])
     result.size.should == 1
     result.first.first.to_s.should == author1.dbid.to_s
-    a = Author.from_dbid_or_entity(result.first.first, @conn)
+    a = Author.reify(result.first.first, @conn)
     a.books.size.should == 2
     a.books.each do |b|
-      Author.from_dbid_or_entity(b, @conn).title.should match(/Pie|Donuts/)
+      Author.reify(b, @conn).title.should match(/Pie|Donuts/)
     end
 
     result = Diametric::Persistence::Peer.q("[:find ?e :in $ [?title] :where [?e :book/title ?title]]", @conn.db, ["Pie"])
     result.size.should == 1
     result.first.first.to_s.should == book1.dbid.to_s
-    b = Book.from_dbid_or_entity(result.first.first, @conn)
+    b = Book.reify(result.first.first, @conn)
     b.authors.size.should == 2
     b.authors.each do |a|
-      Book.from_dbid_or_entity(a, @conn).name.should match(/Ms\.\sWilber|Mr\.\sSmith/)
+      Book.reify(a, @conn).name.should match(/Ms\.\sWilber|Mr\.\sSmith/)
     end
   end
 end

data/spec/parent_child_sample.rb

@@ -5,7 +5,9 @@ class Somebody
   include Diametric::Persistence::Peer
 
   attribute :name, String
-  attribute :parent, Ref, :cardinality => :one
+  attribute :mom, Ref, :cardinality => :one
+  attribute :dad, Ref, :cardinality => :one
+  attribute :kids, Ref, :cardinality => :many
 end
 
 describe "RailsConf 2013", :jruby => true do
@@ -13,30 +15,33 @@ describe "RailsConf 2013", :jruby => true do
     before(:all) do
       datomic_uri = "datomic:mem://somebody-#{SecureRandom.uuid}"
       @conn = Diametric::Persistence::Peer.connect(datomic_uri)
+      Somebody.create_schema(@conn).get
     end
+
     after(:all) do
       @conn.release
     end
 
-    it "should create schema" do
-      binding.pry
-      Sombody.create_schema(@conn)
-    end
-
     it "should create instances" do
-      alice = Somebody.new
-      alice.name = "Alice Wonderland"
-      alice.parent = ""
-      yoko.save
+      mom = Somebody.new(name: "Snow White")
+      mom.save(@conn)
+      dad = Somebody.new(name: "Prince Brave")
+      dad.save(@conn)
       binding.pry
-
-      clinton = Developer.new(:name => "Clinton N. Dreisbach", :friends => [yoko])
-      clinton.save
+      Somebody.new(name: "Alice Wonderland", mom: mom, dad: dad).save(@conn)
       binding.pry
-
-      ryan = Developer.new(:name => "Ryan Neufeld", :friends => [clinton, yoko])
-      ryan.save
+      me = Diametric::Query.new(Somebody, @conn, true).where(name: "Alice Wonderland").first
+      binding.pry
+      puts "me: #{me.name}, me's mom: #{me.mom.name}, me's dad: #{me.dad.name}"
+      mario = Somebody.new(name: "Mario", mom: me)
+      mario.save
+      luigi = Somebody.new(name: "Luigi", mom: me)
+      luigi.save
+      me.update_attributes(kids: [mario, luigi])
+      me = Diametric::Query.new(Somebody, @conn, true).where(name: "Alice Wonderland").first
+      puts me.kids.inspect
       binding.pry
+      puts Somebody.reify(me.kids.first.mom).name
     end
   end
 end

data/spec/peer_integration_spec.rb

@@ -18,28 +18,62 @@ describe Diametric::Entity, :integration => true, :jruby => true do
     end
 
     let(:query) { Diametric::Query.new(Penguin, @conn, true) }
+
     it "should update entity" do
-      penguin = Penguin.new(:name => "Mary", :age => 2)
+      bday = DateTime.parse('2005-01-01')
+      penguin = Penguin.new(:name => "Mary", :age => 2, :birthday => bday)
       penguin.save(@conn)
       penguin.update(:age => 3)
       penguin.name.should == "Mary"
       penguin.age.should == 3
+      penguin.birthday.should == bday
     end
 
     it "should search upadated attributes" do
-      penguin = query.where(:name => "Mary").first
-      penguin.name.should == "Mary"
-      penguin.age.should == 3
+      bday = DateTime.parse('1900-02-02')
+      penguin = Penguin.new(:name => "Mary J.", :age => 200, :birthday => bday)
+      penguin.save(@conn)
+      penguin = query.where(:name => "Mary J.").first
+      penguin.name.should == "Mary J."
+      penguin.age.should == 200
+      penguin.birthday == bday
     end
 
     it "should destroy entity" do
-      penguin = Penguin.new(:name => "Mary", :age => 2)
+      penguin = Penguin.new(:name => "Mary Jo.", :age => 2)
       penguin.save(@conn)
       number_of_penguins = Penguin.all.size
       number_of_penguins.should >= 1
       penguin.destroy
       Penguin.all.size.should == (number_of_penguins -1)
     end
+
+    it "should find by where query" do
+      Penguin.new(name: "Mary Jo.", birthday: DateTime.parse('1900-12-31')).save
+      Penguin.new(name: "Mary Jen.", birthday: DateTime.parse('1999-12-31')).save
+      Penguin.new(name: "Mary Jr.", birthday: DateTime.parse('2013-01-01')).save
+      Penguin.new(name: "Mary Jay.", birthday: DateTime.parse('2011-01-01')).save
+      query = Penguin.where(birthday: DateTime.parse('1999-12-31'))
+      query.each do |entity|
+        entity.birthday.should == DateTime.parse('1999-12-31')
+      end
+    end
+
+    it "should find by filter query" do
+      Penguin.new(name: "Mary Jo.", birthday: DateTime.parse('1890-12-31'), awesomeness: true).save
+      Penguin.new(name: "Mary Jen.", birthday: DateTime.parse('1999-12-31'), awesomeness: true).save
+      Penguin.new(name: "Mary Jr.", birthday: DateTime.parse('2013-01-01'), awesomeness: false).save
+      Penguin.new(name: "Mary Jay.", birthday: DateTime.parse('1850-02-22'), awesomeness: false).save
+      query = Penguin.filter(:<, :birthday, DateTime.parse('1900-01-01'))
+      result = query.all
+      result.size.should == 2
+      result.collect(&:name).should =~ ["Mary Jay.", "Mary Jo."]
+
+      query = Penguin.where(awesomeness: true).filter(:<, :birthday, DateTime.parse('1900-01-01'))
+      result = query.all
+      result.size.should == 1
+      result.first.name.should == "Mary Jo."
+    end
   end
 
   context Choice do
@@ -57,7 +91,7 @@ describe Diametric::Entity, :integration => true, :jruby => true do
       choice = Choice.new(:item => "Boots", :checked => true)
       choice.save.should_not be_nil
       result = Diametric::Persistence::Peer.q("[:find ?e :in $ :where [?e :choice/checked]]", @conn2.db)
-      choice = Choice.from_dbid_or_entity(result.first.first, @conn2.db)
+      choice = Choice.reify(result.first.first, @conn2.db)
       choice.checked.should be_true
     end
   end
@@ -78,7 +112,7 @@ describe Diametric::Entity, :integration => true, :jruby => true do
       customer = Customer.new(:name => "John Smith", :id => id)
       customer.save.should_not be_nil
       result = Diametric::Persistence::Peer.q("[:find ?e :in $ :where [?e :customer/name]]", @conn3.db)
-      customer2 = Customer.from_dbid_or_entity(result.first.first, @conn3.db)
+      customer2 = Customer.reify(result.first.first, @conn3.db)
       customer2.name.should == "John Smith"
       customer2.id.to_s.should == id.to_s
     end
@@ -89,7 +123,7 @@ describe Diametric::Entity, :integration => true, :jruby => true do
       customer = Customer.new(:name => "Wilber Hoe", :id => id)
       customer.save.should_not be_nil
       result = Diametric::Persistence::Peer.q("[:find ?e :in $ [?name] :where [?e :customer/name ?name]]", @conn3.db, ["Wilber Hoe"])
-      customer2 = Customer.from_dbid_or_entity(result.first.first, @conn3.db)
+      customer2 = Customer.reify(result.first.first, @conn3.db)
       customer2.name.should == "Wilber Hoe"
       customer2.id.to_s.should == id.to_s
     end
@@ -110,7 +144,7 @@ describe Diametric::Entity, :integration => true, :jruby => true do
       account = Account.new(:name => "This month's deposits", :deposit => [100.0, 200.0], :amount => 0.0)
       account.save.should_not be_nil
       result = Diametric::Persistence::Peer.q("[:find ?e :in $ :where [?e :account/name]]", @conn4.db)
-      account2 = Customer.from_dbid_or_entity(result.first.first, @conn4.db)
+      account2 = Customer.reify(result.first.first, @conn4.db)
       account2.name.should == account.name
       account2.amount.should == 0.0
       account2.deposit.should include(100.0)

data/spec/support/entities.rb

@@ -52,6 +52,8 @@ class Penguin
 
   attribute :name, String
   attribute :age, Integer
+  attribute :birthday, DateTime
+  attribute :awesomeness, Boolean
 end
 
 class Rat

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: diametric
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: java
 authors:
 - Clinton N. Dreisbach
@@ -10,7 +10,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2013-09-10 00:00:00.000000000 Z
+date: 2013-11-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   version_requirements: !ruby/object:Gem::Requirement
@@ -18,140 +18,140 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: 1.0.2
-  name: edn
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: 1.0.2
-  type: :runtime
   prerelease: false
+  type: :runtime
+  name: edn
 - !ruby/object:Gem::Dependency
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: 3.2.14
-  name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: 3.2.14
-  type: :runtime
   prerelease: false
+  type: :runtime
+  name: activesupport
 - !ruby/object:Gem::Dependency
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: 3.2.14
-  name: activemodel
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: 3.2.14
-  type: :runtime
   prerelease: false
+  type: :runtime
+  name: activemodel
 - !ruby/object:Gem::Dependency
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: 0.4.1
-  name: datomic-client
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: 0.4.1
-  type: :runtime
   prerelease: false
+  type: :runtime
+  name: datomic-client
 - !ruby/object:Gem::Dependency
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: 0.9.9
-  name: rubyzip
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: 0.9.9
-  type: :runtime
   prerelease: false
+  type: :runtime
+  name: rubyzip
 - !ruby/object:Gem::Dependency
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: 0.7.5
-  name: lock_jar
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: 0.7.5
-  type: :runtime
   prerelease: false
+  type: :runtime
+  name: lock_jar
 - !ruby/object:Gem::Dependency
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: 0.8.8
-  name: jruby-openssl
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: 0.8.8
-  type: :runtime
   prerelease: false
+  type: :runtime
+  name: jruby-openssl
 - !ruby/object:Gem::Dependency
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: 2.3.7
-  name: uuid
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: 2.3.7
-  type: :runtime
   prerelease: false
+  type: :runtime
+  name: uuid
 - !ruby/object:Gem::Dependency
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: 2.14.1
-  name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: 2.14.1
-  type: :runtime
   prerelease: false
+  type: :runtime
+  name: rspec
 - !ruby/object:Gem::Dependency
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: 0.9.1
-  name: rake-compiler
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: 0.9.1
-  type: :runtime
   prerelease: false
+  type: :runtime
+  name: rake-compiler
 description: |
   Diametric is a library for building schemas, queries, and transactions
   for Datomic from Ruby objects. It is also used to map Ruby objects
@@ -196,6 +196,7 @@ files:
 - lib/tasks/create_schema.rb
 - lib/tasks/diametric_config.rb
 - ext/diametric/DiametricCollection.java
+- ext/diametric/DiametricCommon.java
 - ext/diametric/DiametricConnection.java
 - ext/diametric/DiametricDatabase.java
 - ext/diametric/DiametricEntity.java
@@ -203,6 +204,7 @@ files:
 - ext/diametric/DiametricObject.java
 - ext/diametric/DiametricPeer.java
 - ext/diametric/DiametricService.java
+- ext/diametric/DiametricSet.java
 - ext/diametric/DiametricUtils.java
 - ext/diametric/DiametricUUID.java
 - spec/conf_helper.rb