redshift-client 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 07134341d34da433891d4a6fabe9c092d09973a1
-  data.tar.gz: 1fffad0d484638978060447997fdc977d0cb2aa3
+  metadata.gz: 8ccf86e0129abf8d78dd4b7551f1b6dad0d5aa76
+  data.tar.gz: aabd618f7ac00c951abfa34250dc3c27954697fc
 SHA512:
-  metadata.gz: 6c4f6be049d2d7d848367c892624fa67dc64e63f725186a9005dea738d63d7ca5ab2d4f73957ee3f13ea24654b4bfafc9368414b70900c6d86fd11593e8ca983
-  data.tar.gz: 1266a3424362a90776b32832de19008f8be05b161bd5205e43ab28f4adab02dd0599e527d1c09d476c98b2f743700bbe754b9ca1891eb83d65066cecb7c0a117
+  metadata.gz: a5a53fd03e12708b9f5d2e94bce1ae9f397faec83efafb3897b37d08a50123e0cbc4a63fd206750d81f48226b570706bbd653bf0f260298ba7a158e8ec1f0f23
+  data.tar.gz: dd412e3922d8c4add73479d784c9c31739cd85283a05ff0b620bac578a1af50578ee51d6fb507e97160760d4a183eee35bffc33975a22c2dc2023fbdb2ff4ac2

data/lib/redshift/client.rb

@@ -1,11 +1,13 @@
 require "redshift/client/version"
 require "redshift/client/errors"
 require "redshift/client/configuration"
+require 'redshift/client/loggable'
 require "redshift/client/connection"
 require "redshift/client/connection_handling"
 
 module Redshift
   module Client
+    extend Loggable
     extend ConnectionHandling
   end
 end

data/lib/redshift/client/configuration.rb

@@ -1,27 +1,59 @@
 require 'uri'
+require 'cgi'
+require 'active_support/core_ext/hash/reverse_merge'
 
 module Redshift
   module Client
     class Configuration
       attr_reader :host, :port, :user, :password, :dbname
 
-      def self.resolve(config = {})
-        if config.empty?
-          url = URI.parse(ENV["REDSHIFT_URL"])
-          self.new(url.host, url.port, url.user, url.password, url.path[1..-1])
-        else
-          self.new(config[:host], config[:port], config[:user], config[:password], config[:dbname])
+      DEFAULT_SSL_MODE = 'allow'.freeze
+
+      class << self
+        def resolve(config = {})
+          config.reverse_merge!(parse_redshift_url)
+
+          Configuration.new(
+            config[:host],
+            config[:port],
+            config[:user],
+            config[:password],
+            config[:dbname],
+            config[:sslmode]
+          )
+        end
+
+        private
+
+        def parse_redshift_url
+          uri = URI.parse(ENV['REDSHIFT_URL'])
+          {
+            host: uri.host,
+            port: uri.port,
+            user: uri.user,
+            password: uri.password,
+            dbname: uri.path[1..-1],
+            sslmode: sslmode(uri)
+          }
+        rescue
+          {}
+        end
+
+        def sslmode(uri)
+          if uri.query
+            param = CGI.parse(uri.query)['sslmode']
+            param && param[0]
+          end
         end
-      rescue => e
-        raise ConfigurationError.new(e.message)
       end
 
-      def initialize(host, port, user, password, dbname)
+      def initialize(host, port, user, password, dbname, sslmode)
         @host = host
         @port = port || 5439
         @user = user
         @password = password
         @dbname = dbname
+        @sslmode = sslmode || DEFAULT_SSL_MODE
       end
 
       def params
@@ -30,7 +62,8 @@ module Redshift
           port: @port,
           user: @user,
           password: @password,
-          dbname: @dbname
+          dbname: @dbname,
+          sslmode: @sslmode
         }
       end
     end

data/lib/redshift/client/connection_handling.rb

@@ -4,7 +4,7 @@ require 'active_support/lazy_load_hooks'
 module Redshift
   module Client
     module ConnectionHandling
-      def establish_connection(config= {})
+      def establish_connection(config = {})
         clear_connection!
         clear_thread!
 

data/lib/redshift/client/errors.rb

@@ -3,9 +3,6 @@ module Redshift
     class RedshiftClientError < StandardError
     end
 
-    class ConfigurationError < RedshiftClientError
-    end
-
     class ConnectionNotEstablished < RedshiftClientError
     end
   end

data/lib/redshift/client/loggable.rb

@@ -0,0 +1,24 @@
+require 'active_support'
+require 'active_support/core_ext/class/attribute_accessors'
+require 'logger'
+
+module Redshift
+  module Client
+    module Loggable
+      def logger
+        @logger || create_default_logger
+      end
+
+      def logger=(logger)
+        @logger = logger
+      end
+
+      private
+      def create_default_logger
+        @logger = Logger.new($stdout)
+        @logger.level = Logger::INFO
+        @logger
+      end
+    end
+  end
+end

data/lib/redshift/client/version.rb

@@ -1,5 +1,5 @@
 module Redshift
   module Client
-    VERSION = "0.2.0"
+    VERSION = "0.3.0"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: redshift-client
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Dai Akatsuka
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-10-10 00:00:00.000000000 Z
+date: 2017-06-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pg
@@ -101,10 +101,9 @@ files:
 - lib/redshift/client/connection.rb
 - lib/redshift/client/connection_handling.rb
 - lib/redshift/client/errors.rb
+- lib/redshift/client/loggable.rb
 - lib/redshift/client/version.rb
 - redshift-client.gemspec
-- spec/redshift/client_spec.rb
-- spec/spec_helper.rb
 homepage: https://github.com/dakatsuka/redshift-client
 licenses:
 - MIT
@@ -125,10 +124,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.6.11
 signing_key: 
 specification_version: 4
 summary: The ruby client for AWS Redshift.
-test_files:
-- spec/redshift/client_spec.rb
-- spec/spec_helper.rb
+test_files: []

data/spec/redshift/client_spec.rb

@@ -1,102 +0,0 @@
-require 'spec_helper'
-
-describe Redshift::Client do
-  it 'has a version number' do
-    expect(Redshift::Client::VERSION).not_to be nil
-  end
-
-  describe '#establish_connection' do
-    it 'establishes connection' do
-      expect {
-        Redshift::Client.establish_connection
-      }.to change {
-        Redshift::Client.established?
-      }.from(false).to(true)
-    end
-  end
-
-  describe '#disconnect' do
-    before do
-      Redshift::Client.establish_connection
-      Redshift::Client.connection
-    end
-
-    it 'disconnects from database' do
-      expect {
-        Redshift::Client.disconnect
-      }.to change {
-        Redshift::Client.connected?
-      }.from(true).to(false)
-    end
-  end
-
-  describe '#connected?' do
-    context "when already connected" do
-      before do
-        Redshift::Client.establish_connection
-        Redshift::Client.connection
-      end
-
-      after do
-        Redshift::Client.disconnect
-      end
-
-      it "returns true" do
-        expect(Redshift::Client).to be_connected
-      end
-    end
-
-    context "when not yet connected" do
-      it "returns false" do
-        expect(Redshift::Client).not_to be_connected
-      end
-    end
-  end
-
-  describe "#connection" do
-    context "when already established" do
-      before do
-        Redshift::Client.establish_connection
-      end
-
-      it "returns an instance of connection" do
-        expect(Redshift::Client.connection).to be_instance_of Redshift::Client::Connection
-      end
-    end
-
-    context "when not yet established" do
-      before do
-        allow(ActiveSupport).to receive :run_load_hooks
-      end
-
-      it "calls ActiveSupport#run_load_hooks and raise error" do
-        Thread.new {
-          expect { Redshift::Client.connection }.to raise_error(Redshift::Client::ConnectionNotEstablished)
-          expect(ActiveSupport).to have_received(:run_load_hooks).with(:redshift_client_connection).once
-        }.join
-      end
-    end
-  end
-
-  describe "#established?" do
-    context "when already established" do
-      before do
-        Redshift::Client.establish_connection
-      end
-
-      after do
-        Redshift::Client.disconnect
-      end
-
-      it "returns true" do
-        expect(Redshift::Client).to be_established
-      end
-    end
-
-    context "when not yet established" do
-      it "returns false" do
-        Thread.new { expect(Redshift::Client).not_to be_established }.join
-      end
-    end
-  end
-end

data/spec/spec_helper.rb

@@ -1,2 +0,0 @@
-$LOAD_PATH.unshift File.expand_path('../../lib', __FILE__)
-require 'redshift/client'