calagator 1.0.0.rc2 → 1.0.0.rc3

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

@@ -8,7 +8,7 @@ class Source::Parser::Meetup < Source::Parser
     return fallback unless Calagator.meetup_api_key.present?
     return unless data = get_data
     event = Event.new({
-      source:      opts[:source],
+      source:      source,
       title:       data['name'],
       description: data['description'],
       url:         data['event_url'],
@@ -32,7 +32,7 @@ class Source::Parser::Meetup < Source::Parser
   end
 
   def get_data
-    to_events_api_helper(opts[:url], "problem") do |event_id|
+    to_events_api_helper(url, "problem") do |event_id|
       [
         "https://api.meetup.com/2/event/#{event_id}",
         {
@@ -46,7 +46,7 @@ class Source::Parser::Meetup < Source::Parser
   def to_venue(value)
     return if value.blank?
     venue = Venue.new({
-      source: opts[:source],
+      source: source,
       title: value['name'],
       street_address: [value['address_1'], value['address_2'], value['address_3']].compact.join(", "),
       locality: value['city'],
@@ -60,11 +60,10 @@ class Source::Parser::Meetup < Source::Parser
     venue_or_duplicate(venue)
   end
 
-  def to_events_wrapper(driver, source, target)
-    if matcher = opts[:url].try(:match, source)
-      url = target.call(matcher)
-      opts[:content] = self.class.read_url(url)
-      driver.new(opts).to_events
+  def to_events_wrapper(driver, match, template)
+    url.try(:match, match) do |matcher|
+      url = template.call(matcher)
+      driver.new(url, source).to_events
     end
   end
 end

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

@@ -0,0 +1,7 @@
+# Exception raised if user requests parsing of a URL that requires
+# authentication but none was provided.
+class Calagator::Source::Parser
+  class NotConfiguredError < Exception
+  end
+end
+

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

@@ -7,7 +7,7 @@ class Source::Parser::Plancast < Source::Parser
   def to_events
     return unless data = get_data
     event = Event.new({
-      source:      opts[:source],
+      source:      source,
       title:       data['what'],
       description: data['description'],
 
@@ -27,7 +27,7 @@ class Source::Parser::Plancast < Source::Parser
   private
 
   def get_data
-    to_events_api_helper(opts[:url]) do |event_id|
+    to_events_api_helper(url) do |event_id|
       [
         'http://api.plancast.com/02/plans/show.json',
         {
@@ -42,7 +42,7 @@ class Source::Parser::Plancast < Source::Parser
     value = "" if value.nil?
     if value.present?
       venue = Venue.new({
-        source: opts[:source],
+        source: source,
         title: value['name'],
         address: value['address'],
         tag_list: "plancast:place=#{value['id']}",

data/app/models/calagator/venue.rb

@@ -33,6 +33,7 @@ require "calagator/url_prefixer"
 require "paper_trail"
 require "loofah-activerecord"
 require "loofah/activerecord/xss_foliate"
+require "validate_url"
 
 module Calagator
 
@@ -48,9 +49,7 @@ class Venue < ActiveRecord::Base
   include DecodeHtmlEntitiesHack
 
   # Associations
-  has_many :events, dependent: :nullify
-  def future_events; events.future_with_venue; end
-  def past_events; events.past_with_venue; end
+  has_many :events, -> { non_duplicates }, dependent: :nullify
   belongs_to :source
 
   # Triggers
@@ -58,83 +57,38 @@ class Venue < ActiveRecord::Base
   before_save :geocode!
 
   # Validations
-  validates_presence_of :title
-  validates_format_of :url,
-    :with => /(http|https):\/\/(\w+:{0,1}\w*@)?(\S+)(:[0-9]+)?(\/|\/([\w#!:.?+=&%@!\-\/]))?/,
-    :allow_blank => true,
-    :allow_nil => true
-  validates_inclusion_of :latitude,
-    :in => -90..90,
-    :allow_nil => true,
-    :message => "must be between -90 and 90"
-  validates_inclusion_of :longitude,
-    :in => -180..180,
-    :allow_nil => true,
-    :message => "must be between -180 and 180"
-
+  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 :title, :description, :address, :url, :street_address, :locality, :region, :postal_code, :country, :email, :telephone, blacklist: true
 
   # Duplicates
   include DuplicateChecking
   duplicate_checking_ignores_attributes    :source_id, :version, :closed, :wifi, :access_notes
   duplicate_squashing_ignores_associations :tags, :base_tags, :taggings
+  duplicate_finding_scope -> { non_duplicates.order(:title, :id) }
 
   # Named scopes
-  scope :masters,          -> { where(duplicate_of_id: nil).includes(:source, :events, :tags, :taggings) }
+  scope :masters,          -> { 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) }
 
-  #===[ Finders ]=========================================================
-
-  # Return Hash of Venues grouped by the +type+, e.g., a 'title'. Each Venue
-  # record will include an <tt>events_count</tt> field containing the number of
-  # events at the venue, which improves performance for displaying these.
-  def self.find_duplicates_by_type(type='na')
-    case type
-    when 'na', nil, ''
-      # The LEFT OUTER JOIN makes sure that venues without any events are also returned.
-      return { [] => \
-        self.where('venues.duplicate_of_id IS NULL').order('LOWER(venues.title)')
-      }
-    else
-      kind = %w[all any].include?(type) ? type.to_sym : type.split(',').map(&:to_sym)
-
-      return self.find_duplicates_by(kind, 
-        :grouped  => true, 
-        :where    => 'a.duplicate_of_id IS NULL AND b.duplicate_of_id IS NULL'
-      )
-    end
-  end
-
-  #===[ Search ]==========================================================
-
   def self.search(query, opts={})
     SearchEngine.search(query, opts)
   end
 
-  #===[ Overrides ]=======================================================
-
   def url=(value)
     super UrlPrefixer.prefix(value)
   end
 
-  #===[ Address helpers ]=================================================
-
-  # Does this venue have any address information?
-  def has_full_address?
-    [street_address, locality, region, postal_code, country].any?(&:present?)
-  end
-
   # Display a single line address.
   def full_address
-    if has_full_address?
-      "#{street_address}, #{locality} #{region} #{postal_code} #{country}"
-    end
+    full_address = "#{street_address}, #{locality} #{region} #{postal_code} #{country}"
+    full_address.strip != "," && full_address
   end
 
-  #===[ Geocoding helpers ]===============================================
-
   # Get an address we can use for geocoding
   def geocode_address
     full_address or address
@@ -143,9 +97,8 @@ class Venue < ActiveRecord::Base
   # Return this venue's latitude/longitude location,
   # or nil if it doesn't have one.
   def location
-    if [latitude, longitude].all?(&:present?)
-      [latitude, longitude]
-    end
+    location = [latitude, longitude]
+    location.all?(&:present?) && location
   end
 
   attr_accessor :force_geocoding
@@ -154,6 +107,10 @@ class Venue < ActiveRecord::Base
     Geocoder.geocode(self)
     true # Try to geocode, but don't complain if we can't.
   end
+
+  def update_events_count!
+    update_attribute(:events_count, events.non_duplicates.count)
+  end
 end
 
 end

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

@@ -1,38 +1,47 @@
 module Calagator
 
 class Venue < ActiveRecord::Base
-  class Geocoder < Struct.new(:venue, :geo)
+  class Geocoder < Struct.new(:venue)
     cattr_accessor(:perform_geocoding) { true }
-    class << self
-      alias_method :perform_geocoding?, :perform_geocoding
-    end
 
     def self.geocode(venue)
       new(venue).geocode
     end
 
     def geocode
-      return true unless should_geocode?
-
-      self.geo = Geokit::Geocoders::MultiGeocoder.geocode(venue.geocode_address)
-      if geo.success
-        venue.latitude       = geo.lat
-        venue.longitude      = geo.lng
-        venue.street_address = geo.street_address if venue.street_address.blank?
-        venue.locality       = geo.city           if venue.locality.blank?
-        venue.region         = geo.state          if venue.region.blank?
-        venue.postal_code    = geo.zip            if venue.postal_code.blank?
-        venue.country        = geo.country_code   if venue.country.blank?
-      end
-
+      return unless should_geocode?
+      map_geo_to_venue if geo.success
       log
     end
 
     private
 
+    def geo
+      @geo ||= Geokit::Geocoders::MultiGeocoder.geocode(venue.geocode_address)
+    end
+
+    VENUE_GEO_FIELD_MAP = {
+      street_address: :street_address,
+      locality:       :city,
+      region:         :state,
+      postal_code:    :zip,
+      country:        :country_code,
+    }
+
+    def map_geo_to_venue
+      # always overwrite lat and long
+      venue.latitude = geo.lat
+      venue.longitude = geo.lng
+
+      VENUE_GEO_FIELD_MAP.each do |venue_field, geo_field|
+        next if venue[venue_field].present?
+        venue[venue_field] = geo.send(geo_field)
+      end
+    end
+
     def should_geocode?
       [
-        self.class.perform_geocoding?,
+        perform_geocoding,
         (venue.location.blank? || venue.force_geocoding == "1"),
         venue.geocode_address.present?,
         venue.duplicate_of.blank?

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

@@ -9,11 +9,7 @@ class Venue < ActiveRecord::Base
     end
 
     def venues
-      @venues ||= if query
-        Venue.search(query, include_closed: include_closed, wifi: wifi)
-      else
-        base.business.wifi_status.search.scope
-      end
+      @venues ||= perform_search
     end
 
     def most_active_venues
@@ -28,8 +24,28 @@ class Venue < ActiveRecord::Base
       query || tag || all
     end
 
+    def failure_message
+      @failure_message
+    end
+
+    def hard_failure?
+      @hard_failure
+    end
+
     protected
 
+    def perform_search
+      if query
+        Venue.search(query, include_closed: include_closed, wifi: wifi)
+      else
+        base.business.wifi_status.search.scope
+      end
+    rescue ActiveRecord::StatementInvalid => e
+      @failure_message = "There was an error completing your search."
+      @hard_failure = true
+      []
+    end
+
     def base
       @scope = Venue.non_duplicates
       self

data/app/observers/calagator/cache_observer.rb

@@ -12,7 +12,7 @@ class CacheObserver < ActiveRecord::Observer
   # 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)
-    return "#{name}@#{Time.now.strftime('%Y%m%d')}"
+    return "#{name}@#{Time.zone.now.strftime('%Y%m%d')}"
   end
 
   # Expires all cached data.

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

@@ -2,6 +2,15 @@
 
 <p>Locking an event prevents editing or deleting it.</p>
 
+
+<%= form_tag admin_events_path, :method => :get do %>
+  <div id="admin_search_form">
+  <label for="admin_search_field">Search Events</label>
+    <%= search_field_tag "query", @admin_query, :id => "admin_search_field" %>
+    <%= submit_tag("Search") %>
+  </div>
+<% end -%>
+
 <table style="width: 60%; border: 1px solid black;">
   <thead>
     <tr style="background-color: #ccc;">
@@ -17,9 +26,9 @@
       <td style="border: 1px solid gray"><%= event.start_time %></td>
       <td style="border: 1px solid gray">
         <% if event.locked %>
-        <%= button_to "Unlock", lock_event_path(:event_id => event.id) %>
+        <%= button_to "Unlock", lock_event_path(:event_id => event.id, :query => @admin_query) %>
         <% else %>
-        <%= button_to "Lock", lock_event_path(:event_id => event.id) %>
+        <%= button_to "Lock", lock_event_path(:event_id => event.id, :query => @admin_query) %>
         <% end %>
       </td>
     </tr>

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

@@ -23,7 +23,7 @@
       <% if !event.venue.country.blank? %>
         <div class='country-name'><%= event.venue.country %><div>
       <% end %>
-      <% if event.venue && event.venue.has_full_address? %>
+      <% if event.venue && event.venue.full_address.present? %>
         (<a href='<%=google_maps_url(event.venue.full_address)%>'>map</a>)
       <% end %>
     </div>

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

@@ -13,10 +13,9 @@
 </div>
 <% end -%>
 
-<%= semantic_form_for(event, :html => {:id => 'event_form', :class => 'standard_form', :novalidate => 'novalidate'}) do |f| %>
+<%= semantic_form_for(event, :html => {:id => 'event_form', :class => 'standard-form', :novalidate => 'novalidate'}) do |f| %>
   <%= f.inputs :name => "#{'Editing: ' unless event.new_record?} <em>#{event.title}</em>".html_safe do %>
-    <%= f.input :title, :label => "Event Name" %>
-    <% focus_on '#event_title' %>
+    <%= f.input :title, label: "Event Name", input_html: { autofocus: true } %>
     <li class="string input required stringish" id="event_venue_title_input">
       <%= label_tag :venue_name, "Venue", :class => 'label' %>
       <%= text_field_tag 'venue_name', '', :class=> 'autocomplete', :value => !event.venue.nil? ? event.venue.title : params[:venue_name] %>
@@ -26,19 +25,21 @@
         Type the name of a venue to search. If it doesn't exist, we'll create it for you.
       </p>
     <li>
-    <li id="event_times" class='input'>
-      <%= f.label :when, "When", :class => 'label' %>
-      <%
-        present = Time.now
-        # Provide initial default values for the start_time and end_time rounded to the upcoming hour.
-        event.start_time ||= present + (60.minutes - present.min.minutes) - present.sec
-        event.end_time   ||= present + (60.minutes - present.min.minutes) - present.sec + 1.hour
-      %>
-        <%= text_field_tag 'start_date', event.start_time.to_date, :id => 'date_start', :class => 'date_picker' %>
-        <%= text_field_tag 'start_time', event.start_time.strftime('%I:%M %p'), :id => 'time_start', :class => 'time_picker' %>
+    <li class="event-times" class='input'>
+      <%= f.label :when, :class => 'label'  do -%>
+        When<abbr title="required">*</abbr>
+      <% end -%>
+        <div class="event_start">
+          <%= text_field_tag 'start_date', format_event_date(event.start_time), :id => 'date_start', :class => 'date_picker' %>
+          <span class="at">@</span>
+          <%= text_field_tag 'start_time', format_event_time(event.start_time), :id => 'time_start', :class => 'time_picker' %>
+        </div>
         <span class="to">to</span>
-        <%= text_field_tag 'end_time', event.end_time.strftime('%I:%M %p'), :id => 'time_end', :class => 'time_picker' %>
-        <%= text_field_tag 'end_date', event.end_time.to_date, :id => 'date_end', :class => 'date_picker' %>
+        <div class="event_end">
+          <%= text_field_tag 'end_date', format_event_date(event.end_time), :id => 'date_end', :class => 'date_picker' %>
+          <span class="at">@</span>
+          <%= text_field_tag 'end_time', format_event_time(event.end_time), :id => 'time_end', :class => 'time_picker' %>
+        </div>
         <%= f.semantic_errors :start_date, :start_time, :end_date, :end_time %>
     </li>
     <%= f.input :url, :label => 'Website' %>
@@ -48,7 +49,7 @@
     <%= f.input :venue_details, :required => false,
                 :input_html => {:rows => 4},
                 :hint => "(Event-specific details like the room number, or who to call to be let into the building.)" %>
-    <%= f.input :tag_list, :required => false,
+    <%= f.input :tag_list, :input_html => { :value => event.tag_list.to_s }, :required => false,
                 :label => 'Tags',
                 :hint => "(Tags are comma-separated keywords that make it easier to find your event and boost its position in searches. You can also use a tag like <code>plancast:plan=ABCD</code> to associate this with a particular <a href='http://plancast.com/'>Plancast</a> event, or a tag like <code>epdx:group=1234</code> to associate the event with a particular <a href='http://epdx.org/'>ePDX</a> group)".html_safe %>
     <li class='trap'>

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

@@ -20,7 +20,7 @@
       <% if !@event.venue.country.blank? -%>
         <div class='country-name'><%= @event.venue.country -%></div>
       <% end -%>
-      <% if @event.venue && @event.venue.has_full_address? -%>
+      <% if @event.venue && @event.venue.full_address.present? -%>
         (<a href='<%=google_maps_url(@event.venue.full_address) -%>'>map</a>)
       <% end -%>
     </div>

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

@@ -19,7 +19,7 @@ html_classes << " contentbar" if has_contentbar
     <div class='date'><%= normalize_time(event) -%></div>
       <% unless event.venue.blank? %>
       <div class="clearfix location p-location h-card vcard<%= " closed" if event.venue.closed? %>"  itemprop="location" itemscope itemtype="http://schema.org/Place">
-          <%= map event %>
+          <%= map event.venue %>
           <a class="url u-url" href='<%= event.venue.new_record? ? "#" : venue_url(event.venue) %>'>
             <span class='fn org p-name' itemprop="name"><%= event.venue.title -%></span>
           </a>
@@ -40,7 +40,7 @@ html_classes << " contentbar" if has_contentbar
             <% if !event.venue.country.blank? -%>
             <span class='country-name p-country-name'><%= event.venue.country -%></span>
             <% end -%>
-            <% if event.venue && event.venue.has_full_address? -%>
+            <% if event.venue && event.venue.full_address.present? -%>
             (<a href='<%=google_maps_url(event.venue.full_address) -%>'>map</a>)
             <% end -%>