finery 3.0.2 → 3.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4c11bf80f48ee76d4afaed581aabb6481bccd7b56a839c49b2bd61613b8e000e
-  data.tar.gz: f350e697db4948e3b1426961b3b26f46fdd49a2db2a3411812cb85be6510671b
+  metadata.gz: 581c9c47c4c0b79536e441a4d4471fe021dfb782988a397e4ce781436cabe9fb
+  data.tar.gz: f5cf561aaff9f8362b28a28217b01b5591ce73b90d0c1eb7cd54dd67d51c8590
 SHA512:
-  metadata.gz: 6398ed311ae7de30b5f8c8b7f9ad3a3de14c793f62ceeb6bf3b35970703f5d69e5e093888bf41fef8df77945928be7aff3a911b17799bc4b3fbab48c2d221620
-  data.tar.gz: 25553c55eeb394fc57084d8174d408a6a4f977cf28e4333f59c3c611b6fd5bb30f0cc2288e6609cec15cef936db451cec44808ddf0b305d19ee15f88c53e5fa3
+  metadata.gz: 07b7c9c15a2d9a433c2d0b4d45faeba9d2d7ea5c64fcd06b7099f8b849e2aa0e385b026b9198051230efa8c5fe15c0f368a43d3d0fc0319f7df3c6ce2a756f00
+  data.tar.gz: 8a4f16b2080bbc21071068bd93995c08255a0aac0dd3a72ea58fb1f51e0935580c36ede132d0617b8ce6163420f84d1a898b61d05c265e1ddf71d0784b342873

data/README.md

@@ -763,7 +763,6 @@ data_sources:
     # optional settings
     ssl_verify: true # false by default
 ```
->>>>>>> 41a6b49 (Added support for ClickHouse)
 
 ### Druid
 

data/app/assets/javascripts/blazer/controllers/index.js

@@ -7,6 +7,7 @@
 //= require ./code_controller
 //= require ./datepicker_controller
 //= require ./daterangepicker_controller
+//= require ./more_controller
 //= require ./navbar_padding_controller
 //= require ./selectize_controller
 //= require ./unsaved_controller

data/app/assets/javascripts/blazer/controllers/more_controller.js

@@ -0,0 +1,13 @@
+Stimulus.register("more", class extends Controller {
+  static targets = [ "field", "show" ]
+
+  connect() {
+    this.fieldTargets.forEach((e) => { e.style.display = "none" })
+    this.showTarget.classList.remove("d-none")
+  }
+
+  show(event) {
+    this.fieldTargets.forEach((e) => { e.style.display = "block" })
+    this.showTarget.classList.add("d-none")
+  }
+})

data/app/assets/stylesheets/blazer/application.css

@@ -62,7 +62,7 @@ input.search:focus {
   min-width: 10em;
 }
 
-.form-inline .selectize-control, .text-right .selectize-control {
+.text-right .selectize-control {
   display: inline-block;
   vertical-align: middle;
   margin-left: 5px;

data/app/controllers/blazer/queries_controller.rb

@@ -61,6 +61,7 @@ module Blazer
     def show
       @statement = @query.statement_object
       @success = process_vars(@statement)
+      @data_sources = [Blazer.data_sources[@query.data_source]]
 
       @smart_vars = {}
       @sql_errors = []

data/app/helpers/blazer/base_helper.rb

@@ -36,6 +36,12 @@ module Blazer
       k.nil? ? "null" : k.to_s
     end
 
+    def blazer_var_default?(key)
+      value = request.query_parameters[key]
+      return true if value.to_s == ""
+      return true if @data_sources.any? { |source| source.variable_defaults[key].to_s == value.to_s }
+    end
+
     def blazer_format_annotations(annotations)
       return [] unless annotations.is_a?(Array)
       sorted = annotations.sort_by { |annotation| annotation[:min_date] }

data/app/views/blazer/_navbar.html.erb

@@ -1,10 +1,12 @@
 <nav class="navbar navbar-expand-md fixed-top bg-body-tertiary" data-navbar-padding-target="navbar">
-  <div class="container flex-nowrap">
-    <span class="navbar-brand d-none d-sm-inline">Finery</span>
-    <button class="navbar-toggler me-3" type="button" data-bs-toggle="collapse" data-bs-target="#navbarCollapse" aria-controls="navbarCollapse" aria-expanded="false" aria-label="Toggle navigation">
-      <span class="navbar-toggler-icon"></span>
-    </button>
-    <span class="navbar-brand d-sm-none text-truncate"><%= blazer_title || "Finery" %></span>
+  <div class="container">
+    <div class="d-flex flex-nowrap mw-100">
+      <span class="navbar-brand d-none d-sm-inline">Finery</span>
+      <button class="navbar-toggler me-3" type="button" data-bs-toggle="collapse" data-bs-target="#navbarCollapse" aria-controls="navbarCollapse" aria-expanded="false" aria-label="Toggle navigation">
+        <span class="navbar-toggler-icon"></span>
+      </button>
+      <span class="navbar-brand d-sm-none text-truncate"><%= blazer_title || "Finery" %></span>
+    </div>
     <div class="collapse navbar-collapse" id="navbarCollapse">
       <ul class="navbar-nav me-auto mb-2 mb-md-0">
         <li class="nav-item">

data/app/views/blazer/_variables.html.erb

@@ -3,7 +3,7 @@
   <script>
     <%= blazer_js_var "timeZone", Blazer.time_zone.tzinfo.name %>
   </script>
-  <form id="bind" method="get" action="<%= action %>" class="form-inline" style="margin-bottom: 15px;" data-controller="autosubmit" data-action="change->autosubmit#call">
+  <form id="bind" method="get" action="<%= action %>" class="form-inline row g-3" style="margin-bottom: 15px;" data-controller="autosubmit more" data-action="change->autosubmit#call">
     <% date_vars = ["start_time", "end_time"] %>
     <% if (date_vars - @bind_vars).empty? %>
       <% @bind_vars = @bind_vars - date_vars %>
@@ -12,19 +12,17 @@
     <% end %>
 
     <% @bind_vars.each_with_index do |var, i| %>
-      <div class="form-group">
-      <%= label_tag var, var %>
-      <% if (data = @smart_vars[var]) %>
-        <%= select_tag var, options_for_select([[nil, nil]] + data, selected: var_params[var]), data: { controller: "selectize" }, style: "margin-right: 20px; width: 200px; display: none;" %>
+      <div class="col-12 col-md-2" <% if blazer_var_default?(var) %>data-more-target="field"<% end %>>
+      <%= label_tag var, var, class: "form-label" %>
+      <% if @smart_vars.key? var %>
+        <%= select_tag var, options_for_select(@smart_vars[var], var_params[var]), include_blank: true, data: { controller: "selectize" }, class: "form-select" %>
       <% elsif var.end_with?("_at") || var == "start_time" || var == "end_time" %>
-
-        <div class="selectize-control single" style="width: 200px;">
-          <div id="<%= var %>-select" class="selectize-input" style="display: inline-block;" data-controller="datepicker">
+        <div class="selectize-control single">
+          <div id="<%= var %>-select" class="selectize-input" data-controller="datepicker">
             <%= hidden_field_tag var, var_params[var], data: { datepicker_target: "input" }  %>
             <span data-datepicker-target="span">Select a date</span>
           </div>
         </div>
-
       <% else %>
         <%= text_field_tag var, var_params[var], autofocus: i == 0 && !var.end_with?("_at") && !var_params[var], class: "form-control" %>
       <% end %>
@@ -36,14 +34,20 @@
         <%= hidden_field_tag var, var_params[var] %>
       <% end %>
 
-      <%= label_tag nil, date_vars.join(" & ") %>
-      <div class="selectize-control single" style="width: 300px;">
+      <div class="selectize-control single col-12 col-md-4">
+      <%= label_tag nil, date_vars.join(" & "), class: "form-label" %>
         <div id="reportrange" class="selectize-input" style="display: inline-block;" data-controller="daterangepicker">
           <span>Select a time range</span>
         </div>
       </div>
     <% end %>
 
-    <input type="submit" class="btn btn-success" value="Run" style="vertical-align: top;" />
+    <div class="col-12 col-md-2 d-flex align-items-end d-none" data-more-target="show">
+      <button type="button" class="btn btn-info" data-action="more#show:prevent">More filters</button>
+    </div>
+
+    <div class="col-12">
+      <input type="submit" class="btn btn-success col-12 col-md-1 offset-md-11" value="Run">
+    </div>
   </form>
 <% end %>

data/app/views/blazer/queries/show.html.erb

@@ -32,12 +32,14 @@
 
 <%= render partial: "blazer/variables", locals: {action: query_path(@query)} %>
 
-<details class="row">
-  <summary class="col-md-1 offset-md-11 btn btn-sm btn-info">Show source</summary>
-  <pre id="code" class="col-md-12">
-    <code data-controller="code"><%= @statement.display_statement %></code>
-  </pre>
-</details>
+<div class="row">
+  <details class="col-12">
+    <summary class="btn btn-info">Show source</summary>
+    <pre id="code">
+      <code data-controller="code"><%= @statement.display_statement %></code>
+    </pre>
+  </details>
+</div>
 
 <% if @success %>
   <div id="results">

data/lib/blazer/adapters/clickhouse_adapter.rb

@@ -37,6 +37,9 @@ module Blazer
         SQL
 
         response = connection.post(query: { query: statement, default_format: "CSV" })
+
+        return [] if response.body.nil?
+
         response.body
                 .group_by { |row| row[0] }
                 .transform_values { |columns| columns.map { |c| { name: c[1], data_type: c[2] } } }
@@ -54,7 +57,7 @@ module Blazer
       protected
 
       def connection
-        @connection ||= ClickHouse::Connection.new(config)
+        @connection ||= ::ClickHouse::Connection.new(config)
       end
 
       def config
@@ -69,7 +72,7 @@ module Blazer
             database: uri.path.sub(/\A\//, ""),
             ssl_verify: settings.fetch("ssl_verify", false)
           }.compact
-          ClickHouse::Config.new(**options)
+          ::ClickHouse::Config.new(**options)
         end
       end
 

data/lib/blazer/version.rb

@@ -1,3 +1,3 @@
 module Blazer
-  VERSION = "3.0.2"
+  VERSION = "3.0.3"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: finery
 version: !ruby/object:Gem::Version
-  version: 3.0.2
+  version: 3.0.3
 platform: ruby
 authors:
 - Andrew Kane, Chris Hasinski, Tomasz Ratajczak and contributors
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-10-13 00:00:00.000000000 Z
+date: 2023-10-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: railties
@@ -110,6 +110,7 @@ files:
 - app/assets/javascripts/blazer/controllers/datepicker_controller.js
 - app/assets/javascripts/blazer/controllers/daterangepicker_controller.js
 - app/assets/javascripts/blazer/controllers/index.js
+- app/assets/javascripts/blazer/controllers/more_controller.js
 - app/assets/javascripts/blazer/controllers/navbar_padding_controller.js
 - app/assets/javascripts/blazer/controllers/selectize_controller.js
 - app/assets/javascripts/blazer/controllers/unsaved_controller.js