tdreyno-staticmatic 2.9.7 → 2.10.0

data/lib/generator.rb

@@ -9,6 +9,7 @@ module Generators
     desc "Creates a new staticmatic scaffold."
     first_argument :location, :required => true, :desc => "Project location"
     option :rack, :as => :boolean, :default => false, :desc => 'Should generate rackup (ru) file for Passenger'
+    option :compass, :as => :boolean, :default => false, :desc => 'Should enable Compass integration'
 
     def destination_root
       File.expand_path(location)

data/lib/merb/init.rb

@@ -25,5 +25,5 @@ Merb.push_path(:image,        Merb.dir_for(:public) / "images", nil)
 Merb.push_path(:view,         Merb.root / "pages")
 Merb.push_path(:helper,       Merb.root / "helpers")
 
-Merb::Plugins.config[:sass][:template_location] = Merb.root / "stylesheets"
-Merb::Plugins.config[:sass][:css_location]      = Merb.dir_for(:stylesheet)
+# Merb::Plugins.config[:sass][:template_location] = Merb.root / "stylesheets"
+# Merb::Plugins.config[:sass][:css_location]      = Merb.dir_for(:stylesheet)

data/lib/template/config/init.rb

@@ -1,7 +1,11 @@
 # Include default staticmatic init
 require '<%= ::File.join(::File.expand_path(::File.join(source_root, '..')), 'merb', 'init') %>'
 
+<% if compass %>
 # Enable Compass
+gem 'haml-edge', '>= 2.1'
+dependency "merb-haml"
 dependency "chriseppstein-compass", :require_as => 'compass'
-Merb::Plugins.config[:compass][:stylesheets]          = Merb.dir_for(:stylesheet)
-Merb::Plugins.config[:compass][:compiled_stylesheets] = Merb.dir_for(:stylesheet) / "sass"
+<% else %>
+dependency "merb-haml"
+<% end %>

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: tdreyno-staticmatic
 version: !ruby/object:Gem::Version 
-  version: 2.9.7
+  version: 2.10.0
 platform: ruby
 authors: 
 - Stephen Bartholomew
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-04-29 00:00:00 -07:00
+date: 2009-05-28 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -100,7 +100,7 @@ files:
 - lib/template/pages/layout/site.html.haml
 - lib/template/stylesheets/site.sass
 - README.textile
-has_rdoc: true
+has_rdoc: false
 homepage: http://github.com/tdreyno/staticmatic
 post_install_message: 
 rdoc_options: