middleman 2.0.11-x86-mingw32 → 2.0.12.pre-x86-mingw32

data/CHANGELOG

@@ -1,3 +1,11 @@
+2.0.12
+====
+Sinatra 1.3.1 and Padrino 0.10.4
+
+2.0.11
+=====
+- Lock Padrino and Sinatra versions (for now)
+
 2.0.9
 =====
 - Added --glob option to build which only builds matching files

data/fixtures/ignore-app/config.rb

@@ -0,0 +1,2 @@
+page "/my_article.html", :proxy => "/template.html", :ignore => true, :layout => false
+page "/articles/my_article.html", :proxy => "/articles/template.html", :ignore => true, :layout => false

data/fixtures/ignore-app/source/articles/template.html.erb

@@ -0,0 +1 @@
+<%= [1,2,3].join("-") %>

data/fixtures/ignore-app/source/template.html.erb

@@ -0,0 +1 @@
+<%= [1,2,3].join("-") %>

data/lib/middleman/base.rb

@@ -124,12 +124,12 @@ module Middleman::Base
   module ClassMethods
     # Override Sinatra's set to accept a block
     # Specifically for the asset_host feature
-    def set(option, value=self, &block)
+    def set(option, value = (not_set = true), ignore_setter = false, &block)
       if block_given?
         value = Proc.new { block }
       end
     
-      super(option, value, &nil)
+      super(option, value, ignore_setter, &nil)
     end
     
     def before_processing(name=:unnamed, idx=-1, &block)
@@ -150,6 +150,10 @@ module Middleman::Base
   end
   
   module InstanceMethods
+    def forward
+      raise ::Sinatra::NotFound
+    end
+  
     # Internal method to look for templates and evaluate them if found
     def process_request(options={})
       if !settings.views.include?(settings.root)

data/lib/middleman/core_extensions/features.rb

@@ -20,7 +20,7 @@
 #     activate MyExtension
 #
 # This will call the `registered` method in your extension and provide you
-# with the `app` parameter which is a Middleman::Server context. From here
+# with the `app` parameter which is a Middleman::Base context. From here
 # you can choose to respond to requests for certain paths or simply attach
 # Rack middleware to the stack.
 #

data/lib/middleman/features/minify_javascript.rb

@@ -19,7 +19,7 @@ module Middleman::Features::MinifyJavascript
       if env["PATH_INFO"].match(/\.html$/)
         compressor = ::Uglifier.new
 
-        if response.is_a?(::Rack::File) or response.is_a?(::Sinatra::Helpers::StaticFile)
+        if response.is_a?(::Rack::File)# or response.is_a?(::Sinatra::Helpers::StaticFile)
           uncompressed_source = File.read(response.path)
         else
           uncompressed_source = response.join

data/lib/middleman/version.rb

@@ -1,3 +1,3 @@
 module Middleman
-  VERSION = "2.0.11"
+  VERSION = "2.0.12.pre"
 end

data/middleman-x86-mingw32.gemspec

@@ -42,7 +42,7 @@ eos
   s.add_dependency("thor", ["~> 0.14.0"])
   s.add_dependency("tilt", ["~> 1.3.1"])
   s.add_dependency("maruku", ["~> 0.6.0"])
-  s.add_dependency("sinatra", ["~> 1.2.6"])
+  s.add_dependency("sinatra", ["~> 1.3.1"])
   s.add_dependency("rack-test", ["~> 0.6.1"])
   s.add_dependency("uglifier", ["~> 1.0.0"])
   s.add_dependency("slim", ["~> 1.0.2"])
@@ -51,17 +51,12 @@ eos
   s.add_dependency("compass", ["~> 0.11.3"])
   s.add_dependency("coffee-script", ["~> 2.2.0"])
   s.add_dependency("sprockets", ["~> 2.0.0"])
-  s.add_dependency("padrino-core", ["0.10.2"])
-  s.add_dependency("padrino-helpers", ["0.10.2"])
+  s.add_dependency("padrino-core", ["~> 0.10.4"])
+  s.add_dependency("padrino-helpers", ["~> 0.10.4"])
   
-  # case s.platform.to_s
-  # when %r{mingw}
-    s.add_dependency("eventmachine", ["1.0.0.beta.3"])
-    s.add_dependency("win32-process", ["~> 0.6.5"])
-    s.add_dependency("rb-fchange")
-  # else
-  #   s.add_dependency("rb-fsevent", ["~> 0.4.2"])
-  # end
+  s.add_dependency("eventmachine", ["1.0.0.beta.3"])
+  s.add_dependency("win32-process", ["~> 0.6.5"])
+  s.add_dependency("rb-fchange")
   
   s.add_dependency("guard", ["~> 0.6.2"])
   s.add_dependency("middleman-livereload", ["~> 0.2.0"])

data/middleman.gemspec

@@ -42,7 +42,7 @@ eos
   s.add_dependency("thor", ["~> 0.14.0"])
   s.add_dependency("tilt", ["~> 1.3.1"])
   s.add_dependency("maruku", ["~> 0.6.0"])
-  s.add_dependency("sinatra", ["~> 1.2.6"])
+  s.add_dependency("sinatra", ["~> 1.3.1"])
   # s.add_dependency("sinatra-synchrony", ["~> 0.2.1"])
   s.add_dependency("rack-test", ["~> 0.6.1"])
   s.add_dependency("uglifier", ["~> 1.0.0"])
@@ -51,25 +51,15 @@ eos
   s.add_dependency("sass", ["~> 3.1.7"])
   s.add_dependency("compass", ["~> 0.11.3"])
   s.add_dependency("coffee-script", ["~> 2.2.0"])
+  s.add_dependency("execjs", ["~> 1.2.7"])
   s.add_dependency("sprockets", ["~> 2.0.0"])
-  s.add_dependency("padrino-core", ["0.10.2"])
-  s.add_dependency("padrino-helpers", ["0.10.2"])
-  
-  # case s.platform.to_s
-  # when %r{mingw}
-  #   s.add_dependency("eventmachine", ["1.0.0.beta.3"])
-  #   s.add_dependency("win32-process", ["~> 0.6.5"])
-  #   s.add_dependency("rb-fchange")
-  # else
-    # s.add_dependency("rb-fsevent", ["~> 0.4.2"])
-    # s.add_dependency("therubyracer", ["~> 0.9.4"])
-  # end
+  s.add_dependency("padrino-core", ["~> 0.10.4"])
+  s.add_dependency("padrino-helpers", ["~> 0.10.4"])
   
   s.add_dependency("guard", ["~> 0.6.2"])
   s.add_dependency("middleman-livereload", ["~> 0.2.0"])
   
   # Development and test
-  # s.add_development_dependency("jquery-rails")
   s.add_development_dependency("coffee-filter", ["~> 0.1.1"])
   s.add_development_dependency("liquid", ["~> 2.2.0"])
   s.add_development_dependency("cucumber", ["~> 1.0.2"])

metadata

@@ -1,13 +1,14 @@
 --- !ruby/object:Gem::Specification 
 name: middleman
 version: !ruby/object:Gem::Version 
-  hash: 25
-  prerelease: 
+  hash: 961915988
+  prerelease: 7
   segments: 
   - 2
   - 0
-  - 11
-  version: 2.0.11
+  - 12
+  - pre
+  version: 2.0.12.pre
 platform: x86-mingw32
 authors: 
 - Thomas Reynolds
@@ -15,10 +16,11 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-10-05 00:00:00 -07:00
+date: 2011-10-12 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
+  prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -30,11 +32,11 @@ dependencies:
         - 3
         - 0
         version: 1.3.0
-  version_requirements: *id001
-  name: rack
-  prerelease: false
   type: :runtime
+  name: rack
+  version_requirements: *id001
 - !ruby/object:Gem::Dependency 
+  prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -46,11 +48,11 @@ dependencies:
         - 2
         - 11
         version: 1.2.11
-  version_requirements: *id002
-  name: thin
-  prerelease: false
   type: :runtime
+  name: thin
+  version_requirements: *id002
 - !ruby/object:Gem::Dependency 
+  prerelease: false
   requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -62,11 +64,11 @@ dependencies:
         - 14
         - 0
         version: 0.14.0
-  version_requirements: *id003
-  name: thor
-  prerelease: false
   type: :runtime
+  name: thor
+  version_requirements: *id003
 - !ruby/object:Gem::Dependency 
+  prerelease: false
   requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -78,11 +80,11 @@ dependencies:
         - 3
         - 1
         version: 1.3.1
-  version_requirements: *id004
-  name: tilt
-  prerelease: false
   type: :runtime
+  name: tilt
+  version_requirements: *id004
 - !ruby/object:Gem::Dependency 
+  prerelease: false
   requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -94,27 +96,27 @@ dependencies:
         - 6
         - 0
         version: 0.6.0
-  version_requirements: *id005
-  name: maruku
-  prerelease: false
   type: :runtime
+  name: maruku
+  version_requirements: *id005
 - !ruby/object:Gem::Dependency 
+  prerelease: false
   requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 19
+        hash: 25
         segments: 
         - 1
-        - 2
-        - 6
-        version: 1.2.6
-  version_requirements: *id006
-  name: sinatra
-  prerelease: false
+        - 3
+        - 1
+        version: 1.3.1
   type: :runtime
+  name: sinatra
+  version_requirements: *id006
 - !ruby/object:Gem::Dependency 
+  prerelease: false
   requirement: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -126,11 +128,11 @@ dependencies:
         - 6
         - 1
         version: 0.6.1
-  version_requirements: *id007
-  name: rack-test
-  prerelease: false
   type: :runtime
+  name: rack-test
+  version_requirements: *id007
 - !ruby/object:Gem::Dependency 
+  prerelease: false
   requirement: &id008 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -142,11 +144,11 @@ dependencies:
         - 0
         - 0
         version: 1.0.0
-  version_requirements: *id008
-  name: uglifier
-  prerelease: false
   type: :runtime
+  name: uglifier
+  version_requirements: *id008
 - !ruby/object:Gem::Dependency 
+  prerelease: false
   requirement: &id009 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -158,11 +160,11 @@ dependencies:
         - 0
         - 2
         version: 1.0.2
-  version_requirements: *id009
-  name: slim
-  prerelease: false
   type: :runtime
+  name: slim
+  version_requirements: *id009
 - !ruby/object:Gem::Dependency 
+  prerelease: false
   requirement: &id010 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -174,11 +176,11 @@ dependencies:
         - 1
         - 0
         version: 3.1.0
-  version_requirements: *id010
-  name: haml
-  prerelease: false
   type: :runtime
+  name: haml
+  version_requirements: *id010
 - !ruby/object:Gem::Dependency 
+  prerelease: false
   requirement: &id011 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -190,11 +192,11 @@ dependencies:
         - 1
         - 7
         version: 3.1.7
-  version_requirements: *id011
-  name: sass
-  prerelease: false
   type: :runtime
+  name: sass
+  version_requirements: *id011
 - !ruby/object:Gem::Dependency 
+  prerelease: false
   requirement: &id012 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -206,11 +208,11 @@ dependencies:
         - 11
         - 3
         version: 0.11.3
-  version_requirements: *id012
-  name: compass
-  prerelease: false
   type: :runtime
+  name: compass
+  version_requirements: *id012
 - !ruby/object:Gem::Dependency 
+  prerelease: false
   requirement: &id013 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -222,11 +224,11 @@ dependencies:
         - 2
         - 0
         version: 2.2.0
-  version_requirements: *id013
-  name: coffee-script
-  prerelease: false
   type: :runtime
+  name: coffee-script
+  version_requirements: *id013
 - !ruby/object:Gem::Dependency 
+  prerelease: false
   requirement: &id014 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -238,43 +240,43 @@ dependencies:
         - 0
         - 0
         version: 2.0.0
-  version_requirements: *id014
-  name: sprockets
-  prerelease: false
   type: :runtime
+  name: sprockets
+  version_requirements: *id014
 - !ruby/object:Gem::Dependency 
+  prerelease: false
   requirement: &id015 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - "="
+    - - ~>
       - !ruby/object:Gem::Version 
-        hash: 51
+        hash: 63
         segments: 
         - 0
         - 10
-        - 2
-        version: 0.10.2
-  version_requirements: *id015
-  name: padrino-core
-  prerelease: false
+        - 4
+        version: 0.10.4
   type: :runtime
+  name: padrino-core
+  version_requirements: *id015
 - !ruby/object:Gem::Dependency 
+  prerelease: false
   requirement: &id016 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - "="
+    - - ~>
       - !ruby/object:Gem::Version 
-        hash: 51
+        hash: 63
         segments: 
         - 0
         - 10
-        - 2
-        version: 0.10.2
-  version_requirements: *id016
-  name: padrino-helpers
-  prerelease: false
+        - 4
+        version: 0.10.4
   type: :runtime
+  name: padrino-helpers
+  version_requirements: *id016
 - !ruby/object:Gem::Dependency 
+  prerelease: false
   requirement: &id017 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -288,11 +290,11 @@ dependencies:
         - beta
         - 3
         version: 1.0.0.beta.3
-  version_requirements: *id017
-  name: eventmachine
-  prerelease: false
   type: :runtime
+  name: eventmachine
+  version_requirements: *id017
 - !ruby/object:Gem::Dependency 
+  prerelease: false
   requirement: &id018 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -304,11 +306,11 @@ dependencies:
         - 6
         - 5
         version: 0.6.5
-  version_requirements: *id018
-  name: win32-process
-  prerelease: false
   type: :runtime
+  name: win32-process
+  version_requirements: *id018
 - !ruby/object:Gem::Dependency 
+  prerelease: false
   requirement: &id019 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -318,11 +320,11 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  version_requirements: *id019
-  name: rb-fchange
-  prerelease: false
   type: :runtime
+  name: rb-fchange
+  version_requirements: *id019
 - !ruby/object:Gem::Dependency 
+  prerelease: false
   requirement: &id020 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -334,11 +336,11 @@ dependencies:
         - 6
         - 2
         version: 0.6.2
-  version_requirements: *id020
-  name: guard
-  prerelease: false
   type: :runtime
+  name: guard
+  version_requirements: *id020
 - !ruby/object:Gem::Dependency 
+  prerelease: false
   requirement: &id021 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -350,11 +352,11 @@ dependencies:
         - 2
         - 0
         version: 0.2.0
-  version_requirements: *id021
-  name: middleman-livereload
-  prerelease: false
   type: :runtime
+  name: middleman-livereload
+  version_requirements: *id021
 - !ruby/object:Gem::Dependency 
+  prerelease: false
   requirement: &id022 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -366,11 +368,11 @@ dependencies:
         - 1
         - 1
         version: 0.1.1
-  version_requirements: *id022
-  name: coffee-filter
-  prerelease: false
   type: :development
+  name: coffee-filter
+  version_requirements: *id022
 - !ruby/object:Gem::Dependency 
+  prerelease: false
   requirement: &id023 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -382,11 +384,11 @@ dependencies:
         - 2
         - 0
         version: 2.2.0
-  version_requirements: *id023
-  name: liquid
-  prerelease: false
   type: :development
+  name: liquid
+  version_requirements: *id023
 - !ruby/object:Gem::Dependency 
+  prerelease: false
   requirement: &id024 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -398,11 +400,11 @@ dependencies:
         - 0
         - 2
         version: 1.0.2
-  version_requirements: *id024
-  name: cucumber
-  prerelease: false
   type: :development
+  name: cucumber
+  version_requirements: *id024
 - !ruby/object:Gem::Dependency 
+  prerelease: false
   requirement: &id025 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -414,11 +416,11 @@ dependencies:
         - 8
         - 7
         version: 0.8.7
-  version_requirements: *id025
-  name: rake
-  prerelease: false
   type: :development
+  name: rake
+  version_requirements: *id025
 - !ruby/object:Gem::Dependency 
+  prerelease: false
   requirement: &id026 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -430,10 +432,9 @@ dependencies:
         - 6
         - 0
         version: 2.6.0
-  version_requirements: *id026
-  name: rspec
-  prerelease: false
   type: :development
+  name: rspec
+  version_requirements: *id026
 description: A static site generator based on Sinatra. Providing dozens of templating languages (Haml, Sass, Compass, Slim, CoffeeScript, and more). Makes minification, compression, cache busting, Yaml data (and more) an easy part of your development cycle.
 email: 
 - me@tdreyno.com
@@ -502,6 +503,9 @@ files:
 - fixtures/glob-app/config.rb
 - fixtures/glob-app/source/index.html.haml
 - fixtures/glob-app/source/stylesheets/site.css.sass
+- fixtures/ignore-app/config.rb
+- fixtures/ignore-app/source/articles/template.html.erb
+- fixtures/ignore-app/source/template.html.erb
 - fixtures/indexable-app/config.rb
 - fixtures/indexable-app/source/a_folder/needs_index.html
 - fixtures/indexable-app/source/leave_me_alone.html
@@ -760,12 +764,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version 
-      hash: 3
+      hash: 25
       segments: 
-      - 0
-      version: "0"
+      - 1
+      - 3
+      - 1
+      version: 1.3.1
 requirements: []
 
 rubyforge_project: 
@@ -817,6 +823,9 @@ test_files:
 - fixtures/glob-app/config.rb
 - fixtures/glob-app/source/index.html.haml
 - fixtures/glob-app/source/stylesheets/site.css.sass
+- fixtures/ignore-app/config.rb
+- fixtures/ignore-app/source/articles/template.html.erb
+- fixtures/ignore-app/source/template.html.erb
 - fixtures/indexable-app/config.rb
 - fixtures/indexable-app/source/a_folder/needs_index.html
 - fixtures/indexable-app/source/leave_me_alone.html