koalagator 5.0.0 → 5.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 19e11215c36263be21f40683e72b114898c9d61c65961239f5d4edb91d8fc9c4
-  data.tar.gz: 895412de6ad7a58706dfd518d291dd0161dea28bc9c5e58543a3c647fa67e0d4
+  metadata.gz: ff66a4e6b8b4b8d8d8ec7380366f00970a540e62a3151989b5a38436b2405a32
+  data.tar.gz: b1fff8d25d098776ead6e5485c18c064a9466bfb59ef43b17b0b4387391bd112
 SHA512:
-  metadata.gz: 3d77eba41204db9a67ca1c8823895559175207ab4adaa821979f686beb47dd0e1b24f60f611e64621717cbc9ab0de059925f65a1f87c0057668816e92b9a029f
-  data.tar.gz: 9bb30e3187b5db345e6239715f1f7f26687d6ae0cd428c7e84352933b7fa243e7b6e8f110d24db4fd4e20e8077039f0145ab0875d0b944106432809f1c19b806
+  metadata.gz: 19a313f77215a0546e97cee14916c5b5d5f14c11eaa081abff80fa721eebc8be19f3d8a2f6f0eb71e8b1b4c29d8bcac43133e376ee2708ac5cee59a8a7dadfa6
+  data.tar.gz: 1416ae2d0f5f30eb0d44c829cffd29fc081e22160c5cba1934c6cc0852657e7bb39bdd5b998c5e5a8f3c63e03e99f8e9646203ae797b0a3f1bf883112249eb84

data/README.md

@@ -17,6 +17,8 @@ Thank you to everyone who contributed to the original calagator project (you're
 We appreciate the encouragment from the ruby community for us to undertaking a revivial of this project.
 Koalagator is a hard community fork of calagator. We've upgraded the project from Rails 4.2 to Rails 7.1 as part of this revival.
 
+See also our [Koalagator Browser Extension for Firefox/Chrome](https://github.com/koalagator/koalagator-browser-extension) it supports most major event sites and enables quick and easy one-click adding of events to your instance.
+
 About the revival
 -----------------
 

data/app/assets/stylesheets/calagator/layout.scss

@@ -727,4 +727,8 @@ fieldset .no_label, fieldset .help {
 #curation_description {
   max-width: 800px;
   margin-left: 0px;
+}
+
+a.orange {
+  color: orange;
 }

data/app/controllers/calagator/admin/bulk_imports_controller.rb

@@ -0,0 +1,37 @@
+# frozen_string_literal: true
+
+require "csv"
+require "calagator/import_events_csv"
+
+module Calagator
+  module Admin
+    class BulkImportsController < Calagator::ApplicationController
+      require_admin
+
+      def new
+      end
+
+      def create
+        # example code via: https://guides.rubyonrails.org/form_helpers.html#uploading-files
+
+        @uploaded_file = params[:csv_file]
+
+        if @uploaded_file.present?
+          csv_data = CSV.parse(@uploaded_file.read, headers: true)
+          @bulk_import = Calagator::BulkImport.new(csv_data)
+          @bulk_import.process_csv_file(csv_data)
+        else
+          Rails.logger.info "upload_file not present"
+        end
+
+        respond_to do |format|
+          if @bulk_import&.errors&.empty?
+            format.html { redirect_to events_path(order: "created_at"), notice: "Successfully imported all records." }
+          else
+            format.html { render :new, status: :unprocessable_entity }
+          end
+        end
+      end
+    end
+  end
+end

data/app/controllers/calagator/events_controller.rb

@@ -8,6 +8,7 @@ module Calagator
   class EventsController < Calagator::ApplicationController
     # Provides #duplicates and #squash_many_duplicates
     include Calagator::DuplicateChecking::ControllerActions
+
     require_admin only: %i[duplicates squash_many_duplicates]
 
     authorize_resource :events, only: %i[new edit create update destroy clone]
@@ -24,6 +25,15 @@ module Calagator
       render_events @events
     end
 
+    # GET /events/tabular
+    # GET /events/tabular.xml
+    def tabular
+      @browse = Event::Browse.new(params)
+      @events = @browse.events
+      @browse.errors.each { |error| append_flash :failure, error }
+      render_events @events
+    end
+
     # GET /events/1
     # GET /events/1.xml
     def show

data/app/controllers/calagator/venues_controller.rb

@@ -6,6 +6,7 @@ module Calagator
   class VenuesController < Calagator::ApplicationController
     # Provides #duplicates and #squash_many_duplicates
     include DuplicateChecking::ControllerActions
+
     require_admin only: %i[duplicates squash_many_duplicates]
 
     authorize_resource :venues, only: %i[new edit create update destroy]

data/app/controllers/paper_trail_manager/changes_controller.rb

@@ -16,7 +16,7 @@ class PaperTrailManager
     def index
       unless change_index_allowed?
         flash[:error] = "You do not have permission to list changes."
-        return(redirect_to root_url)
+        return redirect_to root_url
       end
 
       @versions = PaperTrail::Version.order("created_at DESC, id DESC")
@@ -49,12 +49,12 @@ class PaperTrailManager
         @version = PaperTrail::Version.find(params[:id])
       rescue ActiveRecord::RecordNotFound
         flash[:error] = "No such version."
-        return(redirect_to action: :index)
+        return redirect_to action: :index
       end
 
       unless change_show_allowed?(@version)
         flash[:error] = "You do not have permission to show that change."
-        return(redirect_to action: :index)
+        return redirect_to action: :index
       end
 
       respond_to do |format|
@@ -69,12 +69,12 @@ class PaperTrailManager
         @version = PaperTrail::Version.find(params[:id])
       rescue ActiveRecord::RecordNotFound
         flash[:error] = "No such version."
-        return(redirect_to(changes_path))
+        return redirect_to(changes_path)
       end
 
       unless change_revert_allowed?(@version)
         flash[:error] = "You do not have permission to revert this change."
-        return(redirect_to changes_path)
+        return redirect_to changes_path
       end
 
       if @version.event == "create"

data/app/helpers/calagator/application_helper.rb

@@ -15,7 +15,7 @@ module Calagator
     end
 
     def markdown(text)
-      BlueCloth.new(text, relaxed: true).to_html
+      Kramdown::Document.new(text).to_html.rstrip
     end
 
     # Return a HTML string with the BR tags converted to XHTML compliant markup.
@@ -45,7 +45,7 @@ module Calagator
         next if flash[type].blank?
 
         content_tag(:div, class: "flash #{type} flash_#{type}") do
-          "#{(type == :failure) ? "ERROR: " : ""}#{flash[type]}".html_safe
+          "#{"ERROR: " if type == :failure}#{flash[type]}".html_safe
         end
       end.compact.join.html_safe
     end

data/app/helpers/calagator/events_helper.rb

@@ -183,7 +183,8 @@ module Calagator
       "name" => "Event Name",
       "venue" => "Location",
       "score" => "Relevance",
-      "date" => "Date"
+      "created_at" => "Date Added",
+      "date" => "Event Date"
     }.freeze
     private_constant :SORTING_LABELS
   end

data/app/models/calagator/bulk_import.rb

@@ -0,0 +1,59 @@
+module Calagator
+  class BulkImport
+    def initialize(csv_data)
+      @csv_data = csv_data
+      @errors = []
+    end
+
+    attr_reader :errors
+
+    def process_csv_file(csv_data)
+      @errors = []
+      processed_events = csv_data.each.with_index(2).map { |row, index| process_row(row, index) }
+      return false if @errors.any?
+      processed_events.map { |event| event.save }
+    end
+
+    def process_row(row, index)
+      venue = set_venue(row["venue"])
+      event = Calagator::Event.new(
+        title: row["title"],
+        venue_id: venue&.id,
+        url: row["url"],
+        start_time: set_event_at(row["event_start_at"]),
+        end_time: set_event_at(row["event_end_at"]),
+        description: row["description"],
+        venue_details: row["venue_details"],
+        tag_list: row["event_tag_list"]
+      )
+
+      if Calagator::Event.find_duplicate(event.title, event.start_time, event.end_time, venue).any?
+        return @errors << "Row #{index}: 'Duplicate of an existing event.'"
+      end
+
+      if event.valid?
+        event
+      else
+        @errors << "Row #{index}: #{event.errors.full_messages}"
+      end
+    end
+
+    def set_event_at(value)
+      return "" unless value.present?
+      Time.strptime value, "%d/%m/%Y %H:%M:%S"
+    end
+
+    def set_venue(value)
+      return "" unless value.present?
+      value_s = value.to_s
+      value_i = value_s.to_i
+      target_venue = if value_s.match?(/^\s*\d+\s*$/) && value_i > 0
+        Calagator::Venue.find_by(id: value_i)
+      else
+        Calagator::Venue.search(value_s, limit: 1).first
+      end
+      Rails.logger.info "set_venue.target_venue #{target_venue}"
+      target_venue
+    end
+  end
+end

data/app/models/calagator/curation.rb

@@ -18,6 +18,7 @@
 module Calagator
   class Curation < Calagator::ApplicationRecord
     include EventFilterable
+
     scope :listed, -> { where(unlisted: false) }
 
     validates :name, :display_name, :priority, presence: true

data/app/models/calagator/event.rb

@@ -53,7 +53,7 @@ module Calagator
     has_paper_trail
     acts_as_taggable_on :tags
 
-    xss_foliate strip: %i[title description venue_details]
+    # xss_foliate strip: %i[title description venue_details]
 
     include DecodeHtmlEntitiesHack
     include ActiveModel::Serializers::Xml
@@ -76,6 +76,7 @@ module Calagator
 
     # Duplicates
     include DuplicateChecking
+
     duplicate_checking_ignores_attributes :source_id, :version, :venue_id, :tag_list
     duplicate_squashing_ignores_associations :tags, :base_tags, :taggings
     duplicate_finding_scope -> { future.order(:id) }
@@ -100,7 +101,9 @@ module Calagator
       end_date += 1.day if start_date == end_date
       on_or_after_date(start_date).before_date(end_date)
     }
