middleman 2.0.0.rc7 → 2.0.0.rc8

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (4) hide show
  1. data/lib/middleman/core_extensions/routing.rb +3 -1
  2. data/lib/middleman/guard.rb +1 -0
  3. data/lib/middleman/version.rb +1 -1
  4. metadata +2 -2
data/lib/middleman/core_extensions/routing.rb CHANGED
@@ -48,9 +48,11 @@ module Middleman::CoreExtensions::Routing
48
48
 
49
49
  options[:layout] = settings.layout if options[:layout].nil?
50
50
 
51
+ has_block = block_given?
52
+
51
53
  paths.each do |p|
52
54
  get(p) do
53
- return yield if block_given?
55
+ instance_eval(&block) if has_block
54
56
  process_request(options)
55
57
  end
56
58
  end
data/lib/middleman/guard.rb CHANGED
@@ -12,6 +12,7 @@ module Middleman::Guard
12
12
  guardfile_contents = %Q{
13
13
  guard 'middleman'#{options_hash} do
14
14
  watch("config.rb")
15
+ watch(%r{^lib/^[^\.](.*)\.rb$})
15
16
  end
16
17
  }
17
18
 
data/lib/middleman/version.rb CHANGED
@@ -1,3 +1,3 @@
1
1
  module Middleman
2
- VERSION = "2.0.0.rc7"
2
+ VERSION = "2.0.0.rc8"
3
3
  end
metadata CHANGED
@@ -2,7 +2,7 @@
2
2
  name: middleman
3
3
  version: !ruby/object:Gem::Version
4
4
  prerelease: 6
5
- version: 2.0.0.rc7
5
+ version: 2.0.0.rc8
6
6
  platform: ruby
7
7
  authors:
8
8
  - Thomas Reynolds
@@ -10,7 +10,7 @@ autorequire:
10
10
  bindir: bin
11
11
  cert_chain: []
12
12
 
13
- date: 2011-07-16 00:00:00 -07:00
13
+ date: 2011-07-21 00:00:00 -07:00
14
14
  default_executable:
15
15
  dependencies:
16
16
  - !ruby/object:Gem::Dependency