vorpal 0.0.7.rc1 → 0.0.7.rc2

data/spec/vorpal/acceptance/aggregate_repository_spec.rb

@@ -131,7 +131,7 @@ describe 'Aggregate Repository' do
     it 'does not change the id on update' do
       test_repository = configure
 
-      tree = Tree.new()
+      tree = Tree.new
       test_repository.persist(tree)
 
       original_id = tree.id
@@ -145,7 +145,7 @@ describe 'Aggregate Repository' do
     it 'does not create additional records' do
       test_repository = configure
 
-      tree = Tree.new()
+      tree = Tree.new
       test_repository.persist(tree)
 
       tree.name = 'change it'
@@ -185,7 +185,7 @@ describe 'Aggregate Repository' do
     test_repository = configure
 
     tree_db = TreeDB.create! name: 'tree name'
-    tree = test_repository.load(tree_db.id, Tree)
+    tree = test_repository.load_one(tree_db)
 
     expect(tree.id).to eq tree_db.id
     expect(tree.name).to eq 'tree name'
@@ -197,7 +197,7 @@ describe 'Aggregate Repository' do
     tree_db = TreeDB.create!
     Fissure.create! length: 21, tree_id: tree_db.id
 
-    tree = test_repository.load(tree_db.id, Tree)
+    tree = test_repository.load_one(tree_db)
 
     expect(tree.fissures.first.length).to eq 21
   end
@@ -221,7 +221,7 @@ describe 'Aggregate Repository' do
       tree_db = TreeDB.create!
       BranchDB.create!(length: 50, tree_id: tree_db.id)
 
-      tree = test_repository.load(tree_db.id, Tree)
+      tree = test_repository.load_one(tree_db)
 
       expect(tree).to be tree.branches.first.tree
     end
@@ -249,7 +249,7 @@ describe 'Aggregate Repository' do
       long_branch = BranchDB.create!(length: 100, tree_id: tree_db.id)
       BranchDB.create!(length: 50, branch_id: long_branch.id)
 
-      tree = test_repository.load(tree_db.id, Tree)
+      tree = test_repository.load_one(tree_db)
 
       expect(tree.branches.first.branches.first.length).to eq 50
     end
@@ -269,7 +269,7 @@ describe 'Aggregate Repository' do
 
     it 'saves foreign keys' do
       test_repository = configure
-      trunk = Trunk.new()
+      trunk = Trunk.new
       tree = Tree.new(trunk: trunk)
 
       test_repository.persist(tree)
@@ -306,7 +306,7 @@ describe 'Aggregate Repository' do
       trunk_db = TrunkDB.create!(length: 21)
       tree_db = TreeDB.create!(trunk_id: trunk_db.id)
 
-      new_tree = test_repository.load(tree_db.id, Tree)
+      new_tree = test_repository.load_one(tree_db)
       expect(new_tree.trunk.length).to eq 21
     end
   end
@@ -371,7 +371,7 @@ describe 'Aggregate Repository' do
       tree_db = TreeDB.create!
       BranchDB.create!(length: 50, tree_id: tree_db.id)
 
-      tree = test_repository.load(tree_db.id, Tree)
+      tree = test_repository.load_one(tree_db)
 
       expect(tree.branches.first.length).to eq 50
     end
@@ -414,7 +414,7 @@ describe 'Aggregate Repository' do
       trunk_db = TrunkDB.create!
       TreeDB.create!(name: 'big tree', trunk_id: trunk_db.id)
 
-      trunk = test_repository.load(trunk_db.id, Trunk)
+      trunk = test_repository.load_one(trunk_db)
 
       expect(trunk.tree.name).to eq 'big tree'
     end
@@ -442,12 +442,13 @@ describe 'Aggregate Repository' do
       test_repository = configure_polymorphic_has_many
 
       trunk_db = TrunkDB.create!
+      tree_db = TreeDB.create!(trunk_id: trunk_db.id)
       BugDB.create!(name: 'trunk bug', lives_on_id: trunk_db.id, lives_on_type: Trunk.name)
       BugDB.create!(name: 'not a trunk bug!', lives_on_id: trunk_db.id, lives_on_type: 'some other table')
 
