orientdb-ar 0.0.4-jruby → 0.0.5-jruby

data/spec/models/address.rb

@@ -4,4 +4,7 @@ class Address < OrientDB::AR::Embedded
   field :state, :string
   field :zip, :string
   field :country, :string
+
+  validates_presence_of :street, :city, :state
 end
+Address.schema!

data/spec/models/customer.rb

@@ -1,5 +1,6 @@
 class Customer < Person
   field :number, :int, :not_null => true
+  field :tab, :float
   embedds_one Address, :name => :address
   embedds_many PhoneNumber, :name => :phones
 end

data/spec/models/invoice.rb

@@ -0,0 +1,12 @@
+class Invoice < OrientDB::AR::Base
+
+  field :number, :int, :mandatory => true, :index => true
+  links_one Customer, :not_null => true
+  field :sold_on, :date
+  field :total, :float
+  links_many InvoiceLine, :name => :lines
+
+  validates_presence_of :number, :customer
+
+end
+Invoice.schema!

data/spec/models/invoice_line.rb

@@ -0,0 +1,14 @@
+class InvoiceLine < OrientDB::AR::Base
+
+  links_one Product, :not_null => true
+  field :quantity, :int, :not_null => true
+  field :price, :float, :not_null => true
+
+  validates_presence_of :product, :quantity
+
+  def invoice
+    Invoice.where(:lines.contains(:@rid, rid.lit))
+  end
+
+end
+InvoiceLine.schema!

data/spec/models/person.rb

@@ -1,6 +1,13 @@
 class Person < OrientDB::AR::Base
+
   field :name, :string, :not_null => true
   field :age, :int
   field :tags, [:list, :string]
+
+  self.default_validation_group = :all
+
+  validates_presence_of :name, :groups => :all
+  validates_presence_of :age, :groups => [:all, :admins]
+
 end
 Person.schema!

data/spec/models/phone_number.rb

@@ -2,4 +2,5 @@ class PhoneNumber < OrientDB::AR::Embedded
   field :type, :string
   field :number, :string
   field :extension, :string
-end
+end
+PhoneNumber.schema!

data/spec/models/product.rb

@@ -0,0 +1,17 @@
+class Product < OrientDB::AR::Base
+
+  field :sku, :string, :not_null => true
+  field :title, :string, :not_null => true
+  field :price, :float, :not_null => true
+
+  validates_presence_of :sku, :title
+
+  def invoice_lines(reload = false)
+    if !defined?(@invoice_lines) || reload
+      @invoice_lines = InvoiceLine.where(:product => rid.lit).all
+    end
+    @invoice_lines
+  end
+
+end
+Product.schema!

data/spec/serialization_spec.rb

@@ -1,23 +1,19 @@
 require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
 
-describe "ActiveModel" do
+describe "ActiveModel::Serialization" do
 
-  describe "Serialization" do
-
-    it "should comply" do
-      @person = SimplePerson.new
-      @person.serializable_hash.should == {"name" => nil}
-      @person.as_json.should == {"name" => nil}
-      @person.to_json.should == %{{"name":null}}
-      @person.to_xml.should == "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<simple-person>\n  <name type=\"yaml\" nil=\"true\"></name>\n</simple-person>\n"
-
-      @person.name = "Bob"
-      @person.serializable_hash.should == {"name" => "Bob"}
-      @person.as_json.should == {"name" => "Bob"}
-      @person.to_json.should == %{{"name":"Bob"}}
-      @person.to_xml.should == "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<simple-person>\n  <name>Bob</name>\n</simple-person>\n"
-    end
+  it "should comply" do
+    @person = SimplePerson.new
+    @person.serializable_hash.should == { "name" => nil }
+    @person.as_json.should == { "name" => nil }
+    @person.to_json.should == %{{"name":null}}
+    @person.to_xml.should == "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<simple-person>\n  <name nil=\"true\"></name>\n</simple-person>\n"
 
+    @person.name = "Bob"
+    @person.serializable_hash.should == { "name" => "Bob" }
+    @person.as_json.should == { "name" => "Bob" }
+    @person.to_json.should == %{{"name":"Bob"}}
+    @person.to_xml.should == "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<simple-person>\n  <name>Bob</name>\n</simple-person>\n"
   end
 
 end

data/spec/spec_helper.rb

@@ -15,22 +15,51 @@ unless defined?(SPEC_HELPER_LOADED)
   #require 'rspec/autorun'
   require 'fileutils'
 
-  TEST_DB_PATH = "#{TEMP_DIR}/test/db_#{rand(999) + 1}"
-  puts ">> TEST_DB PATH : #{TEST_DB_PATH}"
+  TEST_URL      = ENV["ORIENTDB_TEST_URL"]
+  TEST_USERNAME = ENV["ORIENTDB_TEST_USERNAME"] || 'admin'
+  TEST_PASSWORD = ENV["ORIENTDB_TEST_PASSWORD"] || 'admin'
+  TEST_POOLED   = ENV["ORIENTDB_TEST_POOLED"].to_s[0, 1].downcase == 't'
 
-  require 'fileutils'
-  puts ">> Removing tmp directory #{TEMP_DIR} ..."
-  FileUtils.remove_dir TEMP_DIR + '/test', true
-  puts ">> Creating OrientDB database..."
-  FileUtils.mkdir_p TEST_DB_PATH
-  OrientDB::AR::Base.connection = OrientDB::DocumentDatabase.new("local:#{TEST_DB_PATH}/test").create
-  puts ">> Connection : #{OrientDB::AR::Base.connection}"
-
-  require SPEC_ROOT + '/models/person'
-  require SPEC_ROOT + '/models/simple_person'
-  require SPEC_ROOT + '/models/phone_number'
-  require SPEC_ROOT + '/models/address'
-  require SPEC_ROOT + '/models/customer'
+  puts "ENV :: TEST_URL : #{TEST_URL} | TEST_USERNAME : #{TEST_USERNAME} | TEST_PASSWORD : #{TEST_PASSWORD} | TEST_POOLED : #{TEST_POOLED}"
+
+  if TEST_URL
+    if TEST_POOLED
+      puts ">> Testing [#{TEST_URL[0,TEST_URL.index(':')]}] Pooled Database :: TEST_DB URL : #{TEST_URL} : #{TEST_USERNAME} : #{TEST_PASSWORD}"
+      OrientDB::AR::Base.connection = OrientDB::DocumentDatabasePool.connect(TEST_URL, TEST_USERNAME, TEST_PASSWORD)
+    else
+      puts ">> Testing [#{TEST_URL[0,TEST_URL.index(':')]}] Database :: TEST_DB URL : #{TEST_URL} : #{TEST_USERNAME} : #{TEST_PASSWORD}"
+      OrientDB::AR::Base.connection = OrientDB::DocumentDatabase.connect(TEST_URL, TEST_USERNAME, TEST_PASSWORD)
+    end
+  else
+    TEST_DB_PATH = "#{TEMP_DIR}/databases/db_#{rand(999) + 1}"
+    FileUtils.remove_dir "#{TEMP_DIR}/databases" rescue nil
+    FileUtils.mkdir_p TEST_DB_PATH
+    puts ">> Testing [local] Database :: TEST_DB PATH : #{TEST_DB_PATH}"
+    FileUtils.remove_dir "#{TEMP_DIR}/databases/"
+    FileUtils.mkdir_p TEST_DB_PATH
+    puts ">> TEST_DB PATH : #{TEST_DB_PATH}"
+    OrientDB::AR::Base.connection = OrientDB::DocumentDatabase.new("local:#{TEST_DB_PATH}/test").create
+  end
+
+  at_exit do
+    puts " [ EXITING ] ".center(120, "~")
+    begin
+      puts ">> Will close connection ..."
+      pp OrientDB::AR::Base.connection
+      puts ">> Closing ..."
+      OrientDB::AR::Base.connection.close
+      puts ">> Closed ..."
+    rescue Exception => e
+      puts "EXCEPTION: #{e.class.name} : #{e.message}"
+      pp e.backtrace
+    end
+    puts " [ THE END ] ".center(120, "~")
+    exit!
+  end
+
+  %w{ person simple_person address phone_number customer flo_admin product invoice_line invoice }.each do |name|
+    require SPEC_ROOT + '/models/' + name
+  end
 
   require SPEC_ROOT + '/lint_behavior'
 