-
+    scope :find_duplicate, ->(title, start_time, end_time, venue) {
+      includes(:venue).where(title: title, start_time: start_time, end_time: end_time, venue: venue)
+    }
     # Expand the simple sort order names from the URL into more intelligent SQL order strings
     scope :ordered_by_ui_field, lambda { |ui_field|
       scope = case ui_field
@@ -108,6 +111,8 @@ module Calagator
         order(Arel.sql("lower(events.title)"))
       when "venue"
         includes(:venue).order(Arel.sql("lower(venues.title)")).references(:venues)
+      when "created_at"
+        return order(created_at: :desc)
       else
         all
       end

data/app/models/calagator/venue.rb

@@ -79,6 +79,7 @@ module Calagator
 
     # Duplicates
     include DuplicateChecking
+
     duplicate_checking_ignores_attributes :source_id, :version, :closed, :wifi, :access_notes, :tag_list
     duplicate_squashing_ignores_associations :tags, :base_tags, :taggings
     duplicate_finding_scope -> { non_duplicates.order(:title, :id) }

data/app/views/calagator/admin/bulk_imports/new.html.erb

@@ -0,0 +1,34 @@
+  <% if @bulk_import && @bulk_import&.errors.any? %>
+    <div style="color: red">
+      <h2><%= pluralize(@bulk_import&.errors.count, "error") %> in '<code><%= @uploaded_file.original_filename %></code>' prohibited this import from being saved:</h2>
+
+      <ul>
+        <% @bulk_import&.errors.each do |error| %>
+          <li><%= error %></li>
+        <% end %>
+      </ul>
+    </div>
+  <% end %>
+
+<h1>Bulk Imports</h1>
+
+<p>This feature supports bulk importing of events from a spreadsheet file</p>
+<p>To work as expected the uploaded file needs to be in `.csv` format.</p>
+<p>The header row in the csv file also needs to match our system defined field headings<p>
+<p>We recommend you copy your spreadsheet data into this template, and upload the resultant file</p>
+<p><%= link_to 'Koalagator Bulk Import Template v1.0', 'https://docs.google.com/spreadsheets/d/1QBGzaMjVCjUHQxQ3YIfX5Kivck2Rmow0IlyRAjDrbf4/edit?gid=0#gid=0' %></p>
+<p>1. Open the Template. 2. File > 'Make a copy' 3. Copy paste your records in 4. Review and tidy up records for a clean import.</p>
+<p>Once the sheet is ready. Download in .csv format by going:  File > Download > Comma Separated Value (.csv)</p>
+
+<p>The first version of this importer, will associate all events with a venue named 'TBA', for now its better than nothing.</p>
+<p>Once imported you can go through each event and allocate to a real venue.</p>
+
+<p>Drag and drop / attach your .csv file into the file area below: </p>
+
+<div class="form-label"><h3>Upload Your Spreadsheet (.csv)</h3></div>
+
+<%= form_with url: admin_bulk_imports_path, multipart: true do |form| %>
+    <%= file_field_tag :csv_file, accept:'.csv' %>
+    <br><br>
+    <%= form.submit "Upload attached File" %>
+<% end %>

data/app/views/calagator/admin/index.html.erb

@@ -9,4 +9,6 @@
     <li><%= link_to "Manage users", admin_users_path %></li>
   <% end %>
   <li><%= link_to "Manage curations", admin_curations_path %></li>
+  <li><%= link_to "Tablular Events View - Designed for copy/paste into an external newsletter", '/events/tabular' %></li>
+  <li><%= link_to "Bulk Import from CSV File", new_admin_bulk_import_path %></li>
 </ul>

data/app/views/calagator/events/_table.html.erb

@@ -20,7 +20,8 @@ rowspans = calculate_rowspans(events)
       <th class='date'>Sort By: <%= link_to "Date", url_for(params.to_unsafe_h.merge(:order => 'date')) %></th>
       <th class='event_summary'>
         <%= events_sort_link('name') -%>,
-        <%= events_sort_link('venue') -%>
+        <%= events_sort_link('venue') -%>,
+        <%= events_sort_link('created_at') -%>
         <%- if scores -%>,
         <%= events_sort_link('score') -%>
         <%- end -%>, 
@@ -33,16 +34,20 @@ rowspans = calculate_rowspans(events)
       <% events.each_with_index do |event, index| %>
         <tr class='vevent h-event'>
           <% if rowspans[index] > 0 %>
-          <td class='date' rowspan="<%=rowspans[index]%>">
-            <div class='day_of_week <%= today_tomorrow_or_weekday(event).downcase -%>'>
-              <%= today_tomorrow_or_weekday(event) %>
-            </div>
-            <% show_year = event.start_time.year != Time.now.year %>
-            <%= datetime_format(event.start_time,'%b %d') -%><%= ", "+datetime_format(event.start_time,'%Y') if show_year %>
-          </td>
+            <td class='date' rowspan="<%=rowspans[index]%>">
+              <div class='day_of_week <%= today_tomorrow_or_weekday(event).downcase -%>'>
+                <%= today_tomorrow_or_weekday(event) %>
+              </div>
+              <% show_year = event.start_time.year != Time.now.year %>
+              <%= datetime_format(event.start_time,'%b %d') -%><%= ", "+datetime_format(event.start_time,'%Y') if show_year %>
+            </td>
           <% end %>
           <td class='event_summary'>
-            <a class='summary p-name u-url' href='<%= url_for event_url(event) %>' name='<%= "event-#{event.id}" %>' id='<%= "event-#{event.id}" %>'><%= event.title %></a><br />
+            <%= link_to event.title, event, class: "summary p-name u-url #{'orange' if event.created_at.to_date == Date.today}",
+                id: "event-#{event.id}",
+                name: "event-#{event.id}",
+                title: "Added #{event.created_at}"
+            %>
             <%= normalize_time(event, :context => event.start_time.to_date) -%>
             <% if event.venue && !event.venue.title.blank? %>
               <a class='location p-location h-card' href='<%= url_for venue_url(event.venue) %>'><%= event.venue.title -%></a>

data/app/views/calagator/events/_tabular.html.erb

@@ -0,0 +1,59 @@
+<% links ||= {} %>
+<div class='list_description'>
+  <h2>Viewing <strong><%= browse.events.size %></strong>
+  <%= browse.date ? 'filtered' : 'future' %> events
+  <%= events_sort_label(browse.order) %></h2>
+</div>
+
+<div id='list_filters' class='sidebar'>
+
+  <h3 class='first'>Filter:</h3>
+
+  <%= form_tag events_url, :method => 'get' do  -%>
+
+  <div id="date_filter">
+    <h4>by date</h4>
+    <div id='start_calendar'>
+      <label for='date_start'>From</label>
+      <%= text_field_tag 'date[start]', browse.start_date, :id => 'date_start', :class => 'date_picker' %>
+    </div>
+    <div id='end_calendar'>
+      <label for='date_end'>To</label>
+      <%= text_field_tag 'date[end]', browse.end_date, :id => 'date_end', :class => 'date_picker' %>
+    </div>
+  </div>
+  <div id='time_filter'>
+  <h4>by time</h4>
+    <div id='start_time_picker'>
+      <label for="time_start">Begins after:</label>
+      <%= text_field_tag 'time[start]', browse.start_time, :id => 'filter_time_start', :class => 'time_picker_filter' %>
+    </div>
+    <div id='end_time_picker'>
+      <label for="time_end">Ends before:</label>
+      <%= text_field_tag 'time[end]', browse.end_time, :id => 'filter_time_end', :class => 'time_picker_filter' %>
+    </div>
+  </div>
+  <div>
+    <label for="commit">&nbsp;</label>
+    <%= submit_tag 'Filter' %>
+    <span class="clear_filter"><%= link_to 'Reset', events_url %></span>
+  </div>
+  <% end %>
+
+  <h3>Subscribe to</h3>
+  <ul>
+    <li><%= link_to "iCalendar feed", links[:ical] %></li>
+    <li><%= link_to "Atom feed", links[:atom] %></li>
+    <li><%= link_to "Google Calendar", links[:google] %></li>
+  </ul>
+
+  <h3>Export to</h3>
+  <ul>
+    <li><%= link_to "iCalendar file", links[:ical_export] %></li>
+  </ul>
+
+</div>
+
+<div class='list_items'>
+  <%= render :partial => 'calagator/events/tabular_table', :locals => { :events => browse.events } %>
+</div>

data/app/views/calagator/events/_tabular_table.html.erb

@@ -0,0 +1,82 @@
+<%-
+# Arguments:
+# * events => Array of Event records.
+# * scores => Offer a sort by score, like for search? Default to false.
+
+scores = defined?(scores) ? scores : false
+
+previous_start_time = nil
+#show_year ||= false
+skipped = 0
+
+# calculate rowspans array for events
+# each entry is number of rows spanned by today_tomorrow_weekday entry, if any, to left of event
+# entry will be > 0 for first event of day, 0 for other events
+rowspans = calculate_rowspans(events)
+-%>
+<table class='event_table'>
+  <thead>
+    <tr>
+      <th class='date'>Sort By: <%= link_to "Date", url_for(params.to_unsafe_h.merge(:order => 'date')) %></th>
+      <th class='event_summary'>
+        <%= events_sort_link('name') -%>,
+        <%= events_sort_link('venue') -%>,
+        <%= events_sort_link('created_at') -%>
+        <%- if scores -%>,
+        <%= events_sort_link('score') -%>
+        <%- end -%>, 
+        <%= events_sort_link(nil) -%>
+      </th>
+    </tr>
+  </thead>
+  <tbody>
+    <% unless events.size==0 %>
+      <% events.each_with_index do |event, index| %>
+        <tr class='vevent h-event'>
+          <% if rowspans[index] > 0 %>
+            <td class='event_title rowspan="<%=rowspans[index]%>"'>
+              <%= link_to event.title, (event.url || event_url(event)), 
+                class: "summary p-name u-url #{'orange' if event.created_at.to_date == Date.today}",  
+                id: "event-#{event.id}",
+                name: "event-#{event.id}",
+                title: "Added #{event.created_at}"
+              %>
+              <%= "&nbsp;".html_safe if event&.title&.blank? %>
+              <br/>
+            </td>
+            <td class='event_date'>
+              <div class='day_of_week <%= today_tomorrow_or_weekday(event).downcase -%>'>
+                <%= today_tomorrow_or_weekday(event) %>
+                <% show_year = event.start_time.year != Time.now.year %>
+                <%= datetime_format(event.start_time,'%b %d') -%><%= ", "+datetime_format(event.start_time,'%Y') if show_year %>
+              </div>
+              <%= normalize_time(event, :context => event.start_time.to_date) -%>
+              <%= "&nbsp;".html_safe if event&.start_time&.blank? %>
+            </td>
+          <% end %>
+          <td class='event_location'>
+            <% if event.venue && !event.venue.title.blank? %>
+              <a class='location p-location h-card' href='<%= url_for venue_url(event.venue) %>'><%= event.venue.title %></a>
+            <% end -%>
+            <%= "&nbsp;".html_safe if event&.venue&.blank? %>
+          </td>  
+          <td class='event_summary'>
+            <%= format_description(event.description) %>    
+            <%= "&nbsp;".html_safe if event&.description&.blank? %>
+          </td>
+        </tr>
+      <% end %>
+    <% else %>
+      <tr>
+        <td colspan=2>No events were found.</td>
+      </tr>
+    <% end %>
+    <% if skipped > 0 %>
+      <tr>
+        <td colspan=2>
+          <%= link_to "(And #{skipped} more)", events_url %>
+        </td>
+      </tr>
+    <% end %>
+  </tbody>
+</table>

data/app/views/calagator/events/tabular.html.erb

@@ -0,0 +1,22 @@
+<h1>Tabular Events</h1>
+<p>This special events view has been added to support groups that want to copy/paste events into a newsletter or external publication.</p>
+<p>Specifically it was first added to support a group that is proactivley adding multiple events from the community to then be able to pull this info back out in a useful format.</p>
+<p>The events listing is split into four colummns: Title, Date Time, Venue and Description.</p>
+<p>Note: Unlike elsewhere in the app, the venue title here links to the event website in the first instance.</p>
+<p>If no website is included in the event record, the event title will link to the event record.</p>
+<p>In this way end users of the listing of upcoming events will be linked directly to the event website where available.</p>
+<p>The venue listed will always link to the instances venue record, such that accessibility details and directions are easily discoverable.</p>
+<p>To copy/paste, select from the left hand side of Title the first record and drag until you are at the right hand side of the description of the last record.<p>
+<p>Tip: Use the filter tool (right hand side) to narrow down the event dates before doing a copy/paste</p>
+
+<%= content_for :title, "Events" %>
+
+<% cache_if(@browse.default? && Calagator.cache_enabled, Calagator::CacheObserver.daily_key_for("events_index", request)) do %>
+<%= render partial: "tabular", locals: {browse: @browse, links: {
+    ical: icalendar_feed_link,
+    atom: atom_feed_link,
+    google: google_events_subscription_link,
+    ical_export: icalendar_export_link
+  }}
+%>
+<% end %>

data/app/views/paper_trail_manager/changes/index.atom.builder

@@ -19,7 +19,7 @@ atom_feed do |feed|
         end
       end
 
-      entry.title "#{version.event.upcase} #{version.item_type} «#{change_title_for(version)}» #{user ? "by " + user.send(PaperTrailManager.whodunnit_name_method) : ""}"
+      entry.title "#{version.event.upcase} #{version.item_type} «#{change_title_for(version)}» #{"by " + user.send(PaperTrailManager.whodunnit_name_method) if user}"
       entry.updated version.created_at.utc.xmlschema
 
       xm = ::Builder::XmlMarkup.new

data/config/routes.rb

@@ -33,6 +33,7 @@ Calagator::Engine.routes.draw do
 
   namespace :admin do
     resources :curations, except: :show
+    resources :bulk_imports
     if Calagator.devise_enabled
       resources :users do
         get :invite, as: :invite
@@ -50,6 +51,7 @@ Calagator::Engine.routes.draw do
       get :search
       get :duplicates
       get "tag/:tag", action: :search, as: :tag
+      get "tabular" => "events#tabular"
     end
 
     member do

data/db/seeds.rb

@@ -59,7 +59,7 @@ FactoryBot.define do
     description { Faker::Lorem.paragraph }
     start_time do
       [
-        Faker::Time.between(from: 2.years.ago, to: 2.years.from_now),
+        Faker::Time.between(from: 2.years.ago, to: 2.years.from_now.to_datetime),
         Faker::Time.backward(days: 1),
         Faker::Time.forward(days: 1),
         Faker::Time.forward(days: 7)

data/lib/calagator/decode_html_entities_hack.rb

@@ -15,6 +15,8 @@
 # Warning: this effectively renders loofah's "escape" scrubbing mode useless by
 # undoing everything it does. Don't use that mode.
 #
+# TODO (2025): Review and remove if no longer needed
+#
 module Calagator
   module DecodeHtmlEntitiesHack
     def self.included(base)

data/lib/calagator/import_events_csv.rb

@@ -0,0 +1,123 @@
+require "smarter_csv"
+
+module Calagator
+  class ImportEventsCsv
+    attr_reader :csv, :events
+
+    def initialize(input)
+      @csv = SmarterCSV::Reader.new(input,
+        col_sep: ",",
+        row_sep: "\n",
+        user_provided_headers: %i[title description venue start_date end_date tag_list])
+      @events = process_events
+    end
+
+    def valid?
+      @valid
+    end
+
+    def import!(allow_invalid: false)
+      events.each do |event|
+        if allow_invalid
+          event.import
+        else
+          event.import!
+        end
+      end
+    end
+
+    private def process_events
+      event_list = []
+
+      @valid = true
+      csv.process do |row|
+        event = ImportedEvent.new(row.first)
+        @valid = false unless event.valid?
+        event_list << event
+      end
+
+      event_list
+    end
+
+    class InvalidEventError < StandardError
+    end
+
+    class ImportedEvent
+      attr_reader :data, :errors
+      attr_accessor :title, :description, :venue, :start_date, :end_date, :tag_list
+
+      def initialize(data)
+        @data = data
+        @errors = {}
+
+        set_title(data[:title])
+        set_description(data[:description])
+        set_venue(data[:venue])
+        set_start_date(data[:start_date])
+        set_end_date(data[:end_date])
+        set_tag_list(data[:tag_list])
+      end
+
+      def valid?
+        @errors.empty?
+      end
+
+      def import
+        return false if !valid?
+
+        Calagator::Event.create(title: title, description: description, venue: venue, start_date: start_date, end_date: end_date, tag_list: tag_list)
+      end
+
+      def import!
+        result = import
+        raise InvalidEventError unless result
+
+        result
+      end
+
+      private
+
+      def set_title(value)
+        return errors[:title] = "is empty" unless value.present?
+
+        @title = value.to_s
+      end
+
+      def set_description(value)
+        @description = value.to_s
+      end
+
+      def set_venue(value)
+        return errors[:venue] = "is empty" unless value.present?
+
+        value_s = value.to_s
+        value_i = value_s.to_i
+        target_venue = if value_s.match?(/^\s*\d+\s*$/) && value_i > 0
+          Calagator::Venue.find_by(id: value_i)
+        else
+          Calagator::Venue.search(value_s, limit: 1).first
+        end
+
+        return errors[:venue] = "cannot be found" unless target_venue.present?
+
+        @venue = target_venue
+      end
+
+      def set_start_date(value)
+        @start_date = Time.iso8601(value)
+      rescue
+        errors[:start_date] = "is not in ISO 8601 time format"
+      end
+
+      def set_end_date(value)
+        @end_date = Time.iso8601(value)
+      rescue
+        errors[:end_date] = "is not in ISO 8601 time format"
+      end
+
+      def set_tag_list(value)
+        @tag_list = value
+      end
+    end
+  end
+end

data/lib/calagator/version.rb

@@ -3,7 +3,7 @@
 module Calagator
   NAME = "Koalagator"
   GEMSPEC = "koalagator"
-  VERSION = "5.0.0"
-  RAILS_VERSION = "~> 7.1"
+  VERSION = "5.1.0"
+  RAILS_VERSION = "~> 7.2.2"
   MAJOR_RUBY_VERSION = RUBY_VERSION[0].to_i
 end

data/lib/koalagator.rb

@@ -16,7 +16,6 @@ require "will_paginate/array"
 require "rest-client"
 require "loofah"
 require "loofah-activerecord"
-require "bluecloth"
 require "acts-as-taggable-on"
 require "jquery-rails"
 require "jquery-ui-rails"
@@ -26,6 +25,7 @@ require "utf8-cleaner"
 require "lucene_query"
 require "rack/contrib/jsonp"
 require "devise"
+require "kramdown"
 
 module Calagator
   mattr_accessor :title,

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: koalagator
 version: !ruby/object:Gem::Version
-  version: 5.0.0
+  version: 5.1.0
 platform: ruby
 authors:
 - the Koalagator team
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-04-01 00:00:00.000000000 Z
+date: 2026-04-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '7.1'
+        version: 7.2.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '7.1'
+        version: 7.2.2
 - !ruby/object:Gem::Dependency
   name: sprockets-rails
   requirement: !ruby/object:Gem::Requirement
@@ -58,14 +58,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '11.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '11.0'
 - !ruby/object:Gem::Dependency
   name: annotate
   requirement: !ruby/object:Gem::Requirement
@@ -86,34 +86,20 @@ dependencies:
     - - "<"
       - !ruby/object:Gem::Version
         version: 3.3.0
-- !ruby/object:Gem::Dependency
-  name: bluecloth
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.2'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.2'
 - !ruby/object:Gem::Dependency
   name: bootsnap
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.16'
+        version: '1.23'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.16'
+        version: '1.23'
 - !ruby/object:Gem::Dependency
   name: font-awesome-rails
   requirement: !ruby/object:Gem::Requirement
@@ -146,36 +132,30 @@ dependencies:
   name: geokit
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '1.9'
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.14'
+        version: 1.14.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '1.9'
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.14'
+        version: 1.14.0
 - !ruby/object:Gem::Dependency
   name: htmlentities
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.3'
+        version: 4.4.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.3'
+        version: 4.4.2
 - !ruby/object:Gem::Dependency
   name: jquery-rails
   requirement: !ruby/object:Gem::Requirement
@@ -204,20 +184,40 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '7.0'
+- !ruby/object:Gem::Dependency
+  name: kramdown
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.5'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.5.1
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.5'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.5.1
 - !ruby/object:Gem::Dependency
   name: loofah
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: 2.25.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: 2.25.1
 - !ruby/object:Gem::Dependency
   name: loofah-activerecord
   requirement: !ruby/object:Gem::Requirement
@@ -272,14 +272,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.18.1
+        version: 1.19.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.18.1
+        version: 1.19.2
 - !ruby/object:Gem::Dependency
   name: paper_trail
   requirement: !ruby/object:Gem::Requirement
@@ -300,14 +300,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.3'
+        version: 2.5.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.3'
+        version: 2.5.0
 - !ruby/object:Gem::Dependency
   name: rails-observers
   requirement: !ruby/object:Gem::Requirement
@@ -398,14 +398,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.43.0
+        version: 1.54.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.43.0
+        version: 1.54.0
 - !ruby/object:Gem::Dependency
   name: utf8-cleaner
   requirement: !ruby/object:Gem::Requirement
@@ -460,14 +460,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.5.0
+        version: 2.9.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.5.0
+        version: 2.9.2
 - !ruby/object:Gem::Dependency
   name: observer
   requirement: !ruby/object:Gem::Requirement
@@ -510,6 +510,34 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2.0'
+- !ruby/object:Gem::Dependency
+  name: smarter_csv
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.13'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.13'
+- !ruby/object:Gem::Dependency
+  name: csv
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 3.3.3
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 3.3.3
 - !ruby/object:Gem::Dependency
   name: rexml
   requirement: !ruby/object:Gem::Requirement
@@ -586,42 +614,42 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 6.4.4
+        version: 6.5.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 6.4.4
+        version: 6.5.1
 - !ruby/object:Gem::Dependency
   name: faker
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.5.1
+        version: 3.6.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.5.1
+        version: 3.6.1
 - !ruby/object:Gem::Dependency
   name: gem-release
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: 2.2.4
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: 2.2.4
 - !ruby/object:Gem::Dependency
   name: puma
   requirement: !ruby/object:Gem::Requirement
@@ -642,14 +670,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2.1
+        version: 1.3.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2.1
+        version: 1.3.0
 - !ruby/object:Gem::Dependency
   name: rspec-collection_matchers
   requirement: !ruby/object:Gem::Requirement
@@ -762,6 +790,46 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.5'
+- !ruby/object:Gem::Dependency
+  name: better_errors
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.10'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.10.1
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.10'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.10.1
+- !ruby/object:Gem::Dependency
+  name: binding_of_caller
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.0.1
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.0.1
 description: Koalagator is an open source community calendaring platform
 email:
 - info@calagator.org
@@ -835,6 +903,7 @@ files:
 - app/assets/stylesheets/calagator/typography.scss
 - app/assets/stylesheets/calagator/utils.scss
 - app/assets/stylesheets/calagator/variables.scss
+- app/controllers/calagator/admin/bulk_imports_controller.rb
 - app/controllers/calagator/admin/curations_controller.rb
 - app/controllers/calagator/admin/users_controller.rb
 - app/controllers/calagator/admin_controller.rb
@@ -863,6 +932,7 @@ files:
 - app/javascript/calagator/calendar/lib/components.js
 - app/javascript/calagator/calendar/lib/utils.js
 - app/models/calagator/application_record.rb
+- app/models/calagator/bulk_import.rb
 - app/models/calagator/curation.rb
 - app/models/calagator/event.rb
 - app/models/calagator/event/browse.rb
@@ -888,6 +958,7 @@ files:
 - app/models/calagator/venue/search_engine/sql.rb
 - app/models/concerns/calagator/event_filterable.rb
 - app/observers/calagator/cache_observer.rb
+- app/views/calagator/admin/bulk_imports/new.html.erb
 - app/views/calagator/admin/curations/_form.html.erb
 - app/views/calagator/admin/curations/_index.html.erb
 - app/views/calagator/admin/curations/edit.html.erb
@@ -913,6 +984,8 @@ files:
 - app/views/calagator/events/_subnav.html.erb
 - app/views/calagator/events/_subnav_custom.html.erb
 - app/views/calagator/events/_table.html.erb
+- app/views/calagator/events/_tabular.html.erb
+- app/views/calagator/events/_tabular_table.html.erb
 - app/views/calagator/events/duplicates.html.erb
 - app/views/calagator/events/edit.html.erb
 - app/views/calagator/events/index.atom.builder
@@ -921,6 +994,7 @@ files:
 - app/views/calagator/events/new.html.erb
 - app/views/calagator/events/search.html.erb
 - app/views/calagator/events/show.html.erb
+- app/views/calagator/events/tabular.html.erb
 - app/views/calagator/shared/_calendar.html.erb
 - app/views/calagator/shared/_subnav_curations.html.erb
 - app/views/calagator/shared/_subnav_pinned_venues.html.erb
@@ -1031,6 +1105,7 @@ files:
 - lib/calagator/duplicate_checking/duplicate_finder.rb
 - lib/calagator/duplicate_checking/duplicate_squasher.rb
 - lib/calagator/engine.rb
+- lib/calagator/import_events_csv.rb
 - lib/calagator/machine_tag.rb
 - lib/calagator/strip_whitespace.rb
 - lib/calagator/url_prefixer.rb
@@ -1080,14 +1155,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.6.0
+      version: 3.1.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.3
+rubygems_version: 3.5.22
 signing_key:
 specification_version: 4
 summary: A calendar for communities