motor-admin 0.1.25 → 0.1.27

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d25cd72aeb7206cf66b1d9c632491ad8e0e15a356c59e3234f4fcac2ab8e6960
-  data.tar.gz: e4e0458c383689d39a8065b5c1d5ab48d57ebd19b5ea1f2c4f229bf1e070c466
+  metadata.gz: 696c86b5eeeb132c8216b7662999f671926e0fc9149d74ccb66feb2d120e5e4a
+  data.tar.gz: 00550110edef326dc5d063577bf29a936e4890031f02f9412fb03b431c310476
 SHA512:
-  metadata.gz: 82f524ca428f34514ad3f6361287de3faf8430da549a371196abaf0dbee0bd02068127be712a208708252d8aa7a7c41c84e8df6bc8f96f8ada747bdebc26a076
-  data.tar.gz: b1921a2b38711019965f178120bff24dbe2f2465e750cdc592b2cac558820c51ce6c0addd9ca414ed4d3c90b4bd2c9aa15c112ed4072181fa47f8534d84b8a2b
+  metadata.gz: c91831b3bca03a0f490fee511dbdb70e0635f7e639778b24df48fc248858ead0de39c0744659f388cfcacaa960f01e4d5622b32bab6d1ca1528819aa2da721d1
+  data.tar.gz: 010d5465953944c84189ac3c0a458df1ade18175bf2999faf4259e002fb37d7a49ec6428da755c6bac4de5efaa41193c955d0ca7f72c1bc0dc6c35a61210bd65

data/lib/motor/admin.rb

@@ -22,10 +22,10 @@ module Motor
           ::Digest::SHA256.hexdigest(username),
           ::Digest::SHA256.hexdigest(ENV['MOTOR_AUTH_USERNAME'].to_s)
         ) &
-        ActiveSupport::SecurityUtils.secure_compare(
-          ::Digest::SHA256.hexdigest(password),
-          ::Digest::SHA256.hexdigest(ENV['MOTOR_AUTH_PASSWORD'].to_s)
-        )
+          ActiveSupport::SecurityUtils.secure_compare(
+            ::Digest::SHA256.hexdigest(password),
+            ::Digest::SHA256.hexdigest(ENV['MOTOR_AUTH_PASSWORD'].to_s)
+          )
       end
     end
 

data/lib/motor/queries.rb

@@ -5,6 +5,7 @@ module Motor
   end
 end
 
+require_relative './queries/render_sql_template'
 require_relative './queries/run_query'
 require_relative './queries/persistance'
 require_relative './queries/postgresql_exec_query'

data/lib/motor/queries/render_sql_template.rb

@@ -0,0 +1,51 @@
+# frozen_string_literal: true
+
+module Motor
+  module Queries
+    module RenderSqlTemplate
+      SECTION_OPEN_REGEXP = /{{([#^])\s*(\w+)}}.*\z/m.freeze
+      VARIABLE_REGEXP = /{{\s*(\w+)\s*}}/m.freeze
+
+      module_function
+
+      def call(sql, variables)
+        result = render_sections(sql, variables)
+
+        interpolate_variables(result, variables)
+      end
+
+      def interpolate_variables(sql, variables)
+        selected_variables = []
+
+        rendered =
+          sql.gsub(VARIABLE_REGEXP) do
+            variable_name = Regexp.last_match[1]
+
+            index = selected_variables.index { |name, _| name == variable_name }
+            selected_variables << [variable_name, variables[variable_name]] unless index
+
+            "$#{selected_variables.size}"
+          end
+
+        [rendered, selected_variables]
+      end
+
+      def render_sections(sql, variables)
+        sql.sub(SECTION_OPEN_REGEXP) do |e|
+          variable_name = Regexp.last_match[2]
+          is_negative = Regexp.last_match[1] == '^'
+
+          _, content, rest = e.split(build_section_close_regexp(variable_name), 3)
+
+          is_present = variables[variable_name].present?
+
+          render_sections(is_present ^ is_negative ? content + rest.to_s : rest, variables)
+        end
+      end
+
+      def build_section_close_regexp(variable_name)
+        %r{{{[#^/]s*#{Regexp.escape(variable_name)}\s*}}}m
+      end
+    end
+  end
+end

data/lib/motor/queries/run_query.rb

@@ -4,7 +4,6 @@ module Motor
   module Queries
     module RunQuery
       DEFAULT_LIMIT = 1_000_000
-      INTERPOLATION_REGEXP = /{{(\w+)}}/.freeze
 
       QueryResult = Struct.new(:data, :columns, keyword_init: true)
 
@@ -48,26 +47,30 @@ module Motor
       end
 
       def prepare_sql_statement(query, limit, variables_hash)
-        variables = query.preferences.fetch(:variables, []).pluck(:name, :default_value)
+        variables = merge_variable_default_values(query.preferences.fetch(:variables, []), variables_hash)
 
-        sql =
-          query.sql_body.gsub(INTERPOLATION_REGEXP) do
-            index = variables.index { |name, _| name == (Regexp.last_match[1]) } + 1
+        sql, query_variables = RenderSqlTemplate.call(query.sql_body, variables)
 
-            "$#{index}"
-          end
-
-        attributes =
-          variables.map do |variable_name, default_value|
-            ActiveRecord::Relation::QueryAttribute.new(
-              variable_name,
-              variables_hash[variable_name] || default_value,
-              ActiveRecord::Type::Value.new
-            )
-          end
+        attributes = build_statement_attributes(query_variables)
 
         [format(WITH_STATEMENT_TEMPLATE, sql_body: sql.strip.gsub(/;\z/, ''), limit: limit), 'SQL', attributes]
       end
+
+      def build_statement_attributes(variables)
+        variables.map do |variable_name, value|
+          ActiveRecord::Relation::QueryAttribute.new(
+            variable_name,
+            value,
+            ActiveRecord::Type::Value.new
+          )
+        end
+      end
+
+      def merge_variable_default_values(variable_configs, variables_hash)
+        variable_configs.each_with_object({}) do |variable, acc|
+          acc[variable[:name]] = variables_hash[variable[:name]] || variable[:default_value]
+        end
+      end
     end
   end
 end

data/lib/motor/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Motor
-  VERSION = '0.1.25'
+  VERSION = '0.1.27'
 end

data/ui/dist/manifest.json

@@ -5,9 +5,9 @@
   "fonts/ionicons.ttf?v=3.0.0-alpha.3": "fonts/ionicons.ttf",
   "fonts/ionicons.woff2?v=3.0.0-alpha.3": "fonts/ionicons.woff2",
   "fonts/ionicons.woff?v=3.0.0-alpha.3": "fonts/ionicons.woff",
-  "main-07eb806daf063d260c47.css.gz": "main-07eb806daf063d260c47.css.gz",
-  "main-07eb806daf063d260c47.js.LICENSE.txt": "main-07eb806daf063d260c47.js.LICENSE.txt",
-  "main-07eb806daf063d260c47.js.gz": "main-07eb806daf063d260c47.js.gz",
-  "main.css": "main-07eb806daf063d260c47.css",
-  "main.js": "main-07eb806daf063d260c47.js"
+  "main-d6c1f237d3568a138874.css.gz": "main-d6c1f237d3568a138874.css.gz",
+  "main-d6c1f237d3568a138874.js.LICENSE.txt": "main-d6c1f237d3568a138874.js.LICENSE.txt",
+  "main-d6c1f237d3568a138874.js.gz": "main-d6c1f237d3568a138874.js.gz",
+  "main.css": "main-d6c1f237d3568a138874.css",
+  "main.js": "main-d6c1f237d3568a138874.js"
 }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: motor-admin
 version: !ruby/object:Gem::Version
-  version: 0.1.25
+  version: 0.1.27
 platform: ruby
 authors:
 - Pete Matsyburka
@@ -208,13 +208,14 @@ files:
 - lib/motor/queries.rb
 - lib/motor/queries/persistance.rb
 - lib/motor/queries/postgresql_exec_query.rb
+- lib/motor/queries/render_sql_template.rb
 - lib/motor/queries/run_query.rb
 - lib/motor/tags.rb
 - lib/motor/ui_configs.rb
 - lib/motor/version.rb
 - ui/dist/fonts/ionicons.woff2
-- ui/dist/main-07eb806daf063d260c47.css.gz
-- ui/dist/main-07eb806daf063d260c47.js.gz
+- ui/dist/main-d6c1f237d3568a138874.css.gz
+- ui/dist/main-d6c1f237d3568a138874.js.gz
 - ui/dist/manifest.json
 homepage:
 licenses: