diametric 0.0.2 → 0.0.3

data/Jarfile

@@ -2,5 +2,5 @@ repository 'http://clojars.org/repo/'
 repository 'https://repository.jboss.org/nexus/content/groups/public/'
 
 group :default, :runtime do
-  jar "com.datomic:datomic-free:0.8.3563"
+  jar "com.datomic:datomic-free:0.8.3655"
 end

data/Jarfile.lock

@@ -4,7 +4,7 @@ groups:
   default:
     dependencies:
     - com.amazonaws:aws-java-sdk:jar:1.3.0
-    - com.datomic:datomic-free:jar:0.8.3563
+    - com.datomic:datomic-free:jar:0.8.3655
     - com.google.code.findbugs:jsr305:jar:1.3.9
     - com.google.guava:guava:jar:12.0.1
     - com.h2database:h2:jar:1.3.165
@@ -19,9 +19,11 @@ groups:
     - org.apache.tomcat:tomcat-juli:jar:7.0.27
     - org.clojure:clojure:jar:1.4.0
     - org.clojure:data.json:jar:0.1.2
+    - org.clojure:tools.cli:jar:0.2.2
     - org.codehaus.jackson:jackson-core-asl:jar:1.8.0
     - org.codehaus.janino:commons-compiler-jdk:jar:2.6.1
     - org.codehaus.janino:commons-compiler:jar:2.6.1
+    - org.fressian:fressian:jar:0.6.3
     - org.hornetq:hornetq-core:jar:2.2.2.Final
     - org.jboss.netty:netty:jar:3.2.4.Final
     - org.slf4j:jcl-over-slf4j:jar:1.6.4
@@ -32,39 +34,41 @@ groups:
     - postgresql:postgresql:jar:9.1-901.jdbc4
     - spy:spymemcached:jar:2.8.1
     artifacts:
-    - jar:com.datomic:datomic-free:jar:0.8.3563:
+    - jar:com.datomic:datomic-free:jar:0.8.3655:
         transitive:
-          com.h2database:h2:jar:1.3.165: {}
-          org.apache.lucene:lucene-core:jar:3.3.0: {}
           postgresql:postgresql:jar:9.1-901.jdbc4: {}
+          org.codehaus.jackson:jackson-core-asl:jar:1.8.0: {}
+          org.slf4j:log4j-over-slf4j:jar:1.6.4: {}
+          net.java.dev.jets3t:jets3t:jar:0.8.1:
+            com.jamesmurty.utils:java-xmlbuilder:jar:0.4: {}
+            commons-httpclient:commons-httpclient:jar:3.1: {}
+          org.hornetq:hornetq-core:jar:2.2.2.Final: {}
+          org.slf4j:jcl-over-slf4j:jar:1.6.4: {}
           spy:spymemcached:jar:2.8.1: {}
-          org.clojure:clojure:jar:1.4.0: {}
-          org.slf4j:jul-to-slf4j:jar:1.6.4:
-            org.slf4j:slf4j-api:jar:1.6.4: {}
+          org.apache.tomcat:tomcat-jdbc:jar:7.0.27:
+            org.apache.tomcat:tomcat-juli:jar:7.0.27: {}
+          com.h2database:h2:jar:1.3.165: {}
+          org.apache.httpcomponents:httpclient:jar:4.2-alpha1:
+            org.apache.httpcomponents:httpcore:jar:4.2-alpha2: {}
+          com.amazonaws:aws-java-sdk:jar:1.3.0:
+            commons-codec:commons-codec:jar:1.3: {}
+          org.fressian:fressian:jar:0.6.3: {}
+          org.slf4j:slf4j-nop:jar:1.6.4: {}
+          org.apache.lucene:lucene-core:jar:3.3.0: {}
           com.google.guava:guava:jar:12.0.1:
             com.google.code.findbugs:jsr305:jar:1.3.9: {}
           org.clojure:data.json:jar:0.1.2: {}
