middleman-core 4.3.0.rc.2 → 4.3.0.rc.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 407a6cefc4af923494308fd89533f224e4a41ace633f3047443481148181d5fc
-  data.tar.gz: fa06797e795bf36af4fd50b2174f6de794eb11aaa40f1ed39b242852181188ef
+  metadata.gz: 6c755cc316fdd5d11efdeef58e9440a0897200ff15834a7d49150c78ddf7d937
+  data.tar.gz: 5afadb54e42bbc0da7ee549c955473dd81b66f1b9dc35db6e0a3068d533b5e22
 SHA512:
-  metadata.gz: 129679da5f716ac7a5bc64b8928fe0211add698897af3875f57b32f0f89c3bedf0bf11b08f9ba15d7454eb208e7d9cc5c81befd1a71fb624471ac518afb839b4
-  data.tar.gz: bedf2d6090c39aa9aa0159d2b31a99b88317fe64252adf6da06222f57f0300b234b87559b5da8a50805d261230ecc8d2b2be7c0dacf7539f2037adc03eb8ea81
+  metadata.gz: 34a69f552839aa11d2e0dc963c30c748c7e8f176dc35a890f4bc89548e061f13f0002ee0204a852a96d39eebd0609f3b8fd21f097c04e43e31e87e3651767bdf
+  data.tar.gz: 286fd44a9b7f7d1842b4597d8406e0042a7456ede287e7aa8e369bfb6a540f7dc815b9b51c4fed86150da53aa936480ede6214cc5ab169878686b8b376d65469

data/lib/middleman-core/builder.rb

@@ -133,8 +133,37 @@ module Middleman
 
     Contract ResourceList => ResourceList
     def output_resources(resources)
+      res_count = resources.count
+
+      return resources if res_count.zero?
+
       results = if @parallel
-                  ::Parallel.map(resources, &method(:output_resource))
+                  processes = ::Parallel.processor_count
+                  processes = processes < res_count ? processes : res_count
+                  min_parts = res_count / processes
+                  remainder = res_count % processes
+                  offset = 0
+                  ranges = []
+
+                  while offset < res_count
+                    end_r = offset + min_parts
+
+                    if remainder.positive?
+                      end_r += 1
+                      remainder -= 1
+                    end
+
+                    range = offset...end_r
+                    offset = end_r
+                    ranges << range
+                  end
+
+                  outputs = Parallel.map(ranges, in_processes: processes) do |r|
+                    resources[r].map!(&method(:output_resource))
+                  end
+
+                  outputs.flatten!
+                  outputs
                 else
                   resources.map(&method(:output_resource))
                 end

data/lib/middleman-core/load_paths.rb

@@ -34,7 +34,10 @@ module Middleman
       raise "Couldn't find your Gemfile. Middleman projects require a Gemfile for specifying dependencies." unless File.exist?(ENV['BUNDLE_GEMFILE'])
 
       require 'bundler/setup'
-      Bundler.require
+      Bundler.require(
+        :default,
+        (ENV['MM_ENV'] || ENV['RACK_ENV'] || 'development').to_sym
+      )
     end
 
     # Recursive method to find a file in parent directories

data/lib/middleman-core/preview_server.rb

@@ -201,8 +201,8 @@ module Middleman
 
         # Add in the meta pages application
         meta_app = Middleman::MetaPages::Application.new(app)
-        app.map '/__middleman' do
-          run meta_app
+        app.map '/__middleman' do |rack|
+          rack.run meta_app
         end
 
         app

data/lib/middleman-core/version.rb

@@ -1,5 +1,5 @@
 module Middleman
   # Current Version
   # @return [String]
-  VERSION = '4.3.0.rc.2'.freeze unless const_defined?(:VERSION)
+  VERSION = '4.3.0.rc.3'.freeze unless const_defined?(:VERSION)
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: middleman-core
 version: !ruby/object:Gem::Version
-  version: 4.3.0.rc.2
+  version: 4.3.0.rc.3
 platform: ruby
 authors:
 - Thomas Reynolds
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-10-03 00:00:00.000000000 Z
+date: 2018-10-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler