brick 1.0.22 → 1.0.23

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 82ebef3561b9cd7b8abcbbd8a30b7687485543ddf1a0900a9935dfb99299f13f
-  data.tar.gz: ba071d53409fd8d4833693907364c745585aeb0bb18e885fcf7cbf1bd23b9940
+  metadata.gz: 24731ac9bd56261179224610406247cc4438c61e411aa3fe96205b2e97fc8cb8
+  data.tar.gz: 785d12e36fcf788c05cff3a02ca2ec17fc418b0ea15b54cb6923c83c6f362d3b
 SHA512:
-  metadata.gz: 69ad3ae158a8e478864db65dc808152d4b1b16bdc8779b1a651f59f199167daf00d2aa10018c5f65d5e619bbca4c09e99bc319ca736eed57023d61e6067ea365
-  data.tar.gz: 18ca63e176e12ea50a5168e835a2eddfa66c8f522943d42e6d895d2f3e05d0cf6d396ab28d79f98898c91670b618cc27dbad5fa0bc9129a3edcfc3f74f5db029
+  metadata.gz: '090a3c4d1b3cb4761799e05adf5caa0c83f60cf985f97ed6856beb05620014e9e7401689719209488092c6c4a7605e53781cdb71ad9e7ec204ccaddca0d92cca'
+  data.tar.gz: 8d1f9512c948359e7d73cd7cc32302f226df7e3e744fab562e01e16170830be28d0e2e15bcd7b437f66ed79e366b0ff33b7f578e4c76ffde1dd62cdcec059069

data/lib/brick/extensions.rb

@@ -26,18 +26,13 @@
 
 # colour coded origins
 
-# Drag something like TmfModel#name onto the rows and have it automatically add five columns -- where type=zone / where type = section / etc
+# Drag something like HierModel#name onto the rows and have it automatically add five columns -- where type=zone / where type = section / etc
 
 # Support for Postgres / MySQL enums (add enum to model, use model enums to make a drop-down in the UI)
 
 # Currently quadrupling up routes
 
 
-# From the North app:
-# undefined method `built_in_role_path' when referencing show on a subclassed STI:
-#  http://localhost:3000/roles/3?_brick_schema=cust1
-
-
 # ==========================================================
 # Dynamically create model or controller classes when needed
 # ==========================================================
@@ -166,11 +161,15 @@ module ActiveRecord
       if is_brackets_have_content
         output
       elsif pk_alias
-        if (id = pk_alias.map { |pk_alias_part| obj.send(pk_alias_part) })
+        id = []
+        pk_alias.each do |pk_alias_part|
+          if (pk_part = obj.send(pk_alias_part))
+            id << pk_part
+          end
+        end
+        if id.present?
           "#{klass.name} ##{id.join(', ')}"
         end
-      # elsif klass.primary_key
-      #   "#{klass.name} ##{obj.send(klass.primary_key)}"
       else
         obj.to_s
       end
@@ -184,6 +183,14 @@ module ActiveRecord
       model_underscore == assoc_name ? link : "#{assoc_name}-#{link}".html_safe
     end
 
+    def self.brick_import_template
+      template = constants.include?(:IMPORT_TEMPLATE) ? self::IMPORT_TEMPLATE : suggest_template(false, false, 0)
+      # Add the primary key to the template as being unique (unless it's already there)
+      template[:uniques] = [pk = primary_key.to_sym]
+      template[:all].unshift(pk) unless template[:all].include?(pk)
+      template
+    end
+
   private
 
     def self._brick_get_fks
@@ -354,23 +361,23 @@ module ActiveRecord
       hm_counts.each do |k, hm|
         associative = nil
         count_column = if hm.options[:through]
-                          fk_col = (associative = associatives[hm.name]).foreign_key
-                          hm.foreign_key
-                        else
-                          fk_col = hm.foreign_key
-                          hm.klass.primary_key || '*'
-                        end
+                         fk_col = (associative = associatives[hm.name]).foreign_key
+                         hm.foreign_key
+                       else
+                         fk_col = hm.foreign_key
+                         hm.klass.primary_key || '*'
+                       end
         tbl_alias = "_br_#{hm.name}"
         pri_tbl = hm.active_record
         if fk_col.is_a?(Array) # Composite key?
           on_clause = []
           fk_col.each_with_index { |fk_col_part, idx| on_clause << "#{tbl_alias}.#{fk_col_part} = #{pri_tbl.table_name}.#{pri_tbl.primary_key[idx]}" }
           joins!("LEFT OUTER
-JOIN (SELECT #{fk_col.join(', ')}, COUNT(#{count_column}) AS _ct_ FROM #{associative&.name || hm.klass.table_name} GROUP BY #{(1..fk_col.length).to_a.join(', ')}) AS #{tbl_alias}
+JOIN (SELECT #{fk_col.join(', ')}, COUNT(#{count_column}) AS _ct_ FROM #{associative&.table_name || hm.klass.table_name} GROUP BY #{(1..fk_col.length).to_a.join(', ')}) AS #{tbl_alias}
   ON #{on_clause.join(' AND ')}")
         else
           joins!("LEFT OUTER
-JOIN (SELECT #{fk_col}, COUNT(#{count_column}) AS _ct_ FROM #{associative&.name || hm.klass.table_name} GROUP BY 1) AS #{tbl_alias}
+JOIN (SELECT #{fk_col}, COUNT(#{count_column}) AS _ct_ FROM #{associative&.table_name || hm.klass.table_name} GROUP BY 1) AS #{tbl_alias}
   ON #{tbl_alias}.#{fk_col} = #{pri_tbl.table_name}.#{pri_tbl.primary_key}")
         end
       end
@@ -657,31 +664,34 @@ class Object
           end
           hmts.each do |hmt_fk, fks|
             fks.each do |fk|
-              source = nil
-              this_hmt_fk = if fks.length > 1
-                              singular_assoc_name = fk.first[:inverse][:assoc_name].singularize
-                              source = fk.last
-                              through = fk.first[:alternate_name].pluralize
-                              "#{singular_assoc_name}_#{hmt_fk}"
-                            else
-                              source = fk.last unless hmt_fk.singularize == fk.last
-                              through = fk.first[:assoc_name].pluralize
-                              hmt_fk
-                            end
-              code << "  has_many :#{this_hmt_fk}, through: #{(assoc_name = through.to_sym).to_sym.inspect}#{", source: :#{source}" if source}\n"
+              through = fk.first[:assoc_name]
+              hmt_name = if fks.length > 1
+                           if fks[0].first[:inverse][:assoc_name] == fks[1].first[:inverse][:assoc_name] # Same BT names pointing back to us? (Most common scenario)
+                             "#{hmt_fk}_through_#{fk.first[:assoc_name]}"
+                           else # Use BT names to provide uniqueness
+                             through = fk.first[:alternate_name].pluralize
+                             singular_assoc_name = fk.first[:inverse][:assoc_name].singularize
+                             "#{singular_assoc_name}_#{hmt_fk}"
+                           end
+                         else
+                           hmt_fk
+                         end
+              source = fk.last unless hmt_name.singularize == fk.last
+              code << "  has_many :#{hmt_name}, through: #{(assoc_name = through.to_sym).to_sym.inspect}#{", source: :#{source}" if source}\n"
               options = { through: assoc_name }
               options[:source] = source.to_sym if source
-              self.send(:has_many, this_hmt_fk.to_sym, **options)
-            end
-          end
-          # Not NULLables
-          relation[:cols].each do |col, datatype|
-            if (datatype[3] && ar_pks.exclude?(col) && ::Brick.config.metadata_columns.exclude?(col)) ||
-               ::Brick.config.not_nullables.include?("#{matching}.#{col}")
-              code << "  validates :#{col}, presence: true\n"
-              self.send(:validates, col.to_sym, { presence: true })
+              self.send(:has_many, hmt_name.to_sym, **options)
             end
           end
+          # # Not NULLables
+          # # %%% For the minute we've had to pull this out because it's been troublesome implementing the NotNull validator
+          # relation[:cols].each do |col, datatype|
+          #   if (datatype[3] && ar_pks.exclude?(col) && ::Brick.config.metadata_columns.exclude?(col)) ||
+          #      ::Brick.config.not_nullables.include?("#{matching}.#{col}")
+          #     code << "  validates :#{col}, not_null: true\n"
+          #     self.send(:validates, col.to_sym, { not_null: true })
+          #   end
+          # end
         end
         code << "end # model #{model_name}\n\n"
       end # class definition
@@ -700,9 +710,22 @@ class Object
         code << "    @#{table_name} = #{model.name}#{model.primary_key ? ".order(#{model.primary_key.inspect})" : '.all'}\n"
         code << "    @#{table_name}.brick_select(params)\n"
         code << "  end\n"
+        self.protect_from_forgery unless: -> { self.request.format.js? }
         self.define_method :index do
           ::Brick.set_db_schema(params)
-          ar_relation = model.all # model.primary_key ? model.order(model.primary_key) : model.all
+          if request.format == :csv # Asking for a template?
+            require 'csv'
+            exported_csv = CSV.generate(force_quotes: false) do |csv_out|
+              model.df_export(model.brick_import_template).each { |row| csv_out << row }
+            end
+            render inline: exported_csv, content_type: request.format
+            return
+          elsif request.format == :js # Asking for JSON?
+            render inline: model.df_export(model.brick_import_template).to_json, content_type: request.format
+            return
+          end
+
+          ar_relation = model.primary_key ? model.order("#{model.table_name}.#{model.primary_key}") : model.all
           @_brick_params = ar_relation.brick_select(params, (selects = []), (bt_descrip = {}), (hm_counts = {}), (join_array = ::Brick::JoinArray.new))
           # %%% Add custom HM count columns
           # %%% What happens when the PK is composite?
@@ -739,6 +762,22 @@ class Object
             code << "  end\n"
             self.define_method :update do
               ::Brick.set_db_schema(params)
+
+              if request.format == :csv # Importing CSV?
+                require 'csv'
+                # See if internally it's likely a TSV file (tab-separated)
+                tab_counts = []
+                5.times { tab_counts << request.body.readline.count("\t") unless request.body.eof? }
+                request.body.rewind
+                separator = "\t" if tab_counts.length > 0 && tab_counts.uniq.length == 1 && tab_counts.first > 0
+                result = model.df_import(CSV.parse(request.body, { col_sep: separator || :auto }), model.brick_import_template)
+                # render inline: exported_csv, content_type: request.format
+                return
+              # elsif request.format == :js # Asking for JSON?
+              #   render inline: model.df_export(true).to_json, content_type: request.format
+              #   return
+              end
+
               instance_variable_set("@#{singular_table_name}".to_sym, (obj = model.find(params[:id].split(','))))
               obj = obj.first if obj.is_a?(Array)
               obj.send(:update, send(params_name = params_name.to_sym))

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

@@ -80,6 +80,7 @@ module Brick
               pk = @_brick_model.primary_key
               obj_name = model_name.underscore
               table_name = model_name.pluralize.underscore
+              template_link = nil
               bts, hms, associatives = ::Brick.get_bts_and_hms(@_brick_model) # This gets BT and HM and also has_many :through (HMT)
               hms_columns = [] # Used for 'index'
               skip_klass_hms = ::Brick.config.skip_index_hms[model_name] || {}
@@ -96,7 +97,9 @@ module Brick
                                    set_ct = if skip_klass_hms.key?(assoc_name.to_sym)
                                               'nil'
                                             else
-                                              "#{obj_name}._br_#{assoc_name}_ct || 0"
+                                              # Postgres column names are limited to 63 characters
+                                              attrib_name = "_br_#{assoc_name}_ct"[0..62]
+                                              "#{obj_name}.#{attrib_name} || 0"
                                             end
 "<%= ct = #{set_ct}
      link_to \"#\{ct || 'View'\} #{assoc_name}\", #{hm_assoc.klass.name.underscore.pluralize}_path({ #{path_keys(hm_fk_name, obj_name, pk)} }) unless ct&.zero? %>\n"
@@ -115,6 +118,13 @@ module Brick
               table_options = (::Brick.relations.keys - ::Brick.config.exclude_tables)
                               .each_with_object(+'') { |v, s| s << "<option value=\"#{v.underscore.pluralize}\">#{v}</option>" }.html_safe
               css = +"<style>
+#dropper {
+  background-color: #eee;
+}
+#btnImport {
+  display: none;
+}
+
 table {
   border-collapse: collapse;
   margin: 25px 0;
@@ -260,11 +270,101 @@ function changeout(href, param, value) {
                                   elsif pk
                                     "#{obj_name}.#{pk}"
                                   end
+                         if Object.const_defined?('DutyFree')
+                           template_link = "
+  <%= link_to 'CSV', #{table_name}_path(format: :csv) %> &nbsp; <a href=\"#\" id=\"sheetsLink\">Sheets</a>
+  <div id=\"dropper\" contenteditable=\"true\"></div>
+  <input type=\"button\" id=\"btnImport\" value=\"Import\">"
+                         end
 "#{css}
 <p style=\"color: green\"><%= notice %></p>#{"
 <select id=\"schema\">#{schema_options}</select>" if ::Brick.db_schemas.length > 1}
 <select id=\"tbl\">#{table_options}</select>
-<h1>#{model_name.pluralize}</h1>
+<h1>#{model_name.pluralize}</h1>#{template_link}
+<script>
+var dropperDiv = document.getElementById(\"dropper\");
+var btnImport = document.getElementById(\"btnImport\");
+var droppedTSV;
+if (dropperDiv) { // Other interesting events: blur keyup input
+  dropperDiv.addEventListener(\"paste\", function (evt) {
+    droppedTSV = evt.clipboardData.getData('text/plain');
+    var html = evt.clipboardData.getData('text/html');
+    var tbl = html.substring(html.indexOf(\"<tbody>\") + 7, html.lastIndexOf(\"</tbody>\"));
+    console.log(tbl);
+    btnImport.style.display = droppedTSV.length > 0 ? \"block\" : \"none\";
+  });
+  btnImport.addEventListener(\"click\", function () {
+    fetch(changeout(<%= #{obj_name}_path(-1, format: :csv).inspect.html_safe %>, \"_brick_schema\", brickSchema), {
+      method: 'PATCH',
+      headers: { 'Content-Type': 'text/tab-separated-values' },
+      body: droppedTSV
+    }).then(function (tsvResponse) {
+      btnImport.style.display = \"none\";
+      console.log(\"toaster\", tsvResponse);
+    });
+  });
+}
+var sheetUrl;
+var spreadsheetId;
+var sheetsLink = document.getElementById(\"sheetsLink\");
+function gapiLoaded() {
+  // Have a click on the sheets link to bring up the sign-in window.  (Must happen from some kind of user click.)
+  sheetsLink.addEventListener(\"click\", async function (evt) {
+    evt.preventDefault();
+    await gapi.load(\"client\", function () {
+      gapi.client.init({ // Load the discovery doc to initialize the API
+        clientId: \"487319557829-fgj4u660igrpptdji7ev0r5hb6kh05dh.apps.googleusercontent.com\",
+        scope: \"https://www.googleapis.com/auth/spreadsheets https://www.googleapis.com/auth/drive.file\",
+        discoveryDocs: [\"https://sheets.googleapis.com/$discovery/rest?version=v4\"]
+      }).then(function () {
+        gapi.auth2.getAuthInstance().isSignedIn.listen(updateSignInStatus);
+        updateSignInStatus(gapi.auth2.getAuthInstance().isSignedIn.get());
+      });
+    });
+  });
+}
+
+async function updateSignInStatus(isSignedIn) {
+  if (isSignedIn) {
+    console.log(\"turds!\");
+    await gapi.client.sheets.spreadsheets.create({
+      properties: {
+        title: #{table_name.inspect},
+      },
+      sheets: [
+        // sheet1, sheet2, sheet3
+      ]
+    }).then(function (response) {
+      sheetUrl = response.result.spreadsheetUrl;
+      spreadsheetId = response.result.spreadsheetId;
+      sheetsLink.setAttribute(\"href\", sheetUrl); // response.result.spreadsheetUrl
+      console.log(\"x1\", sheetUrl);
+
+      // Get JSON data
+      fetch(changeout(<%= #{table_name}_path(format: :js).inspect.html_safe %>, \"_brick_schema\", brickSchema)).then(function (response) {
+        response.json().then(function (data) {
+          gapi.client.sheets.spreadsheets.values.append({
+            spreadsheetId: spreadsheetId,
+            range: \"Sheet1\",
+            valueInputOption: \"RAW\",
+            insertDataOption: \"INSERT_ROWS\"
+          }, {
+            range: \"Sheet1\",
+            majorDimension: \"ROWS\",
+            values: data,
+          }).then(function (response2) {
+//            console.log(\"beefcake\", response2);
+          });
+        });
+      });
+    });
+    window.open(sheetUrl, '_blank');
+  }
+}
+</script>
+<script async defer src=\"https://apis.google.com/js/api.js\" onload=\"gapiLoaded()\"></script>
+
+
 <% if @_brick_params&.present? %><h3>where <%= @_brick_params.each_with_object([]) { |v, s| s << \"#\{v.first\} = #\{v.last.inspect\}\" }.join(', ') %></h3><% end %>
 <table id=\"#{table_name}\">
   <thead><tr>#{'<th></th>' if pk}
@@ -285,12 +385,12 @@ function changeout(href, param, value) {
   <tbody>
   <% @#{table_name}.each do |#{obj_name}| %>
   <tr>#{"
-    <td><%= link_to '⇛', #{obj_name}_path(#{obj_pk}), { class: 'big-arrow' } %></td>" if pk}
+    <td><%= link_to '⇛', #{obj_name}_path(#{obj_pk}), { class: 'big-arrow' } %></td>" if obj_pk}
     <% #{obj_name}.attributes.each do |k, val| %>
       <% next if k == '#{pk}' || ::Brick.config.metadata_columns.include?(k) || k.start_with?('_brfk_') || (k.start_with?('_br_') && k.end_with?('_ct')) %>
       <td>
       <% if (bt = bts[k]) %>
-        <%# binding.pry # Postgres column names are limited to 63 characters!!! %>
+        <%# binding.pry # Postgres column names are limited to 63 characters %>
         <% bt_txt = bt[1].brick_descrip(#{obj_name}, @_brick_bt_descrip[bt.first][1].map { |z| #{obj_name}.send(z.last[0..62]) }, @_brick_bt_descrip[bt.first][2]) %>
         <% bt_id_col = @_brick_bt_descrip[bt.first][2]; bt_id = #{obj_name}.send(*bt_id_col) if bt_id_col&.present? %>
         <%= bt_id ? link_to(bt_txt, send(\"#\{bt_obj_path_base = bt[1].name.underscore\}_path\".to_sym, bt_id)) : bt_txt %>
@@ -324,6 +424,7 @@ function changeout(href, param, value) {
   <table>
   <% @#{obj_name}.first.attributes.each do |k, val| %>
     <tr>
+    <%# %%% Accommodate composite keys %>
     <% next if k == '#{pk}' || ::Brick.config.metadata_columns.include?(k) %>
     <th class=\"show-field\">
     <% if (bt = bts[k])
@@ -332,7 +433,8 @@ function changeout(href, param, value) {
       # %%% Only do this if the user has permissions to edit this bt field
       if bt.length < 4
         bt << (option_detail = [[\"(No #\{bt_name\} chosen)\", '^^^brick_NULL^^^']])
-        bt[1].order(:#{pk}).each { |obj| option_detail << [obj.brick_descrip, obj.#{pk}] }
+        # %%% Accommodate composite keys for obj.pk at the end here
+        bt[1].order(bt[1].primary_key).each { |obj| option_detail << [obj.brick_descrip, obj.send(bt[1].primary_key)] }
       end %>
       BT <%= bt[1].bt_link(bt.first) %>
     <% else %>

data/lib/brick/version_number.rb

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

data/lib/brick.rb

@@ -126,9 +126,7 @@ module Brick
           skip_hms[hmt.last.name] = nil
         end
       end
-      skip_hms.each do |k, _v|
-        puts hms.delete(k).inspect
-      end
+      skip_hms.each { |k, _v| hms.delete(k) }
       [bts, hms, associatives]
     end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: brick
 version: !ruby/object:Gem::Version
-  version: 1.0.22
+  version: 1.0.23
 platform: ruby
 authors:
 - Lorin Thwaits
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-05-10 00:00:00.000000000 Z
+date: 2022-05-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord