finery 3.0.1 → 3.0.3

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

@@ -1,27 +1,20 @@
 <% blazer_title @query.name %>
-
-<div class="topbar">
-  <div class="container">
-    <div class="row" style="padding-top: 13px;">
-      <div class="col-sm-9">
-        <%= render partial: "blazer/nav" %>
-        <h3 style="line-height: 34px; display: inline; margin-left: 5px;">
-          <%= @query.name %>
-        </h3>
-      </div>
-      <div class="col-sm-3 text-right">
-        <%= link_to "Edit", edit_query_path(@query, params: variable_params(@query)), class: "btn btn-default", disabled: !@query.editable?(blazer_user) %>
-        <%= link_to "Fork", new_query_path(params: {variables: variable_params(@query), fork_query_id: @query.id, data_source: @query.data_source, name: @query.name}), class: "btn btn-info" %>
-
-        <% if !@error && @success %>
-          <%= button_to "Download", run_queries_path(format: "csv"), params: @run_data, class: "btn btn-primary" %>
-        <% end %>
-      </div>
-    </div>
-  </div>
-</div>
-
-<div style="margin-bottom: 60px;"></div>
+<% content_for :nav do %>
+  <ul class="navbar-nav justify-content-end flex-grow-1 pe-3">
+    <li class="navbar-brand d-none d-sm-inline text-wrap"><%= @query.name %></li>
+    <li class="nav-item">
+      <%= link_to "Edit", blazer.edit_query_path(@query, params: variable_params(@query)), class: "nav-link", disabled: !@query.editable?(blazer_user) %>
+    </li>
+    <li class="nav-item">
+      <%= link_to "Fork", blazer.new_query_path(params: {variables: variable_params(@query), fork_query_id: @query.id, data_source: @query.data_source, name: @query.name}), class: "nav-link" %>
+    </li>
+    <li class="nav-item dropdown">
+      <% if !@error && @success %>
+        <%= button_to "Download", blazer.run_queries_path(format: "csv"), params: @run_data, class: "nav-link" %>
+      <% end %>
+    </li>
+  </ul>
+<% end %>
 
 <% if @sql_errors.any? %>
   <div class="alert alert-danger">
@@ -34,17 +27,19 @@
 <% end %>
 
 <% if @query.description.present? %>
-  <p style="white-space: pre-line;"><%= @query.description %></p>
+  <p class="text-pre-line"><%= @query.description %></p>
 <% end %>
 
 <%= render partial: "blazer/variables", locals: {action: query_path(@query)} %>
 
-<details class="row">
-  <summary class="col-md-1 col-md-offset-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">
@@ -54,7 +49,7 @@
   <script>
     function showRun(data) {
       $("#results").html(data)
-      $("#results table").stupidtable(stupidtableCustomSettings).stickyTableHeaders({fixedOffset: 60})
+      $("#results table").stupidtable(stupidtableCustomSettings).stickyTableHeaders({fixedOffset: 56})
     }
 
     function showError(message) {

data/app/views/blazer/uploads/_form.html.erb

@@ -5,15 +5,15 @@
     <p>Create a database table from a CSV file. The table will be created in the <code><%= Blazer.settings["uploads"]["schema"] %></code> schema.</p>
   <% end %>
 
-  <div class="form-group">
+  <div class="form-group mb-3">
     <%= f.label :table %>
     <%= f.text_field :table, class: "form-control" %>
   </div>
-  <div class="form-group">
+  <div class="form-group mb-3">
     <%= f.label :description %>
     <%= f.text_area :description, placeholder: "Optional", style: "height: 60px;", class: "form-control" %>
   </div>
-  <div class="form-group">
+  <div class="form-group mb-3">
     <%= f.label :file %>
     <%= f.file_field :file, accept: "text/csv", style: "margin-top: 6px; margin-bottom: 21px;" %>
   </div>

data/app/views/blazer/uploads/index.html.erb

@@ -1,24 +1,6 @@
 <% blazer_title "Uploads" %>
 
 <div id="header">
-  <div class="pull-right" style="line-height: 34px;">
-    <div class="btn-group">
-      <%= link_to "New Upload", new_upload_path, class: "btn btn-info" %>
-      <button type="button" class="btn btn-info dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
-        <span class="caret"></span>
-        <span class="sr-only">Toggle Dropdown</span>
-      </button>
-      <ul class="dropdown-menu">
-        <li><%= link_to "Home", root_path %></li>
-        <li><%= link_to "Checks", checks_path %></li>
-        <li role="separator" class="divider"></li>
-        <li><%= link_to "New Query", new_query_path %></li>
-        <li><%= link_to "New Dashboard", new_dashboard_path %></li>
-        <li><%= link_to "New Check", new_check_path %></li>
-      </ul>
-    </div>
-  </div>
-
   <input id="search" type="text" placeholder="Start typing a table or person" style="width: 300px; display: inline-block;" class="search form-control" />
 </div>
 

data/app/views/layouts/blazer/application.html.erb

@@ -1,25 +1,24 @@
 <!DOCTYPE html>
 <html>
   <head>
-    <title><%= blazer_title ? blazer_title : "Blazer" %></title>
+    <title><%= blazer_title ? blazer_title : "Finery" %></title>
+    <meta name="viewport" content="width=device-width,initial-scale=1" />
+    <meta name="robots" content="noindex" />
+    <meta name="referrer" content="same-origin" />
 
     <meta charset="utf-8" />
     <%= favicon_link_tag "blazer/favicon.png" %>
-    <% if defined?(Propshaft::Railtie) %>
-      <%= stylesheet_link_tag "blazer/bootstrap-propshaft", "blazer/bootstrap", "blazer/selectize", "blazer/github", "blazer/daterangepicker", "blazer/application" %>
-      <%= javascript_include_tag "blazer/jquery", "blazer/rails-ujs", "blazer/stupidtable", "blazer/stupidtable-custom-settings", "blazer/jquery.stickytableheaders", "blazer/selectize", "blazer/highlight.min", "blazer/moment", "blazer/moment-timezone-with-data", "blazer/daterangepicker", "blazer/chart.umd", "blazer/chartjs-adapter-date-fns.bundle", "blazer/chartkick", "blazer/mapkick.bundle", "blazer/ace/ace", "blazer/ace/ext-language_tools", "blazer/ace/theme-twilight", "blazer/ace/mode-sql", "blazer/ace/snippets/text", "blazer/ace/snippets/sql", "blazer/Sortable", "blazer/bootstrap", "blazer/vue.global.prod", "blazer/routes", "blazer/queries", "blazer/fuzzysearch", "blazer/application" %>
-    <% else %>
-      <%= stylesheet_link_tag "blazer/application" %>
-      <%= javascript_include_tag "blazer/application" %>
-      <%= javascript_include_tag "blazer/module", type: "module" %>
-    <% end %>
+    <%= stylesheet_link_tag "blazer/application" %>
+    <%= javascript_include_tag "blazer/application" %>
+    <%= javascript_include_tag "blazer/module", type: "module" %>
     <script>
       <%= blazer_js_var "rootPath", root_path %>
     </script>
     <%= csrf_meta_tags %>
   </head>
-  <body>
-    <div class="container">
+  <body class="with-navbar overflow-y-scroll" data-controller="navbar-padding">
+    <%= render partial: "blazer/navbar" %>
+    <div class="container mt-2">
       <%= yield %>
     </div>
   </body>

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/engine.rb

@@ -8,11 +8,6 @@ module Blazer
           "blazer/application.js",
           "blazer/module.js",
           "blazer/application.css",
-          "blazer/glyphicons-halflings-regular.eot",
-          "blazer/glyphicons-halflings-regular.svg",
-          "blazer/glyphicons-halflings-regular.ttf",
-          "blazer/glyphicons-halflings-regular.woff",
-          "blazer/glyphicons-halflings-regular.woff2",
           "blazer/favicon.png"
         ]
       else

data/lib/blazer/version.rb

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

data/lib/blazer.rb

@@ -119,14 +119,17 @@ module Blazer
   end
 
   def self.settings
-    @settings ||= begin
-      path = Rails.root.join("config", "blazer.yml").to_s
-      if File.exist?(path)
-        YAML.safe_load(ERB.new(File.read(path)).result, aliases: true)
-      else
-        {}
-      end
-    end
+    @settings ||= load_settings!
+  end
+
+  def self.load_settings!
+    path = Rails.root.join("config", "blazer.yml").to_s
+    return YAML.safe_load(ERB.new(File.read(path)).result, aliases: true) if File.exist?(path)
+
+    path = Rails.root.join("config", "finery.yml").to_s
+    return YAML.safe_load(ERB.new(File.read(path)).result, aliases: true) if File.exist?(path)
+
+    {}
   end
 
   def self.data_sources

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: finery
 version: !ruby/object:Gem::Version
-  version: 3.0.1
+  version: 3.0.3
 platform: ruby
 authors:
 - Andrew Kane, Chris Hasinski, Tomasz Ratajczak and contributors
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-10-03 00:00:00.000000000 Z
+date: 2023-10-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: railties
@@ -90,11 +90,6 @@ files:
 - CONTRIBUTING.md
 - LICENSE.txt
 - README.md
-- app/assets/fonts/blazer/glyphicons-halflings-regular.eot
-- app/assets/fonts/blazer/glyphicons-halflings-regular.svg
-- app/assets/fonts/blazer/glyphicons-halflings-regular.ttf
-- app/assets/fonts/blazer/glyphicons-halflings-regular.woff
-- app/assets/fonts/blazer/glyphicons-halflings-regular.woff2
 - app/assets/images/blazer/favicon.png
 - app/assets/javascripts/blazer/Sortable.js
 - app/assets/javascripts/blazer/ace.js
@@ -105,17 +100,18 @@ files:
 - app/assets/javascripts/blazer/ace/snippets/text.js
 - app/assets/javascripts/blazer/ace/theme-twilight.js
 - app/assets/javascripts/blazer/application.js
-- app/assets/javascripts/blazer/bootstrap.js
 - app/assets/javascripts/blazer/chart.umd.js
 - app/assets/javascripts/blazer/chartjs-adapter-date-fns.bundle.js
 - app/assets/javascripts/blazer/chartjs-plugin-annotation.min.js
 - app/assets/javascripts/blazer/chartkick.js
-- app/assets/javascripts/blazer/controllers/application.js
+- app/assets/javascripts/blazer/controllers/application.js.erb
 - app/assets/javascripts/blazer/controllers/autosubmit_controller.js
 - app/assets/javascripts/blazer/controllers/code_controller.js
 - 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
 - app/assets/javascripts/blazer/daterangepicker.js
@@ -130,17 +126,12 @@ files:
 - app/assets/javascripts/blazer/queries.js
 - app/assets/javascripts/blazer/rails-ujs.js
 - app/assets/javascripts/blazer/routes.js
-- app/assets/javascripts/blazer/selectize.js
 - app/assets/javascripts/blazer/stupidtable-custom-settings.js
 - app/assets/javascripts/blazer/stupidtable.js
 - app/assets/javascripts/blazer/vue.global.prod.js
 - app/assets/stylesheets/blazer/application.css
-- app/assets/stylesheets/blazer/bootstrap-propshaft.css
-- app/assets/stylesheets/blazer/bootstrap-sprockets.css.erb
-- app/assets/stylesheets/blazer/bootstrap.css
 - app/assets/stylesheets/blazer/daterangepicker.css
 - app/assets/stylesheets/blazer/github.css
-- app/assets/stylesheets/blazer/selectize.css
 - app/controllers/blazer/base_controller.rb
 - app/controllers/blazer/checks_controller.rb
 - app/controllers/blazer/dashboards_controller.rb
@@ -156,7 +147,7 @@ files:
 - app/models/blazer/record.rb
 - app/models/blazer/upload.rb
 - app/models/blazer/uploads_connection.rb
-- app/views/blazer/_nav.html.erb
+- app/views/blazer/_navbar.html.erb
 - app/views/blazer/_variables.html.erb
 - app/views/blazer/check_mailer/failing_checks.html.erb
 - app/views/blazer/check_mailer/state_change.html.erb