ramaze 0.3.5 → 0.3.9

data/lib/ramaze/tool/mime.rb

@@ -1,8 +1,6 @@
 #          Copyright (c) 2008 Michael Fellinger m.fellinger@gmail.com
 # All files in this distribution are subject to the terms of the Ruby license.
 
-require 'yaml'
-
 module Ramaze
   module Tool
 

data/lib/ramaze/trinity.rb

@@ -1,10 +1,6 @@
 #          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/request'
-require 'ramaze/trinity/response'
-require 'ramaze/trinity/session'
-
 module Ramaze
 
   # The module to be included into the Controller it basically just provides
@@ -12,27 +8,6 @@ module Ramaze
   # retrieve the demanded object
 
   module Trinity
-    private
-
-    # same as
-    #   Thread.current[:request]
-
-    def request
-      Request.current
-    end
-
-    # same as
-    #   Thread.current[:response]
-
-    def response
-      Response.current
-    end
-
-    # same as
-    #   Thread.current[:session]
-
-    def session
-      Session.current
-    end
+    thread_accessor :request, :response, :session
   end
 end

data/lib/ramaze/version.rb

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

data/lib/vendor/bacon.rb

@@ -2,13 +2,13 @@
 #
 # "Truth will sooner come out from error than from confusion." ---Francis Bacon
 
-# Copyright (C) 2007 Christian Neukirchen <purl.org/net/chneukirchen>
+# Copyright (C) 2007, 2008 Christian Neukirchen <purl.org/net/chneukirchen>
 #
 # Bacon is freely distributable under the terms of an MIT-style license.
 # See COPYING or http://www.opensource.org/licenses/mit-license.php.
 
 module Bacon
-  VERSION = "0.2"
+  VERSION = "0.9"
 
   Counter = Hash.new(0)
   ErrorLog = ""
@@ -53,9 +53,7 @@ module Bacon
   end
 
   module TestUnitOutput
-    def handle_specification(name)
-      yield
-    end
+    def handle_specification(name)  yield  end
 
     def handle_requirement(description)
       error = yield
@@ -74,17 +72,15 @@ module Bacon
   end
 
   module TapOutput
-    def handle_specification(name)
-      yield
-    end
+    def handle_specification(name)  yield  end
 
     def handle_requirement(description)
       ErrorLog.replace ""
       error = yield
       if error.empty?
-        printf "ok %-8d # %s\n" % [Counter[:specifications], description]
+        printf "ok %-3d - %s\n" % [Counter[:specifications], description]
       else
-        printf "not ok %-4d # %s: %s\n" %
+        printf "not ok %d - %s: %s\n" %
           [Counter[:specifications], description, error]
         puts ErrorLog.strip.gsub(/^/, '# ')
       end
@@ -110,38 +106,58 @@ module Bacon
 
   class Context
     def initialize(name, &block)
-      @before = []
-      @after = []
       @name = name
+      @before, @after = [], []
 
       return  unless name =~ RestrictContext
-      Bacon.handle_specification(name) do
-        instance_eval(&block)
-      end
+      Bacon.handle_specification(name) { instance_eval(&block) }
     end
 
     def before(&block); @before << block; end
     def after(&block);  @after << block; end
 
     def behaves_like(*names)
-      names.each do |name|
-        instance_eval(&Shared[name])
-      end
+      names.each { |name| instance_eval(&Shared[name]) }
     end
 
     def it(description, &block)
       return  unless description =~ RestrictName
+      block ||= lambda { should.flunk "not implemented" }
       Counter[:specifications] += 1
       run_requirement description, block
     end
+    
+    def should(*args, &block)
+      if Counter[:depth]==0
+        it('should '+args.first,&block)
+      else
+        super(*args,&block)
+      end
+    end
 
     def run_requirement(description, spec)
       Bacon.handle_requirement description do
         begin
           Counter[:depth] += 1
-          @before.each { |block| instance_eval(&block) }
-          instance_eval(&spec)
-          @after.each { |block| instance_eval(&block) }
+          rescued = false
+          begin
+            @before.each { |block| instance_eval(&block) }
+            prev_req = Counter[:requirements]
+            instance_eval(&spec)
+          rescue Object => e
+            rescued = true
+            raise e
+          ensure
+            if Counter[:requirements] == prev_req
+              raise Error.new(:missing,
+                              "empty specification: #{@name} #{description}")
+            end
+            begin
+              @after.each { |block| instance_eval(&block) }
+            rescue Object => e
+              raise e  unless rescued
+            end
+          end
         rescue Object => e
           ErrorLog << "#{e.class}: #{e.message}\n"
           e.backtrace.find_all { |line| line !~ /bin\/bacon|\/bacon\.rb:\d+/ }.
@@ -187,10 +203,10 @@ end
 
 class Proc
   def raise?(*exceptions)
-    exceptions << RuntimeError if exceptions.empty?
+    exceptions = [RuntimeError]  if exceptions.empty?
     call
 
-    # Only to work in 1.9.0, rescue with splat doesn't work there right now
+  # Only to work in 1.9.0, rescue with splat doesn't work there right now
   rescue Object => e
     case e
     when *exceptions
@@ -226,21 +242,14 @@ end
 
 
 class Object
-  def should(*args, &block)
-    Should.new(self).be(*args, &block)
-  end
+  def should(*args, &block)   Should.new(self).be(*args, &block)  end
 end
 
 module Kernel
   private
 
-  def describe(name, &block)
-    Bacon::Context.new(name.to_s, &block)
-  end
-
-  def shared(name, &block)
-    Bacon::Shared[name] = block
-  end
+  def describe(*args, &block)  Bacon::Context.new(args.join(' '), &block) end
+  def shared(name, &block)    Bacon::Shared[name] = block           end
 end
 
 
@@ -287,8 +296,8 @@ class Should
 
     r = yield(@object, *args)
     if Bacon::Counter[:depth] > 0
-      raise Bacon::Error.new(:failed, description)  unless @negated ^ r
       Bacon::Counter[:requirements] += 1
+      raise Bacon::Error.new(:failed, description)  unless @negated ^ r
     end
     @negated ^ r ? r : false
   end
@@ -300,15 +309,12 @@ class Should
     desc << @object.inspect << "." << name.to_s
     desc << "(" << args.map{|x|x.inspect}.join(", ") << ") failed"
 
-    satisfy(desc) { |x|
-      x.__send__(name, *args, &block)
-    }
+    satisfy(desc) { |x| x.__send__(name, *args, &block) }
   end
 
-  def equal(value); self == value; end
-  def match(value); self =~ value; end
-
-  def identical_to(value); self.equal? value; end
+  def equal(value)         self == value      end
+  def match(value)         self =~ value      end
+  def identical_to(value)  self.equal? value  end
   alias same_as identical_to
 
   def flunk(reason="Flunked")

data/rake_tasks/conf.rake

@@ -51,5 +51,23 @@ You can now do following:
 #{'=' * 60}
 }.strip
 
+AUTHOR_MAP = {
+  'ahoward'                                 => 'Ara T. Howard',
+  'ara.t.howard@gmail.com'                  => 'Ara T. Howard',
+  'blueonyx@dev-area.net'                   => 'Martin Hilbig',
+  'clive@crous.co.za'                       => 'Clive Crous',
+  'comp.lang.zenix+ramaze@gmail.com'        => 'zenix',
+  'jesusisramazing.10.pistos@geoshell.com'  => 'Pistos',
+  'jesuswasramazing.10.pistos@geoshell.com' => 'Pistos',
+  'keita.yamaguchi@gmail.com'               => 'Keita Yamaguchi',
+  'leo.borisenko@gmail.com'                 => 'Leo Borisenko',
+  'manveru@weez-int.com'                    => 'Michael Fellinger',
+  'm.fellinger@gmail.com'                   => 'Michael Fellinger',
+  'outtenr@gmail.com'                       => 'Richard Outten',
+  'rff.rff@gmail.com'                       => 'Gabriele Renzi',
+  'skaar@waste.org'                         => 'skaar',
+  'stephan@spaceboyz.net'                   => 'Stephan Maka',
+}
+
 # * Browse and try the Examples in
 #     #{File.join(Gem.path, 'gems', 'ramaze-' + VERS, 'examples')}

data/rake_tasks/darcs.rake

@@ -0,0 +1,5 @@
+desc 'Apply a patch bundle to darcs repo'
+task :apply do
+  bundle = ENV['BUNDLE'] || ENV['bundle'] || 'bundle'
+  sh "darcs apply -v --reply=ramaze@googlegroups.com #{bundle}"
+end

data/rake_tasks/maintenance.rake

@@ -204,30 +204,21 @@ task 'tutorial' => ['tutorial2html'] do
 end
 
 def authors
-  author_map = {
-    'blueonyx@dev-area.net'                   => 'Martin Hilbig',
-    'clive@crous.co.za'                       => 'Clive Crous',
-    'comp.lang.zenix+ramaze@gmail.com'        => 'zenix',
-    'jesuswasramazing.10.pistos@geoshell.com' => 'Pistos',
-    'jesusisramazing.10.pistos@geoshell.com'  => 'Pistos',
-    'manveru@weez-int.com'                    => 'Michael Fellinger',
-    'm.fellinger@gmail.com'                   => 'Michael Fellinger',
-    'outtenr@gmail.com'                       => 'Richard Outten',
-    'rff.rff@gmail.com'                       => 'Gabriele Renzi',
-    'skaar@waste.org'                         => 'skaar',
-    'stephan@spaceboyz.net'                   => 'Stephan Maka',
-    'keita.yamaguchi@gmail.com'               => 'Keita Yamaguchi',
-  }
-
   mapping = {}
-  `darcs changes`.split("\n").grep(/^\w/).each do |line|
-    author = line.split[6..-1]
-    email  = author.pop.gsub(/<(.*?)>/, '\1')
-    name   = author.join(' ')
-    name   = author_map[email] if name.empty?
-    fail "#{email} doesn't have a name" unless name
-    mapping[name] ||= { :email => email, :patches => 0 }
-    mapping[name][:patches] += 1
+  `darcs show authors`.split("\n").each do |line|
+    atoms = line.split
+    patches = atoms.shift.to_i
+
+    if email = atoms.find{|a| a.gsub!(/(.*?@.*?)/, '\1') }
+      email.tr!('<>', '')
+      atoms.delete email
+    end
+
+    name = atoms.join(' ')
+    name = AUTHOR_MAP.fetch(email) if name.empty?
+    patches += mapping.fetch(name, {}).fetch(:patches, 0)
+
+    mapping[name] = { :email => email, :patches => patches }
   end
 
   max = mapping.map{|k,v| k.size }.max
@@ -246,10 +237,32 @@ task 'authors' do
   end
 end
 
+desc "show how many patches we made so far"
+task :patchsize do
+  patches = `darcs show repo`[/Num Patches: (\d+)/, 1].to_i
+  puts "currently we have #{patches} patches"
+  init = Time.parse("Sat Oct 14 04:22:49 JST 2006")
+  days = (Time.now - init) / (3600 * 24)
+  puts "%d days since init, avg %4.2f patches per day" % [days, patches/days]
+end
+
+desc "show who made how many patches"
+task :patchstat do
+  total = 0.0
+
+  authors.map do |name, hash|
+    patches = hash[:patches]
+    total += patches
+    [patches, name]
+  end.sort.reverse_each do |patches, name|
+    puts "%s %4d [%6.2f%% ]" % [name, patches, patches/total * 100]
+  end
+end
+
 desc "upload packages to rubyforge"
 task 'release' => ['distribute'] do
   sh 'rubyforge login'
-  #sh "rubyforge add_release ramaze ramaze #{VERS} pkg/ramaze-#{VERS}.gem"
+  sh "rubyforge add_release ramaze ramaze #{VERS} pkg/ramaze-#{VERS}.gem"
 
   require 'open-uri'
   require 'hpricot'

data/rake_tasks/spec.rake

@@ -33,7 +33,7 @@ task 'spec' do
   total = names.size
 
   list.zip(names).each_with_index do |(spec, name), idx|
-    print '%2d/%d: ' % [idx + 1, total]
+    print '%3d/%d: ' % [idx + 1, total]
     print name.ljust(width + 2)
 
     stdout = `#{bin} -I#{libpath} #{spec} 2>&1`

data/spec/contrib/auto_params.rb

@@ -4,11 +4,13 @@ spec_require 'ruby2ruby'
 Ramaze.contrib :auto_params
 
 module AnotherController
+  Ramaze::Helper::LOOKUP << self
+
   def another_page
     'another page'
   end
 
-  define_method(:css/'style.css') { 'style.css' }
+  define_method('css/style.css') { 'style.css' }
 end
 
 class MainController < Ramaze::Controller

data/spec/contrib/profiling.rb

@@ -0,0 +1,26 @@
+require 'spec/helper'
+
+spec_require 'ruby-prof'
+
+Ramaze.contrib :profiling
+
+class MainController < Ramaze::Controller
+  def index
+    100.times {"h" + "e" + "l" + "l" + "o"}
+  end
+end
+
+output = StringIO.new
+Ramaze::Inform.loggers << Ramaze::Informer.new(output)
+
+describe 'Profiling' do
+  behaves_like "http"
+  ramaze
+
+  it "should profile" do
+    get('/')
+    output.string.should =~ /Thread ID:\s\d+/
+    output.string.should =~ /Total:/
+    output.string.should =~ /self\s+total\s+self\s+wait\s+child\s+call/
+  end
+end

data/spec/examples/templates/template_redcloth.rb

@@ -1,7 +1,7 @@
 require 'spec/helper'
 
 spec_require 'redcloth'
-require 'examples/templates/template_redcloth'
+spec_require 'examples/templates/template_redcloth'
 
 describe 'Template RedCloth' do
   behaves_like 'http'

data/spec/examples/templates/template_tenjin.rb

@@ -0,0 +1,28 @@
+require 'spec/helper'
+
+spec_require 'tenjin'
+require 'examples/templates/template_tenjin'
+
+describe 'Template Tenjin' do
+  behaves_like 'http'
+  ramaze
+
+  it '/' do
+    html = get('/').body.strip
+    html.should =~ %r(<a href=\"/\">Home</a>)
+    html.should =~ %r(<a href=\"/internal\">internal</a>)
+    html.should =~ %r(<a href=\"/external\">external</a>)
+  end
+
+  %w[/internal /external].each do |url|
+    it url do
+      name = url.gsub(/^\//, '')
+      response = get(url)
+      response.status.should == 200
+      html = response.body
+      html.should.not == nil
+      html.should =~ %r(<title>Template::Tenjin #{name}</title>)
+      html.should =~ %r(<h1>The #{name} Template for Tenjin</h1>)
+    end
+  end
+end

data/spec/helper.rb

@@ -1,4 +1,3 @@
 ramaze_dir = File.expand_path(File.join(File.dirname(__FILE__), "../lib"))
 $LOAD_PATH.unshift(ramaze_dir)
-require "ramaze"
 require 'ramaze/spec/helper'