calagator 0.0.1.pre1 → 1.0.0.rc1

data/lib/calagator/engine.rb

@@ -2,29 +2,19 @@ module Calagator
   class Engine < ::Rails::Engine
     isolate_namespace Calagator
 
-    config.before_initialize do
-      # Read secrets
-      require 'secrets_reader'
-      ::SECRETS = SecretsReader.read
-    end
-  end
-
-  # settings with defaults
-  class << self
-    mattr_accessor :title, :tagline, :url, :venues_map_options, :blacklist_patterns
-
-    self.title = 'Calagator'
-    self.tagline = 'A Tech Calendar'
-    self.url = 'http://my-calagator.org/'
-    self.venues_map_options = {}
-    self.blacklist_patterns = [
-      /\b(online|overseas).+(drugstore|pharmacy)\b/,
-      /\bcialis\b/,
-    ]
+    config.assets.precompile += %w( 
+      markers-soft.png
+      markers-shadow.png
+      markers-soft@2x.png
+      markers-shadow@2x.png
+      leaflet.js
+      leaflet_google_layer.js
+      mustache.js
+      leaflet
+    )
 
-    # map the attrs from initializer
-    def setup(&block)
-      yield self
+    config.after_initialize do
+      Calagator.configure_search_engine
     end
   end
 end

data/lib/calagator/tag_model_extensions.rb

@@ -4,7 +4,7 @@ module Calagator
 module TagModelExtensions
   def self.included(base)
     base.class_eval do
-      scope :machine_tags, where("name LIKE '%:%=%'")
+      scope :machine_tags, -> { where("name LIKE '%:%=%'") }
     end
   end
 

data/lib/calagator/version.rb

@@ -1,3 +1,3 @@
 module Calagator
-  VERSION = "0.0.1.pre1"
+  VERSION = "1.0.0.rc1"
 end

data/lib/generators/calagator/install_generator.rb

@@ -2,30 +2,31 @@ module Calagator
   class InstallGenerator < Rails::Generators::Base
     source_root File.expand_path('../templates', __FILE__)
 
+    class_option :dummy, type: :boolean, default: false
+
     def install
       add_route
-      add_secrets
-      add_initializer
+      add_initializers
       add_javascripts
       add_stylesheets
-      rake 'calagator:install:migrations'
-      rake 'db:migrate'
-      rake 'db:test:prepare'
+      add_seeds
       run 'rm -f public/index.html'
+      unless options[:dummy]
+        rake 'calagator:install:migrations'
+        rake 'db:migrate'
+        rake 'db:test:prepare'
+      end
     end
 
     private
 
     def add_route
-      inject_into_file 'config/routes.rb', "\s\smount Calagator::Engine => '/'\n", after: "Application.routes.draw do\n"
-    end
-
-    def add_secrets
-      copy_file File.expand_path(File.join(__FILE__, '../templates/config/secrets.yml.sample')), 'config/secrets.yml'
+      inject_into_file 'config/routes.rb', "\s\smount Calagator::Engine => '/'\n", after: "routes.draw do\n"
     end
 
-    def add_initializer
-      copy_file File.expand_path(File.join(__FILE__, '../templates/config/calagator.rb')), 'config/initializers/calagator.rb'
+    def add_initializers
+      initializer '01_calagator.rb', File.read(File.expand_path('../templates/config/initializers/01_calagator.rb', __FILE__))
+      initializer '02_geokit.rb',    File.read(File.expand_path('../templates/config/initializers/02_geokit.rb', __FILE__))
     end
 
     def add_javascripts
@@ -35,5 +36,9 @@ module Calagator
     def add_stylesheets
       append_file 'app/assets/stylesheets/application.css', '//= require calagator'
     end
+
+    def add_seeds
+      append_file 'db/seeds.rb', 'Calagator::Engine.load_seed'
+    end
   end
 end

data/lib/generators/calagator/templates/config/initializers/01_calagator.rb

@@ -0,0 +1,89 @@
+Calagator.setup do |config|
+  # Site name
+  # config.title = 'Calagator'
+
+  # Site tagline
+  # config.tagline = 'A Tech Calendar'
+
+  # Site URL with trailing slash
+  # config.url = 'http://my-calagator.org/'
+
+  # Email address of administrator that will get exception notifications
+  # and requests for assistance from users:
+  # config.administrator_email = 'your@email.addr'
+
+  # Admin username and password to use when accessing /admin pages
+  # config.admin_username = 'admin'
+  # config.admin_password = 'kitties!'
+
+  # API key for Meetup.com, get your own from: http://www.meetup.com/meetup_api/key/
+  # config.meetup_api_key = '<your meetup API key>'
+
+  # Search engine to use for searching events.
+  # Values: :sql, :sunspot. Defaults to :sql.
+  # config.search_engine = :sql
+
+  # 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 set this icalendar_sequence_offset value to something
+  # greater than 0.
+  # config.icalendar_sequence_offset = 0
+
+  # Configure a mapping provider
+  # Stamen's terrain tiles will be used by default.
+  # Map marker color
+  # Values: red, darkred, orange, green, darkgreen, blue, purple, darkpuple, cadetblue
+  # config.mapping_marker_color = 'green'
+
+  # A Google Maps API key is required to use Google's geocoding service
+  # as well as to display maps using their API.
+  # Get one at: https://developers.google.com/maps/documentation/javascript/tutorial#api_key
+  # config.mapping_google_maps_api_key = '<your google maps v3 API key>'
+
+  # The tile provider to use when rendering maps with Leaflet.
+  # One of: leaflet, stamen, mapbox, google
+  # config.mapping_provider = 'stamen'
+
+  # The tiles to use for the map, see the docs for individual Leaflet plugins.
+  # config.mapping_tiles = 'terrain'
+
+  # Other mapping examples:
+  #
+  # Stamen
+  # (available tiles: terrain, toner, watercolor)
+  # config.mapping_provider = 'stamen'
+  # config.mapping_tiles = 'watercolor'
+  #
+  # MapBox Streets (use a map from your own account)
+  # config.mapping_provider = 'mapbox'
+  # config.mapping_tiles = 'examples.map-9ijuk24y'
+  #
+  # Google Maps
+  # config.mapping_provider = 'google'
+  # config.mapping_tiles = 'ROADMAP'
+  #
+  # OpenStreetMap
+  # config.mapping_provider = 'leaflet'
+  # config.mapping_tiles = 'http://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png'
+  #
+  # Esri
+  # (available tiles: Gray, Streets, Oceans, Topographic)
+  # config.mapping_provider = 'esri'
+  # config.mapping_tiles = 'Gray'
+
+  # Map to display on /venues page:
+  # config.venues_map_options = {
+  #   # Zoom magnification level:
+  #   zoom: 12,
+  #   # Center of the map, in latitude and longitude.
+  #   # If no center is specified, the map will zoom to fit all markers.
+  #   center: [45.518493, -122.660737]
+  # }
+
+  # Patterns for detecting spam events and venues
+  # config.blacklist_patterns = [
+  #   /\b(online|overseas).+(drugstore|pharmacy)\b/,
+  #   /\bcialis\b/,
+  # ]
+
+end

data/lib/generators/calagator/templates/config/initializers/02_geokit.rb

@@ -0,0 +1,106 @@
+require 'geokit'
+
+# This is the order in which the geocoders are called in a failover scenario
+# If you only want to use a single geocoder, put a single symbol in the array.
+#
+# Be aware that there are Terms of Use restrictions on how you can use the
+# various geocoders.  Make sure you read up on relevant Terms of Use for each
+# geocoder you are going to use.
+
+Geokit::Geocoders::provider_order = [:google]
+
+# These defaults are used in Geokit::Mappable.distance_to and in acts_as_mappable
+Geokit::default_units = :miles
+Geokit::default_formula = :sphere
+
+# This is your Google Maps geocoder keys (all optional).
+# See http://www.google.com/apis/maps/signup.html
+# and http://www.google.com/apis/maps/documentation/#Geocoding_Examples
+#
+# Geokit::Geocoders::GoogleGeocoder.client_id = ''
+# Geokit::Geocoders::GoogleGeocoder.cryptographic_key = ''
+# Geokit::Geocoders::GoogleGeocoder.channel = ''
+
+# You can also use the free API key instead of signed requests
+# See https://developers.google.com/maps/documentation/geocoding/#api_key
+# Geokit::Geocoders::GoogleGeocoder.api_key = ''
+#
+# CALAGATOR:
+# We populate this with the API key set for Google Maps in 01_calagator.rb by default
+Geokit::Geocoders::GoogleGeocoder.api_key = Calagator.mapping_google_maps_api_key
+
+# You can also set multiple API KEYS for different domains that may be directed to this same application.
+# The domain from which the current user is being directed will automatically be updated for Geokit via
+# the GeocoderControl class, which gets it's begin filter mixed into the ActionController.
+# You define these keys with a Hash as follows:
+#
+# Geokit::Geocoders::google = { 'rubyonrails.org' => 'RUBY_ON_RAILS_API_KEY', 'ruby-docs.org' => 'RUBY_DOCS_API_KEY' }
+
+# This is your yahoo application key for the Yahoo Geocoder.
+# See http://developer.yahoo.com/faq/index.html#appid
+# and http://developer.yahoo.com/maps/rest/V1/geocode.html
+#
+# Geokit::Geocoders::YahooGeocoder.key = 'REPLACE_WITH_YOUR_YAHOO_KEY'
+# Geokit::Geocoders::YahooGeocoder.secret = 'REPLACE_WITH_YOUR_YAHOO_SECRET'
+
+# This is your username and password for geocoder.us.
+# To use the free service, the value can be set to nil or false.  For
+# usage tied to an account, the value should be set to username:password.
+# See http://geocoder.us
+# and http://geocoder.us/user/signup
+#
+# Geokit::Geocoders::UsGeocoder.key = 'username:password'
+
+# This is your authorization key for geocoder.ca.
+# To use the free service, the value can be set to nil or false.  For
+# usage tied to an account, set the value to the key obtained from
+# Geocoder.ca.
+# See http://geocoder.ca
+# and http://geocoder.ca/?register=1
+#
+# Geokit::Geocoders::CaGeocoder.key = 'KEY'
+
+# This is your username key for geonames.
+# To use this service either free or premium, you must register a key.
+# See http://www.geonames.org
+#
+# Geokit::Geocoders::GeonamesGeocoder.key = 'KEY'
+
+# Most other geocoders need either no setup or a key
+# Geokit::Geocoders::BingGeocoder.key = ''
+# Geokit::Geocoders::MapQuestGeocoder.key = ''
+# Geokit::Geocoders::YandexGeocoder.key = ''
+# Geokit::Geocoders::MapboxGeocoder.key = 'ACCESS_TOKEN'
+# Geokit::Geocoders::OpencageGeocoder.key = 'some_api_key'
+
+# Geonames has a free service and a premium service, each using a different URL
+# GeonamesGeocoder.premium = true will use http://ws.geonames.net (premium)
+# GeonamesGeocoder.premium = false will use http://api.geonames.org (free)
+# Geokit::Geocoders::GeonamesGeocoder.premium = false
+
+# The IP provider order. Valid symbols are :ip,:geo_plugin.
+# As before, make sure you read up on relevant Terms of Use for each.
+# Geokit::Geocoders::ip_provider_order = [:external,:geo_plugin,:ip]
+
+# Disable HTTPS globally.  This option can also be set on individual
+# geocoder classes.
+# Geokit::Geocoders::secure = false
+
+# Control verification of the server certificate for geocoders using HTTPS
+# Geokit::Geocoders::ssl_verify_mode = OpenSSL::SSL::VERIFY_(PEER/NONE)
+#
+# Setting this to VERIFY_NONE may be needed on systems that don't have
+# a complete or up to date root certificate store. Only applies to
+# the Net::HTTP adapter.
+
+# This is the timeout value in seconds to be used for calls to the geocoder web
+# services.  For no timeout at all, comment out the setting.  The timeout unit
+# is in seconds.
+Geokit::Geocoders::request_timeout = 3
+
+# This setting can be used if web service calls must be routed through a proxy.
+# These setting can be nil if not needed, otherwise, a valid URI must be
+# filled in at a minimum.  If the proxy requires authentication, the username
+# and password can be provided as well.
+#
+# Geokit::Geocoders::proxy = 'https://user:password@host:port'

data/lib/tasks/sunspot_reindex_calagator.rake

@@ -1,6 +1,19 @@
 desc "Reindex Calagator models with Sunspot"
-task "sunspot:reindex:calagator" => :environment do
-  Rake.application.invoke_task('sunspot:solr:reindex[500,Event]')
-  Rake.application.invoke_task('sunspot:solr:reindex[500,Venue]')
+task "sunspot:reindex:calagator" do
+  # Silence warnings about already-initialized constants caused by
+  # sunspot-rails' aggressive eager loading of all engine files.
+  original_verbosity = $VERBOSE
+  $VERBOSE = nil
+
+  puts "Reindexing Venues…"
+  Rake.application['sunspot:solr:reindex'].invoke(500, "Calagator::Venue")
+
+  Rake.application['sunspot:solr:reindex'].reenable
+  Rake.application['sunspot:reindex'].reenable
+
+  puts "Reindexing Events…"
+  Rake.application['sunspot:solr:reindex'].invoke(500, "Calagator::Event")
+
+  $VERBOSE = original_verbosity
 end
 

data/lib/tasks/update_counter_caches.rake

@@ -1,13 +1,13 @@
 desc "Update counter caches"
 task :update_counter_caches => :environment do
   # Update the Venue#events_count
-  total = Venue.count
-  Venue.all.each do |venue|
+  total = Calagator::Venue.count
+  Calagator::Venue.all.each do |venue|
     cached = venue.events_count
     actual = venue.events.count
     if actual != cached
       puts "Updating Venue ##{venue.id} from #{cached} cached to #{actual} actual -- #{venue.title}"
-      Venue.connection.update("UPDATE venues SET events_count = #{actual} WHERE id = #{venue.id}")
+      Calagator::Venue.connection.update("UPDATE venues SET events_count = #{actual} WHERE id = #{venue.id}")
     end
   end
 end

data/spec/controllers/calagator/events_controller_spec.rb

@@ -62,7 +62,7 @@ describe EventsController, :type => :controller do
       it "should accept a JSONP callback" do
         post :index, :format => "json", :callback => "some_function"
 
-        expect(response.body.split("\n").join).to match /^\s*some_function\(.*\);?\s*$/
+        expect(response.body.split("\n").join).to match /some_function\(.*\)\Z/
       end
 
       describe "without events" do
@@ -586,7 +586,7 @@ describe EventsController, :type => :controller do
 
   context "with admin auth for duplicates" do
     before do
-      credentials = ActionController::HttpAuthentication::Basic.encode_credentials SECRETS.admin_username, SECRETS.admin_password
+      credentials = ActionController::HttpAuthentication::Basic.encode_credentials Calagator.admin_username, Calagator.admin_password
       request.env['HTTP_AUTHORIZATION'] = credentials
     end
 
@@ -717,7 +717,7 @@ describe EventsController, :type => :controller do
         it "should accept a JSONP callback" do
           post :search, :query => "myquery", :format => "json", :callback => "some_function"
 
-          expect(response.body).to match /^\s*some_function\(.*\);?\s*$/
+          expect(response.body).to match /some_function\(.*\)$/
         end
 
         it "should include venue details" do

data/spec/controllers/calagator/sources_controller_spec.rb

@@ -27,7 +27,7 @@ describe SourcesController, :type => :controller do
       allow(@source).to receive(:to_events).and_return([@event])
 
       allow(Source).to receive(:new).and_return(@source)
-      allow(Source).to receive(:find_or_create_by_url).and_return(@source)
+      allow(Source).to receive(:find_or_create_by).with(url: "http://my.url/").and_return(@source)
     end
 
     it "should provide a way to create new sources" do
@@ -69,7 +69,7 @@ describe SourcesController, :type => :controller do
     describe "is given problematic sources" do
       before do
         @source = stub_model(Source)
-        expect(Source).to receive(:find_or_create_from).and_return(@source)
+        expect(Source).to receive(:find_or_create_by).with(url: "http://invalid.host").and_return(@source)
       end
 
       def assert_import_raises(exception)
@@ -79,7 +79,7 @@ describe SourcesController, :type => :controller do
 
       it "should fail when host responds with no events" do
         expect(@source).to receive(:create_events!).and_return([])
-        post :import, :source => {:url => "http://empty.host"}
+        post :import, :source => {:url => "http://invalid.host"}
         expect(flash[:failure]).to match /Unable to find any upcoming events to import from this source/
       end
 

data/spec/controllers/calagator/venues_controller_spec.rb

@@ -29,7 +29,7 @@ describe VenuesController, :type => :controller do
 
   context "with admin auth for duplicates" do
     before do
-      credentials = ActionController::HttpAuthentication::Basic.encode_credentials SECRETS.admin_username, SECRETS.admin_password
+      credentials = ActionController::HttpAuthentication::Basic.encode_credentials Calagator.admin_username, Calagator.admin_password
       request.env['HTTP_AUTHORIZATION'] = credentials
     end
 
@@ -132,9 +132,9 @@ describe VenuesController, :type => :controller do
       end
 
       it "should accept a JSONP callback" do
-        get :index, :format => "json", :callback => "some_function"
+        xhr :get, :index, :format => "json", :callback => "some_function"
 
-        expect(response.body.split("\n").join).to match /^\s*some_function\(.*\);?\s*$/
+        expect(response.body.split("\n").join).to match /some_function\(.*\)$/
       end
     end
 
@@ -164,9 +164,9 @@ describe VenuesController, :type => :controller do
         end
 
         it "should accept a JSONP callback" do
-          get :show, :id => @venue.to_param, :format => "json", :callback => "some_function"
+          xhr :get, :show, :id => @venue.to_param, :format => "json", :callback => "some_function"
 
-          expect(response.body.split("\n").join).to match /^\s*some_function\(.*\);?\s*$/
+          expect(response.body.split("\n").join).to match /some_function\(.*\)$/
         end
       end
     end

data/spec/dummy/Gemfile

@@ -1,39 +1,47 @@
 source 'https://rubygems.org'
 
-gem 'rails', '3.2.19'
-
-# Bundle edge Rails instead:
-# gem 'rails', :git => 'git://github.com/rails/rails.git'
 
+# Bundle edge Rails instead: gem 'rails', github: 'rails/rails'
+gem 'rails', '4.2.1'
+# Use sqlite3 as the database for Active Record
 gem 'sqlite3'
+# Use SCSS for stylesheets
+gem 'sass-rails', '~> 5.0'
+# Use Uglifier as compressor for JavaScript assets
+gem 'uglifier', '>= 1.3.0'
+# Use CoffeeScript for .coffee assets and views
+gem 'coffee-rails', '~> 4.1.0'
+# See https://github.com/rails/execjs#readme for more supported runtimes
+# gem 'therubyracer', platforms: :ruby
+
+# Use jquery as the JavaScript library
+gem 'jquery-rails'
+# Turbolinks makes following links in your web application faster. Read more: https://github.com/rails/turbolinks
+gem 'turbolinks'
+# Build JSON APIs with ease. Read more: https://github.com/rails/jbuilder
+gem 'jbuilder', '~> 2.0'
+# bundle exec rake doc:rails generates the API under doc/api.
+gem 'sdoc', '~> 0.4.0', group: :doc
 
+# Use ActiveModel has_secure_password
+# gem 'bcrypt', '~> 3.1.7'
 
-# Gems used only for assets and not required
-# in production environments by default.
-group :assets do
-  gem 'sass-rails',   '~> 3.2.3'
-  gem 'coffee-rails', '~> 3.2.1'
-
-  # See https://github.com/sstephenson/execjs#readme for more supported runtimes
-  # gem 'therubyracer', :platforms => :ruby
-
-  gem 'uglifier', '>= 1.0.3'
-end
+# Use Unicorn as the app server
+# gem 'unicorn'
 
-gem 'jquery-rails'
+# Use Capistrano for deployment
+# gem 'capistrano-rails', group: :development
 
-# To use ActiveModel has_secure_password
-# gem 'bcrypt-ruby', '~> 3.0.0'
+group :development, :test do
+  # Call 'byebug' anywhere in the code to stop execution and get a debugger console
+  gem 'byebug'
 
-# To use Jbuilder templates for JSON
-# gem 'jbuilder'
+  # Access an IRB console on exception pages or by using <%= console %> in views
+  gem 'web-console', '~> 2.0'
 
-# Use unicorn as the app server
-# gem 'unicorn'
+  # Spring speeds up development by keeping your application running in the background. Read more: https://github.com/rails/spring
+  gem 'spring'
+end
 
-# Deploy with Capistrano
-# gem 'capistrano'
 
-# To use debugger
-# gem 'debugger'
-gem 'calagator', path: '/Users/reidab/code/calagator'
+gem 'calagator', path: '../..'