ramaze 0.2.1 → 0.3.0

data/lib/ramaze/global/globalstruct.rb

@@ -1,4 +1,4 @@
-#          Copyright (c) 2006 Michael Fellinger m.fellinger@gmail.com
+#          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
@@ -23,6 +23,7 @@ module Ramaze
       :mongrel             => :Mongrel,
       :evented_mongrel     => :Mongrel,
       :swiftiplied_mongrel => :Mongrel,
+      :thin                => :Thin
     }
 
     # mapping of :cache => to the right class-name.
@@ -96,12 +97,17 @@ module Ramaze
       sri.interval = interval if sri
     end
 
-    def template_root=(tr)
-      self[:template_root] = File.expand_path(tr)
+    def template_root
+      [ tr = self[:template_root],
+        APPDIR/tr,
+        APPDIR/'template',
+      ].find{|path| File.directory?(path) } || self[:template_root]
     end
 
-    def public_root=(pr)
-      self[:public_root] = File.expand_path(pr)
+    def public_root
+      [ pr = self[:public_root],
+        APPDIR/pr,
+      ].find{|path| File.directory?(path) } || self[:public_root]
     end
 
     def list_directories=(active)

data/lib/ramaze/helper.rb

@@ -1,4 +1,4 @@
-#          Copyright (c) 2006 Michael Fellinger m.fellinger@gmail.com
+#          Copyright (c) 2008 Michael Fellinger m.fellinger@gmail.com
 # All files in this distribution are subject to the terms of the Ruby license.
 
 require 'ramaze/trinity'

data/lib/ramaze/helper/aspect.rb

@@ -1,4 +1,4 @@
-#          Copyright (c) 2006 Michael Fellinger m.fellinger@gmail.com
+#          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

data/lib/ramaze/helper/auth.rb

@@ -1,4 +1,4 @@
-#          Copyright (c) 2006 Michael Fellinger m.fellinger@gmail.com
+#          Copyright (c) 2008 Michael Fellinger m.fellinger@gmail.com
 # All files in this distribution are subject to the terms of the Ruby license.
 
 require 'digest/sha1'
@@ -25,7 +25,7 @@ module Ramaze
     # if no password given, shows a simple form to input it.
 
     def login
-      username, password = request.params.values_at('username', 'password')
+      username, password = request[:username, :password]
       if check_auth(username, password)
         session[:logged_in] = true
         session[:username] = username

data/lib/ramaze/helper/cache.rb

@@ -1,4 +1,4 @@
-#          Copyright (c) 2006 Michael Fellinger m.fellinger@gmail.com
+#          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

data/lib/ramaze/helper/cgi.rb

@@ -1,4 +1,4 @@
-#          Copyright (c) 2006 Michael Fellinger m.fellinger@gmail.com
+#          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

data/lib/ramaze/helper/file.rb

@@ -1,4 +1,4 @@
-#          Copyright (c) 2006 Michael Fellinger m.fellinger@gmail.com
+#          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

data/lib/ramaze/helper/flash.rb

@@ -1,4 +1,4 @@
-#          Copyright (c) 2006 Michael Fellinger m.fellinger@gmail.com
+#          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

data/lib/ramaze/helper/formatting.rb

@@ -1,4 +1,4 @@
-#          Copyright (c) 2006 Michael Fellinger m.fellinger@gmail.com
+#          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

data/lib/ramaze/helper/identity.rb

@@ -1,4 +1,4 @@
-#          Copyright (c) 2006 Michael Fellinger m.fellinger@gmail.com
+#          Copyright (c) 2008 Michael Fellinger m.fellinger@gmail.com
 # All files in this distribution are subject to the terms of the Ruby license.
 
 require 'tmpdir'

data/lib/ramaze/helper/inform.rb

@@ -1,4 +1,4 @@
-#          Copyright (c) 2006 Michael Fellinger m.fellinger@gmail.com
+#          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

data/lib/ramaze/helper/link.rb

@@ -1,4 +1,4 @@
-#          Copyright (c) 2006 Michael Fellinger m.fellinger@gmail.com
+#          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
@@ -59,10 +59,10 @@ module Ramaze
 
       map = Global.mapping.invert
       atoms.map! do |atom|
-        if atom.respond_to?(:new)
-          map[atom] || atom
-        else
+        if atom.is_a?(Ramaze::Controller)
           map[atom.class] || atom
+        else
+          map[atom] || atom
         end
       end
 

data/lib/ramaze/helper/markaby.rb

@@ -1,4 +1,4 @@
-#          Copyright (c) 2006 Michael Fellinger m.fellinger@gmail.com
+#          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

data/lib/ramaze/helper/nitroform.rb

@@ -1,4 +1,4 @@
-#          Copyright (c) 2006 Michael Fellinger m.fellinger@gmail.com
+#          Copyright (c) 2008 Michael Fellinger m.fellinger@gmail.com
 # All files in this distribution are subject to the terms of the Ruby license.
 
 require 'nitro/helper/form'

data/lib/ramaze/helper/pager.rb

@@ -352,7 +352,8 @@ private
       options.update(pager.limit)
       items = items.reload(options)
       return items, pager
-    elsif defined?(Og) && items.is_a?(Og::Mixin)
+    elsif defined?(Og::EntityMixin) && items.is_a?(Og::EntityMixin) ||
+          defined?(Og::Mixin) && items.is_a?(Og::Mixin) # Og <= 0.41
       pager = Pager.new(request, limit, items.count(options), pager_key)
       options.update(pager.limit)
       items = items.all(options)

data/lib/ramaze/helper/partial.rb

@@ -1,4 +1,4 @@
-#          Copyright (c) 2006 Michael Fellinger m.fellinger@gmail.com
+#          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

data/lib/ramaze/helper/redirect.rb

@@ -1,4 +1,4 @@
-#          Copyright (c) 2006 Michael Fellinger m.fellinger@gmail.com
+#          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
@@ -47,6 +47,11 @@ module Ramaze
         end
       end
 
+      raw_redirect(target, opts)
+    end
+
+    def raw_redirect(target, opts = {})
+      target = target.to_s
       header = {'Location' => target}
       status = opts[:status] || STATUS_CODE["See Other"]
       body = %{You are being redirected, please follow <a href="#{target}">this link to: #{target}</a>!}

data/lib/ramaze/helper/sequel.rb

@@ -0,0 +1,54 @@
+#          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 SequelHelper
+    private
+
+    def paginator(paginated, target)
+      page_count = paginated.page_count
+      prev_page = paginated.prev_page
+      current_page = paginated.current_page
+      next_page = paginated.next_page
+
+      lower = (current_page - 3).abs
+      lower = lower == 0 ? 1 : lower
+
+      out = ['<div class="paginator">']
+
+      if prev_page
+        out << %(<a class="paginator_prev" href="#{Rs(target, prev_page)}">&lt;&nbsp;Prev</a>)
+      else
+        out << %(<span class="paginator_prev">&lt;&nbsp;Prev</span>)
+      end
+
+      if current_page > 3
+        out << %(<a class="paginator_page" href="#{Rs(target, 1)}">#{1}</a> ... )
+      end
+
+      lower.upto(current_page) do |pc|
+        next if pc == current_page
+        out << %(<a class="paginator_page" href="#{Rs(target, pc)}">#{pc}</a>)
+      end
+
+      out << %(<span class="paginator_current">#{current_page}</span>)
+
+      current_page.upto([page_count, current_page + 3].min) do |pc|
+        next if pc == current_page
+        out << %(<a class="paginator_page" href="#{Rs(target, pc)}">#{pc}</a>)
+      end
+
+      if current_page < (page_count - 3)
+        out << %(.. <a class="paginator_page" href="#{Rs(target, page_count)}">#{page_count}</a>)
+      end
+
+      if next_page
+        out << %(<a class="paginator_next" href="#{Rs(target, next_page)}">Next&nbsp;&gt;</a>)
+      else
+        out << %(<span class="paginator_next">Next&nbsp;&gt;</span>)
+      end
+      out << '</div>'
+      out.join(" ")
+    end
+  end
+end

data/lib/ramaze/helper/stack.rb

@@ -1,4 +1,4 @@
-#          Copyright (c) 2006 Michael Fellinger m.fellinger@gmail.com
+#          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

data/lib/ramaze/inform.rb

@@ -1,4 +1,4 @@
-#          Copyright (c) 2006 Michael Fellinger m.fellinger@gmail.com
+#          Copyright (c) 2008 Michael Fellinger m.fellinger@gmail.com
 # All files in this distribution are subject to the terms of the Ruby license.
 
 require 'ramaze/inform/informing'

data/lib/ramaze/inform/analogger.rb

@@ -1,4 +1,4 @@
-#          Copyright (c) 2006 Michael Fellinger m.fellinger@gmail.com
+#          Copyright (c) 2008 Michael Fellinger m.fellinger@gmail.com
 # All files in this distribution are subject to the terms of the Ruby license.
 
 require 'swiftcore/Analogger/Client'

data/lib/ramaze/inform/growl.rb

@@ -1,4 +1,4 @@
-#          Copyright (c) 2006 Michael Fellinger m.fellinger@gmail.com
+#          Copyright (c) 2008 Michael Fellinger m.fellinger@gmail.com
 # All files in this distribution are subject to the terms of the Ruby license.
 
 require 'ruby-growl'

data/lib/ramaze/inform/hub.rb

@@ -1,4 +1,4 @@
-#          Copyright (c) 2006 Michael Fellinger m.fellinger@gmail.com
+#          Copyright (c) 2008 Michael Fellinger m.fellinger@gmail.com
 # All files in this distribution are subject to the terms of the Ruby license.
 
 require 'set'

data/lib/ramaze/inform/informer.rb

@@ -1,4 +1,4 @@
-#          Copyright (c) 2006 Michael Fellinger m.fellinger@gmail.com
+#          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

data/lib/ramaze/inform/informing.rb

@@ -1,4 +1,4 @@
-#          Copyright (c) 2006 Michael Fellinger m.fellinger@gmail.com
+#          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
@@ -60,7 +60,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.map{|m| m.gsub!(/^#{Regexp.escape(Dir.pwd)}/, '.') }
         message.unshift(ex.inspect)
       else
         message = ex.to_s

data/lib/ramaze/inform/knotify.rb

@@ -1,4 +1,4 @@
-#          Copyright (c) 2006 Michael Fellinger m.fellinger@gmail.com
+#          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

data/lib/ramaze/inform/syslog.rb

@@ -1,4 +1,4 @@
-#          Copyright (c) 2006 Michael Fellinger m.fellinger@gmail.com
+#          Copyright (c) 2008 Michael Fellinger m.fellinger@gmail.com
 # All files in this distribution are subject to the terms of the Ruby license.
 
 require 'syslog'

data/lib/ramaze/inform/xosd.rb

@@ -1,4 +1,4 @@
-#          Copyright (c) 2006 Michael Fellinger m.fellinger@gmail.com
+#          Copyright (c) 2008 Michael Fellinger m.fellinger@gmail.com
 # All files in this distribution are subject to the terms of the Ruby license.
 
 require 'xosd'

data/lib/ramaze/snippets.rb

@@ -1,4 +1,4 @@
-#          Copyright (c) 2006 Michael Fellinger m.fellinger@gmail.com
+#          Copyright (c) 2008 Michael Fellinger m.fellinger@gmail.com
 # All files in this distribution are subject to the terms of the Ruby license.
 
 dir  = File.join(File.expand_path(File.dirname(__FILE__)), 'snippets')

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

@@ -1,4 +1,4 @@
-#          Copyright (c) 2006 Michael Fellinger m.fellinger@gmail.com
+#          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

data/lib/ramaze/snippets/blankslate.rb

@@ -0,0 +1,7 @@
+unless defined?(BlankSlate)
+  class BlankSlate < BasicObject; end if defined?(BasicObject)
+
+  class BlankSlate
+    instance_methods.each { |m| undef_method m unless m =~ /^__/ }
+  end
+end

data/lib/ramaze/snippets/dictionary.rb

@@ -350,7 +350,7 @@ module Ramaze
     def inspect
       ary = []
       each {|k,v| ary << k.inspect + "=>" + v.inspect}
-    '{' + ary.join(", ") + '}'
+      '{' + ary.join(", ") + '}'
     end
 
     def dup
@@ -374,6 +374,11 @@ module Ramaze
       ary
     end
 
+    def find
+      each{|k,v| return k, v if yield(k,v) }
+      return nil
+    end
+
     def first
       @hash[order.first]
     end

data/lib/ramaze/snippets/divide.rb

@@ -1,4 +1,4 @@
-#          Copyright (c) 2006 Michael Fellinger m.fellinger@gmail.com
+#          Copyright (c) 2008 Michael Fellinger m.fellinger@gmail.com
 # All files in this distribution are subject to the terms of the Ruby license.
 
 # A convenient way to do File.join

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

@@ -1,4 +1,4 @@
-#          Copyright (c) 2006 Michael Fellinger m.fellinger@gmail.com
+#          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

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

@@ -0,0 +1,39 @@
+#          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
+
+  # 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':
+  #   acquire 'src/*'
+  #
+  #   # requires all files in 'src' recursive:
+  #   acquire 'src/**/*'
+  #
+  #   # require 'src/foo.rb' and 'src/bar.so' and 'src/foobar/baz.rb'
+  #   acquire 'src/*', 'src/foobar/*'
+
+  def acquire *globs
+    globs.flatten.each do |glob|
+      Dir[glob].each do |file|
+        require file if file =~ /\.(rb|so)$/
+      end
+    end
+  end
+
+  def aquire *globs
+    warn "Kernel#aquire is being deprecated, use Kernel#acquire instead"
+    acquire *globs
+  end
+end

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

@@ -1,34 +1 @@
-#          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
-
-  # 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':
-  #   aquire 'src/*'
-  #
-  #   # requires all files in 'src' recursive:
-  #   aquire 'src/**/*'
-  #
-  #   # require 'src/foo.rb' and 'src/bar.so' and 'src/foobar/baz.rb'
-  #   aquire 'src/*', 'src/foobar/*'
-
-  def aquire *globs
-    globs.flatten.each do |glob|
-      Dir[glob].each do |file|
-        require file if file =~ /\.(rb|so)$/
-      end
-    end
-  end
-end
+require File.join(File.dirname(__FILE__), 'acquire')