vorpal 0.1.0.rc3 → 1.1.0

data/lib/vorpal/dsl/configuration.rb

@@ -1,5 +1,6 @@
 require 'vorpal/engine'
 require 'vorpal/dsl/config_builder'
+require 'vorpal/driver/postgresql'
 
 module Vorpal
   module Dsl
@@ -9,12 +10,12 @@ module Vorpal
     #
     # @param options [Hash] Global configuration options for the engine instance.
     # @option options [Object] :db_driver (Object that will be used to interact with the DB.)
-    #  Must be duck-type compatible with {DbDriver}.
+    #  Must be duck-type compatible with {Postgresql}.
     #
     # @return [Engine] Instance of the mapping engine.
     def define(options={}, &block)
       master_config = build_config(&block)
-      db_driver = options.fetch(:db_driver, DbDriver.new)
+      db_driver = options.fetch(:db_driver, Driver::Postgresql.new)
       Engine.new(db_driver, master_config)
     end
 
@@ -40,7 +41,7 @@ module Vorpal
 
     # @private
     def build_class_config(domain_class, options={}, &block)
-      builder = ConfigBuilder.new(domain_class, options, DbDriver.new)
+      builder = ConfigBuilder.new(domain_class, options, Driver::Postgresql.new)
       builder.instance_exec(&block) if block_given?
       builder.build
     end
@@ -53,4 +54,4 @@ module Vorpal
     end
   end
   end
-end
+end

data/lib/vorpal/dsl/defaults_generator.rb

@@ -1,6 +1,6 @@
 require 'simple_serializer/serializer'
 require 'simple_serializer/deserializer'
-require 'active_support/inflector/methods'
+require 'active_support'
 require 'active_support/core_ext/module/introspection'
 
 module Vorpal
@@ -36,9 +36,19 @@ module Vorpal
     end
 
     def child_class(association_name)
-      # Module#parent comes from 'active_support/core_ext/module/introspection'
-      parent_module = @domain_class.parent
-      parent_module.const_get(ActiveSupport::Inflector.classify(association_name.to_s))
+      module_parent.const_get(ActiveSupport::Inflector.classify(association_name.to_s))
+    end
+
+    private
+
+    def module_parent
+      if (ActiveSupport::VERSION::MAJOR == 5)
+        # Module#parent comes from 'active_support/core_ext/module/introspection'
+        @domain_class.parent
+      else
+        # Module#module_parent comes from 'active_support/core_ext/module/introspection'
+        @domain_class.module_parent
+      end
     end
   end
   end

data/lib/vorpal/engine.rb

@@ -1,7 +1,6 @@
 require 'vorpal/identity_map'
 require 'vorpal/aggregate_utils'
 require 'vorpal/db_loader'
-require 'vorpal/db_driver'
 require 'vorpal/aggregate_mapper'
 require 'vorpal/exceptions'
 
@@ -80,7 +79,7 @@ module Vorpal
 
       loaded_db_objects = load_owned_from_db(ids, domain_class)
       loaded_db_objects.each do |config, db_objects|
-        @db_driver.destroy(config, db_objects.map(&:id))
+        @db_driver.destroy(config.db_class, db_objects.map(&:id))
       end
       ids
     end
@@ -91,7 +90,7 @@ module Vorpal
     end
 
     def query(domain_class)
-      @db_driver.query(@configs.config_for(domain_class), mapper_for(domain_class))
+      @db_driver.query(@configs.config_for(domain_class).db_class, mapper_for(domain_class))
     end
 
     private
@@ -166,7 +165,7 @@ module Vorpal
     def set_primary_keys(owned_objects, mapping)
       owned_objects.each do |config, objects|
         in_need_of_primary_keys = objects.find_all { |obj| obj.id.nil? }
-        primary_keys = @db_driver.get_primary_keys(config, in_need_of_primary_keys.length)
+        primary_keys = @db_driver.get_primary_keys(config.db_class, in_need_of_primary_keys.length)
         in_need_of_primary_keys.zip(primary_keys).each do |object, primary_key|
           mapping[object].id = primary_key
           object.id = primary_key
@@ -207,11 +206,11 @@ module Vorpal
       owned_objects.each do |config, objects|
         objects_to_insert = grouped_new_objects[config] || []
         db_objects_to_insert = objects_to_insert.map { |obj| mapping[obj] }
-        @db_driver.insert(config, db_objects_to_insert)
+        @db_driver.insert(config.db_class, db_objects_to_insert)
 
         objects_to_update = objects - objects_to_insert
         db_objects_to_update = objects_to_update.map { |obj| mapping[obj] }
-        @db_driver.update(config, db_objects_to_update)
+        @db_driver.update(config.db_class, db_objects_to_update)
       end
     end
 
@@ -221,7 +220,7 @@ module Vorpal
       all_orphans = db_objects_in_db - db_objects_in_aggregate
       grouped_orphans = all_orphans.group_by { |o| @configs.config_for_db_object(o) }
       grouped_orphans.each do |config, orphans|
-        @db_driver.destroy(config, orphans)
+        @db_driver.destroy(config.db_class, orphans)
       end
     end
 
@@ -234,4 +233,4 @@ module Vorpal
       objects.each { |object| object.id = nil }
     end
   end
-end
+end

data/lib/vorpal/identity_map.rb

@@ -1,22 +1,23 @@
 module Vorpal
+  # Maps DB rows to Entities
   class IdentityMap
     def initialize
       @entities = {}
     end
 
-    def get(key_object)
-      @entities[key(key_object)]
+    def get(db_row)
+      @entities[key(db_row)]
     end
 
-    def set(key_object, object)
-      @entities[key(key_object)] = object
+    def set(db_row, entity)
+      @entities[key(db_row)] = entity
     end
 
-    def get_and_set(key_object)
-      object = get(key_object)
-      object = yield if object.nil?
-      set(key_object, object)
-      object
+    def get_and_set(db_row)
+      entity = get(db_row)
+      entity = yield if entity.nil?
+      set(db_row, entity)
+      entity
     end
 
     def map(key_objects)
@@ -25,11 +26,11 @@ module Vorpal
 
     private
 
-    def key(key_object)
-      return nil unless key_object
-      raise "Cannot put entity '#{key_object.inspect}' into IdentityMap without an id." if key_object.id.nil?
-      raise "Cannot put entity '#{key_object.inspect}' into IdentityMap without a Class with a name." if key_object.class.name.nil?
-      [key_object.id, key_object.class.name]
+    def key(db_row)
+      return nil unless db_row
+      raise "Cannot map a DB row without an id '#{db_row.inspect}' to an entity." if db_row.id.nil?
+      raise "Cannot map a DB row without a Class with a name '#{db_row.inspect}' to an entity." if db_row.class.name.nil?
+      [db_row.id, db_row.class.name]
     end
   end
 end

data/lib/vorpal/version.rb

@@ -1,3 +1,3 @@
 module Vorpal
-  VERSION = "0.1.0.rc3"
+  VERSION = "1.1.0"
 end

data/vorpal.gemspec

@@ -13,19 +13,23 @@ Gem::Specification.new do |spec|
   spec.homepage      = "https://github.com/nulogy/vorpal"
   spec.license       = "MIT"
 
-  spec.files         = `git ls-files -z`.split("\x0")
-  spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
-  spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
+  spec.files         = Dir["CHANGELOG.md", "LICENSE.txt", "README.md", "vorpal.gemspec", "lib/**/*"]
+  spec.bindir        = "exe"
+  spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
   spec.add_runtime_dependency "simple_serializer", "~> 1.0"
   spec.add_runtime_dependency "equalizer"
   spec.add_runtime_dependency "activesupport"
 
-  spec.add_development_dependency "rake", "~> 10.0"
+  spec.add_development_dependency "rake", "~> 13"
   spec.add_development_dependency "rspec", "~> 3.0"
-  spec.add_development_dependency "activerecord", "~> 4.0"
-  spec.add_development_dependency "pg", "~> 0.17.0"
   spec.add_development_dependency "virtus", "~> 1.0"
-  spec.add_development_dependency "activerecord-import", "~> 0.10.0"
+  spec.add_development_dependency "appraisal", "~> 2.2"
+
+  spec.required_ruby_version = ">= 2.5.7"
+  spec.add_development_dependency "activerecord"
+  spec.add_development_dependency "pg"
+  spec.add_development_dependency "activerecord-import"
+  spec.add_development_dependency "codecov"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vorpal
 version: !ruby/object:Gem::Version
-  version: 0.1.0.rc3
+  version: 1.1.0
 platform: ruby
 authors:
 - Sean Kirby
-autorequire: 
-bindir: bin
+autorequire:
+bindir: exe
 cert_chain: []
-date: 2016-11-11 00:00:00.000000000 Z
+date: 2020-10-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: simple_serializer
@@ -58,14 +58,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '13'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '13'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -81,61 +81,89 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '3.0'
 - !ruby/object:Gem::Dependency
-  name: activerecord
+  name: virtus
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '1.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '1.0'
 - !ruby/object:Gem::Dependency
-  name: pg
+  name: appraisal
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.17.0
+        version: '2.2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.17.0
+        version: '2.2'
 - !ruby/object:Gem::Dependency
-  name: virtus
+  name: activerecord
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: pg
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: activerecord-import
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.10.0
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.10.0
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: codecov
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: An ORM framelet that fits on top of ActiveRecord to give you 'Data Mapper'
   semantics.
 email:
@@ -144,23 +172,16 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- ".editorconfig"
-- ".gitignore"
-- ".rspec"
-- ".ruby-version"
-- ".yardopts"
 - CHANGELOG.md
-- Gemfile
 - LICENSE.txt
 - README.md
-- Rakefile
 - lib/vorpal.rb
 - lib/vorpal/aggregate_mapper.rb
 - lib/vorpal/aggregate_traversal.rb
 - lib/vorpal/aggregate_utils.rb
 - lib/vorpal/configs.rb
-- lib/vorpal/db_driver.rb
 - lib/vorpal/db_loader.rb
+- lib/vorpal/driver/postgresql.rb
 - lib/vorpal/dsl/config_builder.rb
 - lib/vorpal/dsl/configuration.rb
 - lib/vorpal/dsl/defaults_generator.rb
@@ -172,26 +193,12 @@ files:
 - lib/vorpal/util/hash_initialization.rb
 - lib/vorpal/util/string_utils.rb
 - lib/vorpal/version.rb
-- spec/helpers/db_helpers.rb
-- spec/helpers/profile_helpers.rb
-- spec/integration_spec_helper.rb
-- spec/unit_spec_helper.rb
-- spec/vorpal/acceptance/aggregate_mapper_spec.rb
-- spec/vorpal/integration/db_driver_spec.rb
-- spec/vorpal/performance/performance_spec.rb
-- spec/vorpal/unit/configs_spec.rb
-- spec/vorpal/unit/db_loader_spec.rb
-- spec/vorpal/unit/dsl/config_builder_spec.rb
-- spec/vorpal/unit/dsl/defaults_generator_spec.rb
-- spec/vorpal/unit/identity_map_spec.rb
-- spec/vorpal/unit/loaded_objects_spec.rb
-- spec/vorpal/unit/util/string_utils_spec.rb
 - vorpal.gemspec
 homepage: https://github.com/nulogy/vorpal
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -199,30 +206,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 2.5.7
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.4.8
-signing_key: 
+rubygems_version: 3.1.2
+signing_key:
 specification_version: 4
 summary: Separate your domain model from your persistence mechanism.
-test_files:
-- spec/helpers/db_helpers.rb
-- spec/helpers/profile_helpers.rb
-- spec/integration_spec_helper.rb
-- spec/unit_spec_helper.rb
-- spec/vorpal/acceptance/aggregate_mapper_spec.rb
-- spec/vorpal/integration/db_driver_spec.rb
-- spec/vorpal/performance/performance_spec.rb
-- spec/vorpal/unit/configs_spec.rb
-- spec/vorpal/unit/db_loader_spec.rb
-- spec/vorpal/unit/dsl/config_builder_spec.rb
-- spec/vorpal/unit/dsl/defaults_generator_spec.rb
-- spec/vorpal/unit/identity_map_spec.rb
-- spec/vorpal/unit/loaded_objects_spec.rb
-- spec/vorpal/unit/util/string_utils_spec.rb
+test_files: []

data/.editorconfig

@@ -1,13 +0,0 @@
-root = true
-
-[*]
-
-indent_style = space
-indent_size = 2
-end_of_line = lf
-charset = utf-8
-trim_trailing_whitespace = true
-insert_final_newline = true
-
-[*.md]
-trim_trailing_whitespace = false