staticmatic 0.11.0.alpha.5 → 0.11.0.alpha.6

data/VERSION.yml

@@ -2,4 +2,4 @@
 :major: 0
 :minor: 11
 :patch: 0
-:build: alpha.5
+:build: alpha.6

data/bin/staticmatic

@@ -12,22 +12,5 @@ end
 
 $:.push File.join(directory, "lib")
 
-configuration = StaticMatic::Configuration.new
-
-config_file = File.join(directory, "config", "site.rb")
-
-if !File.exists?(config_file)
-  config_file = File.join(directory, "src", "configuration.rb")
-  
-  if File.exists?(config_file)
-    puts "DEPRECATION: #{directory}/src/configuration.rb will be moved to #{directory}/config/site.rb in 0.12.0"
-  end
-end
-
-if File.exists?(config_file)
-  config = File.read(config_file)
-  eval(config)
-end
-
-staticmatic = StaticMatic::Base.new(directory, configuration)
+staticmatic = StaticMatic::Base.new(directory)
 staticmatic.run(command)

data/lib/staticmatic/base.rb

@@ -33,10 +33,33 @@ module StaticMatic
       @scope = Object.new
       @scope.instance_variable_set("@staticmatic", self)
       
+      load_configuration      
       configure_compass
+
       load_helpers
     end
     
+    def load_configuration
+      configuration = StaticMatic::Configuration.new
+      config_file = File.join(@base_dir, "config", "site.rb")
+
+      if !File.exists?(config_file)
+        config_file = File.join(@base_dir, "src", "configuration.rb")
+
+        if File.exists?(config_file)
+          puts "DEPRECATION: #{@base_dir}/src/configuration.rb will be moved to #{@base_dir}/config/site.rb in 0.12.0"
+        end
+      end
+      
+      if File.exists?(config_file)
+        config = File.read(config_file)
+        eval(config)
+      end
+
+      # Compass.sass_engine_options.merge!(configuration.sass_options)
+      @configuration = configuration
+    end
+    
     def base_dir
       @base_dir
     end
@@ -69,17 +92,16 @@ module StaticMatic
     end
     
     def configure_compass
-      Compass.configuration do |config|
-        config.output_style = :expanded
-        config.project_path = @base_dir 
-        config.sass_dir = File.join(@base_dir, "src", "stylesheets")
-        config.css_dir = File.join(@base_dir, "site", "stylesheets")
-        config.images_dir = File.join(@base_dir, "site", "images")
-        config.http_path = "/"
-        config.http_images_path = "/images"
-      end
+      Compass.configuration.project_path = @base_dir 
+      Compass.add_configuration(:staticmatic)
+
+      compass_config_path = File.join(@base_dir, "config", "compass.rb")
       
-      configuration.sass_options.merge!(Compass.sass_engine_options)
+      if File.exists?(compass_config_path)
+        Compass.add_configuration(compass_config_path)  
+      end
+
+      configuration.sass_options.merge!(Compass.configuration.to_sass_engine_options)
     end
   end
 end

data/lib/staticmatic/compass/app_integration.rb

@@ -0,0 +1,19 @@
+
+module Compass
+  module AppIntegration
+    module Staticmatic
+
+      extend self
+
+      def installer(*args)
+        Installer.new(*args)
+      end
+
+      def configuration
+        Compass::Configuration::Data.new('staticmatic').
+          extend(ConfigurationDefaults)
+      end
+
+    end
+  end
+end

data/lib/staticmatic/compass/configuration_defaults.rb

@@ -0,0 +1,39 @@
+module Compass
+  module AppIntegration
+    module Staticmatic
+      module ConfigurationDefaults
+        def project_type_without_default
+          :staticmatic
+        end
+
+        def sass_dir_without_default
+          "src/stylesheets"
+        end
+
+        def javascripts_dir_without_default
+          "site/javascripts"
+        end
+
+        def css_dir_without_default
+          "site/stylesheets"
+        end
+
+        def images_dir_without_default
+          "site/images"
+        end
+        def default_http_images_path
+          "site/images"
+        end
+
+        def default_http_javascripts_path
+          "site/javascripts"
+        end
+        
+        def default_cache_dir
+          ".sass-cache"
+        end
+      end
+
+    end
+  end
+end

data/lib/staticmatic/mixins/build.rb

@@ -16,7 +16,7 @@ module StaticMatic::BuildMixin
 
   # Build CSS from the source files
   def build_css
-    Dir["#{@src_dir}/stylesheets/**/*.sass"].each do |path|
+    Dir["#{@src_dir}/stylesheets/**/*.{sass,scss}"].each do |path|
       file_dir, template = source_template_from_path(path.sub(/^#{@src_dir}\/stylesheets/, ''))
       
       if !template.match(/(^|\/)\_/)

data/lib/staticmatic.rb

@@ -1,11 +1,12 @@
 require 'rubygems'
+require 'compass'
 require 'haml'
 require 'sass'
 require 'sass/plugin'
 require 'rack'
 require 'rack/handler/mongrel'
 require 'fileutils'
-require 'compass'
+
 
 module StaticMatic
   VERSION = "0.11.0"
@@ -15,7 +16,7 @@ end
   require File.join(File.dirname(__FILE__), "staticmatic", "mixins", mixin)
 end
 
-["base", "configuration", "error", "server", "helpers", "template_error"].each do |lib|
+["base", "configuration", "error", "server", "helpers", "template_error", "compass/app_integration", "compass/configuration_defaults"].each do |lib|
   require File.join(File.dirname(__FILE__), "staticmatic", lib)
 end
 

data/spec/compass_integration_spec.rb

@@ -1,16 +1,27 @@
 require File.dirname(__FILE__) + "/spec_helper"
 
 describe "Compass integration" do
-  before do
-    setup_staticmatic
+  context "with the default staticmatic configuraiton" do 
+    before do
+      setup_staticmatic
+    end
+  
+    it "should configure compass" do
+      Compass.configuration.project_path.should == TEST_SITE_PATH
+      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"
+    end
   end
   
-  it "should configure compass" do
-    Compass.configuration.project_path.should == TEST_SITE_PATH
-    Compass.configuration.sass_dir.should == File.join(TEST_SITE_PATH, "src", "stylesheets")
-    Compass.configuration.css_dir.should == File.join(TEST_SITE_PATH, "site", "stylesheets")
-    Compass.configuration.images_dir.should == File.join(TEST_SITE_PATH, "site", "images")
-    Compass.configuration.http_path.should == "/"
-    Compass.configuration.http_images_path.should == "/images"
+  context "with a custom configuration" do
+    before do
+      setup_staticmatic
+    end
+    
+    it "should allow site config to override defaults" do
+      Compass.configuration.http_path.should == "http://a.test.host"
+    end
   end
 end

data/spec/sandbox/test_site/config/compass.rb

@@ -0,0 +1 @@
+http_path = "http://a.test.host"

data/spec/sandbox/test_site/src/stylesheets/application.sass

@@ -1,2 +1,5 @@
+@import blueprint
+
++blueprint
 body
   :font-family = "Verdana, Helvetica, sans-serif"

metadata

@@ -7,8 +7,8 @@ version: !ruby/object:Gem::Version
   - 11
   - 0
   - alpha
-  - 5
-  version: 0.11.0.alpha.5
+  - 6
+  version: 0.11.0.alpha.6
 platform: ruby
 authors: 
 - Stephen Bartholomew
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-05-24 00:00:00 +01:00
+date: 2010-05-30 00:00:00 +01:00
 default_executable: staticmatic
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -89,6 +89,8 @@ files:
 - bin/staticmatic
 - lib/staticmatic.rb
 - lib/staticmatic/base.rb
+- lib/staticmatic/compass/app_integration.rb
+- lib/staticmatic/compass/configuration_defaults.rb
 - lib/staticmatic/configuration.rb
 - lib/staticmatic/error.rb
 - lib/staticmatic/helpers.rb
@@ -111,10 +113,10 @@ files:
 - spec/helpers_spec.rb
 - spec/render_spec.rb
 - spec/rescue_spec.rb
+- spec/sandbox/test_site/config/compass.rb
 - spec/sandbox/test_site/config/site.rb
 - spec/sandbox/test_site/site/index
 - spec/sandbox/test_site/site/layout_test
-- spec/sandbox/test_site/site/stylesheets/application.css
 - spec/sandbox/test_site/site/sub_folder/another_sub_folder/index.html
 - spec/sandbox/test_site/site/sub_folder/another_sub_folder/index.html.html
 - spec/sandbox/test_site/site/sub_folder/index.html
@@ -185,6 +187,7 @@ test_files:
 - spec/helpers_spec.rb
 - spec/render_spec.rb
 - spec/rescue_spec.rb
+- spec/sandbox/test_site/config/compass.rb
 - spec/sandbox/test_site/config/site.rb
 - spec/sandbox/test_site/src/helpers/application_helper.rb
 - spec/sandbox/tmp/config/compass.rb

data/spec/sandbox/test_site/site/stylesheets/application.css

@@ -1,2 +0,0 @@
-body {
-  font-family: Verdana, Helvetica, sans-serif; }