-          org.slf4j:slf4j-nop:jar:1.6.4: {}
           org.jboss.netty:netty:jar:3.2.4.Final: {}
+          org.clojure:tools.cli:jar:0.2.2: {}
+          org.slf4j:jul-to-slf4j:jar:1.6.4:
+            org.slf4j:slf4j-api:jar:1.6.4: {}
+          org.clojure:clojure:jar:1.4.0: {}
           org.codehaus.janino:commons-compiler-jdk:jar:2.6.1:
             org.codehaus.janino:commons-compiler:jar:2.6.1: {}
-          org.apache.tomcat:tomcat-jdbc:jar:7.0.27:
-            org.apache.tomcat:tomcat-juli:jar:7.0.27: {}
-          org.hornetq:hornetq-core:jar:2.2.2.Final: {}
-          org.slf4j:jcl-over-slf4j:jar:1.6.4: {}
-          org.codehaus.jackson:jackson-core-asl:jar:1.8.0: {}
-          net.java.dev.jets3t:jets3t:jar:0.8.1:
-            com.jamesmurty.utils:java-xmlbuilder:jar:0.4: {}
-            commons-httpclient:commons-httpclient:jar:3.1: {}
-            commons-codec:commons-codec:jar:1.3: {}
-          org.slf4j:log4j-over-slf4j:jar:1.6.4: {}
-          com.amazonaws:aws-java-sdk:jar:1.3.0: {}
-          org.apache.httpcomponents:httpclient:jar:4.2-alpha1:
-            org.apache.httpcomponents:httpcore:jar:4.2-alpha2: {}
   runtime:
     dependencies:
     - com.amazonaws:aws-java-sdk:jar:1.3.0
-    - com.datomic:datomic-free:jar:0.8.3563
+    - com.datomic:datomic-free:jar:0.8.3655
     - com.google.code.findbugs:jsr305:jar:1.3.9
     - com.google.guava:guava:jar:12.0.1
     - com.h2database:h2:jar:1.3.165
@@ -79,9 +83,11 @@ groups:
     - org.apache.tomcat:tomcat-juli:jar:7.0.27
     - org.clojure:clojure:jar:1.4.0
     - org.clojure:data.json:jar:0.1.2
+    - org.clojure:tools.cli:jar:0.2.2
     - org.codehaus.jackson:jackson-core-asl:jar:1.8.0
     - org.codehaus.janino:commons-compiler-jdk:jar:2.6.1
     - org.codehaus.janino:commons-compiler:jar:2.6.1
+    - org.fressian:fressian:jar:0.6.3
     - org.hornetq:hornetq-core:jar:2.2.2.Final
     - org.jboss.netty:netty:jar:3.2.4.Final
     - org.slf4j:jcl-over-slf4j:jar:1.6.4
@@ -92,35 +98,37 @@ groups:
     - postgresql:postgresql:jar:9.1-901.jdbc4
     - spy:spymemcached:jar:2.8.1
     artifacts:
-    - jar:com.datomic:datomic-free:jar:0.8.3563:
+    - jar:com.datomic:datomic-free:jar:0.8.3655:
         transitive:
-          com.h2database:h2:jar:1.3.165: {}
-          org.apache.lucene:lucene-core:jar:3.3.0: {}
           postgresql:postgresql:jar:9.1-901.jdbc4: {}
+          org.codehaus.jackson:jackson-core-asl:jar:1.8.0: {}
+          org.slf4j:log4j-over-slf4j:jar:1.6.4: {}
+          net.java.dev.jets3t:jets3t:jar:0.8.1:
+            com.jamesmurty.utils:java-xmlbuilder:jar:0.4: {}
+            commons-httpclient:commons-httpclient:jar:3.1: {}
+          org.hornetq:hornetq-core:jar:2.2.2.Final: {}
+          org.slf4j:jcl-over-slf4j:jar:1.6.4: {}
           spy:spymemcached:jar:2.8.1: {}
-          org.clojure:clojure:jar:1.4.0: {}
-          org.slf4j:jul-to-slf4j:jar:1.6.4:
-            org.slf4j:slf4j-api:jar:1.6.4: {}
+          org.apache.tomcat:tomcat-jdbc:jar:7.0.27:
+            org.apache.tomcat:tomcat-juli:jar:7.0.27: {}
+          com.h2database:h2:jar:1.3.165: {}
+          org.apache.httpcomponents:httpclient:jar:4.2-alpha1:
+            org.apache.httpcomponents:httpcore:jar:4.2-alpha2: {}
+          com.amazonaws:aws-java-sdk:jar:1.3.0:
+            commons-codec:commons-codec:jar:1.3: {}
+          org.fressian:fressian:jar:0.6.3: {}
+          org.slf4j:slf4j-nop:jar:1.6.4: {}
+          org.apache.lucene:lucene-core:jar:3.3.0: {}
           com.google.guava:guava:jar:12.0.1:
             com.google.code.findbugs:jsr305:jar:1.3.9: {}
           org.clojure:data.json:jar:0.1.2: {}
-          org.slf4j:slf4j-nop:jar:1.6.4: {}
           org.jboss.netty:netty:jar:3.2.4.Final: {}
+          org.clojure:tools.cli:jar:0.2.2: {}
+          org.slf4j:jul-to-slf4j:jar:1.6.4:
+            org.slf4j:slf4j-api:jar:1.6.4: {}
+          org.clojure:clojure:jar:1.4.0: {}
           org.codehaus.janino:commons-compiler-jdk:jar:2.6.1:
             org.codehaus.janino:commons-compiler:jar:2.6.1: {}
-          org.apache.tomcat:tomcat-jdbc:jar:7.0.27:
-            org.apache.tomcat:tomcat-juli:jar:7.0.27: {}
-          org.hornetq:hornetq-core:jar:2.2.2.Final: {}
-          org.slf4j:jcl-over-slf4j:jar:1.6.4: {}
-          org.codehaus.jackson:jackson-core-asl:jar:1.8.0: {}
-          net.java.dev.jets3t:jets3t:jar:0.8.1:
-            com.jamesmurty.utils:java-xmlbuilder:jar:0.4: {}
-            commons-httpclient:commons-httpclient:jar:3.1: {}
-            commons-codec:commons-codec:jar:1.3: {}
-          org.slf4j:log4j-over-slf4j:jar:1.6.4: {}
-          com.amazonaws:aws-java-sdk:jar:1.3.0: {}
-          org.apache.httpcomponents:httpclient:jar:4.2-alpha1:
-            org.apache.httpcomponents:httpcore:jar:4.2-alpha2: {}
 remote_repositories:
 - http://clojars.org/repo/
 - https://repository.jboss.org/nexus/content/groups/public/

data/README.md

@@ -14,6 +14,14 @@ recommend them for help with your corporate projects.
 
 Special thanks to Mongoid for writing some solid ORM code that was liberally borrowed from to add Rails support to Diametric.
 
+## Documents
+
+Other than highlights below, there are documents on Wiki.
+
+- [Getting Started](https://github.com/relevance/diametric/wiki/Getting-Started)
+- [Rails Integration](https://github.com/relevance/diametric/wiki/Rails-Integration-%28Experimental%29)
+
+
 ## Entity API
 
 The `Entity` module is interesting, in that it is primarily made of
@@ -133,34 +141,43 @@ query.data
 
 ## Persistence API
 
-The persistence API comes in two flavors: REST- and peer-based. For the most part, they have the same API.
+The persistence API comes in two flavors: REST- and peer-based.
+For the most part, they have the same API.
+
+The suitable persistent module will be selected based on URI to connect datomic.
+You don't need to care which module should be included.
+However, if you like to inlcude REST or Peer module explicitely, you can write it.
+
 
 ### Peer
 
-With `Diametric::Persistence::Peer`, you can create objects that know how to store themselves to Datomic through a Datomic peer.
+With Peer connection, you can create objects that know how to store themselves to Datomic through a Datomic peer.
 
-To use `Diametric::Persistence::Peer`, you will need to use JRuby and require `diametric/persistence/peer`. When you install the `diametric` gem with JRuby, all `.jar` files needed to run Datomic will be downloaded. 
+Peer connection as well as "require `diametric/persistence/peer`" are only available on JRuby.
+When you install the `diametric` gem with JRuby, all `.jar` files needed to run Datomic will be downloaded.
 
 ```ruby
 require 'diametric'
-require 'diametric/persistence/peer'
+require 'diametric/persistence'
 
 # database URI
 # will create database if it does not already exist
-Diametric::Persistence::Peer.connect('datomic:mem://animals')
+Diametric::Persistence.establish_base_connection({:uri=>'datomic:mem://sample'})
 ```
 
 ### REST
 
-With `Diametric::Persistence::REST`, you can create objects that know how to store themselves to Datomic through the Datomic REST API. This is your only option unless you are using JRuby.
+With REST connection, you can create objects that know how to store themselves to Datomic through the Datomic REST API.
+REST connection is available both on CRuby and JRuby.
+You need to download Datomic by yourself and start the server before you run the code.
 
 ```ruby
 require 'diametric'
-require 'diametric/persistence/rest'
+require 'diametric/persistence'
 
 # database url, database alias, database name
 # will create database if it does not already exist
-Diametric::Persistence::REST.connect('http://localhost:9000', 'free', 'animals')
+Diametric::Persistence.establish_base_connection({:uri => 'http://localhost:9000', :storage => 'free', :database => 'sample'})
 ```
 
 ### Using persisted models
@@ -168,8 +185,7 @@ Diametric::Persistence::REST.connect('http://localhost:9000', 'free', 'animals')
 ```ruby
 class Goat
   include Diametric::Entity
-  include Diametric::Persistence::REST # if using REST API
-  include Diametric::Persistence::Peer # if using JRuby and not using REST
+  include Diametric::Persistence
   
   attribute :name, String, :index => true
   attribute :age, Integer

data/lib/diametric.rb

@@ -2,6 +2,7 @@ require "diametric/version"
 require "diametric/entity"
 require "diametric/query"
 require "diametric/persistence"
+require "diametric/errors"
 
 require 'diametric/config'
 

data/lib/diametric/entity.rb

@@ -239,6 +239,16 @@ module Diametric
       def namespace(ns, attribute)
         [ns.to_s, attribute.to_s].join("/").to_sym
       end
+      
+      # Raise an error if validation failed.
+      #
+      # @example Raise the validation error.
+      #   Person.fail_validate!(person)
+      #
+      # @param [ Entity ] entity The entity to fail.
+      def fail_validate!(entity)
+        raise Errors::ValidationError.new(entity)
+      end
 
       private
 
@@ -340,6 +350,13 @@ module Diametric
       txes << [:"db/add", (dbid || tempid) , namespaced_attribute, protractions.to_a] unless protractions.empty?
       txes
     end
+    
+    # Returns hash of all attributes for this object
+    #
+    # @return [Hash<Symbol, object>] Hash of atrributes
+    def attributes
+      Hash[self.class.attribute_names.map {|attribute_name| [attribute_name, self.send(attribute_name)] }]
+    end
 
     # @return [Array<Symbol>] Names of the entity's attributes.
     def attribute_names

data/lib/diametric/errors.rb

@@ -0,0 +1,13 @@
+require 'diametric'
+
+module Diametric
+  module Errors
+    
+    class ValidationError < StandardError
+      def initialize(entity)
+        super(entity.errors.full_messages.join(", "))
+      end
+    end
+    
+  end
+end

data/lib/diametric/persistence/common.rb

@@ -20,6 +20,19 @@ module Diametric
             end
           end
         end
+        
+        # Save the entity. If a validation error occurs an error will get raised.
+        #
+        # @example Save the entitiy.
+        #   entity.save!
+        #
+        # @return [ true, false ] True if validation passed.
+        def save!
+          unless save
+            self.class.fail_validate!(self) unless errors.empty?
+          end
+          return true
+        end
       end
 
       module ClassMethods

data/lib/diametric/persistence/peer.rb

@@ -82,6 +82,12 @@ module Diametric
 
       extend ClassMethods
 
+      # Save the entity
+      #
+      # @example Save the entity.
+      #   entity.save
+      #
+      # @return [ true, false ] True is success, false if not.
       def save
         return false unless valid?
         return true unless changed?

data/lib/diametric/persistence/rest.rb

@@ -70,6 +70,12 @@ module Diametric
 
       extend ClassMethods
 
+      # Save the entity
+      #
+      # @example Save the entity.
+      #   entity.save
+      #
+      # @return [ true, false ] True is success, false if not.
       def save
         return false unless valid?
         return true unless changed?
@@ -87,6 +93,10 @@ module Diametric
         res
       end
 
+      def to_edn
+        self.dbid
+      end
+
       def retract_entity(dbid)
         query = [[:"db.fn/retractEntity", dbid.to_i]]
         self.class.transact(query)

data/lib/diametric/version.rb

@@ -1,3 +1,3 @@
 module Diametric
-  VERSION = "0.0.2"
+  VERSION = "0.0.3"
 end

data/spec/diametric/entity_spec.rb

@@ -86,6 +86,22 @@ describe Diametric::Entity do
       subject.name = "Clinton"
       subject.name.should == "Clinton"
     end
+    
+    it "should return attribute names" do
+      subject.attribute_names.should eql(Person.attribute_names)
+    end
+    
+    it "should return a hash of attributes" do
+      attributes = subject.attributes
+      
+      attributes.should be_a Hash
+      attributes.keys.should eql(subject.attribute_names)
+      attributes[:middle_name].should eql("Danger")
+    end
+    
+    it "should raise a validation error" do
+      expect { Robin.new.save! }.to raise_error(Diametric::Errors::ValidationError)
+    end
 
   end
 

data/spec/integration_spec.rb

@@ -70,6 +70,16 @@ describe Diametric::Entity, :integration => true do
     end
 
     let(:query) { Diametric::Query.new(Robin) }
+    it "can create entity" do
+      robin = Robin.new
+      
+      expect { robin.save! }.to raise_error(Diametric::Errors::ValidationError)
+      robin.save.should be_false
+      robin.name = "Mary"
+      robin.age = 3
+      expect { robin.save! }.to_not raise_error(Diametric::Errors::ValidationError)
+      robin.persisted?.should be_true
+    end
     it "can update entity" do
       robin = Robin.new(:name => "Mary", :age => 2)
       robin.save

data/spec/spec_helper.rb

@@ -61,6 +61,7 @@ class Robin
   include Diametric::Persistence::REST
 
   attribute :name, String
+  validates_presence_of :name
   attribute :age, Integer
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: diametric
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
   prerelease: 
 platform: ruby
 authors:
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-29 00:00:00.000000000 Z
+date: 2012-12-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: edn
@@ -119,6 +119,7 @@ files:
 - lib/diametric/config/environment.rb
 - lib/diametric/config.rb
 - lib/diametric/entity.rb
+- lib/diametric/errors.rb
 - lib/diametric/generators/active_model.rb
 - lib/diametric/persistence/common.rb
 - lib/diametric/persistence/peer.rb
@@ -154,21 +155,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -448457445775991460
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -448457445775991460
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: ActiveModel for Datomic