-      trunk = test_repository.load(trunk_db.id, Trunk)
+      tree = test_repository.load_one(tree_db)
 
-      expect(trunk.bugs.map(&:name)).to eq ['trunk bug']
+      expect(tree.trunk.bugs.map(&:name)).to eq ['trunk bug']
     end
 
     it 'saves with belongs_tos' do
@@ -456,7 +457,7 @@ describe 'Aggregate Repository' do
       trunk_bug = Bug.new(lives_on: Trunk.new)
       branch_bug = Bug.new(lives_on: Branch.new)
 
-      test_repository.persist_all([trunk_bug, branch_bug])
+      test_repository.persist([trunk_bug, branch_bug])
 
       expect(BugDB.find(trunk_bug.id).lives_on_type).to eq Trunk.name
       expect(BugDB.find(branch_bug.id).lives_on_type).to eq Branch.name
@@ -487,7 +488,7 @@ describe 'Aggregate Repository' do
       branch_db.save!
       branch_bug_db = BugDB.create!(lives_on_id: branch_db.id, lives_on_type: Branch.name)
 
-      trunk_bug, branch_bug = test_repository.load_all([trunk_bug_db.id, branch_bug_db.id], Bug)
+      trunk_bug, branch_bug = test_repository.load_many([trunk_bug_db, branch_bug_db])
 
       expect(trunk_bug.lives_on.length).to eq 99
       expect(branch_bug.lives_on.length).to eq 5
@@ -499,23 +500,58 @@ describe 'Aggregate Repository' do
       swamp = Swamp.create!
       tree_db = TreeDB.create!(environment_id: swamp.id, environment_type: Swamp.name)
 
-      tree = test_repository.load(tree_db.id, Tree)
+      tree = test_repository.load_one(tree_db)
 
       expect(tree.environment).to eq swamp
     end
   end
 
-  describe 'load_all' do
-    it 'returns objects in the same order as the ids' do
+  describe 'arel' do
+    it 'loads many' do
+      test_repository = configure
+
+      TreeDB.create!
+      tree_db = TreeDB.create!
+
+      trees = test_repository.query.where(id: tree_db.id).load_many
+
+      expect(trees.map(&:id)).to eq [tree_db.id]
+    end
+
+    it 'loads one' do
       test_repository = configure
 
-      tree_db1 = TreeDB.create!
-      tree_db2 = TreeDB.create!
-      tree_db3 = TreeDB.create!
+      TreeDB.create!
+      tree_db = TreeDB.create!
 
-      trees = test_repository.load_all([tree_db2.id, tree_db1.id, tree_db3.id], Tree)
+      trees = test_repository.query.where(id: tree_db.id).load_one
 
-      expect(trees.map(&:id)).to eq [tree_db2.id, tree_db1.id, tree_db3.id]
+      expect(trees.id).to eq tree_db.id
+    end
+  end
+
+  describe 'load_many' do
+    it 'maps given db objects' do
+      test_repository = configure
+
+      TreeDB.create!
+      tree_db = TreeDB.create!
+
+      trees = test_repository.load_many([tree_db])
+
+      expect(trees.map(&:id)).to eq [tree_db.id]
+    end
+
+    it 'only returns roots' do
+      test_repository = configure
+
+      TreeDB.create!
+      tree_db = TreeDB.create!
+      BranchDB.create!(tree_id: tree_db.id)
+
+      trees = test_repository.load_many([tree_db])
+
+      expect(trees.map(&:id)).to eq [tree_db.id]
     end
   end
 
@@ -525,7 +561,7 @@ describe 'Aggregate Repository' do
 
       tree_db = TreeDB.create!
 
-      test_repository.destroy_all([Tree.new(id: tree_db.id)])
+      test_repository.destroy([Tree.new(id: tree_db.id)])
 
       expect(TreeDB.count).to eq 0
     end
@@ -592,54 +628,46 @@ describe 'Aggregate Repository' do
 
       tree_db = TreeDB.create!
 
-      test_repository.destroy_all_by_id([tree_db.id], Tree)
+      test_repository.destroy_by_id([tree_db.id])
 
       expect(TreeDB.count).to eq 0
     end
   end
 
   describe 'non-existent values' do
-    it 'load_all ignores ids that do not exist' do
+    it 'load_many returns an empty array when given an empty array' do
       test_repository = configure
 
-      results = test_repository.load_all([99], Tree)
+      results = test_repository.load_many([])
       expect(results).to eq []
     end
 
-    it 'load_all throws an exception when given a nil id' do
+    it 'load_many throws an exception when given a nil db_object' do
       test_repository = configure
 
       expect {
-        test_repository.load_all([nil], Tree)
-      }.to raise_error(Vorpal::InvalidPrimaryKeyValue, "Nil primary key values are not allowed.")
-    end
-
-    it 'load throws an exception when given a nil id' do
-      test_repository = configure
-
-      expect {
-        test_repository.load(nil, Tree)
-      }.to raise_error(Vorpal::InvalidPrimaryKeyValue, "Nil primary key values are not allowed.")
+        test_repository.load_many([nil])
+      }.to raise_error(Vorpal::InvalidAggregateRoot, "Nil aggregate roots are not allowed.")
     end
 
-    it 'load_all ignores empty arrays' do
+    it 'load_one returns nil when given nil' do
       test_repository = configure
 
-      results = test_repository.load_all([], Tree)
-      expect(results).to eq []
+      result = test_repository.load_one(nil)
+      expect(result).to eq nil
     end
 
-    it 'persist_all ignores empty arrays' do
+    it 'persist ignores empty arrays' do
       test_repository = configure
 
-      results = test_repository.persist_all([])
+      results = test_repository.persist([])
       expect(results).to eq []
     end
 
-    it 'persist_all throws an exception when given a nil root' do
+    it 'persist throws an exception when given a collection with a nil root' do
       test_repository = configure
       expect {
-        test_repository.persist_all([nil])
+        test_repository.persist([nil])
       }.to raise_error(Vorpal::InvalidAggregateRoot, "Nil aggregate roots are not allowed.")
     end
 
@@ -650,10 +678,10 @@ describe 'Aggregate Repository' do
       }.to raise_error(Vorpal::InvalidAggregateRoot, "Nil aggregate roots are not allowed.")
     end
 
-    it 'destroy_all ignores empty arrays' do
+    it 'destroy ignores empty arrays' do
       test_repository = configure
 
-      results = test_repository.destroy_all([])
+      results = test_repository.destroy([])
       expect(results).to eq []
     end
 
@@ -665,32 +693,32 @@ describe 'Aggregate Repository' do
       }.to raise_error(Vorpal::InvalidAggregateRoot, "Nil aggregate roots are not allowed.")
     end
 
-    it 'destroy_all throws an exception when given a nil root' do
+    it 'destroy throws an exception when given a collection with a nil root' do
       test_repository = configure
 
       expect {
-        test_repository.destroy_all([nil])
+        test_repository.destroy([nil])
       }.to raise_error(Vorpal::InvalidAggregateRoot, "Nil aggregate roots are not allowed.")
     end
 
-    it 'destroy_all_by_id ignores empty arrays' do
+    it 'destroy_by_id ignores empty arrays' do
       test_repository = configure
 
-      results = test_repository.destroy_all_by_id([], Tree)
+      results = test_repository.destroy_by_id([])
       expect(results).to eq []
     end
 
-    it 'destroy_all_by_id ignores ids that do not exist' do
+    it 'destroy_by_id ignores ids that do not exist' do
       test_repository = configure
 
-      test_repository.destroy_all_by_id([99], Tree)
+      test_repository.destroy_by_id([99])
     end
 
-    it 'destroy_all_by_id throws an exception when given a nil id' do
+    it 'destroy_by_id throws an exception when given a collection with a nil id' do
       test_repository = configure
 
       expect {
-        test_repository.destroy_all_by_id([nil], Tree)
+        test_repository.destroy_by_id([nil])
       }.to raise_error(Vorpal::InvalidPrimaryKeyValue, "Nil primary key values are not allowed.")
     end
 
