adhoq 0.4.0 → 0.5.0.beta1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 55ebbfcb4634de6d7ff7b565a620aea07cdb739c
-  data.tar.gz: 4a46756086ac03ff5f8564797fff26522fb0f4a2
+  metadata.gz: a6e80af86c7cb940f71f7e52519bfb230401a77c
+  data.tar.gz: 8ffc771c4e7d7dab5779ce9523a3057750baf712
 SHA512:
-  metadata.gz: 19c49904e45e9eedf169134bc6564448e0974af82a61862bc8fffc33c3bd1a921cb976acf7c962e34b963b38ec99ad06f21b0d0c07ec6dd3bed30856901cec1c
-  data.tar.gz: cae892aac89db0af6e29568fac5aac68c2adab131315fa87fdf38dd8a002e9397c8b85dd2864f4b09c0fb745799597d0a313c0c56e3e6288662d94977b6508b7
+  metadata.gz: 663808146b19b9804b2190ea04b7d7f36e97087884b515fc70a34248b8e73b4ad40fadce1bfdd0ac29443ca2faecf32852e408622a8a8f8fef4f80fc23129562
+  data.tar.gz: 0cce243729dc884e9f2f81ac1fa33f479db7f9fb92c5e617b1251bcaa3f919798b081dc7942303e749c4456dd4200b66a6420bb0972b9d03e22bf86c9bf6908b

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

@@ -16,5 +16,6 @@
 //= require ./bootstrap
 //= require ./previewer
 //= require ./current_tables
+//= require queryEditor.bundle
 
 window.Adhoq = {}

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

@@ -18,6 +18,14 @@ class Previewer
     )
 
   source: ->
+    # NOTE: Sometimes the textarea is empty even if the monaco editor has some contents.
+    #       That's why the editor source is preferred.
+    @editorSource() || @domSource()
+
+  editorSource: ->
+    Adhoq.editor && Adhoq.editor.getValue()
+
+  domSource: ->
     $(@el.data('source')).val()
 
   result: ->

data/app/controllers/adhoq/current_tables_controller.rb

@@ -11,11 +11,32 @@ module Adhoq
         reject {|klass| klass.abstract_class? || hidden_model_names.include?(klass.name) || klass.name.nil? }.
         sort_by(&:name)
 
-      render layout: false
+      respond_to do |format|
+        format.html { render layout: false }
+        format.json { render json: tables_as_json(@ar_classes) }
+      end
     end
 
     private
 
+    def tables_as_json(ar_classes)
+      ar_classes.map {|ar_class|
+        {
+          table_name: ar_class.table_name,
+          columns: ar_class.columns.map {|column|
+            {
+              name: column.name,
+              type: column.type,
+              primary_key: column.name == ar_class.primary_key,
+              null: column.null,
+              limit: column.limit,
+              default: column.default
+            }
+          }
+        }
+      }
+    end
+
     def eager_load_models
       return unless Rails.env.development?
       [Rails.application, Adhoq::Engine].each(&:eager_load!)

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

@@ -1,5 +1,5 @@
 #current-tables
-  a.loading[href=current_tables_path]
+  a.loading[href=current_tables_path(format: 'html')]
 
 javascript:
   $(function() {

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

@@ -7,8 +7,20 @@
           i.fa.fa-database.fa-pad-r
           | Show tables
 
+  .clearfix
+    a#disable_code_editor.pull-right(href='#')
+      i.fa.fa-edit
+      | Switch to Plain Editor
+
   .form-group
-    = f.text_area :query, class: 'form-control', rows: 15, required: true
+    .form-control.query-editor
+      #query_field(
+        data-current-tables-path="#{current_tables_path}"
+        data-id="query_query"
+        data-name="query[query]"
+        data-placeholder="#{@query.persisted? ? 'Edit' : 'New'} query"
+        data-query="#{@query.query}"
+      )
 
   .modal.fade#nameAndDesc[role='dialog']
     .modal-dialog
@@ -85,9 +97,25 @@ ul.nav.nav-tabs[role='tablist']
 
 javascript:
   $(function() {
+    var element = document.getElementById('query_field');
+
+    Adhoq.editor = Adhoq.launchEditor(element);
+    Adhoq.installCompletion(element.dataset.currentTablesPath);
+
+    $('#disable_code_editor').on('click', function(e) {
+      e.preventDefault();
+
+      Adhoq.switchToTextareaEditor({
+        editor: Adhoq.editor,
+        element: element.parentNode,
+        content: Adhoq.editor.getModel().getValue()
+      });
+
+      e.target.remove();
+    });
+
     Adhoq.enablePreview($('#preview a.js-preview-button'));
     Adhoq.enablePreview($('#explain a.js-explain-button'));
 
     Adhoq.enablePreviewKeybordShortCut($('#query_query'), '#previews .tab-pane.active a:has(".fa-refresh")')
   });
-

data/lib/adhoq/engine.rb

@@ -12,5 +12,7 @@ module Adhoq
       g.test_framework      :rspec,        fixture: false
       g.fixture_replacement :factory_girl, dir:     'spec/factories'
     end
+
+    config.assets.paths << "#{__dir__}/../../query_editor/dist"
   end
 end

data/lib/adhoq/version.rb

@@ -1,3 +1,3 @@
 module Adhoq
-  VERSION = "0.4.0"
+  VERSION = "0.5.0.beta1"
 end

data/spec/spec_helper.rb

@@ -13,6 +13,7 @@ Rails.backtrace_cleaner.remove_silencers!
 Dir["#{File.dirname(__FILE__)}/support/**/*.rb"].each {|f| require f }
 
 Capybara.default_driver = :poltergeist
+Capybara.default_wait_time = 30
 
 RSpec.configure do |config|
   config.expect_with :rspec do |expectations|

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: adhoq
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.5.0.beta1
 platform: ruby
 authors:
 - Kyosuke MOROHASHI
@@ -493,9 +493,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.5.2.2