koalagator 4.1.0 → 5.0.0

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

@@ -0,0 +1,79 @@
+# frozen_string_literal: true
+
+module Calagator
+  module Admin
+    class UsersController < Calagator::ApplicationController
+      require_admin
+      before_action :set_user, only: %i[invite show edit update destroy]
+
+      def index
+        @users = User.order(created_at: :desc).paginate(page: params[:page])
+      end
+
+      def new
+        @user = User.new
+      end
+
+      def show
+      end
+
+      def create
+        @user = User.new(user_params)
+        temp_pass = SecureRandom.base36
+        @user.password = temp_pass
+        @user.password_confirmation = temp_pass
+
+        respond_to do |format|
+          if @user.save
+            token = @user.send_reset_password_instructions
+            format.html {
+              redirect_to admin_user_invite_path(@user, token: token), notice: "Successfully created user."
+            }
+          else
+            format.html { render :new, status: :unprocessable_entity }
+          end
+        end
+      end
+
+      def edit
+      end
+
+      def update
+        respond_to do |format|
+          if @user.update(user_params)
+            format.html { redirect_to admin_users_path, notice: "Successfully updated user." }
+          else
+            format.html { render :edit, status: :unprocessable_entity }
+          end
+        end
+      end
+
+      def destroy
+        respond_to do |format|
+          if @user.admin? || @user == current_user
+            format.html { redirect_to admin_users_path, notice: "Cannot delete an admin." }
+          else
+            @user.destroy
+            format.html { redirect_to admin_users_path, notice: "Successfully destroyed user." }
+          end
+        end
+      end
+
+      def invite
+        redirect_to admin_users_path unless params[:token].present?
+      end
+
+      private
+
+      def user_params
+        params.require(:user).permit(:email, :name, :display_name, :admin)
+      end
+
+      def set_user
+        @user = User.find(params[:user_id] || params[:id])
+      rescue ActiveRecord::RecordNotFound
+        redirect_to admin_users_path
+      end
+    end
+  end
+end

data/app/controllers/calagator/application_controller.rb

@@ -4,7 +4,7 @@
 # Likewise, all the methods added will be available for all controllers.
 
 module Calagator
-  class ApplicationController < ActionController::Base
+  class ApplicationController < ::ApplicationController
     helper Calagator::EventsHelper
     helper Calagator::ApplicationHelper
     helper Calagator::EventsHelper
@@ -33,7 +33,8 @@ module Calagator
     end
 
     def self.require_admin(options = {})
-     return false unless Calagator.admin_username && Calagator.admin_password
+      return devise_require_admin(options) if Calagator.devise_enabled
+      return false unless Calagator.admin_username && Calagator.admin_password
       http_basic_authenticate_with(
         **options.reverse_merge(
           name: Calagator.admin_username,
@@ -43,6 +44,28 @@ module Calagator
     end
     private_class_method :require_admin
 
+    def self.authorize_resource(resource, options = {})
+      return false unless Calagator.devise_enabled
+      resource = resource.to_s.to_sym
+      return devise_require_admin(options) if Calagator.admin_resources.include?(resource)
+      before_action(:authenticate_user!, **options) if Calagator.user_resources.include?(resource)
+    end
+    private_class_method :authorize_resource
+
+    def self.devise_require_admin(options = {})
+      return false unless Calagator.devise_enabled
+      before_action :authenticate_user!, **options
+      before_action -> {
+        render status: 403, html: "403: Access Denied" unless current_user&.admin?
+      }, **options
+    end
+    private_class_method :devise_require_admin
+
+    def self.nav_section(section, options = {})
+      before_action -> { @nav_section = section }, **options
+    end
+    private_class_method :nav_section
+
     #---[ Helpers ]---------------------------------------------------------
 
     # Returns a data structure used for telling the CSS menu which part of the
@@ -50,10 +73,11 @@ module Calagator
     # and their values are either "active" or nil.
     def link_class
       @_link_class_cache ||= {
-        events: ((controller_name == "events" ||
+        events: (controller_name == "events" ||
                       controller_name == "sources" ||
-                      controller_name == "site") && "active"),
-        venues: (controller_name == "venues" && "active")
+                      controller_name == "site" ||
+                      controller_name == "curations") && "active",
+        venues: controller_name == "venues" && "active"
       }
     end
     helper_method :link_class

data/app/controllers/calagator/curations_controller.rb

@@ -0,0 +1,32 @@
+# frozen_string_literal: true
+
+module Calagator
+  class CurationsController < Calagator::ApplicationController
+    before_action :set_curation, only: %i[show]
+
+    def show
+      @browse = Event::Browse.new(params, @curation.events)
+      @events = @browse.events
+      @browse.errors.each { |error| append_flash :failure, error }
+      render_events @events
+    end
+
+    private
+
+    def set_curation
+      @curation = Curation.find_by_name(params[:id])
+      redirect_to root_path unless @curation.present?
+    end
+
+    def render_events(events)
+      respond_to do |format|
+        format.html # *.html.erb
+        format.kml  # *.kml.erb
+        format.ics { render ics: events || Event.future.non_duplicates }
+        format.atom { render template: "calagator/events/index" }
+        format.xml { render xml: events.to_xml(root: "events", include: :venue) }
+        format.json { render json: events.to_json(include: :venue) }
+      end
+    end
+  end
+end

data/app/controllers/calagator/events_controller.rb

@@ -10,8 +10,11 @@ module Calagator
     include Calagator::DuplicateChecking::ControllerActions
     require_admin only: %i[duplicates squash_many_duplicates]
 
+    authorize_resource :events, only: %i[new edit create update destroy clone]
     before_action :find_and_redirect_if_locked, only: %i[edit update destroy]
 
+    nav_section :events
+
     # GET /events
     # GET /events.xml
     def index
@@ -46,6 +49,9 @@ module Calagator
     # POST /events.xml
     def create
       @event = Event.new
+      if Calagator.devise_enabled && current_user.present?
+        @event.created_by = current_user
+      end
       create_or_update
     end
 

data/app/controllers/calagator/paper_trail_manager_controller.rb

@@ -0,0 +1,5 @@
+module Calagator
+  class PaperTrailManagerController < ApplicationController
+    authorize_resource :changes
+  end
+end

data/app/controllers/calagator/passwords_controller.rb

@@ -0,0 +1,4 @@
+module Calagator
+  class PasswordsController < Devise::PasswordsController
+  end
+end

data/app/controllers/calagator/registrations_controller.rb

@@ -0,0 +1,5 @@
+module Calagator
+  class RegistrationsController < Devise::RegistrationsController
+    before_action -> { devise_parameter_sanitizer.permit(:sign_up, keys: %i[name]) }, only: :create
+  end
+end

data/app/controllers/calagator/sessions_controller.rb

@@ -0,0 +1,4 @@
+module Calagator
+  class SessionsController < Devise::SessionsController
+  end
+end

data/app/controllers/calagator/site_controller.rb

@@ -3,6 +3,9 @@
 module Calagator
   class SiteController < Calagator::ApplicationController
     # Raise exception, mostly for confirming that exception_notification works
+
+    nav_section :about, only: :about
+
     def omfg
       raise ArgumentError, "OMFG"
     end
@@ -12,6 +15,10 @@ module Calagator
       render plain: "hello"
     end
 
+    def embed
+      render layout: "calagator/embed"
+    end
+
     def index
       @overview = Event::Overview.new
       respond_to do |format|
@@ -34,5 +41,8 @@ module Calagator
       @url = params[:url]
       raise ArgumentError if /^javascript:/.match?(@url)
     end
+
+    def closed_registrations
+    end
   end
 end

data/app/controllers/calagator/sources_controller.rb

@@ -2,6 +2,8 @@
 
 module Calagator
   class SourcesController < Calagator::ApplicationController
+    authorize_resource :events, only: %i[new edit create update destroy]
+
     # POST /import
     # POST /import.xml
     def import

data/app/controllers/calagator/venues_controller.rb

@@ -8,6 +8,10 @@ module Calagator
     include DuplicateChecking::ControllerActions
     require_admin only: %i[duplicates squash_many_duplicates]
 
+    authorize_resource :venues, only: %i[new edit create update destroy]
+
+    nav_section :venues
+
     def venue
       @venue ||= params[:id] ? Venue.find(params[:id]) : Venue.new
     end
@@ -63,7 +67,7 @@ module Calagator
       private
 
       def show_all_if_not_found
-        return if venue
+        nil if venue
       rescue ActiveRecord::RecordNotFound => e
         redirect_to venues_path, flash: {failure: e.to_s}
       end

data/app/controllers/calagator/versions_controller.rb

@@ -8,7 +8,7 @@ module Calagator
 
       singular = @record.class.name.singularize.underscore.split("/").last
       plural = @record.class.name.pluralize.underscore.split("/").last
-      instance_variable_set("@#{singular}", @record)
+      instance_variable_set(:"@#{singular}", @record)
 
       if request.xhr?
         render partial: "calagator/#{plural}/form", locals: {singular.to_sym => @record}

data/app/controllers/paper_trail_manager/changes_controller.rb

@@ -15,11 +15,11 @@ class PaperTrailManager
     # List changes
     def index
       unless change_index_allowed?
-        flash[:error] = 'You do not have permission to list changes.'
+        flash[:error] = "You do not have permission to list changes."
         return(redirect_to root_url)
       end
 
-      @versions = PaperTrail::Version.order('created_at DESC, id DESC')
+      @versions = PaperTrail::Version.order("created_at DESC, id DESC")
       @versions = @versions.where(item_type: params[:type]) if params[:type]
       @versions = @versions.where(item_id: params[:id]) if params[:id]
 
@@ -31,10 +31,10 @@ class PaperTrailManager
       @per_page = nil if @per_page.zero?
 
       @versions = if defined?(WillPaginate)
-                    @versions.paginate(page: @page, per_page: @per_page)
-                  else
-                    @versions.page(@page).per(@per_page)
-                  end
+        @versions.paginate(page: @page, per_page: @per_page)
+      else
+        @versions.page(@page).per(@per_page)
+      end
 
       respond_to do |format|
         format.html # index.html.erb
@@ -48,12 +48,12 @@ class PaperTrailManager
       begin
         @version = PaperTrail::Version.find(params[:id])
       rescue ActiveRecord::RecordNotFound
-        flash[:error] = 'No such version.'
+        flash[:error] = "No such version."
         return(redirect_to action: :index)
       end
 
       unless change_show_allowed?(@version)
-        flash[:error] = 'You do not have permission to show that change.'
+        flash[:error] = "You do not have permission to show that change."
         return(redirect_to action: :index)
       end
 
@@ -68,16 +68,16 @@ class PaperTrailManager
       begin
         @version = PaperTrail::Version.find(params[:id])
       rescue ActiveRecord::RecordNotFound
-        flash[:error] = 'No such version.'
+        flash[:error] = "No such version."
         return(redirect_to(changes_path))
       end
 
       unless change_revert_allowed?(@version)
-        flash[:error] = 'You do not have permission to revert this change.'
+        flash[:error] = "You do not have permission to revert this change."
         return(redirect_to changes_path)
       end
 
-      if @version.event == 'create'
+      if @version.event == "create"
         @record = @version.item_type.constantize.find(@version.item_id)
         @result = @record.destroy
       else
@@ -86,11 +86,11 @@ class PaperTrailManager
       end
 
       if @result
-        if @version.event == 'create'
-          flash[:notice] = 'Rolled back newly-created record by destroying it.'
+        if @version.event == "create"
+          flash[:notice] = "Rolled back newly-created record by destroying it."
           redirect_to changes_path
         else
-          flash[:notice] = 'Rolled back changes to this record.'
+          flash[:notice] = "Rolled back changes to this record."
           redirect_to change_item_url(@version)
         end
       else
@@ -103,8 +103,8 @@ class PaperTrailManager
 
     # Return the URL for the item represented by the +version+, e.g. a Company record instance referenced by a version.
     def change_item_url(version)
-      version_type = version.item_type.underscore.split('/').last
-      send("#{version_type}_url", version.item_id)
+      version_type = version.item_type.underscore.split("/").last
+      send(:"#{version_type}_url", version.item_id)
     rescue NoMethodError
       nil
     end

data/app/helpers/calagator/application_helper.rb

@@ -5,6 +5,10 @@ module Calagator
   module ApplicationHelper
     include TimeRangeHelper
 
+    def distro_name
+      NAME.to_s
+    end
+
     # Returns HTML string of an event or venue description for display in a view.
     def format_description(string)
       sanitize(auto_link(upgrade_br(markdown(string))))
@@ -19,6 +23,21 @@ module Calagator
       content.gsub("<br>", "<br />")
     end
 
+    def display_username(user)
+      name = sanitize(user.name)
+      display_name = sanitize(user.display_name)
+      admin_flag = (user.admin? ? "<span title=\"Administrator\">#{Calagator.admin_icon} </span>" : nil)
+      raw "<span title=\"@#{name}\">#{admin_flag}#{display_name}</span>"
+    end
+
+    def nav_section
+      @nav_section || :root
+    end
+
+    def active_on(*sections)
+      sections.map { |c| c.to_s }.include?(nav_section.to_s) ? "active" : nil
+    end
+
     FLASH_TYPES = %i[success failure].freeze
 
     def render_flash
@@ -48,11 +67,16 @@ module Calagator
       else
         "imported from #{link_to truncate(item.source.name, length: 40), url_for(item.source)}"
       end
+      creator = if item&.created_by_id?
+        " by:<br />#{display_username(item.created_by)}"
+      elsif item&.created_by_name?
+        " by:<br />#{CGI.escapeHTML(item.created_by_name)}"
+      end
       created = " <br /><strong>#{normalize_time(item.created_at, format: :html)}</strong>"
       updated = if item.updated_at > item.created_at
         " and last updated <br /><strong>#{normalize_time(item.updated_at, format: :html)}</strong>"
       end
-      raw "This item was #{source}#{created}#{updated}."
+      raw "This item was #{source}#{creator}#{created}#{updated}."
     end
 
     # Caches +block+ in view only if the +condition+ is true.
@@ -65,10 +89,15 @@ module Calagator
       end
     end
 
-    def subnav_class_for(controller_name, action_name)
+    def subnav_class_for(controller_name, action_name, id_name = nil)
+      id_fail = false
+      if id_name.present?
+        id_fail = (id_name != params[:id])
+      end
+
       css_class = "#{controller.controller_name}_#{controller.action_name}_subnav"
       if [controller.controller_name, controller.action_name] == [controller_name, action_name]
-        css_class += " active"
+        css_class += " active" unless id_fail
       end
       css_class
     end

data/app/helpers/calagator/time_range_helper.rb

@@ -155,7 +155,7 @@ module Calagator
 
       def text
         part.parts.reduce("") do |string, (key, value)|
-          prefix = (PREFIXES[[@last_key, key]] || PREFIXES[key])
+          prefix = PREFIXES[[@last_key, key]] || PREFIXES[key]
           suffix = SUFFIXES[key]
           @last_key = key
           "#{string}#{prefix}#{value}#{suffix}"

data/app/helpers/paper_trail_manager/changes_helper.rb

@@ -5,7 +5,7 @@ class PaperTrailManager
     # Return HTML representing the +object+, which is either its text or a stylized "nil".
     def text_or_nil(object)
       if object.nil?
-        content_tag('em', 'nil')
+        content_tag("em", "nil")
       else
         h(object)
       end
@@ -28,18 +28,18 @@ class PaperTrailManager
     #   }
     def changes_for(version)
       case version.event
-      when 'create', 'update'
+      when "create", "update"
         return {} unless version.changeset
 
         version.changeset.inject({}) do |changes, (attr, (prev, curr))|
-          changes.store(attr, { previous: prev, current: curr }) && changes
+          changes.store(attr, {previous: prev, current: curr}) && changes
         end
-      when 'destroy'
+      when "destroy"
         record = version_reify(version)
         return {} unless record
 
         record.attributes.reject { |_k, v| v.nil? }.inject({}) do |changes, (attr, value)|
-          changes.store(attr, { previous: value, current: nil }) && changes
+          changes.store(attr, {previous: value, current: nil}) && changes
         end
       else
         raise ArgumentError, "Unknown event: #{version.event}"
@@ -67,9 +67,9 @@ class PaperTrailManager
     # Returns HTML link for the item stored in the version, e.g. a link to a Company record stored in the version.
     def change_item_link(version)
       if (url = change_item_url(version))
-        link_to(change_title_for(version), url, class: 'change_item')
+        link_to(change_title_for(version), url, class: "change_item")
       else
-        content_tag(:span, change_title_for(version), class: 'change_item')
+        content_tag(:span, change_title_for(version), class: "change_item")
       end
     end
 

data/app/javascript/calagator/calendar/calendar.js

@@ -0,0 +1,82 @@
+import {CalendarEvent} from 'calendar/event'
+import {BaseComponent} from 'calendar/lib/components'
+import ICAL from "ical.js";
+import EventCalendar from "@event-calendar/core"
+import ListView from "@event-calendar/list"
+import DayGrid from "@event-calendar/day-grid"
+
+class Calendar extends BaseComponent {
+  static validViews = ["dayGridMonth", "listMonth"]
+  static {
+    this.observe("src", "view")
+  }
+
+  calendar
+
+  constructor() {
+    super()
+
+    this.calendar = this._setupCalendar()
+  }
+
+  onSrcChanged(_, value) { this._loadICAL(value) }
+
+  onViewChanged(_, value) {
+    if (!Calendar.validViews.includes(value)) {
+      this.setAttribute('view', validViews[0])
+      return
+    }
+    this.calendar.setOption('view', value)
+  }
+
+  _loadICAL(source) {
+    if (source == "") { return; }
+    const calendar = this.calendar;
+
+    fetch(source)
+      .then(r => r.text())
+      .then(text => this._parseICAL(calendar, text))
+  }
+
+  _parseICAL(calendar, rawText) {
+    const jCal = ICAL.parse(rawText)
+    const parser = new ICAL.ComponentParser
+  
+    const events = []
+    parser.onevent = (event) => {
+      events.push(
+        {
+          id: event.uid,
+          start: event.startDate.toJSDate(),
+          end: event.endDate.toJSDate(),
+          title: event.summary,
+          color: event.color || "#59a12d",
+          editable: false,
+          extendedProps: event
+        }
+      )
+    };
+    
+    parser.oncomplete = () => {
+      calendar.setOption("events", events)
+    }
+    parser.process(jCal)
+  }
+
+  _setupCalendar() {
+    return new EventCalendar({
+      target: this,
+      props: {
+        plugins: [ListView, DayGrid],
+        options: {
+          view: "dayGridMonth",
+          events: [],
+          firstDay: 1,
+          eventContent: info => { return {domNodes: [new CalendarEvent(info.event)]} }
+        }
+      }
+    })
+  }
+}
+
+window.customElements.define("events-calendar", Calendar)

data/app/javascript/calagator/calendar/event.js

@@ -0,0 +1,94 @@
+class CalendarEvent extends HTMLElement {
+  constructor(event) {
+    super()
+    this._setupDom(event)
+  }
+
+  _setupDom(event) {
+    console.log(event)
+    const body = createElement("div", "event-body")
+    const title = createElement("h4", "event-title")
+    const detailsContainer = createElement("div", "event-details-container")
+    const detailsArrow = createElement("div", "event-details-arrow")
+    
+    title.innerText = event.title
+    
+    detailsArrow.append(this._createDetails(event))
+    detailsContainer.append(detailsArrow)
+    
+    body.append(this._createTimeLabel(event.start, event.end))
+    body.append(title)
+    this.append(body)
+    this.append(detailsContainer)
+
+    document.addEventListener("click", () => {
+      if (this.matches(":hover")) {
+        this.setAttribute("open", "")
+      } else {
+        this.removeAttribute("open")
+      }
+    })
+  }
+
+  _createTimeLabel(start, end) {
+    const time = createElement("time", "event-time")
+    time.setAttribute("datetime", start.toISOString())
+
+    let innerText = start.toLocaleTimeString(undefined, {timeStyle: "short"})
+    if (end) {
+      innerText += " - " + end.toLocaleTimeString(undefined, {timeStyle: "short"})
+    }
+    
+    time.innerText = innerText
+    return time
+  }
+
+  _createDetails(event) {
+    const details = createElement("div", "event-details")
+    const header = createElement("h4")
+    const description = createElement("div", "event-description")
+    const link = createElement("a")
+    
+    header.innerText = event.title
+    link.setAttribute("href", event.id)
+    link.setAttribute("target", "_blank")
+    link.innerText = "View Event"
+
+    details.append(header)
+
+    if (event.extendedProps.location) {
+      const address = createElement("address")
+      const addr = event.extendedProps.location.replaceAll("
", "")
+      address.innerText = addr;
+
+      details.append(address)
+    }
+
+    if (event.extendedProps.description) {
+      const desc = event.extendedProps.description.replaceAll("
", "").split("\n")
+      desc.forEach(line => {
+        if (line == "") { return }
+        const p = document.createElement("p")
+        p.innerText = line
+        description.append(p)
+      })
+    }
+
+    details.append(description)
+    details.append(link)
+
+    return details
+  }
+}
+
+function createElement(element, ...classes) {
+  const instance = document.createElement(element)
+  if (classes.length > 0) {
+    instance.classList.add(classes)
+  }
+  return instance
+}
+
+window.customElements.define("calendar-event", CalendarEvent)
+
+export {CalendarEvent}