brick 1.0.94 → 1.0.95

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4b4de74edca4a5dd2c7d57d23dda2aa4cbc966402db4f2d0490dfeb741224dd5
-  data.tar.gz: fe905ed82bf8ae8f249e5ce3fe1646cb6366caf3343086ea8ba597e51525f521
+  metadata.gz: ebb01aca7fcf3fa8cfbb699e48fa85601341df79645d4f3d6ebc5a43351c3d29
+  data.tar.gz: 2bca81242ee8eaa5bbfd477b39df8eb969f8999abe680329e2ae9b1b4ef928a7
 SHA512:
-  metadata.gz: 45d2dda76345ab043c4e62d92b5e12a466ffec892e1ce63b540bd6427fcecfa777739732754d554f78b5803599fca1390fa2d38cb8f0acd9b0ffd8e5c6dd34aa
-  data.tar.gz: 65b73535a5874fe5b3c46fec455fe62857259c7d56b68241a729f2c928a47e0fdcc71988a3b7ead506de717fae71932007855efaf18dd8866b920da2c6d5c779
+  metadata.gz: 566f2e6925b918fb8c7b3bf545dc8fd98f840b35fdf875e0f7812de3f127dae21e2fd4b9a2f3e9faba5255ec83d76b0651657e0051aa8e9706429354dee4d012
+  data.tar.gz: b07ce93b35464f516e3f03b1c8c98d215b3fa2db1051af5d6d41131313d694e483cc7cc40a063b6fd6b70e6d5eb2afb99fb9cc47914a81e6dc0a2392a5b2602c

data/lib/brick/config.rb

@@ -303,5 +303,13 @@ module Brick
     def add_orphans
       true
     end
+
+    def license_key
+      @mutex.synchronize { @license_key }
+    end
+
+    def license_key=(key)
+      @mutex.synchronize { @license_key = key }
+    end
   end
 end

data/lib/brick/extensions.rb

@@ -1416,6 +1416,85 @@ class Object
           self.define_method :orphans do
             instance_variable_set(:@orphans, ::Brick.find_orphans(::Brick.set_db_schema(params).first))
           end
+          self.define_method :crosstab do
+            @relations = ::Brick.relations.each_with_object({}) do |r, s|
+              cols = r.last[:cols].each_with_object([]) do |c, s2|
+                s2 << [c.first] + c.last
+              end
+              s[r.first] = { cols: cols } if r.last.key?(:cols)
+            end
+          end
+
+          self.define_method :crosstab_data do
+            # Bring in column names and use this to create an appropriate SELECT statement
+            is_grouped = nil
+            fields_in_sequence = params['fields'].split(',')
+            relations = {}
+            first_relation = nil
+            fields = fields_in_sequence.each_with_object(Hash.new { |h, k| h[k] = {} }) do |f, s|
+              relation, col = if (paren_index = f.index('(')) # Aggregate?
+                                aggregate = f[0..paren_index - 1]
+                                f_parts = f[(paren_index + 1)..-2].split(',')
+                                aggregate_options = f_parts[1..-1] # Options about aggregation
+                                f_parts.first.split('/') # Column being aggregated
+                              else
+                                f.split('/')
+                              end
+              first_relation ||= relation
+              # relation = if dts[(relation = relation.downcase)]
+              #   relation # Generally a common JOIN point, but who knows, maybe we'll add more
+              # else
+              #   relation
+              # end
+              if col
+                relations[relation] = nil
+                s[f] = if aggregate
+                         is_grouped = true
+                         [aggregate, relation, col, aggregate_options]
+                       else
+                         [relation, col]
+                       end
+              end
+              s
+            end
+            # ver = params['ver']
+            if fields.empty?
+              render json: { data: [] } # [ver, []]
+              return
+            end
+
+            # Apartment::Tenant.switch!(params['schema'])
+            # result = ActiveRecord::Base.connection.query("SELECT #{cols.join(', ')} FROM #{view}")
+            col_num = 0
+            grouping = []
+            cols = fields_in_sequence.each_with_object([]) do |f, s|
+              c = fields[f]
+              col_num += 1
+              col_def = if c.length > 2 # Aggregate?
+                          case c.first
+                          when 'COMMA_SEP'
+                            "STRING_AGG(DISTINCT #{c[1].downcase}.\"#{c[2]}\"::varchar, ',')" # Like STRING_AGG(DISTINCT v_tacos."price"::varchar, ',')
+                          when 'COUNT_DISTINCT'
+                            "COUNT(DISTINCT #{c[1].downcase}.\"#{c[2]}\")" # Like COUNT(DISTINCT v_tacos."price")
+                          when 'MODE'
+                            "MODE() WITHIN GROUP(ORDER BY #{c[1].downcase}.\"#{c[2]}\")" # Like MODE() WITHIN GROUP(ORDER BY v_tacos."price")
+                          when 'NUM_DAYS'
+                            "EXTRACT(DAYS FROM (MAX(#{c[1].downcase}.\"#{c[2]}\")::timestamp - MIN(#{c[1].downcase}.\"#{c[2]}\")::timestamp))" # Like EXTRACT(DAYS FROM (MAX(order."order_date") - MIN(order."order_date"))
+                          else
+                            "#{c.first}(#{c[1].downcase}.\"#{c[2]}\")" # Something like AVG(v_tacos."price")
+                          end
+                        else # Normal column, represented in an array having:  [relation, column_name]
+                          grouping << col_num
+                          "#{c.first.downcase}.\"#{c.last}\"" # Like v_tacos."price"
+                        end
+              s << "#{col_def} AS c#{col_num}"
+            end
+            sql = "SELECT #{cols.join(', ')} FROM #{first_relation.downcase}"
+            sql << "\nGROUP BY #{grouping.map(&:to_s).join(',')}" if is_grouped && grouping.present?
+            result = ActiveRecord::Base.connection.query(sql)
+            render json: { data: result } # [ver, result]
+          end
+
           return [new_controller_class, code + "end # BrickGem controller\n"]
         when 'BrickOpenapi'
           is_openapi = true

data/lib/brick/frameworks/rails/engine.rb

@@ -71,6 +71,7 @@ module Brick
             def template_exists?(*args, **options)
               (::Brick.config.add_status && args.first == 'status') ||
               (::Brick.config.add_orphans && args.first == 'orphans') ||
