terrestrial 0.1.1 → 0.3.0

data/spec/{sequel_mapper → terrestrial}/dirty_map_spec.rb

@@ -11,7 +11,7 @@ RSpec.describe Terrestrial::DirtyMap do
 
   let(:storage) { {} }
 
-  let(:loaded_record) {
+  let(:record) {
     create_record( namespace, identity_fields, attributes, depth)
   }
 
@@ -27,15 +27,47 @@ RSpec.describe Terrestrial::DirtyMap do
     }
   }
 
+  describe "#load_if_new" do
+    context "when a record is new" do
+      it "adds it to the map" do
+        dirty_map.load_if_new(record)
+
+        expect(storage).to include([:table_name, { id: "record/id" }])
+      end
+
+      it "returns the record" do
+        expect(dirty_map.load_if_new(record)).to eq(record)
+      end
+    end
+
+    context "when the record has already been loaded" do
+      let(:storage) {
+        {
+          [:table_name, { id: "record/id" }] => record
+        }
+      }
+
+      it "has no effect on the storage" do
+        expect {
+          dirty_map.load_if_new(record)
+        }.not_to change { storage }
+      end
+
+      it "returns the record" do
+        expect(dirty_map.load_if_new(record)).to eq(record)
+      end
+    end
+  end
+
   describe "#load" do
     it "adds the record to its storage" do
-      dirty_map.load(loaded_record)
+      dirty_map.load(record)
 
-      expect(storage.values).to include(loaded_record)
+      expect(storage.values).to include(record)
     end
 
     it "returns the loaded record" do
-      expect(dirty_map.load(loaded_record)).to eq(loaded_record)
+      expect(dirty_map.load(record)).to eq(record)
     end
   end
 
@@ -61,7 +93,7 @@ RSpec.describe Terrestrial::DirtyMap do
 
     context "when a record with same identity has been loaded (existing record)" do
       before do
-        dirty_map.load(loaded_record)
+        dirty_map.load(record)
       end
 
       context "when the record is unchanged" do
@@ -181,7 +213,7 @@ RSpec.describe Terrestrial::DirtyMap do
 
       context "when a record with same identity has been loaded (existing record)" do
         before do
-          dirty_map.load(loaded_record)
+          dirty_map.load(record)
         end
 
         context "with a equivalent record" do

data/spec/{sequel_mapper → terrestrial}/lazy_collection_spec.rb

@@ -7,7 +7,7 @@ RSpec.describe Terrestrial::LazyCollection do
     Terrestrial::LazyCollection.new(
       database_enum,
       loader,
-      mapper,
+      queries,
     )
   }
 
@@ -24,8 +24,7 @@ RSpec.describe Terrestrial::LazyCollection do
   let(:collection_size) { row_object_map.size }
 
   let(:database_enum) { [row1, row2].each.lazy }
-
-  let(:mapper) { double(:mapper) }
+  let(:queries) { {} }
 
   let(:loader_count) { @loader_count }
   let(:loader) {

data/spec/{sequel_mapper → terrestrial}/public_conveniencies_spec.rb

@@ -1,6 +1,7 @@
 require "spec_helper"
 
 require "terrestrial/public_conveniencies"
+require "ostruct"
 
 RSpec.describe Terrestrial::PublicConveniencies do
   subject(:conveniences) {
@@ -13,7 +14,7 @@ RSpec.describe Terrestrial::PublicConveniencies do
     end
   end
 
-  describe "#mappers" do
+  describe "#object_store" do
     let(:datastore) {
       MockDatastore.new(
         {
@@ -22,7 +23,7 @@ RSpec.describe Terrestrial::PublicConveniencies do
       )
     }
 
-    let(:mapper_config) {
+    let(:mappings) {
       {
         things: double(
           :thing_config,
@@ -31,7 +32,7 @@ RSpec.describe Terrestrial::PublicConveniencies do
           fields: [:id],
           associations: [],
           primary_key: [],
-          factory: ->(x){x}
+          load: thing_object,
         )
       }
     }
@@ -44,14 +45,18 @@ RSpec.describe Terrestrial::PublicConveniencies do
       }
     }
 
-    it "returns a mapper for the specified mapping" do
-      mappers = conveniences.mappers(
-        mappings: mapper_config,
+    let(:thing_object) {
+      OpenStruct.new(thing_record)
+    }
+
+    it "returns an object store for given mappings" do
+      object_store = conveniences.object_store(
+        mappings: mappings,
         datastore: datastore,
       )
 
       expect(
-        mappers[:things].all.first.fetch(:id)
+        object_store[:things].all.first.id
       ).to eq("THE THING")
     end
   end

data/{sequel_mapper.gemspec → terrestrial.gemspec}

@@ -8,8 +8,8 @@ Gem::Specification.new do |spec|
   spec.version       = Terrestrial::VERSION
   spec.authors       = ["Stephen Best"]
   spec.email         = ["bestie@gmail.com"]
-  spec.summary       = %q{A data mapping ORM to make your objects feel less alien}
-  spec.description   = %q{Terrestial persists your POROs while keeping them free of database concerns.}
+  spec.summary       = %q{A data mapper ORM for Ruby}
+  spec.description   = %q{A data mapper ORM for Ruby. Persists POROs, enables DDD and fast tests. Makes your objects less alien.}
   spec.homepage      = "https://github.com/bestie/terrestrial"
   spec.license       = "MIT"
 
@@ -22,7 +22,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "rake", "~> 10.0"
   spec.add_development_dependency "pry", "~> 0.10.1"
   spec.add_development_dependency "rspec", "~> 3.1"
-  spec.add_development_dependency "cucumber"
+  spec.add_development_dependency "cucumber", "~> 2.4"
   spec.add_development_dependency "pg", "~> 0.17.1"
 
   spec.add_dependency "sequel", "~> 4.16"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: terrestrial
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.3.0
 platform: ruby
 authors:
 - Stephen Best
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-04 00:00:00.000000000 Z
+date: 2017-01-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -70,16 +70,16 @@ dependencies:
   name: cucumber
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.4'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.4'
 - !ruby/object:Gem::Dependency
   name: pg
   requirement: !ruby/object:Gem::Requirement
@@ -136,10 +136,12 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
-description: Terrestial persists your POROs while keeping them free of database concerns.
+description: A data mapper ORM for Ruby. Persists POROs, enables DDD and fast tests.
+  Makes your objects less alien.
 email:
 - bestie@gmail.com
-executables: []
+executables:
+- test
 extensions: []
 extra_rdoc_files: []
 files:
@@ -154,11 +156,14 @@ files:
 - README.md
 - Rakefile
 - TODO.md
+- bin/test
+- docs/domain_object_contract.md
 - features/env.rb
 - features/example.feature
 - features/step_definitions/example_steps.rb
 - lib/terrestrial.rb
 - lib/terrestrial/abstract_record.rb
+- lib/terrestrial/adapters/memory_adapter.rb
 - lib/terrestrial/association_loaders.rb
 - lib/terrestrial/collection_mutability_proxy.rb
 - lib/terrestrial/configurations/conventional_association_configuration.rb
@@ -166,55 +171,57 @@ files:
 - lib/terrestrial/dataset.rb
 - lib/terrestrial/deleted_record.rb
 - lib/terrestrial/dirty_map.rb
+- lib/terrestrial/error.rb
 - lib/terrestrial/graph_loader.rb
 - lib/terrestrial/graph_serializer.rb
 - lib/terrestrial/identity_map.rb
+- lib/terrestrial/inspection_string.rb
 - lib/terrestrial/lazy_collection.rb
 - lib/terrestrial/lazy_object_proxy.rb
 - lib/terrestrial/many_to_many_association.rb
 - lib/terrestrial/many_to_one_association.rb
-- lib/terrestrial/mapper_facade.rb
 - lib/terrestrial/one_to_many_association.rb
 - lib/terrestrial/public_conveniencies.rb
 - lib/terrestrial/query_order.rb
 - lib/terrestrial/relation_mapping.rb
+- lib/terrestrial/relational_store.rb
 - lib/terrestrial/serializer.rb
-- lib/terrestrial/short_inspection_string.rb
 - lib/terrestrial/struct_factory.rb
 - lib/terrestrial/subset_queries_proxy.rb
 - lib/terrestrial/upserted_record.rb
 - lib/terrestrial/version.rb
-- sequel_mapper.gemspec
 - spec/config_override_spec.rb
 - spec/custom_serializers_spec.rb
 - spec/deletion_spec.rb
+- spec/error_handling/factory_error_handling_spec.rb
+- spec/error_handling/serialization_error_spec.rb
+- spec/error_handling/upsert_error_spec.rb
 - spec/graph_persistence_spec.rb
 - spec/graph_traversal_spec.rb
 - spec/new_graph_persistence_spec.rb
 - spec/object_identity_spec.rb
 - spec/ordered_association_spec.rb
-- spec/persistence_efficiency_spec.rb
 - spec/predefined_queries_spec.rb
-- spec/proxying_spec.rb
 - spec/querying_spec.rb
 - spec/readme_examples_spec.rb
-- spec/sequel_mapper/abstract_record_spec.rb
-- spec/sequel_mapper/collection_mutability_proxy_spec.rb
-- spec/sequel_mapper/deleted_record_spec.rb
-- spec/sequel_mapper/dirty_map_spec.rb
-- spec/sequel_mapper/lazy_collection_spec.rb
-- spec/sequel_mapper/lazy_object_proxy_spec.rb
-- spec/sequel_mapper/public_conveniencies_spec.rb
-- spec/sequel_mapper/upserted_record_spec.rb
+- spec/sequel_query_efficiency_spec.rb
 - spec/spec_helper.rb
 - spec/support/blog_schema.rb
 - spec/support/have_persisted_matcher.rb
-- spec/support/mapper_setup.rb
-- spec/support/mock_sequel.rb
+- spec/support/memory_adapter_test_support.rb
 - spec/support/object_graph_setup.rb
+- spec/support/object_store_setup.rb
 - spec/support/seed_data_setup.rb
-- spec/support/sequel_persistence_setup.rb
 - spec/support/sequel_test_support.rb
+- spec/terrestrial/abstract_record_spec.rb
+- spec/terrestrial/collection_mutability_proxy_spec.rb
+- spec/terrestrial/deleted_record_spec.rb
+- spec/terrestrial/dirty_map_spec.rb
+- spec/terrestrial/lazy_collection_spec.rb
+- spec/terrestrial/lazy_object_proxy_spec.rb
+- spec/terrestrial/public_conveniencies_spec.rb
+- spec/terrestrial/upserted_record_spec.rb
+- terrestrial.gemspec
 homepage: https://github.com/bestie/terrestrial
 licenses:
 - MIT
@@ -235,10 +242,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
-summary: A data mapping ORM to make your objects feel less alien
+summary: A data mapper ORM for Ruby
 test_files:
 - features/env.rb
 - features/example.feature
@@ -246,30 +253,31 @@ test_files:
 - spec/config_override_spec.rb
 - spec/custom_serializers_spec.rb
 - spec/deletion_spec.rb
+- spec/error_handling/factory_error_handling_spec.rb
+- spec/error_handling/serialization_error_spec.rb
+- spec/error_handling/upsert_error_spec.rb
 - spec/graph_persistence_spec.rb
 - spec/graph_traversal_spec.rb
 - spec/new_graph_persistence_spec.rb
 - spec/object_identity_spec.rb
 - spec/ordered_association_spec.rb
-- spec/persistence_efficiency_spec.rb
 - spec/predefined_queries_spec.rb
-- spec/proxying_spec.rb
 - spec/querying_spec.rb
 - spec/readme_examples_spec.rb
-- spec/sequel_mapper/abstract_record_spec.rb
-- spec/sequel_mapper/collection_mutability_proxy_spec.rb
-- spec/sequel_mapper/deleted_record_spec.rb
-- spec/sequel_mapper/dirty_map_spec.rb
-- spec/sequel_mapper/lazy_collection_spec.rb
-- spec/sequel_mapper/lazy_object_proxy_spec.rb
-- spec/sequel_mapper/public_conveniencies_spec.rb
-- spec/sequel_mapper/upserted_record_spec.rb
+- spec/sequel_query_efficiency_spec.rb
 - spec/spec_helper.rb
 - spec/support/blog_schema.rb
 - spec/support/have_persisted_matcher.rb
-- spec/support/mapper_setup.rb
-- spec/support/mock_sequel.rb
+- spec/support/memory_adapter_test_support.rb
 - spec/support/object_graph_setup.rb
+- spec/support/object_store_setup.rb
 - spec/support/seed_data_setup.rb
-- spec/support/sequel_persistence_setup.rb
 - spec/support/sequel_test_support.rb
+- spec/terrestrial/abstract_record_spec.rb
+- spec/terrestrial/collection_mutability_proxy_spec.rb
+- spec/terrestrial/deleted_record_spec.rb
+- spec/terrestrial/dirty_map_spec.rb
+- spec/terrestrial/lazy_collection_spec.rb
+- spec/terrestrial/lazy_object_proxy_spec.rb
+- spec/terrestrial/public_conveniencies_spec.rb
+- spec/terrestrial/upserted_record_spec.rb

data/lib/terrestrial/short_inspection_string.rb

@@ -1,18 +0,0 @@
-module Terrestrial
-  module ShortInspectionString
-    def inspect
-      "\#<#{self.class.name}:#{self.object_id.<<(1).to_s(16)} " +
-        inspectable_properties.map { |property|
-          [
-            property,
-            instance_variable_get("@#{property}").inspect
-          ].join("=")
-        }
-        .join(" ") + ">"
-    end
-
-    def inspectable_properties
-      []
-    end
-  end
-end

data/spec/proxying_spec.rb

@@ -1,88 +0,0 @@
-require "spec_helper"
-
-require "support/mapper_setup"
-require "support/sequel_persistence_setup"
-require "support/seed_data_setup"
-require "terrestrial"
-
-RSpec.describe "Proxying associations" do
-  include_context "mapper setup"
-  include_context "sequel persistence setup"
-  include_context "seed data setup"
-
-  context "of type `has_many`" do
-    subject(:mapper) { user_mapper }
-
-    let(:user) {
-      mapper.where(id: "users/1").first
-    }
-
-    let(:posts) { user.posts }
-
-    describe "limiting datastore reads" do
-      context "when loading the root node" do
-        it "only performs one read" do
-          expect {
-            user
-          }.to change { query_counter.read_count }.by(1)
-        end
-      end
-
-      context "when getting a reference to an association proxy" do
-        before { user }
-
-        it "does no additional reads" do
-          expect{
-            user.posts
-          }.to change { query_counter.read_count }.by(0)
-        end
-      end
-
-      context "when iteratiing over a has many association" do
-        before { posts }
-
-        it "does a single additional read for the association collection" do
-          expect {
-            user.posts.each { |x| x }
-          }.to change { query_counter.read_count }.by(1)
-        end
-
-        context "when doing this more than once" do
-          before do
-            posts.each { |x| x }
-          end
-
-          it "performs no additional reads" do
-            expect {
-              user.posts.each { |x| x }
-            }.not_to change { query_counter.read_count }
-          end
-        end
-      end
-
-      context "when getting a reference to a many to many association" do
-        before { post }
-
-        let(:post) { user.posts.first }
-
-        it "does no additional reads" do
-          expect {
-            post.categories
-          }.to change { query_counter.read_count }.by(0)
-        end
-      end
-
-      context "when iterating over a many to many association" do
-        let(:category_count) { 3 }
-
-        it "does 1 read" do
-          post = user.posts.first
-
-          expect {
-            post.categories.each { |x| x }
-          }.to change { query_counter.read_count }.by(1)
-        end
-      end
-    end
-  end
-end