merb-core 1.0.12 → 1.0.13

data/Rakefile

@@ -66,7 +66,7 @@ spec = Gem::Specification.new do |s|
   s.add_dependency "rspec"
   s.add_dependency "rack"
   s.add_dependency "mime-types"
-  s.add_dependency "thor", ">= 0.9.9"
+  s.add_dependency "thor", "~> 0.9.9"
   # this escalates to "regular" dependencies, comment it out
   # for now. RubyGems need some love.
   #s.add_development_dependency "libxml-ruby"

data/lib/merb-core/bootloader.rb

@@ -1269,6 +1269,8 @@ class Merb::BootLoader::ChooseAdapter < Merb::BootLoader
   #
   # :api: plugin
   def self.run
+    # Check if we running in IRB if so run IRB adapter
+    Merb::Config[:adapter] = 'irb' if Merb.running_irb?
     Merb.adapter = Merb::Rack::Adapter.get(Merb::Config[:adapter])
   end
 end
@@ -1307,6 +1309,19 @@ class Merb::BootLoader::RackUpApplication < Merb::BootLoader
   end
 end
 
+class Merb::BootLoader::BackgroundServices < Merb::BootLoader
+  # Start background services, such as the run_later worker thread.
+  #
+  # ==== Returns
+  # nil
+  #
+  # :api: plugin
+  def self.run
+    Merb::Worker.start unless Merb.testing? || Merb::Worker.started?
+    nil
+  end
+end
+
 class Merb::BootLoader::ReloadClasses < Merb::BootLoader
 
   class TimedExecutor

data/lib/merb-core/config.rb

@@ -151,6 +151,10 @@ module Merb
       #
       # :api: private
       def setup(settings = {})
+        # Merge new settings with any existing configuration settings
+        settings = @configuration.merge(settings) unless @configuration.nil?
+        
+        # Merge new settings with default settings
         config = defaults.merge(settings)
         
         unless config[:reload_classes]

data/lib/merb-core/core_ext.rb

@@ -1,7 +1,7 @@
 begin
   require "extlib"
 rescue LoadError => e
-  puts "Merb-core 0.9.4 and later uses extlib for Ruby core class extensions. Install it from github.com/sam/extlib."
+  puts "Merb-core 0.9.4 and later uses extlib for Ruby core class extensions. Install it from github.com/datamapper/extlib."
   exit
 end
 

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

@@ -303,7 +303,7 @@ module Merb
       # r<Behavior>:: +optional+ - The to behavior object.
       # 
       # ==== Returns
-      # Route:: It registers a new route and returns it.
+      # Behavior:: The route definition behavior defining the created route
       # 
       # ==== Examples
       #   match('/:controller/:id).to(:action => 'show')

data/lib/merb-core/dispatch/session/cookie.rb

@@ -148,6 +148,36 @@ module Merb
     def generate_digest(data)
       OpenSSL::HMAC.hexdigest(DIGEST, @secret, data)
     end
+
+    # Securely compare two digests using a constant time algorithm.
+    # This avoids leaking information about the calculated HMAC
+    #
+    # Based on code by Michael Koziarski <michael@koziarski.com>
+    # http://github.com/rails/rails/commit/674f780d59a5a7ec0301755d43a7b277a3ad2978
+    #
+    # ==== Parameters
+    # a, b<~to_s>:: digests to compare.
+    #
+    # ==== Returns
+    # Boolean:: Do the digests validate?
+    def secure_compare(a, b)
+      if a.length == b.length
+
+        # unpack to forty characters.
+        # needed for 1.8 and 1.9 compat
+        a_bytes = a.unpack('C*')
+        b_bytes = b.unpack('C*')
+
+        result = 0
+        for i in 0..(a_bytes.length - 1)
+          result |= a_bytes[i] ^ b_bytes[i]
+        end
+        result == 0
+      else
+        false
+      end
+    end
+
     
     # Unmarshal cookie data to a hash and verify its integrity.
     # 
@@ -167,7 +197,7 @@ module Merb
       else
         data, digest = Merb::Parse.unescape(cookie).split('--')
         return {} if data.blank? || digest.blank?
-        unless digest == generate_digest(data)
+        unless secure_compare(generate_digest(data), digest)
           clear
           unless Merb::Config[:ignore_tampered_cookies]
             raise TamperedWithCookie, "Maybe the site's session_secret_key has changed?"

data/lib/merb-core/dispatch/worker.rb

@@ -21,6 +21,14 @@ module Merb
         end
         @worker
       end      
+
+      # ==== Returns
+      # Whether the Merb::Worker instance is already started.
+      #
+      # :api: private
+      def started?
+        !@worker.nil?
+      end
     end
     
     # Creates a new worker thread that loops over the work queue.

data/lib/merb-core/logger.rb

@@ -16,7 +16,9 @@ end
 # ==== Public Merb Logger API
 #
 # To replace an existing logger with a new one:
-#  Merb::Logger.set_log(log{String, IO},level{Symbol, String})
+#  Merb.logger.set_log(log{String, IO},level{Symbol, String})
+#  for example:
+#  Merb.logger.set_log($stdout, Merb::Logger::Levels[:fatal])
 #
 # Available logging levels are
 #   Merb::Logger::{ Fatal, Error, Warn, Info, Debug }

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

@@ -217,8 +217,6 @@ module Merb
           Merb::Server.remove_pid(port)
         end
 
-        Merb::Worker.start unless Merb.testing?
-
         # If Merb is daemonized, trap INT. If it's not daemonized,
         # we let the master process' ctrl-c control the cluster
         # of workers.

data/lib/merb-core/test/matchers.rb

@@ -7,8 +7,8 @@ require "merb-core/test/matchers/request_matchers"
 Merb::Test::ControllerHelper.send(:include, Merb::Test::Rspec::ControllerMatchers)
 Merb::Test::RouteHelper.send(:include, Merb::Test::Rspec::RouteMatchers)
 
-if defined?(::Webrat)
-  module Merb::Test::ViewHelper
+module Merb::Test::ViewHelper
+  if defined?(::Webrat)
     include ::Webrat::Matchers
     include ::Webrat::HaveTagMatcher
   end

data/lib/merb-core/version.rb

@@ -1,5 +1,5 @@
 module Merb
-  VERSION    = '1.0.12' unless defined?(Merb::VERSION)
-  DM_VERSION = '0.9.11' unless defined?(Merb::DM_VERSION)
-  DO_VERSION = '0.9.11' unless defined?(Merb::DO_VERSION)
+  VERSION    = '1.0.13' unless defined?(Merb::VERSION)
+  DM_VERSION = '0.10' unless defined?(Merb::DM_VERSION)
+  DO_VERSION = '0.10' unless defined?(Merb::DO_VERSION)
 end

data/lib/merb-core.rb

@@ -154,6 +154,9 @@ module Merb
         Merb::Config.parse_args(argv)
       end
 
+      # Keep information that we run inside IRB to guard it against overriding in init.rb
+      @running_irb = Merb::Config[:adapter] == 'irb'
+
       Merb::Config[:log_stream] = STDOUT
       
       Merb.environment = Merb::Config[:environment]
@@ -786,6 +789,11 @@ module Merb
     def run_later(&blk)
       Merb::Dispatcher.work_queue << blk
     end
+
+    # :api: private
+    def running_irb?
+      @running_irb
+    end
   end
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: merb-core
 version: !ruby/object:Gem::Version 
-  version: 1.0.12
+  version: 1.0.13
 platform: ruby
 authors: 
 - Ezra Zygmuntowicz
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-06-30 00:00:00 -07:00
+date: 2009-11-03 00:00:00 +00:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -88,7 +88,7 @@ dependencies:
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
         version: 0.9.9
     version: 
@@ -240,7 +240,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: 
 - install the json gem to get faster json parsing
 rubyforge_project: 
-rubygems_version: 1.3.2
+rubygems_version: 1.3.5
 signing_key: 
 specification_version: 3
 summary: Merb. Pocket rocket web framework.