mode 0.0.7 → 0.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 916fc74b44c1c5b65091492b449464196a27067c
-  data.tar.gz: 41bdef70c556a8b1807e5e9f8fb71bfce3a39ded
+  metadata.gz: 03a5f9840967c0b0a7b461ff7ebbef1ceee872f6
+  data.tar.gz: d207b4e636caaf13e1c43ae76aa86e556aba7825
 SHA512:
-  metadata.gz: aba504acfea6ea6cd6052666abd9f826c44e1241ba738b523089bedd8e4e700f4d40e78ba1c5df9adf8d6dfcf0f03003564114cf29a79bc597d98fca31ecbf4e
-  data.tar.gz: 0fc687a9b19413e7c47339aaa6ddd215145a374f1cbb5d068b37c2c5b134891553c3ff69d1a8891c805f3c97f4594bedac2778374986e632b487db28d3666858
+  metadata.gz: da0837b3b8b33c55de80fba1d1ecfc2b16dc47831658f5fee2da7387bff8fba4ea6022a3732b30b020fe8379a66624a8bfd9b53e31d006850eba8a17a3301fda
+  data.tar.gz: 2aff0e732ef9fa57dfec9702e41b14c3377a6a8fe3eded36e05c17c0d7e4a0ae82102b8cab4778878a0b6f8bfaee7d724987ec7f045e92a8cb7a789a70a81243

data/lib/mode/commands/login.rb

@@ -63,6 +63,12 @@ module Mode
           end
         elsif resource.status == 401
           raise "Login failed, credentials invalid"
+        elsif resource.status == 404
+          raise "Login failed, access tokens not found"
+        elsif resource.status == 500
+          raise "Login failed, internal server error"
+        else
+          raise "Login failed, unknown error"
         end
       end
 
@@ -80,7 +86,9 @@ module Mode
       def choose_access_token
         access_tokens = fetch_access_tokens
 
-        if access_tokens.length == 1
+        if access_tokens.nil?
+          raise "Couldn't retrieve access tokens"
+        elsif access_tokens.length == 1
           access_tokens.first
         else
           chosen = prompt_access_tokens(access_tokens)

data/lib/mode/connector/data_source.rb

@@ -30,34 +30,58 @@ module Mode
         props['host']
       end
 
+      def port
+        props['port']
+      end
+
       def database
         props['database']
       end
 
+      def ssl_mode
+        props['sslmode'] || 'prefer'
+      end
+
       def select(query, &block)
         connection_dataset(query).each(&block)
       end
 
       def connection
-        if redshift?
-          @connection ||= Sequel.connect(connection_url,
-            :client_min_messages => '',
-            :force_standard_strings => false
-          )
-        else
-          @connection ||= Sequel.connect(connection_url)
-        end
+        @connection ||= Sequel.connect(connection_url, adapter_opts)
       end
 
       def redshift?
         adapter == 'redshift'
       end
 
+      def postgres?
+        adapter == 'postgres'
+      end
+
       private
 
+      def adapter_opts
+        opts = {}
+
+        if redshift?
+          opts.merge!({
+            :sslmode => ssl_mode,
+            :client_min_messages => '',
+            :force_standard_strings => false
+          })
+        elsif postgres?
+          opts.merge!({
+            :sslmode => ssl_mode
+          })
+        end
+
+        opts
+      end
+
       def connection_url
+        port_segment = port.nil? ? nil : ":#{port}"
         password_segment = password.nil? ? nil : ":#{password}"
-        "#{adapter}://#{username}#{password_segment}@#{host}/#{database}"
+        "#{adapter}://#{username}#{password_segment}@#{host}#{port_segment}/#{database}"
       end
 
       def connection_dataset(query)

data/lib/mode/version.rb

@@ -1,3 +1,3 @@
 module Mode
-  VERSION = "0.0.7"
+  VERSION = "0.0.8"
 end

data/spec/connector/data_source_spec.rb

@@ -54,9 +54,12 @@ describe Mode::Connector::DataSource do
   it 'has a connection dataset' do
     source = Mode::Connector::DataSource.new('dev', props)
 
+    dataset = double(:dataset, :with_sql => :dataset)
+    connection = double(:connection, :dataset => dataset)
+    Sequel.should_receive(:connect).and_return(connection)
     dataset = source.send(:connection_dataset, "SELECT * FROM fake")
 
-    dataset.should_not == nil
+    dataset.should == :dataset
   end
 
   it "fetches results from dataset" do

data/spec/connector/scheduler_spec.rb

@@ -25,6 +25,8 @@ describe Mode::Connector::Scheduler do
     rufus.should_receive(:join).and_return(true)
     rufus.should_receive(:stop).and_return(true)
 
+    Sequel.should_receive(:connect).and_return(:connect)
+
     scheduler = Mode::Connector::Scheduler.new(data_sources)
 
     scheduler.start!

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mode
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 0.0.8
 platform: ruby
 authors:
 - Mode Analytics