diametric 0.0.4 → 0.1.1

data/spec/simple_validation_sample.rb

@@ -0,0 +1,31 @@
+require 'conf_helper'
+
+class Person
+  include Diametric::Entity
+  include Diametric::Persistence::Peer
+
+  attribute :name, String
+  validates_presence_of :name
+  attribute :nerd_rate, Integer
+end
+
+describe "RailsConf 2013", :jruby => true do
+  context Person do
+    before(:all) do
+      datomic_uri = "datomic:mem://person-#{SecureRandom.uuid}"
+      @conn = Diametric::Persistence::Peer.connect(datomic_uri)
+    end
+    after(:all) do
+      @conn.release
+    end
+
+    it "should create schema and save instaces" do
+      binding.pry
+      Person.create_schema(@conn).get
+
+      foo = Person.new
+      binding.pry
+      foo.save
+    end
+  end
+end

data/spec/spec_helper.rb

@@ -1,19 +1,48 @@
 require 'rspec'
-require 'pry'
+
+if defined?(RUBY_ENGINE) && RUBY_ENGINE == "jruby"
+  require 'lock_jar'
+  jar_file = File.join(File.dirname(__FILE__), "..", "Jarfile")
+  lock_file = File.join(File.dirname(__FILE__), "..", "Jarfile.lock")
+  LockJar.lock(jar_file)
+  LockJar.install(lock_file)
+  LockJar.load(lock_file)
+end
 require 'diametric'
+require 'diametric/rest_service'
+require 'diametric/transactor'
 Dir["./spec/support/**/*.rb"].each {|f| require f}
 
 RSpec.configure do |c|
 #  c.fail_fast = true
 
   c.filter_run_excluding :integration => true unless ENV['INTEGRATION']
-  c.filter_run_excluding :jruby => true unless RUBY_ENGINE == "jruby"
+  c.filter_run_excluding :jruby => (not is_jruby?)
+  c.filter_run_excluding :service => true unless ENV['RESTSERVICE']
+  c.filter_run_excluding :transactor => true unless ENV['TRANSACTOR']
 
   c.filter_run_including :focused => true
   c.alias_example_to :fit, :focused => true
 
   c.run_all_when_everything_filtered = true
   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
+    if ENV['TRANSACTOR']
+      FileUtils.cp(File.join('spec', 'config', 'logback.xml'), File.join('bin', 'logback.xml'))
+    end
+  end
+
+  c.after(:suite) do
+    Diametric::Persistence::Peer.shutdown(true) if is_jruby?
+    Process.kill("HUP", PID)
+    if ENV['TRANSACTOR']
+      FileUtils.rm(File.join('bin', 'logback.xml'), :force => true)
+    end
+  end
 end
 
 shared_examples "ActiveModel" do |model|
@@ -32,46 +61,3 @@ shared_examples "ActiveModel" do |model|
     end
   end
 end
-
-class Person
-  include Diametric::Entity
-
-  attribute :name, String, :index => true
-  attribute :email, String, :cardinality => :many
-  attribute :birthday, DateTime
-  attribute :awesome, :boolean, :doc => "Is this person awesome?"
-  attribute :ssn, String, :unique => :value
-  attribute :secret_name, String, :unique => :identity
-  attribute :bio, String, :fulltext => true
-  attribute :middle_name, String, :default => "Danger"
-  attribute :nicknames, String, :cardinality => :many, :default => ["Buddy", "Pal"]
-  attribute :parent, Ref, :cardinality => :many, :doc => "A person's parent"
-end
-
-class Goat
-  include Diametric::Entity
-
-  attribute :name, String
-  attribute :birthday, DateTime
-end
-
-require 'diametric/persistence/rest'
-class Robin
-  include Diametric::Entity
-  include Diametric::Persistence::REST
-
-  attribute :name, String
-  validates_presence_of :name
-  attribute :age, Integer
-end
-
-if RUBY_ENGINE == "jruby"
-  require 'diametric/persistence/peer'
-  class Penguin
-    include Diametric::Entity
-    include Diametric::Persistence::Peer
-
-    attribute :name, String
-    attribute :age, Integer
-  end
-end

data/spec/support/entities.rb

