merb-core 0.9.9 → 0.9.10

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

@@ -35,8 +35,53 @@ module Merb
     class NotCompiledError < StandardError; end;
     
     class << self
-      # @private
-      attr_accessor :routes, :named_routes, :resource_routes, :root_behavior
+      # An array containing all the application routes in order of
+      # priority.
+      # ---
+      # @api private
+      attr_accessor :routes
+      
+      # A hash containing all the named application routes. The names
+      # are absolute (as in, all routes named in a namespace will
+      # contain the name of the namespace).
+      # ---
+      # @api private
+      attr_accessor :named_routes
+      
+      # A hash of all the application resource routes. The key of the hash
+      # is an array with each element containing the "path" for the resource
+      # for example, given the following resource routes:
+      #
+      # resources :users do
+      #   resources :comments
+      # end
+      #
+      # The show comment route will have a key of ["User", "Comment"]
+      # ---
+      # @api private
+      attr_accessor :resource_routes
+      
+      # The starting point for route definition. Any route defined in a
+      # Merb::Router.prepare block will defined in context of this 
+      # behavior.
+      #
+      # ==== Examples
+      #
+      # Merb::Router.root_behavior = Merb::Router.root_bavior.match("/hello")
+      #
+      # In the previous example, all routes will have the path prefix /hello.
+      # It is important to note that this attribute must be set before any
+      # routes are defined in order for the behavior to be applied to the
+      # routes.
+      # ---
+      # @api plugin
+      attr_accessor :root_behavior
+      
+      # A block that will be run around route matching. This block must yield
+      # in order for the actual matching to happen.
+      # ---
+      # @api plugin
+      attr_accessor :around_match
       
       # Creates a route building context and evaluates the block in it. A
       # copy of +root_behavior+ (and instance of Behavior) is copied as
@@ -53,7 +98,7 @@ module Merb
       # ==== Returns
       # Merb::Router::
       #   Returns self to allow chaining of methods.
-      # 
+      # ---
       # @api public
       def prepare(first = [], last = [], &block)
         @routes = []
@@ -63,20 +108,6 @@ module Merb
         self
       end
       
-      # Appends route in the block to routing table.
-      # 
-      # @api public
-      def append(&block)
-        prepare(routes, [], &block)
-      end
-      
-      # Prepends routes in the block to routing table.
-      # 
-      # @api public
-      def prepend(&block)
-        prepare([], routes, &block)
-      end
-      
       # Clears the routing table. Route generation and request matching
       # won't work anymore until a new routing table is built.
       # 
@@ -85,7 +116,7 @@ module Merb
         class << self
           alias_method :match, :match_before_compilation
         end
-        self.routes, self.named_routes = [], {}
+        self.routes, self.named_routes, self.resource_routes = [], {}, {}
       end
       
       # Finds route matching URI of the request and returns a tuple of
@@ -101,8 +132,12 @@ module Merb
       #   are :controller, :action and all the named segments of the route.
       # 
       # @api private
-      def route_for(request) #:nodoc:
-        index, params = match(request)
+      def route_for(request)
+        index, params = if @around_match
+          send(@around_match, request) { match(request) }
+        else
+          match(request)
+        end
         route = routes[index] if index
         if !route
           raise ControllerExceptions::NotFound, 
@@ -181,8 +216,8 @@ module Merb
       # end
       #
       # url(:articles, 2008, 10, "test_article")
-      #
-      # @api private
+      # ---
+      # @api plugin
       def url(name, *args)
         unless name.is_a?(Symbol)
           args.unshift(name)
@@ -211,8 +246,8 @@ module Merb
       #
       # ==== Returns
       # String:: The generated URL
-      # 
-      # @api private
+      # ---
+      # @api plugin
       def resource(*args)
         defaults = args.pop
         options  = extract_options_from_args!(args) || {}
@@ -266,7 +301,7 @@ module Merb
       #     # ... routes come here ...
       #   end
       # end
-      #
+      # ---
       # @api public
       def extensions(&block)
         Router::Behavior.class_eval(&block)
@@ -275,7 +310,7 @@ module Merb
     private
     
       # Compiles the routes and creates the +match+ method.
-      # 
+      # ---
       # @api private
       def compile
         if routes.any?
@@ -287,7 +322,7 @@ module Merb
       
       # Generates the method for evaluation defining a +match+ method to match
       # a request with the defined routes.
-      # 
+      # ---
       # @api private
       def compiled_statement
         @compiler_mutex.synchronize do

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

@@ -73,19 +73,22 @@ module Merb
         match_opts = options.except(*resource_options)
         options    = options.only(*resource_options)
         singular   = options[:singular] ? options[:singular].to_s : Extlib::Inflection.singularize(name)
-        klass_name = args.first ? args.first.to_s : Extlib::Inflection.classify(singular)
-        klass      = Object.full_const_get(klass_name) rescue nil
+        klass_name = args.first ? args.first.to_s : singular.to_const_string
         keys       = options.delete(:keys) || options.delete(:key)
         params     = { :controller => options.delete(:controller) || name }
         collection = options.delete(:collection) || {}
         member     = { :edit => :get, :delete => :get }.merge(options.delete(:member) || {})
         
         # Use the identifier for the class as a default
-        if klass
-          keys ||= options[:identify]
-          keys ||= @identifiers[klass]
-        elsif options[:identify]
-          raise Error, "The constant #{klass_name} does not exist, please specify the constant for this resource"
+        begin
+          if klass = Object.full_const_get(klass_name)
+            keys ||= options[:identify]
+            keys ||= @identifiers[klass]
+          elsif options[:identify]
+            raise Error, "The constant #{klass_name} does not exist, please specify the constant for this resource"
+          end
+        rescue NameError => e
+          Merb.logger.debug!("Could not find resource model #{klass_name}")
         end
         
         keys = [ keys || :id ].flatten

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

@@ -424,6 +424,8 @@ module Merb
           segments << match[2].intern
           path = match.post_match
         end
+        
+        raise Router::Behavior::Error, "cannot use :path as a route placeholder" if segments.include?(:path)
 
         segments << path unless path.empty?
         segments

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

@@ -19,7 +19,7 @@ module Merb
   end # Config
   
   # The Merb::Session module gets mixed into Merb::SessionContainer to allow
-  # app-level functionality (usually found in app/models/merb/session.rb) for
+  # app-level functionality (usually found in ./merb/session/session.rb) for
   # session.
   #
   # You can use this module to implement additional methods to simplify
@@ -38,7 +38,7 @@ module Merb
   #                           session data; min. 16 chars
   #
   # :default_cookie_domain    The default domain to write cookies for.
-  module Session
+  module Session    
   end
   
   # This is mixed into Merb::Controller on framework boot.

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

@@ -154,7 +154,7 @@ module Merb
           Merb::Server.remove_pid(port)
         end
 
-        Merb::Worker.start
+        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

data/lib/merb-core/tasks/gem_management.rb

@@ -189,7 +189,7 @@ module GemManagement
       options[:version] = Gem::Requirement.new ["= #{options[:version]}"]
     end
     update_source_index(options[:install_dir]) if options[:install_dir]
-    Gem::Uninstaller.new(gem, options).uninstall
+    Gem::Uninstaller.new(gem, options).uninstall rescue nil
   end
 
   def clobber(source_dir)
@@ -251,7 +251,7 @@ module GemManagement
         gemspecs = ::Gem.source_index.search(dep)
         local = gemspecs.reverse.find { |s| s.loaded_from.index(gem_dir) == 0 }
         if local
-          local_specs  << local
+          local_specs << local
         elsif gemspecs.last
           system_specs << gemspecs.last
         else
@@ -259,6 +259,15 @@ module GemManagement
         end
       end
       ::Gem.clear_paths
+    else
+      dependencies.each do |dep|
+        gemspecs = ::Gem.source_index.search(dep)
+        if gemspecs.last
+          system_specs << gemspecs.last
+        else
+          missing_deps << dep
+        end
+      end
     end
     [system_specs, local_specs, missing_deps]
   end
@@ -307,9 +316,12 @@ end
 if File.directory?(gems_dir = File.join(Dir.pwd, 'gems')) ||
    File.directory?(gems_dir = File.join(File.dirname(__FILE__), '..', 'gems'))
   $BUNDLE = true; Gem.clear_paths; Gem.path.unshift(gems_dir)
+  if (local_gem = Dir[File.join(gems_dir, "specifications", "#{spec.name}-*.gemspec")].last)
+    version = File.basename(local_gem)[/-([\\.\\d]+)\\.gemspec$/, 1]
+  end
 end
 
-version = "#{Gem::Requirement.default}"
+version ||= "#{Gem::Requirement.default}"
 
 if ARGV.first =~ /^_(.*)_$/ and Gem::Version.correct? $1 then
   version = $1

data/lib/merb-core/test/helpers/request_helper.rb

@@ -51,6 +51,10 @@ module Merb
 
         @__cookie__ = rack.headers["Set-Cookie"] && rack.headers["Set-Cookie"].join
 
+        Merb::Dispatcher.work_queue.size.times do
+          Merb::Dispatcher.work_queue.pop.call
+        end
+
         rack
       end
       alias requesting request

data/lib/merb-core/test/tasks/spectasks.rb

@@ -28,6 +28,16 @@ namespace :spec do
     end
   end
 
+  desc "Run all request specs, run a spec for a specific Request with REQUEST=MyRequest"
+  Spec::Rake::SpecTask.new('request') do |t|
+    t.spec_opts = SPEC_OPTS
+    if(ENV['REQUEST'])
+      t.spec_files = Dir["spec/requests/**/#{ENV['REQUEST']}_spec.rb"].sort
+    else    
+      t.spec_files = Dir['spec/requests/**/*_spec.rb'].sort
+    end
+  end
+  
   desc "Run all controller specs, run a spec for a specific Controller with CONTROLLER=MyController"
   Spec::Rake::SpecTask.new('controller') do |t|
     t.spec_opts = SPEC_OPTS

data/lib/merb-core/test/test_ext/rspec.rb

@@ -42,11 +42,6 @@ module Merb
       include ::Merb::Test::RouteHelper
       include ::Merb::Test::ControllerHelper
 
-      def initialize(defined_description, &implementation)
-        @_defined_description = defined_description
-        @_implementation = implementation
-      end
-
       class << self
         # This is a copy of the method in rspec, so we can have
         # describe "...", :when => "logged in", and the like

data/lib/merb-core/version.rb

@@ -1,3 +1,3 @@
 module Merb
-  VERSION = '0.9.9' unless defined?(Merb::VERSION)
+  VERSION = '0.9.10' unless defined?(Merb::VERSION)
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: merb-core
 version: !ruby/object:Gem::Version 
-  version: 0.9.9
+  version: 0.9.10
 platform: ruby
 authors: 
 - Ezra Zygmuntowicz
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-10-13 00:00:00 +03:00
+date: 2008-10-21 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -30,7 +30,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: "0"
+        version: 2.6.2
     version: 
 - !ruby/object:Gem::Dependency 
   name: rake
@@ -255,7 +255,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: 
 - install the json gem to get faster json parsing
 rubyforge_project: 
-rubygems_version: 1.2.0
+rubygems_version: 1.3.0
 signing_key: 
 specification_version: 2
 summary: Merb. Pocket rocket web framework.