almanack 1.0.1 → 1.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c39fea3d02a2700be92b1899af873e7ca32aafd4
-  data.tar.gz: 29c54092d575add88cdac6dda027c653c60f7c0e
+  metadata.gz: 4a615dead37656c50c8dda7c475f58be70bf83a5
+  data.tar.gz: 1b66ef25577bc35a31baebc9db5be31b59df785d
 SHA512:
-  metadata.gz: 46fadc971f44e0e7a0ebe0206e3ef1bc35f8499966d7a2801af61252ee26f821fb3dc5932ee8979631d558797f737fc9b8a01d86a7797dc46c0d872f00c939b9
-  data.tar.gz: 4fbcc1013b4bf0b07792a7c121ae7965183a884dd041ba48cb0d469a84ef52988a670d4bdd165bd0ee40850162c22e28dde35e7ee4b4f6200efd5f06faa17f2a
+  metadata.gz: 7ef50d32c20ce5ebe045593c353708a3df7ba674a8ba6fd6c3e5cb4ca78318ff318d9c828e3b9b63ccb61bd129402d5f2d254a4d55d0c879a95da2db70d6058c
+  data.tar.gz: d933f1771604f7d4bc8cbf6cd2621ab1ad841ab018edb060dfac46e59c1721a486ce0433b6b65c8cbdcd137645fb0d8d18c0d5af24a48906cf31aab480fa5575

data/README.md

@@ -2,9 +2,9 @@
 
 [![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)
+[![Gem Version](https://badge.fury.io/rb/almanack.svg)](http://badge.fury.io/rb/almanack)
 
-*This project was formerly Sinatra-GCal. A [legacy branch](https://github.com/Aupajo/almanack/tree/almanack) exists for that project.*
+*This project was formerly Sinatra-GCal. A [legacy branch](https://github.com/Aupajo/almanack/tree/sinatra-gcal) 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).
 

data/lib/almanack/server.rb

@@ -44,13 +44,18 @@ module Almanack
       erb :error
     end
 
+    error do
+      status 500
+      erb :error
+    end
+
     def basename(file)
       Pathname(file).split.last.to_s.split(".", 2).first
     end
 
     def locate_asset(name, within: path)
       name = basename(name)
-      path = options.root.join(within)
+      path = settings.root.join(within)
       available = Pathname.glob(path.join("*"))
       asset = available.find { |path| basename(path) == name }
       raise "Could not find stylesheet #{name} inside #{available}" if asset.nil?
@@ -67,6 +72,16 @@ module Almanack
       auto_render_template locate_asset(*args)
     end
 
+    def theme_stylesheet_path
+      settings.root.join('stylesheets')
+    end
+
+    before do
+      if !Sass.load_paths.include?(theme_stylesheet_path)
+        Sass.load_paths << theme_stylesheet_path
+      end
+    end
+
     get "/" do
       erb :events
     end

data/lib/almanack/version.rb

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

data/spec/features/sass_features_spec.rb

@@ -0,0 +1,15 @@
+require 'spec_helper'
+
+describe "Sass rendering", :feature do
+  before { Almanack.reset! }
+
+  it "can import sass" do
+    allow(Almanack.config).to receive(:theme_root) { fixture_theme('sassy') }
+    get "/stylesheets/imports.css"
+    raise last_response.errors unless last_response.errors.empty?
+  end
+
+  def fixture_theme(name)
+    Pathname(__dir__).parent.join('fixtures', 'themes', name)
+  end
+end

data/spec/fixtures/themes/sassy/stylesheets/imports.scss

@@ -0,0 +1 @@
+@import 'imported';

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: almanack
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.2
 platform: ruby
 authors:
 - Pete Nicholls
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-23 00:00:00.000000000 Z
+date: 2014-07-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sinatra
@@ -234,7 +234,7 @@ files:
 - LICENSE.txt
 - README.md
 - Rakefile
-- almanac.gemspec
+- almanack.gemspec
 - bin/almanack
 - example.ru
 - lib/almanack.rb
@@ -264,10 +264,13 @@ files:
 - spec/event_source/static_spec.rb
 - spec/event_spec.rb
 - spec/features/calendar_feature_spec.rb
+- spec/features/sass_features_spec.rb
 - spec/features/subscription_feature_spec.rb
 - spec/fixtures/responses/google_calendar.yml
 - spec/fixtures/responses/meetup-without-location.yml
 - spec/fixtures/responses/meetup.yml
+- spec/fixtures/themes/sassy/stylesheets/imported.scss
+- spec/fixtures/themes/sassy/stylesheets/imports.scss
 - spec/spec_helper.rb
 - spec/support/event_matchers.rb
 - spec/support/server_support.rb
@@ -309,10 +312,13 @@ test_files:
 - spec/event_source/static_spec.rb
 - spec/event_spec.rb
 - spec/features/calendar_feature_spec.rb
+- spec/features/sass_features_spec.rb
 - spec/features/subscription_feature_spec.rb
 - spec/fixtures/responses/google_calendar.yml
 - spec/fixtures/responses/meetup-without-location.yml
 - spec/fixtures/responses/meetup.yml
+- spec/fixtures/themes/sassy/stylesheets/imported.scss
+- spec/fixtures/themes/sassy/stylesheets/imports.scss
 - spec/spec_helper.rb
 - spec/support/event_matchers.rb
 - spec/support/server_support.rb