almanack 1.0.0 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5284cadfc609e3a8a9ed16fa80b5c80607c3d922
-  data.tar.gz: a2ba774e37e39820483a979f4fd1315e75e195b1
+  metadata.gz: c39fea3d02a2700be92b1899af873e7ca32aafd4
+  data.tar.gz: 29c54092d575add88cdac6dda027c653c60f7c0e
 SHA512:
-  metadata.gz: 7c3cc747278612494441caf410a86dcc6ecd16f719be394da132eb31b4cc3ef992adafe037d1dc4329c904e2d67ae94e876825bb276b23ad5741ad0b80159daf
-  data.tar.gz: 37ab70dee79424f70633593700bc84cbe526c6832c652a53e8a45299335bcd26972d2a5ac22baba4f0c6bf28eafca77067c578d20a41af5231a4774f6096dae6
+  metadata.gz: 46fadc971f44e0e7a0ebe0206e3ef1bc35f8499966d7a2801af61252ee26f821fb3dc5932ee8979631d558797f737fc9b8a01d86a7797dc46c0d872f00c939b9
+  data.tar.gz: 4fbcc1013b4bf0b07792a7c121ae7965183a884dd041ba48cb0d469a84ef52988a670d4bdd165bd0ee40850162c22e28dde35e7ee4b4f6200efd5f06faa17f2a

data/.travis.yml

@@ -2,6 +2,8 @@ language: ruby
 cache: bundler
 rvm:
 - 2.1.2
+- 2.1.0
+- 2.0.0
 addons:
   code_climate:
     repo_token:

data/README.md

@@ -1,11 +1,17 @@
 # Almanack
 
-[![Build Status](https://travis-ci.org/Aupajo/sinatra-gcal.svg)](https://travis-ci.org/Aupajo/sinatra-gcal)
-[![Code Climate](https://codeclimate.com/github/Aupajo/sinatra-gcal.png)](https://codeclimate.com/github/Aupajo/sinatra-gcal)
-[![Code Climate](https://codeclimate.com/github/Aupajo/sinatra-gcal/coverage.png)](https://codeclimate.com/github/Aupajo/sinatra-gcal)
+[![Build Status](https://travis-ci.org/Aupajo/almanack.svg)](https://travis-ci.org/Aupajo/almanack)
+[![Code Climate](https://codeclimate.com/github/Aupajo/almanack.png)](https://codeclimate.com/github/Aupajo/almanack)
+[![Code Climate](https://codeclimate.com/github/Aupajo/almanack/coverage.png)](https://codeclimate.com/github/Aupajo/almanack)
+
+*This project was formerly Sinatra-GCal. A [legacy branch](https://github.com/Aupajo/almanack/tree/almanack) exists for that project.*
 
 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)
+
 ## Features
 
 * Aggregate multiple calendars together into one stream
@@ -15,7 +21,8 @@ A calendar that combines events from different sources (such as Google Calendar,
 * Supports being freely hosted on Heroku
 * 100% customisable themes with Sass and CoffeeScript support
 * Server optional (you can use the underlying calendar library by itself)
-* Rack-compatible (mount inside any Rails application)
+* Rack-compatible (can be mounted inside a Rails app if needed)
+* Produces iCal feed for smartphone and desktop calendar apps to subscribe to
 
 ## Installation
 
@@ -46,6 +53,7 @@ See examples inside `config.ru` for iCal feeds, Meetup.com, or static events.
 Almanack.config do |c|
   c.title = 'My Calendar'
   c.theme = 'my-custom-theme'
+  c.days_lookahead = 30
   c.add_ical_feed 'http://example.org/events.ics'
   c.add_ical_feed 'http://example.org/more-events.ics'
   c.add_meetup_group group_urlname: 'Christchurch-Ruby-Group', key: 'mysecretkey'
@@ -70,6 +78,24 @@ Almanack.config do |c|
 end
 ```
 
+## Deploying to Heroku
+
+Deployment works with Git and Heroku. First, add your work to git (an repository
+is already initialized for you when you run `almanack new`):
+
+    git add .
+    git commit -m "My awesome calendar"
+
+With the [Heroku Toolbelt](https://toolbelt.heroku.com) installed:
+
+    almanack deploy my-awesome-calendar
+
+Will create and deploy http://my-awesome-calendar.herokuapp.com/.
+
+Subsequent commits can be deployed with just:
+
+    almanack deploy
+
 ## Contributing
 
 1. Fork it ( http://github.com/Aupajo/almanack/fork )

data/lib/almanack/calendar.rb

@@ -8,7 +8,7 @@ module Almanack
     ONE_YEAR = 365 * ONE_DAY
 
     extend Forwardable
-    def_delegators :@config, :event_sources, :title
+    def_delegators :@config, :event_sources, :title, :days_lookahead
 
     def initialize(config)
       @config = config
@@ -49,9 +49,5 @@ module Almanack
 
       ical.to_s
     end
-
-    def days_lookahead
-      30
-    end
   end
 end

data/lib/almanack/cli.rb

@@ -33,15 +33,15 @@ module Almanack
     option :theme, default: 'legacy', desc: "Which theme to use (available: #{available_themes.join(', ')})"
     option :git, type: :boolean, default: true, desc: "Whether to initialize an empty git repo"
     def new(path)
-      path = Pathname(path).cleanpath
+      @path = Pathname(path).cleanpath
 
       directory "templates/new", path
 
       if options[:git]
-        template('templates/gitignore', path.join(".gitignore"))
+        template('templates/gitignore', @path.join(".gitignore"))
       end
 
-      inside path do
+      inside @path do
         say_status :installing, "bundler dependencies"
         system "bundle install --quiet"
 
@@ -53,7 +53,7 @@ module Almanack
         say
         say "==> Run your new calendar!"
         say
-        say "  cd #{path}"
+        say "  cd #{@path}"
         say "  almanack start"
         say
       end
@@ -110,6 +110,20 @@ module Almanack
         options[:theme]
       end
 
+      def almanack_homepage
+        Almanack::HOMEPAGE
+      end
+
+      def almanack_issues
+        Almanack::ISSUES
+      end
+
+      def title
+        basename = @path.to_s.split('/', 2).last.split('.', 2).first
+        sanitized = basename.gsub('-', ' ')
+        sanitized.split(/\s+/).map(&:capitalize).join(' ')
+      end
+
       def git(command)
         output = `git #{command}`
         abort "Git failed: #{output}" if $?.exitstatus != 0

data/lib/almanack/configuration.rb

@@ -7,9 +7,10 @@ module Almanack
     class ThemeNotFound < StandardError; end
 
     DEFAULT_THEME = "legacy"
+    DEFAULT_DAYS_LOOKAHEAD = 30
 
     attr_reader :event_sources
-    attr_accessor :title, :theme, :theme_paths, :theme_root
+    attr_accessor :title, :theme, :theme_paths, :theme_root, :days_lookahead
 
     def initialize
       reset!
@@ -17,6 +18,7 @@ module Almanack
 
     def reset!
       @theme = DEFAULT_THEME
+      @days_lookahead = DEFAULT_DAYS_LOOKAHEAD
       @event_sources = []
 
       @theme_paths = [

data/lib/almanack/event_source/meetup_group.rb

@@ -42,6 +42,8 @@ module Almanack
       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(', ')

data/lib/almanack/version.rb

@@ -1,6 +1,6 @@
 module Almanack
   CODENAME = "Garlick"
-  VERSION  = "1.0.0"
+  VERSION  = "1.0.1"
   HOMEPAGE = "https://github.com/Aupajo/sinatra-gcal"
   ISSUES   = "https://github.com/Aupajo/sinatra-gcal/issues"
 end

data/spec/calendar_spec.rb

@@ -53,8 +53,11 @@ module Almanack
       end
     end
 
-    it "has a 30 day lookahead" do
-      expect(Calendar.new(double).days_lookahead).to eq(30)
+    describe "#days_lookahead" do
+      it "delegates to the configuration's days_lookahead" do
+        config = double(days_lookahead: :delegated)
+        expect(Calendar.new(config).days_lookahead).to eq(:delegated)
+      end
     end
 
   end

data/spec/configuration_spec.rb

@@ -27,6 +27,16 @@ module Almanack
       end
     end
 
+    describe "#days_lookahead" do
+      specify { expect(Configuration.new.days_lookahead).to eq(30) }
+
+      specify "it can be set" do
+        config = Configuration.new
+        config.days_lookahead = 365
+        expect(config.days_lookahead).to eq(365)
+      end
+    end
+
     describe "#add_events" do
       it "adds a simple event collection event source" do
         config = Configuration.new

data/spec/event_source/meetup_group_spec.rb

@@ -20,6 +20,18 @@ module Almanack::EventSource
         expect(events.length).to eq(5)
         expect(events).to all_have_properties(:title, :start_date, :end_date, :description, :location)
       end
+
+      it "handles a missing location" do
+        feed = MeetupGroup.new(group_urlname: 'adventurewellington', key: 'secrettoken')
+
+        Timecop.freeze(2014, 7, 23) do
+          VCR.use_cassette('meetup-without-location') do
+            from = Time.now
+            to = from + 30 * 24 * 60 * 60
+            expect { feed.events_between(from..to) }.not_to raise_error
+          end
+        end
+      end
     end
 
   end