diametric 0.1.2-java → 0.1.3-java

data/spec/support/persistence_examples.rb

@@ -65,7 +65,8 @@ shared_examples "persistence API" do
       end
 
       it "can find it by attribute" do
-        model2 = model_class.first({:name => "Wilbur"}, nil, true)
+        model2 = model_class.first({:name => "Wilbur"}, nil, true) if model_class.ancestors.include? Diametric::Persistence::Peer
+        model2 = model_class.first({:name => "Wilbur"}) if model_class.ancestors.include? Diametric::Persistence::REST
         model2.should_not be_nil
         model2.dbid.should == model.dbid
         model2.should == model if model2.is_a? Rat
@@ -73,23 +74,30 @@ shared_examples "persistence API" do
       end
 
       it "can find all matching conditions" do
-        mice = model_class.where({:name => "Wilbur"}, nil, true).where(:age => 2).all
+        if model_class.ancestors.include? Diametric::Persistence::Peer
+          mice = model_class.where({:name => "Wilbur"}, nil, true).where(:age => 2).all
+        else
+          mice = model_class.where({:name => "Wilbur"}).where(:age => 2).all
+        end
         mice.should == [model]
         mice.should include(model)
       end
 
       it "can filter entities" do
-        mice = model_class.filter(:<, :age, 3).all
+        mice = model_class.filter(nil, :<, :age, 3).all if model_class.ancestors.include? Diametric::Persistence::Peer
+        mice = model_class.filter(:<, :age, 3).all if model_class.ancestors.include? Diametric::Persistence::REST
         mice.should == [model]
         mice.should include(model)
 
-        mice = model_class.filter(:>, :age, 3).all
+        mice = model_class.filter(nil, :>, :age, 3).all if model_class.ancestors.include? Diametric::Persistence::Peer
+        mice = model_class.filter(:>, :age, 3).all if model_class.ancestors.include? Diametric::Persistence::REST
         mice.should == []
       end
 
       it "can find all" do
         model_class.new(:name => "Smith", :age => 5).save
-        mice = model_class.all(nil, true)
+        mice = model_class.all(nil, true) if model_class.ancestors.include? Diametric::Persistence::Peer
+        mice = model_class.all if model_class.ancestors.include? Diametric::Persistence::REST
         mice.should_not be_nil
         mice.size.should == 2
         names = ["Smith", "Wilbur"]

data/spec/support/various_types_examples.rb

@@ -0,0 +1,163 @@
+require 'uuid'
+
+shared_examples "supports various types" do
+  describe "entity instance" do
+    let(:model) { model_class.new }
+
+    it "can save" do
+      model.name = "Wilbur"
+      model.description = "This bird has a lot of colors on its body which draws other animals' attentions"
+      model.talkative = true
+      model.colors = 200
+      model.average_speed = 12.34
+      model.observed = DateTime.parse("2013-12-24T07:18:29")
+      # REST failes to save UUID
+      if model_class.ancestors.include? Diametric::Persistence::Peer
+        model.case_no = UUID.new.generate
+        model.serial = UUID.new.generate
+      end
+      model.save.should be_true
+      model.should be_persisted
+    end
+
+    describe '#update_attributes' do
+      let(:bird) {
+        model.name = "William"
+        model.description = "This bird is famous for its colorful body."
+        model.talkative = false
+        model.colors = 150
+        model.average_speed = 6.99
+        model.observed = DateTime.parse("2010-11-12T05:16:27")
+        # REST failes to save UUID
+        if model_class.ancestors.include? Diametric::Persistence::Peer
+          model.case_no = UUID.new.generate
+          model.serial = UUID.new.generate
+        end
+        model.save
+        model
+      }
+
+      it "saves and updates name" do
+        new_values = { "name" => "Stuart" }
+        bird.update_attributes(new_values)
+
+        bird.should_not be_changed
+        bird.name.should == "Stuart"
+        if model_class.ancestors.include? Diametric::Persistence::Peer
+          result = model_class.where({:name => new_values["name"]}, nil, true).first
+        else
+          result = model_class.where({:name => new_values["name"]}).first
+        end
+        result.dbid.should == model.dbid
+      end
+
+      it "saves and updates description" do
+        new_values = { "description" => "Many words should be here to replace the value of description." }
+        bird.update_attributes(new_values)
+
+        bird.should_not be_changed
+        bird.description.should include("Many words")
+        if model_class.ancestors.include? Diametric::Persistence::Peer
+          result = model_class.where({:description => new_values["description"]}, nil, true).first
+        else
+          result = model_class.where({:description => new_values["description"]}).first
+        end
+        result.dbid.should == model.dbid
+      end
+
+      it "saves and updates talkative" do
+        new_values = { "talkative" => true }
+        bird.update_attributes(new_values)
+
+        bird.should_not be_changed
+        bird.talkative.should be_true
+        if model_class.ancestors.include? Diametric::Persistence::Peer
+          result = model_class.where({:talkative => new_values["talkative"]}, nil, true).first
+        else
+          result = model_class.where({:talkative => new_values["talkative"]}).first
+        end
+        result.dbid.should == model.dbid
+      end
+
+      it "saves and updates colors" do
+        new_values = { "colors" => 345 }
+        bird.update_attributes(new_values)
+
+        bird.should_not be_changed
+        bird.colors.should be_true
+        if model_class.ancestors.include? Diametric::Persistence::Peer
+          result = model_class.where({:colors => new_values["colors"]}, nil, true).first
+        else
+          result = model_class.where({:colors => new_values["colors"]}).first
+        end
+        result.dbid.should == model.dbid
+      end
+
+      it "saves and updates average_speed" do
+        new_values = { "average_speed" => 1.58 }
+        bird.update_attributes(new_values)
+
+        bird.should_not be_changed
+        bird.average_speed.should be_true
+        if model_class.ancestors.include? Diametric::Persistence::Peer
+          result = model_class.where({:average_speed => new_values["average_speed"]}, nil, true).first
+        else
+          result = model_class.where({:average_speed => new_values["average_speed"]}).first
+        end
+        result.dbid.should == model.dbid
+      end
+
+      it "saves and updates observed" do
+        new_values = { "observed" => DateTime.parse("2012-11-23T06:17:28") }
+        bird.update_attributes(new_values)
+
+        bird.should_not be_changed
+        bird.observed.should be_true
+        if model_class.ancestors.include? Diametric::Persistence::Peer
+          result = model_class.where({:observed => new_values["observed"]}, nil, true).first
+        else
+          result = model_class.where({:observed => new_values["observed"]}).first
+        end
+        result.dbid.should == model.dbid
+      end
+
+      it "saves and updates case_no" do
+        if model_class.ancestors.include? Diametric::Persistence::REST
+          pending "REST fails to save UUID type"
+        else
+          no = UUID.new.generate
+          new_values = { "case_no" => no }
+          bird.update_attributes(new_values)
+
+          bird.should_not be_changed
+          bird.case_no.should be_true
+          if model_class.ancestors.include? Diametric::Persistence::Peer
+            result = model_class.where({:case_no => new_values["case_no"]}, nil, true).first
+          else
+            result = model_class.where({:case_no => new_values["case_no"]}).first
+          end
+          result.dbid.should == model.dbid
+        end
+      end
+
+      it "saves and updates serial" do
+        if model_class.ancestors.include? Diametric::Persistence::REST
+          pending "REST fails to save UUID type"
+        else
+          no = UUID.new.generate
+          new_values = { "serial" => no }
+          bird.update_attributes(new_values)
+
+          bird.should_not be_changed
+          bird.serial.should be_true
+          if model_class.ancestors.include? Diametric::Persistence::Peer
+            result = model_class.where({:serial => new_values["serial"]}, nil, true).first
+          else
+            result = model_class.where({:serial => new_values["serial"]}).first
+          end
+          result.dbid.should == model.dbid
+        end
+      end
+    end
+  end
+end

data/spec/test_version_file.yml

@@ -1,4 +1,4 @@
 free:
-  datomic-free-0.8.4122
+  0.9.4497
 pro:
-  datomic-pro-0.8.4122
+  0.9.4497

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: diametric
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: java
 authors:
 - Clinton N. Dreisbach
@@ -10,148 +10,208 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2013-11-10 00:00:00.000000000 Z
+date: 2014-02-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 1.0.2
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.0'
+    - - '>='
       - !ruby/object:Gem::Version
         version: 1.0.2
+  name: edn
   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
+        version: '1.0'
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: 1.0.2
+- !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 3.2.14
+        version: '3.2'
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: 3.2.16
+  name: activesupport
   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
+        version: '3.2'
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: 3.2.16
+- !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 3.2.14
+        version: '3.2'
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: 3.2.16
+  name: activemodel
   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
+        version: '3.2'
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: 3.2.16
+- !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
+      - !ruby/object:Gem::Version
+        version: '0.4'
+    - - '>='
       - !ruby/object:Gem::Version
         version: 0.4.1
+  name: datomic-client
   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
+        version: '0.4'
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: 0.4.1
+- !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
+      - !ruby/object:Gem::Version
+        version: '0.9'
+    - - '>='
       - !ruby/object:Gem::Version
         version: 0.9.9
+  name: rubyzip
   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
+        version: '0.9'
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: 0.9.9
+- !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
+      - !ruby/object:Gem::Version
+        version: '0.7'
+    - - '>='
       - !ruby/object:Gem::Version
         version: 0.7.5
+  name: lock_jar
   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
+        version: '0.7'
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: 0.7.5
+- !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
+      - !ruby/object:Gem::Version
+        version: '0.8'
+    - - '>='
       - !ruby/object:Gem::Version
         version: 0.8.8
+  name: jruby-openssl
   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
+        version: '0.8'
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: 0.8.8
+- !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
+      - !ruby/object:Gem::Version
+        version: '2.3'
+    - - '>='
       - !ruby/object:Gem::Version
         version: 2.3.7
+  name: uuid
   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
+        version: '2.3'
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: 2.3.7
+- !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
+      - !ruby/object:Gem::Version
+        version: '2.14'
+    - - '>='
       - !ruby/object:Gem::Version
         version: 2.14.1
+  name: rspec
   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
+        version: '2.14'
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: 2.14.1
+- !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
+      - !ruby/object:Gem::Version
+        version: '0.9'
+    - - '>='
       - !ruby/object:Gem::Version
         version: 0.9.1
+  name: rake-compiler
   prerelease: false
   type: :runtime
-  name: rake-compiler
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '0.9'
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: 0.9.1
 description: |
   Diametric is a library for building schemas, queries, and transactions
   for Datomic from Ruby objects. It is also used to map Ruby objects
@@ -172,44 +232,62 @@ files:
 - LICENSE.txt
 - README.md
 - Rakefile
+- bin/datomic-rest
+- bin/download-datomic
 - datomic_version.yml
 - diametric-java.gemspec
+- ext/diametric/DiametricCollection.java
+- ext/diametric/DiametricCommon.java
+- ext/diametric/DiametricConnection.java
+- ext/diametric/DiametricDatabase.java
+- ext/diametric/DiametricEntity.java
+- ext/diametric/DiametricListenableFuture.java
+- ext/diametric/DiametricObject.java
+- ext/diametric/DiametricPeer.java
+- ext/diametric/DiametricService.java
+- ext/diametric/DiametricSet.java
+- ext/diametric/DiametricUUID.java
+- ext/diametric/DiametricUtils.java
 - lib/boolean_type.rb
 - lib/diametric.rb
-- lib/diametric_service.jar
-- lib/value_enums.rb
+- lib/diametric/associations/collection.rb
 - lib/diametric/config.rb
+- lib/diametric/config/environment.rb
 - lib/diametric/entity.rb
 - lib/diametric/errors.rb
+- lib/diametric/generators/active_model.rb
 - lib/diametric/persistence.rb
+- lib/diametric/persistence/common.rb
+- lib/diametric/persistence/peer.rb
+- lib/diametric/persistence/rest.rb
 - lib/diametric/query.rb
 - lib/diametric/railtie.rb
 - lib/diametric/rest_service.rb
 - lib/diametric/service_base.rb
 - lib/diametric/transactor.rb
 - lib/diametric/version.rb
-- lib/diametric/config/environment.rb
-- lib/diametric/generators/active_model.rb
-- lib/diametric/persistence/common.rb
-- lib/diametric/persistence/peer.rb
-- lib/diametric/persistence/rest.rb
+- lib/diametric_service.jar
 - 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
-- ext/diametric/DiametricListenableFuture.java
-- ext/diametric/DiametricObject.java
-- ext/diametric/DiametricPeer.java
-- ext/diametric/DiametricService.java
-- ext/diametric/DiametricSet.java
-- ext/diametric/DiametricUtils.java
-- ext/diametric/DiametricUUID.java
+- lib/value_enums.rb
 - spec/conf_helper.rb
+- spec/config/free-transactor-template.properties
+- spec/config/logback.xml
+- spec/data/seattle-data0.dtm
+- spec/data/seattle-data1.dtm
 - spec/developer_create_sample.rb
 - spec/developer_query_spec.rb
+- spec/diametric/config_spec.rb
+- spec/diametric/entity_spec.rb
+- spec/diametric/peer_api_spec.rb
+- spec/diametric/persistence/peer_many2many_spec.rb
+- spec/diametric/persistence/peer_spec.rb
+- spec/diametric/persistence/rest_spec.rb
+- spec/diametric/persistence_spec.rb
+- spec/diametric/query_spec.rb
+- spec/diametric/rest_service_spec.rb
+- spec/diametric/schema_spec.rb
+- spec/diametric/transactor_spec.rb
 - spec/integration_spec.rb
 - spec/parent_child_sample.rb
 - spec/peer_integration_spec.rb
@@ -220,28 +298,17 @@ files:
 - spec/seattle_integration_spec.rb
 - spec/simple_validation_sample.rb
 - spec/spec_helper.rb
-- spec/test_version_file.yml
-- spec/config/free-transactor-template.properties
-- spec/config/logback.xml
-- spec/data/seattle-data0.dtm
-- spec/data/seattle-data1.dtm
-- spec/diametric/config_spec.rb
-- spec/diametric/entity_spec.rb
-- spec/diametric/peer_api_spec.rb
-- spec/diametric/persistence_spec.rb
-- spec/diametric/query_spec.rb
-- spec/diametric/rest_service_spec.rb
-- spec/diametric/transactor_spec.rb
-- spec/diametric/persistence/peer_many2many_spec.rb
-- spec/diametric/persistence/peer_spec.rb
-- spec/diametric/persistence/rest_spec.rb
+- spec/support/cardinarity_many_example.rb
 - spec/support/entities.rb
 - spec/support/gen_entity_class.rb
+- spec/support/has_a_example.rb
+- spec/support/has_many_example.rb
 - spec/support/persistence_examples.rb
-- bin/datomic-rest
-- bin/download-datomic
+- spec/support/various_types_examples.rb
+- spec/test_version_file.yml
 homepage: https://github.com/relevance/diametric
-licenses: []
+licenses:
+- MIT
 metadata: {}
 post_install_message:
 rdoc_options: []
@@ -259,7 +326,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project:
-rubygems_version: 2.0.7
+rubygems_version: 2.2.2
 signing_key:
 specification_version: 4
 summary: ActiveModel for Datomic (JRuby)
@@ -283,10 +350,15 @@ test_files:
 - spec/diametric/persistence_spec.rb
 - spec/diametric/query_spec.rb
 - spec/diametric/rest_service_spec.rb
+- spec/diametric/schema_spec.rb
 - spec/diametric/transactor_spec.rb
 - spec/diametric/persistence/peer_many2many_spec.rb
 - spec/diametric/persistence/peer_spec.rb
 - spec/diametric/persistence/rest_spec.rb
+- spec/support/cardinarity_many_example.rb
 - spec/support/entities.rb
 - spec/support/gen_entity_class.rb
+- spec/support/has_a_example.rb
+- spec/support/has_many_example.rb
 - spec/support/persistence_examples.rb
+- spec/support/various_types_examples.rb