middleman 2.0.11.pre → 2.0.11

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 = (not_set = true), ignore_setter = false, &block)
+    def set(option, value=self, &block)
       if block_given?
         value = Proc.new { block }
       end
     
-      super(option, value, ignore_setter, &nil)
+      super(option, value, &nil)
     end
     
     def before_processing(name=:unnamed, idx=-1, &block)
@@ -150,10 +150,6 @@ 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::Base context. From here
+# with the `app` parameter which is a Middleman::Server 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.pre"
+  VERSION = "2.0.11"
 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.3.0"])
+  s.add_dependency("sinatra", ["~> 1.2.6"])
   s.add_dependency("rack-test", ["~> 0.6.1"])
   s.add_dependency("uglifier", ["~> 1.0.0"])
   s.add_dependency("slim", ["~> 1.0.2"])
@@ -51,12 +51,17 @@ 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.3"])
-  s.add_dependency("padrino-helpers", ["~> 0.10.3"])
+  s.add_dependency("padrino-core", ["0.10.2"])
+  s.add_dependency("padrino-helpers", ["0.10.2"])
   
-  s.add_dependency("eventmachine", ["1.0.0.beta.3"])
-  s.add_dependency("win32-process", ["~> 0.6.5"])
-  s.add_dependency("rb-fchange")
+  # 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("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.3.0"])
+  s.add_dependency("sinatra", ["~> 1.2.6"])
   # s.add_dependency("sinatra-synchrony", ["~> 0.2.1"])
   s.add_dependency("rack-test", ["~> 0.6.1"])
   s.add_dependency("uglifier", ["~> 1.0.0"])
@@ -52,13 +52,24 @@ 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.3"])
-  s.add_dependency("padrino-helpers", ["~> 0.10.3"])
+  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("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,14 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: middleman
 version: !ruby/object:Gem::Version 
-  hash: 961915976
-  prerelease: 7
+  hash: 25
+  prerelease: 
   segments: 
   - 2
   - 0
   - 11
-  - pre
-  version: 2.0.11.pre
+  version: 2.0.11
 platform: ruby
 authors: 
 - Thomas Reynolds
@@ -16,11 +15,10 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-10-04 00:00:00 -07:00
+date: 2011-10-05 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -32,11 +30,11 @@ dependencies:
         - 3
         - 0
         version: 1.3.0
-  type: :runtime
-  name: rack
   version_requirements: *id001
-- !ruby/object:Gem::Dependency 
+  name: rack
   prerelease: false
+  type: :runtime
+- !ruby/object:Gem::Dependency 
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -48,11 +46,11 @@ dependencies:
         - 2
         - 11
         version: 1.2.11
-  type: :runtime
-  name: thin
   version_requirements: *id002
-- !ruby/object:Gem::Dependency 
+  name: thin
   prerelease: false
+  type: :runtime
+- !ruby/object:Gem::Dependency 
   requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -64,11 +62,11 @@ dependencies:
         - 14
         - 0
         version: 0.14.0
-  type: :runtime
-  name: thor
   version_requirements: *id003
-- !ruby/object:Gem::Dependency 
+  name: thor
   prerelease: false
+  type: :runtime
+- !ruby/object:Gem::Dependency 
   requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -80,11 +78,11 @@ dependencies:
         - 3
         - 1
         version: 1.3.1
-  type: :runtime
-  name: tilt
   version_requirements: *id004
-- !ruby/object:Gem::Dependency 
+  name: tilt
   prerelease: false
+  type: :runtime
+- !ruby/object:Gem::Dependency 
   requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -96,27 +94,27 @@ dependencies:
         - 6
         - 0
         version: 0.6.0
-  type: :runtime
-  name: maruku
   version_requirements: *id005
-- !ruby/object:Gem::Dependency 
+  name: maruku
   prerelease: false
+  type: :runtime
+- !ruby/object:Gem::Dependency 
   requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 27
+        hash: 19
         segments: 
         - 1
-        - 3
-        - 0
-        version: 1.3.0
-  type: :runtime
-  name: sinatra
+        - 2
+        - 6
+        version: 1.2.6
   version_requirements: *id006
-- !ruby/object:Gem::Dependency 
+  name: sinatra
   prerelease: false
+  type: :runtime
+- !ruby/object:Gem::Dependency 
   requirement: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -128,11 +126,11 @@ dependencies:
         - 6
         - 1
         version: 0.6.1
-  type: :runtime
-  name: rack-test
   version_requirements: *id007
-- !ruby/object:Gem::Dependency 
+  name: rack-test
   prerelease: false
+  type: :runtime
+- !ruby/object:Gem::Dependency 
   requirement: &id008 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -144,11 +142,11 @@ dependencies:
         - 0
         - 0
         version: 1.0.0
-  type: :runtime
-  name: uglifier
   version_requirements: *id008
-- !ruby/object:Gem::Dependency 
+  name: uglifier
   prerelease: false
+  type: :runtime
+- !ruby/object:Gem::Dependency 
   requirement: &id009 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -160,11 +158,11 @@ dependencies:
         - 0
         - 2
         version: 1.0.2
-  type: :runtime
-  name: slim
   version_requirements: *id009
-- !ruby/object:Gem::Dependency 
+  name: slim
   prerelease: false
+  type: :runtime
+- !ruby/object:Gem::Dependency 
   requirement: &id010 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -176,11 +174,11 @@ dependencies:
         - 1
         - 0
         version: 3.1.0
-  type: :runtime
-  name: haml
   version_requirements: *id010
-- !ruby/object:Gem::Dependency 
+  name: haml
   prerelease: false
+  type: :runtime
+- !ruby/object:Gem::Dependency 
   requirement: &id011 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -192,11 +190,11 @@ dependencies:
         - 1
         - 7
         version: 3.1.7
-  type: :runtime
-  name: sass
   version_requirements: *id011
-- !ruby/object:Gem::Dependency 
+  name: sass
   prerelease: false
+  type: :runtime
+- !ruby/object:Gem::Dependency 
   requirement: &id012 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -208,11 +206,11 @@ dependencies:
         - 11
         - 3
         version: 0.11.3
-  type: :runtime
-  name: compass
   version_requirements: *id012
-- !ruby/object:Gem::Dependency 
+  name: compass
   prerelease: false
+  type: :runtime
+- !ruby/object:Gem::Dependency 
   requirement: &id013 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -224,11 +222,11 @@ dependencies:
         - 2
         - 0
         version: 2.2.0
-  type: :runtime
-  name: coffee-script
   version_requirements: *id013
-- !ruby/object:Gem::Dependency 
+  name: coffee-script
   prerelease: false
+  type: :runtime
+- !ruby/object:Gem::Dependency 
   requirement: &id014 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -240,43 +238,43 @@ dependencies:
         - 0
         - 0
         version: 2.0.0
-  type: :runtime
-  name: sprockets
   version_requirements: *id014
-- !ruby/object:Gem::Dependency 
+  name: sprockets
   prerelease: false
+  type: :runtime
+- !ruby/object:Gem::Dependency 
   requirement: &id015 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ~>
+    - - "="
       - !ruby/object:Gem::Version 
-        hash: 49
+        hash: 51
         segments: 
         - 0
         - 10
-        - 3
-        version: 0.10.3
-  type: :runtime
-  name: padrino-core
+        - 2
+        version: 0.10.2
   version_requirements: *id015
-- !ruby/object:Gem::Dependency 
+  name: padrino-core
   prerelease: false
+  type: :runtime
+- !ruby/object:Gem::Dependency 
   requirement: &id016 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ~>
+    - - "="
       - !ruby/object:Gem::Version 
-        hash: 49
+        hash: 51
         segments: 
         - 0
         - 10
-        - 3
-        version: 0.10.3
-  type: :runtime
-  name: padrino-helpers
+        - 2
+        version: 0.10.2
   version_requirements: *id016
-- !ruby/object:Gem::Dependency 
+  name: padrino-helpers
   prerelease: false
+  type: :runtime
+- !ruby/object:Gem::Dependency 
   requirement: &id017 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -288,11 +286,11 @@ dependencies:
         - 6
         - 2
         version: 0.6.2
-  type: :runtime
-  name: guard
   version_requirements: *id017
-- !ruby/object:Gem::Dependency 
+  name: guard
   prerelease: false
+  type: :runtime
+- !ruby/object:Gem::Dependency 
   requirement: &id018 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -304,11 +302,11 @@ dependencies:
         - 2
         - 0
         version: 0.2.0
-  type: :runtime
-  name: middleman-livereload
   version_requirements: *id018
-- !ruby/object:Gem::Dependency 
+  name: middleman-livereload
   prerelease: false
+  type: :runtime
+- !ruby/object:Gem::Dependency 
   requirement: &id019 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -320,11 +318,11 @@ dependencies:
         - 1
         - 1
         version: 0.1.1
-  type: :development
-  name: coffee-filter
   version_requirements: *id019
-- !ruby/object:Gem::Dependency 
+  name: coffee-filter
   prerelease: false
+  type: :development
+- !ruby/object:Gem::Dependency 
   requirement: &id020 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -336,11 +334,11 @@ dependencies:
         - 2
         - 0
         version: 2.2.0
-  type: :development
-  name: liquid
   version_requirements: *id020
-- !ruby/object:Gem::Dependency 
+  name: liquid
   prerelease: false
+  type: :development
+- !ruby/object:Gem::Dependency 
   requirement: &id021 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -352,11 +350,11 @@ dependencies:
         - 0
         - 2
         version: 1.0.2
-  type: :development
-  name: cucumber
   version_requirements: *id021
-- !ruby/object:Gem::Dependency 
+  name: cucumber
   prerelease: false
+  type: :development
+- !ruby/object:Gem::Dependency 
   requirement: &id022 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -368,11 +366,11 @@ dependencies:
         - 8
         - 7
         version: 0.8.7
-  type: :development
-  name: rake
   version_requirements: *id022
-- !ruby/object:Gem::Dependency 
+  name: rake
   prerelease: false
+  type: :development
+- !ruby/object:Gem::Dependency 
   requirement: &id023 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -384,9 +382,10 @@ dependencies:
         - 6
         - 0
         version: 2.6.0
-  type: :development
-  name: rspec
   version_requirements: *id023
+  name: rspec
+  prerelease: false
+  type: :development
 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
@@ -713,14 +712,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version 
-      hash: 25
+      hash: 3
       segments: 
-      - 1
-      - 3
-      - 1
-      version: 1.3.1
+      - 0
+      version: "0"
 requirements: []
 
 rubyforge_project: