koalagator 2.0.0 → 2.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cf58dc7b99c59da8376a1218f9c9f3a6e35d08b3c95519b94ed7328c00b89213
-  data.tar.gz: 96c3e4932f833142f6d64b2be81ba4ccb30e8e0c4e803a969316ea52ab5f0ca4
+  metadata.gz: d46eaa5285dbaedf685ddbee4939703eb628f483ef9f991c70ce42034087600c
+  data.tar.gz: a3a6d739be8d3565ce316c7e49d4c053c6cb499b836266f0848293c649226354
 SHA512:
-  metadata.gz: e5303eda5bce92236ac88ab06ae851135f28d00322635074966405bc80bfda682e5df4adbbd2ad4ed0085b94a691d96064f376fddbccd0233cd9e090d8a04d55
-  data.tar.gz: f20dd416299ff15d5709b0c36ef29048f364b16cad3b9655ff204ca8339c008937b54d30982fc1d110ef90246a963f930c790a43c375b13157a37fd5ec5dc66b
+  metadata.gz: ec36be7b3eec5f7a82419c9736218f0d075a2184a0950101b04a24395899b8004b19e7a24362505053f6501fc7c354c87dd0bd265135c34d88b8ecdf24bf7535
+  data.tar.gz: e54a32d233b8cb70f9793c9e4eec4af7d0c44bb41a4c7193c2754b166636e260104a17e3563416378c6ea804ecba1dda9ade0264cb1ae4621457ac23e7639ecc

data/Rakefile

@@ -1,15 +1,15 @@
 #!/usr/bin/env rake
 # frozen_string_literal: true
 
-require 'bundler/setup'
+require "bundler/setup"
 
-APP_RAKEFILE = File.expand_path('spec/test_app/Rakefile', __dir__)
-load 'rails/tasks/engine.rake'
+APP_RAKEFILE = File.expand_path("spec/test_app/Rakefile", __dir__)
+load "rails/tasks/engine.rake"
 
 Bundler::GemHelper.install_tasks
 
-require 'rspec/core/rake_task'
+require "rspec/core/rake_task"
 RSpec::Core::RakeTask.new(:spec)
 
-task spec: 'app:db:test:prepare'
+task spec: "app:db:test:prepare"
 task default: :spec

data/app/controllers/calagator/admin_controller.rb

@@ -4,7 +4,8 @@ module Calagator
   class AdminController < Calagator::ApplicationController
     require_admin
 
-    def index; end
+    def index
+    end
 
     def events
       if params[:query].blank?
@@ -19,7 +20,7 @@ module Calagator
         return redirect_to admin_events_path if @search.hard_failure?
       end
 
-      render 'calagator/admin/events'
+      render "calagator/admin/events"
     end
 
     def lock_event

data/app/controllers/calagator/application_controller.rb

@@ -41,6 +41,7 @@ module Calagator
         )
       )
     end
+    private_class_method :require_admin
 
     #---[ Helpers ]---------------------------------------------------------
 
@@ -49,10 +50,10 @@ module Calagator
     # and their values are either "active" or nil.
     def link_class
       @_link_class_cache ||= {
-        events: ((controller_name == 'events' ||
-                      controller_name == 'sources' ||
-                      controller_name == 'site') && 'active'),
-        venues: (controller_name == 'venues' && 'active')
+        events: ((controller_name == "events" ||
+                      controller_name == "sources" ||
+                      controller_name == "site") && "active"),
+        venues: (controller_name == "venues" && "active")
       }
     end
     helper_method :link_class
@@ -63,11 +64,11 @@ module Calagator
     # +kind+ (e.g. :failure).
     def append_flash(kind, message)
       kind = kind.to_sym
-      flash[kind] = if leaf = flash[kind]
-                      "#{leaf} #{message}"
-                    else
-                      message.to_s
-                    end
+      flash[kind] = if (leaf = flash[kind])
+        "#{leaf} #{message}"
+      else
+        message.to_s
+      end
     end
 
     # Make it possible to use helpers in controllers

data/app/controllers/calagator/events_controller.rb

@@ -1,8 +1,8 @@
 # frozen_string_literal: true
 
-require 'recaptcha/rails'
-require 'calagator/duplicate_checking'
-require 'calagator/duplicate_checking/controller_actions'
+require "recaptcha/rails"
+require "calagator/duplicate_checking"
+require "calagator/duplicate_checking/controller_actions"
 
 module Calagator
   class EventsController < Calagator::ApplicationController
@@ -29,7 +29,7 @@ module Calagator
 
       render_event @event
     rescue ActiveRecord::RecordNotFound => e
-      redirect_to events_path, flash: { failure: e.to_s }
+      redirect_to events_path, flash: {failure: e.to_s}
     end
 
     # GET /events/new
@@ -39,7 +39,8 @@ module Calagator
     end
 
     # GET /events/1/edit
-    def edit; end
+    def edit
+    end
 
     # POST /events
     # POST /events.xml
@@ -59,7 +60,7 @@ module Calagator
       respond_to do |format|
         if recaptcha_verified?(@event) && saver.save
           format.html do
-            flash[:success] = 'Event was successfully saved.'
+            flash[:success] = "Event was successfully saved."
             if saver.has_new_venue?
               flash[:success] += " Please tell us more about where it's being held."
               redirect_to edit_venue_url(@event.venue, from_event: @event.id)
@@ -67,11 +68,11 @@ module Calagator
               redirect_to @event
             end
           end
-          format.xml  { render xml: @event, status: :created, location: @event }
+          format.xml { render xml: @event, status: :created, location: @event }
         else
           format.html do
             flash[:failure] = saver.failure
-            render action: @event.new_record? ? 'new' : 'edit'
+            render action: @event.new_record? ? "new" : "edit"
           end
           format.xml { render xml: @event.errors, status: :unprocessable_entity }
         end
@@ -84,8 +85,8 @@ module Calagator
       @event.destroy
 
       respond_to do |format|
-        format.html { redirect_to(events_url, flash: { success: "\"#{@event.title}\" has been deleted" }) }
-        format.xml  { head :ok }
+        format.html { redirect_to(events_url, flash: {success: "\"#{@event.title}\" has been deleted"}) }
+        format.xml { head :ok }
       end
     end
 
@@ -104,8 +105,8 @@ module Calagator
 
     def clone
       @event = Event::Cloner.clone(Event.find(params[:id]))
-      flash[:success] = 'This is a new event cloned from an existing one. Please update the fields, like the time and description.'
-      render 'new'
+      flash[:success] = "This is a new event cloned from an existing one. Please update the fields, like the time and description."
+      render "new"
     end
 
     private
@@ -113,9 +114,9 @@ module Calagator
     def render_event(event)
       respond_to do |format|
         format.html # show.html.erb
-        format.xml  { render xml: event.to_xml(root: 'events', include: :venue) }
+        format.xml { render xml: event.to_xml(root: "events", include: :venue) }
         format.json { render json: event.to_json(include: :venue) }
-        format.ics  { render ics: [event] }
+        format.ics { render ics: [event] }
       end
     end
 
@@ -124,9 +125,9 @@ module Calagator
       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.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
@@ -134,7 +135,7 @@ module Calagator
     def find_and_redirect_if_locked
       @event = Event.find(params[:id])
       if @event.locked?
-        flash[:failure] = 'You are not permitted to modify this event.'
+        flash[:failure] = "You are not permitted to modify this event."
         redirect_to root_path
       end
     end

data/app/controllers/calagator/site_controller.rb

@@ -4,28 +4,29 @@ module Calagator
   class SiteController < Calagator::ApplicationController
     # Raise exception, mostly for confirming that exception_notification works
     def omfg
-      raise ArgumentError, 'OMFG'
+      raise ArgumentError, "OMFG"
     end
 
     # Render something to help benchmark stack without the views
     def hello
-      render plain: 'hello'
+      render plain: "hello"
     end
 
     def index
       @overview = Event::Overview.new
       respond_to do |format|
         format.html {}
-        format.any  { redirect_to events_path(format: params[:format]) }
+        format.any { redirect_to events_path(format: params[:format]) }
       end
     end
 
     # Displays the about page.
-    def about; end
+    def about
+    end
 
     def opensearch
       respond_to do |format|
-        format.xml { render content_type: 'application/opensearchdescription+xml' }
+        format.xml { render content_type: "application/opensearchdescription+xml" }
       end
     end
 

data/app/controllers/calagator/sources_controller.rb

@@ -9,11 +9,11 @@ module Calagator
       respond_to do |format|
         if @importer.import
           redirect_target = @importer.events.one? ? @importer.events.first : events_path
-          format.html { redirect_to redirect_target, flash: { success: render_to_string(layout: false) } }
-          format.xml  { render xml: @importer.source, events: @importer.events }
+          format.html { redirect_to redirect_target, flash: {success: render_to_string(layout: false)} }
+          format.xml { render xml: @importer.source, events: @importer.events }
         else
-          format.html { redirect_to new_source_path(url: @importer.source.url), flash: { failure: @importer.failure_message } }
-          format.xml  { render xml: @importer.source.errors, status: :unprocessable_entity }
+          format.html { redirect_to new_source_path(url: @importer.source.url), flash: {failure: @importer.failure_message} }
+          format.xml { render xml: @importer.source.errors, status: :unprocessable_entity }
         end
       end
     end
@@ -25,7 +25,7 @@ module Calagator
 
       respond_to do |format|
         format.html { @sources = @sources.paginate(page: params[:page], per_page: params[:per_page]) }
-        format.xml  { render xml: @sources }
+        format.xml { render xml: @sources }
       end
     end
 
@@ -35,10 +35,10 @@ module Calagator
       @source = Source.find(params[:id], include: %i[events venues])
       respond_to do |format|
         format.html # show.html.erb
-        format.xml  { render xml: @source }
+        format.xml { render xml: @source }
       end
     rescue ActiveRecord::RecordNotFound => e
-      flash[:failure] = e.to_s if params[:id] != 'import'
+      flash[:failure] = e.to_s if params[:id] != "import"
       redirect_to new_source_path
     end
 
@@ -70,11 +70,11 @@ module Calagator
     def create_or_update
       respond_to do |format|
         if @source.update(params.permit![:source])
-          format.html { redirect_to @source, notice: 'Source was successfully saved.' }
-          format.xml  { render xml: @source, status: :created, location: @source }
+          format.html { redirect_to @source, notice: "Source was successfully saved." }
+          format.xml { render xml: @source, status: :created, location: @source }
         else
-          format.html { render action: @source.new_record? ? 'new' : 'edit' }
-          format.xml  { render xml: @source.errors, status: :unprocessable_entity }
+          format.html { render action: @source.new_record? ? "new" : "edit" }
+          format.xml { render xml: @source.errors, status: :unprocessable_entity }
         end
       end
     end
@@ -88,7 +88,7 @@ module Calagator
 
       respond_to do |format|
         format.html { redirect_to sources_url }
-        format.xml  { head :ok }
+        format.xml { head :ok }
       end
     end
   end

data/app/controllers/calagator/venues_controller.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'calagator/duplicate_checking/controller_actions'
+require "calagator/duplicate_checking/controller_actions"
 
 module Calagator
   class VenuesController < Calagator::ApplicationController
@@ -27,9 +27,9 @@ module Calagator
       respond_to do |format|
         format.html # index.html.erb
         format.kml  # index.kml.erb
-        format.xml  { render xml:  venues }
+        format.xml { render xml: venues }
         format.json { render json: venues }
