From 6a86f660102ede8309d928dd3be1cfd2b7ea9fc3 Mon Sep 17 00:00:00 2001 From: Thomas Reynolds Date: Tue, 26 Apr 2011 12:10:27 -0700 Subject: [PATCH] new release containing sinatra custom layout support and Rack minification fix --- features/tiny_src.feature | 1 + lib/middleman/templates.rb | 5 ++++- lib/middleman/templates/compass.rb | 18 ++++++++++++++++++ lib/middleman/version.rb | 2 +- middleman.gemspec | 4 ++-- 5 files changed, 26 insertions(+), 4 deletions(-) create mode 100644 lib/middleman/templates/compass.rb diff --git a/features/tiny_src.feature b/features/tiny_src.feature index f6babc98..6d8df909 100644 --- a/features/tiny_src.feature +++ b/features/tiny_src.feature @@ -1,3 +1,4 @@ +@wip Feature: Tiny Src In order automatically scale images for mobile devices diff --git a/lib/middleman/templates.rb b/lib/middleman/templates.rb index 4da13659..e97456c2 100644 --- a/lib/middleman/templates.rb +++ b/lib/middleman/templates.rb @@ -33,4 +33,7 @@ require "middleman/templates/default" require "middleman/templates/html5" # Local templates -require "middleman/templates/local" \ No newline at end of file +require "middleman/templates/local" + +# Compass templates +# require "middleman/templates/compass" \ No newline at end of file diff --git a/lib/middleman/templates/compass.rb b/lib/middleman/templates/compass.rb new file mode 100644 index 00000000..2ad10354 --- /dev/null +++ b/lib/middleman/templates/compass.rb @@ -0,0 +1,18 @@ +require 'compass' + +class Middleman::Templates::Compass < Middleman::Templates::Base + def self.source_root + # Middleman.templates_path + end + + def build_scaffold + # directory options[:template].to_s, location + end +end + +$stderr.puts Compass::Frameworks::ALL.map { |f| f.name }.inspect + +# Dir[File.join(Middleman.templates_path, "*")].each do |dir| +# next unless File.directory?(dir) +# Middleman::Templates.register(File.basename(dir).to_sym, Middleman::Templates::Local) +# end \ No newline at end of file diff --git a/lib/middleman/version.rb b/lib/middleman/version.rb index ce488c0e..e4a1069c 100644 --- a/lib/middleman/version.rb +++ b/lib/middleman/version.rb @@ -1,3 +1,3 @@ module Middleman - VERSION = "1.2.0" + VERSION = "1.2.1" end diff --git a/middleman.gemspec b/middleman.gemspec index 3307b8ee..b89daa27 100644 --- a/middleman.gemspec +++ b/middleman.gemspec @@ -9,7 +9,7 @@ Gem::Specification.new do |s| s.authors = ["Thomas Reynolds"] s.email = ["tdreyno@gmail.com"] s.homepage = "http://wiki.github.com/tdreyno/middleman" - s.summary = "A static site generator utilizing Haml, Sass and providing YUI compression and cache busting" + s.summary = "A static site generator based on Sinatra. Providing Haml, Sass, Compass, Less, Coffee Script and including minification, compression and cache busting." s.rubyforge_project = "middleman" @@ -31,7 +31,7 @@ Gem::Specification.new do |s| s.add_runtime_dependency("yui-compressor", ["~> 0.9.0"]) s.add_runtime_dependency("haml", ["~> 3.1.0"]) s.add_runtime_dependency("sass", ["~> 3.1.0"]) - s.add_runtime_dependency("compass", [">= 0.11.1"]) + s.add_runtime_dependency("compass", ["~> 0.11.1"]) s.add_runtime_dependency("chunky_png", ["~> 1.1.0"]) s.add_runtime_dependency("oily_png", ["~> 1.0"]) unless defined?(JRUBY_VERSION) s.add_runtime_dependency("coffee-script", ["~> 2.1.0"])