mode 0.0.17 → 0.0.18

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 74f1b2ce9baad12179eacc6a688af0cc4c1a63ea
-  data.tar.gz: 3d8f7f5cab8366b0eb3bf454c62e4374ce9fccf3
+  metadata.gz: ba4667740570363fcc09c91a5ab6306678f54731
+  data.tar.gz: 9d1e27811b305bd7f81da09fdb0794583852744e
 SHA512:
-  metadata.gz: 1e288584297b41d8e45ce8886b987531dc5aa77650a9dc188426e25c1b1f47727fd7b6c92a378bad2c3df863c6ddf4671eddb5f48e2b3cea55635cd2da158061
-  data.tar.gz: b091fee08b2215bb46ead6ec37c207db6641f53fa4b71b8a59e012f930d998dfb22d438211ded8f4b7997d0c090f98854914a7d25bdc463283ab5cbdc1895cca
+  metadata.gz: 6a820c70b52f95e12f71c7a50a37975038986ebe83cdd7769c778f6ee6d60159187d6d42ad78005ef01f045133217203540e63f99edcb7e4fcc28c913b854f76
+  data.tar.gz: dfd181018bf5f35d3b5c5f1f41dc8713daa8b1291f4fcd75fc2609e41796b38fa4dfd2e8c208dbaea1c731e9430fa106595816e629a4116170058a0b9408ca14

data/README.md

@@ -2,139 +2,7 @@
 
 This gem provides command line tools for interacting with the Mode Analytics APIs.
 
-[![Build Status](https://magnum.travis-ci.com/mode/mode-ruby.png?token=i2TyUW8sMD41B46pRCpz&branch=master)](https://magnum.travis-ci.com/mode/mode-ruby)
+[![Build Status](https://travis-ci.org/mode/mode-ruby.png?branch=v0.0.17)](https://travis-ci.org/mode/mode-ruby)
 [![Code Climate](https://codeclimate.com/repos/52a90897f3ea0044b10034de/badges/68f57393128c9c3fe2c5/gpa.png)](https://codeclimate.com/repos/52a90897f3ea0044b10034de/feed)
 
-
-## Install Mode
-
-**Mode requires Ruby 1.9 or JRuby 1.7 or newer**
-
-For the best performance and compatibility we recommend JRuby.
-
-If you don't currently have a suitable ruby or aren't sure then follow [these directions](doc/install_ruby.md) to install it before continuing.
-
-```
-gem install mode
-```
-
-## Logging In
-
-Before you use the mode gem you'll need to login.
-
-The login process allows you to authorize the machine to connect via
-the API with the use of an API access token. The first time you use this
-command the it will look as follows:
-
-```
-$ mode login
-Enter your Mode credentials:
-Username: besquared
-Password: 
-
-No API tokens found, would you like to create a new token? [y/n] y
-
-Choose a token name: Connector
-Updated configuration at /Users/josh/.mode/config.yml
-```
-
-The token name is just a descriptive name that will help you remember what the token is used for.
-
-Tokens can be renamed or deleted at any time from your account settings page in Mode.
-
-## Adding Data Sources
-
-Open the Mode configuration file in your favorite text editor (I'm using sublime text)
-
-```
-$ subl ~/.mode/config.yml
-```
-
-A sample data sources configuration is listed which you can copy to the bottom of your config file and modify:
-
-```
-data_sources:
-  development:
-    adapter: jdbc:postgresql
-    host: localhost
-    database: development
-    username: postgres
-    password:
-
-  warehouse:
-    adapter: jdbc:redshift
-    host: hostname.redshift.amazonaws.com
-    port: 5439
-    database: dev
-    username: 
-    password: 
-```
-
-## Database Drivers
-
-If you're using JRuby then you can load JDBC drivers by copying the driver's jar files into Mode's drivers directory
-
-Example for teradata:
-
-```
-cp terajdbc4.jar ~/mode/drivers
-cp tdgssconfig.jar ~/mode/drivers
-```
-
-For ruby1.9+ you need to install the correct driver gem and libraries
-
-```
-# PostgreSQL
-gem install pg
-
-# Redshift
-gem install sequel_redshift
-
-# MySQL
-gem install mysql2
-
-# Oracle 9i+
-gem install oci8
-
-# SQL Server & Azure
-gem install tiny_tds
-
-# DB2
-gem install ibm_db
-```
-
-## Verifying your API and driver configuration
-
-You can verify that your data sources are correct by using the verify command:
-
-```
-$ mode connect verify
-```
-
-## Controlling the connector
-
-Starting
-
-```
-$ mode connect start
-```
-
-Restarting
-
-```
-$ mode connect restart
-```
-
-Stopping
-
-```
-$ mode connect stop
-```
-
-## Connector logging
-
-The connect logs all its activity and errors to a log file that rotates weekly by default.
-
-```
-tail -f ~/.mode/log/mode.log
-```
+To learn how to install and use this gem please visit [Mode Analytics Help](http://help.modeanalytics.com)

data/lib/connect.rb

@@ -4,21 +4,21 @@ $LOAD_PATH.unshift File.dirname(__FILE__)
 
 require 'mode'
 
-runner = Mode::Connector::Daemon.new(:max_jobs => ARGV[0] || 4)
+daemon = Mode::Connector::Daemon.new(:max_jobs => ARGV[0] || 4)
 
 trap("INT") do
   Mode::Logger.instance.info("connect.rb", "Received INT signal, shutting down.")
-  runner.stop
+  daemon.stop
 end
 
 trap("HUP") do
   Mode::Logger.instance.info("connect.rb", "Received HUP signal, shutting down.")
-  runner.stop
+  daemon.stop
 end
 
 trap("TERM") do
   Mode::Logger.instance.info("connect.rb", "Received TERM signal, shutting down.")
-  runner.stop
+  daemon.stop
 end
 
-runner.start
+daemon.start

data/lib/mode.rb

@@ -30,19 +30,23 @@ require 'mode/api/request'
 
 # Core
 require 'mode/connector/type_map'
-require 'mode/connector/data_source'
+require 'mode/connector/tables/rdbms'
+require 'mode/connector/databases/rdbms'
+require 'mode/connector/data_sources/base'
 
-# Operations
+# Models
+require 'mode/connector/dataset'
+
+# Commands
+require 'mode/connector/commands/select_table_metadata'
+require 'mode/connector/commands/select_report_run_dataset'
+
+# Core Operations
 require 'mode/connector/registrar'
 require 'mode/connector/scheduler'
 require 'mode/connector/poller'
-require 'mode/connector/processor'
 require 'mode/connector/selector'
-require 'mode/connector/uploader'
-
-# Models
-require 'mode/connector/dataset'
-require 'mode/connector/message'
+require 'mode/connector/dispatcher'
 
 # Daemon
 require 'mode/connector/daemon'

data/lib/mode/api/form.rb

@@ -22,32 +22,54 @@ module Mode
       def submit!(params = {})
         inputs = content['input']
         params = input_values(inputs, params)
-        Mode::API::Request.send(method.to_sym, action, params)
+        Mode::API::Request.send(method.to_sym, action, params, request_opts)
       end
 
       private
 
+      def request_opts
+        {
+          :content_type => content_type
+        }.delete_if{|k, v| v.nil? }
+      end
+
+      def content_type
+        content['content_type']
+      end
+
       def input_values(inputs, params = {})
         merged = {}
         return merged if inputs.nil?
 
         inputs.each do |name, value|
-          if value.instance_of?(Hash)
-            if value.has_key?('value')
-              # we reached a leaf
-              merged[name] = params[name] || value['value']
+          if name =~ /\[\]$/
+            clean_name = name.gsub(/\[\]$/, '')
+            param_value = params[clean_name.to_sym]
+
+            merged[clean_name] = param_value.map do |item|
+              input_values(value, item)
+            end unless param_value.nil?
+
+          elsif value.instance_of?(Hash)
+            param_value = params[name.to_sym]
+
+            if is_leaf?(value)
+              merged[name] = param_value.nil? ? value['value'] : param_value
             else
-              # we're at an intermediate node
-              merged[name] = input_values(value, params[name])
+              merged[name] = input_values(value, param_value) unless param_value.nil?
             end
           else
-            # non-field node
+            # non-field node (WHAT DO?)
             # merged[name] = params[name]
           end
         end
 
         merged
       end
+
+      def is_leaf?(value)
+        value.find{ |k, v| v.instance_of?(Hash) }.nil?
+      end
     end
   end
 end

data/lib/mode/api/request.rb

@@ -1,6 +1,7 @@
 require 'uri'
 require 'json'
 require 'faraday'
+require 'faraday_middleware'
 
 module Mode
   module API
@@ -13,11 +14,16 @@ module Mode
         @params = params
       end
 
-      def perform(request_opts = {})
+      def perform(opts = {})
         response = http.send(method.to_sym) do |request|
           request.url path
           request.body = params unless params.empty?
-          request.options[:timeout] = request_opts.fetch(:timeout, 30)
+
+          if opts[:content_type]
+            request.headers['Content-Type'] = opts[:content_type]
+          end
+
+          request.options[:timeout] = opts.fetch(:timeout, 30)
         end
 
         response.success? ? success(response) : error(response)
@@ -56,7 +62,7 @@ module Mode
         response_lines = response.body.split("\n")
 
         Mode::Logger.instance.send(level,
-          "API::Request", "#{response.status}",
+          self.class.name, "#{response.status}",
           ["HOST #{self.class.base_url}", "#{method.upcase} #{path}", *response_lines])
       end
 
@@ -104,24 +110,28 @@ module Mode
         # Request Methods
         #
 
-        def head(path)
-          new(:head, resolve_path(path)).perform
+        def head(path, opts = {})
+          new(:head, resolve_path(path)).perform(opts)
+        end
+
+        def get(path, params = {}, opts = {})
+          new(:get, resolve_path(path), params).perform(opts)
         end
 
-        def get(path, params = {})
-          new(:get, resolve_path(path), params).perform
+        def post(path, params = {}, opts = {})
+          new(:post, resolve_path(path), params).perform(opts)
         end
 
-        def post(path, params = {})
-          new(:post, resolve_path(path), params).perform
+        def put(path, params = {}, opts = {})
+          new(:put, resolve_path(path), params).perform(opts)
         end
 
-        def put(path, params = {})
-          new(:put, resolve_path(path), params).perform
+        def patch(path, params = {}, opts = {})
+          new(:patch, resolve_path(path), params).perform(opts)
         end
 
-        def delete(path, params = {})
-          new(:delete, resolve_path(path), params).perform
+        def delete(path, params = {}, opts = {})
+          new(:delete, resolve_path(path), params).perform(opts)
         end
 
         def resolve_path(path)
@@ -140,10 +150,12 @@ module Mode
           "#{base_path}/packages"
         end
 
+        # user.access_tokens
         def access_tokens_path
           "#{base_path}/access_tokens"
         end
 
+        # access_token.data_source_connections
         def data_source_connections_path
           "#{base_path}/data_source_connections"
         end
@@ -153,6 +165,7 @@ module Mode
           [data_source_connections_path, token].join('/').strip
         end
 
+        # connection.links('messages').follow()
         def data_source_connection_messages_path
           [data_source_connection_path, 'messages'].join('/').strip
         end
@@ -162,10 +175,15 @@ module Mode
         #
         def http(options = {})
           @_http ||= Faraday.new(:url => base_url) do |builder|
-            builder.request  :multipart # adds small overhead to each request 
+            builder.request  :multipart # adds small overhead to each request
             builder.request  :url_encoded
-            builder.adapter  Faraday.default_adapter
+            builder.request  :json
+
             builder.basic_auth(username, password)
+
+            builder.use FaradayMiddleware::FollowRedirects, limit: 5
+
+            builder.adapter  Faraday.default_adapter
           end
         end
 
@@ -197,7 +215,7 @@ module Mode
           when :staging
             "staging.modeanalytics.com"
           else
-            "stealth.modeanalytics.com"
+            "modeanalytics.com"
           end
         end
 

data/lib/mode/commands/connect.rb

@@ -14,8 +14,6 @@ module Mode
 
       def execute(options = {})
         validate_config!
-
-        register! 
         run_command!
       end
 
@@ -30,12 +28,6 @@ module Mode
 
       private
 
-      def register!
-        if ['start', 'restart'].include?(command)
-          Mode::Connector::Registrar.new(configuration).perform!
-        end
-      end
-
       def run_command!
         if command == 'status'
           daemon.alive?

data/lib/mode/commands/import.rb

@@ -64,7 +64,7 @@ module Mode
       end
 
       def submit_import_form(resource, params)
-        resource.forms('import').submit!('import' => params)
+        resource.forms('import').submit!(:import => params)
       end
 
       def parse_uploaded_response(content)

data/lib/mode/config.rb

@@ -56,6 +56,14 @@ module Mode
         new(path, filename)
       end
 
+      def load_drivers!
+        if RUBY_PLATFORM == 'java'
+          Dir[File.join(drivers_dir, '*.jar')].each do |driver|
+            load driver
+          end
+        end
+      end
+
       def default_dir
         File.expand_path("~/.mode")
       end
@@ -82,7 +90,7 @@ module Mode
 
       @data_sources ||= []
       (config['data_sources'] || []).each do |name, props|
-        @data_sources << Mode::Connector::DataSource.new(name, props)
+        @data_sources << Mode::Connector::DataSources::Base.build(name, props)
       end
     end