-        format.js   { render json: venues }
+        format.js { render json: venues }
       end
     end
     private :render_venues
@@ -37,10 +37,10 @@ module Calagator
     # GET /autocomplete via AJAX
     def autocomplete
       @venues = Venue
-                .non_duplicates
-                .in_business
-                .where(['LOWER(title) LIKE ?', "%#{params[:term]}%".downcase])
-                .order(Arel.sql('LOWER(title)'))
+        .non_duplicates
+        .in_business
+        .where(["LOWER(title) LIKE ?", "%#{params[:term]}%".downcase])
+        .order(Arel.sql("LOWER(title)"))
 
       render json: @venues
     end
@@ -65,7 +65,7 @@ module Calagator
       def show_all_if_not_found
         return if venue
       rescue ActiveRecord::RecordNotFound => e
-        redirect_to venues_path, flash: { failure: e.to_s }
+        redirect_to venues_path, flash: {failure: e.to_s}
       end
 
       def redirect_to_originator
@@ -75,9 +75,9 @@ module Calagator
       def render_venue
         respond_to do |format|
           format.html
-          format.xml  { render xml: venue }
+          format.xml { render xml: venue }
           format.json { render json: venue }
-          format.ics  { render ics: venue_events }
+          format.ics { render ics: venue_events }
         end
       end
 
@@ -89,7 +89,7 @@ module Calagator
     # GET /venues/new
     def new
       venue
-      render layout: params[:layout] != 'false'
+      render layout: params[:layout] != "false"
     end
 
     # GET /venues/1/edit
@@ -101,7 +101,7 @@ module Calagator
     def create
       CreateOrUpdate.new(self).call(recaptcha_verified?(venue))
     end
-    alias update create
+    alias_method :update, :create
 
     class CreateOrUpdate < SimpleDelegator
       def call(recaptcha_result)
@@ -127,16 +127,16 @@ module Calagator
 
       def render_success
         respond_to do |format|
-          format.html { redirect_to from_event || venue, flash: { success: 'Venue was successfully saved.' } }
-          format.xml  { render xml: venue, status: :created, location: venue }
+          format.html { redirect_to from_event || venue, flash: {success: "Venue was successfully saved."} }
+          format.xml { render xml: venue, status: :created, location: venue }
         end
       end
 
       def render_failure
-        flash[:failure] = '<h3>Please fix any errors and try again</h3>'
+        flash[:failure] = "<h3>Please fix any errors and try again</h3>"
         respond_to do |format|
-          format.html { render action: venue.new_record? ? 'new' : 'edit' }
-          format.xml  { render xml: venue.errors, status: :unprocessable_entity }
+          format.html { render action: venue.new_record? ? "new" : "edit" }
+          format.xml { render xml: venue.errors, status: :unprocessable_entity }
         end
       end
 
@@ -160,18 +160,18 @@ module Calagator
       def prevent_destruction_of_venue_with_events
         return if venue.events.none?
 
-        message = 'Cannot destroy venue that has associated events, you must reassociate all its events first.'
+        message = "Cannot destroy venue that has associated events, you must reassociate all its events first."
         respond_to do |format|
-          format.html { redirect_to venue, flash: { failure: message } }
-          format.xml  { render xml: message, status: :unprocessable_entity }
+          format.html { redirect_to venue, flash: {failure: message} }
+          format.xml { render xml: message, status: :unprocessable_entity }
         end
       end
 
       def destroy
         venue.destroy
         respond_to do |format|
-          format.html { redirect_to venues_path, flash: { success: %("#{venue.title}" has been deleted) } }
-          format.xml  { head :ok }
+          format.html { redirect_to venues_path, flash: {success: %("#{venue.title}" has been deleted)} }
+          format.xml { head :ok }
         end
       end
     end

data/app/controllers/calagator/versions_controller.rb

@@ -6,14 +6,14 @@ module Calagator
       @version = PaperTrail::Version.find(params[:id])
       @record = @version.next.try(:reify) || @version.item || @version.reify
 
-      singular = @record.class.name.singularize.underscore.split('/').last
-      plural = @record.class.name.pluralize.underscore.split('/').last
+      singular = @record.class.name.singularize.underscore.split("/").last
+      plural = @record.class.name.pluralize.underscore.split("/").last
       instance_variable_set("@#{singular}", @record)
 
       if request.xhr?
-        render partial: "calagator/#{plural}/form", locals: { singular.to_sym => @record }
+        render partial: "calagator/#{plural}/form", locals: {singular.to_sym => @record}
       else
-        render "calagator/#{plural}/edit", locals: { singular.to_sym => @record }
+        render "calagator/#{plural}/edit", locals: {singular.to_sym => @record}
       end
     end
   end

data/app/helpers/calagator/application_helper.rb

@@ -16,7 +16,7 @@ module Calagator
 
     # Return a HTML string with the BR tags converted to XHTML compliant markup.
     def upgrade_br(content)
-      content.gsub('<br>', '<br />')
+      content.gsub("<br>", "<br />")
     end
 
     FLASH_TYPES = %i[success failure].freeze
@@ -26,14 +26,14 @@ module Calagator
         next if flash[type].blank?
 
         content_tag(:div, class: "flash #{type} flash_#{type}") do
-          "#{type == :failure ? 'ERROR: ' : ''}#{flash[type]}".html_safe
+          "#{(type == :failure) ? "ERROR: " : ""}#{flash[type]}".html_safe
         end
       end.compact.join.html_safe
     end
 
     def datetime_format(time, format)
       format = format.gsub(/(%[dHImU])/, '*\1')
-      time.strftime(format).gsub(/\*0*/, '').html_safe
+      time.strftime(format).gsub(/\*0*/, "").html_safe
     end
 
     # Return a string describing the source code version being used
@@ -44,13 +44,13 @@ module Calagator
     # returns html markup with source (if any), imported/created time, and - if modified - modified time
     def datestamp(item)
       source = if item.source.nil?
-                 "added directly to #{Calagator.title}"
-               else
-                 "imported from #{link_to truncate(item.source.name, length: 40), url_for(item.source)}"
+        "added directly to #{Calagator.title}"
+      else
+        "imported from #{link_to truncate(item.source.name, length: 40), url_for(item.source)}"
       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>"
+        " and last updated <br /><strong>#{normalize_time(item.updated_at, format: :html)}</strong>"
       end
       raw "This item was #{source}#{created}#{updated}."
     end
@@ -68,7 +68,7 @@ module Calagator
     def subnav_class_for(controller_name, action_name)
       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"
       end
       css_class
     end

data/app/helpers/calagator/events_helper.rb

@@ -5,19 +5,19 @@ module Calagator
     include TimeRangeHelper # provides normalize_time
 
     def today_tomorrow_or_weekday(event)
-      output = event.start_time.strftime('%A')
+      output = event.start_time.strftime("%A")
       output = "Started #{output}" if event.ongoing?
       output
     end
 
     # Cast date to_date unless date is undefined
     def format_event_date(date)
-      date ? date.to_date : ''
+      date ? date.to_date : ""
     end
 
     # Cast date to time unless date is undefined
     def format_event_time(date)
-      date ? date.strftime('%I:%M %p') : ''
+      date ? date.strftime("%I:%M %p") : ""
     end
 
     # calculate rowspans for an array of events
@@ -41,7 +41,7 @@ module Calagator
     end
 
     def google_maps_url(address)
-      "https://maps.google.com/maps?q=#{URI.encode(address)}"
+      "https://maps.google.com/maps?q=#{URI.encode_www_form_component(address)}"
     end
 
     #---[ Event sorting ]----------------------------------------------------
@@ -51,7 +51,7 @@ module Calagator
       if key.present?
         link_to(sorting_label_for(key, @tag.present?), url_for(params.to_unsafe_h.merge(order: key)))
       else
-        link_to('Default', url_for(params.to_unsafe_h.tap { |o| o.delete :order }))
+        link_to("Default", url_for(params.to_unsafe_h.tap { |o| o.delete :order }))
       end
     end
 
@@ -90,13 +90,13 @@ module Calagator
         events_url(common)
     end
 
-    GOOGLE_EVENT_SUBSCRIBE_BASE = 'https://www.google.com/calendar/render?cid='
+    GOOGLE_EVENT_SUBSCRIBE_BASE = "https://www.google.com/calendar/render?cid="
 
     # Returns a Google Calendar subscription URL.
     #
     # @see #_events_feed_linker for details on parameters and exceptions.
     def google_events_subscription_link(filter = {})
-      link = _events_feed_linker(filter, protocol: 'webcal', format: 'ics')
+      link = _events_feed_linker(filter, protocol: "webcal", format: "ics")
       "#{GOOGLE_EVENT_SUBSCRIBE_BASE}#{CGI.escape(link)}"
     end
 
@@ -104,21 +104,21 @@ module Calagator
     #
     # @see #_events_feed_linker for details on parameters and exceptions.
     def icalendar_feed_link(filter = {})
-      _events_feed_linker(filter, protocol: 'webcal', format: 'ics')
+      _events_feed_linker(filter, protocol: "webcal", format: "ics")
     end
 
     # Returns an iCalendar export URL.
     #
     # @see #_events_feed_linker for details on parameters and exceptions.
     def icalendar_export_link(filter = {})
-      _events_feed_linker(filter, format: 'ics')
+      _events_feed_linker(filter, format: "ics")
     end
 
     # Returns an ATOM subscription URL.
     #
     # @see #_events_feed_linker for details on parameters and exceptions.
     def atom_feed_link(filter = {})
-      _events_feed_linker(filter, format: 'atom')
+      _events_feed_linker(filter, format: "atom")
     end
 
     #--[ Sharing buttons ]-----------------------------------------
@@ -130,12 +130,12 @@ module Calagator
 
       result = []
       result << "#{truncate(event.title, length: lengths[:title])} -"
-      result << event.start_time.strftime('%I:%M%p %m.%d.%Y') # "04:00PM 08.01.2012"
+      result << event.start_time.strftime("%I:%M%p %m.%d.%Y") # "04:00PM 08.01.2012"
       if event.venue
         result << "@ #{truncate(event.venue.title, length: lengths[:venue])}"
       end
 
-      result.join(' ')
+      result.join(" ")
     end
 
     # Will increase the maximum length of either the event title or venue
@@ -143,10 +143,10 @@ module Calagator
 
     def tweet_text_sizer(event)
       title_length = event.title.length
-      venue_length = (event.venue.try(:title) || '').length
+      venue_length = (event.venue.try(:title) || "").length
       title_length = tweet_length(title_length, venue_length)
       venue_length = tweet_length(venue_length, title_length)
-      { title: title_length, venue: title_length }
+      {title: title_length, venue: venue_length}
     end
     private :tweet_text_sizer
 
@@ -172,18 +172,18 @@ module Calagator
       if sorting_key.present? && SORTING_LABELS.key?(sorting_key)
         SORTING_LABELS[sorting_key]
       elsif is_searching_by_tag
-        SORTING_LABELS['date']
+        SORTING_LABELS["date"]
       else
-        SORTING_LABELS['score']
+        SORTING_LABELS["score"]
       end
     end
 
     # Labels displayed for sorting options:
     SORTING_LABELS = {
-      'name' => 'Event Name',
-      'venue' => 'Location',
-      'score' => 'Relevance',
-      'date' => 'Date'
+      "name" => "Event Name",
+      "venue" => "Location",
+      "score" => "Relevance",
+      "date" => "Date"
     }.freeze
     private_constant :SORTING_LABELS
   end