almanack 0.0.1.alpha2 → 0.0.1.alpha3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 67e9e2f5df00888819b42e0af733cf662fb60a4f
-  data.tar.gz: cd05e1944b3dd5e0670de6d9e378c6964e90972a
+  metadata.gz: 0d73adf865b8f26fc09b7964c10617ff54d6b381
+  data.tar.gz: c9835f0434bf1821619eb22d86a0396c156860c3
 SHA512:
-  metadata.gz: 45140da76420d78031824b8e7ac8c079e01dda68dad3bf67a977da43b93aeca2d9111eab2eb865bc324a3cd671ec74d9965b2f6d3349c866006c110970e61b8b
-  data.tar.gz: e4497e0852a86bf0ea21b18926eb2f215698f5858c60d3330fad90c0e0107dba2c4cc1a0d0f623dc7bd6e6cf96ab886b337c45875ba5ed017ead0f755e8d4028
+  metadata.gz: 64d23b956709c3127395f09e774f7acc6ec4761222c085d6b86bc3cfd4e49c77bc578c7ee93abc007dc6dcba762f4eabff9b24d43ec5705b086cc620df858b31
+  data.tar.gz: 164eb43910f561b1fd46e154e460dff36e70cd392cd1311e08f3ad78ae63b5afe179f3f89beb1181cc064260a393dcefe2b64c48aae5e84efa2267a413a27cc8

data/.travis.yml

@@ -1,7 +1,7 @@
 language: ruby
 cache: bundler
 rvm:
-- 2.1.1
+- 2.1.2
 addons:
   code_climate:
     repo_token:

data/Rakefile

@@ -4,18 +4,3 @@ require "rspec/core/rake_task"
 RSpec::Core::RakeTask.new(:spec)
 
 task :default => :spec
-
-desc 'Run a dummy server'
-task :server do
-  require "almanack"
-
-  today = DateTime.now
-
-  Almanack.config.add_events [
-    { title: "Hogswatch", start_date: today },
-    { title: "Soul Cake Tuesday", start_date: today + 10 },
-    { title: "Eve of Small Gods", start_date: today + 30 },
-  ]
-
-  Rack::Handler::WEBrick.run(Almanack::Server)
-end

data/almanac.gemspec

@@ -18,6 +18,8 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   spec.add_dependency "sinatra"
+  spec.add_dependency "sinatra-contrib"
+  spec.add_dependency "sass"
   spec.add_dependency "ri_cal"
   spec.add_dependency "addressable"
 

data/example.ru

@@ -0,0 +1,20 @@
+require "bundler/setup"
+require "rack/reloader"
+require "almanack"
+
+today = DateTime.now
+
+Almanack.config.title = 'Discworld Holidays'
+
+Almanack.config.add_events [
+  {
+    title: "Hogswatch",
+    start_date: today,
+    description: 'The sausages have been strung, the wreaths of oakleaves hung and the stockings dangled. The pork pie, the sherry and the all-important turnip await their festive guests. The poker lent against the fireplace may or may not have been bent over the head of some nightmare creature.',
+    location: 'Castle of Bones'
+  },
+  { title: "Soul Cake Tuesday", start_date: today + 10 },
+  { title: "Eve of Small Gods", start_date: today + 30 },
+]
+
+run Almanack::Server

data/lib/almanack/calendar.rb

@@ -1,21 +1,25 @@
+require 'forwardable'
+
 module Almanack
   class Calendar
+    extend Forwardable
+    def_delegators :@config, :event_sources, :title
+
     def initialize(config)
       @config = config
     end
 
-    def event_sources
-      @config.event_sources
-    end
-
-    def events  
-      days_lookahead = 30
+    def events
       from_date = DateTime.now
       to_date = DateTime.now + days_lookahead
-      
+
       event_sources.map do |event_source|
         event_source.events_between(from_date..to_date)
       end.flatten.sort_by(&:start_date)
     end
+
+    def days_lookahead
+      30
+    end
   end
-end
+end

data/lib/almanack/configuration.rb

@@ -5,6 +5,7 @@ require 'ri_cal'
 module Almanack
   class Configuration
     attr_reader :event_sources
+    attr_accessor :title
 
     def initialize
       reset!
@@ -26,4 +27,4 @@ module Almanack
       @event_sources << MeetupGroup.new(options)
     end
   end
-end
+end

data/lib/almanack/server.rb

@@ -2,12 +2,17 @@ require "sinatra"
 
 module Almanack
   class Server < Sinatra::Base
-    set :theme, 'origami'
+    set :theme, 'legacy'
     set :root, Pathname(settings.root).join('themes', settings.theme)
+    set :protection, except: :frame_options
 
     get "/" do
       @calendar = Almanack.calendar
       erb :events
     end
+
+    get "/stylesheets/:name" do
+      sass :"stylesheets/#{params[:name]}"
+    end
   end
-end
+end

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

@@ -0,0 +1,29 @@
+<div class="events">
+  <% @calendar.events.each do |event| %>
+    <div class="event">
+      <div class="date">
+        <div class="month"><%= event.start_date.strftime('%a') %></div>
+        <div class="day"><%= event.start_date.strftime('%d') %></div>
+      </div>
+      <div class="details">
+        <h3 class="title"><%= event.title %></h3>
+
+        <% if event.description %>
+          <div class="description">
+            <%= event.description %>
+          </div>
+        <% end %>
+
+         <dl>
+           <% if event.location %>
+            <dt>Where</dt>
+            <dd><%= event.location %></dd>
+          <% end %>
+
+          <dt>When</dt>
+          <dd><%= event.start_date.strftime('%l:%M%P, %-d %b %Y') %></dd>
+        </dl>
+      </div>
+    </div>
+  <% end %>
+</div>

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

@@ -0,0 +1,25 @@
+<!DOCTYPE html>
+<html>
+  <head>
+    <meta charset="utf-8">
+    <title>Upcoming events</title>
+    <link rel="stylesheet" type="text/css" href="/stylesheets/legacy.css">
+  </head>
+  <body>
+
+    <header>
+      <h1><%= @calendar.title %></h1>
+      <h2>The Next <%= @calendar.days_lookahead %> Days</h2>
+    </header>
+
+    <%= yield %>
+
+    <footer>
+      <div class="fork">
+        Powered by <a href="http://github.com/Aupajo/sinatra-gcal">Almanack</a>.
+        <a href="http://github.com/Aupajo/sinatra-gcal/issues">Bugs? Features?</a>
+      </div>
+    </footer>
+
+  </body>
+</html>

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

@@ -0,0 +1,119 @@
+=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

data/lib/almanack/version.rb

@@ -1,3 +1,3 @@
 module Almanack
-  VERSION = "0.0.1.alpha2"
+  VERSION = "0.0.1.alpha3"
 end

data/spec/calendar_spec.rb

@@ -2,7 +2,16 @@ require 'spec_helper'
 
 module Almanack
   describe Calendar do
-    
+
+    describe "#title" do
+      it "delegates to the config's title" do
+        config = Configuration.new
+        config.title = "Discworld Holidays"
+        calendar = Calendar.new(config)
+        expect(calendar.title).to eq("Discworld Holidays")
+      end
+    end
+
     describe "#events" do
       describe "with simple events" do
         it "returns the events" do
@@ -40,5 +49,9 @@ module Almanack
       end
     end
 
+    it "has a 30 day lookahead" do
+      expect(Calendar.new(double).days_lookahead).to eq(30)
+    end
+
   end
-end
+end

data/spec/configuration_spec.rb

@@ -3,6 +3,14 @@ require 'spec_helper'
 module Almanack
   describe Configuration do
 
+    describe "#title" do
+      it "can be set and accessed" do
+        config = Configuration.new
+        config.title = "Discworld Holidays"
+        expect(config.title).to eq("Discworld Holidays")
+      end
+    end
+
     describe "#add_events" do
       it "adds a simple event collection event source" do
         config = Configuration.new
@@ -23,7 +31,7 @@ module Almanack
         expect(config.event_sources.size).to eq(0)
 
         config.add_ical_feed "https://www.google.com/calendar/ical/61s2re9bfk01abmla4d17tojuo%40group.calendar.google.com/public/basic.ics"
-        
+
         expect(config.event_sources.size).to eq(1)
         expect(config.event_sources.first).to be_an_instance_of(IcalFeed)
       end
@@ -35,11 +43,11 @@ module Almanack
         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(MeetupGroup)
       end
     end
 
   end
-end
+end

data/spec/event_spec.rb

@@ -29,4 +29,4 @@ module Almanack
     end
 
   end
-end
+end

data/spec/features/calendar_feature_spec.rb

@@ -4,10 +4,12 @@ describe "Viewing a calendar", :feature do
   before { Almanack.reset! }
 
   it "displays all upcoming events" do
+    today = DateTime.now
+
     Almanack.config.add_events [
-      { title: "Hogswatch" },
-      { title: "Soul Cake Tuesday" },
-      { title: "Eve of Small Gods" },
+      { title: "Hogswatch", start_date: today },
+      { title: "Soul Cake Tuesday", start_date: today + 10 },
+      { title: "Eve of Small Gods", start_date: today + 30 },
     ]
 
     get "/"
@@ -19,7 +21,7 @@ describe "Viewing a calendar", :feature do
 
   it "displays events from an iCal feed" do
     Almanack.config.add_ical_feed "https://www.google.com/calendar/ical/61s2re9bfk01abmla4d17tojuo%40group.calendar.google.com/public/basic.ics"
-    
+
     Timecop.freeze(2014, 4, 3) do
       VCR.use_cassette('google_calendar') do
         get "/"
@@ -32,4 +34,9 @@ describe "Viewing a calendar", :feature do
     expect(last_response).to have_event_on_page("Christchurch Python Meetup")
     expect(last_response).to have_event_on_page("Coffee & Jam")
   end
-end
+
+  it "allows being embedded in an iframe" do
+    get "/"
+    expect(last_response.headers).to_not have_key("X-Frame-Options")
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: almanack
 version: !ruby/object:Gem::Version
-  version: 0.0.1.alpha2
+  version: 0.0.1.alpha3
 platform: ruby
 authors:
 - Pete Nicholls
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-07 00:00:00.000000000 Z
+date: 2014-07-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sinatra
@@ -24,6 +24,34 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: sinatra-contrib
+  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: sass
+  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: ri_cal
   requirement: !ruby/object:Gem::Requirement
@@ -192,6 +220,7 @@ files:
 - README.md
 - Rakefile
 - almanac.gemspec
+- example.ru
 - lib/almanack.rb
 - lib/almanack/calendar.rb
 - lib/almanack/configuration.rb
@@ -200,9 +229,9 @@ files:
 - lib/almanack/meetup_group.rb
 - lib/almanack/server.rb
 - lib/almanack/simple_event_collection.rb
-- lib/almanack/themes/origami/public/stylesheets/origami.css
-- lib/almanack/themes/origami/views/events.erb
-- lib/almanack/themes/origami/views/layout.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/version.rb
 - spec/calendar_spec.rb
 - spec/configuration_spec.rb
@@ -236,7 +265,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.3.0
 signing_key: 
 specification_version: 4
 summary: Combined events calendar for Google Calendar, iCal, Meetup.com and friends.

data/lib/almanack/themes/origami/public/stylesheets/origami.css

@@ -1,4 +0,0 @@
-body {
-  font: 14pt/1.6em "Helvetica Neue", sans-serif;
-  font-weight: 300;
-}

data/lib/almanack/themes/origami/views/events.erb

@@ -1,8 +0,0 @@
-<div class="events">
-  <% @calendar.events.each do |event| %>
-    <div class="event">
-      <h2 class="title"><%= event.title %></h2>
-      (<%= event.start_date %>)
-    </div>
-  <% end %>
-</div>

data/lib/almanack/themes/origami/views/layout.erb

@@ -1,13 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <meta charset="utf-8">
-    <title>Upcoming events</title>
-    <link rel="stylesheet" type="text/css" href="/stylesheets/origami.css">
-  </head>
-  <body>
-
-    <%= yield %>
-
-  </body>
-</html>