From 7d2821a4725a81d2957eda902070eef4c49b00bd Mon Sep 17 00:00:00 2001
From: Thomas Reynolds <me@tdreyno.com>
Date: Wed, 14 Mar 2012 20:02:49 -0700
Subject: [PATCH] travis update

---
 .travis.yml                                   |  7 ++++-
 Gemfile                                       |  3 ++-
 gemfiles/Gemfile                              | 26 +++++++++++++++++++
 gemfiles/Gemfile-compass-0.11                 | 25 ++++++++++++++++++
 .../middleman-more/core_extensions/compass.rb |  9 +++++++
 5 files changed, 68 insertions(+), 2 deletions(-)
 create mode 100644 gemfiles/Gemfile
 create mode 100644 gemfiles/Gemfile-compass-0.11

diff --git a/.travis.yml b/.travis.yml
index 3f6d0093..1ef48128 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -2,8 +2,13 @@ rvm:
   - 1.8.7
   - 1.9.2
   - 1.9.3
+  - jruby
 script: "bundle exec rake test"
 
 branches:
   only:
-    - master
\ No newline at end of file
+    - master
+
+matrix:
+  allow_failures:
+    - rvm: jruby
\ No newline at end of file
diff --git a/Gemfile b/Gemfile
index 6fd4dd5f..32d3e1da 100644
--- a/Gemfile
+++ b/Gemfile
@@ -22,4 +22,5 @@ end
 
 gem "middleman-core", :path => "middleman-core"
 gem "middleman-more", :path => "middleman-more"
-gem "middleman", :path => "middleman"
\ No newline at end of file
+gem "middleman", :path => "middleman"
+gem "compass", "~> 0.11.0"
\ No newline at end of file
diff --git a/gemfiles/Gemfile b/gemfiles/Gemfile
new file mode 100644
index 00000000..32d3e1da
--- /dev/null
+++ b/gemfiles/Gemfile
@@ -0,0 +1,26 @@
+source :rubygems
+
+group :development do
+  gem "cucumber", "~> 1.1.0"
+  gem "aruba",    "~> 0.4.11"
+  gem "rake",     "~> 0.9.2"
+  gem "rspec",    "~> 2.7"
+  gem "rdoc",     "~> 3.9"
+  # gem "yard"
+end
+  
+group :test do
+  # For actual tests
+  gem "sinatra"
+  gem "slim"
+  gem "coffee-filter", "~> 0.1.1"
+  gem "liquid", "~> 2.2"
+  gem "jquery-rails", "~> 2.0.1"
+  # gem "bootstrap-rails", "0.0.5"
+  # gem "zurb-foundation"
+end
+
+gem "middleman-core", :path => "middleman-core"
+gem "middleman-more", :path => "middleman-more"
+gem "middleman", :path => "middleman"
+gem "compass", "~> 0.11.0"
\ No newline at end of file
diff --git a/gemfiles/Gemfile-compass-0.11 b/gemfiles/Gemfile-compass-0.11
new file mode 100644
index 00000000..6fd4dd5f
--- /dev/null
+++ b/gemfiles/Gemfile-compass-0.11
@@ -0,0 +1,25 @@
+source :rubygems
+
+group :development do
+  gem "cucumber", "~> 1.1.0"
+  gem "aruba",    "~> 0.4.11"
+  gem "rake",     "~> 0.9.2"
+  gem "rspec",    "~> 2.7"
+  gem "rdoc",     "~> 3.9"
+  # gem "yard"
+end
+  
+group :test do
+  # For actual tests
+  gem "sinatra"
+  gem "slim"
+  gem "coffee-filter", "~> 0.1.1"
+  gem "liquid", "~> 2.2"
+  gem "jquery-rails", "~> 2.0.1"
+  # gem "bootstrap-rails", "0.0.5"
+  # gem "zurb-foundation"
+end
+
+gem "middleman-core", :path => "middleman-core"
+gem "middleman-more", :path => "middleman-more"
+gem "middleman", :path => "middleman"
\ No newline at end of file
diff --git a/middleman-more/lib/middleman-more/core_extensions/compass.rb b/middleman-more/lib/middleman-more/core_extensions/compass.rb
index da4c7891..c3697427 100644
--- a/middleman-more/lib/middleman-more/core_extensions/compass.rb
+++ b/middleman-more/lib/middleman-more/core_extensions/compass.rb
@@ -25,6 +25,15 @@ module Middleman::CoreExtensions::Compass
           config.fonts_dir       = fonts_dir
           config.images_dir      = images_dir
           config.http_path       = http_prefix
+          
+          # Correctly support HTTP paths with generated sprites
+          # if config.respond_to? :http_generated_images_path
+          #   config.http_generated_images_path = if app.respond_to? :http_generated_images_path
+          #     app.http_generated_images_path
+          #   else
+          #     File.join(app.http_prefix || "/", app.images_dir)
+          #   end
+          # end
 
           config.asset_cache_buster :none
           config.relative_assets = false