almanack 0.0.1.alpha3 → 1.0.0.pre

data/spec/features/subscription_feature_spec.rb

@@ -0,0 +1,60 @@
+require 'spec_helper'
+
+describe "Consolidated iCal feed", :feature do
+  let(:now) { Time.now }
+  let(:parsed_feed) { RiCal.parse_string(Almanack.calendar.ical_feed) }
+  let(:parsed_cal) { parsed_feed.first }
+  let(:parsed_events) { parsed_cal.events }
+
+  before do
+    Timecop.freeze(now)
+
+    Almanack.reset!
+
+    Almanack.config.add_events [
+      { title: "Basic", start_date: now },
+      { title: "Almost a year away", start_date: now + 364 * 24 * 60 * 60 },
+      { title: "Over a year away", start_date: now + 366 * 24 * 60 * 60 },
+      {
+        title: "Complex",
+        start_date: now,
+        end_date: now + 30 * 24 * 60 * 60,
+        description: "Body",
+        location: "CA"
+      }
+    ]
+  end
+
+  after { Timecop.return }
+
+  it "should contain one calendar entity" do
+    expect(parsed_feed.length).to eq(1)
+    expect(parsed_feed.first).to be_an_instance_of(RiCal::Component::Calendar)
+  end
+
+  it "contains a year's worth of events" do
+    expect(parsed_events.length).to eq(3)
+    expect(parsed_events.map(&:summary)).to_not include("Over a year away")
+  end
+
+  it "contains all available event information" do
+    complex_event = parsed_events.find { |e| e.summary == 'Complex' }
+    expect(complex_event.dtstart).to eq_time(now)
+    expect(complex_event.dtend).to eq_time(now + 30 * 24 * 60 * 60)
+    expect(complex_event.description).to eq('Body')
+    expect(complex_event.location).to eq('CA')
+  end
+
+  it "treats missing end dates as three hours from the start date" do
+    three_hours_from_now = now + 3 * 60 * 60
+    basic_event = parsed_events.find { |e| e.summary == 'Basic' }
+    expect(basic_event.dtend).to eq_time(three_hours_from_now)
+  end
+
+  it "can be accessed from the server" do
+    allow(Almanack.calendar).to receive(:ical_feed) { "feed" }
+    get "/feed.ics"
+    expect(last_response.body).to eq("feed")
+    expect(last_response.headers["Content-Type"]).to include("text/calendar")
+  end
+end

data/spec/spec_helper.rb

@@ -13,10 +13,11 @@ Dir[File.expand_path('../support/*.rb', __FILE__)].each { |file| require file }
 RSpec.configure do |config|
   config.include ServerSupport, :feature
   config.include EventMatchers
+  config.include TimeComparisonMatchers
 end
 
 VCR.configure do |config|
   config.cassette_library_dir = File.expand_path('../fixtures/responses', __FILE__)
   config.ignore_hosts 'codeclimate.com'
   config.hook_into :webmock
-end
+end

data/spec/support/server_support.rb

@@ -1,4 +1,5 @@
 require 'rack/test'
+require 'almanack/server'
 
 module ServerSupport
   include Rack::Test::Methods
@@ -6,4 +7,4 @@ module ServerSupport
   def app
     Almanack::Server
   end
-end
+end

data/spec/support/time_comparison_matchers.rb

@@ -0,0 +1,14 @@
+module TimeComparisonMatchers
+  extend RSpec::Matchers::DSL
+
+  matcher :eq_time do |expected_time|
+    match do |actual_time|
+      actual_time.to_time.to_i == expected_time.to_time.to_i
+    end
+
+    failure_message do |actual_time|
+      "expected #{actual_time.to_time} to be equal in time to #{expected_time.to_time}"
+    end
+  end
+
+end

data/templates/gitignore

@@ -0,0 +1,2 @@
+.DS_Store
+Thumbs.db

data/templates/new/Gemfile

@@ -0,0 +1,3 @@
+source 'https://rubygems.org'
+
+gem 'almanack'

data/templates/new/config.ru.tt

@@ -0,0 +1,24 @@
+require 'almanack/server'
+
+Almanack.config do |c|
+  c.title = "My Calendar"
+  c.theme = "<%= theme_name %>" # available: <%= available_themes.join(', ') %>
+
+  # 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'
+
+  # Static events
+  c.add_events [
+    {
+      title: "Edit my calendar's settings",
+      description: "Edit the configuration at #{__FILE__}",
+      start_date: Time.now + 30 * 60
+    }
+  ]
+end
+
+run Almanack::Server

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: almanack
 version: !ruby/object:Gem::Version
-  version: 0.0.1.alpha3
+  version: 1.0.0.pre
 platform: ruby
 authors:
 - Pete Nicholls
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-03 00:00:00.000000000 Z
+date: 2014-07-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sinatra
@@ -80,6 +80,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: thor
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -209,7 +223,8 @@ dependencies:
 description: 
 email:
 - pete@metanation.com
-executables: []
+executables:
+- almanack
 extensions: []
 extra_rdoc_files: []
 files:
@@ -220,31 +235,45 @@ files:
 - README.md
 - Rakefile
 - almanac.gemspec
+- bin/almanack
 - example.ru
 - lib/almanack.rb
 - lib/almanack/calendar.rb
+- lib/almanack/cli.rb
 - lib/almanack/configuration.rb
 - lib/almanack/event.rb
-- lib/almanack/ical_feed.rb
-- lib/almanack/meetup_group.rb
+- lib/almanack/event_source/ical_feed.rb
+- lib/almanack/event_source/meetup_group.rb
+- lib/almanack/event_source/static.rb
 - lib/almanack/server.rb
-- lib/almanack/simple_event_collection.rb
+- lib/almanack/themes/legacy/stylesheets/calendar.scss
+- lib/almanack/themes/legacy/views/error.erb
 - lib/almanack/themes/legacy/views/events.erb
 - lib/almanack/themes/legacy/views/layout.erb
-- lib/almanack/themes/legacy/views/stylesheets/legacy.css.sass
+- lib/almanack/themes/starter/javascripts/calendar.js
+- lib/almanack/themes/starter/stylesheets/calendar.scss
+- lib/almanack/themes/starter/views/error.erb
+- lib/almanack/themes/starter/views/events.erb
+- lib/almanack/themes/starter/views/layout.erb
 - lib/almanack/version.rb
+- spec/almanack_spec.rb
 - spec/calendar_spec.rb
 - spec/configuration_spec.rb
+- spec/event_source/ical_feed_spec.rb
+- spec/event_source/meetup_group_spec.rb
+- spec/event_source/static_spec.rb
 - spec/event_spec.rb
 - spec/features/calendar_feature_spec.rb
+- spec/features/subscription_feature_spec.rb
 - spec/fixtures/responses/google_calendar.yml
 - spec/fixtures/responses/meetup.yml
-- spec/ical_feed_spec.rb
-- spec/meetup_group_spec.rb
-- spec/simple_event_collection_spec.rb
 - spec/spec_helper.rb
 - spec/support/event_matchers.rb
 - spec/support/server_support.rb
+- spec/support/time_comparison_matchers.rb
+- templates/gitignore
+- templates/new/Gemfile
+- templates/new/config.ru.tt
 homepage: https://github.com/Aupajo/sinatra-gcal
 licenses:
 - MIT
@@ -270,15 +299,18 @@ signing_key:
 specification_version: 4
 summary: Combined events calendar for Google Calendar, iCal, Meetup.com and friends.
 test_files:
+- spec/almanack_spec.rb
 - spec/calendar_spec.rb
 - spec/configuration_spec.rb
+- spec/event_source/ical_feed_spec.rb
+- spec/event_source/meetup_group_spec.rb
+- spec/event_source/static_spec.rb
 - spec/event_spec.rb
 - spec/features/calendar_feature_spec.rb
+- spec/features/subscription_feature_spec.rb
 - spec/fixtures/responses/google_calendar.yml
 - spec/fixtures/responses/meetup.yml
-- spec/ical_feed_spec.rb
-- spec/meetup_group_spec.rb
-- spec/simple_event_collection_spec.rb
 - spec/spec_helper.rb
 - spec/support/event_matchers.rb
 - spec/support/server_support.rb
+- spec/support/time_comparison_matchers.rb

data/lib/almanack/ical_feed.rb

@@ -1,60 +0,0 @@
-require 'net/http'
-require 'uri'
-require 'ri_cal'
-
-module Almanack
-  class IcalFeed
-    def initialize(url)
-      @url = url
-    end
-
-    def events_between(date_range)
-      occurrences_between(date_range).map do |occurrence|
-        event_from(occurrence)
-      end
-    end
-
-    private
-
-    def each_ical_event(&block)
-      entities.each do |entity|
-        entity.events.each(&block) if entity.respond_to?(:events)
-      end
-    end
-
-    def occurrences_between(date_range)
-      to_date = date_range.max
-      from_date = date_range.min
-
-      occurrences = []
-
-      each_ical_event do |ical_event|
-        ical_event.occurrences(starting: from_date, before: to_date).each do |occurrence|
-          occurrences << occurrence
-        end
-      end
-
-      occurrences
-    end
-
-    def event_from(occurrence)
-      Event.new(
-        title: occurrence.summary,
-        start_date: occurrence.dtstart,
-        end_date: occurrence.dtend,
-        description: occurrence.description,
-        location: occurrence.location
-      )
-    end
-
-    def entities
-      RiCal.parse_string(body)
-    end
-
-    def body
-      uri = URI(@url)
-      Net::HTTP.get(uri)
-    end
-
-  end
-end

data/lib/almanack/meetup_group.rb

@@ -1,96 +0,0 @@
-require 'net/http'
-require 'json'
-require 'addressable/uri'
-
-module Almanack
-  class MeetupGroup
-    def initialize(options = {})
-      @request_options = options
-    end
-
-    def events_between(date_range)
-      events.select do |event|
-        event.start_date >= date_range.min && event.start_date <= date_range.max
-      end
-    end
-
-    private
-
-    def events
-      request = MeetupAPIRequest.new(@request_options)
-      request.results.map { |result| event_from(result) }
-    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_date: start_time.to_datetime,
-        end_date: end_time.to_datetime,
-        description: result['description'],
-        location: location_from_venue(result['venue']),
-        url: result['event_url']
-      )
-    end
-
-    def location_from_venue(venue)
-      %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_accessor :options
-
-    def initialize(options = {})
-      @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
-      json = Net::HTTP.get(uri)
-      data = JSON.parse(json)
-      
-      if data['problem']
-        raise MeetupAPIError, data['problem']
-      end
-
-      data
-    end
-  end
-end

data/lib/almanack/simple_event_collection.rb

@@ -1,11 +0,0 @@
-module Almanack
-  class SimpleEventCollection
-    def initialize(events)
-      @events = events
-    end
-
-    def events_between(date_range)
-      @events.map { |attrs| Event.new(attrs) }
-    end
-  end
-end

data/lib/almanack/themes/legacy/views/stylesheets/legacy.css.sass

@@ -1,119 +0,0 @@
-=border-radius($size)
-  border-radius: $size
-  -webkit-border-radius: $size
-  -moz-border-radius: $size
-
-=box-shadow($x, $y, $size, $colour)
-  -webkit-box-shadow: $x $y $size $colour
-  -moz-box-shadow: $x $y $size $colour
-
-body
-  background-color: #e3e3e3
-  color: #595959
-  font: 12pt / 1.6em "Helvetica Neue", Helvetica, sans-serif
-  margin: 2em auto
-  width: 600px
-
-a
-  text-decoration: none
-  &:link, &:visited
-    color: #2960AA
-
-em
-  font-style: italic
-
-strong
-  font-weight: bold
-
-.event
-  background-color: #efefef
-  background: -webkit-gradient(linear, left top, left bottom, from(#f9f9f9), to(#efefef))
-  background: -moz-linear-gradient(top, #f9f9f9, #efefef)
-  border-top: 1px solid white
-  +border-radius(4px)
-  overflow: hidden
-  padding: 20px
-  margin-bottom: 1em
-  +box-shadow(0, 1px, 3px, rgba(0, 0, 0, 0.3))
-  &.today
-    background-color: #ebe4de
-    background: -webkit-gradient(linear, left top, left bottom, from(#f3ebe3), to(#e9d6c1))
-  .details
-    float: right
-    width: 480px
-  dl
-    color: #777777
-    font-size: 0.9em
-  dt
-    font-weight: bold
-    float: left
-  dd
-    float: right
-    margin: 0
-    width: 420px
-
-header, footer
-  // display: block for browsers with poor HTML5 support
-  display: block
-
-header
-  border-bottom: 1px solid #cccccc
-  overflow: hidden
-  padding-bottom: 0.5em
-  margin-bottom: 1em
-  +box-shadow(0, 1px, 0, #f6f6f6)
-
-footer
-  border-top: 1px solid #cccccc
-  color: #999999
-  font-size: 0.9em
-  padding: 1em
-  .subscribe
-    float: left
-    a
-      margin-right: 1em
-  .add
-    float: right
-  .fork
-    clear: both
-    font-size: 0.8em
-
-  a:link, a:visited
-    color: #8aa0b6
-
-h1, h2, h3, h4
-  margin: 0
-  text-shadow: 0 1px 0 white
-
-h1
-  color: #666666
-  font-size: 1.8em
-  float: left
-
-h2
-  color: #999999
-  font-size: 1em
-  float: right
-  text-transform: uppercase
-
-h3
-  color: #333333
-
-h4
-  display: inline
-  font-size: 1em
-  margin-right: 1em
-
-.date
-  background-color: #cc0000
-  +border-radius(4px)
-  color: white
-  float: left
-  text-align: center
-  padding: 2px
-  width: 60px
-  .day
-    background-color: white
-    color: #333333
-    font-size: 1.6em
-    padding: 0.2em