middleman 0.99.1.pre → 0.99.2.pre

data/Rakefile

@@ -1,24 +1,24 @@
 require 'lib/middleman'
 require 'rake'
-require 'spec/rake/spectask'
 require 'cucumber/rake/task'
 
 begin
   require 'jeweler'
   Jeweler::Tasks.new do |gem|
-    gem.name = "middleman"
-    gem.summary = %Q{A static site generator utilizing Haml, Sass and providing YUI compression and cache busting}
-    gem.email = "tdreyno@gmail.com"
-    gem.homepage = "http://wiki.github.com/tdreyno/middleman"
-    gem.authors = ["Thomas Reynolds"]
+    gem.name              = "middleman"
+    gem.summary           = %Q{A static site generator utilizing Haml, Sass and providing YUI compression and cache busting}
+    gem.email             = "tdreyno@gmail.com"
+    gem.homepage          = "http://wiki.github.com/tdreyno/middleman"
+    gem.authors           = ["Thomas Reynolds"]
     gem.rubyforge_project = "middleman"
-    gem.executables = %w(mm-init mm-build mm-server)
+    gem.executables       = %w(mm-init mm-build mm-server)
     gem.add_dependency("rack",                "~>1.0")
     gem.add_dependency("thin",                "~>1.2.0")
     gem.add_dependency("shotgun",             "~>0.8.0")
     gem.add_dependency("templater",           "~>1.0.0")
     gem.add_dependency("sinatra",             "~>1.0")
-    gem.add_dependency("sinatra-content-for", "~>0.2.0")
+    gem.add_dependency("padrino-core",        "~>0.9.0")
+    gem.add_dependency("padrino-helpers",     "~>0.9.0")
     gem.add_dependency("rack-test",           "~>0.5.0")
     gem.add_dependency("yui-compressor",      "~>0.9.0")
     gem.add_dependency("haml",                "~>3.0")
@@ -28,7 +28,6 @@ begin
     gem.add_dependency("compass-slickmap",    "~>0.4.0")
     # gem.add_dependency("livereload",          "~>1.4.0")
     
-    gem.add_development_dependency("rspec")
     gem.add_development_dependency("cucumber")
     gem.add_development_dependency("jeweler")
   end
@@ -38,15 +37,8 @@ rescue LoadError
   puts "Jeweler (or a dependency) not available. Install it with: gem install jeweler"
 end
 
-Spec::Rake::SpecTask.new(:spec) do |spec|
-  spec.libs << 'lib' << 'spec'
-  spec.spec_files = FileList['spec/**/*_spec.rb']
-end
-
 Cucumber::Rake::Task.new(:cucumber, 'Run features that should pass') do |t|
   t.cucumber_opts = "--color --tags ~@wip --strict --format #{ENV['CUCUMBER_FORMAT'] || 'pretty'}"
 end
 
-task :spec => :check_dependencies
-
-task :default => [:cucumber, :spec]
+task :default => :cucumber

data/VERSION

@@ -1 +1 @@
-0.99.1.pre
+0.99.2.pre

data/features/builder.feature

@@ -0,0 +1,16 @@
+Feature: Builder
+  In order to output static html and css for delivery
+
+  Scenario: Checking built folder for content
+    Given a built test app
+    Then "index.html" should exist and include "Comment in layout"
+    Then "javascripts/coffee_test.js" should exist and include "Array.prototype.slice"
+    Then "index.html" should exist and include "<h1>Welcome</h1>"
+    Then "static.html" should exist and include "Static, no code!"
+    Then "services/index.html" should exist and include "Services"
+    Then "stylesheets/site.css" should exist and include "html, body, div, span"
+    Then "stylesheets/site_scss.css" should exist and include "html, body, div, span"
+    Then "stylesheets/test_less.css" should exist and include "666"
+    Then "stylesheets/static.css" should exist and include "body"
+    Then "_partial.html" should not exist
+    And cleanup built test app

data/features/coffee-script.feature

@@ -0,0 +1,7 @@
+Feature: Support coffee-script
+  In order to offer an alternative when writing Javascript
+  
+  Scenario: Rendering coffee script
+    Given the Server is running
+    When I go to "/javascripts/coffee_test.js"
+    Then I should see "Array.prototype.slice"

data/features/helpers_auto_stylesheet_link_tag.feature

@@ -0,0 +1,17 @@
+Feature: Built-in auto_stylesheet_link_tag view helper
+  In order to simplify including css files
+
+  Scenario: Viewing the root path
+    Given the Server is running
+    When I go to "/auto-css.html"
+    Then I should see "stylesheets/auto-css.css"
+
+  Scenario: Viewing a tier-1 path
+    Given the Server is running
+    When I go to "/sub1/auto-css.html"
+    Then I should see "stylesheets/sub1/auto-css.css"
+
+  Scenario: Viewing a tier-2 path
+    Given the Server is running
+    When I go to "/sub1/sub2/auto-css.html"
+    Then I should see "stylesheets/sub1/sub2/auto-css.css"

data/features/helpers_page_classes.feature

@@ -0,0 +1,17 @@
+Feature: Built-in page_classes view helper
+  In order to generate body classes for views
+  
+  Scenario: Viewing the root path
+    Given the Server is running
+    When I go to "/page-class.html"
+    Then I should see "page-class"
+
+  Scenario: Viewing a tier-1 path
+    Given the Server is running
+    When I go to "/sub1/page-class.html"
+    Then I should see "sub1 sub1_page-class"
+
+  Scenario: Viewing a tier-2 path
+    Given the Server is running
+    When I go to "/sub1/sub2/page-class.html"
+    Then I should see "sub1 sub1_sub2 sub1_sub2_page-class"

data/features/less-css.feature

@@ -0,0 +1,7 @@
+Feature: Support Less CSS
+ In order to offer an alternative when writing CSS
+
+ Scenario: Rendering Less
+   Given the Server is running
+   When I go to "/stylesheets/test_less.css"
+   Then I should see "666"

data/features/padrino_helpers.feature

@@ -0,0 +1,10 @@
+Feature: Built-in macro view helpers
+  In order to simplify generating HTML
+
+  Scenario: Using the link_to helper
+    Given the Server is running
+    When I go to "/padrino_test.html"
+    And I should see 'href="test2.com"'
+    And I should see 'src="/images/test2.png"'
+    Then I should see 'src="/javascripts/test1.js"'
+    Then I should see 'href="/stylesheets/test1.css"'

data/features/scss-support.feature

@@ -0,0 +1,7 @@
+Feature: Support SCSS Syntax
+ In order to offer an alternative when writing Sass
+
+ Scenario: Rendering scss
+   Given the Server is running
+   When I go to "/stylesheets/site_scss.css"
+   Then I should see "html"

data/features/step_definitions/asset_host_steps.rb

@@ -1,5 +1,5 @@
 Given /^I am using an asset host$/ do
-  Middleman::Server.enable :asset_host
+  Middleman::Server.activate :asset_host
   Middleman::Server.set :asset_host do |asset|
     "http://assets%d.example.com" % (asset.hash % 4)
   end

data/features/step_definitions/builder_steps.rb

@@ -0,0 +1,45 @@
+require 'fileutils'
+
+Given /^a built test app$/ do
+  target = File.join(File.dirname(File.dirname(File.dirname(__FILE__))), "fixtures", "test-app")
+  build_cmd = File.expand_path(File.join(File.dirname(File.dirname(File.dirname(__FILE__))), "bin", "mm-build"))
+  `cd #{target} && MM_DIR="#{target}" #{build_cmd}`
+end
+
+Given /^cleanup built test app$/ do
+  target = File.join(File.dirname(File.dirname(File.dirname(__FILE__))), "fixtures", "test-app", "build")
+  FileUtils.rm_rf(target)
+end
+
+Then /^"([^"]*)" should exist and include "([^"]*)"$/ do |target_file, expected|
+  target = File.join(File.dirname(File.dirname(File.dirname(__FILE__))), "fixtures", "test-app", "build", target_file)
+  File.exists?(target).should be_true
+  File.read(target).should include(expected)
+end
+
+Then /^"([^"]*)" should not exist$/ do |target_file|
+  target = File.join(File.dirname(File.dirname(File.dirname(__FILE__))), "fixtures", "test-app", "build", target_file)
+  File.exists?(target).should be_false
+end
+
+
+
+# require 'fileutils'
+# 
+# describe "Builder" do
+#   def project_file(*parts)
+#     File.expand_path(File.join(File.dirname(__FILE__), "..", *parts))
+#   end
+# 
+#   before :all do
+#     @root_dir = project_file("spec", "fixtures", "sample")
+#   end
+# 
+#   before :each do
+#     build_cmd = project_file("bin", "mm-build")
+#     `cd #{@root_dir} && MM_DIR="#{@root_dir}" #{build_cmd}`
+#   end
+# 
+#   after :each do
+#     FileUtils.rm_rf(File.join(@root_dir, "build"))
+#   end

data/features/step_definitions/env.rb

@@ -1,3 +1,3 @@
-ENV["MM_DIR"] = File.join(File.dirname(File.dirname(File.dirname(__FILE__))), "spec", "fixtures", "sample")
+ENV["MM_DIR"] = File.join(File.dirname(File.dirname(File.dirname(__FILE__))), "fixtures", "test-app")
 require File.join(File.dirname(File.dirname(File.dirname(__FILE__))), 'lib', 'middleman')
 require "rack/test"

data/features/step_definitions/generator_steps.rb

@@ -1,7 +1,13 @@
 require 'fileutils'
 
+Given /^generated directory at "([^\"]*)"$/ do |dirname|
+  target = File.join(File.dirname(File.dirname(File.dirname(__FILE__))), "fixtures", dirname)
+  init_cmd = File.expand_path(File.join(File.dirname(File.dirname(File.dirname(__FILE__))), "bin", "mm-init"))
+  `cd #{File.dirname(target)} && #{init_cmd} #{File.basename(target)}`
+end
+
 Then /^template files should exist at "([^\"]*)"$/ do |dirname|
-  target = File.join(File.dirname(File.dirname(File.dirname(__FILE__))), "spec", "fixtures", dirname)
+  target = File.join(File.dirname(File.dirname(File.dirname(__FILE__))), "fixtures", dirname)
   template_glob = File.join(File.dirname(File.dirname(File.dirname(__FILE__))), "lib", "middleman", "template", "*/**/*")
   
   Dir[template_glob].each do |f|
@@ -11,7 +17,7 @@ Then /^template files should exist at "([^\"]*)"$/ do |dirname|
 end
 
 Then /^empty directories should exist at "([^\"]*)"$/ do |dirname|
-  target = File.join(File.dirname(File.dirname(File.dirname(__FILE__))), "spec", "fixtures", dirname)
+  target = File.join(File.dirname(File.dirname(File.dirname(__FILE__))), "fixtures", dirname)
   
   %w(views/stylesheets public/stylesheets public/javascripts public/images).each do |d|
     File.exists?("#{target}/#{d}").should be_true
@@ -19,6 +25,6 @@ Then /^empty directories should exist at "([^\"]*)"$/ do |dirname|
 end
 
 Then /^cleanup at "([^\"]*)"$/ do |dirname|
-  target = File.join(File.dirname(File.dirname(File.dirname(__FILE__))), "spec", "fixtures", dirname)
+  target = File.join(File.dirname(File.dirname(File.dirname(__FILE__))), "fixtures", dirname)
   FileUtils.rm_rf(target)
 end

data/features/step_definitions/middleman_steps.rb

@@ -1,13 +1,12 @@
 Given /^"([^\"]*)" feature is "([^\"]*)"$/ do |feature, state|
-  enable_or_disable = (state == "enabled") ? :enable : :disable
-  Middleman::Server.send(enable_or_disable, feature.to_sym)
+  if state == "enabled"
+    Middleman::Server.activate(feature.to_sym)
+  end
   @browser = Rack::Test::Session.new(Rack::MockSession.new(Middleman::Server.new))
 end
 
-Given /^generated directory at "([^\"]*)"$/ do |dirname|
-  target = File.join(File.dirname(File.dirname(File.dirname(__FILE__))), "spec", "fixtures", dirname)
-  init_cmd = File.expand_path(File.join(File.dirname(File.dirname(File.dirname(__FILE__))), "bin", "mm-init"))
-  `cd #{File.dirname(target)} && #{init_cmd} #{File.basename(target)}`
+Given /^the Server is running$/ do
+  @browser = Rack::Test::Session.new(Rack::MockSession.new(Middleman::Server.new))
 end
 
 When /^I go to "([^\"]*)"$/ do |url|
@@ -17,6 +16,9 @@ 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
 
 Then /^I should not see "([^\"]*)"$/ do |expected|
   @browser.last_response.body.should_not include(expected)

data/features/step_definitions/page_layout_steps.rb

@@ -1,11 +1,11 @@
 Given /^page "([^\"]*)" has layout "([^\"]*)"$/ do |url, layout|
-  Middleman::Server.set :root, File.join(File.dirname(File.dirname(File.dirname(__FILE__))), "spec", "fixtures", "sample")
+  Middleman::Server.set :root, File.join(File.dirname(File.dirname(File.dirname(__FILE__))), "fixtures", "test-app")
   Middleman::Server.page(url, :layout => layout.to_sym)
   @browser = Rack::Test::Session.new(Rack::MockSession.new(Middleman::Server.new))
 end
 
 Given /^"([^\"]*)" with_layout block has layout "([^\"]*)"$/ do |url, layout|
-  Middleman::Server.set :root, File.join(File.dirname(File.dirname(File.dirname(__FILE__))), "spec", "fixtures", "sample")
+  Middleman::Server.set :root, File.join(File.dirname(File.dirname(File.dirname(__FILE__))), "fixtures", "test-app")
   Middleman::Server.with_layout(:layout => layout.to_sym) do
     page(url)
   end

data/fixtures/test-app/views/javascripts/coffee_test.js.coffee

@@ -0,0 +1,3 @@
+# Splats:
+race = (winner, runners...) ->
+  print winner, runners

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

@@ -0,0 +1,5 @@
+= stylesheet_link_tag "test1"
+= javascript_include_tag "test1"
+= image_tag "test2.png", :alt => "alt"
+
+= link_to "Has param", "test2.com", :class => "test"

data/lib/middleman.rb

@@ -4,5 +4,13 @@ $LOAD_PATH.unshift(libdir) unless $LOAD_PATH.include?(libdir)
 require 'rubygems'
 
 module Middleman
-  autoload :Server, "middleman/server"  
+  autoload :Server, "middleman/server"
+  
+  module Renderers
+    autoload :CoffeeScript, "middleman/renderers/coffee_script"
+    autoload :Haml,         "middleman/renderers/haml"
+    autoload :Sass,         "middleman/renderers/sass"
+  end
+
+  autoload :Features, "middleman/features"
 end

data/lib/middleman/features.rb

@@ -1,41 +1,34 @@
-module Middleman
-  module Features
-    # Top-level method to register a new feature
-    @@features = {}
-    def self.register(feature_name, feature_class=nil, options={})
-      @@features[feature_name] = feature_class
-    
-      # Default to disabled, unless the class asks to auto-enable
-      activate_method = (options.has_key?(:auto_enable) && options[:auto_enable]) ? :enable : :disable
-      Middleman::Server.send(activate_method, feature_name)
+module Middleman::Features
+  autoload :RelativeAssets,      "middleman/features/relative_assets"
+  autoload :AssetHost,           "middleman/features/asset_host"
+  autoload :CacheBuster,         "middleman/features/cache_buster"
+  autoload :DefaultHelpers,      "middleman/features/default_helpers"
+  autoload :AutomaticImageSizes, "middleman/features/automatic_image_sizes"
+  autoload :UglyHaml,            "middleman/features/ugly_haml"
+  autoload :MinifyCss,           "middleman/features/minify_css"
+  autoload :MinifyJavascript,    "middleman/features/minify_javascript"
+  autoload :Slickmap,            "middleman/features/slickmap"
+  autoload :SmushPNGs,           "middleman/features/smush_pngs"
+  
+  class << self
+    def registered(app)
+      app.extend ClassMethods
     end
-    
-    # Initialize a feature
-    def self.run(feature_name, feature_config, scope)
-      feature_class = @@features[feature_name]
-      feature_class.new(scope, feature_config) unless feature_class.nil?
+    alias :included :registered
+  end
+  
+  module ClassMethods
+    def activate(feature_name)
+      mod_name = feature_name.to_s.camelize
+      if Middleman::Features.const_defined?(mod_name)
+        register Middleman::Features.const_get(mod_name)
+      end
     end
-
-    # Get a list of all features
-    def self.all
-      @@features
+    
+    def enable(feature_name)
+      $stderr.puts "Warning: Feature activation has been renamed from enable to activate"
+      activate(feature_name)
+      super(feature_name)
     end
-
   end
-end
-
-# livereload
-%w(default_helpers
-   asset_host 
-   automatic_image_sizes
-   cache_buster
-   minify_css
-   minify_javascript
-   relative_assets
-   slickmap
-   smush_pngs
-   ugly_haml).each do |feature| 
-     
-  require File.join("middleman/features", feature)
-
 end