middleman 1.2.0 → 1.2.1

data/features/step_definitions/middleman_steps.rb

@@ -16,6 +16,7 @@ end
 Then /^I should see "([^\"]*)"$/ do |expected|
   @browser.last_response.body.should include(expected)
 end
+
 Then /^I should see '([^\']*)'$/ do |expected|
   @browser.last_response.body.should include(expected)
 end

data/features/tiny_src.feature

@@ -0,0 +1,13 @@
+@wip
+Feature: Tiny Src
+  In order automatically scale images for mobile devices
+    
+  Scenario: Rendering html with the feature disabled
+    Given "tiny_src" feature is "disabled"
+    When I go to "/tiny_src.html"
+    Then I should see "http://test.com/image.jpg"
+
+  Scenario: Rendering html with the feature enabled
+    Given "tiny_src" feature is "enabled"
+    When I go to "/tiny_src.html"
+    Then I should see "http://i.tinysrc.mobi/http://test.com/image.jpg"

data/fixtures/test-app/views/tiny_src.html.haml

@@ -0,0 +1 @@
+= image_tag "http://test.com/image.jpg"

data/lib/middleman/features.rb

@@ -71,6 +71,9 @@ module Middleman::Features
   # to dynamic requests.
   autoload :Data,                "middleman/features/data"
 
+  # Automatically resize images for mobile devises
+  # autoload :TinySrc,             "middleman/features/tiny_src"
+
   # LiveReload will auto-reload browsers with the live reload extension installed after changes
   # Currently disabled and untested.
   #autoload :LiveReload,          "middleman/features/live_reload"

data/lib/middleman/features/minify_javascript/rack.rb

@@ -18,9 +18,14 @@ module Middleman
         if env["PATH_INFO"].match(/\.js$/)
           compressor = ::YUI::JavaScriptCompressor.new(:munge => true)
       
-          uncompressed_source = response.is_a?(::Rack::File) ? File.read(response.path) : response
-          response = compressor.compress(uncompressed_source)
-          headers["Content-Length"] = ::Rack::Utils.bytesize(response).to_s
+          if response.is_a?(::Rack::File) or response.is_a?(Sinatra::Helpers::StaticFile)
+            uncompressed_source = File.read(response.path)
+          else
+            uncompressed_source = response.join
+          end
+          minified = compressor.compress(uncompressed_source)
+          headers["Content-Length"] = ::Rack::Utils.bytesize(minified).to_s
+          response = [minified]
         end
     
         [status, headers, response]
@@ -28,4 +33,4 @@ module Middleman
     end
     
   end
-end
+end

data/lib/middleman/features/tiny_src.rb

@@ -0,0 +1,11 @@
+module Middleman::Features::TinySrc
+  class << self
+    def registered(app)
+      Middleman::Assets.register :tiny_src do |path, prefix, request|
+        original_output = Middleman::Assets.before(:tiny_src, path, prefix, request)
+        "http://i.tinysrc.mobi/#{original_output}"
+      end
+    end
+    alias :included :registered
+  end
+end

data/lib/middleman/server.rb

@@ -147,7 +147,10 @@ module Middleman
       settings.layout(options[:layout]) if !options[:layout].nil?
       layout = settings.fetch_layout_path.to_sym
       layout = false if options[:layout] == false or path =~ /\.(css|js)$/
-      result = render(path, :layout => layout, :layout_engine => options[:layout_engine])
+      
+      render_options = { :layout => layout }
+      render_options[:layout_engine] = options[:layout_engine] if options.has_key? :layout_engine
+      result = render(path, render_options)
       settings.layout(old_layout)
       
       if result

data/lib/middleman/templates.rb

@@ -33,4 +33,7 @@ require "middleman/templates/default"
 require "middleman/templates/html5"
 
 # Local templates
-require "middleman/templates/local"
+require "middleman/templates/local"
+
+# Compass templates
+# require "middleman/templates/compass"

data/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

data/lib/middleman/version.rb

@@ -1,3 +1,3 @@
 module Middleman
-  VERSION = "1.2.0"
+  VERSION = "1.2.1"
 end

data/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.0"])
+  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"])

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: middleman
 version: !ruby/object:Gem::Version 
-  hash: 31
+  hash: 29
   prerelease: 
   segments: 
   - 1
   - 2
-  - 0
-  version: 1.2.0
+  - 1
+  version: 1.2.1
 platform: ruby
 authors: 
 - Thomas Reynolds
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-04-25 00:00:00 -07:00
+date: 2011-04-26 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -215,14 +215,14 @@ dependencies:
   requirement: &id013 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
-        hash: 51
+        hash: 49
         segments: 
         - 0
         - 11
-        - 0
-        version: 0.11.0
+        - 1
+        version: 0.11.1
   type: :runtime
   version_requirements: *id013
 - !ruby/object:Gem::Dependency 
@@ -372,6 +372,7 @@ files:
 - features/step_definitions/generator_steps.rb
 - features/step_definitions/middleman_steps.rb
 - features/step_definitions/page_layout_steps.rb
+- features/tiny_src.feature
 - features/w_asset_host.feature
 - features/x_automatic_image_sizes.feature
 - features/y_cache_buster.feature
@@ -404,6 +405,7 @@ files:
 - fixtures/test-app/views/stylesheets/site.css.sass
 - fixtures/test-app/views/stylesheets/site_scss.css.scss
 - fixtures/test-app/views/stylesheets/test_less.css.less
+- fixtures/test-app/views/tiny_src.html.haml
 - lib/middleman.rb
 - lib/middleman/assets.rb
 - lib/middleman/builder.rb
@@ -422,11 +424,13 @@ files:
 - lib/middleman/features/minify_javascript.rb
 - lib/middleman/features/minify_javascript/rack.rb
 - lib/middleman/features/relative_assets.rb
+- lib/middleman/features/tiny_src.rb
 - lib/middleman/features/ugly_haml.rb
 - lib/middleman/renderers/haml.rb
 - lib/middleman/renderers/sass.rb
 - lib/middleman/server.rb
 - lib/middleman/templates.rb
+- lib/middleman/templates/compass.rb
 - lib/middleman/templates/default.rb
 - lib/middleman/templates/default/config.ru
 - lib/middleman/templates/default/config.tt
@@ -489,7 +493,7 @@ rubyforge_project: middleman
 rubygems_version: 1.5.0
 signing_key: 
 specification_version: 3
-summary: A static site generator utilizing Haml, Sass and providing YUI compression and cache busting
+summary: A static site generator based on Sinatra. Providing Haml, Sass, Compass, Less, Coffee Script and including minification, compression and cache busting.
 test_files: 
 - features/builder.feature
 - features/coffee-script.feature
@@ -508,6 +512,7 @@ test_files:
 - features/step_definitions/generator_steps.rb
 - features/step_definitions/middleman_steps.rb
 - features/step_definitions/page_layout_steps.rb
+- features/tiny_src.feature
 - features/w_asset_host.feature
 - features/x_automatic_image_sizes.feature
 - features/y_cache_buster.feature
@@ -540,3 +545,4 @@ test_files:
 - fixtures/test-app/views/stylesheets/site.css.sass
 - fixtures/test-app/views/stylesheets/site_scss.css.scss
 - fixtures/test-app/views/stylesheets/test_less.css.less
+- fixtures/test-app/views/tiny_src.html.haml