staticmatic 0.11.0.alpha.7 → 0.11.0.alpha.8

data/Rakefile

@@ -19,11 +19,10 @@ begin
     
     gem.add_dependency("haml", ">=2.0.0")
     gem.add_dependency("rack", ">=1.0")
-    gem.add_dependency("mongrel", ">=1.1.5")
-    gem.add_dependency("compass")
+    gem.add_dependency("compass", ">=0.10.0")
   end
 rescue LoadError
-  puts "Jeweler, or one of its dependencies, is not available. Install it with: sudo gem install technicalpickles-jeweler -s http://gemgem.github.com"
+  puts "Jeweler, or one of its dependencies, is not available. Install it with: gem install jeweler"
 end
 
 Spec::Rake::SpecTask.new(:spec) do |spec|

data/VERSION.yml

@@ -2,4 +2,4 @@
 :major: 0
 :minor: 11
 :patch: 0
-:build: alpha.7
+:build: alpha.8

data/lib/staticmatic.rb

@@ -4,7 +4,8 @@ require 'haml'
 require 'sass'
 require 'sass/plugin'
 require 'rack'
-require 'rack/handler/mongrel'
+require 'rack/handler/webrick'
+require 'cgi'
 require 'fileutils'
 
 
@@ -16,7 +17,7 @@ end
   require File.join(File.dirname(__FILE__), "staticmatic", "mixins", mixin)
 end
 
-["base", "configuration", "error", "server", "helpers", "template_error", "compass/app_integration", "compass/configuration_defaults"].each do |lib|
+["base", "configuration", "error", "server", "helpers", "template_error", "compass"].each do |lib|
   require File.join(File.dirname(__FILE__), "staticmatic", lib)
 end
 

data/lib/staticmatic/base.rb

@@ -93,7 +93,6 @@ module StaticMatic
     
     def configure_compass
       Compass.configuration.project_path = @base_dir 
-      Compass.add_configuration(:staticmatic)
 
       compass_config_path = File.join(@base_dir, "config", "compass.rb")
       

data/lib/staticmatic/compass.rb

@@ -0,0 +1,5 @@
+["installer", "configuration_defaults", "app_integration"].each do |file|
+  require File.join(File.dirname(__FILE__), "compass", file)
+end
+
+Compass.add_configuration(:staticmatic)

data/lib/staticmatic/compass/app_integration.rb

@@ -4,6 +4,8 @@ module Compass
     module Staticmatic
 
       extend self
+      
+
 
       def installer(*args)
         Installer.new(*args)

data/lib/staticmatic/compass/installer.rb

@@ -0,0 +1,15 @@
+module Compass
+  module AppIntegration
+    module Staticmatic
+      class Installer < Compass::Installers::ManifestInstaller 
+        def completed_configuration
+          nil
+        end
+        
+        def finalize(options = {})
+          puts manifest.welcome_message if manifest.welcome_message
+        end
+      end
+    end
+  end
+end

data/lib/staticmatic/server.rb

@@ -49,7 +49,7 @@ module StaticMatic
         use Rack::ShowExceptions
         run StaticMatic::Server.new(staticmatic)
       end
-      Rack::Handler::Mongrel.run(app, :Port => port, :Host => host)
+      Rack::Handler::WEBrick.run(app, :Port => port, :Host => host)
     end
 
     private

data/lib/staticmatic/templates/project/config/compass.rb

@@ -0,0 +1,3 @@
+require "staticmatic/compass"
+
+project_type = :staticmatic

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

@@ -1,11 +1,3 @@
+require "staticmatic/compass"
 
-output_style = :expanded
-project_path = File.join(File.dirname(__FILE__), "..", "/")     # must be set for Compass to work 
-sass_dir     = "src/stylesheets"  # dir containing Sass / Compass source files
-http_path    = "/"                # root when deployed
-css_dir      = "site/stylesheets" # final CSS
-images_dir   = "site/images"      # final images
-http_images_path = "/images"
-
-# To enable relative paths to assets via compass helper functions. Uncomment:
-# relative_assets = true
+project_type = :staticmatic

metadata

@@ -7,8 +7,8 @@ version: !ruby/object:Gem::Version
   - 11
   - 0
   - alpha
-  - 7
-  version: 0.11.0.alpha.7
+  - 8
+  version: 0.11.0.alpha.8
 platform: ruby
 authors: 
 - Stephen Bartholomew
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-05-30 00:00:00 +01:00
+date: 2010-06-05 00:00:00 +01:00
 default_executable: staticmatic
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -46,32 +46,20 @@ dependencies:
         version: "1.0"
   type: :runtime
   version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: mongrel
-  prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 1
-        - 1
-        - 5
-        version: 1.1.5
-  type: :runtime
-  version_requirements: *id003
 - !ruby/object:Gem::Dependency 
   name: compass
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  requirement: &id003 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
         segments: 
         - 0
-        version: "0"
+        - 10
+        - 0
+        version: 0.10.0
   type: :runtime
-  version_requirements: *id004
+  version_requirements: *id003
 description: Lightweight Static Site Framework
 email: steve@curve21.com
 executables: 
@@ -89,8 +77,10 @@ files:
 - bin/staticmatic
 - lib/staticmatic.rb
 - lib/staticmatic/base.rb
+- lib/staticmatic/compass.rb
 - lib/staticmatic/compass/app_integration.rb
 - lib/staticmatic/compass/configuration_defaults.rb
+- lib/staticmatic/compass/installer.rb
 - lib/staticmatic/configuration.rb
 - lib/staticmatic/error.rb
 - lib/staticmatic/helpers.rb
@@ -102,6 +92,7 @@ files:
 - lib/staticmatic/mixins/setup.rb
 - lib/staticmatic/server.rb
 - lib/staticmatic/template_error.rb
+- lib/staticmatic/templates/project/config/compass.rb
 - lib/staticmatic/templates/project/config/site.rb
 - lib/staticmatic/templates/project/src/layouts/default.haml
 - lib/staticmatic/templates/project/src/pages/index.haml