calagator 0.0.1.pre1 → 1.0.0.rc1

data/app/controllers/calagator/application_controller.rb

@@ -26,9 +26,9 @@ protected
   def self.require_admin(options = {})
     http_basic_authenticate_with(
       options.reverse_merge(
-        :name => SECRETS.admin_username,
-        :password => SECRETS.admin_password,
-        :if => Proc.new { SECRETS.admin_username && SECRETS.admin_password }
+        :name => Calagator.admin_username,
+        :password => Calagator.admin_password,
+        :if => Proc.new { Calagator.admin_username && Calagator.admin_password }
       )
     )
   end

data/app/controllers/calagator/events_controller.rb

@@ -2,7 +2,7 @@ require "calagator/duplicate_checking/controller_actions"
 
 module Calagator
 
-class EventsController < ApplicationController
+class EventsController < Calagator::ApplicationController
   # Provides #duplicates and #squash_many_duplicates
   include DuplicateChecking::ControllerActions
   require_admin only: [:duplicates, :squash_many_duplicates]
@@ -39,7 +39,7 @@ class EventsController < ApplicationController
   # GET /events/new
   # GET /events/new.xml
   def new
-    @event = Event.new(params[:event])
+    @event = Event.new(params.permit![:event])
   end
 
   # GET /events/1/edit
@@ -60,7 +60,7 @@ class EventsController < ApplicationController
   end
 
   def create_or_update
-    saver = Event::Saver.new(@event, params)
+    saver = Event::Saver.new(@event, params.permit!)
     respond_to do |format|
       if saver.save
         format.html {

data/app/controllers/calagator/site_controller.rb

@@ -1,6 +1,6 @@
 module Calagator
 
-class SiteController < ApplicationController
+class SiteController < Calagator::ApplicationController
   # Raise exception, mostly for confirming that exception_notification works
   def omfg
     raise ArgumentError, "OMFG"

data/app/controllers/calagator/sources_controller.rb

@@ -1,10 +1,10 @@
 module Calagator
 
-class SourcesController < ApplicationController
+class SourcesController < Calagator::ApplicationController
   # POST /import
   # POST /import.xml
   def import
-    @importer = Source::Importer.new(params[:source])
+    @importer = Source::Importer.new(params.permit![:source])
     respond_to do |format|
       if @importer.import
         format.html { redirect_to events_path, flash: { success: render_to_string(layout: false) } }
@@ -67,7 +67,7 @@ class SourcesController < ApplicationController
 
   def create_or_update
     respond_to do |format|
-      if @source.update_attributes(params[:source])
+      if @source.update_attributes(params.permit![:source])
         format.html { redirect_to @source, notice: 'Source was successfully saved.' }
         format.xml  { render xml: @source, status: :created, location: @source }
       else

data/app/controllers/calagator/venues_controller.rb

@@ -2,7 +2,7 @@ require "calagator/duplicate_checking/controller_actions"
 
 module Calagator
 
-class VenuesController < ApplicationController
+class VenuesController < Calagator::ApplicationController
   # Provides #duplicates and #squash_many_duplicates
   include DuplicateChecking::ControllerActions
   require_admin only: [:duplicates, :squash_many_duplicates]
@@ -10,7 +10,7 @@ class VenuesController < ApplicationController
   # GET /venues
   # GET /venues.xml
   def index
-    @search = Venue::Search.new(params)
+    @search = Venue::Search.new(params.permit!)
     @venues = @search.venues
 
     respond_to do |format|
@@ -42,7 +42,7 @@ class VenuesController < ApplicationController
   # GET /venues/1
   # GET /venues/1.xml
   def show
-    @venue = Venue.find(params[:id], include: :source)
+    @venue = Venue.find(params[:id])
 
     return redirect_to @venue.duplicate_of if @venue.duplicate?
 
@@ -85,7 +85,7 @@ class VenuesController < ApplicationController
   end
 
   def create_or_update
-    @venue.attributes = params[:venue]
+    @venue.attributes = params.permit![:venue] || {}
     respond_to do |format|
       if !evil_robot? && @venue.save
         format.html { redirect_to from_event || @venue, flash: { success: "Venue was successfully saved." } }

data/app/controllers/calagator/versions_controller.rb

@@ -1,8 +1,8 @@
 module Calagator
 
-class VersionsController < ApplicationController
+class VersionsController < Calagator::ApplicationController
   def edit
-    @version = Version.find(params[:id])
+    @version = PaperTrail::Version.find(params[:id])
     @record = @version.next.try(:reify) || @version.item || @version.reify
 
     singular = @record.class.name.singularize.underscore.split("/").last

data/app/helpers/calagator/application_helper.rb

@@ -116,9 +116,6 @@ module ApplicationHelper
     ].compact.join(" ")
   end
 
-  # String name of the mobile preference cookie's name, e.g. "calagator_mobile".
-  MOBILE_COOKIE_NAME = "#{SECRETS.session_name}_mobile"
-
   # CGI escape a string-like object. The issue is that CGI::escape fails if used on a RailsXss SafeBuffer: https://github.com/rails/rails_xss/issues/8
   def cgi_escape(data)
     return CGI::escape(data.to_str)

data/app/helpers/calagator/mapping_helper.rb

@@ -2,15 +2,15 @@ module Calagator
 
 module MappingHelper
   def map_provider
-    (SECRETS.mapping && SECRETS.mapping["provider"]) || 'stamen'
+    Calagator.mapping_provider || 'stamen'
   end
 
   def map_tiles
-    (SECRETS.mapping && SECRETS.mapping["tiles"]) || 'terrain'
+    Calagator.mapping_tiles || 'terrain'
   end
 
   def leaflet_js
-    Rails.env.production? ? ["https://d591zijq8zntj.cloudfront.net/leaflet-0.6.4/leaflet.js"] : ["leaflet"]
+    Rails.env.production? ? ["http://cdnjs.cloudflare.com/ajax/libs/leaflet/0.7.3/leaflet.js"] : ["leaflet"]
   end
 
   def map_provider_dependencies
@@ -19,10 +19,10 @@ module MappingHelper
       "mapbox" => ["https://api.tiles.mapbox.com/mapbox.js/v1.3.1/mapbox.standalone.js"],
       "esri"   => ["http://cdn-geoweb.s3.amazonaws.com/esri-leaflet/0.0.1-beta.5/esri-leaflet.js"],
       "google" => [
-        "https://maps.googleapis.com/maps/api/js?key=#{SECRETS.mapping && SECRETS.mapping["google_maps_api_key"]}&sensor=false",
-        "leaflet_google_layer",
-      ],
-    }[map_provider]
+        "https://maps.googleapis.com/maps/api/js?key=#{Calagator.mapping_google_maps_api_key}&sensor=false",
+        "leaflet_google_layer"
+      ]
+    }[map_provider] || []
   end
 
   def mapping_js_includes
@@ -58,7 +58,8 @@ module MappingHelper
 
         var venueIcon = L.AwesomeMarkers.icon({
           icon: 'star',
-          color: '#{SECRETS.mapping['marker_color']}'
+          prefix: 'fa',
+          markerColor: '#{Calagator.mapping_marker_color}'
         })
 
         var markers = [#{markers.join(", ")}];

data/app/models/calagator/event.rb

@@ -36,8 +36,6 @@ module Calagator
 class Event < ActiveRecord::Base
   self.table_name = "events"
 
-  attr_protected
-
   has_paper_trail
   acts_as_taggable
 
@@ -100,7 +98,7 @@ class Event < ActiveRecord::Base
       when 'name'
         order('lower(events.title), start_time')
       when 'venue'
-        includes(:venue).order('lower(venues.title), start_time')
+        includes(:venue).order('lower(venues.title), start_time').references(:venues)
       else # when 'date', nil
         order('start_time')
     end
@@ -144,6 +142,7 @@ class Event < ActiveRecord::Base
 
   def time_for(value)
     value = value.join(' ') if value.kind_of?(Array)
+    value = value.to_s if value.kind_of?(Date)
     value = Time.zone.parse(value) if value.kind_of?(String) # this will throw ArgumentError if invalid
     value
   end

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

@@ -10,6 +10,8 @@
 # Example:
 #   ics1 = Event::IcalRenderer.render(myevent)
 #   ics2 = Event::IcalRenderer.render(myevents, url_helper: -> (event) { event_url(event) })
+require "loofah/helpers"
+
 module Calagator
 
 class Event < ActiveRecord::Base
@@ -128,10 +130,10 @@ class Event < ActiveRecord::Base
     def sequence
       # Set the iCalendar SEQUENCE, which should be increased each time an
       # event is updated. If an admin needs to forcefully increment the
-      # SEQUENCE for all events, they can edit the "config/secrets.yml"
+      # SEQUENCE for all events, they can edit the "config/initializers/calagator.rb"
       # file and set the "icalendar_sequence_offset" value to something
       # greater than 0.
-      (SECRETS.icalendar_sequence_offset || 0) + event.versions.count
+      (Calagator.icalendar_sequence_offset || 0) + event.versions.count
     end
 
     def dtstamp

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

@@ -3,7 +3,7 @@ module Calagator
 class Event < ActiveRecord::Base
   class Saver < Struct.new(:event, :params, :failure)
     def save
-      event.attributes = params[:event]
+      event.attributes = params[:event] || {}
       event.venue      = find_or_initialize_venue
       event.start_time = [ params[:start_date], params[:start_time] ]
       event.end_time   = [ params[:end_date], params[:end_time] ]
@@ -23,7 +23,7 @@ class Event < ActiveRecord::Base
       if params[:event] && params[:event][:venue_id].present?
         Venue.find(params[:event][:venue_id]).progenitor
       else
-        Venue.find_or_initialize_by_title(params[:venue_name]).progenitor
+        Venue.find_or_initialize_by(title: params[:venue_name]).progenitor
       end
     end
 

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

@@ -50,11 +50,12 @@ class Event < ActiveRecord::Base
       def base
         column_names = Event.column_names.map { |name| "events.#{name}"}
         column_names << "venues.id"
-        @scope = Event.scoped
+        @scope = Event.all
           .group(column_names)
           .joins("LEFT OUTER JOIN taggings on taggings.taggable_id = events.id AND taggings.taggable_type LIKE '%Event'")
           .joins("LEFT OUTER JOIN tags ON tags.id = taggings.tag_id")
           .includes(:venue)
+          .references(:venues, :tags)
         self
       end
 

data/app/models/calagator/source.rb

@@ -25,8 +25,6 @@ module Calagator
 class Source < ActiveRecord::Base
   self.table_name = "sources"
 
-  attr_protected
-
   validate :assert_url
 
   has_many :events,  :dependent => :destroy
@@ -39,30 +37,6 @@ class Source < ActiveRecord::Base
   xss_foliate
   include DecodeHtmlEntitiesHack
 
-  # Return a newly-created or existing Source record matching the given
-  # attributes. The +attrs+ hash is the same format as used when calling
-  # Source::new.
-  #
-  # This method is intended to supplement the import process by providing a
-  # single Source record for each unique URL, thus when multiple people import
-  # the same URL, there will only be one Source record.
-  #
-  # The :reimport flag is given special handling: If the original Source record
-  # has this set to true, it will never be set back to false by this method.
-  # The intent behind this is that if one person wants this Source reimported,
-  # the reimporting shouldn't be disabled by someone else manually importing it
-  # without setting the reimport flag. If someone really wants to turn off
-  # reimporting, they should edit the source.
-  def self.find_or_create_from(attrs={})
-    return new(attrs) unless attrs[:url]
-
-    source = find_or_create_by_url(attrs[:url])
-    source.reimport = true if attrs.delete(:reimport)
-    source.attributes = attrs
-    source.save if source.changed?
-    source
-  end
-
   # Create events for this source. Returns the events created. URL must be set
   # for this source for this to work.
   def create_events!(opts={})

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

@@ -3,7 +3,7 @@ module Calagator
 class Source < ActiveRecord::Base
   class Importer < Struct.new(:source, :events)
     def initialize params
-      self.source = Source.find_or_create_from(params)
+      self.source = Source.find_or_create_by(params)
     end
 
     def import

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

@@ -5,7 +5,7 @@ class Source::Parser::Meetup < Source::Parser
   self.url_pattern = %r{^http://(?:www\.)?meetup\.com/[^/]+/events/([^/]+)/?}
 
   def to_events
-    return fallback unless SECRETS.meetup_api_key.present?
+    return fallback unless Calagator.meetup_api_key.present?
     return unless data = get_data
     event = Event.new({
       source:      opts[:source],
@@ -36,7 +36,7 @@ class Source::Parser::Meetup < Source::Parser
       [
         "https://api.meetup.com/2/event/#{event_id}",
         {
-          key: SECRETS.meetup_api_key,
+          key: Calagator.meetup_api_key,
           sign: 'true'
         }
       ]

data/app/models/calagator/venue.rb

@@ -39,8 +39,6 @@ module Calagator
 class Venue < ActiveRecord::Base
   self.table_name = "venues"
 
-  attr_protected
-
   include StripWhitespace
 
   has_paper_trail

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

@@ -14,7 +14,7 @@ class Venue < ActiveRecord::Base
     def geocode
       return true unless should_geocode?
 
-      self.geo = GeoKit::Geocoders::MultiGeocoder.geocode(venue.geocode_address)
+      self.geo = Geokit::Geocoders::MultiGeocoder.geocode(venue.geocode_address)
       if geo.success
         venue.latitude       = geo.lat
         venue.longitude      = geo.lng

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

@@ -17,7 +17,7 @@ class Venue < ActiveRecord::Base
 
       def base
         column_names = Venue.column_names.map { |name| "venues.#{name}" }
-        @scope = Venue.scoped
+        @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")

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

@@ -1,12 +1,12 @@
 <div id="events_subnav" class="subnav">
     <ul class="clearfix">
-      <li><%= link_to 'Browse Events', root_url,
+      <li><%= link_to 'Browse events', root_url,
               :class => subnav_class_for("site", "index") %>
       </li>
       <li><%= link_to 'Add an event', new_event_url,
               :class => subnav_class_for("events", "new") %>
       </li>
-      <li><%= link_to 'Import event(s)', new_source_url,
+      <li><%= link_to 'Import events', new_source_url,
               :class => subnav_class_for("sources", "new") %>
       </li>
     </ul>

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

@@ -43,7 +43,7 @@
     <li><%= link_to "Google Calendar", google_event_export_link(@event), :id => "google_calendar_export", :target => "_blank" %></li>
     <li><%= link_to 'iCalendar file', "#{event_url(@event)}.ics" %></li>
     <li>
-      <%= link_to_function 'hCalendar markup', '$("#hcal_field").toggle()' %>
+      <a href="#" onclick="$('#hcal_field').toggle(); return false">hCalendar markup</a>
       <div id="hcal_field" style="display: none;">
         <%= text_area_tag 'hCalendar',
           h(
@@ -67,7 +67,7 @@
       <%= link_to "edit", edit_event_url(@event) %>,
       <%= link_to "clone", clone_event_url(@event) %>,
       or 
-      <%= link_to "delete", event_url(@event), :method => :delete, :confirm => "Are you sure?" %>
+      <%= link_to "delete", event_url(@event), method: :delete, data: { confirm: "Are you sure?" } %>
       this event.
     </p>
     <% end %>

data/app/views/calagator/site/_description.html.erb

@@ -1,3 +1,6 @@
-<p class="replace-this-text">
-  Describe your site in: <code>themes/YOUR_THEME/views/site/_description.html.erb</code>
-</p>
+<div class='replace-this-text'>
+  <h2>Hi there.</h2>
+  <p>
+    Describe your site in: <code>app/views/calagator/site/_description.html.erb</code>
+  </p>
+</div>

data/app/views/calagator/site/_sidebar_menu.html.erb

@@ -0,0 +1,13 @@
+<h4>Get Started</h4>
+<ul>
+  <li><%= link_to "Find local events", about_url(anchor: "find_local_events") %></li>
+  <li><%= link_to "Share local events", about_url(anchor: "share_local_events") %></li>
+  <li><%= link_to "Get involved", about_url(anchor: "get_involved") %></li>
+  <li><%= link_to "Find out about us", about_url %></li>
+</ul>
+
+<h4>Subscribe To</h4>
+<ul>
+  <li><%= link_to "iCalendar feed", icalendar_feed_link %></li>
+  <li><%= link_to "Atom feed", atom_feed_link %></li>
+</ul>

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

@@ -5,6 +5,7 @@
 <div id="homepage_sidebar">
   <div id="project_description">
     <%= render :partial => "description" %>
+    <%= render :partial => "sidebar_menu" %>
   </div>
 
   <% if @overview.tags.present? %>

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

@@ -10,7 +10,7 @@
   <tr class="<%= cycle 'odd', 'even' %>">
     <td>
       <%= link_to 'Show', source %> | 
-      <%= link_to 'Destroy', source, :confirm => 'Are you sure?', :method => :delete %>
+      <%= link_to 'Destroy', source, method: :delete, data: {confirm: 'Are you sure?' } %>
     </td>
     <td><%= source_url_link source %></td>
   </tr>

data/app/views/calagator/sources/show.html.erb

@@ -13,4 +13,4 @@
 </p>
 
 <%= link_to 'Back', sources_path %> |
-<%= link_to 'Destroy', @source, :confirm => 'Are you sure?', :method => :delete %>
+<%= link_to 'Destroy', @source, method: :delete, data: { confirm: 'Are you sure?' } %>

data/app/views/calagator/venues/_subnav.html.erb

@@ -1,6 +1,6 @@
 <div id="venues_subnav" class="subnav">
     <ul class="clearfix">
-      <li><%= link_to 'Browse venues', venues_url, 
+      <li><%= link_to 'Browse venues', venues_url,
               :class => subnav_class_for("venues", "index") %>
       </li>
       <li><%= link_to 'Add a venue', new_venue_url,