couchdb_to_sql 1.0.0 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5a78893ba22f84ef03fa138cbee46b65ab1e793a
-  data.tar.gz: a57a1d876ff3969ece6ddfca90ba32c8d0d56216
+  metadata.gz: 51e5df8173322c4586364b13ebd30b450677af07
+  data.tar.gz: fbd8a500bea9b195f9287c0a18b12aab84de50dd
 SHA512:
-  metadata.gz: 04bf0493beadf5d5265df76e5778fccb65f46d571b0b45fa2910f33b6b3eff69261f230f78715aa3dfb88c1980e8f034e1c7448a228b798b057a587b13741753
-  data.tar.gz: ce176aaf1253318c74a97ba6cef7bedf1c62d219b5c49301091f84f6cc796f6e2951315375594836bfbc247913d4c455c3b194ecb8a835fdd1529cff5a70931b
+  metadata.gz: 90a3d02890b0ccb1ae7714ba87633875ae31e7af56f0e456640a72b1f0f0d1c0a079888c34df997ca5a0787e705f3055fcde442449de1d7ac42b0334284c29fe
+  data.tar.gz: 97fda03da45da9ccdcbdc56b7182426a38d0ddb6db4b1773115c5f54aa5a93a17b8730c9d47ce6b98ea896da9e7b82ffe850d5e9a70ee5e8ad5c4d9c29f0baa0

data/.rubocop_todo.yml

@@ -1,19 +1,19 @@
 # This configuration was generated by
 # `rubocop --auto-gen-config`
-# on 2017-10-02 12:02:20 +0300 using RuboCop version 0.50.0.
+# on 2018-03-26 16:28:00 +0300 using RuboCop version 0.54.0.
 # The point is for the user to remove these configuration records
 # one by one as the offenses are removed from the code base.
 # Note that changes in the inspected code, or installation of new
 # versions of RuboCop, may require this file to be generated again.
 
-# Offense count: 8
+# Offense count: 7
 Metrics/AbcSize:
   Max: 36
 
 # Offense count: 1
 # Configuration parameters: CountComments, ExcludedMethods.
 Metrics/BlockLength:
-  Max: 59
+  Max: 28
 
 # Offense count: 1
 # Configuration parameters: CountBlocks.
@@ -23,17 +23,28 @@ Metrics/BlockNesting:
 # Offense count: 2
 # Configuration parameters: CountComments.
 Metrics/ClassLength:
-  Max: 202
+  Max: 209
 
 # Offense count: 2
 Metrics/CyclomaticComplexity:
-  Max: 8
+  Max: 9
 
-# Offense count: 11
+# Offense count: 13
 # Configuration parameters: CountComments.
 Metrics/MethodLength:
-  Max: 31
+  Max: 38
 
 # Offense count: 1
 Metrics/PerceivedComplexity:
-  Max: 10
+  Max: 12
+
+# Offense count: 2
+Style/DateTime:
+  Exclude:
+    - 'lib/couchdb_to_sql/changes.rb'
+
+# Offense count: 3
+Style/EvalWithLocation:
+  Exclude:
+    - 'test/unit/document_handler_test.rb'
+    - 'test/unit/table_builder_test.rb'

data/VERSION

@@ -1 +1 @@
-1.0.0
+2.0.0

data/lib/couchdb_to_sql/changes.rb

@@ -137,9 +137,7 @@ module CouchdbToSql
       uri = URI.parse(url)
 
       # Authenticate?
