RubyGems - calagator - Versions diffs - 0.0.1.pre1 → 1.0.0.rc1 - Mend

calagator 0.0.1.pre1 → 1.0.0.rc1

Files changed (182) hide show

checksums.yaml +4 -4
data/{LICENSE.txt → MIT-LICENSE.txt} +0 -0
data/README.md +4 -18
data/Rakefile +6 -0
data/app/assets/javascripts/calagator.js +1 -0
data/app/assets/stylesheets/calagator/changes.scss +45 -0
data/app/assets/stylesheets/calagator/errors.css +8 -0
data/app/assets/stylesheets/calagator/forms.scss +148 -2
data/app/assets/stylesheets/calagator/index.scss +21 -0
data/app/assets/stylesheets/calagator/layout.scss +731 -0
data/app/assets/stylesheets/calagator/mobile.scss +196 -0
data/app/assets/stylesheets/calagator/{reset.css → reset.scss} +0 -0
data/app/assets/stylesheets/calagator/typography.scss +225 -0
data/app/assets/stylesheets/calagator/{common.scss → utils.scss} +0 -0
data/app/assets/stylesheets/calagator/variables.scss +21 -0
data/app/controllers/calagator/admin_controller.rb +1 -1
data/app/controllers/calagator/application_controller.rb +3 -3
data/app/controllers/calagator/events_controller.rb +3 -3
data/app/controllers/calagator/site_controller.rb +1 -1
data/app/controllers/calagator/sources_controller.rb +3 -3
data/app/controllers/calagator/venues_controller.rb +4 -4
data/app/controllers/calagator/versions_controller.rb +2 -2
data/app/helpers/calagator/application_helper.rb +0 -3
data/app/helpers/calagator/mapping_helper.rb +9 -8
data/app/models/calagator/event.rb +2 -3
data/app/models/calagator/event/ical_renderer.rb +4 -2
data/app/models/calagator/event/saver.rb +2 -2
data/app/models/calagator/event/search_engine/sql.rb +2 -1
data/app/models/calagator/source.rb +0 -26
data/app/models/calagator/source/importer.rb +1 -1
data/app/models/calagator/source/parser/meetup.rb +2 -2
data/app/models/calagator/venue.rb +0 -2
data/app/models/calagator/venue/geocoder.rb +1 -1
data/app/models/calagator/venue/search_engine/sql.rb +1 -1
data/app/views/calagator/events/_subnav.html.erb +2 -2
data/app/views/calagator/events/show.html.erb +2 -2
data/app/views/calagator/site/_description.html.erb +6 -3
data/app/views/calagator/site/_sidebar_menu.html.erb +13 -0
data/app/views/calagator/site/index.html.erb +1 -0
data/app/views/calagator/sources/index.html.erb +1 -1
data/app/views/calagator/sources/show.html.erb +1 -1
data/app/views/calagator/venues/_subnav.html.erb +1 -1
data/app/views/calagator/venues/show.html.erb +1 -1
data/app/views/layouts/calagator/_after_footer.html.erb +2 -0
data/app/views/layouts/calagator/_content.html.erb +6 -0
data/app/views/layouts/calagator/_footer.html.erb +8 -0
data/app/views/layouts/calagator/_global_search.html.erb +11 -0
data/app/views/layouts/calagator/_header.html.erb +20 -0
data/app/views/layouts/calagator/application.html.erb +9 -64
data/config/routes.rb +16 -16
data/config/spring.rb +1 -0
data/db/development +0 -0
data/db/development.sqlite3 +0 -0
data/db/migrate/20150407014752_add_taggings_counter_cache_to_tags.acts_as_taggable_on_engine.rb +14 -0
data/db/migrate/20150407014754_change_collation_for_tag_names.acts_as_taggable_on_engine.rb +9 -0
data/db/schema.rb +2 -8
data/db/seeds.rb +64 -8
data/lib/calagator.rb +42 -2
data/lib/calagator/duplicate_checking/duplicate_finder.rb +1 -1
data/lib/calagator/duplicate_checking/duplicate_squasher.rb +1 -1
data/lib/calagator/engine.rb +12 -22
data/lib/calagator/tag_model_extensions.rb +1 -1
data/lib/calagator/version.rb +1 -1
data/lib/generators/calagator/install_generator.rb +17 -12
data/lib/generators/calagator/templates/config/initializers/01_calagator.rb +89 -0
data/lib/generators/calagator/templates/config/initializers/02_geokit.rb +106 -0
data/lib/tasks/sunspot_reindex_calagator.rake +16 -3
data/lib/tasks/update_counter_caches.rake +3 -3
data/spec/controllers/calagator/events_controller_spec.rb +3 -3
data/spec/controllers/calagator/sources_controller_spec.rb +3 -3
data/spec/controllers/calagator/venues_controller_spec.rb +5 -5
data/spec/dummy/Gemfile +35 -27
data/spec/dummy/README.rdoc +15 -248
data/spec/dummy/Rakefile +1 -2
data/spec/dummy/app/assets/javascripts/application.js +5 -4
data/spec/dummy/app/assets/stylesheets/application.css +6 -4
data/spec/dummy/app/controllers/application_controller.rb +3 -1
data/spec/dummy/app/views/layouts/application.html.erb +2 -2
data/spec/dummy/bin/bundle +3 -0
data/spec/dummy/bin/rails +4 -0
data/spec/dummy/bin/rake +4 -0
data/spec/dummy/bin/setup +29 -0
data/spec/dummy/config.ru +2 -2
data/spec/dummy/config/application.rb +5 -41
data/spec/dummy/config/boot.rb +1 -4
data/spec/dummy/config/database.yml +8 -8
data/spec/dummy/config/environment.rb +3 -3
data/spec/dummy/config/environments/development.rb +22 -18
data/spec/dummy/config/environments/production.rb +46 -34
data/spec/dummy/config/environments/test.rb +19 -14
data/spec/dummy/config/initializers/01_calagator.rb +89 -0
data/spec/dummy/config/initializers/02_geokit.rb +106 -0
data/spec/dummy/config/initializers/assets.rb +11 -0
data/spec/dummy/config/initializers/cookies_serializer.rb +3 -0
data/spec/dummy/config/initializers/filter_parameter_logging.rb +4 -0
data/spec/dummy/config/initializers/inflections.rb +6 -5
data/spec/dummy/config/initializers/mime_types.rb +0 -1
data/spec/dummy/config/initializers/session_store.rb +1 -6
data/spec/dummy/config/initializers/wrap_parameters.rb +6 -6
data/spec/dummy/config/locales/en.yml +20 -2
data/spec/dummy/config/routes.rb +23 -25
data/spec/dummy/config/secrets.yml +16 -77
data/spec/dummy/config/sunspot.yml +23 -0
data/spec/dummy/db/development.sqlite3 +0 -0
data/spec/dummy/db/schema.rb +31 -30
data/spec/dummy/db/seeds.rb +1 -0
data/spec/dummy/log/development.log +257 -235
data/spec/dummy/public/404.html +54 -13
data/spec/dummy/public/422.html +54 -13
data/spec/dummy/public/500.html +53 -12
data/spec/dummy/public/robots.txt +2 -2
data/spec/dummy/test/test_helper.rb +2 -5
data/spec/factories.rb +0 -54
data/spec/features/admin_auth_spec.rb +2 -2
data/spec/features/admin_lock_event_spec.rb +1 -1
data/spec/features/import_events_from_feed_spec.rb +1 -1
data/spec/helpers/calagator/google_event_export_helper_spec.rb +8 -11
data/spec/helpers/calagator/sources_helper_spec.rb +1 -2
data/spec/helpers/calagator/tags_helper_spec.rb +1 -2
data/spec/models/calagator/event_spec.rb +7 -7
data/spec/models/calagator/source/parser_meetup_spec.rb +3 -3
data/spec/models/calagator/source_spec.rb +0 -29
data/spec/models/calagator/venue_spec.rb +8 -11
data/spec/spec_helper.rb +3 -1
data/spec/support/admin_authentication.rb +2 -0
data/spec/support/assert_dom_equal.rb +26 -0
data/spec/support/paper_trail.rb +7 -0
data/spec/support/rspec-activemodel-mocks_patch.rb +9 -0
metadata +200 -280
data/app/assets/stylesheets/calagator.scss +0 -8
data/app/assets/stylesheets/calagator/datepicker.scss +0 -177
data/app/assets/stylesheets/calagator/theme.css +0 -0
data/app/models/event/search_engine/base.rb +0 -0
data/config/deploy/local.rb +0 -37
data/config/deploy/lucca.rb +0 -33
data/config/initializers/geokit.rb +0 -74
data/config/initializers/search_engine.rb +0 -4
data/config/initializers/set_default_url_host.rb +0 -5
data/db/test.sqlite3 +0 -0
data/lib/generators/calagator/templates/config/calagator.rb +0 -26
data/lib/generators/calagator/templates/config/secrets.yml.sample +0 -83
data/lib/secrets_reader.rb +0 -76
data/spec/dummy/Gemfile.lock +0 -195
data/spec/dummy/app/assets/images/rails.png +0 -0
data/spec/dummy/config/initializers/calagator.rb +0 -26
data/spec/dummy/config/initializers/secret_token.rb +0 -7
data/spec/dummy/db/migrate/20150309023304_create_events.calagator.rb +0 -18
data/spec/dummy/db/migrate/20150309023305_create_venues.calagator.rb +0 -18
data/spec/dummy/db/migrate/20150309023306_create_sources.calagator.rb +0 -17
data/spec/dummy/db/migrate/20150309023307_add_detailed_fields_to_venue.calagator.rb +0 -20
data/spec/dummy/db/migrate/20150309023308_add_end_time_to_events.calagator.rb +0 -10
data/spec/dummy/db/migrate/20150309023309_add_source_id_to_events.calagator.rb +0 -10
data/spec/dummy/db/migrate/20150309023310_add_source_id_to_venues.calagator.rb +0 -11
data/spec/dummy/db/migrate/20150309023311_add_duplicate_of_column_to_venues.calagator.rb +0 -10
data/spec/dummy/db/migrate/20150309023312_add_duplicate_of_column_to_events.calagator.rb +0 -10
data/spec/dummy/db/migrate/20150309023313_change_lat_long_type.calagator.rb +0 -13
data/spec/dummy/db/migrate/20150309023314_add_source_reimport.calagator.rb +0 -10
data/spec/dummy/db/migrate/20150309023315_change_end_time_to_duration.calagator.rb +0 -12
data/spec/dummy/db/migrate/20150309023316_remove_format_type_from_source.calagator.rb +0 -10
data/spec/dummy/db/migrate/20150309023317_create_updates.calagator.rb +0 -16
data/spec/dummy/db/migrate/20150309023318_remove_next_update_from_source.calagator.rb +0 -10
data/spec/dummy/db/migrate/20150309023319_change_duration_to_end_time.calagator.rb +0 -12
data/spec/dummy/db/migrate/20150309023320_create_tags_and_taggings.calagator.rb +0 -29
data/spec/dummy/db/migrate/20150309023321_create_versioned_events.calagator.rb +0 -26
data/spec/dummy/db/migrate/20150309023322_create_versioned_venues.calagator.rb +0 -33
data/spec/dummy/db/migrate/20150309023323_add_rrule_to_events.calagator.rb +0 -16
data/spec/dummy/db/migrate/20150309023324_create_versions.calagator.rb +0 -19
data/spec/dummy/db/migrate/20150309023325_add_closed_flag_to_venues.calagator.rb +0 -10
data/spec/dummy/db/migrate/20150309023326_add_wifi_flag_to_venues.calagator.rb +0 -10
data/spec/dummy/db/migrate/20150309023327_add_access_notes_to_venues.calagator.rb +0 -10
data/spec/dummy/db/migrate/20150309023328_add_events_count_to_venues.calagator.rb +0 -9
data/spec/dummy/db/migrate/20150309023329_add_venue_details_to_events.calagator.rb +0 -10
data/spec/dummy/db/migrate/20150309023330_acts_as_taggable_on_migration.calagator.rb +0 -51
data/spec/dummy/db/migrate/20150309023331_cleanup.calagator.rb +0 -15
data/spec/dummy/db/migrate/20150309023332_specify_venues_latitude_and_longitude_precision.calagator.rb +0 -12
data/spec/dummy/db/migrate/20150309023333_remove_updates.calagator.rb +0 -14
data/spec/dummy/db/migrate/20150309023334_add_locked_status_to_events.calagator.rb +0 -6
data/spec/dummy/db/test.sqlite3 +0 -0
data/spec/dummy/doc/README_FOR_APP +0 -2
data/spec/dummy/script/rails +0 -6
data/spec/dummy/test/performance/browsing_test.rb +0 -12
data/spec/lib/secrets_reader_spec.rb +0 -65

data/app/views/calagator/venues/show.html.erb CHANGED

@@ -12,7 +12,7 @@
     <div id='edit_link'>
       <p>
         You can <%= link_to "edit", edit_venue_url(@venue) %>
-        or <%= link_to "delete", venue_url(@venue), :method => :delete, :confirm => "Are you sure?" %>
+        or <%= link_to "delete", venue_url(@venue), method: :delete, data: { confirm: "Are you sure?" } %>
         this venue.
       </p>
     </div>

data/app/views/layouts/calagator/_after_footer.html.erb ADDED

	@@ -0,0 +1,2 @@
1	+ <%# Override this file to include Javascript in the layout's footer %>
2	+

data/app/views/layouts/calagator/_content.html.erb ADDED

@@ -0,0 +1,6 @@
+      <div id="content">
+        <%# flash[:success] = "yay"; flash[:failure] = "meh" %>
+        <%= render_flash %>
+        <%= yield %>
+      </div>

data/app/views/layouts/calagator/_footer.html.erb ADDED

@@ -0,0 +1,8 @@
+      <div id="top_footer">
+        <%= URI.parse(Calagator.url).host %>
+        <%= source_code_version %>
+        &nbsp;
+        &nbsp;
+        &nbsp;
+      </div>

data/app/views/layouts/calagator/_global_search.html.erb ADDED

@@ -0,0 +1,11 @@
+          <%= form_tag search_events_path, :method => :get do %>
+            <div id='search_form'>
+            <label for="search_field">Search Events</label>
+            <% if request.env["HTTP_USER_AGENT"] && request.env["HTTP_USER_AGENT"].include?("Safari") %>
+              <input type="search" name="query" value="<%= @query %>" results="5" id="search_field">
+            <% else %>
+              <%= text_field_tag 'query', @query, :id => 'search_field' %>
+            <% end %>
+            </div>
+          <% end -%>

data/app/views/layouts/calagator/_header.html.erb ADDED

@@ -0,0 +1,20 @@
+      <div id="global_header">
+        <%= link_to Calagator.title, root_path, id: "project_title" %>
+        <div id="top_menu">
+          <div id='app_menu'>
+            <ul>
+                <li class='<%=link_class[:events]%>'><%= link_to "Events", events_path %></li>
+                <li class='<%=link_class[:venues]%>'><%= link_to "Venues", venues_path %></li>
+            </ul>
+          </div>
+          <%= render partial: 'layouts/calagator/global_search' %>
+        </div>
+      </div>
+      <% # Pick a subnav %>
+      <%= render(:partial => 'calagator/events/subnav') if link_class[:events] == 'active' %>
+      <%= render(:partial => 'calagator/venues/subnav') if link_class[:venues] == 'active' %>
+      <%= render(:partial => 'calagator/sources/subnav') if link_class[:import] == 'active' %>

data/app/views/layouts/calagator/application.html.erb CHANGED

@@ -6,7 +6,7 @@
     <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
     <%= yield :open_graph_tags %>
     <title>
-      <%= "#{yield(:title)} » " if content_for?(:title) -%>
+      <%= "#{yield(:title)} » ".html_safe if content_for?(:title) -%>
       <%= Calagator.title -%>: <%= Calagator.tagline -%>
     </title>
     <meta name="viewport" content="width=device-width, initial-scale=1.0, user-scalable=yes">
@@ -17,9 +17,9 @@
     <!-- Stylesheets, static -->
     <%= stylesheet_link_tag 'application', :media => :all %>
-    <link rel="stylesheet" href="https://d591zijq8zntj.cloudfront.net/leaflet-0.6.4/leaflet.css" />
+    <link rel="stylesheet" href="http://cdnjs.cloudflare.com/ajax/libs/leaflet/0.7.3/leaflet.css" />
     <!--[if lte IE 8]>
-        <link rel="stylesheet" href="https://d591zijq8zntj.cloudfront.net/leaflet-0.6.4/leaflet.ie.css" />
+        <link rel="stylesheet" href="http://cdnjs.cloudflare.com/ajax/libs/leaflet/0.7.3/leaflet.ie.css" />
     <![endif]-->
     <!-- Stylesheets, inserted  -->
@@ -43,68 +43,13 @@
   </head>
   <body class="<%= "#{controller.controller_name}_#{action_name}" %> <%= "#{controller.controller_name}_controller" %> <%= %w[new create edit update].include?(action_name) ? "#{controller.controller_name}_change" : "" %>">
-  <div id="outer">
-    <div id="global_header">
-      <%= link_to Calagator.title, root_path, id: "project_title" %>
-      <div id="top_menu">
-         <div id='app_menu'>
-          <ul>
-              <li class='<%=link_class[:events]%>'><%= link_to "Events", events_path %></li>
-              <li class='<%=link_class[:venues]%>'><%= link_to "Venues", venues_path %></li>
-          </ul>
-        </div>
-        <div id='project_menu'>
-          <strong>Get Involved:</strong> <%= link_to "Blog", "http://calagator.wordpress.com/", {:class => 'first'} %> | <%= link_to "Forum", "http://groups.google.com/group/pdx-tech-calendar/" %> | <%= link_to "Code", "https://github.com/calagator/calagator" %>
-          <br />
-          <strong>Something not right?</strong> <%= link_to "File an issue", "https://github.com/calagator/calagator/issues" %>
-        </div>
-        <%= form_tag search_events_path, :method => :get do %>
-          <div id='search_form'>
-          <label for="search_field">Search Events</label>
-          <% if request.env["HTTP_USER_AGENT"] && request.env["HTTP_USER_AGENT"].include?("Safari") %>
-            <input type="search" name="query" value="<%= @query %>" results="5" id="search_field">
-          <% else %>
-            <%= text_field_tag 'query', @query, :id => 'search_field' %>
-          <% end %>
-          </div>
-        <% end -%>
-      </div>
-    </div>
-    <% # Pick a subnav %>
-    <%= render(:partial => 'calagator/events/subnav') if link_class[:events] == 'active' %>
-    <%= render(:partial => 'calagator/venues/subnav') if link_class[:venues] == 'active' %>
-    <%= render(:partial => 'calagator/sources/subnav') if link_class[:import] == 'active' %>
-    <div id="content">
-      <%# flash[:success] = "yay"; flash[:failure] = "meh" %>
-      <%= render_flash %>
-      <%= yield %>
+    <div id="outer">
+      <%= render partial: 'layouts/calagator/header' %>
+      <%= render partial: 'layouts/calagator/content' %>
+      <%= render partial: 'layouts/calagator/footer' %>
     </div>
-    <div id="top_footer">
-      <%= URI.parse(Calagator.url).host %>
-      <%= source_code_version %>
-      &nbsp;
-      &nbsp;
-      &nbsp;
-    </div>
-</div>
-    <% if Rails.env == 'production' %>
-      <script type="text/javascript">
-        var gaJsHost = (("https:" == document.location.protocol) ? "https://ssl." : "http://www.");
-        document.write(unescape("%3Cscript src='" + gaJsHost + "google-analytics.com/ga.js' type='text/javascript'%3E%3C/script%3E"));
-        </script>
-        <script type="text/javascript">
-        var pageTracker = _gat._getTracker("UA-168427-7");
-        pageTracker._initData();
-        pageTracker._trackPageview();
-      </script>
-    <% end %>
+    <%= render partial: 'layouts/calagator/after_footer' %>
   </body>
 </html>

data/config/routes.rb CHANGED

@@ -1,23 +1,23 @@
 Calagator::Engine.routes.draw do
-  match 'omfg' => 'site#omfg'
-  match 'hello' => 'site#hello'
+  get 'omfg' => 'site#omfg'
+  get 'hello' => 'site#hello'
-  match 'about' => 'site#about'
+  get 'about' => 'site#about'
-  match 'opensearch.:format' => 'site#opensearch'
-  match 'defunct' => 'site#defunct'
+  get 'opensearch.:format' => 'site#opensearch'
+  get 'defunct' => 'site#defunct'
-  match 'admin' => 'admin#index'
+  get 'admin' => 'admin#index'
   get "admin/index"
   get "admin/events"
-  match "lock_event" => "admin#lock_event", :only => :post
+  post "lock_event" => "admin#lock_event"
   resources :events do
     collection do
       post :squash_many_duplicates
       get :search
       get :duplicates
-      match 'tag/:tag', via: :get, to: :search, as: :tag
+      get 'tag/:tag', to: :search, as: :tag
     end
     member do
@@ -37,19 +37,19 @@ Calagator::Engine.routes.draw do
       get :map
       get :duplicates
       get :autocomplete
-      match 'tag/:tag', via: :get, to: :search, as: :tag
+      get 'tag/:tag', to: :search, as: :tag
     end
   end
   resources :versions, :only => [:edit]
   resources :changes, :controller => 'paper_trail_manager/changes'
-  match 'recent_changes' => redirect("/changes")
-  match 'recent_changes.:format' => redirect("/changes.%{format}")
+  get 'recent_changes' => redirect("/changes")
+  get 'recent_changes.:format' => redirect("/changes.%{format}")
-  match 'css/:name' => 'site#style'
-  match 'css/:name.:format' => 'site#style'
+  get 'css/:name' => 'site#style'
+  get 'css/:name.:format' => 'site#style'
-  match '/' => 'site#index', :as => :root
-  match '/index' => 'site#index'
-  match '/index.:format' => 'site#index'
+  get '/' => 'site#index', :as => :root
+  get '/index' => 'site#index'
+  get '/index.:format' => 'site#index'
 end

data/config/spring.rb ADDED

	@@ -0,0 +1 @@
1	+ Spring.application_root = './spec/dummy'

data/db/development ADDED

Binary file

data/db/development.sqlite3 CHANGED

Binary file

data/db/migrate/20150407014752_add_taggings_counter_cache_to_tags.acts_as_taggable_on_engine.rb ADDED

@@ -0,0 +1,14 @@
+class AddTaggingsCounterCacheToTags < ActiveRecord::Migration
+  def self.up
+    add_column :tags, :taggings_count, :integer, default: 0
+    ActsAsTaggableOn::Tag.reset_column_information
+    ActsAsTaggableOn::Tag.find_each do |tag|
+      ActsAsTaggableOn::Tag.reset_counters(tag.id, :taggings)
+    end
+  end
+  def self.down
+    remove_column :tags, :taggings_count
+  end
+end

data/db/migrate/20150407014754_change_collation_for_tag_names.acts_as_taggable_on_engine.rb ADDED

@@ -0,0 +1,9 @@
+# This migration is added to circumvent issue #623 and have special characters
+# work properly
+class ChangeCollationForTagNames < ActiveRecord::Migration
+  def up
+    if ActsAsTaggableOn::Utils.using_mysql?
+      execute("ALTER TABLE tags MODIFY name varchar(255) CHARACTER SET utf8 COLLATE utf8_bin;")
+    end
+  end
+end

data/db/schema.rb CHANGED

@@ -11,7 +11,7 @@
 #
 # It's strongly recommended to check this file into your version control system.
-ActiveRecord::Schema.define(:version => 20120831234448) do
+ActiveRecord::Schema.define(:version => 20150207231355) do
   create_table "events", :force => true do |t|
     t.string   "title"
@@ -27,6 +27,7 @@ ActiveRecord::Schema.define(:version => 20120831234448) do
     t.integer  "version"
     t.string   "rrule"
     t.text     "venue_details"
+    t.boolean  "locked",          :default => false
   end
   create_table "sources", :force => true do |t|
@@ -57,13 +58,6 @@ ActiveRecord::Schema.define(:version => 20120831234448) do
   add_index "tags", ["name"], :name => "index_tags_on_name", :unique => true
-  create_table "updates", :force => true do |t|
-    t.integer  "source_id"
-    t.text     "status"
-    t.datetime "created_at"
-    t.datetime "updated_at"
-  end
   create_table "venues", :force => true do |t|
     t.string   "title"
     t.text     "description"

data/db/seeds.rb CHANGED

@@ -1,15 +1,71 @@
 # ruby encoding: utf-8
-# This file should contain all the record creation needed to seed the database with its default values.
-# The data can then be loaded with the rake db:seed (or created alongside the db with db:setup).
-#
-# Examples:
-#
-#   cities = City.create([{ :name => 'Chicago' }, { :name => 'Copenhagen' }])
-#   Mayor.create(:name => 'Daley', :city => cities.first)
+begin
+  require 'faker'
+  require 'factory_girl'
+rescue LoadError
+  puts "Calagator's seeds require faker and factory_girl."
+  puts "Add them to your gemfile and try again."
+  exit 1
+end
-require 'faker'
+FactoryGirl.define do
+  factory :seed_venue, class: Calagator::Venue do
+    title           { Faker::Company.name }
+    description     { Faker::Lorem.paragraph }
+    address         { "#{Faker::Address.street_address},
+                       #{Faker::Address.city},
+                       #{Faker::Address.state}
+                       #{Faker::Address.zip_code}" }
+    street_address  { Faker::Address.street_address }
+    locality        { Faker::Address.city }
+    region          { Faker::Address.state }
+    postal_code     { [Faker::Address.zip_code, Faker::Address.postcode].sample }
+    country         { Faker::Address.country }
+    latitude        { Faker::Address.latitude }
+    longitude       { Faker::Address.longitude }
+    email           { Faker::Internet.email }
+    telephone       { Faker::PhoneNumber.phone_number }
+    url             { Faker::Internet.url }
+    closed          { [false, true].sample }
+    wifi            { [true, false].sample }
+    access_notes    Faker::Lorem.paragraph
+    trait :with_events do
+      after(:create) do | seed_venue |
+        create_list(:seed_event, 3, venue_id: seed_venue.id)
+      end
+    end
+  end
+  factory :seed_event, class: Calagator::Event do
+    from = 2.years.ago
+    to = 2.years.from_now
+    title       { Faker::Lorem.sentence }
+    description { Faker::Lorem.paragraph }
+    start_time  {
+      [
+        Faker::Time.between(2.years.ago, 2.years.from_now),
+        Faker::Time.backward(1, :all),
+        Faker::Time.forward(1, :all),
+        Faker::Time.forward(7, :all)
+      ].sample
+    }
+    created_at  { start_time - 1.days }
+    end_time    { start_time + 3.hours }
+    trait :with_venue do
+      before(:create) do |seed_event|
+        venue = create(:seed_venue)
+        seed_event.venue_id = venue.id
+      end
+    end
+  end
+end
+puts "Seeding database with sample data..."
 FactoryGirl.create_list(:seed_venue, 25, :with_events)
 FactoryGirl.create_list(:seed_venue, 25)
 FactoryGirl.create_list(:seed_event, 25, :with_venue)

data/lib/calagator.rb CHANGED

@@ -2,8 +2,8 @@ require "calagator/engine"
 require "formtastic"
 require "rails_autolink"
+require "rails-observers"
 require "nokogiri"
-require "columnize"
 require "geokit"
 require "htmlentities"
 require "paper_trail"
@@ -18,7 +18,6 @@ require "formtastic"
 require "acts-as-taggable-on"
 require "jquery-rails"
 require "jquery-ui-rails"
-require "progress_bar"
 require "font-awesome-rails"
 require "paper_trail_manager"
 require "utf8-cleaner"
@@ -27,4 +26,45 @@ require "sunspot_solr"
 require "lucene_query"
 module Calagator
+  mattr_accessor :title,
+    :tagline,
+    :url,
+    :administrator_email,
+    :admin_username,
+    :admin_password,
+    :meetup_api_key,
+    :search_engine,
+    :icalendar_sequence_offset,
+    :mapping_marker_color,
+    :mapping_google_maps_api_key,
+    :mapping_provider,
+    :mapping_tiles,
+    :venues_map_options,
+    :blacklist_patterns
+  self.title = 'Calagator'
+  self.tagline = 'A Tech Calendar'
+  self.url = 'http://my-calagator.org/'
+  self.administrator_email = 'your@email.addr'
+  self.search_engine = :sql
+  self.icalendar_sequence_offset = 0
+  self.mapping_marker_color = 'green'
+  self.mapping_provider = 'stamen'
+  self.mapping_tiles = 'terrain'
+  self.venues_map_options = {}
+  self.blacklist_patterns = [
+    /\b(online|overseas).+(drugstore|pharmacy)\b/,
+    /\bcialis\b/,
+  ]
+  def self.configure_search_engine
+    kind = search_engine.try(:to_sym)
+    Calagator::Event::SearchEngine.use(kind)
+    Calagator::Venue::SearchEngine.use(kind)
+  end
+  def self.setup(&block)
+    yield self
+  end
 end

data/lib/calagator/duplicate_checking/duplicate_finder.rb CHANGED

@@ -11,7 +11,7 @@ module DuplicateChecking
       scope = scope.where(query)
       scope.distinct
-      records = scope.all
+      records = scope.to_a
       records = group_by_fields(records) if grouped
       records
     end

data/lib/calagator/duplicate_checking/duplicate_squasher.rb CHANGED

@@ -20,7 +20,7 @@ module DuplicateChecking
           SingleSquasher.new(master, duplicate, model_name).squash
         end
         name = model_name.split("::").last
-        self.success = "Squashed duplicate #{name.pluralize} #{duplicates.map(&:title)} into master #{master.id}."
+        self.success = "Squashed duplicate #{name.pluralize} #{duplicates.map(&:title).sort} into master #{master.id}."
       end
       self
     end