middleman 0.14.1 → 0.99.0.pre

data/spec/builder_spec.rb

@@ -42,6 +42,16 @@ describe "Builder" do
     File.read("#{@root_dir}/build/stylesheets/site.css").gsub(/\s/, "").should include("html,body,div,span,applet,object,iframe")
   end
 
+  it "should build less files" do
+    File.exists?("#{@root_dir}/build/stylesheets/test_less.css").should be_true
+    File.read("#{@root_dir}/build/stylesheets/test_less.css").should include("666")
+  end
+
+  it "should build scss files" do
+    File.exists?("#{@root_dir}/build/stylesheets/site_scss.css").should be_true
+    File.read("#{@root_dir}/build/stylesheets/site_scss.css").gsub(/\s/, "").should include("html,body,div,span,applet,object,iframe")
+  end
+
   it "should build static css files" do
     File.exists?("#{@root_dir}/build/stylesheets/static.css").should be_true
   end
@@ -49,8 +59,4 @@ describe "Builder" do
   it "should not build partial files" do
     File.exists?("#{@root_dir}/build/_partial.html").should be_false
   end
-
-  it "should combine javascript" do
-    File.read("#{@root_dir}/build/javascripts/empty-with-include.js").should include("combo")
-  end
 end

data/spec/fixtures/sample/views/stylesheets/site_scss.css.scss

@@ -0,0 +1 @@
+@import "compass/reset";

data/spec/fixtures/sample/views/stylesheets/test_less.css.less

@@ -0,0 +1,5 @@
+@brand_color: #666666;
+
+#header {
+  color: @brand_color;
+}

metadata

@@ -1,12 +1,14 @@
 --- !ruby/object:Gem::Specification 
 name: middleman
 version: !ruby/object:Gem::Version 
-  prerelease: false
+  hash: 961916764
+  prerelease: true
   segments: 
   - 0
-  - 14
-  - 1
-  version: 0.14.1
+  - 99
+  - 0
+  - pre
+  version: 0.99.0.pre
 platform: ruby
 authors: 
 - Thomas Reynolds
@@ -14,253 +16,256 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-08-06 00:00:00 -07:00
+date: 2010-09-05 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rack
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
+        hash: 15
         segments: 
+        - 1
         - 0
-        version: "0"
+        version: "1.0"
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
   name: thin
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
+        hash: 31
         segments: 
+        - 1
+        - 2
         - 0
-        version: "0"
+        version: 1.2.0
   type: :runtime
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
   name: shotgun
   prerelease: false
   requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
+        hash: 63
         segments: 
         - 0
         - 8
-        version: "0.8"
+        - 0
+        version: 0.8.0
   type: :runtime
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
   name: templater
   prerelease: false
   requirement: &id004 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
+        hash: 23
         segments: 
+        - 1
         - 0
-        version: "0"
+        - 0
+        version: 1.0.0
   type: :runtime
   version_requirements: *id004
 - !ruby/object:Gem::Dependency 
-  name: sprockets
+  name: sinatra
   prerelease: false
   requirement: &id005 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
+        hash: 15
         segments: 
+        - 1
         - 0
-        version: "0"
+        version: "1.0"
   type: :runtime
   version_requirements: *id005
 - !ruby/object:Gem::Dependency 
-  name: sinatra
+  name: sinatra-content-for
   prerelease: false
   requirement: &id006 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
+        hash: 23
         segments: 
-        - 1
         - 0
-        version: "1.0"
+        - 2
+        - 0
+        version: 0.2.0
   type: :runtime
   version_requirements: *id006
 - !ruby/object:Gem::Dependency 
-  name: sinatra-content-for
+  name: rack-test
   prerelease: false
   requirement: &id007 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
+        hash: 11
         segments: 
         - 0
-        version: "0"
+        - 5
+        - 0
+        version: 0.5.0
   type: :runtime
   version_requirements: *id007
 - !ruby/object:Gem::Dependency 
-  name: less
+  name: yui-compressor
   prerelease: false
   requirement: &id008 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
+        hash: 59
         segments: 
         - 0
-        version: "0"
+        - 9
+        - 0
+        version: 0.9.0
   type: :runtime
   version_requirements: *id008
 - !ruby/object:Gem::Dependency 
-  name: builder
+  name: haml
   prerelease: false
   requirement: &id009 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
+        hash: 7
         segments: 
+        - 3
         - 0
-        version: "0"
+        version: "3.0"
   type: :runtime
   version_requirements: *id009
 - !ruby/object:Gem::Dependency 
-  name: rack-test
+  name: compass
   prerelease: false
   requirement: &id010 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
+        hash: 55
         segments: 
         - 0
-        version: "0"
+        - 10
+        - 0
+        version: 0.10.0
   type: :runtime
   version_requirements: *id010
 - !ruby/object:Gem::Dependency 
-  name: yui-compressor
+  name: json_pure
   prerelease: false
   requirement: &id011 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
+        hash: 7
         segments: 
+        - 1
+        - 4
         - 0
-        version: "0"
+        version: 1.4.0
   type: :runtime
   version_requirements: *id011
 - !ruby/object:Gem::Dependency 
-  name: haml
+  name: smusher
   prerelease: false
   requirement: &id012 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
+        hash: 5
         segments: 
-        - 3
         - 0
-        version: "3.0"
+        - 4
+        - 5
+        version: 0.4.5
   type: :runtime
   version_requirements: *id012
 - !ruby/object:Gem::Dependency 
-  name: compass
+  name: compass-slickmap
   prerelease: false
   requirement: &id013 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        - 10
-        version: "0.10"
-  type: :runtime
-  version_requirements: *id013
-- !ruby/object:Gem::Dependency 
-  name: fancy-buttons
-  prerelease: false
-  requirement: &id014 !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        version: "0"
-  type: :runtime
-  version_requirements: *id014
-- !ruby/object:Gem::Dependency 
-  name: json_pure
-  prerelease: false
-  requirement: &id015 !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        version: "0"
-  type: :runtime
-  version_requirements: *id015
-- !ruby/object:Gem::Dependency 
-  name: smusher
-  prerelease: false
-  requirement: &id016 !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
+        hash: 19
         segments: 
         - 0
-        version: "0"
-  type: :runtime
-  version_requirements: *id016
-- !ruby/object:Gem::Dependency 
-  name: compass-slickmap
-  prerelease: false
-  requirement: &id017 !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
+        - 3
         - 0
-        version: "0"
+        version: 0.3.0
   type: :runtime
-  version_requirements: *id017
+  version_requirements: *id013
 - !ruby/object:Gem::Dependency 
   name: rspec
   prerelease: false
-  requirement: &id018 !ruby/object:Gem::Requirement 
+  requirement: &id014 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
         segments: 
         - 0
         version: "0"
   type: :development
-  version_requirements: *id018
+  version_requirements: *id014
 - !ruby/object:Gem::Dependency 
   name: cucumber
   prerelease: false
-  requirement: &id019 !ruby/object:Gem::Requirement 
+  requirement: &id015 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
         segments: 
         - 0
         version: "0"
   type: :development
-  version_requirements: *id019
+  version_requirements: *id015
 - !ruby/object:Gem::Dependency 
   name: jeweler
   prerelease: false
-  requirement: &id020 !ruby/object:Gem::Requirement 
+  requirement: &id016 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
         segments: 
         - 0
         version: "0"
   type: :development
-  version_requirements: *id020
+  version_requirements: *id016
 description: 
 email: tdreyno@gmail.com
 executables: 
@@ -296,26 +301,27 @@ files:
 - features/step_definitions/middleman_steps.rb
 - features/step_definitions/page_layout_steps.rb
 - lib/middleman.rb
+- lib/middleman/assets.rb
 - lib/middleman/base.rb
 - lib/middleman/builder.rb
 - lib/middleman/config.ru
-- lib/middleman/fastimage.rb
+- lib/middleman/features.rb
 - lib/middleman/features/asset_host.rb
 - lib/middleman/features/automatic_image_sizes.rb
+- lib/middleman/features/automatic_image_sizes/fastimage.rb
 - lib/middleman/features/cache_buster.rb
+- lib/middleman/features/default_helpers.rb
+- lib/middleman/features/livereload.rb
 - lib/middleman/features/minify_css.rb
 - lib/middleman/features/minify_javascript.rb
+- lib/middleman/features/minify_javascript/rack.rb
 - lib/middleman/features/relative_assets.rb
 - lib/middleman/features/slickmap.rb
 - lib/middleman/features/smush_pngs.rb
-- lib/middleman/helpers.rb
-- lib/middleman/rack/minify_css.rb
-- lib/middleman/rack/minify_javascript.rb
-- lib/middleman/rack/sprockets.rb
-- lib/middleman/renderers/builder.rb
-- lib/middleman/renderers/erb.rb
+- lib/middleman/features/ugly_haml.rb
+- lib/middleman/renderers.rb
+- lib/middleman/renderers/coffee.rb
 - lib/middleman/renderers/haml.rb
-- lib/middleman/renderers/less.rb
 - lib/middleman/renderers/sass.rb
 - lib/middleman/template/init.rbt
 - lib/middleman/template/views/index.html.haml
@@ -326,7 +332,6 @@ files:
 - spec/builder_spec.rb
 - spec/fixtures/sample/init.rb
 - spec/fixtures/sample/public/images/blank.gif
-- spec/fixtures/sample/public/javascripts/to-be-included.js
 - spec/fixtures/sample/public/static.html
 - spec/fixtures/sample/public/stylesheets/auto-css.css
 - spec/fixtures/sample/public/stylesheets/static.css
@@ -342,7 +347,6 @@ files:
 - spec/fixtures/sample/views/index.html.haml
 - spec/fixtures/sample/views/inline-css.html.haml
 - spec/fixtures/sample/views/inline-js.html.haml
-- spec/fixtures/sample/views/javascripts/empty-with-include.js
 - spec/fixtures/sample/views/layout.haml
 - spec/fixtures/sample/views/maruku.html.maruku
 - spec/fixtures/sample/views/page-classes.html.haml
@@ -350,6 +354,8 @@ files:
 - spec/fixtures/sample/views/stylesheets/asset_host.css.sass
 - spec/fixtures/sample/views/stylesheets/relative_assets.css.sass
 - spec/fixtures/sample/views/stylesheets/site.css.sass
+- spec/fixtures/sample/views/stylesheets/site_scss.css.scss
+- spec/fixtures/sample/views/stylesheets/test_less.css.less
 - spec/helpers_spec.rb
 - spec/spec_helper.rb
 has_rdoc: true
@@ -362,28 +368,34 @@ rdoc_options:
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version 
+      hash: 25
       segments: 
-      - 0
-      version: "0"
+      - 1
+      - 3
+      - 1
+      version: 1.3.1
 requirements: []
 
 rubyforge_project: middleman
-rubygems_version: 1.3.6
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: A static site generator utilizing Haml, Sass and providing YUI compression and cache busting
 test_files: 
-- spec/spec_helper.rb
 - spec/builder_spec.rb
-- spec/helpers_spec.rb
 - spec/fixtures/sample/init.rb
+- spec/helpers_spec.rb
+- spec/spec_helper.rb