ramaze 0.3.5 → 0.3.9

data/lib/ramaze/helper/redirect.rb

@@ -3,7 +3,7 @@
 
 module Ramaze
 
-  # RedirectHelper actually takes advantage of LinkHelper.link_raw to build the links
+  # Helper::Redirect actually takes advantage of Helper::Link.link_raw to build the links
   # it redirects to.
   # It doesn't do much else than this:
   #     setting a status-code of 303 and a response['Location'] = link
@@ -20,9 +20,7 @@ module Ramaze
   #   - maybe some more options, like a delay
   #
 
-  module RedirectHelper
-
-    private
+  module Helper::Redirect
 
     # render to the browser directly, ignoring any templates
     def respond *args
@@ -56,10 +54,15 @@ module Ramaze
       status = opts[:status] || STATUS_CODE["See Other"]
       body = %{You are being redirected, please follow <a href="#{target}">this link to: #{target}</a>!}
 
-      Inform.info("Redirect to '#{target}'")
+      Log.info("Redirect to '#{target}'")
+      request[:redirected] = true
       throw(:redirect, [body, status, header])
     end
 
+    def redirected?
+      request[:redirected]
+    end
+
     # redirect to the location the browser says it's coming from.
 
     def redirect_referer

data/lib/ramaze/helper/{file.rb → sendfile.rb}

@@ -5,9 +5,7 @@ module Ramaze
 
   # Helper for quickly push out files with the proper mimetype.
 
-  module FileHelper
-    private
-
+  module Helper::SendFile
     # Sets Content-Type to the mimetype of the file and opens the file you pass
     # it, then throws :respond to finish off the request.
 

data/lib/ramaze/helper/sequel.rb

@@ -2,9 +2,7 @@
 # All files in this distribution are subject to the terms of the Ruby license.
 
 module Ramaze
-  module SequelHelper
-    private
-
+  module Helper::Sequel
     def paginator(paginated, target)
       page_count = paginated.page_count
       prev_page = paginated.prev_page

data/lib/ramaze/helper/stack.rb

@@ -39,9 +39,7 @@ module Ramaze
   #   end
   # end
 
-  module StackHelper
-    private
-
+  module Helper::Stack
     # redirect to another location and pushing the current location
     # on the session[:STACK]
 

data/lib/ramaze/helper/tagz.rb

@@ -0,0 +1,19 @@
+#          Copyright (c) 2008 Michael Fellinger m.fellinger@gmail.com
+# All files in this distribution are subject to the terms of the Ruby license.
+
+require 'tagz'
+
+module Ramaze
+
+  # Allows you to use some shortcuts for Tagz in your Controller.
+
+  # use this inside your controller to directly build Tagz
+  # Refer to the Tagz-documentation and testsuite for more examples.
+  # Usage:
+  #   tagz { h1_{ "Apples & Oranges" } }                   #=> "<h1>Apples &amp; Oranges</h1>"
+  #   tagz { h1_(:class => 'fruits&floots'){ 'Apples' } }  #=> "<h1 class=\"fruits&amp;floots\">Apples</h1>"
+
+  module Helper
+    Tagz = ::Tagz
+  end
+end

data/lib/ramaze/helper/user.rb

@@ -0,0 +1,63 @@
+module Ramaze
+  module Helper
+    module User
+      def self.inherited(klass)
+        klass.trait :user_model => ::User
+      end
+
+      def user
+        if instance_variable_defined?('@user_helper')
+          @user_helper
+        else
+          @user_helper = Wrapper.new ancestral_trait[:user_model]
+        end
+      end
+
+      class Wrapper
+        thread_accessor :session
+        attr_accessor :user
+
+        def initialize(model)
+          raise ArgumentError, "No model defined for Helper::User" unless model
+          @model = model
+          @user = nil
+          login(persist)
+        end
+
+        def logged_in?
+          !!@user
+        end
+
+        def login?(hash)
+          credentials = {}
+          hash.each{|k,v| credentials[k.to_sym] = v.to_s }
+          @model[credentials]
+        end
+
+        def persist
+          session[:USER] ||= {}
+        end
+
+        def persist=(hash)
+          session[:USER] = hash
+        end
+
+        def login(hash = Request.current.params)
+          return if hash.empty?
+          if found = login?(hash)
+            @user = found
+            self.persist = hash
+          end
+        end
+
+        def logout
+          persist.clear
+        end
+
+        def method_missing(meth, *args, &block)
+          @user.send(meth, *args, &block)
+        end
+      end
+    end
+  end
+end

data/lib/ramaze/inform.rb

@@ -1,26 +1,4 @@
-#          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'
-require 'ramaze/inform/hub'
-require 'ramaze/inform/informer'
-
-begin
-  require 'win32console' if RUBY_PLATFORM =~ /win32/i
-rescue LoadError => ex
-  puts ex
-  puts "For nice colors on windows, please `gem install win32console`"
-  Ramaze::Informer.trait[:colorize] = false
-end
-
 module Ramaze
-  autoload :Analogger, "ramaze/inform/analogger.rb"
-  autoload :Knotify,   "ramaze/inform/knotify.rb"
-  autoload :Syslog,    "ramaze/inform/syslog.rb"
-  autoload :Growl,     "ramaze/inform/growl.rb"
-  autoload :Xosd,      "ramaze/inform/xosd.rb"
-
-  unless defined?(Inform)
-    Inform = LogHub.new(Informer)
-  end
+  Log.warn "Ramaze::Inform is being deprecated, use Ramaze::Log instead"
+  Inform = Log
 end

data/lib/ramaze/log.rb

@@ -0,0 +1,28 @@
+#          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/log/logging'
+require 'ramaze/log/hub'
+require 'ramaze/log/informer'
+
+begin
+  require 'win32console' if RUBY_PLATFORM =~ /win32/i
+rescue LoadError => ex
+  puts ex
+  puts "For nice colors on windows, please `gem install win32console`"
+  Ramaze::Informer.trait[:colorize] = false
+end
+
+module Ramaze
+  autoload :Analogger, "ramaze/log/analogger.rb"
+  autoload :Knotify,   "ramaze/log/knotify.rb"
+  autoload :Syslog,    "ramaze/log/syslog.rb"
+  autoload :Growl,     "ramaze/log/growl.rb"
+  autoload :Xosd,      "ramaze/log/xosd.rb"
+  autoload :Logger,    "ramaze/log/logger.rb"
+  autoload :Inform,    "ramaze/inform"
+
+  unless defined?(Log)
+    Log = LogHub.new(Informer)
+  end
+end

data/lib/ramaze/{inform → log}/analogger.rb

@@ -11,7 +11,7 @@ module Ramaze
   # gem install analogger
 
   class Analogger < ::Swiftcore::Analogger::Client
-    include Informing
+    include Logging
 
     # identifier for your application
     trait :name => 'walrus'
@@ -28,9 +28,9 @@ module Ramaze
       super
     end
 
-    # integration to Informing
+    # integration to Logging
 
-    def inform(tag, *args)
+    def log(tag, *args)
       log(tag, args.join("\n"))
     end
   end

data/lib/ramaze/{inform → log}/growl.rb

@@ -24,9 +24,9 @@ module Ramaze
       super(*options)
     end
 
-    # integration to Informing
+    # integration to Logging
 
-    def inform(tag, *args)
+    def log(tag, *args)
       notify(tag.to_s, Time.now.strftime("%X"), args.join("\n")[0..100])
     rescue Errno::EMSGSIZE
       # Send size was to big (not really), ignore

data/lib/ramaze/{inform → log}/hub.rb

@@ -1,15 +1,13 @@
 #          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'
-
 module Ramaze
 
   # Bundles different informer instances and sends incoming messages to each.
   # This is the default with Informer as only member.
 
   class LogHub
-    include Informing
+    include Logging
 
     attr_accessor :loggers
     attr_accessor :ignored_tags
@@ -28,12 +26,12 @@ module Ramaze
       @loggers.compact!
     end
 
-    # integration to Informing
+    # integration to Logging
 
-    def inform(tag, *args)
+    def log(tag, *args)
       return if @ignored_tags.include?(tag)
       @loggers.each do |logger|
-        logger.inform(tag, *args)
+        logger.log(tag, *args)
       end
     end
   end

data/lib/ramaze/{inform → log}/informer.rb

@@ -7,7 +7,7 @@ module Ramaze
   # customization.
 
   class Informer
-    include Informing
+    include Logging
 
     attr_accessor :out, :colorize, :log_levels
 
@@ -70,14 +70,14 @@ module Ramaze
 
     def shutdown
       if @out.respond_to?(:close)
-        Inform.debug("close, #{@out.inspect}")
+        Log.debug("close, #{@out.inspect}")
         @out.close
       end
     end
 
-    # Integration to Informing.
+    # Integration to Logging.
 
-    def inform tag, *messages
+    def log tag, *messages
       return if closed? || !@log_levels.include?(tag)
       messages.flatten!
 

data/lib/ramaze/{inform → log}/knotify.rb

@@ -7,14 +7,14 @@ module Ramaze
   # Doesn't need any special libraries.
 
   class Knotify
-    include Informing
+    include Logging
 
     trait :present => 16
 
     # Please see for more information on the API used here:
     # http://lukeplant.me.uk/articles.php?id=3
 
-    def inform(tag, *messages)
+    def log(tag, *messages)
       present = class_trait[:present]
       tag = tag.to_s.capitalize
       messages.flatten.each do |message|

data/lib/ramaze/log/logger.rb

@@ -0,0 +1,22 @@
+#          Copyright (c) 2008 Michael Fellinger m.fellinger@gmail.com
+# All files in this distribution are subject to the terms of the Ruby license.
+
+require 'logger'
+
+module Ramaze
+
+  # Informer for the Stdlib Logger
+
+  class Logger < ::Logger
+
+    # integration to Logging
+
+    def log(tag, *args)
+      __send__(tag, args.join("\n"))
+    end
+
+    def dev(*args)
+      debug(*args)
+    end
+  end
+end

data/lib/ramaze/{inform/informing.rb → log/logging.rb}

@@ -7,71 +7,71 @@ module Ramaze
   # The minimal usage is like this:
   #
   #   class MyLogger
-  #     include Informing
+  #     include Logging
   #
-  #     def inform(tag, *args)
+  #     def log(tag, *args)
   #       p tag => args
   #     end
   #   end
 
-  module Informing
+  module Logging
 
     # Takes the tag (:warn|:debug|:error|:info) and the name of a method to be
     # called upon elements of msgs that don't respond to :to_str
-    # Goes on and sends the tag and transformed messages each to the #inform method.
-    # If you include this module you have to define #inform or it will raise.
+    # Goes on and sends the tag and transformed messages each to the #log method.
+    # If you include this module you have to define #log or it will raise.
 
-    def tag_inform(tag, meth, *msgs)
+    def tag_log(tag, meth, *msgs)
       msgs.each do |msg|
         string = (msg.respond_to?(:to_str) ? msg : msg.send(meth))
-        inform(tag, string)
+        log(tag, string)
       end
     end
 
     # Converts everything given to strings and passes them on with :info
 
     def info(*objects)
-      tag_inform(:info, :to_s, *objects)
+      tag_log(:info, :to_s, *objects)
     end
 
     # Converts everything given to strings and passes them on with :warn
 
     def warn(*objects)
-      tag_inform(:warn, :to_s, *objects)
+      tag_log(:warn, :to_s, *objects)
     end
 
     # inspects objects if they are no strings. Tag is :debug
 
     def debug(*objects)
-      tag_inform(:debug, :inspect, *objects)
+      tag_log(:debug, :inspect, *objects)
     end
 
     # inspects objects if they are no strings. Tag is :dev
 
     def dev(*objects)
-      tag_inform(:dev, :inspect, *objects)
+      tag_log(:dev, :inspect, *objects)
     end
 
     alias << debug
 
     # Takes either an Exception or just a String, formats backtraces to be a bit
-    # more readable and passes all of this on to tag_inform :error
+    # more readable and passes all of this on to tag_log :error
 
     def error(ex)
       if ex.respond_to?(:exception)
-        message = ex.backtrace[0..Global.backtrace_size]
+        message = (ex.backtrace || [])[0..Global.backtrace_size]
         message.map{|m| m.gsub!(/^#{Regexp.escape(Dir.pwd)}/, '.') }
         message.unshift(ex.inspect)
       else
         message = ex.to_s
       end
-      tag_inform(:error, :to_s, *message)
+      tag_log(:error, :to_s, *message)
     end
 
     # raises
 
-    def inform(*args)
-      raise "#inform should be implemented by an instance including this module (#{self})"
+    def log(*args)
+      raise "#log should be implemented by an instance including this module (#{self})"
     end
 
     # nothing

data/lib/ramaze/{inform → log}/xosd.rb

@@ -14,7 +14,7 @@ module Ramaze
   class Xosd < ::Xosd
     attr_accessor :options
 
-    include Informing
+    include Logging
 
     DEFAULT = {
       :font_size       => 20,
@@ -79,7 +79,7 @@ module Ramaze
 
     # pushes all messages it gets on the QUEUE for further processing.
 
-    def inform(tag, *messages)
+    def log(tag, *messages)
       messages.each do |message|
         QUEUE << [tag, message]
       end