-      if uri.user.present? && uri.password.present?
-        @http.set_auth(source.root, uri.user, uri.password)
-      end
+      @http.set_auth(source.root, uri.user, uri.password) if uri.user.present? && uri.password.present?
 
       # Make sure the request has the latest sequence
       query = {
@@ -186,7 +184,15 @@ module CouchdbToSql
 
           if row['deleted']
             log_info "received DELETE seq. #{seq} id: #{id}"
-            handlers.each { |handler| handler.mark_as_deleted(doc) }
+            document_handlers = find_document_handlers(doc)
+            if document_handlers.empty?
+              log_info "Found deletion without type-identifying field, (id: '#{id}'), removing " \
+                        'data from SQL/Postgres.'
+              log_info 'Trying all handlers...'
+              handlers.each { |handler| handler.delete(doc) }
+            else
+              document_handlers.each { |handler| handler.mark_as_deleted(doc) }
+            end
           else
             log_debug "received CHANGE seq. #{seq} id: #{id}"
 
@@ -206,8 +212,8 @@ module CouchdbToSql
             end
           end
 
-          update_sequence_table(seq)
-        end # transaction
+          update_sequence_table(seq) # transaction
+        end
       elsif row['last_seq']
         # Sometimes CouchDB will send an update to keep the connection alive
         log_info "received last seq: #{row['last_seq']}"

data/lib/couchdb_to_sql/document_handler.rb

@@ -29,9 +29,9 @@ module CouchdbToSql
     # Handle a table definition.
     def table(name, opts = {}, &block)
       if @mode == :delete
-        TableDestroyer.new(self, name, opts).execute
+        TableDestroyer.new(self, name, opts, &block).execute
       elsif @mode == :mark_as_deleted
-        TableDeletedMarker.new(self, name, opts).execute
+        TableDeletedMarker.new(self, name, opts, &block).execute
       elsif @mode == :insert
         TableBuilder.new(self, name, opts, &block).execute
       end

data/lib/couchdb_to_sql/table_deleted_marker.rb

@@ -9,35 +9,20 @@ module CouchdbToSql
   class TableDeletedMarker < TableBuilder
     def execute
       dataset = handler.database[table_name]
+      handler.changes.log_info "Deletion with additional info present (#{primary_key} '#{handler.id}'), assuming tombstone. " \
+                               'Updating data in SQL/Postgres database with data from CouchDB document.'
+      fields = attributes.merge(
+        _deleted: true,
+        _deleted_timestamp: Sequel::CURRENT_TIMESTAMP,
+        rev: handler.rev
+      )
 
-      if attributes.key?(:id)
-        handler.changes.log_info "Deletion with 'id' field present (#{primary_key} '#{handler.id}'), assuming tombstone. " \
-                                 'Updating data in SQL/Postgres database with data from CouchDB document.'
-        fields = attributes.merge(
-          _deleted: true,
-          _deleted_timestamp: Sequel::CURRENT_TIMESTAMP,
-          rev: handler.rev
+      dataset
+        .insert_conflict(
+          target: primary_key,
+          update: fields
         )
-
-        dataset
-          .insert_conflict(
-            target: primary_key,
-            update: fields
-          )
-          .insert(fields)
-      else
-        handler.changes.log_info "Found deletion without 'id' field (#{primary_key} '#{handler.id}'), assuming plaque. Leaving " \
-                                 'data as-is in SQL/Postgres, only setting _deleted* fields.'
-        records_modified = dataset
-          .where(key_filter)
-          .update(
-            _deleted: true,
-            _deleted_timestamp: Sequel::CURRENT_TIMESTAMP,
-            rev: handler.rev
-          )
-
-        handler.changes.log_info "#{records_modified} record(s) were marked as deleted"
-      end
+        .insert(fields)
     end
 
     def key_filter

data/test/unit/changes_test.rb

@@ -74,6 +74,37 @@ class ChangesTest < Test::Unit::TestCase
     assert_equal @changes.database[CouchdbToSql::COUCHDB_TO_SQL_SEQUENCES_TABLE].first.fetch(:highest_sequence), '3'
   end
 
+  def test_mark_deleted_rows
+    doc = {
+      'order_number' => '12345',
+      'customer_number' => '54321',
+      'type' => 'Foo'
+    }
+    row = {
+      'seq' => 9,
+      'id' => '1234',
+      'deleted' => true,
+      'doc' => doc
+    }
+
+    handler = @changes.handlers[0]
+    handler.expects(:mark_as_deleted).with(doc)
+
+    handler = @changes.handlers[1]
+    handler.expects(:delete).never
+    handler.expects(:insert).never
+    handler.expects(:mark_as_deleted).with(doc).never
+
+    handler = @changes.handlers[2]
+    handler.expects(:delete).never
+    handler.expects(:insert).never
+    handler.expects(:mark_as_deleted).with(doc).never
+
+    @changes.send(:process_row, row)
+
+    assert_equal @changes.database[CouchdbToSql::COUCHDB_TO_SQL_SEQUENCES_TABLE].first.fetch(:highest_sequence), '9'
+  end
+
   def test_deleting_rows
     doc = {
       'order_number' => '12345',
@@ -87,7 +118,7 @@ class ChangesTest < Test::Unit::TestCase
     }
 
     @changes.handlers.each do |handler|
-      handler.expects(:mark_as_deleted).with(doc)
+      handler.expects(:delete).with(doc)
     end
 
     @changes.send(:process_row, row)

data/test/unit/table_deleted_marker_test.rb

@@ -0,0 +1,67 @@
+# frozen_string_literal: true
+
+require 'test_helper'
+
+class TableDeletedMarkerTest < Test::Unit::TestCase
+  def described_class
+    CouchdbToSql::TableDeletedMarker
+  end
+
+  def setup
+    @database = create_database
+    @changes = mock
+    @changes.stubs(:database).returns(@database)
+    @changes.stubs(:schema).returns(CouchdbToSql::Schema.new(@database, :items))
+    @changes.stubs(:log_info)
+    @handler = CouchdbToSql::DocumentHandler.new(@changes)
+    @handler.document = { '_id' => '12345' }
+  end
+
+  def test_init
+    @row = described_class.new(@handler, 'items')
+    assert_equal @row.primary_key, :item_id
+  end
+
+  def test_init_override_primary_key
+    @row = described_class.new(@handler, 'items', primary_key: 'foo_item_id')
+    assert_equal @row.primary_key, :foo_item_id
+  end
+
+  def test_handler
+    @row = described_class.new(@handler, :items)
+    assert_equal @row.handler, @handler
+  end
+
+  def test_key_filter
+    @row = described_class.new(@handler, :items)
+    assert_equal @row.key_filter, item_id: '12345'
+  end
+
+  def test_execution_deletes_rows
+    @database[:items].insert(name: 'Test Item 1', item_id: '12345')
+    assert_equal @database[:items].count, 1, 'Did not create sample row correctly!'
+    @row = described_class.new(@handler, :items)
+    # @row.execute # TODO: Sqlite and PostGres have different upsert syntax
+    assert_equal 1, @database[:items].count
+    # assert_true @database[:items].first._deleted
+  end
+
+  protected
+
+  def create_database
+    database = Sequel.sqlite
+    database.create_table :items do
+      String :item_id
+      String :name
+      Time :created_at
+      index :item_id, unique: true
+    end
+    database.create_table :groups do
+      String :group_id
+      String :name
+      Time :created_at
+      index :group_id, unique: true
+    end
+    database
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: couchdb_to_sql
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 2.0.0
 platform: ruby
 authors:
 - Sam Lown
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-10-10 00:00:00.000000000 Z
+date: 2018-04-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -197,6 +197,7 @@ files:
 - test/unit/document_handler_test.rb
 - test/unit/schema_test.rb
 - test/unit/table_builder_test.rb
+- test/unit/table_deleted_marker_test.rb
 - test/unit/table_destroyer_test.rb
 homepage: https://github.com/ecraft/couchdb_to_sql
 licenses:
@@ -218,7 +219,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.14
+rubygems_version: 2.6.12
 signing_key: 
 specification_version: 4
 summary: Listen to a CouchDB changes feed and create rows in a relational database
@@ -230,4 +231,5 @@ test_files:
 - test/unit/document_handler_test.rb
 - test/unit/schema_test.rb
 - test/unit/table_builder_test.rb
+- test/unit/table_deleted_marker_test.rb
 - test/unit/table_destroyer_test.rb