From e4b7d4fff0339180595e41cf33474299c0cf094e Mon Sep 17 00:00:00 2001 From: Thomas Reynolds Date: Sat, 7 Feb 2015 13:38:29 -0800 Subject: [PATCH] begin prepping beta.1 --- middleman-cli/lib/middleman-cli/init.rb | 2 +- middleman-core/lib/middleman-core/core_extensions/data.rb | 2 +- .../lib/middleman-core/sitemap/extensions/proxies.rb | 6 +++--- middleman-core/lib/middleman-core/sources/source_watcher.rb | 2 +- .../lib/middleman-core/util/hash_with_indifferent_access.rb | 1 - middleman-core/lib/middleman-core/version.rb | 2 +- middleman-core/middleman-core.gemspec | 2 +- 7 files changed, 8 insertions(+), 9 deletions(-) diff --git a/middleman-cli/lib/middleman-cli/init.rb b/middleman-cli/lib/middleman-cli/init.rb index 8dd54aa6..7e9f7810 100644 --- a/middleman-cli/lib/middleman-cli/init.rb +++ b/middleman-cli/lib/middleman-cli/init.rb @@ -47,7 +47,7 @@ module Middleman::Cli end dir = Dir.mktmpdir - + begin branch_cmd = repo_branch ? "-b #{repo_branch} " : '' diff --git a/middleman-core/lib/middleman-core/core_extensions/data.rb b/middleman-core/lib/middleman-core/core_extensions/data.rb index c2fad38c..0fe506ad 100644 --- a/middleman-core/lib/middleman-core/core_extensions/data.rb +++ b/middleman-core/lib/middleman-core/core_extensions/data.rb @@ -187,7 +187,7 @@ module Middleman end def key?(key) - ( @local_data.keys + @local_sources.keys + @callback_sources.keys ).include?(key.to_s) + (@local_data.keys + @local_sources.keys + @callback_sources.keys).include?(key.to_s) end alias_method :has_key?, :key? diff --git a/middleman-core/lib/middleman-core/sitemap/extensions/proxies.rb b/middleman-core/lib/middleman-core/sitemap/extensions/proxies.rb index 90bff4fc..07c99e0f 100644 --- a/middleman-core/lib/middleman-core/sitemap/extensions/proxies.rb +++ b/middleman-core/lib/middleman-core/sitemap/extensions/proxies.rb @@ -71,9 +71,9 @@ module Middleman ProxyResource.new(app.sitemap, path, target).tap do |p| md = metadata.dup p.add_metadata( - locals: md.delete(:locals) || {}, - page: md.delete(:data) || {}, - options: md + locals: md.delete(:locals) || {}, + page: md.delete(:data) || {}, + options: md ) end end diff --git a/middleman-core/lib/middleman-core/sources/source_watcher.rb b/middleman-core/lib/middleman-core/sources/source_watcher.rb index faea6874..e7a83012 100644 --- a/middleman-core/lib/middleman-core/sources/source_watcher.rb +++ b/middleman-core/lib/middleman-core/sources/source_watcher.rb @@ -274,7 +274,7 @@ module Middleman types = Set.new([@type]) ::Middleman::SourceFile.new( - path.relative_path_from(@directory), path, @directory, types) + path.relative_path_from(@directory), path, @directory, types) end # Notify callbacks for a file given an array of callbacks diff --git a/middleman-core/lib/middleman-core/util/hash_with_indifferent_access.rb b/middleman-core/lib/middleman-core/util/hash_with_indifferent_access.rb index a401e0f1..81aadcfd 100644 --- a/middleman-core/lib/middleman-core/util/hash_with_indifferent_access.rb +++ b/middleman-core/lib/middleman-core/util/hash_with_indifferent_access.rb @@ -81,7 +81,6 @@ module Middleman self[method] end end - end end end diff --git a/middleman-core/lib/middleman-core/version.rb b/middleman-core/lib/middleman-core/version.rb index 898eca97..960a86d7 100644 --- a/middleman-core/lib/middleman-core/version.rb +++ b/middleman-core/lib/middleman-core/version.rb @@ -1,5 +1,5 @@ module Middleman # Current Version # @return [String] - VERSION = '4.0.0.alpha.6' unless const_defined?(:VERSION) + VERSION = '4.0.0.beta.1' unless const_defined?(:VERSION) end diff --git a/middleman-core/middleman-core.gemspec b/middleman-core/middleman-core.gemspec index 420b5b51..9de55b25 100644 --- a/middleman-core/middleman-core.gemspec +++ b/middleman-core/middleman-core.gemspec @@ -51,5 +51,5 @@ Gem::Specification.new do |s| s.add_dependency('execjs', ['~> 2.0']) # Testing - s.add_dependency('contracts', ['~> 0.4']) + s.add_dependency('contracts', ['~> 0.5.0']) end