merb-core 1.0 → 1.0.1

data/Rakefile

@@ -187,6 +187,8 @@ def setup_specs(name, spec_cmd='spec', run_opts = "-c")
   except += Dir["spec/**/memcache*_spec.rb"] if ENV['MEMCACHED'] == 'no'
 
   public_globs = Dir["#{Dir.pwd}/spec/public/**/*_spec.rb"].reject{|file| file.include?('/gems/')}
+  public_globs_10 = 
+    Dir["#{Dir.pwd}/spec10/public/**/*_spec.rb"].reject{|file| file.include?('/gems/')}
 
   private_globs = Dir["#{Dir.pwd}/spec/private/**/*_spec.rb"]
 
@@ -197,6 +199,12 @@ def setup_specs(name, spec_cmd='spec', run_opts = "-c")
     run_specs(globs, spec_cmd, ENV['RSPEC_OPTS'] || run_opts, except)
   end
   
+  task "specs:oneoh" do
+    require "lib/merb-core/test/run_specs"
+    globs = public_globs_10
+    run_specs(globs, spec_cmd, ENV['RSPEC_OPTS'] || run_opts, except)
+  end
+  
   desc "Run private specs (#{name})"
   task "specs:#{name}:private" do
     require "lib/merb-core/test/run_specs"

data/lib/merb-core/controller/template.rb

@@ -129,9 +129,10 @@ module Merb::Template
       full_file_path = File.expand_path(io.path)
       engine_neutral_path = full_file_path.gsub(/\.[^\.]*$/, "")
       
-      SUPPORTED_LOCALS_LIST[engine_neutral_path] |= locals unless locals.empty?
+      local_list = (SUPPORTED_LOCALS_LIST[engine_neutral_path] |= locals)
       ret = METHOD_LIST[engine_neutral_path] =
-        engine_for(full_file_path).compile_template(io, template_name(full_file_path), locals, mod)
+        engine_for(full_file_path).compile_template(io, 
+        template_name(full_file_path), local_list, mod)
         
       io.close
       ret

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

@@ -34,7 +34,7 @@ module Kernel
 
     new_dep
   end
-  
+
   # Loads the given string as a gem. Execution is deferred until
   # after the logger has been instantiated and the framework directory
   # structure is defined.
@@ -49,16 +49,70 @@ module Kernel
   #   If the last argument is a Hash, extract the :immediate option,
   #   forcing a dependency to load immediately.
   #
+  # ==== Options
+  #
+  # :immediate   when true, gem is loaded immediately even if framework is not yet ready.
+  # :require_as  file name to require for this gem.
+  #
+  # See examples below.
+  #
+  # ==== Notes
+  #
+  # If block is given, it is called after require is called. If you use a block to
+  # require multiple files, require first using :require_as option and the rest
+  # in the block.
+  #
+  # ==== Examples
+  #
+  # Usage scenario is typically one of the following:
+  #
+  # 1. Gem name and loaded file names are the same (ex.: amqp gem uses amqp.rb).
+  #    In this case no extra options needed.
+  #
+  # dependency "amqp"
+  #
+  # 2. Gem name is different from the file needs to be required
+  #    (ex.: ParseTree gem uses parse_tree.rb as main file).
+  #
+  # dependency "ParseTree", :require_as => "parse_tree"
+  #
+  # 3. You need to require a number of files from the library explicitly
+  #    (ex.: cherry pick features from xmpp4r). Pass an array to :require_as.
+  #
+  # dependency "xmpp4r", :require_as => %w(xmpp4r/client xmpp4r/sasl xmpp4r/vcard)
+  #
+  # 4. You need to require a specific version of the gem.
+  #
+  # dependency "RedCloth", "3.0.4"
+  #
+  # 5. You want to load dependency as soon as the method is called.
+  #
+  # dependency "syslog", :immediate => true
+  #
+  # 6. You need to execute some arbitraty code after dependency is loaded:
+  #
+  # dependency "ruby-growl" do
+  #   g = Growl.new "localhost", "ruby-growl",
+  #              ["ruby-growl Notification"]
+  #   g.notify "ruby-growl Notification", "Ruby-Growl is set up",
+  #         "Ruby-Growl is set up"
+  # end
+  #
+  # When specifying a gem version to use, you can use the same syntax RubyGems
+  # support, for instance, >= 3.0.2 or >~ 1.2.
+  #
+  # See rubygems.org/read/chapter/16 for a complete reference.
+  #
   # ==== Returns
   # Gem::Dependency:: The dependency information.
   #
   # :api: public
-  def dependency(name, *ver, &blk)
-    immediate = ver.last.delete(:immediate) if ver.last.is_a?(Hash)
+  def dependency(name, *opts, &blk)
+    immediate = opts.last.delete(:immediate) if opts.last.is_a?(Hash)
     if immediate || Merb::BootLoader.finished?(Merb::BootLoader::Dependencies)
-      load_dependency(name, *ver, &blk)
+      load_dependency(name, *opts, &blk)
     else
-      track_dependency(name, *ver, &blk)
+      track_dependency(name, *opts, &blk)
     end
   end
 

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

@@ -37,14 +37,14 @@ module Merb
     class << self
       # 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
       
@@ -57,7 +57,7 @@ module Merb
       # end
       #
       # The show comment route will have a key of ["User", "Comment"]
-      # ---
+      # 
       # :api: private
       attr_accessor :resource_routes
       
@@ -73,13 +73,13 @@ module Merb
       # 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
       
@@ -98,7 +98,7 @@ module Merb
       # ==== Returns
       # Merb::Router::
       #   Returns self to allow chaining of methods.
-      # ---
+      # 
       # :api: public
       def prepare(first = [], last = [], &block)
         @routes = []
@@ -216,7 +216,7 @@ module Merb
       # end
       #
       # url(:articles, 2008, 10, "test_article")
-      # ---
+      # 
       # :api: plugin
       def url(name, *args)
         if name.is_a?(Route)
@@ -250,7 +250,7 @@ module Merb
       #
       # ==== Returns
       # String:: The generated URL
-      # ---
+      # 
       # :api: plugin
       def resource(*args)
         defaults = args.pop
@@ -289,23 +289,23 @@ module Merb
       # nil
       #
       # ==== Example
-      # Merb::Router.extensions do
-      #   def domain(name, domain, options={}, &block)
-      #     match(:domain => domain).namespace(name, :path => nil, &block)
+      #   Merb::Router.extensions do
+      #     def domain(name, domain, options={}, &block)
+      #       match(:domain => domain).namespace(name, :path => nil, &block)
+      #     end
       #   end
-      # end
       #
       # In this case, a method 'domain' will be available to the route builder
       # which will create namespaces around domains instead of path prefixes.
       #
       # This can then be used as follows.
       #
-      # Merb::Router.prepare do
-      #   domain(:admin, "my-admin.com") do
-      #     # ... routes come here ...
+      #   Merb::Router.prepare do
+      #     domain(:admin, "my-admin.com") do
+      #       # ... routes come here ...
+      #     end
       #   end
-      # end
-      # ---
+      #
       # :api: public
       def extensions(&block)
         Router::Behavior.class_eval(&block)
@@ -314,7 +314,7 @@ module Merb
     private
     
       # Compiles the routes and creates the +match+ method.
-      # ---
+      # 
       # :api: private
       def compile
         if routes.any?
@@ -326,7 +326,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/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: merb-core
 version: !ruby/object:Gem::Version 
-  version: "1.0"
+  version: 1.0.1
 platform: ruby
 authors: 
 - Ezra Zygmuntowicz
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-11-07 00:00:00 -05:00
+date: 2008-11-18 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency