ramaze 0.0.8 → 0.0.9

data/examples/identity.rb

@@ -0,0 +1,21 @@
+#          Copyright (c) 2006 Michael Fellinger m.fellinger@gmail.com
+# All files in this distribution are subject to the terms of the Ruby license.
+
+require 'ramaze'
+
+class MainController < Ramaze::Controller
+  helper :identity
+
+  def index
+    if session[:openid_identity]
+      %{
+        <h1>#{flash[:success]}</h1>
+        <p>You are logged in as #{session[:openid_identity]}</p>
+      }
+    else
+      openid_login_form
+    end
+  end
+end
+
+Ramaze.start

data/examples/nitro_form.rb

@@ -0,0 +1,22 @@
+require 'ramaze'
+
+gem 'facets', '=1.4.5'
+require '/home/manveru/prog/projects/nitroproject/glycerin'
+require 'nitro'
+require 'og'
+
+class Article
+  attr_accessor :title, String
+end
+
+Og.setup :store => :sqlite, :destroy => true
+
+class MainController < Ramaze::Controller
+  helper :nitroform
+
+  def index
+    form(Article.new).to_s
+  end
+end
+
+Ramaze.start

data/lib/ramaze/controller.rb

@@ -273,7 +273,7 @@ module Ramaze
       end
 
       backtrace.map! do |line|
-        file, lineno, meth = *Ramaze.caller_info
+        file, lineno, meth = *Ramaze.parse_backtrace(line)
         backtrace_size = Ramaze::Global.inform_backtrace_size
         lines = Ramaze.caller_lines(file, lineno, backtrace_size)
 

data/lib/ramaze/dispatcher.rb

@@ -57,6 +57,8 @@ module Ramaze
       # This feature is only available if your Global.error is true, which is
       # the default.
       #
+      #--
+      #
       # Yes, again, webrick _has_ to be really obscure, I searched for half an hour
       # and still have not the faintest idea how request_path is related to
       # request_uri...
@@ -74,8 +76,12 @@ module Ramaze
           error_path = handle_error[exception.class]
           error_path ||= handle_error.find{|k,v| k === exception}.last
 
-          request.path_info = error_path
-          respond
+          if exception.message =~ /`#{error_path.split('/').last}'/
+            build_response(exception.message, STATUS_CODE[:internal_server_error])
+          else
+            request.path_info = error_path
+            respond
+          end
         else
           if Global.error_page
             request.path_info = '/error'
@@ -85,7 +91,7 @@ module Ramaze
           end
         end
 
-        respond
+        response
       rescue Object => ex
         Informer.error ex
         build_response(ex.message, STATUS_CODE[:internal_server_error])
@@ -145,7 +151,7 @@ module Ramaze
         if file
           response['Content-Type'] = Tool::MIME.type_for(file)
           Informer.debug("Serving static: #{file}")
-          File.open(file)
+          File.open(file, 'rb')
         end
       end
 

data/lib/ramaze/helper/{openid.rb → identity.rb}

@@ -2,11 +2,17 @@
 # All files in this distribution are subject to the terms of the Ruby license.
 
 require 'tmpdir'
-
 require 'openid'
 
 module Ramaze
-  module OpenidHelper
+
+  # This is called Identity to avoid collisions with the original openid.rb
+
+  module IdentityHelper
+    def self.included(klass)
+      klass.send(:helper, :flash)
+    end
+
     def openid_login_form
       %{
 <form method="GET" action="#{R(self, :openid_begin)}">
@@ -19,7 +25,7 @@ module Ramaze
     def openid_begin
       url = request['url']
       redirect_referrer if url.nil? or url.empty?
-      session[:openid_entry] = referrer
+      session[:openid_entry] = request.referrer
 
       openid_request = openid_consumer.begin(url)
       case openid_request.status
@@ -28,8 +34,7 @@ module Ramaze
 
         redirect_referrer
       when OpenID::SUCCESS
-        host, port   = Ramaze::Global.host, Ramaze::Global.port
-        root         = "http://#{host}:#{port}/"
+        root         = "http://#{request.http_host}/"
         return_to    = root[0..-2] + R(self, :openid_complete)
         redirect_url = openid_request.redirect_url(root, return_to)
 
@@ -44,9 +49,12 @@ module Ramaze
       when OpenID::FAILURE
         flash[:error] = 'OpenID - Verification failed.'
       when OpenID::SUCCESS
+        session[:openid_identity] = openid_response.identity_url
         flash[:success] = 'OpenID - Verification done.'
       end
 
+      session.delete(:_openid_consumer_service)
+
       redirect session[:openid_entry]
     end
 
@@ -58,6 +66,7 @@ module Ramaze
   end
 end
 
+
 openid_store_file = File.join(Dir.tmpdir, 'openid-store')
 
-Global.openid_store ||= OpenID::FilesystemStore.new(openid_store_file)
+Ramaze::Global.openid_store ||= OpenID::FilesystemStore.new(openid_store_file)

data/lib/ramaze/helper/nitroform.rb

@@ -0,0 +1,10 @@
+#          Copyright (c) 2006 Michael Fellinger m.fellinger@gmail.com
+# All files in this distribution are subject to the terms of the Ruby license.
+
+require 'nitro/helper/form'
+
+module Ramaze
+  module NitroformHelper
+    include ::Nitro::FormHelper
+  end
+end

data/lib/ramaze/helper/stack.rb

@@ -46,7 +46,7 @@ module Ramaze
     # on the session[:STACK]
 
     def call this
-      (session[:STACK] ||= []) << request.request_uri
+      (session[:STACK] ||= []) << request.fullpath
       redirect(R(this))
     end
 

data/lib/ramaze/inform.rb

@@ -140,14 +140,24 @@ module Ramaze
     def log prefix, *messages
       [messages].flatten.each do |message|
         compiled = %{[#{timestamp}] #{prefix}  #{message}}
-        out =
-          case Global.inform_to
-          when $stdout, :stderr, 'stdout' : $stdout
-          when $stdout, :stderr, 'stderr' : $stderr
-          else
-            File.open(Global.inform_to, 'ab+')
-          end
-        out.puts(*compiled) unless (out.respond_to?(:closed?) and out.closed?)
+
+        pipes = Global.inform_pipes = pipify(Global.inform_to)
+
+        pipes.each do |pipe|
+          pipe.puts(*compiled) unless (pipe.respond_to?(:closed?) and pipe.closed?)
+        end
+      end
+    end
+
+    def pipify *ios
+      ios.flatten.map do |io|
+        case io
+        when :stdout, 'stdout' : $stdout
+        when :stderr, 'stderr' : $stderr
+        when IO : io
+        else
+          File.open(io.to_s, 'ab+')
+        end
       end
     end
 

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

@@ -12,9 +12,9 @@ module Kernel
   def aquire *files
     files.each do |file|
       require file if %w(rb so).any?{|f| File.file?("#{file}.#{f}")}
-      $:.each do |path|
-        Dir[File.join(path, file, '*.rb')].each do |file|
-          require file unless file == File.expand_path(__FILE__)
+      $:.each do |dir|
+        Dir[File.join(dir, file, '*.rb')].each do |path|
+          require path unless path == File.expand_path(__FILE__)
         end
       end
     end

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

@@ -1,7 +1,7 @@
 #          Copyright (c) 2006 Michael Fellinger m.fellinger@gmail.com
 # All files in this distribution are subject to the terms of the Ruby license.
 
-Traits = Hash.new{|h,k| h[k] = {}}
+Traits = Hash.new{|h,k| h[k] = {}} unless defined?(Traits)
 
 class Object
 

data/lib/ramaze/snippets/ramaze/caller_info.rb

@@ -9,6 +9,22 @@ module Ramaze
   #   # => ['/usr/lib/ruby/1.8/irb/workspace.rb', '52', 'irb_binding']
 
   def self.caller_info(i = 1)
-    file, line, meth = caller[i].scan(/(.*?):(\d+):in `(.*?)'/).first
+    file, line, meth = *parse_backtrace(caller[i])
+  end
+
+  # Parses one line of backtrace and tries to extract as much information
+  # as possible.
+  #
+  # Example:
+  #   line = "/web/repo/ramaze/lib/ramaze/dispatcher.rb:105:in `respond'"
+  #   Ramaze.parse_backtrace(line)
+  #   #=> ["/web/repo/ramaze/lib/ramaze/dispatcher.rb", "105", "respond"]
+
+  def self.parse_backtrace(line = '')
+    full = line.scan(/(.*?):(\d+):in `(.*?)'/).first
+    return full if full and full.all?
+    partial = line.scan(/(.*?):(\d+)/).first
+    return partial if partial and partial.all?
+    line
   end
 end

data/lib/ramaze/snippets/ramaze/caller_lines.rb

@@ -28,7 +28,7 @@ module Ramaze
 
   def self.caller_lines(file, line, size = 4)
     return [[0, file, true]] if file == '(eval)'
-    lines = File.readlines(file)
+    lines = File.readlines(File.expand_path(file)) rescue []
     current = line.to_i - 1
 
     first = current - size

data/lib/ramaze/store/yaml.rb

@@ -119,7 +119,16 @@ module Ramaze::Store
 
       def new
         entity = Entity.new
-        entity.instance_variable_set('@manager', self)
+        entity.manager = self
+        entity
+      end
+
+      def create_with hash = {}
+        entity = new
+        hash.each do |key, value|
+          entity.send("#{key}=", value)
+        end
+        entity.save
         entity
       end
 

data/lib/ramaze/template/ezamar.rb

@@ -43,10 +43,10 @@ module Ramaze
           file_template, path = file_template(file, controller)
           ctrl_template       = render_action(controller, action, *params)
 
-          if chosen = to_transform = alternate || file_template || ctrl_template
+          if chosen = alternate || file_template || ctrl_template
             pipeline(chosen, :binding => bound, :path => path)
           else
-            raise Ramaze::Error::NoAction, "No Action found for `#{action}' on #{controller.class}"
+            raise_no_action(controller, action)
           end
         end
 
@@ -70,12 +70,17 @@ module Ramaze
         # Render an action, on a given controller with parameter
 
         def render_action(controller, action, *params)
-          ctrl_template = controller.send(action, *params).to_s
-        rescue => ex
-          Informer.error(ex)
+          return controller.send(action, *params).to_s
+        rescue NoMethodError => ex
+          ourself = /undefined method `#{action}' for #<TCErrorController:/
+          raise_no_action(controller, action) unless ex.message =~ ourself
           nil
         end
 
+        def raise_no_action(controller, action)
+          raise Ramaze::Error::NoAction, "No Action found for `#{action}' on #{controller.class}"
+        end
+
         # go through the pipeline and call #transform on every object found there,
         # passing the template at that point.
         # the order and contents of the pipeline are determined by an array

data/lib/ramaze/trinity/request.rb

@@ -50,11 +50,21 @@ module Ramaze
     # the referer of the client or '/'
 
     def referer
-      @request.env['HTTP_REFERER'] || '/'
+      env['HTTP_REFERER'] || '/'
     end
 
     alias referrer referer
 
+    def fullpath
+      path = script_name + path_info
+      path << "?" << query_string  unless query_string.empty?
+      path
+    end
+
+    def env
+      @request.env
+    end
+
     # you can access the original @request via this method_missing,
     # first it tries to match your method with any of the HTTP parameters
     # then, in case that fails, it will relay to @request
@@ -62,7 +72,7 @@ module Ramaze
     def method_missing meth, *args, &block
       @request.send(meth, *args, &block)
     rescue
-      @request.env[meth.to_s.upcase]
+      env[meth.to_s.upcase]
     end
   end
 end

data/lib/ramaze/version.rb

@@ -5,7 +5,7 @@ module Ramaze #:nodoc:
   module Version #:nodoc:
     MAJOR = 0
     MINOR = 0
-    TINY  = 8
+    TINY  = 9
 
     STRING = [MAJOR, MINOR, TINY].join('.')
   end

data/lib/ramaze.rb

@@ -138,9 +138,11 @@ module Ramaze
   # closes the IO that Global.inform_to points to.
 
   def close_inform
-    if to = Global.inform_to and to.respond_to?(:close)
-      debug "close #{to.inspect}"
-      to.close until to.closed?
+    [Global.inform_to].flatten.each do |io|
+      if io = Global.inform_to and io.respond_to?(:close)
+        debug "close #{io.inspect}"
+        io.close until io.closed?
+      end
     end
   end
 

data/spec/public/error404.xhtml

@@ -0,0 +1 @@
+404 - not found

data/spec/spec_all.rb

@@ -3,6 +3,11 @@
 
 require 'pp'
 
+begin
+  require 'rubygems'
+rescue LoadError
+end
+
 begin
   require 'systemu'
 rescue LoadError
@@ -17,25 +22,16 @@ rescue LoadError
   end
 end
 
-begin
-  require 'term/ansicolor'
-  class String
-    include Term::ANSIColor
-  end
-rescue LoadError
-  puts "Please install term-ansicolor for better-looking results"
-
-  class String
-
-    # this will be set in case term/ansicolor cannot be
-    # required, just makes colorless output
-
-    def red() self end
-
-    # this will be set in case term/ansicolor cannot be
-    # required, just makes colorless output
+class String
 
-    def green() self end
+  {
+    :red => 31,
+    :green => 32,
+    :yellow => 33,
+  }.each do |key, value|
+    define_method key do
+      "\e[#{value}m" + self + "\e[0m"
+    end
   end
 end
 
@@ -68,8 +64,10 @@ specs.each do |spec|
     print result_format['failed'].red
 
   else
+    found = false
     stdout.each do |line|
       if line =~ /(\d+) specifications?, (\d+) failures?/
+        found = true
         s, f = $1.to_i, $2.to_i
         ss, sf = s.to_s.rjust(3), f.to_s.rjust(3)
 
@@ -80,12 +78,16 @@ specs.each do |spec|
 
         if f.nonzero?
           failed[spec] = hash
-          print((message << "#{f} failed ]").red)
+          print((message << "#{sf} failed ]").red)
         else
           print((message << "all passed ]").green)
         end
       end
     end
+
+    unless found
+      print("[ please test standalone ]".red)
+    end
   end
   puts
 end