brick 1.0.95 → 1.0.96

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ebb01aca7fcf3fa8cfbb699e48fa85601341df79645d4f3d6ebc5a43351c3d29
-  data.tar.gz: 2bca81242ee8eaa5bbfd477b39df8eb969f8999abe680329e2ae9b1b4ef928a7
+  metadata.gz: 0061ad25b22deee43d1939b6541257924a61a67b3b8b004fb6a0072302746ca2
+  data.tar.gz: 99968b9de834f73c60842bf5da03b5bddd750f1ff8c3ac1dac294078f0eb2358
 SHA512:
-  metadata.gz: 566f2e6925b918fb8c7b3bf545dc8fd98f840b35fdf875e0f7812de3f127dae21e2fd4b9a2f3e9faba5255ec83d76b0651657e0051aa8e9706429354dee4d012
-  data.tar.gz: b07ce93b35464f516e3f03b1c8c98d215b3fa2db1051af5d6d41131313d694e483cc7cc40a063b6fd6b70e6d5eb2afb99fb9cc47914a81e6dc0a2392a5b2602c
+  metadata.gz: 4958e2b0c18522be75134ab29df481213594189b4addd6ef9368ae8677aba603cbb278176c57c51217a49c0042e98927cb33465995bc4aae01f3af59b2d64f15
+  data.tar.gz: 1d486886f30ce384edc7d84a441617906b26b001c7c3562558289eedfd4b0c12e2a860c587f71acb6e6727649a3756223f1240c07f4e1013029cfe5b67a9c117

data/lib/brick/config.rb

@@ -304,12 +304,12 @@ module Brick
       true
     end
 
-    def license_key
-      @mutex.synchronize { @license_key }
+    def license
+      @mutex.synchronize { @license }
     end
 
-    def license_key=(key)
-      @mutex.synchronize { @license_key = key }
+    def license=(key)
+      @mutex.synchronize { @license = key }
     end
   end
 end

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

@@ -1097,10 +1097,10 @@ erDiagram
                          end
 
                        when 'crosstab'
-                         if is_crosstab && ::Brick.config.license_key
+                         if is_crosstab && ::Brick.config.license
                            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.key = Digest::SHA256.hexdigest(::Brick.config.license).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'

data/lib/brick/version_number.rb

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

data/lib/brick.rb

@@ -466,8 +466,8 @@ module Brick
       Brick.config.default_route_fallback = resource_name
     end
 
-    def license_key=(key)
-      Brick.config.license_key = key
+    def license=(key)
+      Brick.config.license = key
     end
 
     # Load additional references (virtual foreign keys)
@@ -1257,65 +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
+        if ActiveRecord.version >= ::Gem::Version.new('6.0')
+          # 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
-                col = if (col_parts = col.split('.')).length == 1
-                        [col]
-                      else
-                        [col_parts[0..-2].join('.'), col_parts.last]
-                      end
-                used_cols[col] = nil
+                relation.select_values.clear
               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
+            @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))
+              # # %%% 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 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}")
+              # 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
-              j += 1
-            end
-            Aliases::Table.new(join_part, columns)
-          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 })
+            relation._select!(-> { @aliases.columns })
+          end
         end
 
       private

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: brick
 version: !ruby/object:Gem::Version
-  version: 1.0.95
+  version: 1.0.96
 platform: ruby
 authors:
 - Lorin Thwaits
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-11-24 00:00:00.000000000 Z
+date: 2022-11-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord