adhoq 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cdf4e3ebbc61cde7c4ab96819f90274043380030
-  data.tar.gz: ba15a928b583929ebf15ef137eb72feb416cfdbd
+  metadata.gz: a9fac13cfa25151dce3d5c579c39ba8098f07b6f
+  data.tar.gz: 23f822e233cc7977a2461dbe681a30d2426fffd5
 SHA512:
-  metadata.gz: b3ba6a550268f3a7b899b240b720a15fb5d5000434cd2812bc43b001f0c9e86251d24112abd06400be1c952cca25f6188b795cfb8c9a8d4fbbf1c716a3874273
-  data.tar.gz: 7cdc68ee8876b133c3bfde9830d66ca1f06cd7c0af4ebedca813afdc8ce9573123ea97220a7f810dec73ecd35a68c895c9c3a3f533bece43ac6ef5ee4acb7541
+  metadata.gz: f6d1804945abba5952f20f671f68e5fab9141d474dfdcc70aab8a6317cd3c975296e244b6d480a27a2e19066ec2c56eeaadde874ddd3617281275b23c08de6bb
+  data.tar.gz: 25dac12d074dff4dead41cb23271447737f237103aa494f4148b509b0a6f8cb30be2c1bd3aff9e63fe83763836c744be5249e48422d78d290afdd26685473904

data/README.md

@@ -1,4 +1,5 @@
-# Adhoq
+Adhoq [![Build Status](https://travis-ci.org/esminc/adhoq.svg)](https://travis-ci.org/esminc/adhoq) [![Code Climate](https://codeclimate.com/github/esminc/adhoq/badges/gpa.svg)](https://codeclimate.com/github/esminc/adhoq)
+====
 
 Rails engine to generate instant reports from adhoc SQL query.
 
@@ -6,16 +7,17 @@ Rails engine to generate instant reports from adhoc SQL query.
 
 ## Features
 
-- [x] Rails 4.x support
-- [ ] Rails 3.2 support
+- Export ad-hoc SQL result to .xlsx file
+- Persist generated report as local file or in AWS S3
+- Rails 4.x & 3.2 support
+- Nice administration console with rails engine
+
+### Future planning
+
 - Export reports in some formats:
-  - [x] .xlsx
   - [ ] .csv
   - [ ] .json
-- Report storage supports:
-  - [x] as local file
-  - [ ] S3 (via `Fog::Storage`)
-- [ ] In application export function helper
+- [ ] Label data substitution
 
 ## Installation
 
@@ -58,22 +60,53 @@ Edit initialization file in `config/initializer/adhoq.rb`
 
 ```ruby
 Adhoq.configure do |config|
-  config.storage       = [:local_file, Rails.root + '/path/to/store/report/files']
+  config.storage       = [:local_file, Rails.root + './path/to/store/report/files']
   config.authorization = ->(controller) { controller.signed_in? }
 end
 ```
 
-See configuration example in [dummy app](https://github.com/esminc/adhoq/commit/63cc31fe209baae7211c10f76e7b1c35f4c699ef).
+See configuration example in [dummy app](https://github.com/esminc/adhoq/blob/master/spec/dummy/config/initializers/adhoq.rb).
 
 Then restart server and try it out.
 
 ### As Plain old library (application export helper)
 
-TODO: Write usage instructions here
+Adhoq also provides report generation from SQL string, not from mounted rails engine.
+
+```ruby
+execution = Adhoq::AdhocExecution.new(
+  'xlsx',
+  'SELECT "hello" AS name ,"English greeting message" AS description'
+)
+
+Adhoq::Reporter.generate(execution) #=> report data
+```
+
+Persistence is also available without engine via `Adhoq::Storage::SomeClass#store`.
+Below is example that generating report and persist to in Rails application report method.
+
+```ruby
+execution = Adhoq::AdhocExecution.new(
+  'xlsx',
+  'SELECT "hello" AS name ,"English greeting message" AS description'
+)
+
+storage   = Storage::S3.new(
+  'my-adhoq-bucket',
+  aws_access_key_id: 'key_id',
+  aws_secret_access_key: 'access_key'
+)
+
+# generate report and store it to S3, returns `key` to get report data
+key = storage.store('.xlsx') { Adhoq::Reporter.generate(execution) }
+
+...
+storage.get(key) #=> report data
+```
 
 ## Contributing
 
-1. Fork it ( https://github.com/[my-github-username]/adhoq/fork )
+1. Fork it ( https://github.com/esminc/adhoq/fork )
 2. Create your feature branch (`git checkout -b my-new-feature`)
 3. Commit your changes (`git commit -am 'Add some feature'`)
 4. Push to the branch (`git push origin my-new-feature`)

data/app/assets/javascripts/adhoq/application.js

@@ -15,5 +15,6 @@
 //= require jquery_ujs
 //= require ./bootstrap
 //= require ./previewer
+//= require ./current_tables
 
 window.Adhoq = {}

data/app/assets/javascripts/adhoq/current_tables.js.coffee

@@ -0,0 +1,4 @@
+Adhoq.loadCurrentTableTabOnce = ($el)->
+  pane = $("#{$el.attr('href')}:has(.loading)")
+
+  pane.load(pane.find('a.loading').attr('href'))

data/app/assets/stylesheets/adhoq/adhoq.css.sass

@@ -55,3 +55,47 @@ form.query-form
 
 .fa-pad-l
   padding-left: $short-span / 2
+
+#current-tables
+  font-size: $font-size-base * 0.9
+
+  table
+    width: 800px
+
+    caption
+      text-align: left
+      margin-bottom:  $short-span
+      font-size:  $font-size-base * 1.5
+
+      span.name
+        font-family:  monospace
+      small.count
+        font-size:  $font-size-base * 1
+        color:      gray
+        margin-left:  $font-size-base
+
+    th.pk, td.pk
+      width: $font-size-base * 1.5
+    th, td.icon
+      text-align: center
+    th.number, td.number
+      text-align: right
+    th.monospace, td.monospace
+      font-family: monospace
+    th.data
+      width: $font-size-base * 10
+
+.tab-content
+  margin-top:  $font-size-base
+  padding-left:  1em
+  padding-right: 1em
+
+  max-height: 600px
+  overflow:   scroll
+
+  .tab-pane > h3
+    font-size: $font-size-base * 1.5
+
+    small
+      font-size: $font-size-base
+      margin-left: $font-size-base

data/app/assets/stylesheets/adhoq/bootstrap.scss

@@ -5,7 +5,7 @@
 // Reset and dependencies
 @import "bootstrap/normalize";
 @import "bootstrap/print";
-@import "bootstrap/glyphicons";
+// @import "bootstrap/glyphicons";
 
 // Core CSS
 @import "bootstrap/scaffolding";

data/app/controllers/adhoq/authorization_methods.rb

@@ -3,7 +3,7 @@ module Adhoq
     extend ActiveSupport::Concern
 
     included do |controller|
-      controller.before_action Authorizer.new
+      controller.before_filter Authorizer.new
 
       helper_method :adhoq_current_user
       hide_action   :adhoq_current_user

data/app/controllers/adhoq/current_tables_controller.rb

@@ -0,0 +1,20 @@
+module Adhoq
+  class CurrentTablesController < Adhoq::ApplicationController
+    before_filter :eager_load_models
+
+    def index
+      @ar_classes = ActiveRecord::Base.subclasses.
+        reject {|klass| klass.name == 'ActiveRecord::SchemaMigration' }.
+        sort_by(&:name)
+
+      render layout: false
+    end
+
+    private
+
+    def eager_load_models
+      return unless Rails.env.development?
+      [Rails.application, Adhoq::Engine].each(&:eager_load!)
+    end
+  end
+end

data/app/controllers/adhoq/executions_controller.rb

@@ -1,5 +1,5 @@
 module Adhoq
-  class ExecutionsController < ApplicationController
+  class ExecutionsController < Adhoq::ApplicationController
     def show
       @execution = current_query.executions.where(id: params[:id], report_format: params[:format]).first!
 
@@ -19,7 +19,7 @@ module Adhoq
     end
 
     def respond_report(report)
-      send_data report.data.read, type: report.mime_type, filename: report.name, disposition: 'attachment'
+      send_data report.data, type: report.mime_type, filename: report.name, disposition: 'attachment'
     end
   end
 end

data/app/helpers/adhoq/application_helper.rb

@@ -7,5 +7,18 @@ module Adhoq
         klass.model_name.humanize
       end
     end
+
+    def icon_fa(name, additional_classes = [])
+      tag('i', class: ['fa', "fa-#{name}", *additional_classes])
+    end
+
+    def schema_version
+      if defined?(ActiveRecord::SchemaMigration)
+        ActiveRecord::SchemaMigration.maximum(:version)
+      else
+        result = Adhoq::Executor.select("SELECT MAX(version) AS current_version FROM #{ActiveRecord::Migrator.schema_migrations_table_name}")
+        result.rows.first
+      end
+    end
   end
 end

data/app/models/adhoq/execution.rb

@@ -18,7 +18,7 @@ module Adhoq
     end
 
     def success?
-      report.try(:success?)
+      report.try(:available?)
     end
 
     # TODO go decorator or view model or so

data/app/models/adhoq/report.rb

@@ -1,11 +1,8 @@
 module Adhoq
   class Report < ActiveRecord::Base
-    BUFSIZE = 10.kilobytes.to_i
-
     belongs_to :execution
 
-    delegate :name,      to: 'execution'
-    delegate :mime_type, to: :reporter
+    delegate :name, to: 'execution'
 
     def generate!(storage = Adhoq.current_storage)
       self.identifier   = generate_and_persist_report!(storage)
@@ -15,28 +12,24 @@ module Adhoq
       save!
     end
 
-    def success?
-      data.present?
+    def available?
+      identifier.present? && (storage == Adhoq.current_storage.identifier)
     end
 
     def data(storage = Adhoq.current_storage)
       storage.get(identifier)
     end
 
-    private
-
-    def reporter
-      {'xlsx' => Adhoq::Reporter::Xlsx}[execution.report_format]
+    def mime_type
+      Adhoq::Reporter.lookup(execution.report_format).mime_type
     end
 
-    def generate_and_persist_report!(storage)
-      storage.store(".#{execution.report_format}") do |file, *|
-        executor = Executor.new(execution.raw_sql)
+    private
 
-        reporter.new(executor.execute).build_report.each(BUFSIZE) do |chunk|
-          file.write chunk
-        end
-      end
+    def generate_and_persist_report!(storage)
+      storage.store(".#{execution.report_format}") {
+        Adhoq::Reporter.generate(execution)
+      }
     end
   end
 end

data/app/views/adhoq/application/_global_nav.html.slim

@@ -9,3 +9,4 @@ nav#global-nav.navbar.navbar-default(role='navigation')
             = link_to main_app.root_path do
               i.fa.fa-arrow-circle-right.fa-pad-r
               | Main app
+

data/app/views/adhoq/current_tables/index.html.slim

@@ -0,0 +1,32 @@
+h3
+  | Current database schema
+  small= "Version #{schema_version}"
+
+ul.list-unstyled.tables
+  - @ar_classes.each do |ar_class|
+    - first_record = ar_class.unscoped.order(:id).first
+
+    li.ar_class data-table-name=ar_class.table_name
+      table.table.table-striped.table-hover.table-bordered
+        caption
+          span.name= ar_class.table_name
+          small.count #{ar_class.unscoped.count} rows
+        thead
+          tr
+            th.col-sm-1.pk PK
+            th.col-sm-2.name  Name
+            th.col-sm-1.type  Type
+            th.col-sm-1.null  Non-Null
+            th.col-sm-1.limit Limit
+            th.col-sm-2.default  Default
+            th.col-sm-4.data  unscoped.first
+        tbody
+          - ar_class.columns.each do |column|
+            tr
+              td.pk.icon= column.primary ? icon_fa('check-circle') : ''
+              td.monospace= column.name
+              td= column.type
+              td.null.icon= column.null ? '' : icon_fa('check')
+              td.limit.number= column.limit
+              td= column.default
+              td.monospace= first_record.try {|r| truncate(r.read_attribute_before_type_cast(column.name).to_s, length: 50) }

data/app/views/adhoq/queries/_form.html.slim

@@ -24,15 +24,35 @@
     .col-sm-8
       = f.text_area :query, class: 'form-control', rows: 10, required: true
 
-.preview
-  h2
-    | Preview
-    .btn-in-header
-      = link_to preview_path, class: 'btn btn-default btn-sm js-preview-button', data: {source: '#query_query', result: '.js-preview-result', remote: true, method: 'POST'} do
-        i.fa.fa-refresh[data-title='Refresh preview']
+ul.nav.nav-tabs[role='tablist']
+  li.active
+    a[role='tab' data-toggle='tab' href='#preview' ]
+      i.fa.fa-eye.fa-pad-r
+      | Preview
+  li
+    a[role='tab' data-toggle='tab' href='#current-tables']
+      i.fa.fa-database.fa-pad-r
+      | Tables
 
-  .js-preview-result
-    .alert Preview is shown here
+.tab-content
+  #preview.tab-pane.active
+    h3
+      | Query preview
+      small
+        = link_to preview_path, class: 'js-preview-button', data: {source: '#query_query', result: '.js-preview-result', remote: true, method: 'POST'} do
+          i.fa.fa-refresh.fa-pad-r[data-title='Refresh preview']
+          | Reflesh
+
+    .js-preview-result
+      .alert.alert-info Preview is shown here
+
+  #current-tables.tab-pane
+    a.loading[href=current_tables_path]
 
 javascript:
-  $(function() { Adhoq.enablePreview($('.preview a.js-preview-button')) })
+  $(function() {
+    Adhoq.enablePreview($('#preview a.js-preview-button'));
+
+    $('a[data-toggle="tab"]').on('show.bs.tab', function(ev) { Adhoq.loadCurrentTableTabOnce($(ev.target)) });
+  });
+

data/app/views/adhoq/queries/_query.html.slim

@@ -38,6 +38,6 @@ section.query
                 span.label[class=(exec.success? ? 'label-success' : 'label-danger')]= exec.status_label
               td.report
                 - if exec.success?
-                  = link_to([query, exec, format: exec.report_format], class: 'btn btn-sm btn-default') do
+                  = link_to(adhoq.query_execution_path(query, exec, format: exec.report_format), class: 'btn btn-sm btn-default') do
                     i.fa.fa-download.fa-pad-r
                     = exec.report_format

data/config/routes.rb

@@ -5,5 +5,6 @@ Adhoq::Engine.routes.draw do
     resources :executions, only: %w(create show)
   end
 
-  resource  :preview, only: 'create'
+  resource  :preview,        only: 'create'
+  resources :current_tables, only: 'index'
 end

data/lib/adhoq.rb

@@ -2,12 +2,13 @@ require 'adhoq/engine'
 require 'adhoq/global_variable'
 
 module Adhoq
-  autoload 'Configuration', 'adhoq/configuration'
-  autoload 'Error',         'adhoq/error'
-  autoload 'Executor',      'adhoq/executor'
-  autoload 'Reporter',      'adhoq/reporter'
-  autoload 'Result',        'adhoq/result'
-  autoload 'Storage',       'adhoq/storage'
+  autoload 'AdhocExecution', 'adhoq/adhoc_execution'
+  autoload 'Configuration',  'adhoq/configuration'
+  autoload 'Error',          'adhoq/error'
+  autoload 'Executor',       'adhoq/executor'
+  autoload 'Reporter',       'adhoq/reporter'
+  autoload 'Result',         'adhoq/result'
+  autoload 'Storage',        'adhoq/storage'
 
   extend Adhoq::GlobalVariable
 end

data/lib/adhoq/adhoc_execution.rb

@@ -0,0 +1,11 @@
+# Provides polymorphic API with Adhoc::Execution AR Model
+module Adhoq
+  class AdhocExecution
+    attr_reader :report_format, :raw_sql
+
+    def initialize(report_format, raw_sql)
+      @report_format = report_format
+      @raw_sql       = raw_sql
+    end
+  end
+end

data/lib/adhoq/executor.rb

@@ -2,12 +2,23 @@ module Adhoq
   class Executor
     class << self
       def select(query)
-        current_connection.send(:select, query)
+        with_sandbox do
+          current_connection.exec_query(query)
+        end
       end
 
       def current_connection
         ActiveRecord::Base.connection
       end
+
+      def with_sandbox
+        result = nil
+        ActiveRecord::Base.transaction do
+          result = yield
+          raise ActiveRecord::Rollback
+        end
+        result
+      end
     end
 
     def initialize(query)

data/lib/adhoq/global_variable.rb

@@ -22,13 +22,16 @@ module Adhoq
 
     private
 
-    # TODO Implement S3
     def setup_storage(type, *args)
-      unless type == :local_file
-        raise NotImplementedError
-      end
+      klass =
+        case type
+        when :local_file then Adhoq::Storage::LocalFile
+        when :s3         then Adhoq::Storage::S3
+        else
+          raise NotImplementedError
+        end
 
-      Adhoq::Storage::LocalFile.new(*args)
+      klass.new(*args)
     end
   end
 end

data/lib/adhoq/reporter.rb

@@ -1,5 +1,19 @@
 module Adhoq
   module Reporter
     autoload 'Xlsx', 'adhoq/reporter/xlsx'
+
+    class << self
+      def generate(execution)
+        executor = Executor.new(execution.raw_sql)
+        reporter = lookup(execution.report_format).new(executor.execute)
+
+        reporter.build_report
+      end
+
+      def lookup(format)
+        @map ||= {'xlsx' => Adhoq::Reporter::Xlsx}
+        @map[format]
+      end
+    end
   end
 end

data/lib/adhoq/storage.rb

@@ -1,5 +1,16 @@
 module Adhoq
   module Storage
-    autoload 'LocalFile', 'adhoq/storage/local_file'
+    autoload 'FogStorage', 'adhoq/storage/fog_storage'
+    autoload 'LocalFile',  'adhoq/storage/local_file'
+    autoload 'S3',         'adhoq/storage/s3'
+
+    def with_new_identifier(suffix = nil, seed = Time.now)
+      dirname, fname_seed = ['%Y-%m-%d', '%H%M%S.%L'].map {|f| seed.strftime(f) }
+
+      basename = "%s_%05d%s" % [fname_seed, Process.pid, suffix]
+
+      [dirname, basename].join('/').tap {|id| yield id }
+    end
+    module_function :with_new_identifier
   end
 end

data/lib/adhoq/storage/fog_storage.rb

@@ -0,0 +1,22 @@
+module Adhoq
+  module Storage
+    class FogStorage
+      def store(suffix = nil, seed = Time.now, &block)
+        Adhoq::Storage.with_new_identifier(suffix, seed) do |identifier|
+          io = yield
+          io.rewind
+
+          directory.files.create(key: identifier, body: io, public: false)
+        end
+      end
+
+      def get(identifier)
+        get_raw(identifier).body
+      end
+
+      def get_raw(identifier)
+        directory.files.head(identifier)
+      end
+    end
+  end
+end

data/lib/adhoq/storage/local_file.rb

@@ -1,44 +1,25 @@
+require 'fog'
+
 module Adhoq
   module Storage
-    class LocalFile
+    class LocalFile < FogStorage
       attr_reader :root
 
       def initialize(root_path)
-        @root = Pathname.new(root_path)
-      end
-
-      def identifier
-        "file://#{@root.realpath}"
-      end
-
-      def store(suffix = nil, seed = Time.now, &block)
-        calculate_identifier(suffix, seed).tap do |identifier|
-          mkpath!(identifier)
+        path = Pathname.new(root_path)
 
-          (@root + identifier).open('w:BINARY') do |file|
-            yield file, identifier
-            file.flush
-          end
-        end
+        @fog = Fog::Storage.new(provider: 'Local', local_root: path.parent)
+        @dir = path.basename.to_s
       end
 
-      def get(identifier)
-        (@root + identifier).open('r:BINARY')
+      def identifier
+        "file://#{[@fog.local_root, @dir].join('/')}"
       end
 
       private
 
-      def calculate_identifier(suffix, seed)
-        dirname, fname_seed = ['%Y-%m-%d', '%H%M%S.%L'].map {|f| seed.strftime(f) }
-
-        basename = "%s_%05d%s" % [fname_seed, Process.pid, suffix]
-
-        identifier = [dirname, basename].join('/')
-      end
-
-      def mkpath!(identifier)
-        dir = identifier.split('/').first
-        (@root + dir).mkpath
+      def directory
+        @fog.directories.get(@dir) || @fog.directories.create(key: @dir)
       end
     end
   end

data/lib/adhoq/storage/s3.rb

@@ -0,0 +1,24 @@
+require 'fog'
+
+module Adhoq
+  module Storage
+    class S3 < FogStorage
+      def initialize(bucket, s3_options = {})
+        @bucket = bucket
+        @s3     = Fog::Storage.new({provider: 'AWS'}.merge(s3_options))
+      end
+
+      def identifier
+        "s3://#{@bucket}"
+      end
+
+      private
+
+      def directory
+        return @directory if @directory
+
+        @directory = @s3.directories.get(@bucket) || @s3.directories.create(key: @bucket, public: false)
+      end
+    end
+  end
+end

data/lib/adhoq/version.rb

@@ -1,3 +1,3 @@
 module Adhoq
-  VERSION = "0.0.2"
+  VERSION = "0.0.3"
 end

data/spec/adhoq/executor_spec.rb

@@ -7,5 +7,18 @@ module Adhoq
 
       specify { expect(executor.execute).to eq Adhoq::Result.new(%w[answer], [[42]]) }
     end
+
+    describe '.select' do
+      specify 'Do not reflect write access' do
+        expect {
+          Executor.select(<<-INSERT_SQL.strip_heredoc)
+            INSERT INTO "adhoq_queries"
+            ("description", "name", "query", "updated_at", "created_at")
+            VALUES
+            ("description", "name", "SELECT 1", "NOW", "NOW")
+          INSERT_SQL
+        }.not_to change(Adhoq::Query, :count)
+      end
+    end
   end
 end

data/spec/adhoq/global_variable_spec.rb

@@ -0,0 +1,37 @@
+module Adhoq
+  RSpec.describe GlobalVariable, type: :model do
+    def reset_storage_config(*storage_config)
+      Adhoq.instance_variable_set('@current_storage', nil)
+      Adhoq.config.storage = storage_config
+    end
+
+    around(:each) do |example|
+      begin
+        original_config = Adhoq.config.storage
+        example.run
+      ensure
+        reset_storage_config(*original_config)
+      end
+    end
+
+    context 'config.storage = [:local_file, ....]' do
+      before do
+        reset_storage_config(:local_file, Rails.root + "/tmp/adhoq/#{Rails.env}")
+      end
+
+      specify do
+        expect(Adhoq.current_storage).to be_instance_of Adhoq::Storage::LocalFile
+      end
+    end
+
+    context 'config.storage = [:s3, ....]' do
+      before do
+        reset_storage_config(:s3, 'my-bucket-name', aws_access_key_id: 'key-id', aws_secret_access_key: 'secret', region: 'paris-01')
+      end
+
+      specify do
+        expect(Adhoq.current_storage).to be_instance_of Adhoq::Storage::S3
+      end
+    end
+  end
+end

data/spec/adhoq/reporter/xlsx_spec.rb

@@ -0,0 +1,18 @@
+module Adhoq
+  RSpec.describe Reporter::Xlsx, type: :model do
+    context 'create xlsx report' do
+      let(:report_data) do
+        Adhoq::Reporter.generate(Adhoq::AdhocExecution.new('xlsx', <<-SQL.strip_heredoc))
+          SELECT "hello" AS name ,"English greeting message" AS description
+        SQL
+      end
+
+      specify do
+        expect(report_data.read).to have_values_in_xlsx_sheet([
+          %w[name description],
+          ['hello', 'English greeting message']
+        ])
+      end
+    end
+  end
+end

data/spec/adhoq/storage_spec.rb

@@ -10,10 +10,20 @@ module Adhoq
       let(:storage) { Storage::LocalFile.new(tempdir) }
 
       let(:identifier) do
-        storage.store('.txt') {|file, ident| file.puts 'Hello adhoq!' }
+        storage.store('.txt') { StringIO.new("Hello adhoq!\n") }
       end
 
-      specify { expect(storage.get(identifier).read).to eq "Hello adhoq!\n" }
+      specify { expect(storage.get(identifier)).to eq "Hello adhoq!\n" }
+    end
+
+    describe Storage::S3, :fog_mock do
+      let(:storage) { Storage::S3.new('my-adhoq-bucket', aws_access_key_id: 'key_id', aws_secret_access_key: 'access_key') }
+
+      let(:identifier) do
+        storage.store('.txt') { StringIO.new("Hello adhoq!\n") }
+      end
+
+      specify { expect(storage.get(identifier)).to eq "Hello adhoq!\n" }
     end
   end
 end

data/spec/spec_helper.rb

@@ -2,13 +2,18 @@ ENV['RAILS_ENV'] ||= 'test'
 require_relative 'dummy/config/environment'
 
 require 'rspec/rails'
-require 'factory_girl_rails'
 
+require 'capybara/rspec'
+require 'capybara/poltergeist'
+require 'database_cleaner'
+require 'factory_girl_rails'
 require 'pry-byebug'
 
 Rails.backtrace_cleaner.remove_silencers!
 Dir["#{File.dirname(__FILE__)}/support/**/*.rb"].each {|f| require f }
 
+Capybara.default_driver = :poltergeist
+
 RSpec.configure do |config|
   config.expect_with :rspec do |expectations|
     expectations.include_chain_clauses_in_custom_matcher_descriptions = true
@@ -18,7 +23,7 @@ RSpec.configure do |config|
     mocks.verify_partial_doubles = true
   end
 
-  config.use_transactional_fixtures = true
+  config.use_transactional_fixtures = false
   config.filter_run :focus
   config.run_all_when_everything_filtered = true
 
@@ -33,4 +38,26 @@ RSpec.configure do |config|
 
   config.include FactoryGirl::Syntax::Methods
   Kernel.srand config.seed
+
+  config.around(:each, :fog_mock) do |example|
+    begin
+      Fog.mock!
+      Fog::Mock.reset
+
+      example.run
+    ensure
+      Fog.unmock!
+    end
+  end
+
+  config.before(:suite) do
+    DatabaseCleaner.strategy = :truncation
+    DatabaseCleaner.clean_with :truncation
+  end
+
+  config.around(:each) do |example|
+    DatabaseCleaner.cleaning do
+      example.run
+    end
+  end
 end

data/spec/support/codeclimate_reporter.rb

@@ -0,0 +1,4 @@
+if ENV['CODECLIMATE_REPO_TOKEN'] && RUBY_VERSION >= '2.1'
+  require 'codeclimate-test-reporter'
+  CodeClimate::TestReporter.start
+end

data/spec/support/feature_spec_helper.rb

@@ -0,0 +1,5 @@
+module FeatureSpecHelper
+  def table_contant(table)
+    first(table).all('tr').map {|row| row.all('th, td').map(&:text) }
+  end
+end

data/spec/support/have_values_in_xlsx_sheet_matcher.rb

@@ -1,16 +1,22 @@
 require 'rspec/matchers'
 require 'simple_xlsx_reader'
 
-RSpec::Matchers.define :have_values_in_xlsx_sheet do |values|
+RSpec::Matchers.define :have_values_in_xlsx_sheet do |expect_values|
   match do |data|
-    expect(extract_values(data)).to eq values
+    @actual_values = extract_values(data)
+    expect(@actual_values).to eq expect_values
+  end
+
+
+  failure_message do
+    RSpec::Expectations.differ.diff_as_object(@actual_values, expect_values)
   end
 
   private
 
   def extract_values(data)
     Tempfile.open(%w[actual .xlsx], Dir.tmpdir, encoding: 'BINARY') do |f|
-      f.write data.read
+      f.write data
       f.flush
 
       sheet = SimpleXlsxReader::Document.new(f.path).sheets.first

metadata

@@ -1,31 +1,45 @@
 --- !ruby/object:Gem::Specification
 name: adhoq
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - Kyosuke MOROHASHI
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-08 00:00:00.000000000 Z
+date: 2014-10-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '3.2'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '3.2'
+- !ruby/object:Gem::Dependency
+  name: axlsx
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '2.0'
 - !ruby/object:Gem::Dependency
-  name: axlsx
+  name: coffee-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -39,7 +53,35 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: coffee-rails
+  name: fog
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.23'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.23'
+- !ruby/object:Gem::Dependency
+  name: font-awesome-sass
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 4.2.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 4.2.0
+- !ruby/object:Gem::Dependency
+  name: jquery-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -53,7 +95,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: font-awesome-sass
+  name: sass-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -67,7 +109,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: jquery-rails
+  name: slim-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -81,13 +123,27 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: sass-rails
+  name: capybara
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 2.4.3
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 2.4.3
+- !ruby/object:Gem::Dependency
+  name: database_cleaner
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  type: :runtime
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
@@ -95,13 +151,13 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: slim-rails
+  name: factory_girl_rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  type: :runtime
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
@@ -109,7 +165,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: factory_girl_rails
+  name: launchy
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -122,6 +178,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: poltergeist
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.5.1
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.5.1
 - !ruby/object:Gem::Dependency
   name: pry-byebug
   requirement: !ruby/object:Gem::Requirement
@@ -217,6 +287,7 @@ files:
 - app/assets/javascripts/adhoq/bootstrap/tab.js
 - app/assets/javascripts/adhoq/bootstrap/tooltip.js
 - app/assets/javascripts/adhoq/bootstrap/transition.js
+- app/assets/javascripts/adhoq/current_tables.js.coffee
 - app/assets/javascripts/adhoq/previewer.js.coffee
 - app/assets/stylesheets/adhoq/_bootstrap-compass.scss
 - app/assets/stylesheets/adhoq/_bootstrap-mincer.scss
@@ -296,6 +367,7 @@ files:
 - app/assets/stylesheets/adhoq/bootstrap/mixins/_vendor-prefixes.scss
 - app/controllers/adhoq/application_controller.rb
 - app/controllers/adhoq/authorization_methods.rb
+- app/controllers/adhoq/current_tables_controller.rb
 - app/controllers/adhoq/executions_controller.rb
 - app/controllers/adhoq/previews_controller.rb
 - app/controllers/adhoq/queries_controller.rb
@@ -306,6 +378,7 @@ files:
 - app/models/adhoq/time_based_orders.rb
 - app/views/adhoq/application/_global_nav.html.slim
 - app/views/adhoq/application/_sidebar_queries_index.html.slim
+- app/views/adhoq/current_tables/index.html.slim
 - app/views/adhoq/previews/create.html.slim
 - app/views/adhoq/previews/statement_invalid.html.slim
 - app/views/adhoq/queries/_form.html.slim
@@ -320,6 +393,7 @@ files:
 - db/migrate/20141006014750_create_adhoq_executions.rb
 - db/migrate/20141007052308_create_adhoq_reports.rb
 - lib/adhoq.rb
+- lib/adhoq/adhoc_execution.rb
 - lib/adhoq/configuration.rb
 - lib/adhoq/engine.rb
 - lib/adhoq/error.rb
@@ -329,16 +403,22 @@ files:
 - lib/adhoq/reporter/xlsx.rb
 - lib/adhoq/result.rb
 - lib/adhoq/storage.rb
+- lib/adhoq/storage/fog_storage.rb
 - lib/adhoq/storage/local_file.rb
+- lib/adhoq/storage/s3.rb
 - lib/adhoq/version.rb
 - lib/tasks/adhoq_tasks.rake
 - spec/adhoq/executor_spec.rb
+- spec/adhoq/global_variable_spec.rb
+- spec/adhoq/reporter/xlsx_spec.rb
 - spec/adhoq/storage_spec.rb
 - spec/factories/adhoq_queries.rb
 - spec/models/adhoq/execution_spec.rb
 - spec/models/adhoq/query_spec.rb
 - spec/models/adhoq/report_spec.rb
 - spec/spec_helper.rb
+- spec/support/codeclimate_reporter.rb
+- spec/support/feature_spec_helper.rb
 - spec/support/have_values_in_xlsx_sheet_matcher.rb
 homepage: https://github.com/esminc/adhoq
 licenses:
@@ -366,10 +446,14 @@ specification_version: 4
 summary: DB management console in the wild.
 test_files:
 - spec/adhoq/executor_spec.rb
+- spec/adhoq/global_variable_spec.rb
+- spec/adhoq/reporter/xlsx_spec.rb
 - spec/adhoq/storage_spec.rb
 - spec/factories/adhoq_queries.rb
 - spec/models/adhoq/execution_spec.rb
 - spec/models/adhoq/query_spec.rb
 - spec/models/adhoq/report_spec.rb
+- spec/support/codeclimate_reporter.rb
+- spec/support/feature_spec_helper.rb
 - spec/support/have_values_in_xlsx_sheet_matcher.rb
 - spec/spec_helper.rb