mensa 0.6.2 → 0.6.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f85cdb0a26916745236f68e8a5e2cc5e0241f9f1555f4c4a4dcc408cd94c3786
-  data.tar.gz: 9d12eb7e55e07a595490511329bbf87fb171bf7ca2d1f07f50c92581ce688488
+  metadata.gz: b6c3d12b5f69c5a0893eae56ffda155d75a658dc46620aa18cbd379d0773e16e
+  data.tar.gz: 9e26900083f2aba091e70e5cbcc695f575432c0705b2cc6cda56df78b2d97ed3
 SHA512:
-  metadata.gz: 465070cf2e47b03b4d240a9d3f36a1f1129574a25d1492cb3a57612d5e6156a57ba40dd9cf887f4ee1ee14e5fbbe8ca20a217c73241da4ac12440d0b8ffcb059
-  data.tar.gz: ebdbace0651138de47cc6c26237df580b6c30f49b1735a686d98061b16f14e844d5f7edebd9936ea42e8a8dfd5c57f3f82580bad9a1c9f31f68bd1e77c7d21c7
+  metadata.gz: c5edc68c51ba784fb05689a538fdeec88dccfaeadee54df43a10af537700b442eb16344848a60fa7b8da20ed4c4dde8754e3c2a9bad3848ba71ed255e2598f07
+  data.tar.gz: 327b344e58309db72a11b1d90c8d8eae950b92571434144c3f237e6aa4161ac5eb9221bb3d33609f883e1a38bd6a6c4f0eb5a11a564adf79890fe9f69083ae25

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    mensa (0.6.1)
+    mensa (0.6.2)
       csv
       importmap-rails
       pagy (>= 43)

data/app/components/mensa/control_bar/component.css

@@ -89,6 +89,18 @@
             @apply text-xs font-normal text-gray-400 dark:text-gray-500;
         }
 
+        &__item-password {
+            @apply inline-flex items-center gap-1 text-xs text-gray-500 dark:text-gray-400;
+        }
+
+        &__item-password-value {
+            @apply rounded bg-gray-100 dark:bg-gray-700 px-1 py-0.5 font-mono text-[0.6875rem] text-gray-700 dark:text-gray-200;
+        }
+
+        &__item-password-copy {
+            @apply inline-flex h-5 w-5 items-center justify-center rounded text-gray-400 hover:bg-gray-100 hover:text-gray-700 dark:text-gray-500 dark:hover:bg-gray-700 dark:hover:text-gray-200 focus:outline-none focus:ring-2 focus:ring-gray-400 cursor-pointer;
+        }
+
         &__download {
             @apply inline-flex items-center gap-1.5 rounded-md bg-white dark:bg-gray-700 px-2.5 py-1.5 text-sm font-medium text-primary-600 dark:text-primary-300 ring-1 ring-inset ring-gray-300 dark:ring-gray-600 hover:bg-gray-50 dark:hover:bg-gray-600;
         }

data/app/components/mensa/copyable/component_controller.js

@@ -0,0 +1,32 @@
+import ApplicationController from "mensa/controllers/application_controller";
+
+export default class CopyableComponentController extends ApplicationController {
+    static values = {
+        text: String,
+    };
+
+    async copy(event) {
+        event.preventDefault();
+
+        if (!this.hasTextValue) return;
+
+        if (navigator.clipboard?.writeText) {
+            await navigator.clipboard.writeText(this.textValue);
+        } else {
+            this._copyWithFallback(this.textValue);
+        }
+    }
+
+    _copyWithFallback(text) {
+        const input = document.createElement("textarea");
+        input.value = text;
+        input.setAttribute("readonly", "");
+        input.style.position = "fixed";
+        input.style.top = "-9999px";
+        input.style.left = "-9999px";
+        document.body.appendChild(input);
+        input.select();
+        document.execCommand("copy");
+        input.remove();
+    }
+}

data/app/javascript/mensa/controllers/index.js

@@ -30,6 +30,9 @@ application.register("mensa-selection", SelectionComponentController);
 import ColumnCustomizerController from "mensa/components/column_customizer/component_controller";
 application.register("mensa-column-customizer", ColumnCustomizerController);
 
+import CopyableComponentController from "mensa/components/copyable/component_controller";
+application.register("mensa-copyable", CopyableComponentController);
+
 // Eager load all controllers defined in the import map under controllers/**/*_controller
 // import { eagerLoadControllersFrom } from "@hotwired/stimulus-loading"
 // eagerLoadControllersFrom("controllers", application)

data/app/jobs/mensa/export_job.rb

@@ -1,6 +1,6 @@
 require "csv"
 require "securerandom"
-require "stringio"
+require "tempfile"
 
 module Mensa
   # Generates the CSV for a Mensa::Export, attaches it to the export's +asset+
@@ -21,17 +21,19 @@ module Mensa
         return
       end
 
-      data, filename, content_type = generate(table, export)
+      tempfile, filename, content_type = generate(table, export)
 
       export.asset.purge if export.asset.attached?
-      export.asset.attach(io: StringIO.new(data), filename: filename, content_type: content_type)
+      export.asset.attach(io: tempfile, filename: filename, content_type: content_type)
       finalize(export, status: "completed", filename: filename)
 
       Mensa.config.callbacks[:export_complete]&.call(export)
     rescue => e
-      Mensa.config.logger&.error("Mensa::ExportJob failed for export #{export_id}: #{e.class}: #{e.message}")
+      Mensa.config.logger&.error("Mensa::ExportJob failed for export #{export&.id}: #{e.class}: #{e.message}")
       finalize(export, status: "failed") if export
       raise
+    ensure
+      tempfile&.close!
     end
 
     private
@@ -56,35 +58,63 @@ module Mensa
     end
 
     def generate(table, export)
-      io = StringIO.new
+      base_filename = "#{export.table_name}_export_#{export.created_at.strftime("%Y-%m-%d-%H%M%S")}"
+      csv_file = write_csv_file(table, export, base_filename)
+
+      if table.export_with_password?
+        zip_file = write_zip_file(csv_file, export, base_filename)
+        csv_file.close!
+        [zip_file, "#{base_filename}.zip", "application/zip"]
+      else
+        [csv_file, "#{base_filename}.csv", "text/csv"]
+      end
+    end
+
+    def write_csv_file(table, export, base_filename)
+      tempfile = Tempfile.new([base_filename, ".csv"], binmode: true)
+
       # A UTF-8 BOM makes spreadsheet programs such as Excel detect the encoding
       # correctly. The "plain" CSV variant omits it for maximum compatibility
       # with programmatic consumers.
-      io.write("\uFEFF") if export.format == "csv_excel"
+      tempfile.write("\uFEFF") if export.format == "csv_excel"
 
-      csv = CSV.new(io)
+      csv = CSV.new(tempfile)
       csv << table.display_columns.map(&:name)
       export_rows(table, export).each do |row|
         csv << table.display_columns.map { |column| Mensa::Cell.new(row: row, column: column).render(:csv) }
       end
-      io.rewind
-      data = io.read
+      csv.close
+      tempfile.open
+      tempfile.binmode
+      tempfile.rewind
+      tempfile
+    rescue
+      tempfile&.close!
+      raise
+    end
 
-      base_filename = "#{export.table_name}_export_#{export.created_at.strftime("%Y-%m-%d-%H%M%S")}"
+    def write_zip_file(csv_file, export, base_filename)
+      require "zip"
 
-      if table.export_with_password?
-        require "zip"
-        password = SecureRandom.hex(6)
-        encrypter = Zip::TraditionalEncrypter.new(password)
-        zip_io = Zip::OutputStream.write_buffer(encrypter: encrypter) do |zio|
-          zio.put_next_entry("#{base_filename}.csv")
-          zio.write data
-        end
-        zip_io.rewind
-        [zip_io.read, "#{base_filename}.zip", "application/zip"]
-      else
-        [data, "#{base_filename}.csv", "text/csv"]
+      zip_file = Tempfile.new([base_filename, ".zip"], binmode: true)
+      zip_path = zip_file.path
+      zip_file.close
+
+      export.password = SecureRandom.hex(6)
+      encrypter = Zip::TraditionalEncrypter.new(export.password)
+      Zip::OutputStream.open(zip_path, encrypter: encrypter) do |zio|
+        zio.put_next_entry("#{base_filename}.csv")
+        csv_file.rewind
+        IO.copy_stream(csv_file, zio)
       end
