almanack 1.1.3 → 1.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0c4c0ffb7056e085fa861423bf9ade96fee7dda1daf3fb36495aebaa47f1e008
-  data.tar.gz: 580196e4067cc64650d1342befd65d85d34ef38bcf2ff2213aab68bd56a5a0c0
+  metadata.gz: fd1677c0cdd5da474a3d19e6e2b883e023a7723f3ccea179ac2098cb75773569
+  data.tar.gz: 4c9e72b26356e55d3a7e8cd0ada49264dc79762066eaf2b119343ba6bc2db1d9
 SHA512:
-  metadata.gz: 550894ae4c18c94c4f16443a5d13af2f204a5c05c220f06538e858d6b3ec8d35d0b868517db0157d2a1ae921b6c0a606f4a6eb30ccaf58969f6800c885137c0d
-  data.tar.gz: c91d62ad6a9aae798283abf398224f9116b613e4672ad7a14a01481580c41a107971d3dc274c8e1c2acda345cde51363f56391732f172f42f331ed8fd465247b
+  metadata.gz: f1887ce7f38753cabeca433265b85d5e455b2e48321db6d8625f94c1d266b7990cd8041bf3445baf5a0424e5f3ade8366db50eb4b55a3c2fceeb3a43d84b9092
+  data.tar.gz: c1cc81a1d3bbe45aab4073cee57695fba7658cd6ed24efc072b1f507c9fd0d7a5cbdea0b13ae3dc0f21412dd3ba7179bab2d054cefe51ed7c64f028ac744925d

checksums.yaml.gz.sig

@@ -1 +1,3 @@
-��B�"ň��^}Z*����u��!Г�&��FP%ga�U�`|��LJ�Q���o.�w�m�Q;ۜ������3@�o�""��D˗�U�9�>�� ���մ6�Q�
�&�G�^
+�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�

data/.travis.yml

@@ -2,10 +2,10 @@ sudo: false
 language: ruby
 cache: bundler
 rvm:
-- 2.4.5
-- 2.5.3
-- 2.6.2
-before_install: gem install bundler -v 2.0.1
+- 2.5.7
+- 2.6.5
+- 2.7.0-preview2
+before_install: gem install bundler -v 2.0.2
 addons:
   code_climate:
     repo_token:

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    almanack (1.1.3)
+    almanack (1.1.5)
       activesupport
       addressable
       faraday
@@ -16,43 +16,47 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (5.2.3)
+    activesupport (6.0.1)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 0.7, < 2)
       minitest (~> 5.1)
       tzinfo (~> 1.1)
-    addressable (2.6.0)
-      public_suffix (>= 2.0.2, < 4.0)
+      zeitwerk (~> 2.2)
+    addressable (2.7.0)
+      public_suffix (>= 2.0.2, < 5.0)
     backports (3.15.0)
+    bundler-audit (0.6.1)
+      bundler (>= 1.2.0, < 3)
+      thor (~> 0.18)
     coderay (1.1.2)
     concurrent-ruby (1.1.5)
     crack (0.4.3)
       safe_yaml (~> 1.0.0)
     diff-lcs (1.3)
-    faraday (0.15.4)
+    faraday (0.17.0)
       multipart-post (>= 1.2, < 3)
     faraday_middleware (0.13.1)
       faraday (>= 0.7.4, < 1.0)
-    ffi (1.11.1)
-    hashdiff (0.3.8)
-    i18n (1.6.0)
+    ffi (1.11.2)
+    hashdiff (1.0.0)
+    i18n (1.7.0)
       concurrent-ruby (~> 1.0)
     method_source (0.9.2)
     mini_portile2 (2.4.0)
-    minitest (5.11.3)
-    multi_json (1.13.1)
+    minitest (5.13.0)
+    multi_json (1.14.1)
     multipart-post (2.1.1)
     mustermann (1.0.3)
-    nokogiri (1.10.2)
+    nokogiri (1.10.5)
       mini_portile2 (~> 2.4.0)
     pry (0.12.2)
       coderay (~> 1.1.0)
       method_source (~> 0.9.0)
-    public_suffix (3.0.3)
+    public_suffix (4.0.1)
     rack (2.0.7)
     rack-contrib (2.1.0)
       rack (~> 2.0)
-    rack-protection (2.0.5)
+    rack-protection (2.0.7)
       rack
     rack-test (1.1.0)
       rack (>= 1.0, < 3)
@@ -61,48 +65,49 @@ GEM
     rb-inotify (0.10.0)
       ffi (~> 1.0)
     ri_cal (0.8.8)
-    rspec (3.8.0)
-      rspec-core (~> 3.8.0)
-      rspec-expectations (~> 3.8.0)
-      rspec-mocks (~> 3.8.0)
-    rspec-core (3.8.0)
-      rspec-support (~> 3.8.0)
-    rspec-expectations (3.8.2)
+    rspec (3.9.0)
+      rspec-core (~> 3.9.0)
+      rspec-expectations (~> 3.9.0)
+      rspec-mocks (~> 3.9.0)
+    rspec-core (3.9.0)
+      rspec-support (~> 3.9.0)
+    rspec-expectations (3.9.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.8.0)
-    rspec-mocks (3.8.0)
+      rspec-support (~> 3.9.0)
+    rspec-mocks (3.9.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.8.0)
-    rspec-support (3.8.0)
+      rspec-support (~> 3.9.0)
+    rspec-support (3.9.0)
     safe_yaml (1.0.5)
     sass (3.7.4)
       sass-listen (~> 4.0.0)
     sass-listen (4.0.0)
       rb-fsevent (~> 0.9, >= 0.9.4)
       rb-inotify (~> 0.9, >= 0.9.7)
-    sinatra (2.0.5)
+    sinatra (2.0.7)
       mustermann (~> 1.0)
       rack (~> 2.0)
-      rack-protection (= 2.0.5)
+      rack-protection (= 2.0.7)
       tilt (~> 2.0)
-    sinatra-contrib (2.0.5)
+    sinatra-contrib (2.0.7)
       backports (>= 2.8.2)
       multi_json
       mustermann (~> 1.0)
-      rack-protection (= 2.0.5)
-      sinatra (= 2.0.5)
-      tilt (>= 1.3, < 3)
+      rack-protection (= 2.0.7)
+      sinatra (= 2.0.7)
+      tilt (~> 2.0)
     thor (0.20.3)
     thread_safe (0.3.6)
-    tilt (2.0.9)
+    tilt (2.0.10)
     timecop (0.9.1)
     tzinfo (1.2.5)
       thread_safe (~> 0.1)
-    vcr (4.0.0)
-    webmock (3.5.1)
+    vcr (5.0.0)
+    webmock (3.7.6)
       addressable (>= 2.3.6)
       crack (>= 0.3.2)
-      hashdiff
+      hashdiff (>= 0.4.0, < 2.0.0)
+    zeitwerk (2.2.1)
 
 PLATFORMS
   ruby
@@ -110,6 +115,7 @@ PLATFORMS
 DEPENDENCIES
   almanack!
   bundler (~> 2.0)
+  bundler-audit
   nokogiri
   pry
   rack-test
@@ -120,4 +126,4 @@ DEPENDENCIES
   webmock
 
 BUNDLED WITH
-   2.0.1
+   2.0.2

data/README.md

@@ -2,12 +2,13 @@
 
 [![Build Status](https://travis-ci.org/Aupajo/almanack.svg)](https://travis-ci.org/Aupajo/almanack)
 [![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).
 
 ![Sinatra GCal example](http://i.imgur.com/odgyR.png)
 
-See a demo running at [http://christchurch.events.geek.nz](http://christchurch.events.geek.nz)
+See a demo running at [http://chch-events.herokuapp.com/](http://chch-events.herokuapp.com/)
 
 ## Features
 
@@ -21,6 +22,14 @@ See a demo running at [http://christchurch.events.geek.nz](http://christchurch.e
 * Rack-compatible (can be mounted inside a Rails app if needed)
 * Produces iCal feed for smartphone and desktop calendar apps to subscribe to
 
+## Simple setup
+
+This option can host your calendar for free light use.
+
+[Sign up for a free Heroku account](https://heroku.com) and click the following button:
+
+[![Deploy](https://www.herokucdn.com/deploy/button.svg)](https://heroku.com/deploy?template=https://github.com/Aupajo/almanack/tree/heroku-button)
+
 ## Video tutorial
 
 [![View on YouTube](http://i.imgur.com/4ifJAXD.jpg)](http://youtu.be/0tUcWHE0Zh0)

data/Rakefile

@@ -1,9 +1,12 @@
 require "bundler/gem_tasks"
+require "bundler/audit/task"
 require "rspec/core/rake_task"
 
+Bundler::Audit::Task.new
+
 RSpec::Core::RakeTask.new(:spec)
 
-task :default => :spec
+task :default => ['bundle:audit', :spec]
 
 task :checksum do
   require 'digest/sha2'

data/almanack.gemspec

@@ -46,4 +46,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "vcr"
   spec.add_development_dependency "timecop"
   spec.add_development_dependency "nokogiri"
+  spec.add_development_dependency "bundler-audit"
 end

data/app.json

@@ -0,0 +1,41 @@
+{
+  "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"],
+  "buildpacks": [
+    { "url": "heroku/ruby" }
+  ],
+  "env": {
+    "CALENDAR_NAME": {
+      "description": "The name of your calendar.",
+      "value": "My Calendar",
+      "required": true
+    },
+    "TZ": {
+      "description": "Which time zone to display the calendar events in, such as `Pacific/Auckland`. See a full list in the “TZ database name” field at https://en.wikipedia.org/wiki/List_of_tz_database_time_zones",
+      "value": "UTC"
+    },
+    "ICAL_FEEDS": {
+      "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.",
+      "value": "900"
+    },
+    "DAYS_LOOKAHEAD": {
+      "description": "How many days of events to display on the calendar",
+      "value": "30",
+      "required": true
+    }
+  }
+}

data/checksums/almanack-1.1.3.gem.sha256

@@ -0,0 +1 @@
+a387719ce45e5b0fc859110f0f73baf66e24b8b2c38f30d444448c57115ce6f8

data/checksums/almanack-1.1.3.gem.sha512

@@ -0,0 +1 @@
+dccd4fbe67f011c1272024f5a82f00b96b84766b7c48af41dc28c19857b053c8ef5ef72622aef194ef2ea78dfef3af956cf54398ea55ff4448d3691c5c6b06ad

data/lib/almanack/event_source/meetup_group.rb

@@ -2,6 +2,7 @@ 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
@@ -108,11 +109,21 @@ module Almanack
         data = JSON.parse(response.body)
 
         if data['problem']
-          raise MeetupAPIError, 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

data/lib/almanack/themes/legacy/views/error.erb

@@ -10,4 +10,6 @@
   <% else %>
     <p><a href="/">Return home</a></p>
   <% end %>
+
+  <p>If you're the administrator, please check the logs for more details.</p>
 </div>

data/lib/almanack/themes/starter/views/error.erb

@@ -10,4 +10,6 @@
   <% else %>
     <p><a href="/">Return home</a></p>
   <% end %>
+
+  <p>If you're the administrator, please check the logs for more details.</p>
 </div>

data/lib/almanack/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: almanack
 version: !ruby/object:Gem::Version
-  version: 1.1.3
+  version: 1.1.5
 platform: ruby
 authors:
 - Pete Nicholls
@@ -34,7 +34,7 @@ cert_chain:
   dZpUW6Gfv2VtOtiN0Q3PjLK+TRjHtqYBjbxa771Msax3xs40e2cSVU/dO+OY5NmR
   a61dVmZ1PIJiY+jyzJSb8ohHVx4=
   -----END CERTIFICATE-----
-date: 2019-06-15 00:00:00.000000000 Z
+date: 2019-11-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sinatra
@@ -302,6 +302,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: bundler-audit
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: 
 email:
 - aupajo@gmail.com
@@ -320,6 +334,7 @@ files:
 - README.md
 - Rakefile
 - almanack.gemspec
+- app.json
 - bin/console
 - bin/setup
 - bin/test
@@ -328,6 +343,8 @@ files:
 - checksums/almanack-1.1.1.gem.sha512
 - checksums/almanack-1.1.2.gem.sha256
 - checksums/almanack-1.1.2.gem.sha512
+- checksums/almanack-1.1.3.gem.sha256
+- checksums/almanack-1.1.3.gem.sha512
 - checksums/almanack-1.1.3.rc1.gem.sha256
 - checksums/almanack-1.1.3.rc1.gem.sha512
 - example.ru