oculus 0.8.0 → 0.9.0

data/README.md

@@ -28,7 +28,9 @@ For details on command line options, run:
 ## Contributing
 
 1. Fork it
-2. Make your changes
-3. Send me a pull request
+2. Run `rake db:test:populate`
+3. Make your changes
+4. Run tests (`rake`)
+5. Send me a pull request
 
 If you're making a big change, please open an Issue first, so we can discuss.

data/Rakefile

@@ -4,6 +4,7 @@ require "bundler/gem_tasks"
 require 'rspec/core/rake_task'
 require 'cucumber/rake/task'
 require 'mysql2'
+require 'pg'
 
 desc 'Run RSpec tests'
 RSpec::Core::RakeTask.new(:spec) do |task|
@@ -20,6 +21,8 @@ namespace :db do
   namespace :test do
     desc "Populate the test database"
     task :populate do
+      # MySQL
+      #
       client = Mysql2::Client.new(:host => "localhost", :username => "root")
       client.query "CREATE DATABASE IF NOT EXISTS oculus_test"
       client.query "USE oculus_test"
@@ -36,6 +39,29 @@ namespace :db do
       client.query %[
         INSERT INTO oculus_users (name) VALUES ('Paul'), ('Amy'), ('Peter')
       ]
+
+      client.close
+
+      # Postgres
+      #
+      client = PG::Connection.new(:host => "localhost", :dbname => "postgres")
+      client.query "DROP DATABASE IF EXISTS oculus_test"
+      client.query "CREATE DATABASE oculus_test"
+      client.close
+
+      client = PG::Connection.new(:host => "localhost", :dbname => "oculus_test")
+      client.query %[
+        CREATE TABLE oculus_users (
+          id INT NOT NULL UNIQUE,
+          name VARCHAR(255)
+        );
+      ]
+
+      client.query %[
+        INSERT INTO oculus_users (id, name) VALUES (1, 'Paul'), (2, 'Amy'), (3, 'Peter')
+      ]
+
+      client.close
     end
   end
 end

data/TODO.md

@@ -2,7 +2,8 @@
 
 ## Upcoming (pre-1.0)
 
-* Input validation
+* Setup instructions
+* New user experience
 
 ## Eventually (1.1 or later)
 

data/bin/oculus

@@ -26,6 +26,10 @@ Vegas::Runner.new(Oculus::Server, 'oculus') do |runner, opts, app|
   opts.on("-D", "--database DATABASE", "Database to use") do |db|
     Oculus.connection_options[:database] = db
   end
+  opts.on("-t", "--adapter ADAPTER", "Database adapter") do |adapter|
+    abort "oculus: unknown adapter '#{adapter}'" unless ['mysql', 'postgres', 'pg'].include?(adapter)
+    Oculus.connection_options[:adapter] = adapter
+  end
   opts.on("-d", "--data DIRECTORY", "Data cache path (default: tmp/data)") do |path|
     Oculus.cache_path = path
   end

data/features/query.feature

@@ -5,6 +5,7 @@ Feature: Users can query the database
     When I execute "SELECT * FROM oculus_users"
     Then I should see 3 rows of results
 
+  @javascript
   Scenario: Loading a cached query
     Given a query is cached with results:
       | id | users |

data/features/support/env.rb

