calagator 0.0.1.pre1 → 1.0.0.rc1

data/spec/models/calagator/source/parser_meetup_spec.rb

@@ -3,9 +3,9 @@ require 'spec_helper'
 module Calagator
 
 describe Source::Parser::Meetup, :type => :model do
-  describe "with a meetup.com API key in secrets.yml" do
+  describe "with a meetup.com API key" do
     before do
-      SECRETS.meetup_api_key = "foo"
+      Calagator.meetup_api_key = "foo"
     end
 
     before(:each) do
@@ -40,7 +40,7 @@ describe Source::Parser::Meetup, :type => :model do
 
   context "without a meetup API key" do
     before do
-      SECRETS.meetup_api_key = nil
+      Calagator.meetup_api_key = nil
     end
 
     before(:each) do

data/spec/models/calagator/source_spec.rb

@@ -103,33 +103,4 @@ describe Source, "when parsing URLs", :type => :model do
   end
 end
 
-describe Source, "find_or_create_from", :type => :model do
-  before do
-    @url = "http://foo.bar"
-  end
-
-  it "should return new, unsaved record if given no arguments" do
-    source = Source.find_or_create_from()
-
-    expect(source).to be_a_new_record
-  end
-
-  it "should return an existing or newly-created record" do
-    record = Source.new(:url => @url)
-    expect(Source).to receive(:find_or_create_by_url).and_return(record)
-
-    result = Source.find_or_create_from(:url => @url)
-    expect(record).to eq result
-  end
-
-  it "should set re-import flag if given" do
-    record = Source.new(:url => @url)
-    expect(record).to receive(:save)
-    expect(Source).to receive(:find_or_create_by_url).and_return(record)
-
-    result = Source.find_or_create_from(:url => @url, :reimport => true)
-    expect(result.reimport).to be_truthy
-  end
-end
-
 end

data/spec/models/calagator/venue_spec.rb

@@ -214,11 +214,8 @@ describe Venue, :type => :model do
 
       expect(@venues.map{|venue| venue.events.count}).to eq [2, 0, 0]
 
-      events = @venues.map(&:events).flatten
-      expect(events).to be_present
-      for event in events
-        expect(event.venue).to eq @master_venue
-      end
+      events = @venues.flat_map(&:events).each(&:reload)
+      expect(events.map(&:venue)).to all(eq @master_venue)
     end
   end
 end
@@ -255,29 +252,29 @@ describe "Venue geocoding", :type => :model do
     end
 
     it "should geocode automatically on save" do
-      expect(GeoKit::Geocoders::MultiGeocoder).to receive(:geocode).once.and_return(@geo_success)
+      expect(Geokit::Geocoders::MultiGeocoder).to receive(:geocode).once.and_return(@geo_success)
       @venue.save
     end
 
     it "shouldn't geocode automatically unless there's an address" do
       @venue.address = ""
-      expect(GeoKit::Geocoders::MultiGeocoder).not_to receive(:geocode)
+      expect(Geokit::Geocoders::MultiGeocoder).not_to receive(:geocode)
       @venue.save
     end
 
     it "shouldn't geocode automatically if already geocoded" do
       @venue.latitude = @venue.longitude = 0.0
-      expect(GeoKit::Geocoders::MultiGeocoder).not_to receive(:geocode)
+      expect(Geokit::Geocoders::MultiGeocoder).not_to receive(:geocode)
       @venue.save
     end
 
     it "shouldn't fail if the geocoder returns failure" do
-      expect(GeoKit::Geocoders::MultiGeocoder).to receive(:geocode).once.and_return(@geo_failure)
+      expect(Geokit::Geocoders::MultiGeocoder).to receive(:geocode).once.and_return(@geo_failure)
       @venue.save
     end
 
     it "should fill in empty addressing fields" do
-      expect(GeoKit::Geocoders::MultiGeocoder).to receive(:geocode).once.and_return(@geo_success)
+      expect(Geokit::Geocoders::MultiGeocoder).to receive(:geocode).once.and_return(@geo_success)
       @venue.save
       expect(@venue.street_address).to eq @geo_success.street_address
       expect(@venue.locality).to eq @geo_success.city
@@ -287,7 +284,7 @@ describe "Venue geocoding", :type => :model do
 
     it "should leave non-empty addressing fields alone" do
       @venue.locality = "Cleveland"
-      expect(GeoKit::Geocoders::MultiGeocoder).to receive(:geocode).once.and_return(@geo_success)
+      expect(Geokit::Geocoders::MultiGeocoder).to receive(:geocode).once.and_return(@geo_success)
       @venue.save
       expect(@venue.locality).to eq "Cleveland"
     end

data/spec/spec_helper.rb

@@ -1,5 +1,6 @@
 if !File.exist?("spec/dummy")
-  raise "Missing dummy app in spec/dummy! Run bin/calagator new spec/dummy to generate one."
+  puts "Missing dummy app in spec/dummy! Run `bundle exec bin/calagator new spec/dummy --dummy` to generate one."
+  exit 1
 end
 
 unless RUBY_ENGINE == "rbx" # SimpleCov slows down Rubinius dramatically (using rbx 2.2.6)
@@ -14,6 +15,7 @@ unless RUBY_ENGINE == "rbx" # SimpleCov slows down Rubinius dramatically (using
 end
 
 require "rails_helper"
+require "sass"
 require "rspec-activemodel-mocks"
 require "rspec/its"
 require "rspec-rails"

data/spec/support/admin_authentication.rb

@@ -0,0 +1,2 @@
+Calagator.admin_username = "admin"
+Calagator.admin_password = "kitties!"

data/spec/support/assert_dom_equal.rb

@@ -0,0 +1,26 @@
+module DomEquivalence
+  extend RSpec::Matchers::DSL
+
+  matcher :match_dom_of do |target|
+    match_unless_raises ActiveSupport::TestCase::Assertion do |source|
+      assert_dom_equal source, target
+    end
+
+    failure_message do |source|
+      "Expected #{source} to have equivalent DOM to #{target}"
+    end
+
+    failure_message_when_negated do |source|
+      "Expected #{source} not to have equivalent DOM to #{target}"
+    end
+
+    description do
+      "should be DOM equivalent to #{target}"
+    end
+  end
+end
+
+
+class RSpec::Core::ExampleGroup
+  include DomEquivalence
+end

data/spec/support/paper_trail.rb

@@ -0,0 +1,7 @@
+require "paper_trail/frameworks/rspec"
+
+RSpec.configure do |config|
+  config.before do
+    PaperTrail.enabled = true
+  end
+end

data/spec/support/rspec-activemodel-mocks_patch.rb

@@ -0,0 +1,9 @@
+# Manually applied the patch from https://github.com/jdelStrother/rspec-activemodel-mocks/commit/1211c347c5a574739616ccadf4b3b54686f9051f
+if Gem.loaded_specs['rspec-activemodel-mocks'].version.to_s != "1.0.1"
+  raise "RSpec::ActiveModel::Mocks version has changed, please check if the behavior has already been fixed: https://github.com/rspec/rspec-activemodel-mocks/pull/10
+If so, this patch might be obsolete."
+end
+
+RSpec::ActiveModel::Mocks::Mocks::ActiveRecordInstanceMethods.class_eval do
+  alias_method :_read_attribute, :[]
+end

metadata

@@ -1,287 +1,265 @@
 --- !ruby/object:Gem::Specification
 name: calagator
 version: !ruby/object:Gem::Version
-  version: 0.0.1.pre1
+  version: 1.0.0.rc1
 platform: ruby
 authors:
 - The Calagator Team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-09 00:00:00.000000000 Z
+date: 2015-06-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 3.2.19
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 3.2.19
-- !ruby/object:Gem::Dependency
-  name: sass-rails
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '3.2'
-    - - ">="
+    - - "<"
       - !ruby/object:Gem::Version
-        version: 3.2.3
+        version: '5.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '3.2'
-    - - ">="
+    - - "<"
       - !ruby/object:Gem::Version
-        version: 3.2.3
+        version: '5.0'
 - !ruby/object:Gem::Dependency
-  name: sass
+  name: rails-observers
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.2'
+        version: '0.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.2'
+        version: '0.1'
 - !ruby/object:Gem::Dependency
-  name: formtastic
+  name: sass-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.2.1
+        version: '4.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.2.1
+        version: '4.0'
 - !ruby/object:Gem::Dependency
-  name: rails_autolink
+  name: sass
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.1.3
+        version: '3.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.1.3
+        version: '3.2'
 - !ruby/object:Gem::Dependency
-  name: nokogiri
+  name: formtastic
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.5.11
+        version: '3.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.5.11
+        version: '3.1'
 - !ruby/object:Gem::Dependency
-  name: columnize
+  name: rails_autolink
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.3.6
+        version: '1.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.3.6
+        version: '1.1'
 - !ruby/object:Gem::Dependency
-  name: geokit
+  name: nokogiri
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.6.5
+        version: '1.6'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.6.5
+        version: '1.6'
 - !ruby/object:Gem::Dependency
-  name: htmlentities
+  name: geokit
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.3.1
+        version: 1.9.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.3.1
+        version: 1.9.0
 - !ruby/object:Gem::Dependency
-  name: paper_trail
+  name: htmlentities
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.7.2
+        version: '4.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.7.2
+        version: '4.3'
 - !ruby/object:Gem::Dependency
   name: ri_cal
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.8.8
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.8.8
-- !ruby/object:Gem::Dependency
-  name: rubyzip
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 1.1.7
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 1.1.7
 - !ruby/object:Gem::Dependency
   name: will_paginate
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.0.5
+        version: '3.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.0.5
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: rest-client
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.6.7
+        version: '1.8'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.6.7
+        version: '1.8'
 - !ruby/object:Gem::Dependency
   name: loofah
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2.1
+        version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2.1
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: loofah-activerecord
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.1.0
+        version: '1.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.1.0
+        version: '1.2'
 - !ruby/object:Gem::Dependency
   name: bluecloth
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.2.0
+        version: '2.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.2.0
+        version: '2.2'
 - !ruby/object:Gem::Dependency
   name: acts-as-taggable-on
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.4.1
+        version: '3.5'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.4.1
+        version: '3.5'
 - !ruby/object:Gem::Dependency
   name: jquery-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '3.1'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '5.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '3.1'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '5.0'
 - !ruby/object:Gem::Dependency
   name: jquery-ui-rails
   requirement: !ruby/object:Gem::Requirement
@@ -296,48 +274,34 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '5.0'
-- !ruby/object:Gem::Dependency
-  name: progress_bar
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 1.0.0
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 1.0.0
 - !ruby/object:Gem::Dependency
   name: font-awesome-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.2.1.3
+        version: '4.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.2.1.3
+        version: '4.3'
 - !ruby/object:Gem::Dependency
   name: paper_trail_manager
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.2.0
+        version: 0.3.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.2.0
+        version: 0.3.0
 - !ruby/object:Gem::Dependency
   name: utf8-cleaner
   requirement: !ruby/object:Gem::Requirement
@@ -356,30 +320,30 @@ dependencies:
   name: sunspot_rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.1.1
+        version: '2.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.1.1
+        version: '2.1'
 - !ruby/object:Gem::Dependency
   name: sunspot_solr
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.1.1
+        version: '2.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.1.1
+        version: '2.1'
 - !ruby/object:Gem::Dependency
   name: lucene_query
   requirement: !ruby/object:Gem::Requirement
@@ -400,224 +364,224 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3.10
+        version: '1.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3.10
+        version: '1.3'
 - !ruby/object:Gem::Dependency
-  name: mysql2
+  name: rspec-activemodel-mocks
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.3.18
+        version: '1.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.3.18
+        version: '1.0'
 - !ruby/object:Gem::Dependency
-  name: pg
+  name: rspec-its
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.18.1
+        version: '1.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.18.1
+        version: '1.1'
 - !ruby/object:Gem::Dependency
-  name: rspec-activemodel-mocks
+  name: rspec-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.1
+        version: '3.2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.1
+        version: '3.2'
 - !ruby/object:Gem::Dependency
-  name: rspec-its
+  name: rspec-collection_matchers
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.1.0
+        version: '1.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.1.0
+        version: '1.1'
 - !ruby/object:Gem::Dependency
-  name: rspec-rails
+  name: factory_girl_rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.2.0
+        version: '4.5'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.2.0
+        version: '4.5'
 - !ruby/object:Gem::Dependency
-  name: rspec-collection_matchers
+  name: faker
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.1.2
+        version: '1.4'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.1.2
+        version: '1.4'
 - !ruby/object:Gem::Dependency
-  name: factory_girl_rails
+  name: capybara
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.5.0
+        version: '2.4'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.5.0
+        version: '2.4'
 - !ruby/object:Gem::Dependency
-  name: faker
+  name: coveralls
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.4.3
+        version: 0.8.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.4.3
+        version: 0.8.1
 - !ruby/object:Gem::Dependency
-  name: capybara
+  name: database_cleaner
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.4.4
+        version: '1.4'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.4.4
+        version: '1.4'
 - !ruby/object:Gem::Dependency
-  name: coveralls
+  name: poltergeist
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.7.1
+        version: '1.6'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.7.1
+        version: '1.6'
 - !ruby/object:Gem::Dependency
-  name: database_cleaner
+  name: timecop
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.4.0
+        version: 0.7.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.4.0
+        version: 0.7.1
 - !ruby/object:Gem::Dependency
-  name: poltergeist
+  name: webmock
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.6.0
+        version: '1.20'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.6.0
+        version: '1.20'
 - !ruby/object:Gem::Dependency
-  name: timecop
+  name: simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.7.1
+        version: 0.10.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.7.1
+        version: 0.10.0
 - !ruby/object:Gem::Dependency
-  name: webmock
+  name: appraisal
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.20.4
+        version: '2.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.20.4
+        version: '2.0'
 - !ruby/object:Gem::Dependency
-  name: simplecov
+  name: gem-release
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.9.1
+        version: '0.7'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.9.1
+        version: '0.7'
 description: Calagator is an open source community calendaring platform
 email:
 - calagator-development@googlegroups.com
@@ -625,7 +589,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- LICENSE.txt
+- MIT-LICENSE.txt
 - README.md
 - Rakefile
 - app/assets/images/confused-alligator-sm.png
@@ -675,13 +639,16 @@ files:
 - app/assets/images/weekday_background.gif
 - app/assets/javascripts/calagator.js
 - app/assets/javascripts/calagator/forms.js
-- app/assets/stylesheets/calagator.scss
-- app/assets/stylesheets/calagator/common.scss
-- app/assets/stylesheets/calagator/datepicker.scss
+- app/assets/stylesheets/calagator/changes.scss
 - app/assets/stylesheets/calagator/errors.css
 - app/assets/stylesheets/calagator/forms.scss
-- app/assets/stylesheets/calagator/reset.css
-- app/assets/stylesheets/calagator/theme.css
+- app/assets/stylesheets/calagator/index.scss
+- app/assets/stylesheets/calagator/layout.scss
+- app/assets/stylesheets/calagator/mobile.scss
+- app/assets/stylesheets/calagator/reset.scss
+- app/assets/stylesheets/calagator/typography.scss
+- app/assets/stylesheets/calagator/utils.scss
+- app/assets/stylesheets/calagator/variables.scss
 - app/controllers/calagator/admin_controller.rb
 - app/controllers/calagator/application_controller.rb
 - app/controllers/calagator/events_controller.rb
@@ -721,7 +688,6 @@ files:
 - app/models/calagator/venue/search_engine.rb
 - app/models/calagator/venue/search_engine/apache_sunspot.rb
 - app/models/calagator/venue/search_engine/sql.rb
-- app/models/event/search_engine/base.rb
 - app/observers/calagator/cache_observer.rb
 - app/views/calagator/admin/events.html.erb
 - app/views/calagator/admin/index.html.erb
@@ -745,6 +711,7 @@ files:
 - app/views/calagator/events/show.html.erb
 - app/views/calagator/site/_appropriateness_message.html.erb
 - app/views/calagator/site/_description.html.erb
+- app/views/calagator/site/_sidebar_menu.html.erb
 - app/views/calagator/site/about.html.erb
 - app/views/calagator/site/defunct.html.erb
 - app/views/calagator/site/export.html.erb
@@ -767,23 +734,25 @@ files:
 - app/views/calagator/venues/show.html.erb
 - app/views/calagator/versions/_chooser.html.erb
 - app/views/calagator/versions/_edit_with_chooser.html.erb
+- app/views/layouts/calagator/_after_footer.html.erb
+- app/views/layouts/calagator/_content.html.erb
+- app/views/layouts/calagator/_footer.html.erb
+- app/views/layouts/calagator/_global_search.html.erb
+- app/views/layouts/calagator/_header.html.erb
 - app/views/layouts/calagator/application.html.erb
-- config/deploy/local.rb
-- config/deploy/lucca.rb
 - config/initializers/dates.rb
 - config/initializers/formtastic.rb
-- config/initializers/geokit.rb
 - config/initializers/ics_renderer.rb
 - config/initializers/load_tag_model_extensions.rb
 - config/initializers/mime_types.rb
 - config/initializers/observers.rb
-- config/initializers/search_engine.rb
-- config/initializers/set_default_url_host.rb
 - config/initializers/time_get_zone.rb
 - config/locales/en.yml
 - config/routes.rb
 - config/secrets.yml.blag
+- config/spring.rb
 - config/sunspot.yml
+- db/development
 - db/development.sqlite3
 - db/development.sqlite3.bak
 - db/development.sqlite3.old
@@ -819,10 +788,11 @@ files:
 - db/migrate/20120831234448_specify_venues_latitude_and_longitude_precision.rb
 - db/migrate/20150206085809_remove_updates.rb
 - db/migrate/20150207231355_add_locked_status_to_events.rb
+- db/migrate/20150407014752_add_taggings_counter_cache_to_tags.acts_as_taggable_on_engine.rb
+- db/migrate/20150407014754_change_collation_for_tag_names.acts_as_taggable_on_engine.rb
 - db/production.sqlite3
 - db/schema.rb
 - db/seeds.rb
-- db/test.sqlite3
 - db/test2.sqlite3
 - lib/calagator.rb
 - lib/calagator/blacklist_validator.rb
@@ -837,9 +807,8 @@ files:
 - lib/calagator/url_prefixer.rb
 - lib/calagator/version.rb
 - lib/generators/calagator/install_generator.rb
-- lib/generators/calagator/templates/config/calagator.rb
-- lib/generators/calagator/templates/config/secrets.yml.sample
-- lib/secrets_reader.rb
+- lib/generators/calagator/templates/config/initializers/01_calagator.rb
+- lib/generators/calagator/templates/config/initializers/02_geokit.rb
 - lib/tasks/spec_db.rake
 - lib/tasks/sunspot_reindex_calagator.rake
 - lib/tasks/sunspot_solr_restart_enhancements.rake
@@ -855,15 +824,17 @@ files:
 - spec/controllers/calagator/versions_controller_spec.rb
 - spec/controllers/squash_many_duplicates_examples.rb
 - spec/dummy/Gemfile
-- spec/dummy/Gemfile.lock
 - spec/dummy/README.rdoc
 - spec/dummy/Rakefile
-- spec/dummy/app/assets/images/rails.png
 - spec/dummy/app/assets/javascripts/application.js
 - spec/dummy/app/assets/stylesheets/application.css
 - spec/dummy/app/controllers/application_controller.rb
 - spec/dummy/app/helpers/application_helper.rb
 - spec/dummy/app/views/layouts/application.html.erb
+- spec/dummy/bin/bundle
+- spec/dummy/bin/rails
+- spec/dummy/bin/rake
+- spec/dummy/bin/setup
 - spec/dummy/config.ru
 - spec/dummy/config/application.rb
 - spec/dummy/config/boot.rb
@@ -872,60 +843,29 @@ files:
 - spec/dummy/config/environments/development.rb
 - spec/dummy/config/environments/production.rb
 - spec/dummy/config/environments/test.rb
+- spec/dummy/config/initializers/01_calagator.rb
+- spec/dummy/config/initializers/02_geokit.rb
+- spec/dummy/config/initializers/assets.rb
 - spec/dummy/config/initializers/backtrace_silencers.rb
-- spec/dummy/config/initializers/calagator.rb
+- spec/dummy/config/initializers/cookies_serializer.rb
+- spec/dummy/config/initializers/filter_parameter_logging.rb
 - spec/dummy/config/initializers/inflections.rb
 - spec/dummy/config/initializers/mime_types.rb
-- spec/dummy/config/initializers/secret_token.rb
 - spec/dummy/config/initializers/session_store.rb
 - spec/dummy/config/initializers/wrap_parameters.rb
 - spec/dummy/config/locales/en.yml
 - spec/dummy/config/routes.rb
 - spec/dummy/config/secrets.yml
+- spec/dummy/config/sunspot.yml
 - spec/dummy/db/development.sqlite3
-- spec/dummy/db/migrate/20150309023304_create_events.calagator.rb
-- spec/dummy/db/migrate/20150309023305_create_venues.calagator.rb
-- spec/dummy/db/migrate/20150309023306_create_sources.calagator.rb
-- spec/dummy/db/migrate/20150309023307_add_detailed_fields_to_venue.calagator.rb
-- spec/dummy/db/migrate/20150309023308_add_end_time_to_events.calagator.rb
-- spec/dummy/db/migrate/20150309023309_add_source_id_to_events.calagator.rb
-- spec/dummy/db/migrate/20150309023310_add_source_id_to_venues.calagator.rb
-- spec/dummy/db/migrate/20150309023311_add_duplicate_of_column_to_venues.calagator.rb
-- spec/dummy/db/migrate/20150309023312_add_duplicate_of_column_to_events.calagator.rb
-- spec/dummy/db/migrate/20150309023313_change_lat_long_type.calagator.rb
-- spec/dummy/db/migrate/20150309023314_add_source_reimport.calagator.rb
-- spec/dummy/db/migrate/20150309023315_change_end_time_to_duration.calagator.rb
-- spec/dummy/db/migrate/20150309023316_remove_format_type_from_source.calagator.rb
-- spec/dummy/db/migrate/20150309023317_create_updates.calagator.rb
-- spec/dummy/db/migrate/20150309023318_remove_next_update_from_source.calagator.rb
-- spec/dummy/db/migrate/20150309023319_change_duration_to_end_time.calagator.rb
-- spec/dummy/db/migrate/20150309023320_create_tags_and_taggings.calagator.rb
-- spec/dummy/db/migrate/20150309023321_create_versioned_events.calagator.rb
-- spec/dummy/db/migrate/20150309023322_create_versioned_venues.calagator.rb
-- spec/dummy/db/migrate/20150309023323_add_rrule_to_events.calagator.rb
-- spec/dummy/db/migrate/20150309023324_create_versions.calagator.rb
-- spec/dummy/db/migrate/20150309023325_add_closed_flag_to_venues.calagator.rb
-- spec/dummy/db/migrate/20150309023326_add_wifi_flag_to_venues.calagator.rb
-- spec/dummy/db/migrate/20150309023327_add_access_notes_to_venues.calagator.rb
-- spec/dummy/db/migrate/20150309023328_add_events_count_to_venues.calagator.rb
-- spec/dummy/db/migrate/20150309023329_add_venue_details_to_events.calagator.rb
-- spec/dummy/db/migrate/20150309023330_acts_as_taggable_on_migration.calagator.rb
-- spec/dummy/db/migrate/20150309023331_cleanup.calagator.rb
-- spec/dummy/db/migrate/20150309023332_specify_venues_latitude_and_longitude_precision.calagator.rb
-- spec/dummy/db/migrate/20150309023333_remove_updates.calagator.rb
-- spec/dummy/db/migrate/20150309023334_add_locked_status_to_events.calagator.rb
 - spec/dummy/db/schema.rb
 - spec/dummy/db/seeds.rb
-- spec/dummy/db/test.sqlite3
-- spec/dummy/doc/README_FOR_APP
 - spec/dummy/log/development.log
 - spec/dummy/public/404.html
 - spec/dummy/public/422.html
 - spec/dummy/public/500.html
 - spec/dummy/public/favicon.ico
 - spec/dummy/public/robots.txt
-- spec/dummy/script/rails
-- spec/dummy/test/performance/browsing_test.rb
 - spec/dummy/test/test_helper.rb
 - spec/factories.rb
 - spec/features/add_event_spec.rb
@@ -946,7 +886,6 @@ files:
 - spec/lib/calagator/decode_html_entities_hack_spec.rb
 - spec/lib/calagator/settings_spec.rb
 - spec/lib/calagator/url_prefixer_spec.rb
-- spec/lib/secrets_reader_spec.rb
 - spec/models/calagator/event/cloner_spec.rb
 - spec/models/calagator/event/overview_spec.rb
 - spec/models/calagator/event/search_spec.rb
@@ -966,8 +905,12 @@ files:
 - spec/models/tag_spec.rb
 - spec/rails_helper.rb
 - spec/spec_helper.rb
+- spec/support/admin_authentication.rb
+- spec/support/assert_dom_equal.rb
 - spec/support/disable_geocoding.rb
 - spec/support/http_samples.rb
+- spec/support/paper_trail.rb
+- spec/support/rspec-activemodel-mocks_patch.rb
 - spec/support/samples/facebook.json
 - spec/support/samples/hcal_basic.xml
 - spec/support/samples/hcal_dup_event_dup_venue.xml
@@ -1019,7 +962,10 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 2.0.0
+  - - "<"
+    - !ruby/object:Gem::Version
+      version: 2.2.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">"
@@ -1039,12 +985,15 @@ test_files:
 - spec/controllers/calagator/venues_controller_spec.rb
 - spec/controllers/calagator/versions_controller_spec.rb
 - spec/controllers/squash_many_duplicates_examples.rb
-- spec/dummy/app/assets/images/rails.png
 - spec/dummy/app/assets/javascripts/application.js
 - spec/dummy/app/assets/stylesheets/application.css
 - spec/dummy/app/controllers/application_controller.rb
 - spec/dummy/app/helpers/application_helper.rb
 - spec/dummy/app/views/layouts/application.html.erb
+- spec/dummy/bin/bundle
+- spec/dummy/bin/rails
+- spec/dummy/bin/rake
+- spec/dummy/bin/setup
 - spec/dummy/config/application.rb
 - spec/dummy/config/boot.rb
 - spec/dummy/config/database.yml
@@ -1052,55 +1001,25 @@ test_files:
 - spec/dummy/config/environments/development.rb
 - spec/dummy/config/environments/production.rb
 - spec/dummy/config/environments/test.rb
+- spec/dummy/config/initializers/01_calagator.rb
+- spec/dummy/config/initializers/02_geokit.rb
+- spec/dummy/config/initializers/assets.rb
 - spec/dummy/config/initializers/backtrace_silencers.rb
-- spec/dummy/config/initializers/calagator.rb
+- spec/dummy/config/initializers/cookies_serializer.rb
+- spec/dummy/config/initializers/filter_parameter_logging.rb
 - spec/dummy/config/initializers/inflections.rb
 - spec/dummy/config/initializers/mime_types.rb
-- spec/dummy/config/initializers/secret_token.rb
 - spec/dummy/config/initializers/session_store.rb
 - spec/dummy/config/initializers/wrap_parameters.rb
 - spec/dummy/config/locales/en.yml
 - spec/dummy/config/routes.rb
 - spec/dummy/config/secrets.yml
+- spec/dummy/config/sunspot.yml
 - spec/dummy/config.ru
 - spec/dummy/db/development.sqlite3
-- spec/dummy/db/migrate/20150309023304_create_events.calagator.rb
-- spec/dummy/db/migrate/20150309023305_create_venues.calagator.rb
-- spec/dummy/db/migrate/20150309023306_create_sources.calagator.rb
-- spec/dummy/db/migrate/20150309023307_add_detailed_fields_to_venue.calagator.rb
-- spec/dummy/db/migrate/20150309023308_add_end_time_to_events.calagator.rb
-- spec/dummy/db/migrate/20150309023309_add_source_id_to_events.calagator.rb
-- spec/dummy/db/migrate/20150309023310_add_source_id_to_venues.calagator.rb
-- spec/dummy/db/migrate/20150309023311_add_duplicate_of_column_to_venues.calagator.rb
-- spec/dummy/db/migrate/20150309023312_add_duplicate_of_column_to_events.calagator.rb
-- spec/dummy/db/migrate/20150309023313_change_lat_long_type.calagator.rb
-- spec/dummy/db/migrate/20150309023314_add_source_reimport.calagator.rb
-- spec/dummy/db/migrate/20150309023315_change_end_time_to_duration.calagator.rb
-- spec/dummy/db/migrate/20150309023316_remove_format_type_from_source.calagator.rb
-- spec/dummy/db/migrate/20150309023317_create_updates.calagator.rb
-- spec/dummy/db/migrate/20150309023318_remove_next_update_from_source.calagator.rb
-- spec/dummy/db/migrate/20150309023319_change_duration_to_end_time.calagator.rb
-- spec/dummy/db/migrate/20150309023320_create_tags_and_taggings.calagator.rb
-- spec/dummy/db/migrate/20150309023321_create_versioned_events.calagator.rb
-- spec/dummy/db/migrate/20150309023322_create_versioned_venues.calagator.rb
-- spec/dummy/db/migrate/20150309023323_add_rrule_to_events.calagator.rb
-- spec/dummy/db/migrate/20150309023324_create_versions.calagator.rb
-- spec/dummy/db/migrate/20150309023325_add_closed_flag_to_venues.calagator.rb
-- spec/dummy/db/migrate/20150309023326_add_wifi_flag_to_venues.calagator.rb
-- spec/dummy/db/migrate/20150309023327_add_access_notes_to_venues.calagator.rb
-- spec/dummy/db/migrate/20150309023328_add_events_count_to_venues.calagator.rb
-- spec/dummy/db/migrate/20150309023329_add_venue_details_to_events.calagator.rb
-- spec/dummy/db/migrate/20150309023330_acts_as_taggable_on_migration.calagator.rb
-- spec/dummy/db/migrate/20150309023331_cleanup.calagator.rb
-- spec/dummy/db/migrate/20150309023332_specify_venues_latitude_and_longitude_precision.calagator.rb
-- spec/dummy/db/migrate/20150309023333_remove_updates.calagator.rb
-- spec/dummy/db/migrate/20150309023334_add_locked_status_to_events.calagator.rb
 - spec/dummy/db/schema.rb
 - spec/dummy/db/seeds.rb
-- spec/dummy/db/test.sqlite3
-- spec/dummy/doc/README_FOR_APP
 - spec/dummy/Gemfile
-- spec/dummy/Gemfile.lock
 - spec/dummy/log/development.log
 - spec/dummy/public/404.html
 - spec/dummy/public/422.html
@@ -1109,8 +1028,6 @@ test_files:
 - spec/dummy/public/robots.txt
 - spec/dummy/Rakefile
 - spec/dummy/README.rdoc
-- spec/dummy/script/rails
-- spec/dummy/test/performance/browsing_test.rb
 - spec/dummy/test/test_helper.rb
 - spec/factories.rb
 - spec/features/add_event_spec.rb
@@ -1131,7 +1048,6 @@ test_files:
 - spec/lib/calagator/decode_html_entities_hack_spec.rb
 - spec/lib/calagator/settings_spec.rb
 - spec/lib/calagator/url_prefixer_spec.rb
-- spec/lib/secrets_reader_spec.rb
 - spec/models/calagator/event/cloner_spec.rb
 - spec/models/calagator/event/overview_spec.rb
 - spec/models/calagator/event/search_spec.rb
@@ -1151,8 +1067,12 @@ test_files:
 - spec/models/tag_spec.rb
 - spec/rails_helper.rb
 - spec/spec_helper.rb
+- spec/support/admin_authentication.rb
+- spec/support/assert_dom_equal.rb
 - spec/support/disable_geocoding.rb
 - spec/support/http_samples.rb
+- spec/support/paper_trail.rb
+- spec/support/rspec-activemodel-mocks_patch.rb
 - spec/support/samples/facebook.json
 - spec/support/samples/hcal_basic.xml
 - spec/support/samples/hcal_dup_event_dup_venue.xml