vorpal 0.0.5.1 → 0.0.6.rc1

data/lib/vorpal/identity_map.rb

@@ -23,6 +23,10 @@ class IdentityMap
     key_objects.map { |k| @entities[key(k)] }
   end
 
+  def map_raw(key_ids, key_class)
+    key_ids.map { |key_id| @entities[[key_id, key_class.name]] }
+  end
+
   private
 
   def key(key_object)

data/lib/vorpal/loaded_objects.rb

@@ -0,0 +1,53 @@
+require 'vorpal/util/array_hash'
+require 'forwardable'
+
+module Vorpal
+
+# @private
+class LoadedObjects
+  include ArrayHash
+  extend Forwardable
+  include Enumerable
+
+  attr_reader :objects
+  def_delegators :objects, :each
+
+  def initialize
+    @objects = Hash.new([])
+  end
+
+  def add(config, objects)
+    add_to_hash(@objects, config, objects)
+  end
+
+  def find_by_id(object, config)
+    @objects[config].detect { |obj| obj.id == object.id }
+  end
+
+  def loaded_ids(config)
+    @objects[config].map(&:id)
+  end
+
+  def loaded_fk_values(config, fk_info)
+    if fk_info.polymorphic?
+      @objects[config].
+        find_all { |db_object| fk_info.matches_polymorphic_type?(db_object) }.
+        map(&(fk_info.fk_column.to_sym))
+    else
+      @objects[config].map(&(fk_info.fk_column.to_sym))
+    end
+  end
+
+  def all_objects
+    @objects.values.flatten
+  end
+
+  def id_lookup_done?(config, id)
+    loaded_ids(config).include?(id)
+  end
+
+  def fk_lookup_done?(config, fk_info, fk_value)
+    loaded_fk_values(config, fk_info).include?(fk_value)
+  end
+end
+end

data/lib/vorpal/util/array_hash.rb

@@ -0,0 +1,13 @@
+module Vorpal
+
+# @private
+module ArrayHash
+  def add_to_hash(h, key, values)
+    if h[key].nil? || h[key].empty?
+      h[key] = []
+    end
+    h[key].concat(Array(values))
+  end
+end
+
+end

data/lib/vorpal/version.rb

@@ -1,3 +1,3 @@
 module Vorpal
-  VERSION = "0.0.5.1"
+  VERSION = "0.0.6.rc1"
 end

data/spec/integration_spec_helper.rb

@@ -1,5 +1,6 @@
 require 'active_record'
 require 'pg' # or 'mysql2' or 'sqlite3'
+# require 'logger'
 
 # Change the following to reflect your database settings
 ActiveRecord::Base.establish_connection(
@@ -12,10 +13,11 @@ ActiveRecord::Base.establish_connection(
 )
 
 RSpec.configure do |config|
-  # implements use_transactional_fixtures = true
+  # implements `use_transactional_fixtures = true`
   # from lib/active_record/fixtures.rb
   # works with Rails 3.2. Probably not with Rails 4
   config.before(:each) do
+    # ActiveRecord::Base.logger = Logger.new(STDOUT)
     connection = ActiveRecord::Base.connection
     connection.increment_open_transactions
     connection.transaction_joinable = false

data/spec/vorpal/aggregate_repository_spec.rb

@@ -1,8 +1,7 @@
 require 'integration_spec_helper'
-
 require 'vorpal'
-
 require 'virtus'
+require 'activerecord-import/base'
 
 describe 'Aggregate Repository' do
 
@@ -109,10 +108,9 @@ describe 'Aggregate Repository' do
 
       tree_db = TreeDB.create!
 
+      expect(Vorpal::DbDriver).to receive(:update).and_raise('not so good')
+
       fissure = Fissure.new
-      def fissure.save!
-        raise 'something bad happened!'
-      end
       tree = Tree.new(id: tree_db.id, fissures: [fissure])
 
       expect {
@@ -486,9 +484,15 @@ describe 'Aggregate Repository' do
     it 'restores with belongs_tos' do
       test_repository = configure_polymorphic_belongs_to
 
-      trunk_db = TrunkDB.create!(length: 99)
+      # makes sure that we are using the fk_type to discriminate against
+      # two entities with the same primary key value
+      trunk_db = TrunkDB.new(length: 99)
+      trunk_db.id = 99
+      trunk_db.save!
       trunk_bug_db = BugDB.create!(lives_on_id: trunk_db.id, lives_on_type: Trunk.name)
-      branch_db = BranchDB.create!(length: 5)
+      branch_db = BranchDB.new(length: 5)
+      branch_db.id = 99
+      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)
@@ -576,6 +580,55 @@ describe 'Aggregate Repository' do
     end
   end
 
+  describe 'lots of data' do
+    it 'avoids N+1s on load' do
+      test_repository = Vorpal.define do
+        map Tree do
+          fields :name
+          belongs_to :trunk
+          # has_many :fissures
+          has_many :branches
+        end
+
+        map Trunk do
+          fields :length
+          has_one :tree
+          has_many :bugs, fk: :lives_on_id, fk_type: :lives_on_type
+        end
+
+        map Branch do
+          fields :length
+          belongs_to :tree
+          has_many :bugs, fk: :lives_on_id, fk_type: :lives_on_type
+          has_many :branches
+        end
+
+        map Bug do
+          fields :name
+          belongs_to :lives_on, fk: :lives_on_id, fk_type: :lives_on_type, child_classes: [Trunk, Branch]
+        end
+        # map Fissure, to: Fissure
+      end
+
+      ids = (1..3).map do
+        trunk_db = TrunkDB.create!
+        tree_db = TreeDB.create!(trunk_id: trunk_db.id)
+        branch_db1 = BranchDB.create!(tree_id: tree_db.id)
+        branch_db2 = BranchDB.create!(tree_id: tree_db.id)
+        branch_db3 = BranchDB.create!(branch_id: branch_db2.id)
+        BugDB.create!(name: 'trunk bug', lives_on_id: trunk_db.id, lives_on_type: Trunk.name)
+        BugDB.create!(name: 'branch bug!', lives_on_id: branch_db1.id, lives_on_type: Branch.name)
+        tree_db.id
+      end
+
+      puts '*************************'
+      puts '*************************'
+      puts '*************************'
+      puts '*************************'
+      test_repository.load_all(ids, Tree)
+    end
+  end
+
   # when you change a table's columns, set force to true to re-generate the table in the DB
   def define_table(table_name, columns, force)
     if !ActiveRecord::Base.connection.table_exists?(table_name) || force

data/vorpal.gemspec

@@ -18,11 +18,13 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
-  spec.add_runtime_dependency "simple_serializer", "~> 1.0"
+  spec.add_runtime_dependency "simple_serializer", "~> 0.0.1"
+  spec.add_runtime_dependency "equalizer"
 
   spec.add_development_dependency "rake", "~> 10.0"
   spec.add_development_dependency "rspec", "~> 3.0.0"
   spec.add_development_dependency "activerecord", "~> 3.2.0"
   spec.add_development_dependency "pg", "~> 0.17.0"
   spec.add_development_dependency "virtus", "~> 1.0"
+  spec.add_development_dependency "activerecord-import", "~> 0.3.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vorpal
 version: !ruby/object:Gem::Version
-  version: 0.0.5.1
+  version: 0.0.6.rc1
 platform: ruby
 authors:
 - Sean Kirby
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-19 00:00:00.000000000 Z
+date: 2015-03-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: simple_serializer
@@ -16,14 +16,28 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: 0.0.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: 0.0.1
+- !ruby/object:Gem::Dependency
+  name: equalizer
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -94,6 +108,20 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: '1.0'
+- !ruby/object:Gem::Dependency
+  name: activerecord-import
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.3.1
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.3.1
 description: An ORM framelet that fits on top of ActiveRecord to give you 'Data Mapper'
   semantics.
 email:
@@ -110,12 +138,17 @@ files:
 - Rakefile
 - lib/vorpal.rb
 - lib/vorpal/aggregate_repository.rb
+- lib/vorpal/aggregate_traversal.rb
+- lib/vorpal/aggregate_utils.rb
 - lib/vorpal/config_builder.rb
 - lib/vorpal/configs.rb
 - lib/vorpal/configuration.rb
-- lib/vorpal/hash_initialization.rb
+- lib/vorpal/db_driver.rb
+- lib/vorpal/db_loader.rb
 - lib/vorpal/identity_map.rb
-- lib/vorpal/traversal.rb
+- lib/vorpal/loaded_objects.rb
+- lib/vorpal/util/array_hash.rb
+- lib/vorpal/util/hash_initialization.rb
 - lib/vorpal/version.rb
 - spec/integration_spec_helper.rb
 - spec/unit_spec_helper.rb
@@ -138,9 +171,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ! '>'
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.4.5

data/lib/vorpal/traversal.rb

@@ -1,98 +0,0 @@
-
-# @private
-class Traversal
-  def initialize(configs)
-    @configs = configs
-  end
-
-  def accept_for_domain(object, visitor, already_visited=[])
-    return if object.nil?
-
-    config = @configs.config_for(object.class)
-    return if config.nil?
-
-    return if already_visited.include?(object)
-    already_visited << object
-
-    visitor.visit_object(object, config)
-
-    config.belongs_tos.each do |belongs_to_config|
-      child = belongs_to_config.get_child(object)
-      accept_for_domain(child, visitor, already_visited) if visitor.continue_traversal?(belongs_to_config)
-
-      visitor.visit_belongs_to(object, child, belongs_to_config)
-    end
-
-    config.has_ones.each do |has_one_config|
-      child = has_one_config.get_child(object)
-      accept_for_domain(child, visitor, already_visited) if visitor.continue_traversal?(has_one_config)
-
-      visitor.visit_has_one(object, child, has_one_config)
-    end
-
-    config.has_manys.each do |has_many_config|
-      children = has_many_config.get_children(object)
-      children.each do |child|
-        accept_for_domain(child, visitor, already_visited) if visitor.continue_traversal?(has_many_config)
-      end
-      visitor.visit_has_many(object, children, has_many_config)
-    end
-  end
-
-  def accept_for_db(db_object, visitor, already_visited=[])
-    return if db_object.nil?
-
-    config = @configs.config_for_db(db_object.class)
-    return if config.nil?
-
-    return if already_visited.include?(db_object)
-    already_visited << db_object
-
-    visitor.visit_object(db_object, config)
-
-    config.belongs_tos.each do |belongs_to_config|
-      child = belongs_to_config.load_child(db_object)
-      accept_for_db(child, visitor, already_visited) if visitor.continue_traversal?(belongs_to_config)
-
-      visitor.visit_belongs_to(db_object, child, belongs_to_config)
-    end
-
-    config.has_ones.each do |has_one_config|
-      child = has_one_config.load_child(db_object)
-      accept_for_db(child, visitor, already_visited) if visitor.continue_traversal?(has_one_config)
-
-      visitor.visit_belongs_to(db_object, child, has_one_config)
-    end
-
-    config.has_manys.each do |has_many_config|
-      children = has_many_config.load_children(db_object)
-      children.each do |child|
-        accept_for_db(child, visitor, already_visited) if visitor.continue_traversal?(has_many_config)
-      end
-      visitor.visit_has_many(db_object, children, has_many_config)
-    end
-  end
-end
-
-# @private
-module AggregateVisitorTemplate
-  def visit_object(object, config)
-    # override me!
-  end
-
-  def visit_belongs_to(parent, child, belongs_to_config)
-    # override me!
-  end
-
-  def visit_has_one(parent, child, has_one_config)
-    # override me!
-  end
-
-  def visit_has_many(parent, children, has_many_config)
-    # override me!
-  end
-
-  def continue_traversal?(association_config)
-    true
-  end
-end