middleman 0.99.0.pre → 0.99.1.pre

data/lib/middleman/templater+dynamic_renderer.rb

@@ -14,11 +14,11 @@ end
 
 class Templater::Actions::Template
   def render
-    @@rack_test ||= Rack::Test::Session.new(Rack::MockSession.new(Middleman::Base))
+    @@rack_test ||= Rack::Test::Session.new(Rack::MockSession.new(Middleman::Server))
     
     @render_cache ||= begin
       # The default render just requests the page over Rack and writes the response
-      request_path = destination.gsub(File.join(Dir.pwd, Middleman::Base.build_dir), "")
+      request_path = destination.gsub(File.join(Dir.pwd, Middleman::Server.build_dir), "")
       @@rack_test.get(request_path)
       @@rack_test.last_response.body
     end

data/middleman.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{middleman}
-  s.version = "0.99.0.pre"
+  s.version = "0.99.1.pre"
 
   s.required_rubygems_version = Gem::Requirement.new("> 1.3.1") if s.respond_to? :required_rubygems_version=
   s.authors = ["Thomas Reynolds"]
@@ -41,7 +41,6 @@ Gem::Specification.new do |s|
      "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/features.rb",
@@ -56,20 +55,22 @@ Gem::Specification.new do |s|
      "lib/middleman/features/minify_javascript/rack.rb",
      "lib/middleman/features/relative_assets.rb",
      "lib/middleman/features/slickmap.rb",
+     "lib/middleman/features/slickmap/template.html.haml",
      "lib/middleman/features/smush_pngs.rb",
      "lib/middleman/features/ugly_haml.rb",
      "lib/middleman/renderers.rb",
      "lib/middleman/renderers/coffee.rb",
      "lib/middleman/renderers/haml.rb",
      "lib/middleman/renderers/sass.rb",
-     "lib/middleman/template/init.rbt",
+     "lib/middleman/server.rb",
+     "lib/middleman/template/config.rbt",
      "lib/middleman/template/views/index.html.haml",
      "lib/middleman/template/views/layout.haml",
      "lib/middleman/template/views/stylesheets/site.css.sass",
      "lib/middleman/templater+dynamic_renderer.rb",
      "middleman.gemspec",
      "spec/builder_spec.rb",
-     "spec/fixtures/sample/init.rb",
+     "spec/fixtures/sample/config.rb",
      "spec/fixtures/sample/public/images/blank.gif",
      "spec/fixtures/sample/public/static.html",
      "spec/fixtures/sample/public/stylesheets/auto-css.css",
@@ -106,7 +107,7 @@ Gem::Specification.new do |s|
   s.summary = %q{A static site generator utilizing Haml, Sass and providing YUI compression and cache busting}
   s.test_files = [
     "spec/builder_spec.rb",
-     "spec/fixtures/sample/init.rb",
+     "spec/fixtures/sample/config.rb",
      "spec/helpers_spec.rb",
      "spec/spec_helper.rb"
   ]
@@ -128,7 +129,7 @@ Gem::Specification.new do |s|
       s.add_runtime_dependency(%q<compass>, ["~> 0.10.0"])
       s.add_runtime_dependency(%q<json_pure>, ["~> 1.4.0"])
       s.add_runtime_dependency(%q<smusher>, ["~> 0.4.5"])
-      s.add_runtime_dependency(%q<compass-slickmap>, ["~> 0.3.0"])
+      s.add_runtime_dependency(%q<compass-slickmap>, ["~> 0.4.0"])
       s.add_development_dependency(%q<rspec>, [">= 0"])
       s.add_development_dependency(%q<cucumber>, [">= 0"])
       s.add_development_dependency(%q<jeweler>, [">= 0"])
@@ -145,7 +146,7 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<compass>, ["~> 0.10.0"])
       s.add_dependency(%q<json_pure>, ["~> 1.4.0"])
       s.add_dependency(%q<smusher>, ["~> 0.4.5"])
-      s.add_dependency(%q<compass-slickmap>, ["~> 0.3.0"])
+      s.add_dependency(%q<compass-slickmap>, ["~> 0.4.0"])
       s.add_dependency(%q<rspec>, [">= 0"])
       s.add_dependency(%q<cucumber>, [">= 0"])
       s.add_dependency(%q<jeweler>, [">= 0"])
@@ -163,7 +164,7 @@ Gem::Specification.new do |s|
     s.add_dependency(%q<compass>, ["~> 0.10.0"])
     s.add_dependency(%q<json_pure>, ["~> 1.4.0"])
     s.add_dependency(%q<smusher>, ["~> 0.4.5"])
-    s.add_dependency(%q<compass-slickmap>, ["~> 0.3.0"])
+    s.add_dependency(%q<compass-slickmap>, ["~> 0.4.0"])
     s.add_dependency(%q<rspec>, [">= 0"])
     s.add_dependency(%q<cucumber>, [">= 0"])
     s.add_dependency(%q<jeweler>, [">= 0"])

data/spec/helpers_spec.rb

@@ -1,6 +1,6 @@
 require File.join(File.dirname(__FILE__), "spec_helper")
 
-base = ::Middleman::Base
+base = ::Middleman::Server
 
 describe "page_classes helper" do
   it "should generate root paths correctly" do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification 
 name: middleman
 version: !ruby/object:Gem::Version 
-  hash: 961916764
+  hash: 961916760
   prerelease: true
   segments: 
   - 0
   - 99
-  - 0
+  - 1
   - pre
-  version: 0.99.0.pre
+  version: 0.99.1.pre
 platform: ruby
 authors: 
 - Thomas Reynolds
@@ -216,12 +216,12 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 19
+        hash: 15
         segments: 
         - 0
-        - 3
+        - 4
         - 0
-        version: 0.3.0
+        version: 0.4.0
   type: :runtime
   version_requirements: *id013
 - !ruby/object:Gem::Dependency 
@@ -302,7 +302,6 @@ files:
 - 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/features.rb
@@ -317,20 +316,22 @@ files:
 - lib/middleman/features/minify_javascript/rack.rb
 - lib/middleman/features/relative_assets.rb
 - lib/middleman/features/slickmap.rb
+- lib/middleman/features/slickmap/template.html.haml
 - lib/middleman/features/smush_pngs.rb
 - lib/middleman/features/ugly_haml.rb
 - lib/middleman/renderers.rb
 - lib/middleman/renderers/coffee.rb
 - lib/middleman/renderers/haml.rb
 - lib/middleman/renderers/sass.rb
-- lib/middleman/template/init.rbt
+- lib/middleman/server.rb
+- lib/middleman/template/config.rbt
 - lib/middleman/template/views/index.html.haml
 - lib/middleman/template/views/layout.haml
 - lib/middleman/template/views/stylesheets/site.css.sass
 - lib/middleman/templater+dynamic_renderer.rb
 - middleman.gemspec
 - spec/builder_spec.rb
-- spec/fixtures/sample/init.rb
+- spec/fixtures/sample/config.rb
 - spec/fixtures/sample/public/images/blank.gif
 - spec/fixtures/sample/public/static.html
 - spec/fixtures/sample/public/stylesheets/auto-css.css
@@ -396,6 +397,6 @@ specification_version: 3
 summary: A static site generator utilizing Haml, Sass and providing YUI compression and cache busting
 test_files: 
 - spec/builder_spec.rb
-- spec/fixtures/sample/init.rb
+- spec/fixtures/sample/config.rb
 - spec/helpers_spec.rb
 - spec/spec_helper.rb

data/lib/middleman/base.rb

@@ -1,147 +0,0 @@
-# We're riding on Sinatra, so let's include it
-require "sinatra/base"
-require "sinatra/content_for"
-
-class Sinatra::Request
-  attr_accessor :layout
-end
-
-module Middleman
-  class Base < Sinatra::Base
-    set :app_file, __FILE__
-    set :root, ENV["MM_DIR"] || Dir.pwd
-    set :reload, false
-    set :sessions, false
-    set :logging, false
-    set :environment, ENV['MM_ENV'] || :development
-    set :index_file, "index.html"
-    set :js_dir, "javascripts"
-    set :css_dir, "stylesheets"
-    set :images_dir, "images"
-    set :fonts_dir, "fonts"
-    set :build_dir, "build"
-    set :http_prefix, nil
-    
-    helpers Sinatra::ContentFor
-    
-    set :features, []
-    def self.enable(*opts)
-      set :features, (self.features << opts).flatten
-      super
-    end
-    
-    def self.disable(*opts)
-      current = self.features
-      current -= opts.flatten
-      set :features, current
-      super
-    end
-    
-    def self.set(option, value=self, &block)
-      if block_given?
-        value = Proc.new { block }
-      end
-      
-      super(option, value, &nil)
-    end
-    
-    @@afters = []
-    def self.after_feature_init(&block)
-      @@afters << block
-    end
-    
-    # Rack helper for adding mime-types during local preview
-    def self.mime(ext, type)
-      ext = ".#{ext}" unless ext.to_s[0] == ?.
-      ::Rack::Mime::MIME_TYPES[ext.to_s] = type
-    end
-    
-    @@layout = nil
-    def self.page(url, options={}, &block)
-      layout = @@layout
-      layout = options[:layout] if !options[:layout].nil?
-      
-      get(url) do
-        return yield if block_given?
-        process_request(layout)
-      end
-    end
-    
-    def self.with_layout(layout, &block)
-      @@layout = layout
-      class_eval(&block) if block_given?
-    ensure
-      @@layout = nil
-    end
-    
-    def self.enabled?(name)
-      name = (name.to_s << "?").to_sym
-      self.respond_to?(name) && self.send(name)
-    end
-    
-    def enabled?(name)
-      self.class.enabled?(name)
-    end
-
-    # This will match all requests not overridden in the project's init.rb
-    not_found do
-      process_request
-    end
-    
-  private
-    def process_request(layout = :layout)
-      # Normalize the path and add index if we're looking at a directory
-      path = request.path
-      path << settings.index_file if path.match(%r{/$})
-      path.gsub!(%r{^/}, '')
-
-      template_path = locate_template_file(path)
-      if template_path
-        content_type mime_type(File.extname(path)), :charset => 'utf-8'
-        
-        renderer = Middleman::Renderers.get_method(template_path)
-        if respond_to? renderer
-          status 200
-          return send(renderer, path.to_sym, { :layout => layout })
-        end
-      end
-      
-      status 404
-    end
-    
-    def locate_template_file(path)
-      template_path = File.join(settings.views, "#{path}.*")
-      Dir.glob(template_path).first
-    end
-  end
-end
-
-require "middleman/assets"
-require "middleman/renderers"
-require "middleman/features"
-
-# The Rack App
-class Middleman::Base
-  def self.new(*args, &block)
-    # Check for and evaluate local configuration
-    local_config = File.join(self.root, "init.rb")
-    if File.exists? local_config
-      puts "== Reading:  Local config" if logging?
-      Middleman::Base.class_eval File.read(local_config)
-      set :app_file, File.expand_path(local_config)
-    end
-    
-    # loop over enabled feature
-    features.flatten.each do |feature_name|
-      next unless send(:"#{feature_name}?")
-      $stderr.puts "== Enabling: #{feature_name.to_s.capitalize}" if logging?
-      Middleman::Features.run(feature_name, self)
-    end
-    
-    use ::Rack::ConditionalGet if environment == :development
-    
-    @@afters.each { |block| class_eval(&block) }
-    
-    super
-  end
-end