+              (args.first == 'crosstab') ||
               _brick_template_exists?(*args, **options) ||
               # Do not auto-create a template when it's searching for an application.html.erb, which comes in like:  ["edit", ["games", "application"]]
               ((args[1].length == 1 || args[1][-1] != 'application') &&
@@ -107,7 +108,8 @@ module Brick
             def find_template(*args, **options)
               unless (model_name = @_brick_model&.name) ||
                      (is_status = ::Brick.config.add_status && args[0..1] == ['status', ['brick_gem']]) ||
-                     (is_orphans = ::Brick.config.add_orphans && args[0..1] == ['orphans', ['brick_gem']])
+                     (is_orphans = ::Brick.config.add_orphans && args[0..1] == ['orphans', ['brick_gem']]) ||
+                     (is_crosstab = args[0..1] == ['crosstab', ['brick_gem']])
                 if ActionView.version < ::Gem::Version.new('5.0') # %%% Not sure if this should be perhaps 4.2 instead
                   begin
                     if (possible_template = _brick_find_template(*args, **options))
@@ -212,6 +214,7 @@ module Brick
                               end.html_safe
               table_options << "<option value=\"#{prefix}brick_status\">(Status)</option>".html_safe if ::Brick.config.add_status
               table_options << "<option value=\"#{prefix}brick_orphans\">(Orphans)</option>".html_safe if is_orphans
+              table_options << "<option value=\"#{prefix}brick_orphans\">(Crosstab)</option>".html_safe if is_crosstab
               css = +"<style>
 h1, h3 {
   margin-bottom: 0;
@@ -1093,6 +1096,16 @@ erDiagram
 #{script}"
                          end
 
+                       when 'crosstab'
+                         if is_crosstab && ::Brick.config.license_key
+                           decipher = OpenSSL::Cipher::AES256.new(:CBC).decrypt
+                           decipher.iv = "\xB4,\r2\x19\xF5\xFE/\aR\x1A\x8A\xCFV\v\x8C"
+                           decipher.key = Digest::SHA256.hexdigest(::Brick.config.license_key).scan(/../).map { |x| x.hex }.pack('c*')
+                           decipher.update(File.binread("/Users/aga/brick/lib/brick/frameworks/rails/crosstab.brk"))[16..-1]
+                         else
+                           'Crosstab Charting not yet activated -- enter a valid license key in brick.rb'
+                         end
+
                        when 'show', 'new', 'update'
 +"<html>
 <head>
@@ -1282,7 +1295,8 @@ end}
 "
 
                        end
-              inline << "
+              unless is_crosstab
+                inline << "
 <% if is_includes_dates %>
 <link rel=\"stylesheet\" type=\"text/css\" href=\"https://cdn.jsdelivr.net/npm/flatpickr/dist/flatpickr.min.css\">
 <style>
@@ -1416,6 +1430,7 @@ document.querySelectorAll(\"input, select\").forEach(function (inp) {
   }
 });
 </script>"
+              end
               # puts "==============="
               # puts inline
               # puts "==============="

data/lib/brick/version_number.rb

@@ -5,7 +5,7 @@ module Brick
   module VERSION
     MAJOR = 1
     MINOR = 0
-    TINY = 94
+    TINY = 95
 
     # PRE is nil unless it's a pre-release (beta, RC, etc.)
     PRE = nil

data/lib/brick.rb

@@ -466,6 +466,10 @@ module Brick
       Brick.config.default_route_fallback = resource_name
     end
 
+    def license_key=(key)
+      Brick.config.license_key = key
+    end
+
     # Load additional references (virtual foreign keys)
     # This is attempted early if a brick initialiser file is found, and then again as a failsafe at the end of our engine's initialisation
     # %%% Maybe look for differences the second time 'round and just add new stuff instead of entirely deferring
@@ -691,6 +695,11 @@ In config/initializers/brick.rb appropriate entries would look something like:
             get("/#{controller_prefix}brick_orphans", to: 'brick_gem#orphans', as: 'brick_orphans')
           end
 
+          if instance_variable_get(:@set).named_routes.names.exclude?(:brick_crosstab)
+            get("/#{controller_prefix}brick_crosstab", to: 'brick_gem#crosstab', as: 'brick_crosstab')
+            get("/#{controller_prefix}brick_crosstab/data", to: 'brick_gem#crosstab_data')
+          end
+
           unless ::Brick.routes_done
             if Object.const_defined?('Rswag::Ui')
               rswag_path = ::Rails.application.routes.routes.find { |r| r.app.app == Rswag::Ui::Engine }&.instance_variable_get(:@path_formatter)&.instance_variable_get(:@parts)&.join
@@ -1248,6 +1257,67 @@ module ActiveRecord
     # For AR >= 4.2
     if self.const_defined?('JoinDependency')
       class JoinDependency
