terrestrial 0.3.0 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: c61b139216aa29d6468f16cabdbb135d7c68cbc1
-  data.tar.gz: ab6960d54b3c7546f8d95a6e337efddaef166a7f
+SHA256:
+  metadata.gz: 67854cbc017e8771ba0794d62cfc07b7cf55548c49327cd9a8c82c3167076bc1
+  data.tar.gz: e0fb7f57b53e059485238e36aa00699f15664b721c353e98ec4050d1283dfa6b
 SHA512:
-  metadata.gz: b9a11c083365c86dce49908720970407824645d40802fb5adbfd9d9b7adb8fd22f4a2b539e35edd4d630be0881413f3b0ee5063b3a20011707b33edc0687d72d
-  data.tar.gz: 7e3a194ff7a687b28fdf62ba993af5b83d5e4294c439d14cce8489f8f2439eadc8684842cfc557a642574076b831e6a5e6eb94347e5ee53079b41793c3349348
+  metadata.gz: a41417eaba6d60cdebab5586f61d6c6534bccffb19d736157c7ae43c3651b973b878e1c05ad012d5f8cbb9247af2126d054154c3ec6c506db3158525174e48aa
+  data.tar.gz: aed7b695f3457e7c25ce9c4285137ee04106bbd9692f2d18b11cf680bb002c4b75d96c3f2b066009e6f697b230896442f13aa8173451f4edccdc9fb1eee665b4

data/.ruby-version

@@ -1 +1 @@
-2.3.1
+2.7.1

data/Gemfile.lock

@@ -1,78 +1,69 @@
 PATH
   remote: .
   specs:
-    terrestrial (0.3.0)
-      activesupport (~> 4.0)
+    terrestrial (0.5.0)
       fetchable (~> 1.0)
-      sequel (~> 4.16)
+      sequel (~> 5.0)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (4.2.7.1)
-      i18n (~> 0.7)
-      json (~> 1.7, >= 1.7.7)
-      minitest (~> 5.1)
-      thread_safe (~> 0.3, >= 0.3.4)
-      tzinfo (~> 1.1)
-    builder (3.2.2)
-    coderay (1.1.1)
-    cucumber (2.4.0)
+    backports (3.20.2)
+    builder (3.2.4)
+    coderay (1.1.3)
+    cucumber (3.2.0)
       builder (>= 2.1.2)
-      cucumber-core (~> 1.5.0)
+      cucumber-core (~> 3.2.0)
+      cucumber-expressions (~> 6.0.1)
       cucumber-wire (~> 0.0.1)
-      diff-lcs (>= 1.1.3)
-      gherkin (~> 4.0)
+      diff-lcs (~> 1.3)
+      gherkin (~> 5.1.0)
       multi_json (>= 1.7.5, < 2.0)
       multi_test (>= 0.1.2)
-    cucumber-core (1.5.0)
-      gherkin (~> 4.0)
+    cucumber-core (3.2.1)
+      backports (>= 3.8.0)
+      cucumber-tag_expressions (~> 1.1.0)
+      gherkin (~> 5.0)
+    cucumber-expressions (6.0.1)
+    cucumber-tag_expressions (1.1.1)
     cucumber-wire (0.0.1)
-    diff-lcs (1.2.5)
+    diff-lcs (1.4.4)
     fetchable (1.0.0)
-    gherkin (4.0.0)
-    i18n (0.7.0)
-    json (1.8.3)
-    method_source (0.8.2)
-    minitest (5.9.1)
-    multi_json (1.12.1)
+    gherkin (5.1.0)
+    method_source (1.0.0)
+    multi_json (1.15.0)
     multi_test (0.1.2)
-    pg (0.17.1)
-    pry (0.10.4)
-      coderay (~> 1.1.0)
-      method_source (~> 0.8.1)
-      slop (~> 3.4)
-    rake (10.5.0)
-    rspec (3.5.0)
-      rspec-core (~> 3.5.0)
-      rspec-expectations (~> 3.5.0)
-      rspec-mocks (~> 3.5.0)
-    rspec-core (3.5.3)
-      rspec-support (~> 3.5.0)
-    rspec-expectations (3.5.0)
+    pg (1.2.3)
+    pry (0.14.0)
+      coderay (~> 1.1)
+      method_source (~> 1.0)
+    rake (13.0.3)
+    rspec (3.10.0)
+      rspec-core (~> 3.10.0)
+      rspec-expectations (~> 3.10.0)
+      rspec-mocks (~> 3.10.0)
+    rspec-core (3.10.1)
+      rspec-support (~> 3.10.0)
+    rspec-expectations (3.10.1)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.5.0)
-    rspec-mocks (3.5.0)
+      rspec-support (~> 3.10.0)
+    rspec-mocks (3.10.2)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.5.0)
-    rspec-support (3.5.0)
-    sequel (4.39.0)
-    slop (3.6.0)
-    thread_safe (0.3.5)
-    tzinfo (1.2.2)
-      thread_safe (~> 0.1)
+      rspec-support (~> 3.10.0)
+    rspec-support (3.10.2)
+    sequel (5.42.0)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  bundler (~> 1.7)
-  cucumber
-  pg (~> 0.17.1)
-  pry (~> 0.10.1)
-  rake (~> 10.0)
-  rspec (~> 3.1)
+  bundler (~> 1)
+  cucumber (~> 3.1)
+  pg (~> 1.0)
+  pry (~> 0.13)
+  rake (~> 13.0)
+  rspec (~> 3.9)
   terrestrial!
 
 BUNDLED WITH
-   1.12.5
+   1.17.1

data/README.md

@@ -74,7 +74,7 @@ code of conduct first.
   ## This is kept separate from your domain models as knowledge of the schema
   ## is required to wire them up.
 
-  MAPPINGS = Terrestrial.config(DB)
+  CONFIG = Terrestrial.config(DB)
     .setup_mapping(:users) { |users|
       users.class(User) # Specify a class and the constructor will be used
       users.has_many(:posts, foreign_key: :author_id)
@@ -92,12 +92,9 @@ code of conduct first.
 
   # 4. Create an object store by combining a connection and a configuration
 
-  OBJECT_STORE = Terrestrial.object_store(
-    datastore: DB,
-    mappings: MAPPINGS,
-  )
+  OBJECT_STORE = Terrestrial.object_store(config: CONFIG)
 
-  ## You are not limted to one object store configuration or one database
+  ## You are not limited to one object store configuration or one database
   ## connection. To handle complex situations you may create several segregated
   ## mappings and object stores for your separate aggregate roots, potentially
   ## utilising multiple databases and different domain object

data/bin/test

@@ -3,7 +3,7 @@
 require "bundler"
 Bundler.setup
 
-ADAPTERS = ["memory", "sequel"]
+ADAPTERS = ["sequel"]
 
 module TerrestrialTesting
   module_function def run_rspec_with_adapter(adapter)

data/features/env.rb

@@ -28,18 +28,28 @@ module ExampleRunnerSupport
       .strip
       .gsub(/[\n\s]+/, " ")
       .gsub(/ \>/, ">")
-      .gsub(/\:0x[0-9a-f]{14}/, ":<<object id removed>>")
+      .gsub(/\:0x[0-9a-f]{14,}/, ":<<object id removed>>")
   end
 
   def parse_schema_table(string)
     string.each_line.drop(2).map { |line|
-      name, type = line.split("|").map(&:strip)
+      name, type, options = line.split("|").map(&:strip)
+
       {
         name: name,
         type: Object.const_get(type),
+        options: string_to_schema_options(options.to_s),
       }
     }
   end
+
+  def string_to_schema_options(string)
+    Hash[
+      string.split(",").map(&:strip).reject(&:empty?).map { |s|
+        [s.downcase.gsub(" ", "_").to_sym, true]
+      }
+    ]
+  end
 end
 
 module DatabaseSupport

data/features/example.feature

@@ -9,36 +9,36 @@ Feature: Basic setup
       """
     And a conventionally similar database schema for table "users"
       """
-        Column      | Type
-       ------------ +---------
-        id          | String
-        first_name  | String
-        last_name   | String
-        email       | String
+        Column      | Type     | Options
+       -------------+----------+-------------
+        id          | String   | Primary key
+        first_name  | String   |
+        last_name   | String   |
+        email       | String   |
       """
     And a conventionally similar database schema for table "posts"
       """
-        Column      | Type
-       -------------+---------
-        id          | String
-        author_id   | String
-        subject     | String
-        body        | String
-        created_at  | DateTime
+        Column      | Type     | Options
+       -------------┼----------+-------------
+        id          | String   | Primary key
+        author_id   | String   |
+        subject     | String   |
+        body        | String   |
+        created_at  | DateTime |
       """
     And a conventionally similar database schema for table "categories"
       """
-        Column      | Type
-       -------------+---------
-        id          | String
-        name        | String
+        Column      | Type    | Options
+       -------------+---------+-------------
+        id          | String  | Primary key
+        name        | String  |
       """
     And a conventionally similar database schema for table "categories_to_posts"
       """
-        Column      | Type
-       -------------+---------
-        post_id     | String
-        category_id | String
+        Column      | Type    | Options
+       -------------+---------+-------------
+        post_id     | String  | Primary key
+        category_id | String  |
       """
     And a database connection is established
       """
@@ -50,7 +50,7 @@ Feature: Basic setup
       """
     And the associations are defined in the configuration
       """
-        MAPPINGS = Terrestrial.config(DB)
+        CONFIG = Terrestrial.config(DB)
           .setup_mapping(:users) { |users|
             users.class(User)
             users.has_many(:posts, foreign_key: :author_id)
@@ -67,10 +67,7 @@ Feature: Basic setup
       """
     And a object store is instantiated
       """
-        OBJECT_STORE = Terrestrial.object_store(
-          datastore: DB,
-          mappings: MAPPINGS,
-        )
+        OBJECT_STORE = Terrestrial.object_store(config: CONFIG)
       """
     When a new graph of objects are created
       """

data/lib/terrestrial.rb

@@ -2,7 +2,38 @@ require "logger"
 require "terrestrial/public_conveniencies"
 
 module Terrestrial
+  # TODO: whoa! wtf is this? why did i?
   extend PublicConveniencies
 
   LOGGER = Logger.new(STDERR)
+
+  class DatabaseID
+    def initialize(val = nil)
+      @value = val
+    end
+
+    def sql_literal(_dataset)
+      @value.nil? ? "NULL" : @value.to_s
+    end
+
+    def nil?
+      @value.nil?
+    end
+
+    def value=(v)
+      @value = v
+    end
+
+    def to_s
+      inspect
+    end
+
+    def inspect
+      "#<%{class_name}>:0x%{hex_object_id} @value=%{value}>" % {
+        class_name: self.class.name,
+        hex_object_id: object_id.<<(1).to_s(16),
+        value: @value,
+      }
+    end
+  end
 end

data/lib/terrestrial/adapters/abstract_adapter.rb

@@ -0,0 +1,6 @@
+module Terrestrial
+  module Adapters
+    module AbstractAdapter
+    end
+  end
+end

data/lib/terrestrial/adapters/memory_adapter.rb

@@ -1,9 +1,9 @@
-module Terrestrial
-  module Adapters
-  end
-end
+require "terrestrial/adapters/abstract_adapter"
+require "terrestrial/error"
 
 class Terrestrial::Adapters::MemoryAdapter
+  include Terrestrial::Adapters::AbstractAdapter
+
   def self.build_from_schema(schema, raw_storage)
     schema.each { |name, _| raw_storage[name] = [] }
 
@@ -55,6 +55,18 @@ class Terrestrial::Adapters::MemoryAdapter
     @relations.fetch(table_name)
   end
 
+  def upsert(record)
+    existing = self[record.namespace].where(record.identity)
+
+    if existing.any?
+      existing.update(record.updatable_attributes)
+    else
+      self[record.namespace].insert(record.to_h)
+    end
+  rescue Object => e
+    raise Terrestrial::UpsertError.new(record.namespace, record.to_h, e)
+  end
+
   private
 
   def rollback(relations)
@@ -148,10 +160,19 @@ class Terrestrial::Adapters::MemoryAdapter
       end
     end
 
+    def insert_conflict(target:, update: {})
+      Upsert.new(self, target: target, update: update)
+    end
+
     def insert(new_row)
-      new_row_with_empty_fields = empty_row.merge(clone(new_row))
+      new_row_with_all_fields = empty_row.merge(clone(new_row))
+      row_id = extract_row_id(new_row_with_all_fields)
 
-      all_rows.push(new_row_with_empty_fields)
+      if row_id.any? && where(row_id).any?
+        raise DuplicateKeyError.new(row_id)
+      else
+        all_rows.push(new_row_with_all_fields)
+      end
     end
 
     def update(attrs)
@@ -237,5 +258,60 @@ class Terrestrial::Adapters::MemoryAdapter
     def clone(object)
       Marshal.load(Marshal.dump(object))
     end
+
+    def extract_row_id(row)
+      row.select { |k, _v| primary_key.include?(k) }
+    end
+
+    def primary_key
+      @primary_key ||= schema
+        .select { |col| col.fetch(:options, {}).fetch(:primary_key, nil) }
+        .map { |col| col.fetch(:name) }
+    end
+  end
+
+  # Small amount of code necessary to simulate upserts with Sequel's API
+  class Upsert
+    def initialize(dataset, target:, update:)
+      @dataset = dataset
+      @target = target
+      @update_attributes = update
+    end
+
+    attr_reader :dataset, :target, :update_attributes
+    private     :dataset, :target, :update_attributes
+
+    def insert(row)
+      dataset.insert(row)
+    rescue DuplicateKeyError => e
+      if target_matches?(e.key)
+        attempt_update(e.row_id)
+      end
+    end
+
+    def attempt_update(row_id)
+      dataset.where(row_id).update(update_attributes)
+    end
+
+    def target_matches?(key)
+      key.sort == Array(target).sort
+    end
+  end
+
+
+  class DuplicateKeyError < RuntimeError
+    def initialize(row_id)
+      @row_id = row_id
+    end
+
+    attr_reader :row_id
+
+    def key
+      row_id.keys
+    end
+
+    def message
+      "Insert conflict. Row with `#{row_id}` already exists"
+    end
   end
 end