merb-core 1.0.10 → 1.0.11

data/Rakefile

@@ -352,7 +352,7 @@ def contributors(since_release = nil)
   git_log(since_release).split("\n").uniq.sort
 end
 
-PREVIOUS_RELEASE = '0.9.9'
+PREVIOUS_RELEASE = '0.9.10'
 namespace :history do
   namespace :update do
     desc "updates contributors list"

data/lib/merb-core/constants.rb

@@ -38,7 +38,7 @@ module Merb
     JSON_MIME_TYPE_REGEXP    = %r{^application/json|^text/x-json}.freeze
     XML_MIME_TYPE_REGEXP     = %r{^application/xml|^text/xml}.freeze
     FORM_URL_ENCODED_REGEXP  = %r{^application/x-www-form-urlencoded}.freeze
-    LOCAL_IP_REGEXP          = /^unknown$|^(127|10|172\.16|192\.168)\./i.freeze
+    LOCAL_IP_REGEXP          = /^unknown$|^(127|10|172\.16|192\.168)\.|^(172\.(1[6-9]|2[0-9]|3[0-1]))\.|^(169\.254)\./i.freeze
     XML_HTTP_REQUEST_REGEXP  = /XMLHttpRequest/i.freeze
     UPCASE_CONTENT_TYPE      = 'CONTENT_TYPE'.freeze
     CONTENT_TYPE             = "Content-Type".freeze

data/lib/merb-core/core_ext/kernel.rb

@@ -436,7 +436,7 @@ module Kernel
   #
   # :api: public
   def extract_options_from_args!(args)
-    args.pop if Hash === args.last
+    args.pop if (args.last.instance_of?(Hash) || args.last.instance_of?(Mash))
   end
 
   # Checks that the given objects quack like the given conditions.

data/lib/merb-core/dispatch/router/route.rb

@@ -183,7 +183,7 @@ module Merb
       def identifier_for(obj)
         return if obj.is_a?(String)    || obj.is_a?(Symbol)     || obj.is_a?(Numeric)  ||
                   obj.is_a?(TrueClass) || obj.is_a?(FalseClass) || obj.is_a?(NilClass) ||
-                  obj.is_a?(Array)     || obj.is_a?(Hash)
+                  obj.is_a?(Array)     || obj.instance_of?(Hash)
         
         @identifiers.each do |klass, identifier|
           return identifier if obj.is_a?(klass)

data/lib/merb-core/rack/adapter/abstract.rb

@@ -152,13 +152,14 @@ module Merb
                 pid, status = @pids[port + i], nil
                 poller = Merb::System::PortablePoller.new(pid)
                 begin
-                  i = 0
+                  tick = 1
                   loop do                    
                     # Watch for the pid to exit.
                     _, status = Process.wait2(pid, Process::WNOHANG)
                     break if status
                     
-                    if (i % 120 == 0) && Merb::Config[:max_memory] && poller.memory > Merb::Config[:max_memory]
+                    if (tick % 120 == 0) && Merb::Config[:max_memory] && poller.memory > Merb::Config[:max_memory]
+                      tick = 1
                       Process.kill("INT", pid)
                       if (Process.kill(0, pid) rescue false)
                         sleep Merb::Config[:hang_time] || 5
@@ -169,7 +170,7 @@ module Merb
                       status = Struct.new(:exitstatus).new(nil)
                       break
                     end
-                    i += 1
+                    tick += 1
                     sleep 0.25
                   end
 

data/lib/merb-core/version.rb

@@ -1,5 +1,5 @@
 module Merb
-  VERSION    = '1.0.10'  unless defined?(Merb::VERSION)
-  DM_VERSION = '0.9.10' unless defined?(Merb::DM_VERSION)
+  VERSION    = '1.0.11'  unless defined?(Merb::VERSION)
+  DM_VERSION = '0.9.11' unless defined?(Merb::DM_VERSION)
   DO_VERSION = '0.9.11' unless defined?(Merb::DO_VERSION)
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: merb-core
 version: !ruby/object:Gem::Version 
-  version: 1.0.10
+  version: 1.0.11
 platform: ruby
 authors: 
 - Ezra Zygmuntowicz
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-03-18 00:00:00 -07:00
+date: 2009-03-31 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency