middleman 0.11.4 → 0.11.5

data/Gemfile

@@ -1,19 +1,24 @@
 source "http://gemcutter.org"
 bin_path "vendor/bin"
-disable_rubygems
+# disable_rubygems
+# disable_system_gems
 
-gem "thin"
 gem "shotgun"
 gem "templater"
 gem "sprockets"
 gem "sinatra"
 gem "sinatra-content-for"
-gem "rack-test", "0.5.1"
+gem "rack-test"
 gem "yui-compressor"
 gem "haml"
 gem "compass"
 gem "smusher"
+gem "compass-slickmap"
+gem "maruku"
+gem "markaby"
 
+gem "jeweler"
 gem "rspec"
+gem "rdoc"
 gem "sdoc"
 gem "cucumber"

data/Rakefile

@@ -1,4 +1,3 @@
-require 'rubygems'
 require 'lib/middleman'
 require 'rake'
 require 'cucumber/rake/task'
@@ -14,19 +13,20 @@ begin
     gem.rubyforge_project = "middleman"
     gem.executables = %w(mm-init mm-build mm-server)
     gem.add_dependency("thin")
-    gem.add_dependency("shotgun")
-    gem.add_dependency("templater")
-    gem.add_dependency("sprockets")
-    gem.add_dependency("sinatra")
-    gem.add_dependency("sinatra-content-for")
-    gem.add_dependency("rack-test")
-    gem.add_dependency("yui-compressor")
-    gem.add_dependency("smusher")
-    gem.add_dependency("haml", ">=2.1.0")
-    gem.add_dependency("compass")
-    gem.add_development_dependency("rspec")
-    gem.add_development_dependency("sdoc")
-    gem.add_development_dependency("cucumber")
+    # gem.add_dependency("shotgun")
+    # gem.add_dependency("templater")
+    # gem.add_dependency("sprockets")
+    # gem.add_dependency("sinatra")
+    # gem.add_dependency("sinatra-content-for")
+    # gem.add_dependency("rack-test")
+    # gem.add_dependency("yui-compressor")
+    # gem.add_dependency("smusher")
+    # gem.add_dependency("haml", ">=2.1.0")
+    # gem.add_dependency("compass")
+    # gem.add_development_dependency("rdoc")
+    # gem.add_development_dependency("rspec")
+    # gem.add_development_dependency("sdoc")
+    # gem.add_development_dependency("cucumber")
     
     # Ignore vendored files
     gem.files = gem.files.exclude("vendor/*")
@@ -53,37 +53,35 @@ task :spec => :check_dependencies
 
 task :default => :spec
 
-unless ENV["RUN_CODE_RUN"]
-  require 'rake/rdoctask'
-  require 'sdoc'
+require 'rake/rdoctask'
+require 'sdoc'
 
-  Rake::RDocTask.new do |rdoc|
-    if File.exist?('VERSION')
-      version = File.read('VERSION')
-    else
-      version = ""
-    end
-  
-    # rdoc.template = 'direct'
-
-    rdoc.rdoc_dir = 'rdoc'
-    rdoc.title = "middleman #{version}"
-    rdoc.rdoc_files.include('README*')
-    rdoc.rdoc_files.include('lib/**/*.rb')
-    rdoc.rdoc_files.exclude('lib/middleman/features/sprockets+ruby19.rb')
-    rdoc.rdoc_files.exclude('lib/middleman/templater+dynamic_renderer.rb')
+Rake::RDocTask.new do |rdoc|
+  if File.exist?('VERSION')
+    version = File.read('VERSION')
+  else
+    version = ""
   end
 
-  desc "Build and publish documentation using GitHub Pages."
-  task :pages do
-    if !`git status`.include?('nothing to commit')
-      abort "dirty index - not publishing!"
-    end
- 
-    Rake::Task[:rerdoc].invoke
-    `git checkout gh-pages`
-    `ls -1 | grep -v rdoc | xargs rm -rf; mv rdoc/* .; rm -rf rdoc`
-    `git commit -a -m "update docs"; git push origin gh-pages`
-    `git checkout master`
+  # rdoc.template = 'direct'
+
+  rdoc.rdoc_dir = 'rdoc'
+  rdoc.title = "middleman #{version}"
+  rdoc.rdoc_files.include('README*')
+  rdoc.rdoc_files.include('lib/**/*.rb')
+  rdoc.rdoc_files.exclude('lib/middleman/features/sprockets+ruby19.rb')
+  rdoc.rdoc_files.exclude('lib/middleman/templater+dynamic_renderer.rb')
+end
+
+desc "Build and publish documentation using GitHub Pages."
+task :pages do
+  if !`git status`.include?('nothing to commit')
+    abort "dirty index - not publishing!"
   end
+
+  Rake::Task[:rerdoc].invoke
+  `git checkout gh-pages`
+  `ls -1 | grep -v rdoc | xargs rm -rf; mv rdoc/* .; rm -rf rdoc`
+  `git commit -a -m "update docs"; git push origin gh-pages`
+  `git checkout master`
 end

data/VERSION

@@ -1 +1 @@
-0.11.4
+0.11.5

data/bin/mm-init

@@ -1,5 +1,5 @@
 #!/usr/bin/env ruby
-require 'rubygems'
+require File.join(File.dirname(File.dirname(__FILE__)), 'lib', 'middleman')
 require 'templater'
 
 module Generators

data/bin/mm-server

@@ -52,6 +52,7 @@ require 'shotgun'
 config = File.join(File.dirname(__FILE__), '..', 'lib', 'middleman', 'config.ru')
 app = Shotgun.new(config, lambda { |inner_app| Middleman::Base })
 
+require 'rubygems'
 require 'thin'
 Thin::Logging.silent = true
 

data/lib/middleman.rb

@@ -2,5 +2,5 @@ libdir = File.dirname(__FILE__)
 $LOAD_PATH.unshift(libdir) unless $LOAD_PATH.include?(libdir)
 
 # Bundler
-require File.join(File.dirname(libdir), "vendor", "gems", "environment") if ENV["RUN_CODE_RUN"]
+require File.join(File.dirname(libdir), "vendor", "gems", "environment")# if ENV["RUN_CODE_RUN"]
 require 'middleman/base'

data/lib/middleman/base.rb

@@ -1,6 +1,3 @@
-# Be nice to other library systems, like the wonderful Rip
-require 'rubygems' unless ENV['NO_RUBYGEMS']
-
 # We're riding on Sinatra, so let's include it
 require 'sinatra/base'
 

data/lib/middleman/features/cache_buster.rb

@@ -1,14 +1,18 @@
 class Middleman::Base  
   after_feature_init do 
     ::Compass.configuration do |config|
-      config.asset_cache_buster do |path, real_path|
-        real_path = real_path.path if real_path.is_a? File
-        real_path = real_path.gsub(File.join(self.root, self.build_dir), self.public)
-        if File.readable?(real_path)
-          File.mtime(real_path).strftime("%s") 
-        else
-          $stderr.puts "WARNING: '#{File.basename(path)}' was not found (or cannot be read) in #{File.dirname(real_path)}"
+      if self.respond_to?(:cache_buster?) && self.cache_buster?
+        config.asset_cache_buster do |path, real_path|
+          real_path = real_path.path if real_path.is_a? File
+          real_path = real_path.gsub(File.join(self.root, self.build_dir), self.public)
+          if File.readable?(real_path)
+            File.mtime(real_path).strftime("%s") 
+          else
+            $stderr.puts "WARNING: '#{File.basename(path)}' was not found (or cannot be read) in #{File.dirname(real_path)}"
+          end
         end
+      else
+        config.asset_cache_buster { false }
       end
     end
     
@@ -21,6 +25,8 @@ class << Middleman::Base
   def asset_url(path, prefix="", request=nil)
     http_path = pre_cache_buster_asset_url(path, prefix, request)
     
+    return http_path unless self.respond_to?(:cache_buster?) && self.cache_buster?
+    
     if http_path.include?("://") || !%w(.css .png .jpg .js .gif).include?(File.extname(http_path))
       http_path
     else

data/middleman.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{middleman}
-  s.version = "0.11.4"
+  s.version = "0.11.5"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Thomas Reynolds"]
@@ -116,50 +116,11 @@ Gem::Specification.new do |s|
 
     if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<thin>, [">= 0"])
-      s.add_runtime_dependency(%q<shotgun>, [">= 0"])
-      s.add_runtime_dependency(%q<templater>, [">= 0"])
-      s.add_runtime_dependency(%q<sprockets>, [">= 0"])
-      s.add_runtime_dependency(%q<sinatra>, [">= 0"])
-      s.add_runtime_dependency(%q<sinatra-content-for>, [">= 0"])
-      s.add_runtime_dependency(%q<rack-test>, [">= 0"])
-      s.add_runtime_dependency(%q<yui-compressor>, [">= 0"])
-      s.add_runtime_dependency(%q<smusher>, [">= 0"])
-      s.add_runtime_dependency(%q<haml>, [">= 2.1.0"])
-      s.add_runtime_dependency(%q<compass>, [">= 0"])
-      s.add_development_dependency(%q<rspec>, [">= 0"])
-      s.add_development_dependency(%q<sdoc>, [">= 0"])
-      s.add_development_dependency(%q<cucumber>, [">= 0"])
     else
       s.add_dependency(%q<thin>, [">= 0"])
-      s.add_dependency(%q<shotgun>, [">= 0"])
-      s.add_dependency(%q<templater>, [">= 0"])
-      s.add_dependency(%q<sprockets>, [">= 0"])
-      s.add_dependency(%q<sinatra>, [">= 0"])
-      s.add_dependency(%q<sinatra-content-for>, [">= 0"])
-      s.add_dependency(%q<rack-test>, [">= 0"])
-      s.add_dependency(%q<yui-compressor>, [">= 0"])
-      s.add_dependency(%q<smusher>, [">= 0"])
-      s.add_dependency(%q<haml>, [">= 2.1.0"])
-      s.add_dependency(%q<compass>, [">= 0"])
-      s.add_dependency(%q<rspec>, [">= 0"])
-      s.add_dependency(%q<sdoc>, [">= 0"])
-      s.add_dependency(%q<cucumber>, [">= 0"])
     end
   else
     s.add_dependency(%q<thin>, [">= 0"])
-    s.add_dependency(%q<shotgun>, [">= 0"])
-    s.add_dependency(%q<templater>, [">= 0"])
-    s.add_dependency(%q<sprockets>, [">= 0"])
-    s.add_dependency(%q<sinatra>, [">= 0"])
-    s.add_dependency(%q<sinatra-content-for>, [">= 0"])
-    s.add_dependency(%q<rack-test>, [">= 0"])
-    s.add_dependency(%q<yui-compressor>, [">= 0"])
-    s.add_dependency(%q<smusher>, [">= 0"])
-    s.add_dependency(%q<haml>, [">= 2.1.0"])
-    s.add_dependency(%q<compass>, [">= 0"])
-    s.add_dependency(%q<rspec>, [">= 0"])
-    s.add_dependency(%q<sdoc>, [">= 0"])
-    s.add_dependency(%q<cucumber>, [">= 0"])
   end
 end
 

data/spec/cache_buster_off_spec.rb

@@ -1,21 +1,20 @@
 require File.join(File.dirname(__FILE__), "spec_helper")
-
+  
 describe "Cache Buster Feature in CSS" do
-  before :each do
-    @base = ::Middleman::Base
-    @base.set :root, File.join(File.dirname(__FILE__), "fixtures", "sample")
-    @base.disable :cache_buster
+  before do
+    base = ::Middleman::Base
+    base.set :root, File.join(File.dirname(__FILE__), "fixtures", "sample")
+    base.disable :cache_buster
+    @browser = Rack::Test::Session.new(Rack::MockSession.new(base.new))
   end
-  
+
   it "should not append query string in CSS if off" do
-    browser = Rack::Test::Session.new(Rack::MockSession.new(@base.new))
-    browser.get("/stylesheets/relative_assets.css")
-    browser.last_response.body.should_not include("?")
+    @browser.get("/stylesheets/relative_assets.css")
+    @browser.last_response.body.count("?").should == 0
   end
   
   it "should not append query string in HTML if off" do
-    browser = Rack::Test::Session.new(Rack::MockSession.new(@base.new))
-    browser.get("/cache-buster.html")
-    browser.last_response.body.count("?").should == 0
+    @browser.get("/cache-buster.html")
+    @browser.last_response.body.count("?").should == 0
   end
 end

data/spec/cache_buster_on_spec.rb

@@ -1,21 +1,20 @@
 require File.join(File.dirname(__FILE__), "spec_helper")
 
 describe "Cache Buster Feature in CSS" do
-  before :each do
-    @base = ::Middleman::Base
-    @base.set :root, File.join(File.dirname(__FILE__), "fixtures", "sample")
-    @base.enable :cache_buster
+  before do 
+    base = ::Middleman::Base
+    base.set :root, File.join(File.dirname(__FILE__), "fixtures", "sample")
+    base.enable :cache_buster
+    @browser = Rack::Test::Session.new(Rack::MockSession.new(base.new))
   end
   
   it "should append query string in CSS if on" do
-    browser = Rack::Test::Session.new(Rack::MockSession.new(@base.new))
-    browser.get("/stylesheets/relative_assets.css")
-    browser.last_response.body.should include("?")
+    @browser.get("/stylesheets/relative_assets.css")
+    @browser.last_response.body.should include("?")
   end
 
   it "should not append query string in HTML if on IN DEVELOPMENT" do
-    browser = Rack::Test::Session.new(Rack::MockSession.new(@base.new))
-    browser.get("/cache-buster.html")
-    browser.last_response.body.count("?").should == 0
+    @browser.get("/cache-buster.html")
+    @browser.last_response.body.count("?").should == 0
   end
 end

data/spec/spec_helper.rb

@@ -1,9 +1,8 @@
-require 'rubygems'
+#require 'rubygems'
+require File.join(File.dirname(File.dirname(__FILE__)), 'lib', 'middleman')
 require 'spec'
 require 'rack/test'
 
-require File.join(File.dirname(File.dirname(__FILE__)), 'lib', 'middleman')
-
 Spec::Runner.configure do |config|
   
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: middleman
 version: !ruby/object:Gem::Version 
-  version: 0.11.4
+  version: 0.11.5
 platform: ruby
 authors: 
 - Thomas Reynolds
@@ -22,136 +22,6 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: "0"
     version: 
-- !ruby/object:Gem::Dependency 
-  name: shotgun
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
-    version: 
-- !ruby/object:Gem::Dependency 
-  name: templater
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
-    version: 
-- !ruby/object:Gem::Dependency 
-  name: sprockets
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
-    version: 
-- !ruby/object:Gem::Dependency 
-  name: sinatra
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
-    version: 
-- !ruby/object:Gem::Dependency 
-  name: sinatra-content-for
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
-    version: 
-- !ruby/object:Gem::Dependency 
-  name: rack-test
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
-    version: 
-- !ruby/object:Gem::Dependency 
-  name: yui-compressor
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
-    version: 
-- !ruby/object:Gem::Dependency 
-  name: smusher
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
-    version: 
-- !ruby/object:Gem::Dependency 
-  name: haml
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: 2.1.0
-    version: 
-- !ruby/object:Gem::Dependency 
-  name: compass
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
-    version: 
-- !ruby/object:Gem::Dependency 
-  name: rspec
-  type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
-    version: 
-- !ruby/object:Gem::Dependency 
-  name: sdoc
-  type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
-    version: 
-- !ruby/object:Gem::Dependency 
-  name: cucumber
-  type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
-    version: 
 description: 
 email: tdreyno@gmail.com
 executables: