manveru-ramaze 2008.10 → 2008.12

data/lib/ramaze/reloader.rb

@@ -11,9 +11,7 @@ module Ramaze
   # Reloader::Hooks module or include your own module to override the hooks.
   # You also might have to set the Log constant.
   #
-  # What makes it especially suited for use in a production environment is that
-  # any file will only be checked once and there will only be made one system
-  # call stat(2).
+  # Currently, it uses RInotify if available and falls back to using File.stat.
   #
   # Please note that this will not reload files in the background, it does so
   # only when actively called
@@ -47,11 +45,21 @@ module Ramaze
       :control => nil, # lambda{ cycle },
     }
 
+    begin
+      gem 'RInotify', '>=0.9' # is older version ok?
+      require 'rinotify'
+      require 'ramaze/reloader/watch_inotify'
+      Watcher = WatchInotify
+    rescue LoadError
+      # stat always available
+      require 'ramaze/reloader/watch_stat'
+      Watcher = WatchStat
+    end
+
     def initialize(app)
       @app = app
-      @last = Time.now
-      @mtimes = {}
-      @cache = {}
+      @files = {}
+      @watcher = Watcher.new
       options_reload
     end
 
@@ -63,7 +71,7 @@ module Ramaze
     def call(env)
       options_reload
 
-      if @cooldown and Time.now > @last + @cooldown
+      @watcher.call(@cooldown) do
         if @control
           instance_eval(&@control)
         elsif @thread
@@ -71,8 +79,6 @@ module Ramaze
         else
           cycle
         end
-
-        @last = Time.now
       end
 
       @app.call(env)
@@ -81,16 +87,8 @@ module Ramaze
     def cycle
       before_cycle
 
-      rotation do |file, stat|
-        if mtime = stat.mtime
-          if mtime > (@mtimes[file] ||= mtime)
-            safe_load(file)
-            @mtimes[file] = mtime
-          end
-        else
-          @cache.delete(file)
-        end
-      end
+      rotation{|file| @watcher.watch(file) }
+      @watcher.changed_files.each{|f| safe_load(f) }
 
       after_cycle
     end
@@ -111,37 +109,23 @@ module Ramaze
 
       files.each do |file|
         next if file =~ @ignore
-        path, stat = figure_path(file, paths)
-
-        if path and stat
-          @cache[file] = path
-          yield(path, stat)
-        else
-          # Quite harmless, we just couldn't figure out path for #{file}
+        if not @files.has_key?(file) and path = figure_path(file, paths)
+          @files[file] = path
+          yield path
         end
       end
     end
 
     def figure_path(file, paths)
-      if cached = @cache[file]
-        stat = File.stat(cached)
-        return cached, stat if stat.file?
-      elsif Pathname.new(file).absolute?
-        stat = File.stat(file)
-        return file, stat if stat.file? # do directories really end up in $" ?
+      if Pathname.new(file).absolute?
+        return File.exist?(file) ? file : nil
       end
 
       paths.each do |possible_path|
-        path = File.join(possible_path, file)
-
-        begin
-          stat = File.stat(path)
-          return path, stat if stat.file?
-        rescue Errno::ENOENT, Errno::ENOTDIR
-        end
+        full_path = File.join(possible_path, file)
+        return full_path if File.exist?(full_path)
       end
-
-      return nil
+      nil
     end
 
 

data/lib/ramaze/snippets/object/__dir__.rb

@@ -16,11 +16,11 @@ module Ramaze
         # This method is convenience for the
         #  File.expand_path(File.dirname(__FILE__))
         # idiom.
-        #
 
-        def __DIR__()
+        def __DIR__(*args)
           filename = caller[0][/^(.*):/, 1]
-          File.expand_path(File.dirname(filename))
+          dir = File.expand_path(File.dirname(filename))
+          ::File.expand_path(::File.join(dir, *args.map{|a| a.to_s}))
         end
       end
     end

data/lib/ramaze/snippets/ramaze/acquire.rb

@@ -0,0 +1,31 @@
+#          Copyright (c) 2008 Michael Fellinger m.fellinger@gmail.com
+# All files in this distribution are subject to the terms of the Ruby license.
+
+module Ramaze
+  # Require all .rb and .so files on the given globs, utilizes Dir::[].
+  #
+  # Examples:
+  #   # Given following directory structure:
+  #   # src/foo.rb
+  #   # src/bar.so
+  #   # src/foo.yaml
+  #   # src/foobar/baz.rb
+  #   # src/foobar/README
+  #
+  #   # requires all files in 'src':
+  #   Ramaze.acquire 'src/*'
+  #
+  #   # requires all files in 'src' recursive:
+  #   Ramaze.acquire 'src/**/*'
+  #
+  #   # require 'src/foo.rb' and 'src/bar.so' and 'src/foobar/baz.rb'
+  #   Ramaze.acquire 'src/*', 'src/foobar/*'
+
+  def self.acquire(*globs)
+    globs.flatten.each do |glob|
+      Dir[glob].each do |file|
+        require file if file =~ /\.(rb|so)$/
+      end
+    end
+  end
+end

data/lib/ramaze/spec/helper/mock_http.rb

@@ -42,8 +42,9 @@ module MockHTTP
 
   def process_request(path, query)
     options = {}
-    FISHING.each{|key, value|
-      options[value] = query.delete(key)} if query.is_a?(Hash)
+    FISHING.each do |key, value|
+      options[value] = query.delete(key) if query.key?(key)
+    end if query.is_a?(Hash)
     [create_url(path, query), options]
   end
 
@@ -54,10 +55,10 @@ module MockHTTP
     uri.to_s
   end
 
-	def make_query query
-		return query unless query and not query.is_a?(String)
+  def make_query query
+    return query unless query and not query.is_a?(String)
     query.map{|key, value|
       "#{Rack::Utils.escape(key)}=#{Rack::Utils.escape(value)}"
     }.join('&')
-	end
+  end
 end

data/lib/ramaze/template/ezamar/render_partial.rb

@@ -7,6 +7,14 @@ require 'ramaze/template/ezamar/engine'
 module Ezamar
 
   # A transformer for <render /> tags.
+  #
+  # Setup:
+  #
+  #     pipeline = Ramaze::Template::Ezamar::TRANSFORM_PIPELINE
+  #     pipeline.put_after(::Ezamar::Element, ::Ezamar::RenderPartial)
+  #     pipline.uniq!
+  #
+  # See /examples/basic/partial.rb for usage.
 
   class RenderPartial
     extend Ramaze::Helper::Partial

data/lib/ramaze.rb

@@ -99,10 +99,14 @@ module Ramaze
       end
     end
 
+    # A shortcut for setting Ramaze.trait[:started] = true.
+
     def skip_start
       trait[:started] = true
     end
 
+    # Forces the startup of Ramaze regardless if trait[:started] is set.
+
     def start!(options = {})
       trait[:started] = false
       startup(options)