manveru-ramaze 2008.08 → 2008.09

data/lib/ramaze/option.rb

@@ -73,7 +73,7 @@ module Ramaze
       :controllers, Set.new
 
     o "Instruction for daemonize, only works with bin/ramaze for now",
-      :daemonize, 'start', :cli => [:start, :stop]
+      :daemonize, '', :cli => [:start, :stop]
 
     o "Turn on customized error pages. Use Rack::ShowException otherwise.",
       :error_page, true, :cli => true
@@ -106,7 +106,7 @@ module Ramaze
       :middleware, true
 
     o "For your own modes to decide on",
-      :mode, :live, :cli => [:live, :dev]
+      :mode, :live, :cli => [:live, :dev, :spec]
 
     o "The place ramaze was started from, useful mostly for debugging",
       :origin, :main

data/lib/ramaze/reloader.rb

@@ -106,7 +106,7 @@ module Ramaze
     end
 
     def rotation
-      files = [$0, *$LOADED_FEATURES].uniq
+      files = [$0, __FILE__, *$LOADED_FEATURES].uniq
       paths = ['./', *$LOAD_PATH].uniq
 
       files.each do |file|
@@ -117,7 +117,7 @@ module Ramaze
           @cache[file] = path
           yield(path, stat)
         else
-          Log::warn "Couldn't figure path for #{file}"
+          # Quite harmless, we just couldn't figure out path for #{file}
         end
       end
     end

data/lib/ramaze/snippets.rb

@@ -7,3 +7,16 @@ glob = File.join(dir, '**', '*.rb')
 Dir[glob].each do |snippet|
   require(snippet)
 end
+
+Ramaze::CoreExtensions.constants.each do |const|
+  ext = Ramaze::CoreExtensions.const_get(const)
+  into = Module.const_get(const)
+
+  collisions = ext.instance_methods & into.instance_methods
+
+  if collisions.empty?
+    into.__send__(:include, ext)
+  else
+    warn "Won't include %p with %p, %p exists" % [into, ext, collisions]
+  end
+end

data/lib/ramaze/snippets/array/put_within.rb

@@ -1,37 +1,44 @@
 #          Copyright (c) 2008 Michael Fellinger m.fellinger@gmail.com
 # All files in this distribution are subject to the terms of the Ruby license.
 
-class Array
+module Ramaze
+  module CoreExtensions
 
-  #   a = [1, 2, 3]
-  #   a.put_within(4, :after => 2, :before => 3)
-  #   a # => [1, 2, 4, 3]
+    # Extensions for Array
 
-  def put_within(object, constrain)
-    pre, post = constrain.values_at(:after, :before)
+    module Array
 
-    unless rindex(post) - index(pre) == 1
-      raise ArgumentError, "Too many elements within constrain"
-    end
+      #   a = [1, 2, 3]
+      #   a.put_within(4, :after => 2, :before => 3)
+      #   a # => [1, 2, 4, 3]
 
-    put_after(pre, object)
-  end
+      def put_within(object, constrain)
+        pre, post = constrain.values_at(:after, :before)
 
-  #   a = [1, 2, 3]
-  #   a.put_after(2, 4)
-  #   a # => [1, 2, 4, 3]
+        return put_after(pre, object) if rindex(post) - index(pre) == 1
 
-  def put_after(element, object)
-    raise ArgumentError, "The given element doesn't exist" unless include?(element)
-    self[index(element) + 1, 0] = object
-  end
+        raise ArgumentError, "Too many elements within constrain"
+      end
+
+      #   a = [1, 2, 3]
+      #   a.put_after(2, 4)
+      #   a # => [1, 2, 4, 3]
 
-  #   a = [1, 2, 3]
-  #   a.put_before(2, 4)
-  #   a # => [1, 4, 2, 3]
+      def put_after(element, object)
+        return self[index(element) + 1, 0] = object if include?(element)
 
-  def put_before(element, object)
-    raise ArgumentError, "The given element doesn't exist" unless include?(element)
-    self[rindex(element), 0] = object
+        raise ArgumentError, "The given element doesn't exist"
+      end
+
+      #   a = [1, 2, 3]
+      #   a.put_before(2, 4)
+      #   a # => [1, 4, 2, 3]
+
+      def put_before(element, object)
+        return self[rindex(element), 0] = object if include?(element)
+
+        raise ArgumentError, "The given element doesn't exist"
+      end
+    end
   end
 end

data/lib/ramaze/snippets/binding/locals.rb

@@ -1,13 +1,25 @@
-class Binding
-
-  # returns a hash of localvar/localvar-values from binding, useful for
-  # template engines that do not accept bindings and force passing locals via
-  # hash
-  #   usage: x = 42; p binding.locals #=> {'x'=> 42}
-  def locals
-    Kernel::eval '
-      local_variables.inject({}){|h,v| k = v.to_s; h.merge!(k => eval(k)) }
-    ', self
-  end
+module Ramaze
+  module CoreExtensions
+
+    # Extensions for Binding
+
+    module Binding
 
+      # Returns a hash of localvar/localvar-values from binding, useful for
+      # template engines that do not accept bindings and force passing locals
+      # via hash
+      #
+      # Usage:
+      #   x = 42; p binding.locals #=> {'x'=> 42}
+
+      def locals
+        ::Kernel::eval '
+        local_variables.inject({}){|h,v|
+          k = v.to_s
+          h.merge!(k => eval(k))
+        }', self
+      end
+
+    end
+  end
 end

data/lib/ramaze/snippets/kernel/constant.rb

@@ -1,26 +1,41 @@
 #          Copyright (c) 2008 Michael Fellinger m.fellinger@gmail.com
 # All files in this distribution are subject to the terms of the Ruby license.
 
-# Extensions for Kernel
-
-module Kernel
-  # Original from Trans (Facets 1.4.5)
-  # This is similar to +Module#const_get+ but is accessible at all levels,
-  # and, unlike +const_get+, can handle module hierarchy.
-  #
-  #   constant("Fixnum")                  # -> Fixnum
-  #   constant(:Fixnum)                   # -> Fixnum
-  #
-  #   constant("Process::Sys")            # -> Process::Sys
-  #   constant("Regexp::MULTILINE")       # -> 4
-  #
-  #   require 'test/unit'
-  #   Test.constant("Unit::Assertions")   # -> Test::Unit::Assertions
-  #   Test.constant("::Test::Unit")       # -> Test::Unit
-
-  def constant(const)
-    const = const.to_s.dup
-    base = const.sub!(/^::/, '') ? Object : ( self.kind_of?(Module) ? self : self.class )
-    const.split(/::/).inject(base){ |mod, name| mod.const_get(name) }
+module Ramaze
+  module CoreExtensions
+
+    # Extensions for Kernel
+
+    module Object
+
+      # Original from Trans (Facets 1.4.5)
+      # This is similar to +Module#const_get+ but is accessible at all levels,
+      # and, unlike +const_get+, can handle module hierarchy.
+      #
+      #   constant("Fixnum")                  # -> Fixnum
+      #   constant(:Fixnum)                   # -> Fixnum
+      #
+      #   constant("Process::Sys")            # -> Process::Sys
+      #   constant("Regexp::MULTILINE")       # -> 4
+      #
+      #   require 'test/unit'
+      #   Test.constant("Unit::Assertions")   # -> Test::Unit::Assertions
+      #   Test.constant("::Test::Unit")       # -> Test::Unit
+
+      def constant(const)
+        const = const.to_s.dup
+
+        if const.sub!(/^::/, '')
+          base = Object
+        elsif self.kind_of?(Module)
+          base = self
+        else
+          base = self.class
+        end
+
+        const.split(/::/).inject(base){ |mod, name| mod.const_get(name) }
+      end
+    end
+
   end
 end

data/lib/ramaze/snippets/kernel/pretty_inspect.rb

@@ -3,13 +3,19 @@
 
 require 'pp'
 
-# Extensions for Kernel
+module Ramaze
+  module CoreExtensions
 
-module Kernel
-  unless defined?(pretty_inspect)
-    # returns a pretty printed object as a string.
-    def pretty_inspect
-      PP.pp(self, '')
+    # Extensions for Kernel
+
+    module Kernel
+      unless defined?(pretty_inspect)
+        # returns a pretty printed object as a string.
+        def pretty_inspect
+          PP.pp(self, '')
+        end
+      end
     end
+
   end
 end

data/lib/ramaze/snippets/numeric/filesize_format.rb

@@ -1,25 +1,32 @@
 #          Copyright (c) 2008 Michael Fellinger m.fellinger@gmail.com
 # All files in this distribution are subject to the terms of the Ruby license.
 
-class Numeric
-  FILESIZE_FORMAT = [
-    ['%.1fT', 1 << 40],
-    ['%.1fG', 1 << 30],
-    ['%.1fM', 1 << 20],
-    ['%.1fK', 1 << 10],
-  ]
+module Ramaze
+  module CoreExtensions
 
-  # Output this number as easily readable filesize.
-  # Usage:
-  #   100_000.filesize_format             # => "97.7K"
-  #   100_000_000.filesize_format         # => "95.4M"
-  #   100_000_000_000.filesize_format     # => "93.1G"
-  #   100_000_000_000_000.filesize_format # => "90.9T"
-  def filesize_format
-    FILESIZE_FORMAT.each do |format, size|
-      return format % (self.to_f / size) if self >= size
+    # Extensions for Numeric
+    module Numeric
+      FILESIZE_FORMAT = [
+        ['%.1fT', 1 << 40],
+        ['%.1fG', 1 << 30],
+        ['%.1fM', 1 << 20],
+        ['%.1fK', 1 << 10],
+      ]
+
+      # Output this number as easily readable filesize.
+      # Usage:
+      #   100_000.filesize_format             # => "97.7K"
+      #   100_000_000.filesize_format         # => "95.4M"
+      #   100_000_000_000.filesize_format     # => "93.1G"
+      #   100_000_000_000_000.filesize_format # => "90.9T"
+      def filesize_format
+        FILESIZE_FORMAT.each do |format, size|
+          return format % (self.to_f / size) if self >= size
+        end
+
+        self.to_s
+      end
     end
 
-    self.to_s
   end
 end

data/lib/ramaze/snippets/numeric/time.rb

@@ -1,56 +1,63 @@
-class Numeric
-
-  def seconds
-    self
-  end
-  alias second seconds
-
-  # 60 seconds in a minute
-  def minutes
-    self * 60
-  end
-  alias minute minutes
-
-  # 60 minutes in an hour
-  def hours
-    self * 3600
-  end
-  alias hour hours
-
-  # 24 hours in a day
-  def days
-    self * 86400
-  end
-  alias day days
-
-  # 7 days in a week
-  def weeks
-    self * 604800
-  end
-  alias week weeks
-
-  # 30 days in a month
-  def months
-    self * 2592000
-  end
-  alias month months
-
-  # 365.25 days in a year
-  def years
-    self * 883612800
-  end
-  alias year years
-
-  # Time in the past, i.e. 3.days.ago
-  def ago t = Time.now
-    t - self
-  end
-  alias before ago
-
-  # Time in the future, i.e. 3.days.from_now
-  def from_now t = Time.now
-    t + self
-  end
-  alias since from_now
-
-end unless 5.respond_to? :days
+module Ramaze
+  module CoreExtensions
+
+    # Extensions for Numeric
+
+    module Numeric
+      def seconds
+        self
+      end
+      alias second seconds
+
+      # 60 seconds in a minute
+      def minutes
+        self * 60
+      end
+      alias minute minutes
+
+      # 60 minutes in an hour
+      def hours
+        self * 3600
+      end
+      alias hour hours
+
+      # 24 hours in a day
+      def days
+        self * 86400
+      end
+      alias day days
+
+      # 7 days in a week
+      def weeks
+        self * 604800
+      end
+      alias week weeks
+
+      # 30 days in a month
+      def months
+        self * 2592000
+      end
+      alias month months
+
+      # 365.25 days in a year
+      def years
+        self * 883612800
+      end
+      alias year years
+
+      # Time in the past, i.e. 3.days.ago
+      def ago t = Time.now
+        t - self
+      end
+      alias before ago
+
+      # Time in the future, i.e. 3.days.from_now
+      def from_now t = Time.now
+        t + self
+      end
+      alias since from_now
+
+    end
+
+  end
+end

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

@@ -0,0 +1,29 @@
+#          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
+  module CoreExtensions
+
+    # Extensions for Object
+
+    module Object
+      unless defined?(__DIR__)
+
+        # This is similar to +__FILE__+ and +__LINE__+, and returns a String
+        # representing the directory of the current file is.
+        # Unlike +__FILE__+ the path returned is absolute.
+        #
+        # This method is convenience for the
+        #  File.expand_path(File.dirname(__FILE__))
+        # idiom.
+        #
+
+        def __DIR__()
+          filename = caller[0][/^(.*):/, 1]
+          File.expand_path(File.dirname(filename))
+        end
+      end
+    end
+
+  end
+end