@@ -698,7 +726,7 @@ describe 'Aggregate Repository' do
       test_repository = configure
 
       expect {
-        test_repository.destroy_by_id(nil, Tree)
+        test_repository.destroy_by_id(nil)
       }.to raise_error(Vorpal::InvalidPrimaryKeyValue, "Nil primary key values are not allowed.")
     end
   end
@@ -706,7 +734,7 @@ describe 'Aggregate Repository' do
 private
 
   def configure_polymorphic_has_many
-    Vorpal.define do
+    engine = Vorpal.define do
       map Tree do
         attributes :name
         has_many :branches
@@ -727,10 +755,11 @@ private
         attributes :name
       end
     end
+    engine.repository_for(Tree)
   end
 
   def configure_polymorphic_belongs_to
-    Vorpal.define do
+    engine = Vorpal.define do
       map Bug do
         attributes :name
         belongs_to :lives_on, fk: :lives_on_id, fk_type: :lives_on_type, child_classes: [Trunk, Branch]
@@ -744,10 +773,11 @@ private
         attributes :length
       end
     end
+    engine.repository_for(Bug)
   end
 
   def configure_ar_polymorphic_belongs_to
-    Vorpal.define do
+    engine = Vorpal.define do
       map Tree do
         attributes :name
         belongs_to :environment, owned: false, fk: :environment_id, fk_type: :environment_type, child_class: Swamp
@@ -755,10 +785,11 @@ private
 
       map Swamp, to: Swamp
     end
+    engine.repository_for(Tree)
   end
 
   def configure_unowned_polymorphic_belongs_to
-    Vorpal.define do
+    engine = Vorpal.define do
       map Bug do
         attributes :name
         belongs_to :lives_on, owned: false, fk: :lives_on_id, fk_type: :lives_on_type, child_classes: [Trunk, Branch]
@@ -772,10 +803,11 @@ private
         attributes :length
       end
     end
+    engine.repository_for(Bug)
   end
 
   def configure_unowned
-    Vorpal.define do
+    engine = Vorpal.define do
       map Tree do
         attributes :name
         has_many :branches, owned: false
@@ -790,10 +822,11 @@ private
         attributes :length
       end
     end
+    engine.repository_for(Tree)
   end
 
   def configure_recursive
-    Vorpal.define do
+    engine = Vorpal.define do
       map Branch do
         attributes :length
         has_many :branches
@@ -804,10 +837,11 @@ private
         has_many :branches
       end
     end
+    engine.repository_for(Tree)
   end
 
   def configure_with_cycle
-    Vorpal.define do
+    engine = Vorpal.define do
       map Branch do
         attributes :length
         belongs_to :tree
@@ -818,10 +852,11 @@ private
         has_many :branches
       end
     end
+    engine.repository_for(Tree)
   end
   
   def configure(options={})
-    Vorpal.define(options) do
+    engine = Vorpal.define(options) do
       map Tree do
         attributes :name
         belongs_to :trunk
@@ -839,10 +874,11 @@ private
 
       map Fissure, to: Fissure
     end
+    engine.repository_for(Tree)
   end
 
   def configure_has_one
-    Vorpal.define do
+    engine = Vorpal.define do
       map Trunk do
         attributes :length
         has_one :tree
@@ -852,10 +888,11 @@ private
         attributes :name
       end
     end
+    engine.repository_for(Trunk)
   end
 
   def configure_unowned_has_one
-    Vorpal.define do
+    engine = Vorpal.define do
       map Trunk do
         attributes :length
         has_one :tree, owned: false
@@ -865,5 +902,6 @@ private
         attributes :name
       end
     end
+    engine.repository_for(Trunk)
   end
 end

data/spec/vorpal/performance/performance_spec.rb

@@ -92,10 +92,10 @@ describe 'performance' do
   it 'benchmarks all operations' do
     trees = build_trees(1000)
     Benchmark.bm(7) do |x|
-      x.report('create') { test_repository.persist_all(trees) }
-      x.report('update') { test_repository.persist_all(trees) }
-      x.report('load') { ids = trees.map(&:id); test_repository.load_all(ids, Tree) }
-      x.report('destroy') { test_repository.destroy_all(trees) }
+      x.report('create') { test_repository.persist(trees) }
+      x.report('update') { test_repository.persist(trees) }
+      x.report('load') { test_repository.load_many(TreeDB.where(id: trees.map(&:id)).all) }
+      x.report('destroy') { test_repository.destroy(trees) }
     end
   end
 
@@ -104,39 +104,39 @@ describe 'performance' do
 
     puts 'starting persistence benchmark'
     puts Benchmark.measure {
-      test_repository.persist_all(trees)
+      test_repository.persist(trees)
     }
   end
 
   it 'updates aggregates quickly' do
     trees = build_trees(1000)
 
-    test_repository.persist_all(trees)
+    test_repository.persist(trees)
 
     puts 'starting update benchmark'
     puts Benchmark.measure {
-      test_repository.persist_all(trees)
+      test_repository.persist(trees)
     }
   end
 
   it 'loads aggregates quickly' do
     trees = build_trees(1000)
-    test_repository.persist_all(trees)
+    test_repository.persist(trees)
     ids = trees.map(&:id)
 
     puts 'starting loading benchmark'
     puts Benchmark.measure {
-      test_repository.load_all(ids, Tree)
+      test_repository.load_many(TreeDB.where(id: ids).all)
     }
   end
 
   it 'destroys aggregates quickly' do
     trees = build_trees(1000)
-    test_repository.persist_all(trees)
+    test_repository.persist(trees)
 
     puts 'starting destruction benchmark'
     puts Benchmark.measure {
-      test_repository.destroy_all(trees)
+      test_repository.destroy(trees)
     }
   end
 
@@ -163,7 +163,7 @@ describe 'performance' do
   end
 
   def build_repository
-    Vorpal.define do
+    engine = Vorpal.define do
       map Tree do
         attributes :name
         belongs_to :trunk
@@ -188,5 +188,6 @@ describe 'performance' do
         belongs_to :lives_on, fk: :lives_on_id, fk_type: :lives_on_type, child_classes: [Trunk, Branch]
       end
     end
+    engine.repository_for(Tree)
   end
 end

data/spec/vorpal/unit/config_builder_spec.rb

@@ -1,6 +1,7 @@
 require 'unit_spec_helper'
 
 require 'vorpal/config_builder'
+require 'vorpal/db_driver'
 
 describe Vorpal::ConfigBuilder do
   class Tester; end

data/vorpal.gemspec

@@ -23,7 +23,7 @@ Gem::Specification.new do |spec|
   spec.add_runtime_dependency "activesupport"
 
   spec.add_development_dependency "rake", "~> 10.0"
-  spec.add_development_dependency "rspec", "~> 3.0.0"
+  spec.add_development_dependency "rspec", "~> 3.0"
   spec.add_development_dependency "activerecord", "~> 3.2.0"
   spec.add_development_dependency "pg", "~> 0.17.0"
   spec.add_development_dependency "virtus", "~> 1.0"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vorpal
 version: !ruby/object:Gem::Version
-  version: 0.0.7.rc1
+  version: 0.0.7.rc2
 platform: ruby
 authors:
 - Sean Kirby
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-21 00:00:00.000000000 Z
+date: 2015-10-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: simple_serializer
@@ -72,14 +72,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.0.0
+        version: '3.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.0.0
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
@@ -146,6 +146,7 @@ extra_rdoc_files: []
 files:
 - ".gitignore"
 - ".yardopts"
+- CHANGELOG.md
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -159,6 +160,7 @@ files:
 - lib/vorpal/configuration.rb
 - lib/vorpal/db_driver.rb
 - lib/vorpal/db_loader.rb
+- lib/vorpal/engine.rb
 - lib/vorpal/identity_map.rb
 - lib/vorpal/loaded_objects.rb
 - lib/vorpal/util/array_hash.rb