+        # An intelligent .eager_load() and .includes() that creates t0_r0 style aliases only for the columns
+        # used in .select().  To enable this behaviour, include the flag :_brick_eager_load as the first
+        # entry in your .select().
+        # More information:  https://discuss.rubyonrails.org/t/includes-and-select-for-joined-data/81640
+        def apply_column_aliases(relation)
+          used_cols = {}
+          if (sel_vals = relation.select_values.map(&:to_s)).first == '_brick_eager_load'
+            # Find and expand out all column names being used in select(...)
+            new_select_values = sel_vals.each_with_object([]) do |col, s|
+              next if col == '_brick_eager_load'
+
+              if col.include?(' ') # Some expression? (No chance for a simple column reference)
+                s << col # Just pass it through
+              else
+                col = if (col_parts = col.split('.')).length == 1
+                        [col]
+                      else
+                        [col_parts[0..-2].join('.'), col_parts.last]
+                      end
+                used_cols[col] = nil
+              end
+            end
+            if new_select_values.present?
+              relation.select_values = new_select_values
+            else
+              relation.select_values.clear
+            end
+          end
+
+          @aliases ||= Aliases.new(join_root.each_with_index.map do |join_part, i|
+            join_alias = join_part.table&.table_alias || join_part.table_name
+            keys = [join_part.base_klass.primary_key] # Always include the primary key
+
+            # # %%% Optional to include all foreign keys:
+            # keys.concat(join_part.base_klass.reflect_on_all_associations.select { |a| a.belongs_to? }.map(&:foreign_key))
+
+            # Add foreign keys out to referenced tables that we belongs_to
+            join_part.children.each { |child| keys << child.reflection.foreign_key if child.reflection.belongs_to? }
+
+            # Add the foreign key that got us here -- "the train we rode in on" -- if we arrived from
+            # a has_many or has_one:
+            if join_part.is_a?(ActiveRecord::Associations::JoinDependency::JoinAssociation) &&
+               !join_part.reflection.belongs_to?
+              keys << join_part.reflection.foreign_key
+            end
+            keys = keys.compact # In case we're using composite_primary_keys
+            j = 0
+            columns = join_part.column_names.each_with_object([]) do |column_name, s|
+              # Include columns chosen in select(...) as well as the PK and any relevant FKs
+              if used_cols.keys.find { |c| (c.length == 1 || c.first == join_alias) && c.last == column_name } ||
+                 keys.find { |c| c == column_name }
+                s << Aliases::Column.new(column_name, "t#{i}_r#{j}")
+              end
+              j += 1
+            end
+            Aliases::Table.new(join_part, columns)
+          end)
+
+          relation._select!(-> { @aliases.columns })
+        end
+
       private
 
         # %%% Pretty much have to flat-out replace this guy (I think anyway)
@@ -1283,7 +1353,6 @@ module ActiveRecord
             if (relation = node.instance_variable_get(:@assocs)&.instance_variable_get(:@relation))
               relation.brick_links[link_path] = result.first.table_alias || result.first.table_name
             end
-
             result
           end
         else # Same idea but for Rails 7
@@ -1293,9 +1362,9 @@ module ActiveRecord
 
             # Capture the table alias name that was chosen
             link_path = child.instance_variable_get(:@link_path)
-            relation = child.instance_variable_get(:@assocs)&.instance_variable_get(:@relation)
-            # binding.pry if relation
-            relation.brick_links[link_path] = result.first.left.table_alias || result.first.left.table_name
+            if (relation = child.instance_variable_get(:@assocs)&.instance_variable_get(:@relation))
+              relation.brick_links[link_path] = result.first.left.table_alias || result.first.left.table_name
+            end
             result
           end
         end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: brick
 version: !ruby/object:Gem::Version
-  version: 1.0.94
+  version: 1.0.95
 platform: ruby
 authors:
 - Lorin Thwaits
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-11-22 00:00:00.000000000 Z
+date: 2022-11-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -214,6 +214,7 @@ files:
 - lib/brick/frameworks/cucumber.rb
 - lib/brick/frameworks/rails.rb
 - lib/brick/frameworks/rails/controller.rb
+- lib/brick/frameworks/rails/crosstab.brk
 - lib/brick/frameworks/rails/engine.rb
 - lib/brick/frameworks/rspec.rb
 - lib/brick/join_array.rb