Permalink
Browse files

Fix compass integration defaults, fix tests, prep for version 0.11.0 …

…release
  • Loading branch information...
1 parent 5de53fb commit 00bfcb9552cf61ee834d8f0980ead381936c2654 Stephen Bartholomew committed Nov 15, 2010
View
@@ -2,4 +2,3 @@
:major: 0
:minor: 11
:patch: 0
-:build: alpha.9
View
@@ -97,7 +97,7 @@ def configure_compass
compass_config_path = File.join(@base_dir, "config", "compass.rb")
if File.exists?(compass_config_path)
- Compass.add_configuration(compass_config_path)
+ Compass.add_configuration(compass_config_path)
end
configuration.sass_options.merge!(Compass.configuration.to_sass_engine_options)
@@ -1,5 +1,5 @@
["installer", "configuration_defaults", "app_integration"].each do |file|
- require File.join(File.dirname(__FILE__), "compass", file)
+ require File.join(File.dirname(__FILE__), "compass", file)
end
Compass.add_configuration(:staticmatic)
@@ -5,15 +5,12 @@ module Staticmatic
extend self
-
-
def installer(*args)
Installer.new(*args)
end
def configuration
- Compass::Configuration::Data.new('staticmatic').
- extend(ConfigurationDefaults)
+ Compass::Configuration::Data.new('staticmatic').extend(ConfigurationDefaults)
end
end
@@ -5,7 +5,11 @@ module ConfigurationDefaults
def project_type_without_default
:staticmatic
end
-
+
+ def http_path
+ "/"
+ end
+
def sass_dir_without_default
"src/stylesheets"
end
@@ -21,12 +25,13 @@ def css_dir_without_default
def images_dir_without_default
"site/images"
end
+
def default_http_images_path
- "site/images"
+ "images"
end
def default_http_javascripts_path
- "site/javascripts"
+ "javascripts"
end
def default_cache_dir
@@ -1,7 +1,7 @@
require File.dirname(__FILE__) + "/spec_helper"
describe "Compass integration" do
- context "with the default staticmatic configuraiton" do
+ context "with the default staticmatic configuration" do
before do
setup_staticmatic
end
@@ -11,7 +11,7 @@
Compass.configuration.sass_dir.should == File.join("src", "stylesheets")
Compass.configuration.css_dir.should == File.join("site", "stylesheets")
Compass.configuration.images_dir.should == File.join("site", "images")
- Compass.configuration.http_images_path.should == "site/images"
+ Compass.configuration.http_images_path.should == "images"
end
end
@@ -2,4 +2,4 @@
+blueprint
body
- :font-family = "Verdana, Helvetica, sans-serif"
+ font-family: "Verdana, Helvetica, sans-serif"
View
@@ -5,7 +5,7 @@
Gem::Specification.new do |s|
s.name = %q{staticmatic}
- s.version = "0.11.0.alpha.9"
+ s.version = "0.11.0.alpha.10"
s.required_rubygems_version = Gem::Requirement.new("> 1.3.1") if s.respond_to? :required_rubygems_version=
s.authors = ["Stephen Bartholomew"]

0 comments on commit 00bfcb9

Please sign in to comment.