koalagator 2.0.0 → 2.1.1

data/app/models/calagator/event.rb

@@ -20,16 +20,16 @@
 #  venue_id        :integer
 #
 
-require 'calagator/denylist_validator'
-require 'calagator/duplicate_checking'
-require 'calagator/decode_html_entities_hack'
-require 'calagator/strip_whitespace'
-require 'calagator/url_prefixer'
-require 'paper_trail'
-require 'loofah-activerecord'
-require 'loofah/activerecord/xss_foliate'
-require 'active_model/sequential_validator'
-require 'active_model/serializers/xml'
+require "calagator/denylist_validator"
+require "calagator/duplicate_checking"
+require "calagator/decode_html_entities_hack"
+require "calagator/strip_whitespace"
+require "calagator/url_prefixer"
+require "paper_trail"
+require "loofah-activerecord"
+require "loofah/activerecord/xss_foliate"
+require "active_model/sequential_validator"
+require "active_model/serializers/xml"
 
 # == Event
 #
@@ -37,7 +37,7 @@ require 'active_model/serializers/xml'
 
 module Calagator
   class Event < Calagator::ApplicationRecord
-    self.table_name = 'events'
+    self.table_name = "events"
     self.belongs_to_required_by_default = false
 
     has_paper_trail
@@ -57,30 +57,30 @@ module Calagator
     validates :start_time, :end_time, sequential: true
     validates :title, :start_time, presence: true
     validates :url,
-              format: { with: %r{\Ahttps?://(\w+:?\w*@)?(\S+)(:[0-9]+)?(/|/([\w#!:.?+=&%@!\-/]))?\Z},
-                        allow_blank: true }
+      format: {with: %r{\Ahttps?://(\w+:?\w*@)?(\S+)(:[0-9]+)?(/|/([\w#!:.?+=&%@\-/]))?\Z},
+               allow_blank: true}
 
     before_destroy :check_if_locked_before_destroy # prevent locked events from being destroyed
 
     # Duplicates
     include DuplicateChecking
-    duplicate_checking_ignores_attributes    :source_id, :version, :venue_id, :tag_list
+    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) }
     after_squashing_duplicates ->(primary) { primary.venue.try(:update_events_count!) }
 
     # Named scopes
     scope :after_date, lambda { |date|
-      where(['start_time >= ?', date]).order(:start_time)
+      where(["start_time >= ?", date]).order(:start_time)
     }
     scope :on_or_after_date, lambda { |date|
       time = date.beginning_of_day
-      where('(events.start_time >= :time) OR (events.end_time IS NOT NULL AND events.end_time > :time)',
-            time: time).order(:start_time)
+      where("(events.start_time >= :time) OR (events.end_time IS NOT NULL AND events.end_time > :time)",
+        time: time).order(:start_time)
     }
     scope :before_date, lambda { |date|
       time = date.beginning_of_day
-      where('start_time < :time', time: time).order(start_time: :desc)
+      where("start_time < :time", time: time).order(start_time: :desc)
     }
     scope :future, -> { on_or_after_date(Time.zone.today) }
     scope :past, -> { before_date(Time.zone.today) }
@@ -92,14 +92,14 @@ module Calagator
     # 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
-              when 'name'
-                order(Arel.sql('lower(events.title)'))
-              when 'venue'
-                includes(:venue).order(Arel.sql('lower(venues.title)')).references(:venues)
-              else
-                all
+      when "name"
+        order(Arel.sql("lower(events.title)"))
+      when "venue"
+        includes(:venue).order(Arel.sql("lower(venues.title)")).references(:venues)
+      else
+        all
       end
-      scope.order('start_time')
+      scope.order("start_time")
     }
 
     #---[ Overrides ]-------------------------------------------------------
@@ -113,7 +113,7 @@ module Calagator
     def start_time=(value)
       super time_for(value)
     rescue ArgumentError
