koalagator 4.0.0 → 5.0.0

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

@@ -0,0 +1,120 @@
+import { Optional, toTitleCase } from "calendar/lib/utils"
+
+class BaseComponent extends HTMLElement {
+  static observe(...attr) {
+    this._attrSet = (this._attrSet || new Set)
+    attr.forEach(e => {this._attrSet.add(e)})
+    this.observedAttributes = Array.from(this._attrSet)
+  }
+
+  constructor() {
+    super()
+  }
+
+  attributeChangedCallback(name, oldValue, newValue) {
+    const callback = `on${toTitleCase(name)}Changed`
+    if (typeof this[callback] == "function") {
+      this[callback](oldValue, newValue)
+    }
+  }
+
+  emit(name, data) {
+    this.dispatchEvent(new CustomEvent(name, {detail: data}))
+  }
+
+  on(name, callback) {
+    this.addEventListener(name, callback)
+  }
+}
+
+class SelectComponent extends BaseComponent {
+  constructor() {
+    super()
+  }
+
+  _children = new Set
+  selected = new Set
+
+  select(child) {
+    child.setAttribute("selected", true)
+  }
+
+  deselect(child) {
+    child.removeAttribute("selected")
+  }
+
+  _select(child) {
+    this.selected.add(child)
+    this.emit("child-selected", child)
+  }
+
+  _deselect(child) {
+    this.selected.delete(child)
+    this.emit("child-deselected", child)
+  }
+
+  _registerChild(child) {
+    this._children.add(child)
+  }
+  _removeChild(child) {
+    this._children.delete(child)
+  }
+}
+
+class SingleSelectComponent extends SelectComponent {
+  constructor() {
+    super()
+  }
+
+  selected = Optional.empty()
+
+  _select(selected) {
+    this.selected = Optional.of(selected)
+    this._children.forEach(child => {
+      if (child == selected) { return }
+      this.deselect(child)
+    })
+    this.emit("child-selected", selected)
+  }
+
+  _deselect(child) {
+    if (child == this.selected.get()) {
+      this.selected = Optional.empty()
+    }
+    this.emit("child-deselected", child)
+  }
+}
+
+class OptionComponent extends BaseComponent {
+  static {
+    this.observe("selected")
+  }
+  constructor(parentType) {
+    super()
+    const parent = this.closest(parentType)
+    this.parent = Optional.try(parent instanceof SelectComponent, parent)
+    this.parent.ifPresent(p => { p._registerChild(this) })
+  }
+  selected = false
+
+  onSelectedChanged(_, value) {
+    this.selected = (value == null ? false : true)
+    if (value) {
+      this.parent.ifPresent(p => { p._select(this) })
+      this.emit("selected", {})
+    } else {
+      this.parent.ifPresent(p => { p._deselect(this) })
+      this.emit("deselected", {})
+    }
+  }
+
+  select() {
+    this.setAttribute("selected", true)
+  }
+
+  deselect() {
+    this.removeAttribute("selected")
+  }
+}
+
+export { BaseComponent, SelectComponent, SingleSelectComponent, OptionComponent }

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

@@ -0,0 +1,67 @@
+function toTitleCase(str) {
+  return str.replace(
+    /\w\S*/g,
+    text => text.charAt(0).toUpperCase() + text.substring(1).toLowerCase()
+  );
+}
+
+class Optional {
+  static empty() {
+    return new this(null)
+  }
+
+  static of(value) {
+    return new this(value)
+  }
+
+  static try(condition, value) {
+    if (condition) {
+      return this.of(value)
+    } else {
+      return this.empty()
+    }
+  }
+
+  constructor(value) {
+    if (value != undefined) {
+      this.#value = value
+    }
+  }
+  #value = null
+
+  isPresent() {
+    return !(this.#value === null)
+  }
+
+  get() {
+    return this.#value
+  }
+
+  ifPresent(callback) {
+    if (!this.isPresent()) { return }
+    callback(this.#value)
+  }
+
+  unlessPresent(callback) {
+    if (this.isPresent()) { return }
+    callback()
+  }
+
+  orElse(value) {
+    if (this.isPresent()) {
+      return this.#value
+    } else {
+      return value
+    }
+  }
+
+  orElseGet(callback) {
+    if (this.isPresent()) {
+      return this.#value
+    } else {
+      return callback()
+    }
+  }
+}
+
+export { Optional, toTitleCase }

data/app/models/calagator/curation.rb

@@ -0,0 +1,32 @@
+# == Schema Information
+#
+# Table name: calagator_curations
+#
+#  id           :integer          not null, primary key
+#  description  :string
+#  display_name :string
+#  name         :string           not null
+#  priority     :integer          default(0), not null
+#  unlisted     :boolean          default(FALSE), not null
+#  created_at   :datetime         not null
+#  updated_at   :datetime         not null
+#
+# Indexes
+#
+#  index_calagator_curations_on_name  (name) UNIQUE
+#
+module Calagator
+  class Curation < Calagator::ApplicationRecord
+    include EventFilterable
+    scope :listed, -> { where(unlisted: false) }
+
+    validates :name, :display_name, :priority, presence: true
+    validates :name,
+      format: {with: /\A[a-z0-9\-_]+\z/, message: "only allows ASCII letters, numbers, dashes and underscores"},
+      uniqueness: true,
+      length: {maximum: 64}
+
+    scope :order_by_priority, ->(direction = :desc) { order(priority: direction) }
+    scope :listed, ->(listed = true) { where(unlisted: !listed) }
+  end
+end

data/app/models/calagator/event/browse.rb

@@ -3,10 +3,11 @@
 module Calagator
   class Event < Calagator::ApplicationRecord
     class Browse < Struct.new(:order, :date, :time)
-      def initialize(attributes = {})
+      def initialize(attributes = {}, scope = nil)
         members.each do |key|
-          send "#{key}=", attributes[key]
+          send :"#{key}=", attributes[key]
         end
+        @scope = scope
       end
 
       def events

data/app/models/calagator/event/cloner.rb

@@ -15,7 +15,7 @@ module Calagator
       def clone
         clone = Event.new
         ATTRIBUTES.each do |attribute|
-          clone.send "#{attribute}=", event.send(attribute)
+          clone.send :"#{attribute}=", event.send(attribute)
         end
         if event.start_time
           clone.start_time = clone_time_for_today(event.start_time)

data/app/models/calagator/event/ical_renderer.rb

@@ -25,7 +25,7 @@ module Calagator
 
       def self.render_icalendar(events, opts)
         cal = RiCal.Calendar do |calendar|
-          calendar.prodid = "-//Calagator//EN"
+          calendar.prodid = "-//#{Calagator::NAME}//EN"
 
           Array(events).each do |event|
             calendar.event do |entry|

data/app/models/calagator/event/overview.rb

@@ -20,7 +20,9 @@ module Calagator
       end
 
       def tags
-        @tags ||= Event.tag_counts_on(:tags, limit: 100, conditions: "tags_count >= 10").sort_by(&:name)
+        @tags ||= Event.tag_counts_on(
+          :tags, limit: 100, conditions: "tags_count >= #{Calagator.tag_cloud_min}"
+        ).sort_by(&:name)
       end
 
       private

data/app/models/calagator/event/saver.rb

@@ -25,7 +25,12 @@ module Calagator
         if params[:event] && params[:event][:venue_id].present?
           Venue.find(params[:event][:venue_id]).originator
         else
-          Venue.find_or_initialize_by(title: params[:venue_name]).originator
+          venue = Venue.find_or_initialize_by(title: params[:venue_name]).originator
+          # Set the created_by to match the event, if creating the venue.
+          if event.created_by_id? && !venue.id?
+            venue.created_by = event.created_by
+          end
+          venue
         end
       end
 

data/app/models/calagator/event/search.rb

@@ -5,7 +5,7 @@ module Calagator
     class Search < Struct.new(:query, :tag, :order, :current)
       def initialize(attributes = {})
         members.each do |key|
-          send "#{key}=", attributes[key]
+          send :"#{key}=", attributes[key]
         end
         self.order ||= "date"
         validate!

data/app/models/calagator/event/search_engine.rb

@@ -21,7 +21,7 @@ module Calagator
       private_class_method
 
       def self.search_engine
-        (kind == :sunspot) ? ApacheSunspot : Sql
+        Sql
       end
     end
   end

data/app/models/calagator/event.rb

@@ -5,6 +5,7 @@
 # Table name: events
 #
 #  id              :integer          not null, primary key
+#  created_by_name :string
 #  description     :text
 #  end_time        :datetime
 #  locked          :boolean          default(FALSE)
@@ -15,10 +16,19 @@
 #  venue_details   :text
 #  created_at      :datetime
 #  updated_at      :datetime
+#  created_by_id   :integer
 #  duplicate_of_id :integer
 #  source_id       :integer
 #  venue_id        :integer
 #
+# Indexes
+#
+#  index_events_on_created_by_id  (created_by_id)
+#
+# Foreign Keys
+#
+#  created_by_id  (created_by_id => calagator_users.id)
+#
 
 require "calagator/denylist_validator"
 require "calagator/duplicate_checking"
@@ -49,6 +59,7 @@ module Calagator
     include ActiveModel::Serializers::Xml
 
     # Associations
+    belongs_to :created_by, class_name: "Calagator::User", optional: true
     belongs_to :venue, counter_cache: true, optional: true
     belongs_to :source, optional: true
 
@@ -60,6 +71,7 @@ module Calagator
       format: {with: %r{\Ahttps?://(\w+:?\w*@)?(\S+)(:[0-9]+)?(/|/([\w#!:.?+=&%@\-/]))?\Z},
                allow_blank: true}
 
+    before_save :set_created_by_name, if: :created_by_id?
     before_destroy :check_if_locked_before_destroy # prevent locked events from being destroyed
 
     # Duplicates
@@ -105,25 +117,25 @@ module Calagator
     #---[ Overrides ]-------------------------------------------------------
 
     def url=(value)
-      super UrlPrefixer.prefix(value)
+      super(UrlPrefixer.prefix(value))
     end
 
     # Set the start_time to the given +value+, which could be a Time, Date,
     # DateTime, String, Array of Strings, or nil.
     def start_time=(value)
-      super time_for(value)
+      super(time_for(value))
     rescue ArgumentError
       errors.add :start_time, "is invalid"
-      super nil
+      super(nil)
     end
 
     # Set the end_time to the given +value+, which could be a Time, Date,
     # DateTime, String, Array of Strings, or nil.
     def end_time=(value)
-      super time_for(value)
+      super(time_for(value))
     rescue ArgumentError
       errors.add :end_time, "is invalid"
-      super nil
+      super(nil)
     end
 
     def time_for(value)
@@ -182,5 +194,10 @@ module Calagator
 
       (end_time - start_time)
     end
+
+    def set_created_by_name
+      self.created_by_name = created_by.name_with_email
+    end
+    private :set_created_by_name
   end
 end

data/app/models/calagator/source/parser/hcal.rb

@@ -27,7 +27,7 @@ module Calagator
           next unless hcal.respond_to?(hcal_field)
           next unless (value = decoded_field(hcal, hcal_field))
 
-          event.send "#{field}=", value
+          event.send :"#{field}=", value
         end
         event_or_duplicate(event)
       end.uniq do |event|

data/app/models/calagator/source/parser.rb

@@ -113,6 +113,6 @@ module Calagator
   end
 end
 
-require "calagator/source/parser/not_found"
-require "calagator/source/parser/ical"
-require "calagator/source/parser/hcal"
+require_relative "parser/not_found"
+require_relative "parser/ical"
+require_relative "parser/hcal"

data/app/models/calagator/source.rb

@@ -4,12 +4,22 @@
 #
 # Table name: sources
 #
-#  id          :integer          not null, primary key
-#  imported_at :datetime
-#  title       :string
-#  url         :string
-#  created_at  :datetime
-#  updated_at  :datetime
+#  id              :integer          not null, primary key
+#  created_by_name :string
+#  imported_at     :datetime
+#  title           :string
+#  url             :string
+#  created_at      :datetime
+#  updated_at      :datetime
+#  created_by_id   :integer
+#
+# Indexes
+#
+#  index_sources_on_created_by_id  (created_by_id)
+#
+# Foreign Keys
+#
+#  created_by_id  (created_by_id => calagator_users.id)
 #
 
 # == Source
@@ -26,11 +36,14 @@ module Calagator
 
     validate :assert_url
 
+    belongs_to :created_by, class_name: "Calagator::User", optional: true
     has_many :events, dependent: :destroy
     has_many :venues, dependent: :destroy
 
     scope :listing, -> { order("created_at DESC") }
 
+    before_save :set_created_by_name, if: :created_by_id?
+
     has_paper_trail
 
     xss_foliate
@@ -76,5 +89,9 @@ module Calagator
       errors.add :url, "has invalid format"
       false
     end
+
+    def set_created_by_name
+      self.created_by_name = created_by.name_with_email
+    end
   end
 end

data/app/models/calagator/user.rb

@@ -0,0 +1,50 @@
+# == Schema Information
+#
+# Table name: calagator_users
+#
+#  id                     :integer          not null, primary key
+#  admin                  :boolean
+#  display_name           :string
+#  email                  :string           default(""), not null
+#  encrypted_password     :string           default(""), not null
+#  name                   :string           not null
+#  remember_created_at    :datetime
+#  reset_password_sent_at :datetime
+#  reset_password_token   :string
+#  created_at             :datetime         not null
+#  updated_at             :datetime         not null
+#
+# Indexes
+#
+#  index_calagator_users_on_email                 (email) UNIQUE
+#  index_calagator_users_on_name                  (name) UNIQUE
+#  index_calagator_users_on_reset_password_token  (reset_password_token) UNIQUE
+#
+module Calagator
+  class User < ApplicationRecord
+    if Calagator.devise_enabled
+      # Include default devise modules. Others available are:
+      # :confirmable, :lockable, :timeoutable, :trackable and :omniauthable
+      devise :database_authenticatable, :registerable, :recoverable, :rememberable, :validatable
+    end
+
+    scope :admin, -> { where(admin: true) }
+    validates :name, :email, presence: true
+    validates :name, format: {with: /\A[a-z0-9\-_]+\z/, message: "only allows ASCII letters, numbers, dashes and underscores"}
+
+    has_many :events, foreign_key: :created_by_id, dependent: :nullify
+    has_many :venues, foreign_key: :created_by_id, dependent: :nullify
+    has_many :sources, foreign_key: :created_by_id, dependent: :nullify
+
+    before_validation -> { name&.downcase! }, on: :create
+
+    def display_name
+      attribute = read_attribute(:display_name)
+      attribute.present? ? attribute : name
+    end
+
+    def name_with_email
+      "@#{name} <#{email}>"
+    end
+  end
+end

data/app/models/calagator/venue/geocoder.rb

@@ -45,7 +45,7 @@ module Calagator
       def should_geocode?
         [
           perform_geocoding,
-          (venue.location.blank? || venue.force_geocoding == "1"),
+          venue.location.blank? || venue.force_geocoding == "1",
           venue.geocode_address.present?,
           venue.duplicate_of.blank?
         ].all?

data/app/models/calagator/venue/search.rb

@@ -5,7 +5,7 @@ module Calagator
     class Search < Struct.new(:tag, :query, :wifi, :all, :closed, :include_closed)
       def initialize(attributes = {})
         members.each do |key|
-          send "#{key}=", attributes[key]
+          send :"#{key}=", attributes[key]
         end
       end
 

data/app/models/calagator/venue/search_engine.rb

@@ -17,7 +17,7 @@ module Calagator
       private_class_method
 
       def self.search_engine
-        (kind == :sunspot) ? ApacheSunspot : Sql
+        Sql
       end
     end
   end

data/app/models/calagator/venue.rb

@@ -9,12 +9,14 @@
 #  address         :string
 #  closed          :boolean          default(FALSE)
 #  country         :string
+#  created_by_name :string
 #  description     :text
 #  email           :string
 #  events_count    :integer
 #  latitude        :decimal(7, 4)
 #  locality        :string
 #  longitude       :decimal(7, 4)
+#  pinned          :boolean          default(FALSE), not null
 #  postal_code     :string
 #  region          :string
 #  street_address  :string
@@ -24,9 +26,18 @@
 #  wifi            :boolean          default(FALSE)
 #  created_at      :datetime
 #  updated_at      :datetime
+#  created_by_id   :integer
 #  duplicate_of_id :integer
 #  source_id       :integer
 #
+# Indexes
+#
+#  index_venues_on_created_by_id  (created_by_id)
+#
+# Foreign Keys
+#
+#  created_by_id  (created_by_id => calagator_users.id)
+#
 require "calagator/decode_html_entities_hack"
 require "calagator/strip_whitespace"
 require "calagator/url_prefixer"
@@ -51,11 +62,13 @@ module Calagator
 
     # Associations
     has_many :events, -> { non_duplicates }, dependent: :nullify
+    belongs_to :created_by, class_name: "Calagator::User", optional: true
     belongs_to :source, optional: true
 
     # Triggers
     strip_whitespace! :title, :description, :address, :url, :street_address, :locality, :region, :postal_code, :country, :email, :telephone
     before_save :geocode!
+    before_save :set_created_by_name, if: :created_by_id?
 
     # Validations
     validates :title, presence: true
@@ -75,13 +88,14 @@ module Calagator
     scope :with_public_wifi, -> { where(wifi: true) }
     scope :in_business, -> { where(closed: false) }
     scope :out_of_business, -> { where(closed: true) }
+    scope :pinned, ->(pinned = true) { where(pinned: pinned) }
 
     def self.search(query, opts = {})
       SearchEngine.search(query, opts)
     end
 
     def url=(value)
-      super UrlPrefixer.prefix(value)
+      super(UrlPrefixer.prefix(value))
     end
 
     # Display a single line address.
@@ -112,5 +126,10 @@ module Calagator
     def update_events_count!
       update_attribute(:events_count, events.non_duplicates.count)
     end
+
+    def set_created_by_name
+      self.created_by_name = created_by.name_with_email
+    end
+    private :set_created_by_name
   end
 end

data/app/models/concerns/calagator/event_filterable.rb

@@ -0,0 +1,22 @@
+module Calagator
+  module EventFilterable
+    extend ActiveSupport::Concern
+
+    included do
+      acts_as_taggable_on :blocks, :requires, :denies, :allows
+    end
+
+    def events
+      event_list = Event.all
+      event_list.merge!(Event.tagged_with(block_list, exclude: true)) if block_list.any?
+      event_list.merge!(Event.tagged_with(require_list, any: true)) if require_list.any?
+      if deny_list.any?
+        deny = event_list.tagged_with(deny_list, exclude: true).or(
+          event_list.tagged_with(allow_list, any: true).except(:select, :order)
+        )
+        event_list.merge!(deny)
+      end
+      event_list
+    end
+  end
+end