oculus 0.5.0 → 0.8.0

data/.travis.yml

@@ -5,3 +5,4 @@ rvm:
 before_script:
 - "export DISPLAY=:99.0"
 - "sh -e /etc/init.d/xvfb start"
+- "bundle exec rake db:test:populate"

data/Rakefile

@@ -3,6 +3,7 @@ require "bundler/gem_tasks"
 
 require 'rspec/core/rake_task'
 require 'cucumber/rake/task'
+require 'mysql2'
 
 desc 'Run RSpec tests'
 RSpec::Core::RakeTask.new(:spec) do |task|
@@ -15,4 +16,28 @@ Cucumber::Rake::Task.new(:cucumber) do |task|
   task.cucumber_opts = 'features --format pretty'
 end
 
+namespace :db do
+  namespace :test do
+    desc "Populate the test database"
+    task :populate do
+      client = Mysql2::Client.new(:host => "localhost", :username => "root")
+      client.query "CREATE DATABASE IF NOT EXISTS oculus_test"
+      client.query "USE oculus_test"
+      client.query %[
+        CREATE TABLE IF NOT EXISTS oculus_users (
+          id MEDIUMINT NOT NULL AUTO_INCREMENT,
+          name VARCHAR(255),
+          PRIMARY KEY (id)
+        );
+      ]
+
+      client.query 'TRUNCATE oculus_users'
+
+      client.query %[
+        INSERT INTO oculus_users (name) VALUES ('Paul'), ('Amy'), ('Peter')
+      ]
+    end
+  end
+end
+
 task :default => [:spec, :cucumber]

data/TODO.md

@@ -3,7 +3,6 @@
 ## Upcoming (pre-1.0)
 
 * Input validation
-* Data download
 
 ## Eventually (1.1 or later)
 

data/features/step_definitions/query_steps.rb

@@ -1,5 +1,9 @@
 Given /^a query is cached with results:$/ do |results|
-  Oculus::Query.create(:name => "all users", :query => "SELECT * FROM oculus_users", :results => results.raw)
+  Oculus::Query.create(:name        => "all users",
+                       :query       => "SELECT * FROM oculus_users",
+                       :results     => results.raw,
+                       :started_at  => Time.now,
+                       :finished_at => Time.now)
 end
 
 Given /^I am on the history page$/ do

data/features/support/env.rb

@@ -5,12 +5,13 @@ require 'oculus/server'
 require 'capybara/cucumber'
 
 Capybara.app = Oculus::Server
+Capybara.default_wait_time = 10
 
 Oculus.cache_path = 'tmp/test_cache'
 Oculus.connection_options = {
   :host => 'localhost',
   :username => 'root',
-  :database => 'test'
+  :database => 'oculus_test'
 }
 
 Before do

data/lib/oculus/presenters/query_presenter.rb

@@ -3,8 +3,34 @@ require 'delegate'
 module Oculus
   module Presenters
     class QueryPresenter < SimpleDelegator
-      def formatted_date
-        date.strftime("%Y-%m-%d %H:%M") if date
+      def formatted_start_time
+        started_at.strftime("%Y-%m-%d %I:%M %p") if started_at
+      end
+
+      def formatted_finish_time
+        finished_at.strftime("%Y-%m-%d %I:%M %p") if finished_at
+      end
+
+      def elapsed_time
+        return "" unless started_at && finished_at
+
+        seconds = (finished_at - started_at).round
+
+        if seconds < 60
+          "#{seconds} seconds"
+        else
+          minutes = (seconds / 60).floor
+          seconds %= 60
+
+          if minutes < 60
+            "#{minutes} minutes #{seconds} seconds"
+          else
+            hours = (minutes / 60).floor
+            minutes %= 60
+
+            "#{hours} hours #{minutes} minutes"
+          end
+        end
       end
 
       def status

data/lib/oculus/query.rb

@@ -6,7 +6,9 @@ module Oculus
     attr_accessor :query
     attr_accessor :results
     attr_accessor :error
-    attr_accessor :date
+    attr_accessor :started_at
+    attr_accessor :finished_at
+    attr_accessor :starred
     attr_accessor :thread_id
 
     def initialize(attributes = {})
@@ -20,7 +22,9 @@ module Oculus
         :name        => name,
         :author      => author,
         :query       => query,
-        :date        => date,
+        :started_at  => started_at,
+        :finished_at => finished_at,
+        :starred     => starred,
         :thread_id   => thread_id
       }
       attrs[:error] = error if error
@@ -28,24 +32,40 @@ module Oculus
     end
 
     def execute(connection)
-      self.results = connection.execute(query)
+      self.started_at = Time.now
+      self.thread_id  = connection.thread_id
+      self.save
+      results = connection.execute(query)
     rescue Connection::Error => e
-      self.error = e.message
+      error = e.message
+    ensure
+      reload
+      self.results = results if results
+      self.error   = error   if error
+      self.finished_at = Time.now
+      self.save
     end
 
     def save
-      @date = Time.now
       Oculus.data_store.save_query(self)
     end
 
     def complete?
-      !!error || (!results.nil? && !results.empty?)
+      !!finished_at
     end
 
     def succeeded?
       complete? && !error
     end
 
+    def to_csv
+      CSV.generate do |csv|
+        results.each do |row|
+          csv << row
+        end
+      end
+    end
+
     class << self
       def create(attributes)
         query = new(attributes)
@@ -54,8 +74,17 @@ module Oculus
       end
 
       def find(id)
-        Oculus.data_store.load_query(id)
+        new(Oculus.data_store.load_query(id))
       end
     end
+
+    private
+
+    def reload
+      Oculus.data_store.load_query(id).each do |attr, value|
+        send("#{attr}=", value)
+      end
+    end
+
   end
 end

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

@@ -102,6 +102,18 @@ body {
   margin-top: 1em;
 }
 
+button.star .starred-contents {
+  display: none;
+}
+
+button.starred .starred-contents {
+  display: inline;
+}
+
+button.starred .unstarred-contents {
+  display: none;
+}
+
 #query-properties-form {
   display: none;
 }

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

@@ -32,6 +32,22 @@ $(function() {
     });
   });
 
+  $('#query-actions .star').click(function() {
+    var btn = $(this),
+        newState = !btn.hasClass('starred');
+
+    $.ajax({
+      url: this.href,
+      type: 'PUT',
+      data: {
+        'starred': newState
+      },
+      success: function() {
+        btn.toggleClass('starred', newState);
+      }
+    });
+  });
+
   $('#query-actions .edit').click(function() {
     $('#query-properties-form').toggle();
   });

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

@@ -13,7 +13,7 @@
     <% @queries.each do |query| %>
       <tr>
         <td class="status"><span class="indicator indicator-<%= query.status %>">*</span></td>
-        <td class="date"><%= query.formatted_date %></td>
+        <td class="date"><%= query.formatted_start_time %></td>
         <td>
           <a href="/queries/<%= query.id %>"><%= query.description %></a>
         </td>
@@ -27,9 +27,3 @@
     <% end %>
   </tbody>
 </table>
-
-<script type="text/javascript">
-  CodeMirror.fromTextArea(document.getElementById('query-field'), {
-    tabSize: 2
-  });
-</script>

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

@@ -20,6 +20,9 @@
             <li<% if @current_tab == 'home' %> class="active"<% end %>>
               <a href="/">Home</a>
             </li>
+            <li<% if @current_tab == 'starred' %> class="active"<% end %>>
+              <a href="/starred">Starred</a>
+            </li>
             <li<% if @current_tab == 'history' %> class="active"<% end %>>
               <a href="/history">History</a>
             </li>

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

@@ -1,17 +1,35 @@
 <h1 class="description"><%= @query.description %></h1>
 
 <div id="query-actions">
+  <button class="btn btn-success star<% if @query.starred %> starred<% end %>">
+    <span class="unstarred-contents">
+      <i class="icon-star-empty icon-white"></i>
+      Star
+    </span>
+    <span class="starred-contents">
+      <i class="icon-star icon-white"></i>
+      Starred
+    </span>
+  </button>
   <button class="btn edit<% unless @query.named? %> active<% end %>" data-toggle="button">
     <i class="icon-pencil"></i>
     Edit
   </button>
+  <a class="btn file<% unless @query.succeeded? && @headers %> disabled<% end %>" href="/queries/<%= @query.id %>/download">
+    <i class="icon-file"></i>
+    Download
+  </a>
 </div>
 
 <dl class="dl-horizontal query-properties">
   <dt>Author</dt>
   <dd class="author"><%= @query.author %>&nbsp;</dd>
-  <dt>Timestamp</dt>
-  <dd><%= @query.formatted_date %></dd>
+  <dt>Started at</dt>
+  <dd><%= @query.formatted_start_time %></dd>
+  <% if @query.finished_at %>
+  <dt>Finished at</dt>
+  <dd><%= @query.formatted_finish_time %> (<%= @query.elapsed_time %>)</dd>
+  <% end %>
 </dl>
 
 <form class="well form-inline" id="query-properties-form">
@@ -23,24 +41,31 @@
 <pre class="cm-s-default"><%= @query.query %></pre>
 
 <% if @query.succeeded? %>
-  <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| %>
+  <% if @headers %>
+    <table class="table table-condensed" id="results-table">
+      <thead>
         <tr>
-          <% result.each do |value| %>
-            <td><%= value %></td>
+          <% @headers.each do |label| %>
+            <th><%= label %></th>
           <% end %>
         </tr>
-      <% end %>
-    </tbody>
-  </table>
+      </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>
+  <% end %>
 <% elsif @query.error %>
   <div class="alert alert-error">
     <strong>Sorry!</strong>
@@ -48,7 +73,7 @@
   </div>
 <% else %>
   <div class="alert alert-info">
-    <strong>Head's Up!</strong>
+    <strong>Heads Up!</strong>
     This query is in progress, and has not returned any results yet.
   </div>
 <% end %>
@@ -56,4 +81,7 @@
 <script type="text/javascript">
   var queryNode = $('pre.cm-s-default');
   CodeMirror.runMode(queryNode.text(), 'mysql', queryNode[0]);
+  $('a.disabled').click(function(e) {
+    e.preventDefault();
+  });
 </script>

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

@@ -0,0 +1,29 @@
+<% @current_tab = 'starred' %>
+
+<h2>Starred Queries</h2>
+<table class="table">
+  <thead>
+    <th></th>
+    <th>Timestamp</th>
+    <th>Query</th>
+    <th>Author</th>
+    <th></th>
+  </thead>
+  <tbody id="history">
+    <% @queries.each do |query| %>
+      <tr>
+        <td class="status"><span class="indicator indicator-<%= query.status %>">*</span></td>
+        <td class="date"><%= query.formatted_start_time %></td>
+        <td>
+          <a href="/queries/<%= query.id %>"><%= query.description %></a>
+        </td>
+        <td class="author">
+          <%= query.author %>
+        </td>
+        <td>
+          <a class="delete" href="/queries/<%= query.id %>"><i class="icon-remove"></i></a>
+        </td>
+      </tr>
+    <% end %>
+  </tbody>
+</table>

data/lib/oculus/server.rb

@@ -21,6 +21,12 @@ module Oculus
       erb :index
     end
 
+    get '/starred' do
+      @queries = Oculus.data_store.starred_queries.map { |q| Oculus::Presenters::QueryPresenter.new(q) }
+
+      erb :starred
+    end
+
     get '/history' do
       @queries = Oculus.data_store.all_queries.map { |q| Oculus::Presenters::QueryPresenter.new(q) }
 
@@ -35,13 +41,12 @@ module Oculus
     end
 
     post '/queries' do
-      connection = Oculus::Connection::Mysql2.new(Oculus.connection_options)
-      query = Oculus::Query.create(:query     => params[:query],
-                                   :thread_id => connection.thread_id)
+      query = Oculus::Query.create(:query => params[:query])
 
       pid = fork do
+        query = Oculus::Query.find(query.id)
+        connection = Oculus::Connection::Mysql2.new(Oculus.connection_options)
         query.execute(connection)
-        query.save
       end
 
       Process.detach(pid)
@@ -67,14 +72,26 @@ module Oculus
       erb :show
     end
 
+    get '/queries/:id/download' do
+      query = Oculus::Query.find(params[:id])
+      timestamp = query.started_at.strftime('%Y%m%d%H%M')
+
+      attachment    "#{timestamp}-query-#{query.id}-results.csv"
+      content_type  "text/csv"
+      last_modified query.finished_at
+
+      query.to_csv
+    end
+
     get '/queries/:id/status' do
       Oculus::Presenters::QueryPresenter.new(Oculus::Query.find(params[:id])).status
     end
 
     put '/queries/:id' do
       @query = Oculus::Query.find(params[:id])
-      @query.name   = params[:name]
-      @query.author = params[:author]
+      @query.name    = params[:name]              if params[:name]
+      @query.author  = params[:author]            if params[:author]
+      @query.starred = params[:starred] == "true" if params[:starred]
       @query.save
 
       puts "true"

data/lib/oculus/storage/file_store.rb

@@ -10,7 +10,13 @@ module Oculus
 
       def all_queries
         Dir["#{root}/*.query"].map do |path|
-          File.parse(path)
+          Query.new(File.parse(path))
+        end.sort { |a,b| b.id <=> a.id }
+      end
+
+      def starred_queries
+        Dir["#{root}/starred/*.query"].map do |path|
+          Query.new(File.parse(path))
         end.sort { |a,b| b.id <=> a.id }
       end
 
@@ -19,7 +25,16 @@ module Oculus
 
         File.open(filename_for_id(query.id), 'w') do |file|
           file.write_prelude(query.attributes)
-          file.write_results(query.results) if query.results
+          file.write_results(query.results) if query.results && query.results.length > 0
+        end
+
+        FileUtils.mkdir_p(File.join(root, "starred")) unless Dir.exist?(File.join(root, "starred"))
+        star_path = starred_filename_for_id(query.id)
+
+        if query.starred
+          File.symlink(File.expand_path(filename_for_id(query.id)), star_path) unless File.exist?(star_path)
+        elsif File.exist?(star_path)
+          File.unlink(star_path)
         end
       end
 
@@ -34,6 +49,9 @@ module Oculus
       end
 
       def delete_query(id)
+        star_path = starred_filename_for_id(id)
+        File.unlink(star_path) if File.exist?(star_path)
+
         path = filename_for_id(id)
 
         if File.exist?(path)
@@ -50,9 +68,9 @@ module Oculus
           file = File.open(path)
           attributes = file.attributes
           attributes[:results] = file.results
-          Oculus::Query.new(attributes).tap do |query|
-            query.id = File.basename(path).split('.').first.to_i
-          end
+          attributes[:id] = File.basename(path).split('.').first.to_i
+          attributes[:starred] ||= false
+          attributes
         end
 
         def write_prelude(attributes)
@@ -93,6 +111,11 @@ module Oculus
         end
       end
 
+      def starred_filename_for_id(id)
+        raise ArgumentError unless id.is_a?(Integer) || id =~ /^[0-9]+/
+        File.join(root, "starred", "#{id}.query")
+      end
+
       def filename_for_id(id)
         raise ArgumentError unless id.is_a?(Integer) || id =~ /^[0-9]+/
         File.join(root, "#{id}.query")

data/lib/oculus/version.rb

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

data/spec/connection_spec.rb

@@ -1,33 +1,14 @@
 require 'oculus'
 
 describe Oculus::Connection do
-  before(:all) do
-    client = Mysql2::Client.new(:host => "localhost", :username => "root")
-    client.query "CREATE DATABASE IF NOT EXISTS test"
-    client.query "USE test"
-    client.query %[
-      CREATE TABLE IF NOT EXISTS oculus_users (
-        id MEDIUMINT NOT NULL AUTO_INCREMENT,
-        name VARCHAR(255),
-        PRIMARY KEY (id)
-      );
-  ]
-
-    client.query 'TRUNCATE oculus_users'
-
-    client.query %[
-      INSERT INTO oculus_users (name) VALUES ('Paul'), ('Amy'), ('Peter')
-    ]
-  end
-
-  subject { Oculus::Connection::Mysql2.new(:database => 'test') }
+  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 => "test")
+    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)")

data/spec/file_store_spec.rb

@@ -38,33 +38,48 @@ describe Oculus::Storage::FileStore do
   it "round-trips a query with no results to disk" do
     query = Oculus::Query.new(:name => "Unfinished query", :author => "Me")
     subject.save_query(query)
-    subject.load_query(query.id).results.should == []
-    subject.load_query(query.id).query.should == query.query
-    subject.load_query(query.id).date.should == query.date
-    subject.load_query(query.id).author.should == query.author
-    subject.load_query(query.id).id.should == query.id
-    subject.load_query(query.id).thread_id.should == query.thread_id
+    subject.load_query(query.id).should == {
+      :id => query.id,
+      :name => query.name,
+      :author => query.author,
+      :query => query.query,
+      :results => [],
+      :thread_id => query.thread_id,
+      :starred => false,
+      :started_at => query.started_at,
+      :finished_at => query.finished_at
+    }
   end
 
   it "round-trips a query with an error to disk" do
     subject.save_query(broken_query)
-    subject.load_query(broken_query.id).results.should == []
-    subject.load_query(broken_query.id).error.should == broken_query.error
-    subject.load_query(broken_query.id).query.should == broken_query.query
-    subject.load_query(broken_query.id).date.should == broken_query.date
-    subject.load_query(broken_query.id).author.should == broken_query.author
-    subject.load_query(broken_query.id).id.should == broken_query.id
-    subject.load_query(broken_query.id).thread_id.should == broken_query.thread_id
+    subject.load_query(broken_query.id).should == {
+      :id => broken_query.id,
+      :name => broken_query.name,
+      :error => broken_query.error,
+      :author => broken_query.author,
+      :query => broken_query.query,
+      :results => [],
+      :thread_id => broken_query.thread_id,
+      :starred => false,
+      :started_at => broken_query.started_at,
+      :finished_at => broken_query.finished_at
+    }
   end
 
   it "round-trips a query to disk" do
     subject.save_query(query)
-    subject.load_query(query.id).results.should == query.results
-    subject.load_query(query.id).query.should == query.query
-    subject.load_query(query.id).date.should == query.date
-    subject.load_query(query.id).author.should == query.author
-    subject.load_query(query.id).id.should == query.id
-    subject.load_query(query.id).thread_id.should == query.thread_id
+    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
 
   it "doesn't overwrite an existing query id when saving" do
@@ -87,9 +102,19 @@ describe Oculus::Storage::FileStore do
     subject.all_queries.map(&:results).should == [other_query.results, query.results]
   end
 
+  it "fetches starred queries" do
+    query.starred = true
+    subject.save_query(query)
+    subject.save_query(other_query)
+
+    results = subject.starred_queries
+    results.map(&:results).should == [query.results]
+    results.first.starred.should be true
+  end
+
   it "deletes queries" do
     subject.save_query(query)
-    subject.load_query(query.id).name.should == query.name
+    subject.load_query(query.id)[:name].should == query.name
     subject.delete_query(query.id)
 
     lambda {

data/spec/query_presenter_spec.rb

@@ -10,9 +10,20 @@ describe Oculus::Presenters::QueryPresenter do
     presenter.description.should == 'foo'
   end
 
-  it "has a formatted date" do
-    query.date = Time.mktime(2010, 1, 1, 12, 34)
-    presenter.formatted_date.should == '2010-01-01 12:34'
+  it "has a formatted start time" do
+    query.started_at = Time.mktime(2010, 1, 1, 12, 34)
+    presenter.formatted_start_time.should == '2010-01-01 12:34 PM'
+  end
+
+  it "has a formatted finish time" do
+    query.finished_at = Time.mktime(2010, 1, 1, 12, 34)
+    presenter.formatted_finish_time.should == '2010-01-01 12:34 PM'
+  end
+
+  it "has an elapsed time" do
+    query.started_at = Time.mktime(2010, 1, 1, 10, 30)
+    query.finished_at = Time.mktime(2010, 1, 1, 12, 34)
+    presenter.elapsed_time.should == '2 hours 4 minutes'
   end
 
   it "reports successful queries" do

data/spec/query_spec.rb

@@ -2,25 +2,25 @@ require 'oculus'
 
 describe Oculus::Query do
   before do
-    Oculus.data_store = stub
+    Oculus.data_store = stub(:load_query => {}, :save_query => nil)
   end
 
   it "runs the query against the supplied connection" do
-    connection = stub
+    connection = stub(:thread_id => 42)
     query = Oculus::Query.new(:query => 'SELECT * FROM users')
     connection.should_receive(:execute).with('SELECT * FROM users')
     query.execute(connection)
   end
 
   it "stores the results of running the query" do
-    connection = stub(:execute => [['id', 'name'], [1, 'Paul']])
+    connection = stub(:execute => [['id', 'name'], [1, 'Paul']], :thread_id => 42)
     query = Oculus::Query.new(:query => 'SELECT * FROM users')
     query.execute(connection)
     query.results.should == [['id', 'name'], [1, 'Paul']]
   end
 
   it "stores errors when queries fail" do
-    connection = stub
+    connection = stub(:thread_id => 42)
     query = Oculus::Query.new(:query => 'SELECT * FROM users')
     connection.stub(:execute).and_raise(Oculus::Connection::Error.new('You have an error in your SQL syntax'))
     query.execute(connection)
@@ -37,16 +37,39 @@ describe Oculus::Query do
     query.thread_id.should == 42
   end
 
-  it "has a date" do
+  it "has a start time" do
     query = Oculus::Query.new
-    query.date.should be nil
+    query.started_at.should be nil
   end
 
-  it "updates date on save" do
-    Oculus.data_store.stub(:save_query)
+  it "has a finish time" do
+    query = Oculus::Query.new
+    query.finished_at.should be nil
+  end
+
+  it "updates start time when executing" do
     Time.stub(:now).and_return(now = stub)
-    query = Oculus::Query.create(:results => [['id', 'name'], [1, 'Paul']])
-    query.date.should == now
+    connection = stub(:execute => [['id', 'name'], [1, 'Paul']], :thread_id => 42)
+    query = Oculus::Query.new(:query => 'SELECT * FROM users')
+    query.execute(connection)
+    query.started_at.should == now
+  end
+
+  it "updates finish time when executing" do
+    Time.stub(:now).and_return(now = stub)
+    connection = stub(:execute => [['id', 'name'], [1, 'Paul']], :thread_id => 42)
+    query = Oculus::Query.new(:query => 'SELECT * FROM users')
+    query.execute(connection)
+    query.finished_at.should == now
+  end
+
+  it "updates finish time when execution fails" do
+    Time.stub(:now).and_return(now = stub)
+    connection = stub(:thread_id => 42)
+    connection.stub(:execute).and_raise(Oculus::Connection::Error.new('You have an error in your SQL syntax'))
+    query = Oculus::Query.new(:query => 'SELECT * FROM users')
+    query.execute(connection)
+    query.finished_at.should == now
   end
 
   it "has a name" do
@@ -59,6 +82,11 @@ describe Oculus::Query do
     query.author.should == 'Paul'
   end
 
+  it "can be starred" do
+    query = Oculus::Query.new(:starred => true)
+    query.starred.should == true
+  end
+
   it "stores new queries in the data store on creation" do
     Oculus.data_store.should_receive(:save_query)
     query = Oculus::Query.create(:results => [['id', 'name'], [1, 'Paul']])
@@ -75,18 +103,23 @@ describe Oculus::Query do
     Oculus::Query.find(1)
   end
 
-  it "is not complete when no results are present" do
+  it "is not complete when it has not been executed" do
     query = Oculus::Query.new(:query => 'SELECT * FROM users')
     query.should_not be_complete
   end
 
-  it "is complete when results are present" do
-    query = Oculus::Query.new(:results => [['id', 'name'], [1, 'Paul']])
+  it "is complete when it has been executed" do
+    connection = stub(:execute => [['id', 'name'], [1, 'Paul']], :thread_id => 42)
+    query = Oculus::Query.new
+    query.execute(connection)
     query.should be_complete
   end
 
   it "is complete when there is an error" do
-    query = Oculus::Query.new(:error => "That's not how to write SQL")
+    connection = stub(:thread_id => 42)
+    connection.stub(:execute).and_raise(Oculus::Connection::Error.new('You have an error in your SQL syntax'))
+    query = Oculus::Query.new
+    query.execute(connection)
     query.should be_complete
   end
 
@@ -96,12 +129,23 @@ describe Oculus::Query do
   end
 
   it "is successful when results are present" do
-    query = Oculus::Query.new(:results => [['id', 'name'], [1, 'Paul']])
+    connection = stub(:execute => [['id', 'name'], [1, 'Paul']], :thread_id => 42)
+    query = Oculus::Query.new
+    query.execute(connection)
     query.succeeded?.should be true
   end
 
   it "is not successful when there is an error" do
-    query = Oculus::Query.new(:error => "That's not how to write SQL")
+    connection = stub(:thread_id => 42)
+    connection.stub(:execute).and_raise(Oculus::Connection::Error.new('You have an error in your SQL syntax'))
+    query = Oculus::Query.new
+    query.execute(connection)
     query.succeeded?.should be false
   end
+
+  it "exports to CSV" do
+    query = Oculus::Query.new
+    query.results = [['id', 'name'], [1, 'Paul']]
+    query.to_csv.should == "id,name\n1,Paul\n"
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: oculus
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.8.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-05-01 00:00:00.000000000 Z
+date: 2012-05-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sinatra
-  requirement: &70342379865700 !ruby/object:Gem::Requirement
+  requirement: &70114293249540 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: 1.3.0
   type: :runtime
   prerelease: false
-  version_requirements: *70342379865700
+  version_requirements: *70114293249540
 - !ruby/object:Gem::Dependency
   name: mysql2
-  requirement: &70342379588240 !ruby/object:Gem::Requirement
+  requirement: &70114293249020 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: 0.3.11
   type: :runtime
   prerelease: false
-  version_requirements: *70342379588240
+  version_requirements: *70114293249020
 - !ruby/object:Gem::Dependency
   name: vegas
-  requirement: &70342379586780 !ruby/object:Gem::Requirement
+  requirement: &70114293248540 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: 0.1.4
   type: :runtime
   prerelease: false
-  version_requirements: *70342379586780
+  version_requirements: *70114293248540
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70342379585980 !ruby/object:Gem::Requirement
+  requirement: &70114288904480 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70342379585980
+  version_requirements: *70114288904480
 - !ruby/object:Gem::Dependency
   name: cucumber
-  requirement: &70342379581200 !ruby/object:Gem::Requirement
+  requirement: &70114288903580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '1'
   type: :development
   prerelease: false
-  version_requirements: *70342379581200
+  version_requirements: *70114288903580
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70342379895020 !ruby/object:Gem::Requirement
+  requirement: &70114288902160 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: '2'
   type: :development
   prerelease: false
-  version_requirements: *70342379895020
+  version_requirements: *70114288902160
 - !ruby/object:Gem::Dependency
   name: capybara
-  requirement: &70342379894540 !ruby/object:Gem::Requirement
+  requirement: &70114288901540 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,7 +87,7 @@ dependencies:
         version: '1'
   type: :development
   prerelease: false
-  version_requirements: *70342379894540
+  version_requirements: *70114288901540
 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.
@@ -131,6 +131,7 @@ files:
 - lib/oculus/server/views/index.erb
 - lib/oculus/server/views/layout.erb
 - lib/oculus/server/views/show.erb
+- lib/oculus/server/views/starred.erb
 - lib/oculus/storage.rb
 - lib/oculus/storage/file_store.rb
 - lib/oculus/version.rb