couchdb_to_sql 2.0.0 → 2.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 51e5df8173322c4586364b13ebd30b450677af07
-  data.tar.gz: fbd8a500bea9b195f9287c0a18b12aab84de50dd
+SHA256:
+  metadata.gz: e8c9e4a2bbd735eb84d80280debaaf5bfe00a937a3e0612c172385242c8e9620
+  data.tar.gz: c6348013a668c3dea0cde87ac4fa8ed5968aba97ee24a631db87bc4a4e4ef37c
 SHA512:
-  metadata.gz: 90a3d02890b0ccb1ae7714ba87633875ae31e7af56f0e456640a72b1f0f0d1c0a079888c34df997ca5a0787e705f3055fcde442449de1d7ac42b0334284c29fe
-  data.tar.gz: 97fda03da45da9ccdcbdc56b7182426a38d0ddb6db4b1773115c5f54aa5a93a17b8730c9d47ce6b98ea896da9e7b82ffe850d5e9a70ee5e8ad5c4d9c29f0baa0
+  metadata.gz: 045d9d4017ad0385b37ea36f9dd3af164b50f6e444a973b86b7fa0787f50e23d62fec48785a875752a82bb8a6dcd6152cc9101c8ef9c9599b8cc6c117c01d9fa
+  data.tar.gz: c08676bf07ca8b8e05db22ce2f60759cb1b42523779cb5672b73a8fc6dd46554a7749722e28c0abc3340fb4e343574b366c0aea01e716a4facc38d2723bff95a

data/.rubocop.yml

@@ -5,6 +5,7 @@ AllCops:
   DisplayCopNames: true
   Exclude:
     - bin/**
+    - examples/**
 
 Layout/MultilineMethodCallIndentation:
   EnforcedStyle: indented

data/README.md

@@ -1,4 +1,4 @@
-[![Build Status](https://travis-ci.org/ecraft/couch_tap.svg?branch=master)](https://travis-ci.org/ecraft/couch_tap)
+[![Build Status](https://travis-ci.org/ecraft/couch_tap.svg?branch=master)](https://travis-ci.org/ecraft/couch_tap) [![Gem Version](https://badge.fury.io/rb/couchdb_to_sql.svg)](https://badge.fury.io/rb/couchdb_to_sql)
 
 # couchdb_to_sql
 

data/VERSION

@@ -1 +1 @@
-2.0.0
+2.1.0

data/examples/feed.rb

@@ -1,4 +1,3 @@
-
 # frozen_string_literal: true
 
 # Sample Configuration Script

data/lib/couchdb_to_sql/changes.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 module CouchdbToSql
-  class Changes
+  class Changes # rubocop:disable ClassLength
     COUCHDB_HEARTBEAT  = 30
     INACTIVITY_TIMEOUT = 70
     RECONNECT_TIMEOUT  = 15
@@ -129,8 +129,9 @@ module CouchdbToSql
 
     protected
 
-    def perform_request
+    def perform_request # rubocop:disable AbcSize
       raise 'Internal error: Highest_sequence is expected to be non-nil' unless highest_sequence
+
       log_info "listening to changes feed from sequence number: #{highest_sequence}"
 
       url = File.join(source.root.to_s, '_changes')
@@ -148,25 +149,28 @@ module CouchdbToSql
       }
 
       num_rows = 0
-
       loop do
-        # Perform the actual request for chunked content
-        @http.get_content(url, query) do |chunk|
-          rows = chunk.split("\n")
-          rows.each { |row|
-            parsed_row = JSON.parse(row)
-            process_row(parsed_row)
-
-            num_rows += 1
-            log_info "Processed #{num_rows} rows" if (num_rows % 10_000) == 0
-          }
+        begin
+          # Perform the actual request for chunked content
+          @http.get_content(url, query) do |chunk|
+            rows = chunk.split("\n")
+            rows.each { |row|
+              parsed_row = JSON.parse(row)
+              process_row(parsed_row)
+
+              num_rows += 1
+              log_info "Processed #{num_rows} rows" if (num_rows % 10_000) == 0
+            }
+          end
+        rescue StandardError => e
+          log_error "exception occurred: #{e.message}"
+          log_error "connection ended, attempting to reconnect in #{RECONNECT_TIMEOUT}s..."
+          sleep RECONNECT_TIMEOUT
         end
-        log_error "connection ended, attempting to reconnect in #{RECONNECT_TIMEOUT}s..."
-        wait RECONNECT_TIMEOUT
       end
     rescue HTTPClient::TimeoutError, HTTPClient::BadResponseError => e
       log_error "connection failed: #{e.message}, attempting to reconnect in #{RECONNECT_TIMEOUT}s..."
-      wait RECONNECT_TIMEOUT
+      sleep RECONNECT_TIMEOUT
       retry
     end
 

data/lib/couchdb_to_sql/table_builder.rb

@@ -83,9 +83,11 @@ module CouchdbToSql
     # Take the document and try to automatically set the fields from the columns
     def set_attributes_from_data
       return unless data.is_a?(Hash) || data.is_a?(CouchRest::Document)
+
       data.each do |k, v|
         k = k.to_sym
         next if %i[_id _rev].include?(k)
+
         set_attribute(k, v) if schema.column_names.include?(k)
       end
     end

data/test/test_helper.rb

@@ -1,4 +1,3 @@
-
 # frozen_string_literal: true
 
 $LOAD_PATH.unshift(File.dirname(__FILE__))

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: couchdb_to_sql
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.1.0
 platform: ruby
 authors:
 - Sam Lown
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-04-20 00:00:00.000000000 Z
+date: 2019-06-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -219,7 +219,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.12
+rubygems_version: 2.7.8
 signing_key: 
 specification_version: 4
 summary: Listen to a CouchDB changes feed and create rows in a relational database