brick 1.0.95 → 1.0.97

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ebb01aca7fcf3fa8cfbb699e48fa85601341df79645d4f3d6ebc5a43351c3d29
-  data.tar.gz: 2bca81242ee8eaa5bbfd477b39df8eb969f8999abe680329e2ae9b1b4ef928a7
+  metadata.gz: c257a0a65807fa87a13d722f3cc30c38d51bde571a070df53f4277fc6db8b7ba
+  data.tar.gz: 74d7690a968fab671d9e9e8ac92e41885ceb44a700fd1cb293f3b79af819e463
 SHA512:
-  metadata.gz: 566f2e6925b918fb8c7b3bf545dc8fd98f840b35fdf875e0f7812de3f127dae21e2fd4b9a2f3e9faba5255ec83d76b0651657e0051aa8e9706429354dee4d012
-  data.tar.gz: b07ce93b35464f516e3f03b1c8c98d215b3fa2db1051af5d6d41131313d694e483cc7cc40a063b6fd6b70e6d5eb2afb99fb9cc47914a81e6dc0a2392a5b2602c
+  metadata.gz: 4337faa80a6f0d9c1dadcb3271aea14ec54bb91e72cd7eead7e59c860557f828ac073cab3768feaa2db2f664d63b1604bd8f8e0d53c64621b1fcf5cc041057d9
+  data.tar.gz: 541cade2070bd0a79b21dd7155df700b2739084ae81eaa02709f9e00164f956e62e8342330a78496c4b5fbf351cac9ea40483d3cdc32c1fb1dbe8d7e34499d2d

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 = 97
 
     # 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)
@@ -1284,38 +1284,38 @@ module ActiveRecord
             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)
+          end
 
-          relation._select!(-> { @aliases.columns })
+          relation._select!(-> { aliases.columns })
         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.97
 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