ramaze 0.2.1 → 0.3.0

data/lib/ramaze/spec/helper/requester.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 Requester

data/lib/ramaze/spec/helper/simple_http.rb

@@ -62,7 +62,6 @@ require 'net/http'
 require 'net/https'
 require 'uri'
 require 'cgi'
-require 'base64'
 
 
 # Wrapper around ruby's standard net/http classes. Currently, only GET
@@ -146,8 +145,10 @@ class SimpleHttp
 			# anything other than GET, for that matter.)
 
       case request
-      when Net::HTTP::Get  : sh.get
-      when Net::HTTP::Post : sh.post
+      when Net::HTTP::Get
+        sh.get
+      when Net::HTTP::Post
+        sh.post
 			else
 				raise "Not a valid HTTP method for redirection: #{request.class}"
 			end
@@ -201,7 +202,7 @@ class SimpleHttp
 	#
 
 	def basic_authentication usr, pwd
-		str = Base64.encode64("#{usr}:#{pwd}")
+		str = ["#{usr}:#{pwd}"].pack("*m")
 		str = "Basic #{str}"
 		@request_headers["Authorization"]=str
 	end

data/lib/ramaze/spec/helper/snippets.rb

@@ -0,0 +1,6 @@
+if caller
+  snippet = caller.grep(%r!spec/snippets/!).first.split(':').first
+  require File.expand_path(snippet).gsub('/spec/', '/lib/ramaze/')
+end
+
+require 'lib/ramaze/spec/helper/bacon'

data/lib/ramaze/store/default.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 'yaml/store'

data/lib/ramaze/template.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.
 
 # This module serves as a namespace for all templates, it will autoload

data/lib/ramaze/template/amrita2.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 'amrita2/template'
@@ -22,13 +22,14 @@ module Ramaze
         # The parameters are set to @params in the controller before expansion.
 
         def transform action
-          instance, params, file =
-            action.instance, action.params, action.template
-          raise_no_action(action) unless file
+          instance, file = action.instance, action.template
+
+          raise Ramaze::Error::NoAction,
+                "No Amrita2 template found for `#{action.path}' on #{action.controller}" unless file
 
           template = ::Amrita2::TemplateFile.new(file)
           out = ''
-          instance.instance_variable_set('@params', params)
+          instance.instance_variable_set('@params', action.params)
           template.expand(out, instance)
           out
         end

data/lib/ramaze/template/erubis.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 'erubis'

data/lib/ramaze/template/ezamar.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/template/ezamar/engine'

data/lib/ramaze/template/ezamar/element.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.
 
 # an Element is almost like an Controller, however, instead

data/lib/ramaze/template/ezamar/engine.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'

data/lib/ramaze/template/ezamar/morpher.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/template/ezamar/engine'

data/lib/ramaze/template/ezamar/render_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.
 
 require 'ramaze/template/ezamar/engine'

data/lib/ramaze/template/haml.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 'haml/engine'

data/lib/ramaze/template/liquid.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 'liquid'

data/lib/ramaze/template/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.
 
 require 'markaby'

data/lib/ramaze/template/nagoro.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 'nagoro'
@@ -12,9 +12,7 @@ module Ramaze
 
       ENGINES[self] = %w[ xhtml nag ]
 
-      LISTENERS = [ :Element, :Morpher, :Include, :Instruction ]
-
-      TEMPLATE = ::Nagoro::Template[LISTENERS]
+      PIPES = ::Nagoro::DEFAULT_PIPES.dup
 
       class << self
 
@@ -23,7 +21,7 @@ module Ramaze
         def transform action
           nagoro = wrap_compile(action)
           file = action.template || action.method
-          nagoro.result(action.binding, file.to_s)
+          nagoro.result(:file => file, :binding => action.binding)
         end
 
         def wrap_compile(action, template = nil)
@@ -45,7 +43,7 @@ module Ramaze
         # and returning an instance of ::Nagoro::Template
 
         def compile(action, template)
-          TEMPLATE.render(template)
+          ::Nagoro.compile(template)
         end
       end
     end

data/lib/ramaze/template/none.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/template/remarkably.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 'remarkably/engines/html'

data/lib/ramaze/template/sass.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 'sass/engine'

data/lib/ramaze/tool.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::Tool

data/lib/ramaze/tool/create.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 'fileutils'
@@ -29,6 +29,11 @@ module Ramaze
           @basedir = ::Ramaze::BASEDIR / 'proto'
           @destdir = Dir.pwd / project
 
+          if File.directory?(@destdir)
+            puts "Error: #{project}/ already exists. Rename or delete directory and try again."
+            return
+          end
+
           puts "Creating project #{project}"
 
           FileUtils.mkdir_p(project)
@@ -41,6 +46,7 @@ module Ramaze
           create_dirs(*directories)
           copy_files(*files)
 
+          puts "\nStart your new ramaze app: ruby #{project}/start.rb"
         end
 
         # create the directories recursivly

data/lib/ramaze/tool/localize.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.
 
 $KCODE = 'UTF-8'
@@ -74,23 +74,16 @@ class Ramaze::Tool::Localize
     # not available, it falls back to the default language.
 
     def localize(str, locale)
-      trans = nil
       default_language = trait[:default_language]
       dict = dictionary
+      dict[locale] ||= {}
+      dict[default_language] ||= {}
 
-      if dict[locale] && trans = dict[locale][str]
-        #
-      elsif dict[default_language] && trans = dict[default_language][str]
-        dict[locale] ||= {}
-        dict[locale][str] = str
-      else
-        dict[locale] ||= {}
-        dict[default_language] ||= {}
-        dict[locale][str] = str
-        dict[default_language][str] = str
-      end
+      trans = dict[locale].fetch(str, dict[default_language][str])
+      dict[locale][str] ||= trans
+      dict[default_language][str] ||= trans
 
-      trans || str
+      trans
     rescue Object => ex
       Ramaze::Inform.error(ex)
       str

data/lib/ramaze/tool/mime.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 'yaml'

data/lib/ramaze/tool/record.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/trinity.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/request'

data/lib/ramaze/trinity/request.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 'cgi'
@@ -29,7 +29,7 @@ module Ramaze
     # first it tries to match your method with any of the HTTP parameters
     # then, in case that fails, it will relay to @request
 
-    def method_missing meth, *args, &block
+    def method_missing meth, *args
       key = meth.to_s.upcase
       return env[key] if env.has_key?(key)
       super
@@ -58,6 +58,8 @@ module Ramaze
       address = address.to_s.split(',').first
       addr = IPAddr.new(address)
       LOCAL.find{|range| range.include?(addr) }
+    rescue ArgumentError => ex
+      raise ArgumentError, ex unless ex.message == 'invalid address'
     end
 
     def [](key, *rest)

data/lib/ramaze/trinity/response.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/trinity/session.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.
 
 if RUBY_VERSION >= "1.9.0"
@@ -211,6 +211,12 @@ module Ramaze
       combined.inspect
     end
 
+    # Delete a key
+
+    def delete(key)
+      session[:FLASH].delete(key)
+    end
+
     private
 
     # Session.current or {}

data/lib/ramaze/version.rb

@@ -1,11 +1,11 @@
-#          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 #:nodoc:
   module Version #:nodoc:
     MAJOR = 0
-    MINOR = 2
-    TINY  = 1
+    MINOR = 3
+    TINY  = 0
 
     STRING = [MAJOR, MINOR, TINY].join('.')
   end

data/lib/vendor/bacon.rb

@@ -0,0 +1,317 @@
+# Bacon -- small RSpec clone.
+#
+# "Truth will sooner come out from error than from confusion." ---Francis Bacon
+
+# Copyright (C) 2007 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"
+
+  Counter = Hash.new(0)
+  ErrorLog = ""
+  Shared = Hash.new { |_, name|
+    raise NameError, "no such context: #{name.inspect}"
+  }
+
+  RestrictName    = //  unless defined? RestrictName
+  RestrictContext = //  unless defined? RestrictContext
+
+  def self.summary_on_exit
+    return  if Counter[:installed_summary] > 0
+    at_exit {
+      handle_summary
+      if $!
+        raise $!
+      elsif Counter[:errors] + Counter[:failed] > 0
+        exit 1
+      end
+    }
+    Counter[:installed_summary] += 1
+  end
+
+  module SpecDoxOutput
+    def handle_specification(name)
+      puts name
+      yield
+      puts
+    end
+
+    def handle_requirement(description)
+      print "- #{description}"
+      error = yield
+      puts error.empty? ? "" : " [#{error}]"
+    end
+
+    def handle_summary
+      print ErrorLog
+      puts "%d specifications (%d requirements), %d failures, %d errors" %
+        Counter.values_at(:specifications, :requirements, :failed, :errors)
+    end
+  end
+
+  module TestUnitOutput
+    def handle_specification(name)
+      yield
+    end
+
+    def handle_requirement(description)
+      error = yield
+      if error.empty?
+        print "."
+      else
+        print error[0..0]
+      end
+    end
+
+    def handle_summary
+      puts "", ErrorLog
+      puts "%d tests, %d assertions, %d failures, %d errors" %
+        Counter.values_at(:specifications, :requirements, :failed, :errors)
+    end
+  end
+
+  module TapOutput
+    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]
+      else
+        printf "not ok %-4d # %s: %s\n" %
+          [Counter[:specifications], description, error]
+        puts ErrorLog.strip.gsub(/^/, '# ')
+      end
+    end
+
+    def handle_summary
+      puts "1..#{Counter[:specifications]}"
+      puts "# %d tests, %d assertions, %d failures, %d errors" %
+        Counter.values_at(:specifications, :requirements, :failed, :errors)
+    end
+  end
+
+  extend SpecDoxOutput          # default
+
+  class Error < RuntimeError
+    attr_accessor :count_as
+
+    def initialize(count_as, message)
+      @count_as = count_as
+      super message
+    end
+  end
+
+  class Context
+    def initialize(name, &block)
+      @before = []
+      @after = []
+      @name = name
+
+      return  unless name =~ RestrictContext
+      Bacon.handle_specification(name) do
+        instance_eval(&block)
+      end
+    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
+    end
+
+    def it(description, &block)
+      return  unless description =~ RestrictName
+      Counter[:specifications] += 1
+      run_requirement description, block
+    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) }
+        rescue Object => e
+          ErrorLog << "#{e.class}: #{e.message}\n"
+          e.backtrace.find_all { |line| line !~ /bin\/bacon|\/bacon\.rb:\d+/ }.
+            each_with_index { |line, i|
+            ErrorLog << "\t#{line}#{i==0 ? ": #@name - #{description}" : ""}\n"
+          }
+          ErrorLog << "\n"
+
+          if e.kind_of? Error
+            Counter[e.count_as] += 1
+            e.count_as.to_s.upcase
+          else
+            Counter[:errors] += 1
+            "ERROR: #{e.class}"
+          end
+        else
+          ""
+        ensure
+          Counter[:depth] -= 1
+        end
+      end
+    end
+
+    def raise?(*args, &block); block.raise?(*args); end
+    def throw?(*args, &block); block.throw?(*args); end
+    def change?(*args, &block); block.change?(*args); end
+  end
+end
+
+
+class Object
+  def true?; false; end
+  def false?; false; end
+end
+
+class TrueClass
+  def true?; true; end
+end
+
+class FalseClass
+  def false?; true; end
+end
+
+class Proc
+  def raise?(*exceptions)
+    exceptions << RuntimeError if exceptions.empty?
+    call
+
+    # Only to work in 1.9.0, rescue with splat doesn't work there right now
+  rescue Object => e
+    case e
+    when *exceptions
+      e
+    else
+      raise e
+    end
+  else
+    false
+  end
+
+  def throw?(sym)
+    catch(sym) {
+      call
+      return false
+    }
+    return true
+  end
+
+  def change?
+    pre_result = yield
+    called = call
+    post_result = yield
+    pre_result != post_result
+  end
+end
+
+class Numeric
+  def close?(to, delta)
+    (to.to_f - self).abs <= delta.to_f  rescue false
+  end
+end
+
+
+class Object
+  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
+end
+
+
+class Should
+  # Kills ==, ===, =~, eql?, equal?, frozen?, instance_of?, is_a?,
+  # kind_of?, nil?, respond_to?, tainted?
+  instance_methods.each { |method|
+    undef_method method  if method =~ /\?|^\W+$/
+  }
+
+  def initialize(object)
+    @object = object
+    @negated = false
+  end
+
+  def not(*args, &block)
+    @negated = !@negated
+
+    if args.empty?
+      self
+    else
+      be(*args, &block)
+    end
+  end
+
+  def be(*args, &block)
+    if args.empty?
+      self
+    else
+      block = args.shift  unless block_given?
+      satisfy(*args, &block)
+    end
+  end
+
+  alias a  be
+  alias an be
+
+  def satisfy(*args, &block)
+    if args.size == 1 && String === args.first
+      description = args.shift
+    else
+      description = ""
+    end
+
+    r = yield(@object, *args)
+    if Bacon::Counter[:depth] > 0
+      raise Bacon::Error.new(:failed, description)  unless @negated ^ r
+      Bacon::Counter[:requirements] += 1
+    end
+    @negated ^ r ? r : false
+  end
+
+  def method_missing(name, *args, &block)
+    name = "#{name}?"  if name.to_s =~ /\w[^?]\z/
+
+    desc = @negated ? "not " : ""
+    desc << @object.inspect << "." << name.to_s
+    desc << "(" << args.map{|x|x.inspect}.join(", ") << ") failed"
+
+    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
+  alias same_as identical_to
+
+  def flunk(reason="Flunked")
+    raise Bacon::Error.new(:failed, reason)
+  end
+end