ramaze 0.1.0 → 0.1.1

data/lib/ramaze/helper/link.rb

@@ -4,87 +4,80 @@
 module Ramaze
   # LinkHelper is included into the Controller by default
   #
-  # this helper tries to get along without any major magic, the only 'magic'
-  # thing is that it looks up controller-paths if you pass it a controller
-  # the text shown is always the last segmet of the finished link from split('/')
-  #
-  # usage is pretty much shown in test/tc_helper
-  # however, to give you some idea of how it actually works, some examples:
-  #
-  # link MainController, :foo                 #=> '<a href="/foo">foo</a>'
-  # link MinorController, :foo                #=> '<a href="/minor/foo">foo</a>'
-  # link MinorController, :foo, :bar          #=> '<a href="/minor/foo/bar">bar</a>'
-  # link MainController, :foo, :raw => true   #=> '/foo'
-  # link MainController, :foo => :bar         #=> '/?foo=bar'
-  #
-  # link_raw MainController, :foo             #=> '/foo'
-  # link_raw MinorController, :foo            #=> '/minor/foo'
-  # link_raw MinorController, :foo, :bar      #=> '/minor/foo/bar'
-  #
-  # TODO:
-  #   - handling of no passed parameters
-  #   - setting imagelinks
-  #   - setting of id or class
-  #   - taking advantae of Gestalt to build links
-  #   - lots of other minor niceties, for the moment i'm only concerned to keep
-  #     it as simple as possible
-  #
+  # Usage is pretty much shown in test/tc_helper and the rdocs below.
 
   module LinkHelper
 
     private
 
+    # Builds a basic <a> tag.
+    #
+    # `title` is mandatory, the second hash of options will be transformed into
+    # arguments of the tag, :href is a special case and its segments will be
+    # CGI.escaped.
+    #
+    # If you pass no :href, the title will be run through Rs and its result is
+    # used instead. If you really want an empty href, use :href => ''
+    #
     # Usage:
-    #   link MainController, :foo                 #=> '<a href="/foo">foo</a>'
-    #   link MinorController, :foo                #=> '<a href="/minor/foo">foo</a>'
-    #   link MinorController, :foo, :bar          #=> '<a href="/minor/foo/bar">bar</a>'
-    #   link MainController, :foo, :raw => true   #=> '/foo'
-    #   link MainController, :foo, :title => 'a'  #=> '<a href="/minor/foo/bar">a</a>'
-    #   link MainController, :foo => :bar         #=> '/?foo=bar'
+    #   A('title')                  #=> <a href="/title">title</a>
+    #   A('foo/bar')                #=> <a href="/foo/bar">foo/bar</a>
+    #   A('Home' :href => Rs(:/))   #=> <a href="/foo/bar">foo/bar</a>
 
-    def Rlink *to
-      hash = to.last.is_a?(Hash) ? to.pop : {}
+    def A(title, hash = {})
+      hash[:href] ||= Rs(title)
+      hash[:href].to_s.gsub!(/[^\/]+/){|m| CGI.escape(m) }
 
-      to = to.flatten
+      args = ['']
+      hash.each{|k,v| args << %(#{k}="#{v}") if k and v }
 
-      to.map! do |t|
-        t = t.class if not t.respond_to?(:transform) and t.is_a?(Controller)
-        Global.mapping.invert[t] || t
-      end
+      %(<a#{args.join(' ')}>#{title || hash[:href]}</a>)
+    end
 
-      raw, title = hash.delete(:raw), hash.delete(:title)
-      params = {:class => hash.delete(:class), :id => hash.delete(:id)}
-      opts = hash.inject('?'){|s,(k,v)| s << "#{k}=#{v};"}[0..-2]
-      link = to.join('/').squeeze('/') << (opts.empty? ? '' : opts)
+    # Builds links out of segments.
+    #
+    # Pass it strings, symbols, controllers and it will produce a link out of
+    # it. Paths to Controllers are obtained from Global.mapping.
+    #
+    # For brevity, the mapping for the example below is following:
+    #   { MC => '/', OC => '/o', ODC => '/od' }
+    #
+    # Usage:
+    #   R(MC) #=> '/'
+    #   R(OC) #=> '/o'
+    #   R(ODC) #=> '/od'
+    #   R(MC, :foo) #=> '/foo'
+    #   R(OC, :foo) #=> '/o/foo'
+    #   R(ODC, :foo) #=> '/od/foo'
+    #   R(MC, :foo, :bar => :x) #=> '/foo?bar=x'
 
-      if raw
-        link
-      else
-        title ||= link.split('/').last.to_s.split('?').first || 'index'
-        params = params.inject(''){|s,(k,v)| s + (k and v ? %{ #{k}="#{v}"} : '')}
-        l = %{<a href="#{link}"#{params}>#{title}</a>}
+    def R(*atoms)
+      args, atoms = atoms.partition{|a| a.is_a?(Hash) }
+      args = args.flatten.inject{|s,v| s.merge!(v) }
+
+      map = Global.mapping.invert
+      atoms.map! do |atom|
+        if atom.respond_to?(:new)
+          map[atom] || atom
+        else
+          map[atom.class] || atom
+        end
       end
-    end
 
-    alias link Rlink
+      front = atoms.join('/').squeeze('/')
 
-    # Usage:
-    #   R MainController, :foo        #=> '/foo'
-    #   R MinorController, :foo       #=> '/minor/foo'
-    #   R MinorController, :foo, :bar #=> '/minor/foo/bar'
-
-    def R *to
-      if to.last.is_a?(Hash)
-        to.last[:raw] = true
+      if args
+        rear = args.inject('?'){|s,(k,v)| s << "#{k}=#{v};"}[0..-2]
+        front + rear
       else
-        to << {:raw => true}
+        front
       end
-
-      Rlink(*to)
     end
 
-    def Rs(*to)
-      R(Controller.current, *to)
+    # Uses R with self as first element.
+
+    def Rs(*atoms)
+      R(self, *atoms)
     end
   end
 end

data/lib/ramaze/helper/nitroform.rb

@@ -4,6 +4,10 @@
 require 'nitro/helper/form'
 
 module Ramaze
+
+  # This helper simply includes the Nitro::FormHelper so you can use its methods
+  # in your Controller.
+
   module NitroformHelper
     include ::Nitro::FormHelper
   end

data/lib/ramaze/helper/redirect.rb

@@ -34,7 +34,7 @@ module Ramaze
         'Location' => target
       }.merge(response.header)
 
-      status = opts[:status] || STATUS_CODE[:see_other]
+      status = opts[:status] || STATUS_CODE["See Other"]
 
       body = %{Please follow <a href="#{target}">#{target}</a>!}
 

data/lib/ramaze/inform.rb

@@ -2,12 +2,16 @@
 # All files in this distribution are subject to the terms of the Ruby license.
 
 require 'ramaze/inform/informing'
+require 'ramaze/inform/hub'
+require 'ramaze/inform/informer'
 
 module Ramaze
   autoload :Analogger, "ramaze/inform/analogger.rb"
-  autoload :Informer,  "ramaze/inform/informer.rb"
   autoload :Syslog,    "ramaze/inform/syslog.rb"
   autoload :Growl,     "ramaze/inform/growl.rb"
   autoload :Xosd,      "ramaze/inform/xosd.rb"
-  autoload :LogHub,    "ramaze/inform/hub.rb"
+
+  unless defined?(Inform)
+    Inform = LogHub.new(Informer)
+  end
 end

data/lib/ramaze/inform/analogger.rb

@@ -8,7 +8,11 @@ module Ramaze
   class Analogger < ::Swiftcore::Analogger::Client
     include Informing
 
-    def initialize(name = 'walrus', host = '127.0.0.1', port = 6766)
+    trait :name => 'walrus'
+    trait :host => '127.0.0.1'
+    trait :port => 6766
+
+    def initialize(name = class_trait[:name], host = class_trait[:host], port = class_trait[:port])
       super
     end
 

data/lib/ramaze/inform/hub.rb

@@ -10,9 +10,9 @@ module Ramaze
     def initialize(*loggers)
       @loggers = loggers
       @loggers.map! do |logger|
+        next(nil) if logger == self
         logger.is_a?(Class) ? logger.new : logger
       end
-      @loggers.delete_if {|x| x == self }
       @loggers.uniq!
       @loggers.compact!
     end

data/lib/ramaze/inform/informing.rb

@@ -27,6 +27,7 @@ module Ramaze
     def error(ex)
       if ex.respond_to?(:exception)
         message = ex.backtrace[0..Global.backtrace_size]
+        message.map!{|m| m.gsub(/^#{Dir.pwd}/, '.') }
         message.unshift(ex.inspect)
       else
         message = ex.to_s
@@ -40,5 +41,11 @@ module Ramaze
 
     def shutdown
     end
+
+    # stub for WEBrick
+
+    def debug?
+      false
+    end
   end
 end

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

@@ -1,6 +1,8 @@
 #          Copyright (c) 2006 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
 
   # Example:

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

@@ -1,6 +1,8 @@
 #          Copyright (c) 2006 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,

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

@@ -3,6 +3,8 @@
 
 require 'pp'
 
+# Extensions for Kernel
+
 module Kernel
   unless defined?(pretty_inspect)
     # returns a pretty printed object as a string.

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

@@ -3,6 +3,8 @@
 
 Traits = Hash.new{|h,k| h[k] = {}} unless defined?(Traits)
 
+# Extensions for Object
+
 class Object
 
   # Adds a method to Object to annotate your objects with certain traits.
@@ -62,6 +64,8 @@ class Object
     ancs.reverse.inject({}){|s,v| s.merge(v.trait)}.merge(trait)
   end
 
+  # trait for self.class
+
   def class_trait
     if respond_to?(:ancestors)
       trait

data/lib/ramaze/snippets/openstruct/temp.rb

@@ -1,5 +1,8 @@
 #          Copyright (c) 2006 Michael Fellinger m.fellinger@gmail.com
 # All files in this distribution are subject to the terms of the Ruby license.
+
+# Extensions for OpenStruct
+
 class OpenStruct
 
   # create a new OpenStruct and fill it with a merge of the old @table and the passed hash

data/lib/ramaze/snippets/string/DIVIDE.rb

@@ -1,6 +1,8 @@
 #          Copyright (c) 2006 Michael Fellinger m.fellinger@gmail.com
 # All files in this distribution are subject to the terms of the Ruby license.
 
+# Extensions for String
+
 class String
 
   # A convinient way to do File.join

data/lib/ramaze/snippets/string/camel_case.rb

@@ -1,6 +1,8 @@
 #          Copyright (c) 2006 Michael Fellinger m.fellinger@gmail.com
 # All files in this distribution are subject to the terms of the Ruby license.
 
+# Extensions for String
+
 class String
 
   # simple transformation to CamelCase from snake_case

data/lib/ramaze/snippets/string/color.rb

@@ -1,6 +1,8 @@
 #          Copyright (c) 2006 Michael Fellinger m.fellinger@gmail.com
 # All files in this distribution are subject to the terms of the Ruby license.
 
+# Extensions for String
+
 class String
 
   {

data/lib/ramaze/snippets/string/each.rb

@@ -1,6 +1,8 @@
 #          Copyright (c) 2006 Michael Fellinger m.fellinger@gmail.com
 # All files in this distribution are subject to the terms of the Ruby license.
 
+# Extensions for String
+
 class String
   alias each each_line unless ''.respond_to?(:each)
 end

data/lib/ramaze/snippets/string/snake_case.rb

@@ -1,5 +1,8 @@
 #          Copyright (c) 2006 Michael Fellinger m.fellinger@gmail.com
 # All files in this distribution are subject to the terms of the Ruby license.
+
+# Extensions for String
+
 class String
 
   # convert to snake_case from CamelCase

data/lib/ramaze/snippets/struct/fill.rb

@@ -1,6 +1,8 @@
 #          Copyright (c) 2006 Michael Fellinger m.fellinger@gmail.com
 # All files in this distribution are subject to the terms of the Ruby license.
 
+# Extensions for Struct
+
 class Struct
 
   # Action = Struct.new('Action', :template, :method, :params)
@@ -9,7 +11,11 @@ class Struct
   # # => #<struct Struct::Action template=nil, method=:meth, params=[1]>
 
   def self.fill(hash = {})
-    values = hash.values_at(*members.map{|m| m.to_sym})
-    new(*values)
+    instance = new
+    hash.each do |key, value|
+      next unless members.include?(key.to_s)
+      instance.send("#{key}=", value)
+    end
+    instance
   end
 end

data/lib/ramaze/snippets/struct/values_at.rb

@@ -0,0 +1,16 @@
+#          Copyright (c) 2006 Michael Fellinger m.fellinger@gmail.com
+# All files in this distribution are subject to the terms of the Ruby license.
+
+# Extensions for Struct
+
+class Struct
+
+  # Point = Struct.new(:x, :y)
+  # point = Point.new(15, 10)
+  # point.values_at(:y, :x)
+  # # => [10, 15]
+
+  def values_at(*keys)
+    keys.map{|k| self[k.to_sym] }
+  end
+end

data/lib/ramaze/snippets/symbol/to_proc.rb

@@ -1,5 +1,8 @@
 #          Copyright (c) 2006 Michael Fellinger m.fellinger@gmail.com
 # All files in this distribution are subject to the terms of the Ruby license.
+
+# Extensions for Symbol
+
 class Symbol
 
   # the well-known #to_proc

data/lib/ramaze/sourcereload.rb

@@ -0,0 +1,89 @@
+#          Copyright (c) 2006 Michael Fellinger m.fellinger@gmail.com
+# All files in this distribution are subject to the terms of the Ruby license.
+
+require 'set'
+
+module Ramaze
+  class SourceReload
+    attr_accessor :thread, :interval, :reload_glob, :map
+
+    def initialize interval = 1, reload_glob = %r{(^\./)|#{Dir.pwd}|ramaze}
+      @interval, @reload_glob = interval, reload_glob
+      @mtimes, @map = {}, []
+    end
+
+    def start
+      Inform.debug("initialize automatic source reload every #{interval} seconds")
+      @thread = reloader
+    end
+
+    def self.startup options = {}
+      interval = Global.sourcereload
+      instance = new(interval)
+      Thread.main[:sourcereload] = instance
+      instance.reload # initial scan of all files
+      instance.start if interval
+    end
+
+    def reloader
+      Thread.new do
+        loop do
+          reload
+          sleep(@interval)
+        end
+      end
+    end
+
+    # This method is quite handy if you want direct control over when your code is reloaded
+    #
+    # Usage example:
+    #
+    # trap :HUB do
+    #   Ramaze::Inform.info "reloading source"
+    #   Thread.main[:sourcereload].reload
+    # end
+    #
+
+    def reload
+      all_reload_files.each do |file|
+        mtime = mtime(file)
+
+        next if (@mtimes[file] ||= mtime) == mtime
+
+        Inform.debug("reload #{file}")
+        @mtimes[file] = mtime if safe_load(file)
+      end
+    end
+
+    def all_reload_files
+      files, paths = $LOADED_FEATURES, Array['', './', *$LOAD_PATH]
+
+      unless [@files, @paths] == [files, paths]
+        @files, @paths = files.dup, paths.dup
+
+        map = files.map do |file|
+          possible = paths.map{|pa| File.join(pa.to_s, file.to_s) }
+          possible.find{|po| File.exists?(po) }
+        end
+
+        @map = map.compact
+      end
+
+      m = @map.grep(@reload_glob)
+    end
+
+    def mtime(file)
+      File.mtime(file)
+    rescue Errno::ENOENT
+      false
+    end
+
+    def safe_load(file)
+      load(file)
+      true
+    rescue Object => ex
+      Inform.error(ex)
+      false
+    end
+  end
+end