metadata

@@ -2,7 +2,7 @@
 name: orientdb-ar
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.0.4
+  version: 0.0.5
 platform: jruby
 authors: 
   - Adrian Madrid
@@ -10,8 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-01-26 00:00:00 -07:00
-default_executable: orientdbar_console
+date: 2012-01-12 00:00:00 Z
 dependencies: 
   - !ruby/object:Gem::Dependency 
     name: orientdb
@@ -19,9 +18,9 @@ dependencies:
     requirement: &id001 !ruby/object:Gem::Requirement 
       none: false
       requirements: 
-        - - "="
+        - - ">="
           - !ruby/object:Gem::Version 
-            version: 0.0.15
+            version: 0.0.20
     type: :runtime
     version_requirements: *id001
   - !ruby/object:Gem::Dependency 
@@ -36,27 +35,38 @@ dependencies:
     type: :runtime
     version_requirements: *id002
   - !ruby/object:Gem::Dependency 
-    name: awesome_print
+    name: jnunemaker-validatable
     prerelease: false
     requirement: &id003 !ruby/object:Gem::Requirement 
+      none: false
+      requirements: 
+        - - "="
+          - !ruby/object:Gem::Version 
+            version: 1.8.4
+    type: :runtime
+    version_requirements: *id003
+  - !ruby/object:Gem::Dependency 
+    name: awesome_print
+    prerelease: false
+    requirement: &id004 !ruby/object:Gem::Requirement 
       none: false
       requirements: 
         - - ">="
           - !ruby/object:Gem::Version 
             version: "0"
     type: :development
-    version_requirements: *id003
+    version_requirements: *id004
   - !ruby/object:Gem::Dependency 
     name: rspec
     prerelease: false
-    requirement: &id004 !ruby/object:Gem::Requirement 
+    requirement: &id005 !ruby/object:Gem::Requirement 
       none: false
       requirements: 
         - - ">="
           - !ruby/object:Gem::Version 
             version: "2.4"
     type: :development
-    version_requirements: *id004
+    version_requirements: *id005
 description: Active Model wrappers to persist Ruby objects under OrientDB in JRuby.
 email: 
   - aemadrid@gmail.com
@@ -84,12 +94,15 @@ files:
   - lib/orientdb-ar/embedded.rb
   - lib/orientdb-ar/ext.rb
   - lib/orientdb-ar/relations.rb
+  - lib/orientdb-ar/relations/embedds_many.rb
+  - lib/orientdb-ar/relations/embedds_one.rb
+  - lib/orientdb-ar/relations/links_many.rb
+  - lib/orientdb-ar/relations/links_one.rb
   - lib/orientdb-ar/sql.rb
   - lib/orientdb-ar/sql/delete.rb
   - lib/orientdb-ar/sql/insert.rb
   - lib/orientdb-ar/sql/query.rb
   - lib/orientdb-ar/sql/update.rb
-  - lib/orientdb-ar/validations.rb
   - orientdb-ar.gemspec
   - spec/base_spec.rb
   - spec/dirty_spec.rb
@@ -99,13 +112,15 @@ files:
   - spec/models/address.rb
   - spec/models/customer.rb
   - spec/models/flo_admin.rb
+  - spec/models/invoice.rb
+  - spec/models/invoice_line.rb
   - spec/models/person.rb
   - spec/models/phone_number.rb
+  - spec/models/product.rb
   - spec/models/simple_person.rb
   - spec/serialization_spec.rb
   - spec/spec.opts
   - spec/spec_helper.rb
-has_rdoc: true
 homepage: http://rubygems.org/gems/orientdb
 licenses: []
 
@@ -129,7 +144,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: orientdb-ar
-rubygems_version: 1.4.2
+rubygems_version: 1.8.9
 signing_key: 
 specification_version: 3
 summary: ActiveRecord-like persistency through OrientDB in JRuby

data/lib/orientdb-ar/validations.rb

@@ -1,11 +0,0 @@
-module OrientDB::AR
-  module Validations
-
-    attr_reader :errors
-
-    def valid?
-      true
-    end
-
-  end
-end