almanack 1.0.3 → 1.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 99755b7d77acaef31cc13576f64b83d8fe89f066
-  data.tar.gz: b521618972d94803a6fd80b49d5dfac0d461e1c5
+  metadata.gz: fe53eb2cd99063253c8164224af13ad6a9d8c0e4
+  data.tar.gz: d9bea9d46b17cbdd855b15a88ca31453b1cd8789
 SHA512:
-  metadata.gz: 49b4b25cddb8fd5b99646e1c8c61a81575d07cabed483cff6392e8852752d58c420d51f5f4860665d59b384233535b803f8e32f2313a39ef586b6d25eeac6379
-  data.tar.gz: f68ed352cf8f4931648960e7d1e78b66e13433444acc31f50e617c256d9fffa91ddc804e2407f6433226088eb28c7f10345d81465ddf5b9732874bbd6a86d50a
+  metadata.gz: fb5812256cb74b0d8045df525078dd1946206f8523da3a88b9b924bde801b4d35f64117bce407e0433261bb2f3c5e58ea84adeca9af659d1230126ea2350c39e
+  data.tar.gz: 91bf2d03200306091280e7df21e53313ef7b956f0b8e3a1fa8e3df16454bf02a7dbfc316751226c3c2f3934caed0a708d08a1eeccf7a83432396eb500e06a1f1

data/almanack.gemspec

@@ -23,6 +23,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency "ri_cal"
   spec.add_dependency "addressable"
   spec.add_dependency "thor"
+  spec.add_dependency "faraday"
 
   spec.add_development_dependency "bundler", "~> 1.5"
   spec.add_development_dependency "rake"

data/lib/almanack/calendar.rb

@@ -21,9 +21,13 @@ module Almanack
     end
 
     def events_between(date_range)
-      event_sources.map do |event_source|
+      event_list = event_sources.map do |event_source|
         event_source.events_between(date_range)
-      end.flatten.sort_by(&:start_date)
+      end.flatten
+
+      event_list.sort_by do |event|
+        event.start_date.to_time
+      end
     end
 
     def ical_feed

data/lib/almanack/configuration.rb

@@ -1,7 +1,3 @@
-require 'net/http'
-require 'uri'
-require 'ri_cal'
-
 module Almanack
   class Configuration
     class ThemeNotFound < StandardError; end
@@ -16,6 +12,10 @@ module Almanack
       reset!
     end
 
+    def connection
+      @connection ||= Faraday.new
+    end
+
     def reset!
       @theme = DEFAULT_THEME
       @days_lookahead = DEFAULT_DAYS_LOOKAHEAD
@@ -34,7 +34,7 @@ module Almanack
     end
 
     def add_ical_feed(url)
-      @event_sources << EventSource::IcalFeed.new(url)
+      @event_sources << EventSource::IcalFeed.new(url, connection: connection)
     end
 
     def add_events(events)
@@ -42,7 +42,7 @@ module Almanack
     end
 
     def add_meetup_group(options)
-      @event_sources << EventSource::MeetupGroup.new(options)
+      @event_sources << EventSource::MeetupGroup.new(options.merge(connection: connection))
     end
   end
 end

data/lib/almanack/event_source/ical_feed.rb

@@ -1,12 +1,9 @@
-require 'net/http'
-require 'uri'
-require 'ri_cal'
-
 module Almanack
   module EventSource
     class IcalFeed
-      def initialize(url)
+      def initialize(url, options = {})
         @url = url
+        @options = options
       end
 
       def events_between(date_range)
@@ -49,12 +46,16 @@ module Almanack
       end
 
       def entities
-        RiCal.parse_string(body)
+        RiCal.parse_string(response.body)
+      end
+
+      def connection
+        @options[:connection]
       end
 
-      def body
-        uri = URI(@url)
-        Net::HTTP.get(uri)
+      def response
+        uri = Addressable::URI.parse(@url)
+        connection.get(uri)
       end
 
     end

data/lib/almanack/event_source/meetup_group.rb

@@ -1,7 +1,3 @@
-require 'net/http'
-require 'json'
-require 'addressable/uri'
-
 module Almanack
   module EventSource
     class MeetupGroup
@@ -18,7 +14,7 @@ module Almanack
       private
 
       def events
-        request = MeetupAPIRequest.new(@request_options)
+        request = MeetupAPIRequest.new(@request_options.clone)
         request.results.map { |result| event_from(result) }
       end
 
@@ -59,9 +55,10 @@ module Almanack
     class MeetupAPIRequest
       REQUIRED_OPTIONS = [:group_domain, :group_urlname, :group_id]
 
-      attr_accessor :options
+      attr_reader :options, :connection
 
       def initialize(options = {})
+        @connection = options.delete(:connection)
         @options = options
       end
 
@@ -86,8 +83,8 @@ module Almanack
       end
 
       def response
-        json = Net::HTTP.get(uri)
-        data = JSON.parse(json)
+        response = connection.get(uri)
+        data = JSON.parse(response.body)
 
         if data['problem']
           raise MeetupAPIError, data['problem']

data/lib/almanack/server/helpers.rb

@@ -0,0 +1,36 @@
+Almanack::Server.helpers do
+  # @return The URL to your consolidated iCal feed.
+  def feed_url
+    "webcal://#{request.host}:#{request.port}/#{settings.feed_path}"
+  end
+
+  # @return The URL to Almanack's project homepage.
+  def almanack_project_url
+    Almanack::HOMEPAGE
+  end
+
+  # @return The URL to Almanack's issues page.
+  def almanack_issues_url
+    Almanack::ISSUES
+  end
+
+  # @return The current time.
+  def now
+    Time.now
+  end
+
+  # @return The calendar.
+  def calendar
+    @calendar ||= Almanack.calendar
+  end
+
+  # @return The title of the page.
+  def page_title(separator: " – ")
+    [@title, calendar.title].compact.join(separator)
+  end
+
+  # Use to set the title of the page.
+  def title(value)
+    @title = value
+  end
+end

data/lib/almanack/server.rb

@@ -5,6 +5,8 @@ require "almanack"
 
 module Almanack
   class Server < Sinatra::Base
+    require "almanack/server/helpers"
+
     configure :development do
       register Sinatra::Reloader
     end
@@ -13,32 +15,6 @@ module Almanack
     set :protection, except: :frame_options
     set :feed_path, "feed.ics"
 
-    helpers do
-      def feed_url
-        "webcal://#{request.host}:#{request.port}/#{settings.feed_path}"
-      end
-
-      def almanack_project_url
-        Almanack::HOMEPAGE
-      end
-
-      def almanack_issues_url
-        Almanack::ISSUES
-      end
-
-      def calendar
-        @calendar ||= Almanack.calendar
-      end
-
-      def page_title(separator: " – ")
-        [@title, calendar.title].compact.join(separator)
-      end
-
-      def title(value)
-        @title = value
-      end
-    end
-
     not_found do
       status 404
       erb :error

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

@@ -7,6 +7,9 @@
   </head>
   <body>
 
+    <!-- See http://strftime.net and http://strftimer.com for datee syntax reference -->
+    <p>The time is now <b><%= now.strftime('%A, %-d %B, %Y at %-l:%M%P %z') %></b>.</p>
+
     <header>
       <h1><a href="/"><%= calendar.title %></a></h1>
       <h2>The Next <%= calendar.days_lookahead %> Days</h2>

data/lib/almanack/version.rb

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

data/lib/almanack.rb

@@ -1,4 +1,9 @@
 require "pathname"
+require "json"
+require "ri_cal"
+require "addressable/uri"
+require "faraday"
+
 require "almanack/version"
 require "almanack/configuration"
 require "almanack/calendar"

data/spec/event_source/ical_feed_spec.rb

@@ -2,13 +2,10 @@ require 'spec_helper'
 
 module Almanack::EventSource
   describe IcalFeed do
-    it "accepts a URL" do
-      IcalFeed.new("http://example.org/ical.ics")
-    end
-
     describe "#events_between" do
       it "returns a list of events" do
-        feed = IcalFeed.new('https://www.google.com/calendar/ical/61s2re9bfk01abmla4d17tojuo%40group.calendar.google.com/public/basic.ics')
+        feed = IcalFeed.new('https://www.google.com/calendar/ical/61s2re9bfk01abmla4d17tojuo%40group.calendar.google.com/public/basic.ics',
+                            connection: Faraday.new)
         events = nil
 
         Timecop.freeze(2014, 4, 3) do

data/spec/event_source/meetup_group_spec.rb

@@ -4,7 +4,9 @@ module Almanack::EventSource
   describe MeetupGroup do
     describe "#events_between" do
       it "returns a list of events" do
-        feed = MeetupGroup.new(group_urlname: 'The-Foundation-Christchurch', key: 'secrettoken')
+        feed = MeetupGroup.new(group_urlname: 'The-Foundation-Christchurch',
+                               key: 'secrettoken',
+                               connection: Faraday.new)
         events = nil
 
         Timecop.freeze(2014, 5, 24) do
@@ -22,7 +24,9 @@ module Almanack::EventSource
       end
 
       it "handles a missing location" do
-        feed = MeetupGroup.new(group_urlname: 'adventurewellington', key: 'secrettoken')
+        feed = MeetupGroup.new(group_urlname: 'adventurewellington',
+                               key: 'secrettoken',
+                               connection: Faraday.new)
 
         Timecop.freeze(2014, 7, 23) do
           VCR.use_cassette('meetup-without-location') do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: almanack
 version: !ruby/object:Gem::Version
-  version: 1.0.3
+  version: 1.0.4
 platform: ruby
 authors:
 - Pete Nicholls
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-27 00:00:00.000000000 Z
+date: 2014-08-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sinatra
@@ -94,6 +94,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: faraday
+  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
@@ -246,6 +260,7 @@ files:
 - lib/almanack/event_source/meetup_group.rb
 - lib/almanack/event_source/static.rb
 - lib/almanack/server.rb
+- lib/almanack/server/helpers.rb
 - lib/almanack/themes/legacy/stylesheets/calendar.scss
 - lib/almanack/themes/legacy/views/error.erb
 - lib/almanack/themes/legacy/views/events.erb