Merge pull request #38 from Aupajo/remove-meetup-support

Remove Meetup support (closes #36)

Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    almanack (1.1.5)
+    almanack (1.2.0)
       activesupport
       addressable
       faraday

README.md

@@ -4,7 +4,7 @@
 [![Gem Version](https://badge.fury.io/rb/almanack.svg)](http://badge.fury.io/rb/almanack)
 [![Deploy](https://www.herokucdn.com/deploy/button.svg)](https://heroku.com/deploy?template=https://github.com/Aupajo/almanack/tree/heroku-button)
 
-A calendar that combines events from different sources (such as Google Calendar, Meetup.com, and iCal feeds), and can be hosted for free on [Heroku](http://heroku.com).
+A calendar that combines events from different sources (such as Google Calendar and iCal feeds), and can be hosted for free on [Heroku](http://heroku.com).
 
 ![Sinatra GCal example](http://i.imgur.com/odgyR.png)
 
@@ -14,7 +14,7 @@ See a demo running at [http://chch-events.herokuapp.com/](http://chch-events.her
 
 * Aggregate multiple calendars together into one stream
 * Supports iCal feeds (incuding Google Calendars)
-* Supports Meetup.com groups
+* ~Supports Meetup.com groups~ (see https://github.com/Aupajo/almanack/issues/36)
 * Just supply a hash to create any arbitrary event
 * Supports being freely hosted on Heroku
 * 100% customisable themes with Sass and CoffeeScript support
@@ -67,7 +67,7 @@ By default, your calendar will run on http://localhost:9292.
 
 ## Configuration
 
-See examples inside `config.ru` for iCal feeds, Meetup.com, or static events.
+See examples inside `config.ru` for iCal feeds, or static events.
 
 ```ruby
 Almanack.config do |config|
@@ -81,14 +81,9 @@ Almanack.config do |config|
 
   # Include a downloaded iCal
   config.add_ical Pathname('downloaded-calendar.ical')
-
-  # Include Meetup events
-  config.add_meetup_group group_urlname: 'Christchurch-Ruby-Group', key: 'mysecretkey'
 end
 ```
 
-**Note:** You'll need your [Meetup.com API key](https://secure.meetup.com/meetup_api/key) to use Meetup.
-
 ### Time zone
 
 To set your time zone, set your system's `TZ` environment variable.

almanack.gemspec

@@ -8,7 +8,7 @@ Gem::Specification.new do |spec|
   spec.version       = Almanack::VERSION
   spec.authors       = ["Pete Nicholls"]
   spec.email         = ["aupajo@gmail.com"]
-  spec.summary       = %q{Combined events calendar for Google Calendar, iCal, Meetup.com and friends.}
+  spec.summary       = %q{Combined events calendar for Google Calendar, iCal, and friends.}
   spec.homepage      = Almanack::HOMEPAGE
   spec.license       = "MIT"
 

app.json

@@ -2,7 +2,7 @@
   "name": "Almanack",
   "description": "Combine iCal, Google Calendar, and Meetup.com events into a single calendar with a public website and calendar subscription feed.",
   "repository": "https://github.com/Aupajo/almanack",
-  "keywords": ["calendar", "events", "meetup", "gcal" , "ical", "web", "feed", "rss"],
+  "keywords": ["calendar", "events", "gcal" , "ical", "web", "feed", "rss"],
   "buildpacks": [
     { "url": "heroku/ruby" }
   ],
@@ -20,16 +20,8 @@
       "description": "An optional list of iCal feed URLs separated by spaces. For Google Calendars, look for the “address in iCal format” URLs in the calendar's settings.",
       "required": false
     },
-    "MEETUP_COM_GROUPS": {
-      "description": "An optional list of Meetup.com groups to subscribe to, separated by spaces. A group can be the full URL (e.g. `https://www.meetup.com/Christchurch-Ruby-Group/`) or the URL slug (e.g. `Christchurch-Ruby-Group`). Requires MEETUP_COM_API_KEYS also be set.",
-      "required": false
-    },
-    "MEETUP_COM_API_KEYS": {
-      "description": "If retrieving events from Meetup.com, you need to specify one or more API keys to use. You can find your API key at https://secure.meetup.com/meetup_api/key. If you have a lot of groups, use multiple API keys to avoid hitting API request limits separated by spaces.",
-      "required": false
-    },
     "CACHE_DURATION_IN_SECONDS": {
-      "description": "How long to keep calendar events cached for. Set to `0` to always show an up-to-date calendar, but be wary of API request limits when using Meetup.com. Default is 15 minutes.",
+      "description": "How long to keep calendar events cached for. Set to `0` to always show an up-to-date calendar.",
       "value": "900"
     },
     "DAYS_LOOKAHEAD": {

lib/almanack.rb

@@ -17,6 +17,5 @@
 require "almanack/representation/json_feed"
 require "almanack/event"
 require "almanack/event_source/static"
-require "almanack/event_source/meetup_group"
 require "almanack/event_source/ical"
 require "almanack/event_source/ical_feed"

lib/almanack/configuration.rb

@@ -67,7 +67,7 @@ def add_events(events)
     end
 
     def add_meetup_group(options)
-      add_event_source EventSource::MeetupGroup.new(options.merge(connection: connection))
+      fail "Unfortunately, due to Meetup's changes to their API, this integration is no longer supported. See https://github.com/Aupajo/almanack/issues/36 for more information."
     end
 
     def cache_store

lib/almanack/version.rb

@@ -1,6 +1,6 @@
 module Almanack
   CODENAME = "Garlick"
-  VERSION  = "1.1.5"
+  VERSION  = "1.2.0"
   HOMEPAGE = "https://github.com/Aupajo/almanack"
   ISSUES   = "https://github.com/Aupajo/almanack/issues"
 end

spec/configuration_spec.rb

@@ -73,14 +73,11 @@ module Almanack
     end
 
     describe "#meetup_group" do
-      it "adds a Meetup group event source" do
-        config = Configuration.new
-        expect(config.event_sources.size).to eq(0)
-
-        config.add_meetup_group(group_urlname: "CHC-JS", key: "secrettoken")
-
-        expect(config.event_sources.size).to eq(1)
-        expect(config.event_sources.first).to be_an_instance_of(EventSource::MeetupGroup)
+      it "raises an error" do
+        expect {
+          Configuration.new
+            .add_meetup_group(group_urlname: "CHC-JS", key: "secrettoken")
+        }.to raise_error(%r{https://github.com/Aupajo/almanack/issues/36})
       end
     end