almanack 1.1.5 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fd1677c0cdd5da474a3d19e6e2b883e023a7723f3ccea179ac2098cb75773569
-  data.tar.gz: 4c9e72b26356e55d3a7e8cd0ada49264dc79762066eaf2b119343ba6bc2db1d9
+  metadata.gz: 496b67de75b42507bf08fec988d5eaccf26d4dfa7fee4232bdf16daf058f5b33
+  data.tar.gz: 7c9a6be3cbe1cb94be79ecccbf5ba8f31c3f017433de545502b5770d3d594260
 SHA512:
-  metadata.gz: f1887ce7f38753cabeca433265b85d5e455b2e48321db6d8625f94c1d266b7990cd8041bf3445baf5a0424e5f3ade8366db50eb4b55a3c2fceeb3a43d84b9092
-  data.tar.gz: c1cc81a1d3bbe45aab4073cee57695fba7658cd6ed24efc072b1f507c9fd0d7a5cbdea0b13ae3dc0f21412dd3ba7179bab2d054cefe51ed7c64f028ac744925d
+  metadata.gz: 91bce6c336dee09a859086bff2a11d1a6083918db0fff67c109690da8ea4fb4fad9ff1dc7396f7e38ab21671716f7b1d97628b4ad1d0c3a09059d79cac859b18
+  data.tar.gz: 00bf2e37d9c258ecbeec1b02db98b70a639f6f2a7f031270510351dc83dd0703b4bb4db72b882817347112560560c606c123aaaf8ceff9d45b005c59e9860ae2

checksums.yaml.gz.sig

@@ -1,3 +1 @@
-�n�e6��ɳ(v��o�
-E(����8��x���G����+�S��p����}Q�4��r��A.\a ����juqXOwb��
-��9�������훟�B��ODI���S����\�
i������ԇު��T}�4����2��)h�����1.���3C�¤�ܼ�9K��A
��-&\��,�8
T%Q�M�̑�-E�G�d�>�Ѫ�З��^���8�@5&j5��R�wS]��Z����#���y,�!�!�`O���d63X�z`�H�A:ŋ�����z��&�@N��`-�]iD�iIc�B�'<q�8�.�a�#�Pn�	K��*qˤ�A�Zh��4���y#uo�:�0���g4��4Ԛ�-]��/L��G�
+y2��9�"�F!uP@��r�<���7KPt�T,��X�oYh>Ģ5qAVV�R�����#��J���H�^��v�={��T.`/�.��K����7�����?cًa&�x�\�lK�}=��t�G��Su=��.F�R�&N�xs��a�=Gz��Z���i�Z��Z��C�{r�v�,!�9�s.[?�g6}���\�`PN��C��7�-M�e�+��y����N�&SB@ޣ(W���K�ߓ��8Rǒs���B,�?D�5@m4��G�BnX8U������I���m�X�\ۦ�z9X׾���O�BB�Э��e��8�'�3�J�ӜZ��~�����J���I�i-,���4�:���ʵ

data/Gemfile.lock

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

data/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.

data/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"
 

data/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": {

data/checksums/almanack-1.1.5.gem.sha256

@@ -0,0 +1 @@
+3d267c6f652968bf5184b57bcf50dd7898b07f5ca7fbfcc5ee1c3b12eb705670

data/checksums/almanack-1.1.5.gem.sha512

@@ -0,0 +1 @@
+16041fb8e3be78094936c8740eddd05568135f51dcde0fc991f2818d81235464d53bc0fc7e474e5af327777a6dc464fea05d0e6993b3baace9bd382ec696b039

data/lib/almanack.rb

@@ -17,6 +17,5 @@ require "almanack/representation/ical_feed"
 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"

data/lib/almanack/configuration.rb

@@ -67,7 +67,7 @@ module Almanack
     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

data/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

data/templates/new/config.ru.tt

@@ -9,10 +9,6 @@ Almanack.config do |c|
   c.cache_responses = true
   c.cache_expiry = 900 # seconds
 
-  # Your group's URL name is what you'd find at www.meetup.com/Your-Group-URL-Name/
-  # You can get a Meetup API key from https://secure.meetup.com/meetup_api/key
-  # c.add_meetup_group group_urlname: 'Christchurch-Ruby-Group', key: 'mysecretkey'
-
   # For a Google Calendar, find the "iCal" link under your Calendar's settings
   # c.add_ical_feed 'https://example.com/basic.ics'
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: almanack
 version: !ruby/object:Gem::Version
-  version: 1.1.5
+  version: 1.2.0
 platform: ruby
 authors:
 - Pete Nicholls
@@ -347,6 +347,8 @@ files:
 - checksums/almanack-1.1.3.gem.sha512
 - checksums/almanack-1.1.3.rc1.gem.sha256
 - checksums/almanack-1.1.3.rc1.gem.sha512
+- checksums/almanack-1.1.5.gem.sha256
+- checksums/almanack-1.1.5.gem.sha512
 - example.ru
 - exe/almanack
 - lib/almanack.rb
@@ -357,7 +359,6 @@ files:
 - lib/almanack/event.rb
 - lib/almanack/event_source/ical.rb
 - lib/almanack/event_source/ical_feed.rb
-- lib/almanack/event_source/meetup_group.rb
 - lib/almanack/event_source/static.rb
 - lib/almanack/representation/built_ical_event.rb
 - lib/almanack/representation/ical_feed.rb
@@ -402,5 +403,5 @@ requirements: []
 rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
-summary: Combined events calendar for Google Calendar, iCal, Meetup.com and friends.
+summary: Combined events calendar for Google Calendar, iCal, and friends.
 test_files: []

data/lib/almanack/event_source/meetup_group.rb

@@ -1,129 +0,0 @@
-module Almanack
-  module EventSource
-    class MeetupGroup
-      def initialize(options = {})
-        warn "Meetup have disabled support for API keys. Read more at https://github.com/Aupajo/almanack/issues/36"
-        @request_options = options
-        @group_properties = {}
-      end
-
-      def events_between(date_range)
-        events.select do |event|
-          event.start_time >= date_range.min && event.start_time <= date_range.max
-        end
-      end
-
-      def serialized_between(date_range)
-        # TODO `events` must be called before @group_properties is accessed
-        serialized_events = events_between(date_range).map(&:serialized)
-        @group_properties.merge(events: serialized_events)
-      end
-
-      private
-
-      def events
-        results = MeetupAPIRequest.new(@request_options.clone).results
-        record_group_details_from results
-        results.map { |result| event_from(result) }
-      end
-
-      def record_group_details_from(results)
-        first_result = results.first
-        return if !first_result
-
-        group = first_result['group']
-        return if !group
-
-        @group_properties = {
-          name: group['name'],
-          url: "http://www.meetup.com/" + group['urlname']
-        }
-      end
-
-      def event_from(result)
-        # 3 hours, as recommended by Meetup.com if duration isn't present
-        default_duration_in_ms = 3 * 60 * 60 * 1000
-
-        event_name = [result['group']['name'], result['name']].compact.join(': ')
-        start_time = Time.at(result['time'] / 1000)
-        duration_in_secs = (result['duration'] || default_duration_in_ms) / 1000
-        end_time = start_time + duration_in_secs
-
-        Event.new(
-          title: event_name,
-          start_time: start_time,
-          end_time: end_time,
-          description: result['description'],
-          location: location_from_venue(result['venue']),
-          url: result['event_url']
-        )
-      end
-
-      def location_from_venue(venue)
-        return nil if venue.nil?
-        
-        %w{ name address_1 address_2 address_3 city state country }.map do |attr|
-          venue[attr]
-        end.compact.join(', ')
-      end
-    end
-
-    class MeetupAPIError < StandardError
-    end
-
-    class MeetupAPIException < Exception
-    end
-
-    class MeetupAPIRequest
-      REQUIRED_OPTIONS = [:group_domain, :group_urlname, :group_id]
-
-      attr_reader :options, :connection
-
-      def initialize(options = {})
-        @connection = options.delete(:connection)
-        @options = options
-      end
-
-      def results
-        response['results']
-      end
-
-      def uri
-        if !options.has_key?(:key)
-          raise MeetupAPIException, 'Cannot form valid URI, missing :key option'
-        end
-
-        if (options.keys & REQUIRED_OPTIONS).empty?
-          raise MeetupAPIException, "Cannot form valid URI, missing one of: #{REQUIRED_OPTIONS}"
-        end
-
-        endpoint = "https://api.meetup.com/2/events"
-
-        Addressable::URI.parse(endpoint).tap do |uri|
-          uri.query_values = options
-        end
-      end
-
-      def response
-        response = connection.get(uri)
-        data = JSON.parse(response.body)
-
-        if data['problem']
-          raise MeetupAPIError, error_message_from(data)
-        end
-
-        data
-      end
-
-      def error_message_from(data)
-        message = [data['problem'], data['details']].compact.join(' - ')
-
-        if message.include?('not authorized')
-          message << ' ⚠️ See https://github.com/Aupajo/almanack/issues/36 for more details'
-        end
-
-        message
-      end
-    end
-  end
-end