purview 1.0.0.beta2 → 1.0.0.beta3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3e3e1cc20d1c3e7ff4a68a03010621b55dafa340
-  data.tar.gz: 38e6f5c2ac6013c38cab51cad3594079ef6aaba4
+  metadata.gz: 6e042a9a30d7596c9a7dad1ce2e121b9f9bf160f
+  data.tar.gz: b4a1f379840183ae0a11f411a409849ed06655b2
 SHA512:
-  metadata.gz: a9596c0fbcb897ae45964dcddc151f49da6bb0153e33c8f55d0fc9e199d4f838a7dd716f6b76abf6133a883c6521c50500941ce082d583c48562268bc1e946cd
-  data.tar.gz: ba8989022708f2c1fddf49d77cd3dac2ca3570f710b2b14207c10fa1a6ca1408857948de1e1e8319e0958a2f06928c99ad3dd0dbcfb379bb579010d6c04e0243
+  metadata.gz: 52be209e82452fa5ec45ce2726c516ef315cb32de3c67b2b74862def7a29fb4fd7c95ff4da270de4f8f5262b0a4aa4ad11c35e6ffbc2e27c3bce366e998a8d8e
+  data.tar.gz: c5768e07904cd00ae25d18adfb163ff5516d2337c2451812c1313ec5e1b183ec2ffdddcbb08b6a434607931e7ccbeaec48ea91e8f13a2d118c7b8461cf95529a

data/README.md

@@ -26,22 +26,6 @@ Load the `MySQL` client (for `PostgreSQL` simply change 'mysql2' to 'pg')
 require 'mysql2'
 ```
 
-Set the database-name (this can be anything, but it must exist)
-```ruby
-database_name = :data_warehouse
-```
-
-Combine all the configuration options and instantiate the `Database` (for
-`PostgreSQL` simply change `MySQL` to `PostgreSQL`)
-```ruby
-database_opts = {}
-
-database = Purview::Databases::MySQL.new(
-  database_name,
-  database_opts
-)
-```
-
 Set the table-name (this can be anything, but it must exist)
 ```ruby
 table_name = :users
@@ -93,7 +77,6 @@ Combine all the configuration options and instantiate the `Table`
 ```ruby
 table_opts = {
   :columns => columns,
-  :database => database,
   :loader => loader_opts,
   :parser => parser_opts,
   :puller => puller_opts,
@@ -106,22 +89,39 @@ table = Purview::Tables::Raw.new(
 )
 ```
 
+Set the database-name (this can be anything, but it must exist)
+```ruby
+database_name = :data_warehouse
+```
+
+Combine all the configuration options and instantiate the `Database` (for
+`PostgreSQL` simply change `MySQL` to `PostgreSQL`)
+```ruby
+database_opts = {
+  :tables => [table],
+}
+
+database = Purview::Databases::MySQL.new(
+  database_name,
+  database_opts
+)
+```
+
 Add the `Table` to the `Database` (schema). In order for [the] `Table` to be
 `sync[ed]` it *must* be added to [the] `Database`
 ```ruby
 database.add_table(table)
 ```
 
-Create the `Table`. Recommended for testing purposes *only*. For production
-environments you will likely want an external process to manage the schema (for
-`PostgreSQL` simply change `Mysql2::Error` to `PG::DuplicateTable`)
+Create the `Table` (in the DB). Recommended for testing purposes *only*. For
+production environments you will likely want an external process to manage the
+schema (for `PostgreSQL` simply change `Mysql2::Error` to `PG::DuplicateTable`)
 ```ruby
 begin
-  database.create_table(
-    database.connect,
-    table
-  )
-rescue Mysql2::Error; end
+  database.create_table(table)
+rescue Mysql2::Error
+  # Swallow
+end
 ```
 
 Sync the `Database`. This process will select a [candidate] `Table`, pull data

data/lib/purview/databases/base.rb

@@ -6,60 +6,39 @@ module Purview
       def initialize(name, opts={})
         @name = name
         @opts = opts
-        @tables = Set.new
       end
 
-      def add_table(table)
-        @tables << table
-      end
-
-      def create_index(connection, table, columns, opts={})
+      def create_table(table, opts={})
         table_opts = extract_table_options(opts)
         table_name = table_name(table, table_opts)
-        index_opts = extract_index_options(opts)
-        index_name(
-          table_name,
-          columns,
-          index_opts
-        ).tap do |index_name|
-          connection.execute(
-            create_index_sql(
-              table_name,
-              index_name,
-              table,
-              columns,
-              index_opts
-            )
-          )
-        end
-      end
-
-      def create_table(connection, table, opts={})
-        table_opts = extract_table_options(opts)
-        table_name(table, table_opts).tap do |table_name|
-          connection.execute(
-            create_table_sql(
-              table_name,
-              table,
-              table_opts
-            )
-          )
-          if table_opts[:create_indices]
-            table.indexed_columns.each do |columns|
-              create_index(
-                connection,
+        with_context_logging("`create_table` for: #{table_name}") do
+          with_new_connection do |connection|
+            connection.execute(
+              create_table_sql(
+                table_name,
                 table,
-                columns,
-                :table => { :name => table_name }
+                table_opts
               )
+            )
+            if table_opts[:create_indices]
+              table.indexed_columns.each do |columns|
+                create_index(
+                  connection,
+                  table,
+                  columns,
+                  :table => { :name => table_name }
+                )
+              end
             end
           end
+          table_name
         end
       end
 
       def create_temporary_table(connection, table, opts={})
         table_opts = extract_table_options(opts)
-        table_name(table, table_opts).tap do |table_name|
+        table_name = table_name(table, table_opts)
+        with_context_logging("`create_temporary_table` for: #{table_name}") do
           connection.execute(
             create_temporary_table_sql(
               table_name,
@@ -77,89 +56,79 @@ module Purview
               )
             end
           end
+          table_name
         end
       end
 
       def disable_table(table)
-        with_context_logging("`disable_table` for: #{table_name(table)}") do
+        table_name = table_name(table)
+        with_context_logging("`disable_table` for: #{table_name}") do
           with_new_connection do |connection|
-            set_enabled_for_table(
-              connection,
-              table,
-              false_value
-            )
+            rows_affected = \
+              connection.execute(disable_table_sql(table)).rows_affected
+            raise Purview::Exceptions::TableAlreadyDisabled.new(table) \
+              if zero?(rows_affected)
           end
+          table_name
         end
       end
 
-      def drop_table(connection, table, opts={})
-        table_opts = extract_table_options(opts)
-        table_name(table, table_opts).tap do |table_name|
-          connection.execute(
-            drop_table_sql(
-              table_name,
-              table,
-              table_opts
-            )
-          )
-        end
-      end
-
-      def drop_index(connection, table, columns, opts={})
+      def drop_table(table, opts={})
         table_opts = extract_table_options(opts)
         table_name = table_name(table, table_opts)
-        index_opts = extract_index_options(opts)
-        index_name(
-          table_name,
-          columns,
-          index_opts
-        ).tap do |index_name|
-          connection.execute(
-            drop_index_sql(
-              table_name,
-              index_name,
-              table,
-              columns,
-              index_opts
+        with_context_logging("`drop_table` for: #{table_name}") do
+          with_new_connection do |connection|
+            connection.execute(
+              drop_table_sql(
+                table_name,
+                table,
+                table_opts
+              )
             )
-          )
+          end
+          table_name
         end
       end
 
-      def enable_table(table)
-        with_context_logging("`enable_table` for: #{table_name(table)}") do
+      def enable_table(table, timestamp=Time.now.utc)
+        table_name = table_name(table)
+        with_context_logging("`enable_table` for: #{table_name}") do
           with_new_connection do |connection|
-            set_enabled_for_table(
-              connection,
-              table,
-              true_value
-            )
+            rows_affected = \
+              connection.execute(enable_table_sql(table, timestamp)).rows_affected
+            raise Purview::Exceptions::TableAlreadyEnabled.new(table) \
+              if zero?(rows_affected)
           end
+          table_name
         end
       end
 
-      def lock_table(table, timestamp)
-        with_context_logging("`lock_table` for: #{table_name(table)}") do
+      def lock_table(table, timestamp=Time.now.utc)
+        table_name = table_name(table)
+        with_context_logging("`lock_table` for: #{table_name}") do
           with_new_connection do |connection|
             rows_affected = \
               connection.execute(lock_table_sql(table, timestamp)).rows_affected
-            raise Purview::Exceptions::CouldNotAcquireLock.new(table) \
+            raise Purview::Exceptions::TableAlreadyLocked.new(table) \
               if zero?(rows_affected)
           end
+          table_name
         end
       end
 
       def sync
-        with_new_connection do |connection|
-          with_transaction(connection) do |timestamp|
-            with_next_table(connection, timestamp) do |table|
-              with_next_window(
-                connection,
-                table,
-                timestamp
-              ) do |window|
-                with_table_locked(table, timestamp) do
-                  table.sync(connection, window)
+        with_context_logging('`sync`') do
+          with_new_connection do |connection|
+            with_transaction(connection) do |timestamp|
+              with_next_table(connection, timestamp) do |table|
+                with_next_window(
+                  connection,
+                  table,
+                  timestamp
+                ) do |window|
+                  with_table_locked(table, timestamp) do
+                    table.sync(connection, window)
+                  end
                 end
               end
             end
@@ -168,13 +137,15 @@ module Purview
       end
 
       def unlock_table(table)
-        with_context_logging("`unlock_table` for: #{table_name(table)}") do
+        table_name = table_name(table)
+        with_context_logging("`unlock_table` for: #{table_name}") do
           with_new_connection do |connection|
             rows_affected = \
               connection.execute(unlock_table_sql(table)).rows_affected
-            raise Purview::Exceptions::LockAlreadyReleased.new(table) \
+            raise Purview::Exceptions::TableAlreadyUnlocked.new(table) \
               if zero?(rows_affected)
           end
+          table_name
         end
       end
 
@@ -184,7 +155,7 @@ module Purview
       include Purview::Mixins::Helpers
       include Purview::Mixins::Logger
 
-      attr_reader :opts, :tables
+      attr_reader :opts
 
       public :connect
 
@@ -219,13 +190,40 @@ module Purview
       end
 
       def connection_opts
-        { :database => name }
+        {
+          :database => database_name,
+          :host => database_host,
+          :password => database_password,
+          :port => database_port,
+          :username => database_username,
+        }
       end
 
       def connection_type
         raise %{All "#{Base}(s)" must override the "connection_type" method}
       end
 
+      def create_index(connection, table, columns, opts={})
+        table_opts = extract_table_options(opts)
+        table_name = table_name(table, table_opts)
+        index_opts = extract_index_options(opts)
+        index_name(
+          table_name,
+          columns,
+          index_opts
+        ).tap do |index_name|
+          connection.execute(
+            create_index_sql(
+              table_name,
+              index_name,
+              table,
+              columns,
+              index_opts
+            )
+          )
+        end
+      end
+
       def create_index_sql(table_name, index_name, table, columns, index_opts={})
         raise %{All "#{Base}(s)" must override the "create_index_sql" method}
       end
@@ -238,6 +236,26 @@ module Purview
         raise %{All "#{Base}(s)" must override the "create_temporary_table_sql" method}
       end
 
+      def database_host
+        opts[:host]
+      end
+
+      def database_name
+        name
+      end
+
+      def database_password
+        opts[:password]
+      end
+
+      def database_port
+        opts[:port]
+      end
+
+      def database_username
+        opts[:username]
+      end
+
       def default(column)
         column.default || default_map[column.type]
       end
@@ -254,6 +272,31 @@ module Purview
         raise %{All "#{Base}(s)" must override the "dialect_type" method}
       end
 
+      def disable_table_sql(table)
+        raise %{All "#{Base}(s)" must override the "disable_table_sql" method}
+      end
+
+      def drop_index(table, columns, opts={})
+        table_opts = extract_table_options(opts)
+        table_name = table_name(table, table_opts)
+        index_opts = extract_index_options(opts)
+        index_name(
+          table_name,
+          columns,
+          index_opts
+        ).tap do |index_name|
+          connection.execute(
+            drop_index_sql(
+              table_name,
+              index_name,
+              table,
+              columns,
+              index_opts
+            )
+          )
+        end
+      end
+
       def drop_index_sql(table_name, index_name, table, columns, index_opts={})
         raise %{All "#{Base}(s)" must override the "drop_index_sql" method}
       end
@@ -262,6 +305,10 @@ module Purview
         raise %{All "#{Base}(s)" must override the "drop_table_sql" method}
       end
 
+      def enable_table_sql(table, timestamp)
+        raise %{All "#{Base}(s)" must override the "enable_table_sql" method}
+      end
+
       def ensure_table_metadata_table_exists
         with_new_connection do |connection|
           connection.execute(ensure_table_metadata_table_exists_sql)
@@ -296,14 +343,14 @@ module Purview
         dialect.false_value
       end
 
-      def get_enabled_for_table(connection, table)
-        row = connection.execute(get_last_pulled_at_for_table_sql(table)).rows[0]
-        enabled = row[table_metadata_enabled_column_name]
-        !!(enabled =~ /\A(true|t|yes|y|1)\z/i)
+      def get_enabled_at_for_table(connection, table)
+        row = connection.execute(get_enabled_at_for_table_sql(table)).rows[0]
+        timestamp = row[table_metadata_enabled_at_column_name]
+        timestamp ? Time.parse(timestamp) : nil
       end
 
-      def get_enabled_for_table_sql(table)
-        raise %{All "#{Base}(s)" must override the "get_enabled_for_table_sql" method}
+      def get_enabled_at_for_table_sql(table)
+        raise %{All "#{Base}(s)" must override the "get_enabled_at_for_table_sql" method}
       end
 
       def get_last_pulled_at_for_table(connection, table)
@@ -401,12 +448,12 @@ module Purview
         dialect.sanitized(value)
       end
 
-      def set_enabled_for_table(connection, table, enabled)
-        connection.execute(set_enabled_for_table_sql(table, enabled))
+      def set_enabled_at_for_table(connection, table, timestamp)
+        connection.execute(set_enabled_at_for_table_sql(table, timestamp))
       end
 
-      def set_enabled_for_table_sql(table, enabled)
-        raise %{All "#{Base}(s)" must override the "set_enabled_for_table_sql" method}
+      def set_enabled_at_for_table_sql(table, timestamp)
+        raise %{All "#{Base}(s)" must override the "set_enabled_at_for_table_sql" method}
       end
 
       def set_last_pulled_at_for_table(connection, table, timestamp)
@@ -433,13 +480,13 @@ module Purview
         raise %{All "#{Base}(s)" must override the "set_max_timestamp_pulled_for_table_sql" method}
       end
 
-      def table_metadata_enabled_column_definition
-        column = Purview::Columns::Boolean.new(table_metadata_enabled_column_name)
+      def table_metadata_enabled_at_column_definition
+        column = Purview::Columns::Timestamp.new(table_metadata_enabled_at_column_name)
         column_definition(column)
       end
 
-      def table_metadata_enabled_column_name
-        'enabled'
+      def table_metadata_enabled_at_column_name
+        'enabled_at'
       end
 
       def table_metadata_last_pulled_at_column_definition
@@ -482,18 +529,26 @@ module Purview
         'table_name'
       end
 
+      def table_name(table, table_opts={})
+        table_opts[:name] || table.name
+      end
+
+      def tables
+        @tables ||= Set.new.tap do |result|
+          (opts[:tables] || []).each do |table|
+            table.database = self if result.add?(table)
+          end
+        end
+      end
+
       def tables_by_name
-        {}.tap do |result|
+        @tables_by_name ||= {}.tap do |result|
           tables.each do |table|
             result[table.name] = table
           end
         end
       end
 
-      def table_name(table, table_opts={})
-        table_opts[:name] || table.name
-      end
-
       def true_value
         dialect.true_value
       end

data/lib/purview/databases/mysql.rb

@@ -37,6 +37,17 @@ module Purview
         Purview::Dialects::MySQL
       end
 
+      def disable_table_sql(table)
+        'UPDATE %s SET %s = %s WHERE %s = %s AND %s IS NOT NULL' % [
+          table_metadata_table_name,
+          table_metadata_enabled_at_column_name,
+          null_value,
+          table_metadata_table_name_column_name,
+          quoted(table.name),
+          table_metadata_enabled_at_column_name,
+        ]
+      end
+
       def drop_index_sql(table_name, index_name, table, columns, index_opts={})
         'DROP INDEX %s' % [
           index_name,
@@ -49,6 +60,17 @@ module Purview
         ]
       end
 
+      def enable_table_sql(table, timestamp)
+        'UPDATE %s SET %s = %s WHERE %s = %s AND %s IS NULL' % [
+          table_metadata_table_name,
+          table_metadata_enabled_at_column_name,
+          quoted(timestamp),
+          table_metadata_table_name_column_name,
+          quoted(table.name),
+          table_metadata_enabled_at_column_name,
+        ]
+      end
+
       def ensure_table_metadata_exists_for_table_sql(table)
         'INSERT IGNORE INTO %s VALUES (%s, NULL, NULL, NULL, NULL)' % [
           table_metadata_table_name,
@@ -60,16 +82,16 @@ module Purview
         'CREATE TABLE IF NOT EXISTS %s (%s PRIMARY KEY, %s, %s, %s, %s)' % [
           table_metadata_table_name,
           table_metadata_table_name_column_definition,
-          table_metadata_enabled_column_definition,
+          table_metadata_enabled_at_column_definition,
           table_metadata_last_pulled_at_column_definition,
           table_metadata_locked_at_column_definition,
           table_metadata_max_timestamp_pulled_column_definition,
         ]
       end
 
-      def get_enabled_for_table_sql(table)
+      def get_enabled_at_for_table_sql(table)
         'SELECT %s FROM %s WHERE %s = %s' % [
-          table_metadata_enabled_column_name,
+          table_metadata_enabled_at_column_name,
           table_metadata_table_name,
           table_metadata_table_name_column_name,
           quoted(table.name),
@@ -119,27 +141,23 @@ module Purview
       end
 
       def next_table_sql(timestamp)
-        'SELECT %s FROM %s WHERE %s = %s AND %s IS NULL ORDER BY %s IS NULL DESC, %s LIMIT 1' % [
+        'SELECT %s FROM %s WHERE %s IS NOT NULL AND %s IS NULL ORDER BY %s IS NULL DESC, %s LIMIT 1' % [
           table_metadata_table_name_column_name,
           table_metadata_table_name,
-          table_metadata_enabled_column_name,
-          quoted(true_value),
+          table_metadata_enabled_at_column_name,
           table_metadata_locked_at_column_name,
           table_metadata_last_pulled_at_column_name,
           table_metadata_last_pulled_at_column_name,
         ]
       end
 
-      def set_enabled_for_table_sql(table, enabled)
-        'UPDATE %s SET %s = %s WHERE %s = %s AND (%s IS NULL OR %s = %s)' % [
+      def set_enabled_at_for_table_sql(table, timestamp)
+        'UPDATE %s SET %s = %s WHERE %s = %s AND %s' % [
           table_metadata_table_name,
-          table_metadata_enabled_column_name,
-          quoted(enabled),
+          table_metadata_enabled_at_column_name,
+          quoted(timestamp),
           table_metadata_table_name_column_name,
           quoted(table.name),
-          table_metadata_enabled_column_name,
-          table_metadata_enabled_column_name,
-          quoted(false_value),
         ]
       end
 

data/lib/purview/databases/postgresql.rb

@@ -33,6 +33,17 @@ module Purview
         Purview::Dialects::PostgreSQL
       end
 
+      def disable_table_sql(table)
+        'UPDATE %s SET %s = %s WHERE %s = %s AND %s IS NOT NULL' % [
+          table_metadata_table_name,
+          table_metadata_enabled_at_column_name,
+          null_value,
+          table_metadata_table_name_column_name,
+          quoted(table.name),
+          table_metadata_enabled_at_column_name,
+        ]
+      end
+
       def drop_index_sql(table_name, index_name, table, columns, index_opts={})
         'DROP INDEX %s' % [
           index_name,
@@ -45,6 +56,17 @@ module Purview
         ]
       end
 
+      def enable_table_sql(table, timestamp)
+        'UPDATE %s SET %s = %s WHERE %s = %s AND %s IS NULL' % [
+          table_metadata_table_name,
+          table_metadata_enabled_at_column_name,
+          quoted(timestamp),
+          table_metadata_table_name_column_name,
+          quoted(table.name),
+          table_metadata_enabled_at_column_name,
+        ]
+      end
+
       def ensure_table_metadata_exists_for_table_sql(table)
         'INSERT INTO %s (%s) SELECT %s WHERE NOT EXISTS (SELECT 1 FROM %s WHERE %s = %s)' % [
           table_metadata_table_name,
@@ -60,16 +82,16 @@ module Purview
         'CREATE TABLE IF NOT EXISTS %s (%s PRIMARY KEY, %s, %s, %s, %s)' % [
           table_metadata_table_name,
           table_metadata_table_name_column_definition,
-          table_metadata_enabled_column_definition,
+          table_metadata_enabled_at_column_definition,
           table_metadata_last_pulled_at_column_definition,
           table_metadata_locked_at_column_definition,
           table_metadata_max_timestamp_pulled_column_definition,
         ]
       end
 
-      def get_enabled_for_table_sql(table)
+      def get_enabled_at_for_table_sql(table)
         'SELECT %s FROM %s WHERE %s = %s' % [
-          table_metadata_enabled_column_name,
+          table_metadata_enabled_at_column_name,
           table_metadata_table_name,
           table_metadata_table_name_column_name,
           quoted(table.name),
@@ -122,27 +144,23 @@ module Purview
       end
 
       def next_table_sql(timestamp)
-        'SELECT %s FROM %s WHERE %s = %s AND %s IS NULL ORDER BY %s IS NULL DESC, %s LIMIT 1' % [
+        'SELECT %s FROM %s WHERE %s IS NOT NULL AND %s IS NULL ORDER BY %s IS NULL DESC, %s LIMIT 1' % [
           table_metadata_table_name_column_name,
           table_metadata_table_name,
-          table_metadata_enabled_column_name,
-          quoted(true_value),
+          table_metadata_enabled_at_column_name,
           table_metadata_locked_at_column_name,
           table_metadata_last_pulled_at_column_name,
           table_metadata_last_pulled_at_column_name,
         ]
       end
 
-      def set_enabled_for_table_sql(table, enabled)
-        'UPDATE %s SET %s = %s WHERE %s = %s AND (%s IS NULL OR %s = %s)' % [
+      def set_enabled_at_for_table_sql(table, timestamp)
+        'UPDATE %s SET %s = %s WHERE %s = %s AND %s' % [
           table_metadata_table_name,
-          table_metadata_enabled_column_name,
-          quoted(enabled),
+          table_metadata_enabled_at_column_name,
+          quoted(timestamp),
           table_metadata_table_name_column_name,
           quoted(table.name),
-          table_metadata_enabled_column_name,
-          table_metadata_enabled_column_name,
-          quoted(false_value),
         ]
       end
 

data/lib/purview/exceptions/database_already_assigned.rb

@@ -0,0 +1,9 @@
+module Purview
+  module Exceptions
+    class DatabaseAlreadyAssigned < BaseTable
+      def message
+        "Database already assigned for table: #{table.name}"
+      end
+    end
+  end
+end

data/lib/purview/exceptions.rb

@@ -2,6 +2,7 @@ require 'purview/exceptions/base'
 require 'purview/exceptions/base_table'
 
 require 'purview/exceptions/could_not_acquire_lock'
+require 'purview/exceptions/database_already_assigned'
 require 'purview/exceptions/lock_already_released'
 require 'purview/exceptions/no_table'
 require 'purview/exceptions/no_window'

data/lib/purview/mixins/helpers.rb

@@ -9,6 +9,10 @@ module Purview
         value.nil? ? default : value
       end
 
+      def filter_blank_values(hash)
+        hash.reject { |_, value| blank?(value) }
+      end
+
       def filter_nil_values(hash)
         hash.reject { |_, value| value.nil? }
       end

data/lib/purview/pullers/base_sql.rb

@@ -18,13 +18,13 @@ module Purview
       end
 
       def connection_opts
-        filter_nil_values(
+        {
           :database => database_name,
           :host => database_host,
           :password => database_password,
           :port => database_port,
-          :username => database_username
-        )
+          :username => database_username,
+        }
       end
 
       def connection_type

data/lib/purview/raw_connections/base.rb

@@ -111,7 +111,7 @@ module Purview
       end
 
       def username
-        opts[:username] || Etc.getlogin
+        opts[:username]
       end
     end
   end

data/lib/purview/raw_connections/jdbc/mysql.rb

@@ -1,4 +1,6 @@
-if jruby? && safe_require('jdbc/mysql')
+safe_require('jdbc-mysql')
+
+if defined?(Jdbc::MySQL)
   Jdbc::MySQL.load_driver
 
   module Purview
@@ -10,6 +12,10 @@ if jruby? && safe_require('jdbc/mysql')
           def engine
             'mysql'
           end
+
+          def username
+            super || ENV['USER'] || Etc.getlogin
+          end
         end
       end
     end

data/lib/purview/raw_connections/jdbc/postgres.rb

@@ -1,4 +1,6 @@
-if jruby? && safe_require('jdbc/postgres')
+safe_require('jdbc-postgres')
+
+if defined?(Jdbc::Postgres)
   Jdbc::Postgres.load_driver
 
   module Purview
@@ -10,6 +12,10 @@ if jruby? && safe_require('jdbc/postgres')
           def engine
             'postgresql'
           end
+
+          def username
+            super || ENV['PGUSER'] || Etc.getlogin
+          end
         end
       end
     end

data/lib/purview/raw_connections/mysql2.rb

@@ -1,4 +1,6 @@
-if !jruby? && safe_require('mysql2')
+safe_require('mysql2')
+
+if defined?(Mysql2)
   module Purview
     module RawConnections
       class Mysql2 < Base
@@ -18,15 +20,19 @@ if !jruby? && safe_require('mysql2')
 
         def new_connection
           ::Mysql2::Client.new(
-            filter_nil_values(
-              :database => database,
-              :host => host,
-              :password => password,
+            filter_blank_values(
+              :database => database.to_s,
+              :host => host.to_s,
+              :password => password.to_s,
               :port => port,
-              :username => username
+              :username => username.to_s
             )
           )
         end
+
+        def username
+          super || ENV['USER'] || Etc.getlogin
+        end
       end
     end
   end

data/lib/purview/raw_connections/pg.rb

@@ -1,4 +1,6 @@
-if !jruby? && safe_require('pg')
+safe_require('pg')
+
+if defined?(PG)
   module Purview
     module RawConnections
       class PG < Base
@@ -27,6 +29,10 @@ if !jruby? && safe_require('pg')
             )
           )
         end
+
+        def username
+          super || ENV['PGUSER'] || Etc.getlogin
+        end
       end
     end
   end

data/lib/purview/raw_connections.rb

@@ -6,3 +6,7 @@ require 'purview/raw_connections/jdbc/postgres'
 
 require 'purview/raw_connections/mysql2'
 require 'purview/raw_connections/pg'
+
+if !defined?(Purview::RawConnections::MySQL) && !defined?(Purview::RawConnections::PostgreSQL)
+  raise 'Could not initialize raw-connections; please install and require one or more of the following gems: `jdbc-mysql`, `jdbc-postgres`, `mysql2` and/or `pg`'
+end

data/lib/purview/tables/base.rb

@@ -1,7 +1,7 @@
 module Purview
   module Tables
     class Base
-      attr_reader :name
+      attr_reader :database, :name
 
       def initialize(name, opts={})
         @name = name
@@ -40,8 +40,9 @@ module Purview
         ]
       end
 
-      def database
-        opts[:database]
+      def database=(value)
+        raise Purview::Exceptions::DatabaseAlreadyAssigned.new(self) if database
+        @database = value
       end
 
       def id_column

data/lib/purview/version.rb

@@ -1,3 +1,3 @@
 module Purview
-  VERSION = '1.0.0.beta2'
+  VERSION = '1.0.0.beta3'
 end

data/lib/purview.rb

@@ -1,11 +1,7 @@
-def jruby?
-  defined?(JRUBY_VERSION)
-end
-
 def safe_require(name)
   require name
 rescue LoadError
-  nil
+  false
 end
 
 require 'csv'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: purview
 version: !ruby/object:Gem::Version
-  version: 1.0.0.beta2
+  version: 1.0.0.beta3
 platform: ruby
 authors:
 - Jonathan W. Zaleski
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-19 00:00:00.000000000 Z
+date: 2015-05-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -112,11 +112,11 @@ files:
 - lib/purview/exceptions/base.rb
 - lib/purview/exceptions/base_table.rb
 - lib/purview/exceptions/could_not_acquire_lock.rb
+- lib/purview/exceptions/database_already_assigned.rb
 - lib/purview/exceptions/lock_already_released.rb
 - lib/purview/exceptions/no_table.rb
 - lib/purview/exceptions/no_window.rb
 - lib/purview/exceptions/rows_outside_window.rb
-- lib/purview/helpers.rub
 - lib/purview/loaders.rb
 - lib/purview/loaders/base.rb
 - lib/purview/loaders/mysql.rb