+
+      zip_file.open
+      zip_file.binmode
+      zip_file.rewind
+      zip_file
+    rescue
+      zip_file&.close!
+      raise
     end
 
     def export_rows(table, export)

data/app/tables/mensa/filter.rb

@@ -25,7 +25,8 @@ module Mensa
           [:lt, I18n.t("mensa.operators.lt"), true],
           [:lteq, I18n.t("mensa.operators.lteq"), true],
           [:is_current, I18n.t("mensa.operators.is_current"), false],
-          [:is_empty, I18n.t("mensa.operators.is_empty"), false]
+          [:is_empty, I18n.t("mensa.operators.is_empty"), false],
+          [:isnt_empty, I18n.t("mensa.operators.isnt_empty"), false]
         ].freeze
       end
     end
@@ -85,6 +86,12 @@ module Mensa
           else
             record_scope.where("#{column.attribute_for_condition} IS NULL")
           end
+        when :isnt_empty
+          if column.type == :string
+            record_scope.where("#{column.attribute_for_condition} IS NOT NULL AND #{column.attribute_for_condition} != ''")
+          else
+            record_scope.where("#{column.attribute_for_condition} IS NOT NULL")
+          end
         when :is_current
           record_scope.where("#{column.attribute_for_condition} = ?", Current.send(column.name))
         when :matches

data/app/views/mensa/exports/_list.html.erb

@@ -19,6 +19,15 @@
             <% if export.repeating? %>
               <span class="mensa-table__export-dialog__item-repeat"><%= export.repeat_label %></span>
             <% end %>
+            <% if export.password.present? %>
+              <span class="mensa-table__export-dialog__item-password" data-controller="mensa-copyable" data-mensa-copyable-text-value="<%= export.password %>">
+                <span class="mensa-table__export-dialog__item-password-label">Password:</span>
+                <code class="mensa-table__export-dialog__item-password-value"><%= export.password %></code>
+                <button class="mensa-table__export-dialog__item-password-copy" type="button" data-action="mensa-copyable#copy" aria-label="Copy password">
+                  <i class="fas fa-copy" aria-hidden="true"></i>
+                </button>
+              </span>
+            <% end %>
             <span class="mensa-table__export-dialog__item-meta"><%= export.created_at.strftime("%Y-%m-%d %H:%M") %></span>
           </div>
           <div class="mensa-table__export-dialog__item-action">

data/config/locales/en.yml

@@ -19,6 +19,7 @@ en:
       gteq: greater than or equal to
       lteq: less than or equal to
       is_empty: is empty
+      isnt_empty: is not empty
     add_filter:
       add: Add filter
       component:

data/config/locales/nl.yml

@@ -19,6 +19,7 @@ nl:
       gteq: groter dan of gelijk aan
       lteq: kleiner dan of gelijk aan
       is_empty: is leeg
+      isnt_empty: is niet leeg
     add_filter:
       add: Filter toevoegen
       component:

data/db/migrate/20260616113603_add_password_to_export.rb

@@ -0,0 +1,5 @@
+class AddPasswordToExport < ActiveRecord::Migration[8.1]
+  def change
+    add_column :mensa_exports, :password, :string
+  end
+end

data/lib/mensa/version.rb

@@ -1,3 +1,3 @@
 module Mensa
-  VERSION = "0.6.2"
+  VERSION = "0.6.3"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mensa
 version: !ruby/object:Gem::Version
-  version: 0.6.2
+  version: 0.6.3
 platform: ruby
 authors:
 - Tom de Grunt
@@ -193,6 +193,7 @@ files:
 - app/components/mensa/control_bar/component.css
 - app/components/mensa/control_bar/component.html.erb
 - app/components/mensa/control_bar/component.rb
+- app/components/mensa/copyable/component_controller.js
 - app/components/mensa/empty_state/component.css
 - app/components/mensa/empty_state/component.html.erb
 - app/components/mensa/empty_state/component.rb
@@ -294,6 +295,7 @@ files:
 - db/migrate/20251112143558_add_description_to_table_view.rb
 - db/migrate/20260604120000_create_mensa_exports.rb
 - db/migrate/20260612110000_add_repeat_to_mensa_exports.rb
+- db/migrate/20260616113603_add_password_to_export.rb
 - docs/columns.png
 - docs/export.png
 - docs/filters.png