adhoq 0.5.0.beta1 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: a6e80af86c7cb940f71f7e52519bfb230401a77c
-  data.tar.gz: 8ffc771c4e7d7dab5779ce9523a3057750baf712
+SHA256:
+  metadata.gz: d2c0991686730b39d0fbd3c2e9c7f1bda40fb411c901411fd33191c418e15e5a
+  data.tar.gz: 07061445eb7816acd45def397ed4484c3cece656b888a098af3afdf013f0bfd2
 SHA512:
-  metadata.gz: 663808146b19b9804b2190ea04b7d7f36e97087884b515fc70a34248b8e73b4ad40fadce1bfdd0ac29443ca2faecf32852e408622a8a8f8fef4f80fc23129562
-  data.tar.gz: 0cce243729dc884e9f2f81ac1fa33f479db7f9fb92c5e617b1251bcaa3f919798b081dc7942303e749c4456dd4200b66a6420bb0972b9d03e22bf86c9bf6908b
+  metadata.gz: 0014df0080634eb3d843bc89bf676b7536553830bc49be0bd039ff7e9e8e1cb6cf381ffc2b0e213c5be1cdc906a6b73519b4cbdc99b4353411318fddd95a4719
+  data.tar.gz: 62bbafd14f915ce22af6235864a36220137024446440a18e22d077eeab888ef4f18dc6a503c8cb4b1600b9811c3ed80b7ed421019f04e5296d2d5e910567147f

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

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

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

@@ -18,14 +18,6 @@ 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,32 +11,11 @@ module Adhoq
         reject {|klass| klass.abstract_class? || hidden_model_names.include?(klass.name) || klass.name.nil? }.
         sort_by(&:name)
 
-      respond_to do |format|
-        format.html { render layout: false }
-        format.json { render json: tables_as_json(@ar_classes) }
-      end
+      render layout: false
     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(format: 'html')]
+  a.loading[href=current_tables_path]
 
 javascript:
   $(function() {

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

@@ -7,20 +7,8 @@
           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
-    .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}"
-      )
+    = f.text_area :query, class: 'form-control', rows: 15, required: true
 
   .modal.fade#nameAndDesc[role='dialog']
     .modal-dialog
@@ -97,25 +85,9 @@ 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

@@ -3,6 +3,7 @@ require 'font-awesome-sass'
 require 'jquery-rails'
 require 'slim-rails'
 require 'active_decorator'
+require 'sassc-rails'
 
 module Adhoq
   class Engine < ::Rails::Engine
@@ -12,7 +13,5 @@ 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.5.0.beta1"
+  VERSION = "0.5.0"
 end

data/spec/factories/adhoq_queries.rb

@@ -2,14 +2,14 @@
 
 FactoryBot.define do
   factory :adhoq_query, class: 'Adhoq::Query' do
-    name        'A query'
-    description 'Simple simple SELECT'
-    query       'SELECT 1'
+    name        { 'A query' }
+    description { 'Simple simple SELECT' }
+    query       { 'SELECT 1' }
 
     trait :complex do
-      name        'adhoq current use'
-      description 'Simple analysys: count execution per query'
-      query <<-SQL.strip_heredoc
+      name        { 'adhoq current use' }
+      description { 'Simple analysys: count execution per query' }
+      query { <<-SQL.strip_heredoc }
         SELECT
           q.id
          ,q.name
@@ -27,9 +27,9 @@ FactoryBot.define do
     end
 
     trait :greeting do
-      name        'greeting'
-      description 'Static query for testing data'
-      query       'SELECT "hello" AS name ,"English greeting message" AS description'
+      name        { 'greeting' }
+      description { 'Static query for testing data' }
+      query       { 'SELECT "hello" AS name ,"English greeting message" AS description' }
     end
   end
 end

data/spec/spec_helper.rb

@@ -13,7 +13,6 @@ 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,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: adhoq
 version: !ruby/object:Gem::Version
-  version: 0.5.0.beta1
+  version: 0.5.0
 platform: ruby
 authors:
 - Kyosuke MOROHASHI
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-08-09 00:00:00.000000000 Z
+date: 2019-04-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -84,16 +84,16 @@ dependencies:
   name: font-awesome-sass
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 4.2.0
+        version: '4.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 4.2.0
+        version: '4.2'
 - !ruby/object:Gem::Dependency
   name: jquery-rails
   requirement: !ruby/object:Gem::Requirement
@@ -109,7 +109,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: sass-rails
+  name: sassc-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -280,16 +280,16 @@ dependencies:
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.3.6
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.3.6
 - !ruby/object:Gem::Dependency
   name: tapp
   requirement: !ruby/object:Gem::Requirement
@@ -493,12 +493,11 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.5.2.2
+rubygems_version: 3.0.1
 signing_key: 
 specification_version: 4
 summary: DB management console in the wild.