@@ -0,0 +1,157 @@
+# -*- coding: utf-8 -*-
+
+require 'diametric/entity'
+require 'diametric/persistence'
+require 'diametric/persistence/peer'
+require 'diametric/persistence/rest'
+
+# Prevent CRuby from blowing up
+module Diametric
+  module Persistence
+    module Peer
+    end
+    module Utils
+    end
+  end
+end
+
+class Person
+  include Diametric::Entity
+
+  attribute :name, String, :index => true
+  attribute :email, String, :cardinality => :many
+  attribute :birthday, DateTime
+  attribute :awesome, :boolean, :doc => "Is this person awesome?"
+  attribute :ssn, String, :unique => :value
+  attribute :secret_name, String, :unique => :identity
+  attribute :bio, String, :fulltext => true
+  attribute :middle_name, String, :default => "Danger"
+  attribute :nicknames, String, :cardinality => :many, :default => ["Buddy", "Pal"]
+  attribute :parent, Ref, :cardinality => :many, :doc => "A person's parent"
+end
+
+class Goat
+  include Diametric::Entity
+
+  attribute :name, String
+  attribute :birthday, DateTime
+end
+
+class Robin
+  include Diametric::Entity
+  include Diametric::Persistence::REST
+
+  attribute :name, String
+  validates_presence_of :name
+  attribute :age, Integer
+end
+
+class Penguin
+  include Diametric::Entity
+  include Diametric::Persistence::Peer
+
+  attribute :name, String
+  attribute :age, Integer
+end
+
+class Rat
+  include Diametric::Entity
+  include Diametric::Persistence::Peer
+
+  attribute :name, String, :index => true
+  attribute :age, Integer
+end
+
+class Mouse
+  include Diametric::Entity
+  include Diametric::Persistence::REST
+
+  attribute :name, String, :index => true
+  attribute :age, Integer
+end
+
+class Author
+  include Diametric::Entity
+  include Diametric::Persistence::Peer
+
+  attribute :name, String
+  attribute :books, Ref, :cardinality => :many
+end
+
+class Book
+  include Diametric::Entity
+  include Diametric::Persistence::Peer
+
+  attribute :title, String
+  attribute :authors, Ref, :cardinality => :many
+end
+
+class Choice
+  include Diametric::Entity
+  include Diametric::Persistence::Peer
+
+  attribute :item, String
+  attribute :checked, Boolean
+end
+
+class Customer
+  include Diametric::Entity
+  include Diametric::Persistence::Peer
+
+  attribute :name, String
+  attribute :id, UUID
+end
+
+class Account
+  include Diametric::Entity
+  include Diametric::Persistence::Peer
+
+  attribute :name, String
+  attribute :deposit, Float, :cardinality => :many
+  attribute :amount, Double
+end
+
+class Organization
+  include Diametric::Entity
+  include Diametric::Persistence::REST
+
+  attribute :name, String, :cardinality => :one, :fulltext => true, :doc => "A organization's name"
+  attribute :url, String, :cardinality => :one, :doc => "A organization's url"
+  attribute :neighborhood, Ref, :cardinality => :one, :doc => "A organization's neighborhood"
+  attribute :category, String, :cardinality => :many, :fulltext => true, :doc => "All organization categories"
+  attribute :orgtype, Ref, :cardinality => :one, :doc => "A organization orgtype enum value"
+  attribute :type, Ref, :cardinality => :one, :doc => "A organization type enum value"
+  enum :orgtype, [:community, :commercial, :nonprofit, :personal]
+  enum :type, [:email_list, :twitter, :facebook_page, :blog, :website, :wiki, :myspace, :ning]
+end
+
+class Community
+  include Diametric::Entity
+  include Diametric::Persistence::Peer
+
+  attribute :name, String, :cardinality => :one, :fulltext => true, :doc => "A community's name"
+  attribute :url, String, :cardinality => :one, :doc => "A community's url"
+  attribute :neighborhood, Ref, :cardinality => :one, :doc => "A community's neighborhood"
+  attribute :category, String, :cardinality => :many, :fulltext => true, :doc => "All community categories"
+  attribute :orgtype, Ref, :cardinality => :one, :doc => "A community orgtype enum value"
+  attribute :type, Ref, :cardinality => :one, :doc => "A community type enum value"
+  enum :orgtype, [:community, :commercial, :nonprofit, :personal]
+  enum :type, [:email_list, :twitter, :facebook_page, :blog, :website, :wiki, :myspace, :ning]
+end
+
+class Neighborhood
+  include Diametric::Entity
+  include Diametric::Persistence::Peer
+
+  attribute :name, String, :cardinality => :one, :unique => :identity, :doc => "A unique neighborhood name (upsertable)"
+  attribute :district, Ref, :cardinality => :one, :doc => "A neighborhood's district"
+end
+
+class District
+  include Diametric::Entity
+  include Diametric::Persistence::Peer
+
+  attribute :name, String, :cardinality => :one, :unique => :identity, :doc => "A unique district name (upsertable)"
+  attribute :region, Ref, :cardinality => :one, :doc => "A district region enum value"
+  enum :region, [:n, :ne, :e, :se, :s, :sw, :w, :nw]
+end

data/spec/support/gen_entity_class.rb

@@ -1,3 +1,5 @@
+require 'diametric/entity'
+
 def gen_entity_class(named = 'generated_entity_class', &block)
   Class.new do
     include Diametric::Entity

data/spec/support/persistence_examples.rb

@@ -43,7 +43,7 @@ shared_examples "persistence API" do
     end
 
     context "that is saved in Datomic" do
-      before(:each) do
+      before do
         model.name = "Wilbur"
         model.age = 2
         model.save
@@ -65,20 +65,23 @@ shared_examples "persistence API" do
       end
 
       it "can find it by attribute" do
-        model2 = model_class.first(:name => "Wilbur")
+        model2 = model_class.first({:name => "Wilbur"}, nil, true)
         model2.should_not be_nil
         model2.dbid.should == model.dbid
-        model2.should == model
+        model2.should == model if model2.is_a? Rat
+        model2.should include(mode) if model2.is_a? Array
       end
 
       it "can find all matching conditions" do
-        mice = model_class.where(:name => "Wilbur").where(:age => 2).all
+        mice = model_class.where({:name => "Wilbur"}, nil, true).where(:age => 2).all
         mice.should == [model]
+        mice.should include(model)
       end
 
       it "can filter entities" do
         mice = model_class.filter(:<, :age, 3).all
         mice.should == [model]
+        mice.should include(model)
 
         mice = model_class.filter(:>, :age, 3).all
         mice.should == []
@@ -86,7 +89,8 @@ shared_examples "persistence API" do
 
       it "can find all" do
         model_class.new(:name => "Smith", :age => 5).save
-        mice = model_class.all
+        mice = model_class.all(nil, true)
+        mice.should_not be_nil
         mice.size.should == 2
         names = ["Smith", "Wilbur"]
         mice.each do |m|

data/spec/test_version_file.yml

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

metadata

@@ -1,164 +1,208 @@
 --- !ruby/object:Gem::Specification
 name: diametric
 version: !ruby/object:Gem::Version
-  prerelease:
-  version: 0.0.4
+  version: 0.1.1
 platform: ruby
 authors:
 - Clinton N. Dreisbach
 - Ryan K. Neufeld
 - Yoko Harada
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-22 00:00:00.000000000 Z
+date: 2013-09-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
+  name: edn
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '1.0'
-    none: false
+        version: 1.0.2
+  type: :runtime
   prerelease: false
-  name: edn
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '1.0'
-    none: false
-  type: :runtime
+        version: 1.0.2
 - !ruby/object:Gem::Dependency
+  name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 3.0.0
-    none: false
+        version: 3.2.14
+  type: :runtime
   prerelease: false
-  name: activesupport
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 3.0.0
-    none: false
-  type: :runtime
+        version: 3.2.14
 - !ruby/object:Gem::Dependency
+  name: activemodel
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 3.0.0
-    none: false
+        version: 3.2.14
+  type: :runtime
   prerelease: false
-  name: activemodel
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 3.0.0
-    none: false
-  type: :runtime
+        version: 3.2.14
 - !ruby/object:Gem::Dependency
+  name: datomic-client
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: 0.4.1
-    none: false
+  type: :runtime
   prerelease: false
-  name: datomic-client
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: 0.4.1
-    none: false
-  type: :runtime
 - !ruby/object:Gem::Dependency
+  name: rubyzip
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.12.0
-    none: false
+        version: 0.9.9
+  type: :runtime
   prerelease: false
-  name: rspec
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.12.0
-    none: false
-  type: :runtime
+        version: 0.9.9
 - !ruby/object:Gem::Dependency
+  name: uuid
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 0.7.2
-    none: false
+        version: 2.3.7
+  type: :runtime
   prerelease: false
-  name: lock_jar
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 0.7.2
-    none: false
+        version: 2.3.7
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 2.14.1
   type: :runtime
-description: |
-  Diametric is a library for building schemas, queries, and transactions
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 2.14.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
+
   as entities into a Datomic database.
+
+'
 email:
 - crnixon@gmail.com
 - ryan@thinkrelevance.com
 - yoko@thinkrelevance.com
-executables: []
+executables:
+- datomic-rest
+- download-datomic
 extensions:
 - Rakefile
 extra_rdoc_files: []
 files:
 - Gemfile
 - Jarfile
-- Jarfile.lock
 - LICENSE.txt
 - README.md
 - Rakefile
+- datomic_version.yml
 - diametric.gemspec
-- lib/diametric.rb
-- lib/jrclj.rb
+- lib/boolean_type.rb
+- lib/diametric/config/environment.rb
 - lib/diametric/config.rb
 - lib/diametric/entity.rb
 - lib/diametric/errors.rb
-- lib/diametric/persistence.rb
-- lib/diametric/query.rb
-- lib/diametric/railtie.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/persistence.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.rb
+- lib/diametric_service.jar
 - lib/tasks/create_schema.rb
 - lib/tasks/diametric_config.rb
-- spec/integration_spec.rb
-- spec/peer_integration_spec.rb
-- spec/spec_helper.rb
+- lib/value_enums.rb
+- ext/diametric/DiametricCollection.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/DiametricUtils.java
+- ext/diametric/DiametricUUID.java
+- 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/persistence_spec.rb
-- spec/diametric/query_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/transactor_spec.rb
+- spec/integration_spec.rb
+- spec/parent_child_sample.rb
+- spec/peer_integration_spec.rb
+- spec/peer_seattle_spec.rb
+- spec/rc2013_seattle_big.rb
+- spec/rc2013_seattle_small.rb
+- spec/rc2013_simple_sample.rb
+- spec/seattle_integration_spec.rb
+- spec/simple_validation_sample.rb
+- spec/spec_helper.rb
+- spec/support/entities.rb
 - spec/support/gen_entity_class.rb
 - spec/support/persistence_examples.rb
+- spec/test_version_file.yml
+- bin/datomic-rest
+- bin/download-datomic
 homepage: https://github.com/relevance/diametric
 licenses: []
-post_install_message:
+metadata: {}
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -166,31 +210,43 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
-      version: !binary |-
-        MA==
-  none: false
+      version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
-      version: !binary |-
-        MA==
-  none: false
+      version: '0'
 requirements: []
-rubyforge_project:
-rubygems_version: 1.8.24
-signing_key:
-specification_version: 3
+rubyforge_project: 
+rubygems_version: 2.0.5
+signing_key: 
+specification_version: 4
 summary: ActiveModel for Datomic
 test_files:
-- spec/integration_spec.rb
-- spec/peer_integration_spec.rb
-- spec/spec_helper.rb
+- spec/conf_helper.rb
+- spec/developer_create_sample.rb
+- spec/developer_query_spec.rb
 - spec/diametric/config_spec.rb
 - spec/diametric/entity_spec.rb
-- spec/diametric/persistence_spec.rb
-- spec/diametric/query_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/transactor_spec.rb
+- spec/integration_spec.rb
+- spec/parent_child_sample.rb
+- spec/peer_integration_spec.rb
+- spec/peer_seattle_spec.rb
+- spec/rc2013_seattle_big.rb
+- spec/rc2013_seattle_small.rb
+- spec/rc2013_simple_sample.rb
+- spec/seattle_integration_spec.rb
+- spec/simple_validation_sample.rb
+- spec/spec_helper.rb
+- spec/support/entities.rb
 - spec/support/gen_entity_class.rb
 - spec/support/persistence_examples.rb
+has_rdoc: