almanack 1.1.0.beta1 → 1.1.0.beta2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 49d69b1b032ff7f536d34807c859021af3840f3e
-  data.tar.gz: b5ea878e85c09b1e967054e7038400fcc0125120
+  metadata.gz: 10c99dfffb686948d337e833fb1e6b7ecb1f5158
+  data.tar.gz: c28448a2dd460493f2cbddbdec8a661e5c291726
 SHA512:
-  metadata.gz: d40154226158a3bbf56e6de69e1cd495827eef1563cbf88e8823257cdf8653c2eec181070a6be6e2ae0f0b19d9fc9c56a5b02471945f6ae35bba68cecb6151b9
-  data.tar.gz: 0a8723f866ee7403cd8d66044c16c6e93c197c5a9b7485d7af61da75a00a8cc31f9c2a04fc3cdfc40d22b80c903b9e9ebd703f2e8704ab34e8246b8a302bd024
+  metadata.gz: 41f12f532013e4ffe218a7f1cff3fbf794cf412c7f258e78a3a95ec5b9a5934619f7fb092fae6fa68a874ba6370f015499c1d66858bfc2d247cb6c075091110c
+  data.tar.gz: 8c7845973b5ab3bf7e81c508d7a4d249cb1390312008d0eff1d0c162ab98ae1ab1471ba6dc2db88d66cbe88a072bd2ca51f512265587c02fcfbc9235439d2cb0

data/.travis.yml

@@ -1,6 +1,7 @@
 language: ruby
 cache: bundler
 rvm:
+- 2.1.5
 - 2.1.4
 - 2.1.3
 - 2.1.2

data/almanack.gemspec

@@ -24,9 +24,12 @@ Gem::Specification.new do |spec|
   spec.add_dependency "addressable"
   spec.add_dependency "thor"
   spec.add_dependency "faraday"
+  spec.add_dependency "faraday_middleware"
   spec.add_dependency "rack-contrib"
+  spec.add_dependency "activesupport"
 
   spec.add_development_dependency "bundler", "~> 1.5"
+  spec.add_development_dependency "pry"
   spec.add_development_dependency "rake"
   spec.add_development_dependency "rspec"
   spec.add_development_dependency "rack-test"

data/lib/almanack/cli.rb

@@ -35,12 +35,14 @@ module Almanack
     def new(path)
       @path = Pathname(path).cleanpath
 
-      directory "templates/new", path
+      directory "templates/new", @path
 
       if options[:git]
         template('templates/gitignore', @path.join(".gitignore"))
       end
 
+      create_file @path.join('tmp/.keep')
+
       inside @path do
         say_status :installing, "bundler dependencies"
         system "bundle install --quiet"

data/lib/almanack/configuration.rb

@@ -2,9 +2,12 @@ module Almanack
   class Configuration
     class ThemeNotFound < StandardError; end
 
+    CACHE_DIR = "tmp"
     DEFAULT_THEME = "legacy"
     DEFAULT_DAYS_LOOKAHEAD = 30
     DEFAULT_FEED_LOOKAHEAD = 365
+    DEFAULT_CACHE_RESPONSES = false
+    DEFAULT_CACHE_EXPIRY = 900
 
     attr_reader :event_sources
     attr_accessor :title,
@@ -12,21 +15,28 @@ module Almanack
                   :theme_paths,
                   :theme_root,
                   :days_lookahead,
-                  :feed_lookahead
+                  :feed_lookahead,
+                  :cache_responses,
+                  :cache_expiry
 
     def initialize
       reset!
     end
 
     def connection
-      @connection ||= Faraday.new
+      @connection ||= Faraday.new do |conn|
+        conn.response(:caching) { cache_store } if cache_responses
+        conn.adapter Faraday.default_adapter
+      end
     end
 
     def reset!
-      @theme = DEFAULT_THEME
-      @days_lookahead = DEFAULT_DAYS_LOOKAHEAD
-      @feed_lookahead = DEFAULT_FEED_LOOKAHEAD
-      @event_sources = []
+      @theme           = DEFAULT_THEME
+      @days_lookahead  = DEFAULT_DAYS_LOOKAHEAD
+      @feed_lookahead  = DEFAULT_FEED_LOOKAHEAD
+      @event_sources   = []
+      @cache_responses = DEFAULT_CACHE_RESPONSES
+      @cache_expiry    = DEFAULT_CACHE_EXPIRY
 
       @theme_paths = [
         Pathname.pwd.join('themes'),
@@ -55,5 +65,15 @@ module Almanack
     def add_meetup_group(options)
       add_event_source EventSource::MeetupGroup.new(options.merge(connection: connection))
     end
+
+    def cache_store
+      @cache_store ||= ActiveSupport::Cache::FileStore.new(cache_dir, expires_in: cache_expiry)
+    end
+
+    private
+
+    def cache_dir
+      Pathname.pwd.join(CACHE_DIR)
+    end
   end
 end

data/lib/almanack/serialized_transformation.rb

@@ -37,7 +37,7 @@ module Almanack
     end
 
     def recurse(entity)
-      cloned = case entity
+      case entity
       when Array
         entity.map { |child| recurse(child) }
       when Hash

data/lib/almanack/version.rb

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

data/lib/almanack.rb

@@ -3,6 +3,8 @@ require "json"
 require "ri_cal"
 require "addressable/uri"
 require "faraday"
+require "faraday_middleware"
+require "active_support/cache"
 
 require "almanack/base"
 require "almanack/version"

data/spec/configuration_spec.rb

@@ -85,5 +85,29 @@ module Almanack
       end
     end
 
+    describe "#cache_expiry" do
+      it "is 15 minutes by default" do
+        expect(Configuration.new.cache_expiry).to eq(900)
+      end
+
+      it "can be set" do
+        config = Configuration.new
+        config.cache_expiry = 3600
+        expect(config.cache_expiry).to eq(3600)
+      end
+    end
+
+    describe "#cache_responses" do
+      it "is enabled by default" do
+        expect(Configuration.new.cache_responses).to be(false)
+      end
+
+      it "can be disabled" do
+        config = Configuration.new
+        config.cache_responses = true
+        expect(config.cache_responses).to be(true)
+      end
+    end
+
   end
 end

data/templates/gitignore

@@ -5,3 +5,7 @@ Thumbs.db
 # Ignore cache files
 /.sass-cache
 /.cache
+/tmp/*
+
+# But not the tmp directory itself
+!/tmp/.keep

data/templates/new/config.ru.tt

@@ -5,6 +5,10 @@ Almanack.config do |c|
   c.theme = "<%= theme_name %>" # available: <%= available_themes.join(', ') %>
   c.days_lookahead = 30
 
+  # Don't fetch event information more than once every 15 minutes
+  c.cache_responses = true
+  c.cache_expiry = 900 # seconds
+
   # 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'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: almanack
 version: !ruby/object:Gem::Version
-  version: 1.1.0.beta1
+  version: 1.1.0.beta2
 platform: ruby
 authors:
 - Pete Nicholls
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-08 00:00:00.000000000 Z
+date: 2014-12-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sinatra
@@ -108,6 +108,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: faraday_middleware
+  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: rack-contrib
   requirement: !ruby/object:Gem::Requirement
@@ -122,6 +136,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: activesupport
+  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
@@ -136,6 +164,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.5'
+- !ruby/object:Gem::Dependency
+  name: pry
+  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'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement