diametric 0.1.2 → 0.1.3

data/spec/diametric/transactor_spec.rb

@@ -23,22 +23,22 @@ describe "Transactor Service", :transactor =>true do
   end
 
   it "should return false for version no" do
-    transactor.datomic_conf_file?("datomic-free-0.8.4122").should be_false
+    transactor.datomic_conf_file?("0.9.4497").should be_false
   end
 
   it "should know datomic version specified" do
-    transactor.datomic_version("spec/test_version_file.yml").should == "datomic-free-0.8.4122"
-    transactor.datomic_version("datomic-free-0.8.4122").should == "datomic-free-0.8.4122"
+    transactor.datomic_version("spec/test_version_file.yml").should == ["free", "0.9.4497"]
+    transactor.datomic_version("0.9.4497").should == ["free", "0.9.4497"]
   end
 
   it  "should know the specified version of datomic has been downloaded" do
     transactor.downloaded?("spec/test_version_file.yml", "tmp/datomic").should be_false
-    transactor.downloaded?("datomic-free-0.8.4122", "tmp/datomic").should be_false
+    transactor.downloaded?("0.9.4497", "tmp/datomic").should be_false
 
     transactor.download("spec/test_version_file.yml", "tmp/datomic")
   
     transactor.downloaded?("spec/test_version_file.yml", "tmp/datomic").should be_true
-    transactor.downloaded?("datomic-free-0.8.4122", "tmp/datomic").should be_true
+    transactor.downloaded?("0.9.4497", "tmp/datomic").should be_true
   end
 
   context Diametric::Transactor do
@@ -64,5 +64,4 @@ describe "Transactor Service", :transactor =>true do
       transactor.stop
     end
   end
-
 end

data/spec/integration_spec.rb

@@ -7,10 +7,10 @@ require 'securerandom'
 #   bin/rest 9000 test datomic:mem://
 
 describe Diametric::Entity, :integration => true do
-  before(:all) do
+  before do
     @datomic_uri = ENV['DATOMIC_URI'] || 'http://localhost:46291'
     @storage = ENV['DATOMIC_STORAGE'] || 'free'
-    @dbname = ENV['DATOMIC_NAME'] || "test-#{SecureRandom.uuid}"
+    @dbname = ENV['DATOMIC_NAME'] || "integratin-test-#{SecureRandom.uuid}"
     @client = Datomic::Client.new @datomic_uri, @storage
     @client.create_database(@dbname)
     sleep 0.5
@@ -24,8 +24,7 @@ describe Diametric::Entity, :integration => true do
   end
 
   describe "with a schema" do
-    before(:all) do
-      @client.transact(@dbname, Person.schema)
+    before do
       @client.transact(@dbname, Goat.schema)
     end
 
@@ -40,13 +39,14 @@ describe Diametric::Entity, :integration => true do
   end
 
   describe "with an entity" do
-    before(:all) do
+    before do
+      @client.transact(@dbname, Goat.schema)
       goat = Goat.new(:name => "Josef", :birthday => DateTime.parse("1976-09-04"))
       @client.transact(@dbname, goat.tx_data)
     end
 
     it "can query for that entity" do
-      query, args = Diametric::Query.new(Goat).where(:name => "Josef").data
+      query, args = Diametric::Query.new(Goat, nil, true).where(:name => "Josef").data
       args = args.unshift({:"db/alias" => "#{@storage}/#{@dbname}"})
       resp = @client.query(query, args)
       resp.code.should == 200
@@ -67,7 +67,7 @@ describe Diametric::Entity, :integration => true do
   end
 
   describe "with persistence module" do
-    before(:all) do
+    before do
       Robin.create_schema
     end
 

data/spec/peer_integration_spec.rb

@@ -64,7 +64,7 @@ describe Diametric::Entity, :integration => true, :jruby => true do
       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'))
+      query = Penguin.filter(@conn, :<, :birthday, DateTime.parse('1900-01-01'))
       result = query.all
       result.size.should == 2
       result.collect(&:name).should =~ ["Mary Jay.", "Mary Jo."]
@@ -150,6 +150,30 @@ describe Diametric::Entity, :integration => true, :jruby => true do
       account2.deposit.should include(100.0)
       account2.deposit.should include(200.0)
     end
+  end
+
+  context 'issue43' do
+    before do
+      @datomic_uri = 'datomic:mem://issue43'
+      @conn_issue43 = Diametric::Persistence.establish_base_connection({:uri => @datomic_uri})
+      This::Bug.create_schema(@conn_issue43).get
+      Outermost::Outer::Inner::Innermost.create_schema(@conn_issue43).get
+    end
+
+    after do
+      @conn_issue43.release
+    end
+
+    it 'should get all entities' do
+      This::Bug.new(id: '123').save
+      result = This::Bug.all
+      result.first.id.should == '123'
+    end
 
+    it 'should get all entities of nested modules' do
+      Outermost::Outer::Inner::Innermost.new(name: 'nested').save
+      result = Outermost::Outer::Inner::Innermost.all
+      result.first.name.should == 'nested'
+    end
   end
 end

data/spec/peer_seattle_spec.rb

@@ -94,8 +94,7 @@ describe Diametric::Entity, :integration => true, :jruby => true do
 
       result = []
       neighborhood.parse_tx_data(neighborhood.tx_data, result)
-      result.first[":neighborhood/district"].to_s.should match(/^\d+/)
-
+      result.first[:"neighborhood/district"].to_s.should match(/^\d+/)
       neighborhood.save(@n_conn2)
       district.tx_data.should be_empty
       neighborhood.tx_data.should be_empty

data/spec/spec_helper.rb

@@ -28,9 +28,11 @@ RSpec.configure do |c|
   c.treat_symbols_as_metadata_keys_with_true_values = true
 
   c.before(:suite) do
-    @rest = Diametric::RestService.new("spec/test_version_file.yml", "tmp/datomic")
-    @rest.start(:port => 46291, :db_alias => @storage, :uri => "datomic:mem://")
-    PID = @rest.pid
+    unless ENV['RESTSERVICE']
+      @rest = Diametric::RestService.new("spec/test_version_file.yml", "tmp/datomic")
+      @rest.start(:port => 46291, :db_alias => @storage, :uri => "datomic:mem://")
+      PID = @rest.pid
+    end
     if ENV['TRANSACTOR']
       FileUtils.cp(File.join('spec', 'config', 'logback.xml'), File.join('bin', 'logback.xml'))
     end
@@ -38,13 +40,38 @@ RSpec.configure do |c|
 
   c.after(:suite) do
     Diametric::Persistence::Peer.shutdown(true) if is_jruby?
-    Process.kill("HUP", PID)
+    unless ENV['RESTSERVICE']
+      Process.kill("HUP", PID)
+    end
     if ENV['TRANSACTOR']
       FileUtils.rm(File.join('bin', 'logback.xml'), :force => true)
     end
   end
 end
 
+RSpec::Matchers.define :be_an_equivalent_hash do |expected|
+  match do |actual|
+    status = true
+    expected.keys.each do |k|
+      next if k == :"db/id"
+      status = false if actual[k].nil?
+      status = false unless actual[k] == expected[k]
+    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.kind_of?(String) && (e.gsub(/ /, "") == "#db/id[:db.part/user]")
+      status = false unless actual[index] == e
+    end
+    status
+  end
+end
+
 shared_examples "ActiveModel" do |model|
   require 'test/unit/assertions'
   require 'active_model/lint'

data/spec/support/cardinarity_many_example.rb

@@ -0,0 +1,37 @@
+shared_examples "supports cardinality many" do
+  describe "entity instance" do
+    let(:model) { model_class.new }
+
+    it "can save" do
+      model.words = ["hopefully", "likely", "possibly"]
+      model.save.should be_true
+      model.should be_persisted
+
+      model.class.all.first.words.should == Set.new(["hopefully", "likely", "possibly"])
+    end
+
+    describe "#assign_attributes" do
+      let(:words) {
+        model.words = ["sadlly", "happily", "joyfully"]
+        model.save
+        model
+      }
+
+      it "updates words" do
+        new_values = { "words" => ["calmly", "peacefully", "joyfully"] }
+        words.update_attributes(new_values)
+
+        words.should_not be_changed
+        words.words.should == Set.new(["calmly", "peacefully", "joyfully"])
+
+        if model_class.ancestors.include? Diametric::Persistence::Peer
+          result = model_class.where({:words => new_values["words"]}, nil, true).first
+        else
+          # not sure, but for some reason, REST likes singular.
+          result = model_class.where({:word => new_values["words"]}).first
+        end
+        result.dbid.should == words.dbid
+      end
+    end
+  end
+end

data/spec/support/entities.rb

@@ -72,6 +72,77 @@ class Mouse
   attribute :age, Integer
 end
 
+class ScarletMacaw
+  include Diametric::Entity
+  include Diametric::Persistence::Peer
+
+  attribute :name, String
+  attribute :description, String, :fulltext => true
+  attribute :talkative, Boolean
+  attribute :colors, Integer
+  attribute :average_speed, Float
+  attribute :observed, DateTime
+  attribute :case_no, UUID, :index => true
+  attribute :serial, UUID, :unique => :value
+end
+
+class Peacock
+  include Diametric::Entity
+  include Diametric::Persistence::REST
+
+  attribute :name, String
+  attribute :description, String, :fulltext => true
+  attribute :talkative, Boolean
+  attribute :colors, Integer
+  attribute :average_speed, Float
+  attribute :observed, DateTime
+  # REST failes to save UUID
+  #attribute :case_no, UUID, :index => true
+  #attribute :serial, UUID, :unique => :value
+end
+
+class MyWords
+  include Diametric::Entity
+  include Diametric::Persistence::Peer
+
+  attribute :words, String, :cardinality => :many
+end
+
+class YourWords
+  include Diametric::Entity
+  include Diametric::Persistence::REST
+
+  attribute :words, String, :cardinality => :many
+end
+
+class Cage
+  include Diametric::Entity
+  include Diametric::Persistence::Peer
+
+  attribute :pet, Ref
+end
+
+class Box
+  include Diametric::Entity
+  include Diametric::Persistence::REST
+
+  attribute :pet, Ref
+end
+
+class BigCage
+  include Diametric::Entity
+  include Diametric::Persistence::Peer
+
+  attribute :pets, Ref, :cardinality => :many
+end
+
+class BigBox
+  include Diametric::Entity
+  include Diametric::Persistence::REST
+
+  attribute :pets, Ref, :cardinality => :many
+end
+
 class Author
   include Diametric::Entity
   include Diametric::Persistence::Peer
@@ -88,6 +159,38 @@ class Book
   attribute :authors, Ref, :cardinality => :many
 end
 
+class Writer
+  include Diametric::Entity
+  include Diametric::Persistence::REST
+
+  attribute :name, String
+  attribute :books, Ref, :cardinality => :many
+end
+
+class Article
+  include Diametric::Entity
+  include Diametric::Persistence::REST
+
+  attribute :title, String
+  attribute :authors, Ref, :cardinality => :many
+end
+
+class Role
+  include Diametric::Entity
+  include Diametric::Persistence::Peer
+
+  attribute :type, Ref
+  enum :type, [:accountant, :manager, :developer]
+end
+
+class Position
+  include Diametric::Entity
+  include Diametric::Persistence::REST
+
+  attribute :type, Ref
+  enum :type, [:accountant, :manager, :developer]
+end
+
 class Choice
   include Diametric::Entity
   include Diametric::Persistence::Peer
@@ -157,3 +260,27 @@ class District
   attribute :region, Ref, :cardinality => :one, :doc => "A district region enum value"
   enum :region, [:n, :ne, :e, :se, :s, :sw, :w, :nw]
 end
+
+# issue 43
+module This
+  class Bug
+    include Diametric::Entity
+    include Diametric::Persistence::Peer
+
+    attribute :id, String, index: true
+    attribute :name, String
+  end
+end
+
+module Outermost
+  module Outer
+    module Inner
+      class Innermost
+        include Diametric::Entity
+        include Diametric::Persistence::Peer
+
+        attribute :name, String
+      end
+    end
+  end
+end

data/spec/support/has_a_example.rb

@@ -0,0 +1,31 @@
+shared_examples "supports has_one association" do
+  describe "entity instance" do
+    let(:parent) { parent_class.new }
+    let(:child) { child_class.new }
+
+    it "can save child" do
+      # similar to thing.pet_id = pet.id; pet.save
+      # diametric does pet.save; thing.pet = pet.dbid
+      child.name = "Sophia"
+      child.age = 5
+      parent.pet = child
+
+      child.should be_persisted
+      child.dbid.to_i.should > 0
+      child.class.all.first.name.should == "Sophia"
+    end
+
+    it "can save parent" do
+      child.name = "Jacob"
+      child.age = 3
+      parent.pet = child
+      parent.save
+
+      parent.should be_persisted
+      parent.dbid.to_i.should > 0
+      searched_child = parent.class.all.first.pet
+      searched_child.name.should == "Jacob"
+      searched_child.age.should == 3
+    end
+  end
+end

data/spec/support/has_many_example.rb

@@ -0,0 +1,79 @@
+shared_examples "supporting has_many association" do
+  describe "entity instance" do
+    let(:parent) { parent_class.new }
+    let(:child) { child_class.new }
+
+    it "can save child" do
+      child.name = "Emma"
+      child.age = 15
+      parent.pets << child
+
+      child.should be_persisted
+      child.dbid.to_i.should > 0
+    end
+
+    it "can save parent" do
+      child.name = "Ethan"
+      child.age = 14
+      parent.pets << child
+      parent.save
+
+      parent.should be_persisted
+      parent.dbid.to_i.should > 0
+      searched_children = parent.class.first.pets
+      searched_children.collect(&:name).should include "Ethan"
+      searched_children.collect(&:age).should include 14
+    end
+
+    it "can find children" do
+      child1 = child_class.new(name: "Michael", age: 10)
+      parent.pets << child1
+      child2 = child_class.new(name: "Mia", age: 9)
+      parent.pets << child2
+      parent.save
+
+      searched_parent = parent.class.first
+      searched_parent.pets.size.should == 2
+      searched_parent.pets.collect(&:name).should =~ ["Michael", "Mia"]
+      searched_parent.pets.collect(&:age).should =~ [10, 9]
+      searched_parent.pets.empty?.should == false
+    end
+
+    it "can destory child" do
+      child1 = child_class.new(name: "Alexander", age: 5)
+      child2 = child_class.new(name: "Abigail", age: 6)
+      parent.pets = [child1, child2]
+      parent.save
+
+      searched_parent = parent.class.first
+      searched_parent.pets.size.should == 2
+
+      searched_parent.pets.destroy(child1)
+      searched_parent.pets.size.should == 1
+      searched_parent.pets.collect(&:name).should == ["Abigail"]
+      searched_parent.pets.collect(&:age).should == [6]
+
+      searched_children = child_class.all
+      searched_children.size.should == 1
+      searched_children.first.dbid.should == child2.dbid
+    end
+
+    it "can delete child" do
+      child1 = child_class.new(name: "Joseph", age: 1)
+      child2 = child_class.new(name: "Janet", age: 2)
+      parent.pets = [child1, child2]
+      parent.save
+
+      searched_parent = parent.class.first
+      searched_parent.pets.size.should == 2
+
+      searched_parent.pets.delete(child1, child2)
+      searched_parent.pets.size.should == 0
+
+      searched_children = child_class.all
+      searched_children.size.should == 2
+      searched_children.collect(&:name).should =~ ["Joseph", "Janet"]
+      searched_children.collect(&:age).should =~ [1, 2]
+    end
+  end
+end