cranium 0.6.1 → 0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cf60640829ad3e3977a453a18b4a91c01538ecfe79fb8759b3d978348e10cb8c
-  data.tar.gz: e297e5c85dd7f0c6296aa1e9ce01dc112d43b08e7087e34f266ff856a0e41ac9
+  metadata.gz: b61de113471ffdd1d3b83dccd8076faee6951352456022b1eda76680cc6d52c4
+  data.tar.gz: 10e4a762604b5d985e8675cde783e3165dc4d94da41fe017c05e6b4a8c514b83
 SHA512:
-  metadata.gz: c47d42ecea886eb75e21b471c9e7b5cdc810d020174e43a76b5554cd3f4f6a71d2517bde5e041a544167ec461d74e2c0945459ac7b3223bf6793ef9fe4d0192d
-  data.tar.gz: 9dbc134d24bd752b0adfe664d2a0187fb07a8c3e8d0a3d956b5949a7135dbe1c147e158bd6c5f54eca9580f0f424fd56d68b88a032e8352c7709c6ade6c673da
+  metadata.gz: 2d1ea26710cf8585f6c081a0f7c5da88213209685ed73fd8deacacef03e17a4423ba47f1974987e3528fbae50e2ce15db1eca521dbf1e30c73ebf4639cbe53bc
+  data.tar.gz: 3b799dc7963a54cd38b7d46b8313a3a76e6350894f6f6162dcd56387a884e36c601573e94deae2ad4d7e5ac31194e36eb3669437adfec45edf13e7585fb8fedf

data/cranium.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |spec|
   spec.name = 'cranium'
-  spec.version = '0.6.1'
+  spec.version = '0.7'
   spec.authors = ['Emarsys Technologies']
   spec.email = ['smart-insight-dev@emarsys.com']
   spec.description = %q{Provides Extract, Transform and Load functionality for loading data from CSV files to a Greenplum database.}

data/lib/cranium/database.rb

@@ -13,7 +13,9 @@ module Cranium::Database
 
   def self.[](name)
     @connections ||= {}
-    @connections[name] ||= setup_connection(@definitions[name].connect_to)
+    @connections[name] ||= setup_connection(@definitions[name].connect_to,
+                                            @definitions[name].retry_count,
+                                            @definitions[name].retry_delay)
   end
 
 
@@ -28,15 +30,19 @@ module Cranium::Database
   private
 
 
-  def self.setup_connection(connection_string)
-    connection = if Cranium.configuration.log_queries
-                   Sequel.connect(connection_string, loggers: Cranium.configuration.loggers)
-                 else
-                   Sequel.connect(connection_string)
-                 end
-    connection.extension :connection_validator
-    connection.pool.connection_validation_timeout = -1
-    return connection
+  def self.setup_connection(connection_details, retry_count = 0, retry_delay = 0)
+    (retry_count + 1).times do |try_count|
+      connection = if Cranium.configuration.log_queries
+                     Sequel.connect(connection_details, loggers: Cranium.configuration.loggers)
+                   else
+                     Sequel.connect(connection_details)
+                   end
+      connection.extension :connection_validator
+      connection.pool.connection_validation_timeout = -1
+      break connection
+    rescue Sequel::DatabaseConnectionError
+      (try_count == retry_count) ? raise : sleep(retry_delay)
+    end
   end
 
 end

data/lib/cranium/dsl/database_definition.rb

@@ -7,11 +7,15 @@ class Cranium::DSL::DatabaseDefinition
   attr_reader :name
 
   define_attribute :connect_to
+  define_attribute :retry_count
+  define_attribute :retry_delay
 
 
 
   def initialize(name)
     @name = name
+    @retry_count = 0
+    @retry_delay = 0
   end
 
 

data/spec/cranium/database_spec.rb

@@ -81,6 +81,40 @@ describe Cranium::Database do
 
       expect(database[:dwh]).not_to eq database[:dwh2]
     end
+
+    context 'when retry_count is specified' do
+      before do
+        database.register_database :dwh do
+          connect_to "other connection string"
+          retry_count 3
+          retry_delay 15
+        end
+        allow(database).to receive(:sleep)
+      end
+
+      it "should retry connecting to the DB the specified number of times" do
+        call_count = 0
+        allow(Sequel).to receive(:connect) do
+          call_count += 1
+          call_count < 3 ? raise(Sequel::DatabaseConnectionError) : connection
+        end
+
+        expect(database[:dwh]).to eq connection
+      end
+
+      it "should not retry connecting to the DB more than the specified number of times" do
+        allow(Sequel).to receive(:connect).exactly(4).times.and_raise(Sequel::DatabaseConnectionError)
+
+        expect { database[:dwh] }.to raise_error(Sequel::DatabaseConnectionError)
+      end
+
+      it "should wait retry_delay seconds between connection attempts" do
+        allow(Sequel).to receive(:connect).and_raise(Sequel::DatabaseConnectionError)
+        expect(database).to receive(:sleep).with(15).exactly(3).times
+
+        expect { database[:dwh] }.to raise_error(Sequel::DatabaseConnectionError)
+      end
+    end
   end
 
 end

data/spec/cranium/dsl/database_definition_spec.rb

@@ -20,4 +20,38 @@ describe Cranium::DSL::DatabaseDefinition do
     end
   end
 
+
+  describe "#retry_count" do
+    context 'when not set' do
+      it "should return 0 by default" do
+        expect(database.retry_count).to eq(0)
+      end
+    end
+
+    context 'when set' do
+      it "should return the number of retries specified for the database" do
+        database.retry_count 3
+
+        expect(database.retry_count).to eq(3)
+      end
+    end
+  end
+
+
+  describe "#retry_delay" do
+    context 'when not set' do
+      it "should return 0 by default" do
+        expect(database.retry_delay).to eq(0)
+      end
+    end
+
+    context 'when set' do
+      it "should return the number of retries specified for the database" do
+        database.retry_delay 15
+
+        expect(database.retry_delay).to eq(15)
+      end
+    end
+  end
+
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cranium
 version: !ruby/object:Gem::Version
-  version: 0.6.1
+  version: '0.7'
 platform: ruby
 authors:
 - Emarsys Technologies
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-12-05 00:00:00.000000000 Z
+date: 2020-03-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pg
@@ -317,7 +317,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.0.1
 signing_key: 
 specification_version: 4
 summary: Pure Ruby ETL framework