@@ -9,6 +9,7 @@ Capybara.default_wait_time = 10
 
 Oculus.cache_path = 'tmp/test_cache'
 Oculus.connection_options = {
+  :adapter => 'mysql',
   :host => 'localhost',
   :username => 'root',
   :database => 'oculus_test'

data/lib/oculus/connection/mysql2.rb

@@ -14,6 +14,10 @@ module Oculus
         raise Connection::Error.new(e.message)
       end
 
+      def kill(id)
+        execute("KILL QUERY #{id}")
+      end
+
       def thread_id
         @connection.thread_id
       end

data/lib/oculus/connection/postgres.rb

@@ -0,0 +1,31 @@
+require 'pg'
+
+module Oculus
+  module Connection
+    class Postgres
+      def initialize(options = {})
+        @connection = ::PG::Connection.new(options[:host],
+                                           options[:port],
+                                           nil, nil,
+                                           options[:database],
+                                           options[:username],
+                                           options[:password])
+      end
+
+      def execute(sql)
+        results = @connection.exec(sql)
+        [results.fields] + results.values if results
+      rescue ::PG::Error => e
+        raise Connection::Error.new(e.message)
+      end
+
+      def kill(id)
+        @connection.execute("SELECT pg_cancel_backend(#{id})")
+      end
+
+      def thread_id
+        @connection.backend_pid
+      end
+    end
+  end
+end

data/lib/oculus/connection.rb

@@ -1,7 +1,20 @@
 require 'oculus/connection/mysql2'
+require 'oculus/connection/postgres'
 
 module Oculus
   module Connection
     class Error < StandardError; end
+    class AdapterNotFound < Error; end
+
+    def self.connect(options)
+      case options[:adapter]
+      when 'mysql'
+        Mysql2
+      when 'postgres', 'pg'
+        Postgres
+      else
+        raise AdapterNotFound, "#{options[:adapter]} is not currently implemented. You should write it!"
+      end.new(options)
+    end
   end
 end

data/lib/oculus/server/public/css/style.css

@@ -117,3 +117,8 @@ button.starred .unstarred-contents {
 #query-properties-form {
   display: none;
 }
+
+#loading .cancel-container {
+  float: right;
+  margin: -1px -26px 0 0;
+}

data/lib/oculus/server/public/js/application.js

@@ -57,6 +57,89 @@ $(function() {
   }
 });
 
+function Query(id) {
+  this.id         = id;
+  this._monitoring = false;
+}
+
+Query.MONITOR_TIMEOUT = 1000;
+
+Query.prototype.cancel = function() {
+  $.ajax({
+    url: '/queries/' + this.id + '/cancel',
+    type: 'POST'
+  });
+}
+
+Query.prototype.check = function(callbacks) {
+  $.ajax({
+    url: '/queries/' + this.id + '/status',
+    type: 'GET',
+    success: callbacks.success
+  });
+}
+
+// For now, multiple calls to monitor will overwrite callbacks.
+// Someday, a pubsub mechanism might make sense here.
+Query.prototype.monitor = function(callbacks) {
+  this._monitoringCallbacks = callbacks;
+
+  if (!this._monitoring) {
+    this._monitoring = true;
+
+    var self = this;
+    setTimeout(function() {
+      self._tick();
+    }, Query.MONITOR_TIMEOUT);
+  }
+}
+
+Query.prototype.detach = function() {
+  this._monitoring          = false;
+  this._monitoringCallbacks = null;
+}
+
+Query.prototype._tick = function() {
+  if (this._monitoring) {
+    var self = this;
+
+    this.check({
+      success: function(status) {
+        // Ignore responses for queries we're no longer interested in
+        if (self._monitoring) {
+          if (status !== 'loading') {
+            self.load(self._monitoringCallbacks);
+          } else {
+            setTimeout(function() {
+              self._tick();
+            }, Query.MONITOR_TIMEOUT);
+          }
+        }
+      }
+    });
+  }
+}
+
+Query.prototype.load = function(callbacks) {
+  var self = this;
+
+  $.ajax({
+    url: '/queries/' + this.id + '.json',
+    type: 'GET',
+    dataType: 'json',
+    success: function(data) {
+      if (data.results) {
+        if (callbacks.success) callbacks.success(data);
+      } else {
+        if (callbacks.error) callbacks.error(data.error);
+      }
+    },
+    error: function() {
+      if (callbacks.error) callbacks.error("Failed to load results");
+    }
+  });
+}
+
 function QueryEditor(form, options) {
   this._monitorQueryId = null;
   this._form = form;
@@ -65,8 +148,6 @@ function QueryEditor(form, options) {
   this.bindEvents();
 }
 
-QueryEditor.MONITOR_TIMEOUT = 1000;
-
 QueryEditor.prototype.getQueryField = function() {
   return document.getElementById('query-field');
 }
@@ -84,7 +165,7 @@ QueryEditor.prototype.initCodeMirror = function() {
 QueryEditor.prototype.bindEvents = function() {
   var self = this;
   $(document).on('keydown', 'form', function(e) {
-    if (e.keyCode === 13 && (e.ctrlKey || e.metaKey)) {
+    if ((e.keyCode === 13 && (e.ctrlKey || e.metaKey)) || (e.metaKey && e.altKey && e.keyCode === 82)) {
       e.preventDefault();
 
       // CodeMirror normally saves itself automatically, but since there is no
@@ -101,7 +182,8 @@ QueryEditor.prototype.bindEvents = function() {
 }
 
 QueryEditor.prototype.submit = function() {
-  if(this._options.onQueryStart) this._options.onQueryStart();
+  if (this._query) this._query.detach();
+  if (this._options.onQueryStart) this._options.onQueryStart();
 
   var self = this;
   $.ajax({
@@ -110,7 +192,11 @@ QueryEditor.prototype.submit = function() {
     data: this._form.serialize(),
     dataType: 'json',
     success: function(data) {
-      self.monitorQuery(data.id);
+      self._query = new Query(data.id);
+      self._query.monitor({
+        success: self._options.onQuerySuccess,
+        error:   self._options.onQueryError
+      });
     },
     error: function() {
       if (self._options.onQueryError) self._options.onQueryError();
@@ -118,59 +204,6 @@ QueryEditor.prototype.submit = function() {
   });
 }
 
-QueryEditor.prototype.monitorQuery = function(id) {
-  this._monitorQueryId = id;
-
-  var self = this;
-  setTimeout(function() {
-    self._tick();
-  }, QueryEditor.MONITOR_TIMEOUT);
-}
-
-QueryEditor.prototype._tick = function() {
-  if (this._monitorQueryId !== null) {
-    var queryId = this._monitorQueryId,
-        self    = this;
-
-    $.ajax({
-      url: '/queries/' + queryId + '/status',
-      type: 'GET',
-      success: function(status) {
-        // Ignore responses for queries we're no longer interested in
-        if (queryId === self._monitorQueryId) {
-          if (status !== 'loading') {
-            self._loadQueryResult(queryId);
-          } else {
-            setTimeout(function() {
-              self._tick();
-            }, QueryEditor.MONITOR_TIMEOUT);
-          }
-        }
-      }
-    });
-  }
-}
-
-QueryEditor.prototype._loadQueryResult = function(id) {
-  var self = this;
-  $.ajax({
-    url: '/queries/' + id + '.json',
-    type: 'GET',
-    dataType: 'json',
-    success: function(data) {
-      // Ignore responses for queries we're no longer interested in
-      if (id === self._monitorQueryId) {
-        if (data.results) {
-          if (self._options.onQuerySuccess) self._options.onQuerySuccess(data);
-        } else {
-          if (self._options.onQueryError) self._options.onQueryError(data.error);
-        }
-      }
-    },
-    error: function() {
-      if (id === self._monitorQueryId && self._options.onQueryError) {
-        self._options.onQueryError("Failed to load results");
-      }
-    }
-  });
+QueryEditor.prototype.cancelQuery = function() {
+  if (this._query) this._query.cancel();
 }

data/lib/oculus/server/views/index.erb

@@ -6,12 +6,15 @@
   </div>
   <div class="form-actions">
     <input type="submit" class="btn" name="submit" value="Run" />
-    <span class="deemphasized help-inline">Ctrl+&crarr; or &#8984;&crarr;</span>
+    <span class="deemphasized help-inline"><abbr title="Ctrl+Enter">Ctrl+&crarr;</abbr> or <abbr title="Command+Enter">&#8984;&crarr;</abbr></span>
   </div>
 </form>
 
 <div id="loading">
   <div class="alert">
+    <div class="cancel-container">
+      <a class="btn btn-mini btn-warning cancel">Cancel</a>
+    </div>
     <span id="spinner"></span>
     Executing query...
   </div>
@@ -37,6 +40,11 @@
 </div>
 
 <script type="text/javascript">
+  $('#loading .cancel').click(function(e) {
+    e.preventDefault();
+    editor.cancelQuery();
+  });
+
   var opts = {
     lines: 11,
     length: 4,

data/lib/oculus/server/views/layout.erb

@@ -28,7 +28,7 @@
             </li>
           </ul>
           <div class="pull-right navbar-text">
-            mysql://<%= Oculus.connection_options[:username] %>@<%= Oculus.connection_options[:host] %>:<%= Oculus.connection_options[:port] %>/<%= Oculus.connection_options[:database] %>
+            <%= Oculus.connection_string %>
           </div>
         </div>
       </div>

data/lib/oculus/server/views/show.erb

@@ -40,45 +40,103 @@
 
 <pre class="cm-s-default"><%= @query.query %></pre>
 
-<% if @query.succeeded? %>
-  <% if @headers %>
-    <table class="table table-condensed" id="results-table">
-      <thead>
-        <tr>
-          <% @headers.each do |label| %>
-            <th><%= label %></th>
-          <% end %>
-        </tr>
-      </thead>
-      <tbody class="results">
-        <% @results.each do |result| %>
-          <tr>
-            <% result.each do |value| %>
-              <td><%= value %></td>
-            <% end %>
-          </tr>
-        <% end %>
-      </tbody>
-    </table>
-  <% else %>
-    <div class="alert alert-success">
-      <strong>Heads Up!</strong>
-      This query ran successfully, but returned no results.
+<div id="loading">
+  <div class="alert">
+    <div class="cancel-container">
+      <a class="btn btn-mini btn-warning cancel">Cancel</a>
     </div>
-  <% end %>
-<% elsif @query.error %>
-  <div class="alert alert-error">
-    <strong>Sorry!</strong>
-    <%= @query.error %>
+    <span id="spinner"></span>
+    Executing query...
   </div>
-<% else %>
-  <div class="alert alert-info">
-    <strong>Heads Up!</strong>
-    This query is in progress, and has not returned any results yet.
+</div>
+
+<div id="error" class="alert alert-error">
+  <strong>Problem!</strong>
+  <span class="message"></span>
+</div>
+
+<div id="results">
+  <div class="alert alert-success">
+    <strong>Success!</strong>
+    Query returned <span class="row-count"></span> row<span class="row-count-plural">s</span>.
   </div>
-<% end %>
+
+  <table class="table table-condensed" id="results-table">
+    <thead>
+      <tr class="headers"></tr>
+    </thead>
+    <tbody class="results"></tbody>
+  </table>
+</div>
 
 <script type="text/javascript">
+  var id = window.location.href.match(/queries\/([0-9]+)/)[1];
+
+  var query = new Query(id);
+  var callbacks = {
+    success: function(query) {
+      $('#loading, #error').hide();
+      $('#results')
+        .show()
+        .find('.row-count')
+          .text(query.results.length - 1)
+        .end()
+        .find('.row-count-plural')
+          .toggle(query.results.length !== 2);
+
+      var headerRow = $('#results .headers').empty();
+      var container = $('#results .results').empty();
+
+      for (var i = 0; i < query.results[0].length; i++) {
+        headerRow.append('<th>' + query.results[0][i] + '</th>');
+      }
+
+      for (var i = 1; i < query.results.length; i++) {
+        var result = query.results[i];
+        var row = $('<tr></tr>');
+
+        for (var j = 0; j < result.length; j++) {
+          row.append('<td>' + result[j] + '</td>');
+        }
+
+        container.append(row);
+      }
+    },
+    error: function(error) {
+      $('#loading, #results').hide();
+      $('#error')
+        .show()
+        .find('.message')
+          .text(error);
+    }
+  };
+
+  $('#results, #error').hide();
+
+  <% if @query.succeeded? || @query.error %>
+    $('#loading').hide();
+    query.load(callbacks);
+  <% else %>
+    query.monitor(callbacks);
+  <% end %>
+
+  $('#loading .cancel').click(function(e) {
+    e.preventDefault();
+    query.cancel();
+  });
+
+  var opts = {
+    lines: 11,
+    length: 4,
+    width: 2,
+    radius: 4,
+    color: '#C09853',
+    speed: 1.2,
+    trail: 60
+  };
+  var target = document.getElementById('spinner');
+  var spinner = new Spinner(opts).spin(target);
+
   var queryNode = $('pre.cm-s-default');
   CodeMirror.runMode(queryNode.text(), 'mysql', queryNode[0]);
   $('a.disabled').click(function(e) {

data/lib/oculus/server.rb

@@ -35,8 +35,8 @@ module Oculus
 
     post '/queries/:id/cancel' do
       query = Oculus::Query.find(params[:id])
-      connection = Oculus::Connection::Mysql2.new(Oculus.connection_options)
-      connection.execute("KILL QUERY #{query.thread_id}")
+      connection = Oculus::Connection.connect(Oculus.connection_options)
+      connection.kill(query.thread_id)
       [200, "OK"]
     end
 
@@ -45,7 +45,7 @@ module Oculus
 
       pid = fork do
         query = Oculus::Query.find(query.id)
-        connection = Oculus::Connection::Mysql2.new(Oculus.connection_options)
+        connection = Oculus::Connection.connect(Oculus.connection_options)
         query.execute(connection)
       end
 

data/lib/oculus/storage/file_store.rb

@@ -1,5 +1,6 @@
 require 'yaml'
 require 'csv'
+require 'fileutils'
 
 module Oculus
   module Storage
@@ -21,11 +22,15 @@ module Oculus
       end
 
       def save_query(query)
+        ensure_root_path
+
         query.id = next_id if query.id.nil?
 
         File.open(filename_for_id(query.id), 'w') do |file|
+          file.flock(File::LOCK_EX)
           file.write_prelude(query.attributes)
           file.write_results(query.results) if query.results && query.results.length > 0
+          file.flock(File::LOCK_UN)
         end
 
         FileUtils.mkdir_p(File.join(root, "starred")) unless Dir.exist?(File.join(root, "starred"))
@@ -66,8 +71,12 @@ module Oculus
       class File < ::File
         def self.parse(path)
           file = File.open(path)
+
+          file.flock(File::LOCK_EX)
           attributes = file.attributes
           attributes[:results] = file.results
+          file.flock(File::LOCK_UN)
+
           attributes[:id] = File.basename(path).split('.').first.to_i
           attributes[:starred] ||= false
           attributes
@@ -146,6 +155,10 @@ module Oculus
         File.join(root, 'NEXT_ID')
       end
 
+      def ensure_root_path
+        FileUtils.mkdir_p root unless File.exists? root
+      end
+
       attr_reader :root
     end
   end

data/lib/oculus/version.rb

@@ -1,3 +1,3 @@
 module Oculus
-  VERSION = "0.8.0"
+  VERSION = "0.9.0"
 end

data/lib/oculus.rb

@@ -6,7 +6,7 @@ require "oculus/query"
 module Oculus
   extend self
 
-  DEFAULT_CONNECTION_OPTIONS = { :host => 'localhost', :username => 'root' }
+  DEFAULT_CONNECTION_OPTIONS = { :adapter => 'mysql', :host => 'localhost' }
 
   attr_writer :cache_path
 
@@ -25,5 +25,11 @@ module Oculus
   def connection_options
     @connection_options ||= DEFAULT_CONNECTION_OPTIONS
   end
+
+  def connection_string
+    user = "#{connection_options[:user]}@" if connection_options[:user]
+    port = ":#{connection_options[:port]}" if connection_options[:port]
+    "#{connection_options[:adapter]}://#{user}#{connection_options[:host]}#{port}/#{connection_options[:database]}"
+  end
 end
 

data/oculus.gemspec

@@ -16,11 +16,13 @@ Gem::Specification.new do |gem|
   gem.version       = Oculus::VERSION
 
   gem.add_runtime_dependency "sinatra", [">= 1.3.0"]
-  gem.add_runtime_dependency "mysql2",  [">= 0.3.11"]
   gem.add_runtime_dependency "vegas",   [">= 0.1.4"]
 
   gem.add_development_dependency "rake"
   gem.add_development_dependency "cucumber", [">= 1"]
   gem.add_development_dependency "rspec",    [">= 2"]
   gem.add_development_dependency "capybara", [">= 1"]
+
+  gem.add_development_dependency "mysql2",  [">= 0.3.11"]
+  gem.add_development_dependency "pg",      [">= 0.13.2"]
 end

data/spec/connection/mysql2_spec.rb

@@ -0,0 +1,42 @@
+require 'oculus'
+
+describe Oculus::Connection::Mysql2 do
+  subject { Oculus::Connection::Mysql2.new(:host => 'localhost', :database => 'oculus_test', :username => 'root') }
+
+  it "fetches a result set" do
+    subject.execute("SELECT * FROM oculus_users").should == [['id', 'name'], [1, 'Paul'], [2, 'Amy'], [3, 'Peter']]
+  end
+
+  it "returns nil for queries that don't return result sets" do
+    query_connection = Mysql2::Client.new(:host => "localhost", :database => "oculus_test", :username => "root")
+    thread_id = query_connection.thread_id
+    Thread.new {
+      query_connection.execute("SELECT * FROM oculus_users WHERE SLEEP(2)")
+    }
+
+    sleep 0.1
+    subject.kill(thread_id).should be_nil
+  end
+
+  it "raises a Connection::Error on syntax errors" do
+    lambda {
+      subject.execute("FOO BAZ QUUX")
+    }.should raise_error(Oculus::Connection::Error)
+  end
+
+  it "raises a Connection::Error when the query is interrupted" do
+    thread_id = subject.thread_id
+    Thread.new {
+      sleep 0.1
+      Mysql2::Client.new(:host => "localhost", :username => "root").query("KILL QUERY #{thread_id}")
+    }
+
+    lambda {
+      subject.execute("SELECT * FROM oculus_users WHERE SLEEP(2)")
+    }.should raise_error(Oculus::Connection::Error)
+  end
+
+  it "provides the connection's thread_id" do
+    subject.thread_id.should be_an Integer
+  end
+end

data/spec/connection/postgres_spec.rb

@@ -0,0 +1,22 @@
+require 'oculus'
+
+describe Oculus::Connection::Postgres do
+  subject { Oculus::Connection::Postgres.new(:host => 'localhost', :database => 'oculus_test') }
+
+  it "fetches a result set" do
+    subject.execute("SELECT * FROM oculus_users").should == [['id', 'name'],
+                                                             ['1', 'Paul'],
+                                                             ['2', 'Amy'],
+                                                             ['3', 'Peter']]
+  end
+
+  it "raises a Connection::Error on syntax errors" do
+    lambda {
+      subject.execute("FOO BAZ QUUX")
+    }.should raise_error(Oculus::Connection::Error)
+  end
+
+  it "provides the connection's thread_id" do
+    subject.thread_id.should be_an Integer
+  end
+end

data/spec/connection_spec.rb

@@ -1,42 +1,33 @@
 require 'oculus'
 
 describe Oculus::Connection do
-  subject { Oculus::Connection::Mysql2.new(:host => 'localhost', :database => 'oculus_test', :username => 'root') }
-
-  it "fetches a result set" do
-    subject.execute("SELECT * FROM oculus_users").should == [['id', 'name'], [1, 'Paul'], [2, 'Amy'], [3, 'Peter']]
-  end
-
-  it "returns nil for queries that don't return result sets" do
-    query_connection = Mysql2::Client.new(:host => "localhost", :database => "oculus_test", :username => "root")
-    thread_id = query_connection.thread_id
-    Thread.new {
-      query_connection.execute("SELECT * FROM oculus_users WHERE SLEEP(2)")
-    }
-
-    sleep 0.1
-    subject.execute("KILL QUERY #{thread_id}").should be_nil
+  describe "non-nonexistent adapter" do
+    it "raises an adapter not found error" do
+      lambda {
+        Oculus::Connection.connect adapter: 'nonexistent-adapter'
+      }.should raise_error Oculus::Connection::AdapterNotFound, "nonexistent-adapter is not currently implemented. You should write it!"
+    end
   end
 
-  it "raises a Connection::Error on syntax errors" do
-    lambda {
-      subject.execute("FOO BAZ QUUX")
-    }.should raise_error(Oculus::Connection::Error)
+  describe "mysql adapter option" do
+    it "returns a new instance of MySQL adapter" do
+      adapter = Oculus::Connection.connect adapter: 'mysql'
+      adapter.should be_an_instance_of Oculus::Connection::Mysql2
+    end
   end
 
-  it "raises a Connection::Error when the query is interrupted" do
-    thread_id = subject.thread_id
-    Thread.new {
-      sleep 0.1
-      Mysql2::Client.new(:host => "localhost", :username => "root").query("KILL QUERY #{thread_id}")
-    }
-
-    lambda {
-      subject.execute("SELECT * FROM oculus_users WHERE SLEEP(2)")
-    }.should raise_error(Oculus::Connection::Error)
+  describe "postgres adapter option" do
+    it "returns a new instance of Postgres adapter" do
+      adapter = Oculus::Connection.connect adapter: 'postgres', database: 'oculus_test'
+      adapter.should be_an_instance_of Oculus::Connection::Postgres
+    end
   end
 
-  it "provides the connection's thread_id" do
-    subject.thread_id.should be_an Integer
+  describe "pg adapter alias" do
+    it "returns a new instance of Postgres adapter" do
+      adapter = Oculus::Connection.connect adapter: 'pg', database: 'oculus_test'
+      adapter.should be_an_instance_of Oculus::Connection::Postgres
+    end
   end
 end
+

data/spec/file_store_spec.rb

@@ -133,4 +133,25 @@ describe Oculus::Storage::FileStore do
       subject.delete_query('..')
     }.should raise_error(ArgumentError)
   end
+
+  context "when cache dir does not exist (like for a new install)" do
+    before do
+      FileUtils.rm_r('tmp/test_cache')
+    end
+
+    it "round-trips a query to disk" do
+      subject.save_query(query)
+      subject.load_query(query.id).should == {
+        :id => query.id,
+        :name => query.name,
+        :author => query.author,
+        :query => query.query,
+        :results => query.results,
+        :thread_id => query.thread_id,
+        :starred => false,
+        :started_at => query.started_at,
+        :finished_at => query.finished_at
+      }
+    end
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: oculus
 version: !ruby/object:Gem::Version
-  version: 0.8.0
+  version: 0.9.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-05-06 00:00:00.000000000 Z
+date: 2012-05-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sinatra
-  requirement: &70114293249540 !ruby/object:Gem::Requirement
+  requirement: &70346142610300 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,21 +21,10 @@ dependencies:
         version: 1.3.0
   type: :runtime
   prerelease: false
-  version_requirements: *70114293249540
-- !ruby/object:Gem::Dependency
-  name: mysql2
-  requirement: &70114293249020 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 0.3.11
-  type: :runtime
-  prerelease: false
-  version_requirements: *70114293249020
+  version_requirements: *70346142610300
 - !ruby/object:Gem::Dependency
   name: vegas
-  requirement: &70114293248540 !ruby/object:Gem::Requirement
+  requirement: &70346142609780 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +32,10 @@ dependencies:
         version: 0.1.4
   type: :runtime
   prerelease: false
-  version_requirements: *70114293248540
+  version_requirements: *70346142609780
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70114288904480 !ruby/object:Gem::Requirement
+  requirement: &70346142609320 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +43,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70114288904480
+  version_requirements: *70346142609320
 - !ruby/object:Gem::Dependency
   name: cucumber
-  requirement: &70114288903580 !ruby/object:Gem::Requirement
+  requirement: &70346142608500 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +54,10 @@ dependencies:
         version: '1'
   type: :development
   prerelease: false
-  version_requirements: *70114288903580
+  version_requirements: *70346142608500
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70114288902160 !ruby/object:Gem::Requirement
+  requirement: &70346142607820 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +65,10 @@ dependencies:
         version: '2'
   type: :development
   prerelease: false
-  version_requirements: *70114288902160
+  version_requirements: *70346142607820
 - !ruby/object:Gem::Dependency
   name: capybara
-  requirement: &70114288901540 !ruby/object:Gem::Requirement
+  requirement: &70346142607300 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,7 +76,29 @@ dependencies:
         version: '1'
   type: :development
   prerelease: false
-  version_requirements: *70114288901540
+  version_requirements: *70346142607300
+- !ruby/object:Gem::Dependency
+  name: mysql2
+  requirement: &70346142606800 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.3.11
+  type: :development
+  prerelease: false
+  version_requirements: *70346142606800
+- !ruby/object:Gem::Dependency
+  name: pg
+  requirement: &70346142606280 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.13.2
+  type: :development
+  prerelease: false
+  version_requirements: *70346142606280
 description: Oculus is a web-based logging SQL client.  It keeps a history of your
   queries and the results they returned, so your research is always at hand, easy
   to share and easy to repeat or reproduce in the future.
@@ -112,6 +123,7 @@ files:
 - lib/oculus.rb
 - lib/oculus/connection.rb
 - lib/oculus/connection/mysql2.rb
+- lib/oculus/connection/postgres.rb
 - lib/oculus/presenters.rb
 - lib/oculus/presenters/query_presenter.rb
 - lib/oculus/query.rb
@@ -136,6 +148,8 @@ files:
 - lib/oculus/storage/file_store.rb
 - lib/oculus/version.rb
 - oculus.gemspec
+- spec/connection/mysql2_spec.rb
+- spec/connection/postgres_spec.rb
 - spec/connection_spec.rb
 - spec/file_store_spec.rb
 - spec/query_presenter_spec.rb
@@ -168,6 +182,8 @@ test_files:
 - features/query.feature
 - features/step_definitions/query_steps.rb
 - features/support/env.rb
+- spec/connection/mysql2_spec.rb
+- spec/connection/postgres_spec.rb
 - spec/connection_spec.rb
 - spec/file_store_spec.rb
 - spec/query_presenter_spec.rb