diff --git a/islostonyet.rb b/islostonyet.rb index 0c001ce..f3dafbf 100644 --- a/islostonyet.rb +++ b/islostonyet.rb @@ -10,15 +10,6 @@ class Rack::Request alias request_uri fullpath end -module Sinatra - module Sass - private - def render_sass(content, options = {}) - ::Sass::Engine.new(content, options).render - end - end -end - configure do require File.join(File.dirname(__FILE__), 'config', 'lost.rb') end @@ -30,7 +21,7 @@ def render_sass(content, options = {}) get '/stylesheets/:name.css' do content_type 'text/css', :charset => 'utf-8' - sass :"stylesheets/#{params[:name]}", :style => :compact, :load_paths => [File.join(Sinatra.application.options.views, 'stylesheets')] + sass :"stylesheets/#{params[:name]}", :sass => {:style => :compact, :load_paths => [File.join(Sinatra::Application.views, 'stylesheets')]} end get '/' do @@ -48,10 +39,12 @@ def render_sass(content, options = {}) @body_class = "widget" haml :widget end + get '/widget.js' do content_type 'text/javascript', :charset => 'utf-8' haml :widget_js, :layout => false end + get '/widget.css' do content_type 'text/css', :charset => 'utf-8' sass :"stylesheets/#{IsLOSTOnYet.show_abbrev.downcase}_widget", :style => :compact, :load_paths => [File.join(Sinatra.application.options.views, 'stylesheets')] diff --git a/test/episode_test.rb b/test/episode_test.rb index 418fdf8..07f5826 100644 --- a/test/episode_test.rb +++ b/test/episode_test.rb @@ -6,7 +6,7 @@ class EpisodeTest < Test::Unit::TestCase end it "parses season from code" do - IsLOSTOnYet::Episode.new("s50e40").season.should == 50 + IsLOSTOnYet::Episode.new("s50e40").season.should == 501 end it "parses episode number from code" do diff --git a/test/test_helper.rb b/test/test_helper.rb index e6aec12..b5ea71d 100644 --- a/test/test_helper.rb +++ b/test/test_helper.rb @@ -11,6 +11,8 @@ gem 'jeremymcanally-context' # sudo gem install jeremymcanally-context --source=http://gems.github.com gem 'jeremymcanally-matchy' # sudo gem install jeremymcanally-matchy --source=http://gems.github.com +$:.unshift '/Users/technoweenie/p/plugins/matchy/lib' + require 'rr' require 'context' require 'matchy'