-      errors.add :start_time, 'is invalid'
+      errors.add :start_time, "is invalid"
       super nil
     end
 
@@ -122,7 +122,7 @@ module Calagator
     def end_time=(value)
       super time_for(value)
     rescue ArgumentError
-      errors.add :end_time, 'is invalid'
+      errors.add :end_time, "is invalid"
       super nil
     end
 

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

@@ -14,7 +14,7 @@ module Calagator
 
         events.present?
       rescue Source::Parser::NotFound
-        add_error 'No events found at remote site. Is the event identifier in the URL correct?'
+        add_error "No events found at remote site. Is the event identifier in the URL correct?"
       rescue Source::Parser::HttpAuthenticationRequiredError
         add_error "Couldn't import events, remote site requires authentication."
       rescue OpenURI::HTTPError
@@ -23,7 +23,7 @@ module Calagator
         add_error "Couldn't connect to remote site."
       rescue SocketError
         add_error "Couldn't find IP address for remote site. Is the URL correct?"
-      rescue Exception => e
+      rescue => e
         add_error "Unknown error: #{e}"
       end
 
@@ -31,7 +31,7 @@ module Calagator
         if events.nil?
           "Unable to import: #{source.errors.full_messages.to_sentence}"
         else
-          'Unable to find any upcoming events to import from this source'
+          "Unable to find any upcoming events to import from this source"
         end
       end
 

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

@@ -4,7 +4,7 @@
 #
 # Reads hCalendar events.
 
-require 'microformats'
+require "microformats"
 
 module Calagator
   class Source::Parser::Hcal < Source::Parser
@@ -25,7 +25,7 @@ module Calagator
         event.source = source
         EVENT_TO_HCALENDAR_FIELD_MAP.each do |field, hcal_field|
           next unless hcal.respond_to?(hcal_field)
-          next unless value = decoded_field(hcal, hcal_field)
+          next unless (value = decoded_field(hcal, hcal_field))
 
           event.send "#{field}=", value
         end
@@ -38,15 +38,15 @@ module Calagator
     private
 
     def decoded_field(hcal, hcal_field)
-      return unless raw_field = hcal.send(hcal_field)
-
-      decoded_field = case hcal_field
-                      when :start, :end
-                        Time.parse(raw_field).in_time_zone
-                      when :location
-                        to_venue(raw_field)
-                      else
-                        raw_field
+      return unless (raw_field = hcal.send(hcal_field))
+
+      case hcal_field
+      when :start, :end
+        Time.parse(raw_field).in_time_zone
+      when :location
+        to_venue(raw_field)
+      else
+        raw_field
       end
     end
 
@@ -93,15 +93,15 @@ module Calagator
         attributes[field] = raw.adr.send(field) if raw.adr.respond_to?(field)
       end
 
-      attributes['country'] = attributes.delete('country_name')
-      if attributes['postal_code']
-        attributes['postal_code'] = attributes['postal_code'].to_s
+      attributes["country"] = attributes.delete("country_name")
+      if attributes["postal_code"]
+        attributes["postal_code"] = attributes["postal_code"].to_s
       end
       venue.attributes = attributes
     end
 
     def hcals
-      Microformats.parse(url).items.select { |item| item.type == 'h-event' }
+      Microformats.parse(url).items.select { |item| item.type == "h-event" }
     end
   end
 end

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

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'calagator/vcalendar'
+require "calagator/vcalendar"
 
 # == Source::Parser::Ical
 #
@@ -18,7 +18,7 @@ module Calagator
 
     # Override Source::Parser.read_url to handle "webcal" scheme addresses.
     def self.read_url(url)
-      url = url.gsub(/^webcal:/, 'http:')
+      url = url.gsub(/^webcal:/, "http:")
       super
     end
 

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

@@ -1,8 +1,8 @@
 # frozen_string_literal: true
 
-require 'net/http'
-require 'net/https'
-require 'open-uri'
+require "net/http"
+require "net/https"
+require "open-uri"
 
 # == Source::Parser
 #
@@ -93,7 +93,7 @@ module Calagator
       end
     end
 
-    def to_events_api_helper(url, error_key = 'error')
+    def to_events_api_helper(url, error_key = "error")
       # Extract +event_id+ from :url using +url_pattern+.
       event_id = url[self.class.url_pattern, 1]
       return false unless event_id # Give up unless we find the identifier.
@@ -102,18 +102,17 @@ module Calagator
       url, params = *yield(event_id)
 
       # Get data from the API.
-      data = RestClient.get(url, params: params, accept: 'json').to_str
+      data = RestClient.get(url, params: params, accept: "json").to_str
       data = JSON.parse(data)
 
       # Stop if API tells us there's an error.
-      raise Source::Parser::NotFound, error if error = data[error_key]
-
-      data['event_id'] = event_id
+      raise Source::Parser::NotFound, error if data[error_key]
+      data["event_id"] = event_id
       data
     end
   end
 end
 
-require 'calagator/source/parser/not_found'
-require 'calagator/source/parser/ical'
-require 'calagator/source/parser/hcal'
+require "calagator/source/parser/not_found"
+require "calagator/source/parser/ical"
+require "calagator/source/parser/hcal"

data/app/models/calagator/source.rb

@@ -15,21 +15,21 @@
 # == Source
 #
 # A model that represents a source of events data, such as feeds for hCal, iCal, etc.
-require 'calagator/decode_html_entities_hack'
-require 'paper_trail'
-require 'loofah-activerecord'
-require 'loofah/activerecord/xss_foliate'
+require "calagator/decode_html_entities_hack"
+require "paper_trail"
+require "loofah-activerecord"
+require "loofah/activerecord/xss_foliate"
 
 module Calagator
   class Source < Calagator::ApplicationRecord
-    self.table_name = 'sources'
+    self.table_name = "sources"
 
     validate :assert_url
 
-    has_many :events,  dependent: :destroy
-    has_many :venues,  dependent: :destroy
+    has_many :events, dependent: :destroy
+    has_many :venues, dependent: :destroy
 
-    scope :listing, -> { order('created_at DESC') }
+    scope :listing, -> { order("created_at DESC") }
 
     has_paper_trail
 
@@ -47,9 +47,9 @@ module Calagator
     def url=(value)
       url = URI.parse(value.strip)
       unless %w[http https ftp].include?(url.scheme) || url.scheme.nil?
-        url.scheme = 'http'
+        url.scheme = "http"
       end
-      self[:url] = url.scheme.nil? ? 'http://' + value.strip : url.to_s
+      self[:url] = url.scheme.nil? ? "http://" + value.strip : url.to_s
     rescue URI::InvalidURIError
       false
     end
@@ -73,7 +73,7 @@ module Calagator
     def assert_url
       URI.parse(url)
     rescue URI::InvalidURIError
-      errors.add :url, 'has invalid format'
+      errors.add :url, "has invalid format"
       false
     end
   end

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

@@ -45,16 +45,16 @@ 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?
       end
 
       def log
-        venue_id = venue.new_record? ? 'new record' : "record #{venue.id}"
-        status = geo.success ? 'was successful' : 'failed'
-        message = "Venue#add_geocoding for #{venue} #{status}, response was: #{geo.inspect}"
+        venue_id = venue.new_record? ? "new record" : "record #{venue.id}"
+        status = geo.success ? "was successful" : "failed"
+        message = "Venue#add_geocoding for #{venue_id} #{status}, response was: #{geo.inspect}"
         Rails.logger.info message
       end
     end

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

@@ -14,11 +14,11 @@ module Calagator
       end
 
       def most_active_venues
-        base.business.wifi_status.scope.order('events_count DESC').limit(10)
+        base.business.wifi_status.scope.order("events_count DESC").limit(10)
       end
 
       def newest_venues
-        base.business.wifi_status.scope.order('created_at DESC').limit(10)
+        base.business.wifi_status.scope.order("created_at DESC").limit(10)
       end
 
       def results?
@@ -39,8 +39,8 @@ module Calagator
         else
           base.business.wifi_status.search.scope
         end
-      rescue ActiveRecord::StatementInvalid => e
-        @failure_message = 'There was an error completing your search.'
+      rescue ActiveRecord::StatementInvalid
+        @failure_message = "There was an error completing your search."
         @hard_failure = true
         []
       end

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

@@ -50,7 +50,7 @@ module Calagator
         def search
           Venue.solr_search do
             keywords query
-            order_by *order
+            order_by(*order)
             with :duplicate_for_solr, false
             with :wifi, true if wifi
             with :closed, false unless include_closed

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

@@ -19,16 +19,16 @@ module Calagator
         def base
           column_names = Venue.column_names.map { |name| "venues.#{name}" }
           @scope = Venue.all
-                        .group(column_names)
-                        .joins("LEFT OUTER JOIN taggings on taggings.taggable_id = venues.id AND taggings.taggable_type LIKE '%Venue'")
-                        .joins('LEFT OUTER JOIN tags ON tags.id = taggings.tag_id')
+            .group(column_names)
+            .joins("LEFT OUTER JOIN taggings on taggings.taggable_id = venues.id AND taggings.taggable_type LIKE '%Venue'")
+            .joins("LEFT OUTER JOIN tags ON tags.id = taggings.tag_id")
           self
         end
 
         def keywords
-          @scope = @scope.where(['LOWER(title) LIKE ?', "%#{query.downcase}%"])
-                         .or(@scope.where(['LOWER(description) LIKE ?', "%#{query.downcase}%"]))
-                         .or(@scope.where(['LOWER(tags.name) = ?', query]))
+          @scope = @scope.where(["LOWER(title) LIKE ?", "%#{query.downcase}%"])
+            .or(@scope.where(["LOWER(description) LIKE ?", "%#{query.downcase}%"]))
+            .or(@scope.where(["LOWER(tags.name) = ?", query]))
           self
         end
 
@@ -38,7 +38,7 @@ module Calagator
         end
 
         def order
-          @scope = @scope.order(Arel.sql('LOWER(venues.title) ASC'))
+          @scope = @scope.order(Arel.sql("LOWER(venues.title) ASC"))
           self
         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
+        (kind == :sunspot) ? ApacheSunspot : Sql
       end
     end
   end

data/app/models/calagator/venue.rb

@@ -27,18 +27,18 @@
 #  duplicate_of_id :integer
 #  source_id       :integer
 #
-require 'calagator/decode_html_entities_hack'
-require 'calagator/strip_whitespace'
-require 'calagator/url_prefixer'
-require 'paper_trail'
-require 'loofah-activerecord'
-require 'loofah/activerecord/xss_foliate'
-require 'validate_url'
-require 'active_model/serializers/xml'
+require "calagator/decode_html_entities_hack"
+require "calagator/strip_whitespace"
+require "calagator/url_prefixer"
+require "paper_trail"
+require "loofah-activerecord"
+require "loofah/activerecord/xss_foliate"
+require "validate_url"
+require "active_model/serializers/xml"
 
 module Calagator
   class Venue < Calagator::ApplicationRecord
-    self.table_name = 'venues'
+    self.table_name = "venues"
 
     include StripWhitespace
 
@@ -59,22 +59,22 @@ module Calagator
 
     # Validations
     validates :title, presence: true
-    validates :url, url: { allow_blank: true }
-    validates :latitude, inclusion: { in: -90..90, allow_nil: true }
-    validates :longitude, inclusion: { in: -180..180, allow_nil: true }
+    validates :url, url: {allow_blank: true}
+    validates :latitude, inclusion: {in: -90..90, allow_nil: true}
+    validates :longitude, inclusion: {in: -180..180, allow_nil: true}
     validates :title, :description, :address, :url, :street_address, :locality, :region, :postal_code, :country, :email, :telephone, denylist: true
 
     # Duplicates
     include DuplicateChecking
-    duplicate_checking_ignores_attributes    :source_id, :version, :closed, :wifi, :access_notes, :tag_list
+    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) }
 
     # Named scopes
-    scope :primaries,          -> { non_duplicates.includes(:source, :events, :tags, :taggings) }
+    scope :primaries, -> { non_duplicates.includes(:source, :events, :tags, :taggings) }
     scope :with_public_wifi, -> { where(wifi: true) }
-    scope :in_business,      -> { where(closed: false) }
-    scope :out_of_business,  -> { where(closed: true) }
+    scope :in_business, -> { where(closed: false) }
+    scope :out_of_business, -> { where(closed: true) }
 
     def self.search(query, opts = {})
       SearchEngine.search(query, opts)
@@ -87,7 +87,7 @@ module Calagator
     # Display a single line address.
     def full_address
       full_address = "#{street_address}, #{locality} #{region} #{postal_code} #{country}"
-      full_address.strip != ',' && full_address
+      full_address.strip != "," && full_address
     end
 
     # Get an address we can use for geocoding

data/app/observers/calagator/cache_observer.rb

@@ -13,24 +13,24 @@ module Calagator
     # primarily by the #cache_if calls in views. The optional +request+ object
     # provides a HTTP_HOST so that caching can be done for a particular hostname.
     def self.daily_key_for(name, _request = nil)
-      "#{name}@#{Time.zone.now.strftime('%Y%m%d')}"
+      "#{name}@#{Time.zone.now.strftime("%Y%m%d")}"
     end
 
     # Expires all cached data.
     def self.expire_all
-      Rails.logger.info 'CacheObserver::expire_all: invoked'
+      Rails.logger.info "CacheObserver::expire_all: invoked"
       Rails.cache.clear
     end
 
     #---[ Triggers ]--------------------------------------------------------
 
     def after_save(_record)
-      Rails.logger.info 'CacheObserver#after_save: invoked'
+      Rails.logger.info "CacheObserver#after_save: invoked"
       self.class.expire_all
     end
 
     def after_destroy(_record)
-      Rails.logger.info 'CacheObserver#after_destroy: invoked'
+      Rails.logger.info "CacheObserver#after_destroy: invoked"
       self.class.expire_all
     end
   end

data/app/views/calagator/events/index.atom.builder

@@ -1,11 +1,11 @@
 # frozen_string_literal: true
 
-cache_if(@perform_caching, Calagator::CacheObserver.daily_key_for('events_atom', request)) do
-  atom_feed('xmlns:georss'.to_sym => 'http://www.georss.org/georss') do |feed|
+cache_if(@perform_caching, Calagator::CacheObserver.daily_key_for("events_atom", request)) do
+  atom_feed("xmlns:georss": "http://www.georss.org/georss") do |feed|
     page_title = if @search
-                   @search.tag ? "Events tagged with: #{@search.tag}" : "Search Results for: #{@search.query}"
-                 else
-                   'Events'
+      @search.tag ? "Events tagged with: #{@search.tag}" : "Search Results for: #{@search.query}"
+    else
+      "Events"
     end
     feed.title("#{Calagator.title}: #{page_title}")
 
@@ -22,10 +22,10 @@ cache_if(@perform_caching, Calagator::CacheObserver.daily_key_for('events_atom',
           entry.title(event.title)
           entry.summary(summary)
           entry.url(event_url(event))
-          entry.link(rel: 'enclosure', type: 'text/calendar', href: event_url(event, format: 'ics'))
+          entry.link(rel: "enclosure", type: "text/calendar", href: event_url(event, format: "ics"))
           entry.start_time(event.start_time.xmlschema)
           entry.end_time(event.end_time.xmlschema) if event.end_time
-          entry.content(render(partial: 'feed_item', locals: { event: event }, formats: [:html]), type: 'html')
+          entry.content(render(partial: "feed_item", locals: {event: event}, formats: [:html]), type: "html")
           if event.venue&.latitude && event.venue&.longitude
             entry.georss :point, "#{event.venue.latitude} #{event.venue.longitude}"
           end

data/app/views/calagator/site/opensearch.xml.builder

@@ -1,10 +1,10 @@
 # frozen_string_literal: true
 
 xml.instruct!
-xml.OpenSearchDescription('xmlns' => 'http://a9.com/-/spec/opensearch/1.1/', 'xmlns:moz' => 'http://www.mozilla.org/2006/browser/search/') do
+xml.OpenSearchDescription("xmlns" => "http://a9.com/-/spec/opensearch/1.1/", "xmlns:moz" => "http://www.mozilla.org/2006/browser/search/") do
   xml.ShortName Calagator.title
   xml.Description "Search #{Calagator.title}"
-  xml.InputEncoding 'UTF-8'
+  xml.InputEncoding "UTF-8"
   # The sub call at the end of this line is because we want to use the rails URL helper, but don't want to urlencode the curly braces.
-  xml.Url('type' => 'text/html', 'method' => 'get', 'template' => search_events_url(query: 'searchTerms').sub('searchTerms', '{searchTerms}'))
+  xml.Url("type" => "text/html", "method" => "get", "template" => search_events_url(query: "searchTerms").sub("searchTerms", "{searchTerms}"))
 end

data/config/initializers/dates.rb

@@ -1,8 +1,8 @@
 # frozen_string_literal: true
 
 my_formats = {
-  yyyymmdd: '%Y-%m-%d',
-  long_date: '%A, %B %d, %Y'
+  yyyymmdd: "%Y-%m-%d",
+  long_date: "%A, %B %d, %Y"
 }
 
 Time::DATE_FORMATS.merge!(my_formats)

data/config/initializers/formtastic.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'formtastic'
+require "formtastic"
 # --------------------------------------------------------------------------------------------------
 # Please note: If you're subclassing Formtastic::FormBuilder, Formtastic uses
 # class_attribute for these configuration attributes instead of the deprecated
@@ -31,7 +31,7 @@ Formtastic::FormBuilder.all_fields_required_by_default = false
 # '<abbr title="required">*</abbr>'. In other words, if you configure formtastic.required
 # in your locale, it will replace the abbr title properly. But if you don't want to use
 # abbr tag, you can simply give a string as below
-Formtastic::FormBuilder.required_string = proc { %{<abbr title="#{Formtastic::I18n.t(:required)}" aria-hidden="true">*</abbr>}.html_safe }
+Formtastic::FormBuilder.required_string = proc { %(<abbr title="#{Formtastic::I18n.t(:required)}" aria-hidden="true">*</abbr>).html_safe }
 
 # Set the string that will be appended to the labels/fieldsets which are optional
 # Defaults to an empty string ("") and also accepts procs (see required_string above)
@@ -93,4 +93,4 @@ Formtastic::FormBuilder.required_string = proc { %{<abbr title="#{Formtastic::I1
 # and `<textarea>` tags by setting this to true (defaults to false).
 Formtastic::FormBuilder.use_required_attribute = true
 
-require 'formtastic/version'
+require "formtastic/version"

data/config/initializers/ics_renderer.rb

@@ -3,5 +3,5 @@
 # Export +events+ to an iCalendar file.
 ActionController::Renderers.add(:ics) do |events, _options|
   render plain: Calagator::Event::IcalRenderer.render(events, url_helper: ->(event) { event_url(event) }),
-         content_type: 'text/calendar'
+    content_type: "text/calendar"
 end