ramaze 0.2.1 → 0.3.0

data/lib/ramaze/snippets/kernel/constant.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/pretty_inspect.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 'pp'

data/lib/ramaze/snippets/numeric/filesize_format.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 Numeric

data/lib/ramaze/snippets/object/traits.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.
 
 Traits = Hash.new{|h,k| h[k] = {}} unless defined?(Traits)

data/lib/ramaze/snippets/ordered_set.rb

@@ -1,13 +1,18 @@
-#          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 OrderedSet
-  instance_methods.each { |m| undef_method m unless m =~ /^__/ }
+require File.join(File.dirname(__FILE__), 'blankslate')
 
+class OrderedSet < BlankSlate
   def initialize(*args)
-    @set = *args
+    if args.size == 1
+      @set = args.shift
+    else
+      @set = *args
+    end
+
     @set ||= []
-    @set = [@set] unless Array === @set
+    @set = [@set] unless ::Array === @set
     @set.uniq!
   end
 
@@ -17,7 +22,7 @@ class OrderedSet
       @set.delete *args
     when '[]='
       @set.map! do |e|
-        if Array === args.last
+        if ::Array === args.last
           args.last.include?(e) ? nil : e
         else
           args.last == e ? nil : e
@@ -26,6 +31,6 @@ class OrderedSet
     end
     @set.__send__(meth, *args, &block)
   ensure
-    @set.delete nil
+    @set.compact! if meth == :[]=
   end
 end

data/lib/ramaze/snippets/ramaze/caller_info.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/snippets/ramaze/caller_lines.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/snippets/string/camel_case.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 String

data/lib/ramaze/snippets/string/color.rb

@@ -1,12 +1,10 @@
-#          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 String
 
 class String
-
-  {
-    :reset          =>  0,
+  { :reset          =>  0,
     :bold           =>  1,
     :dark           =>  2,
     :underline      =>  4,

data/lib/ramaze/snippets/string/each.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 String

data/lib/ramaze/snippets/string/ord.rb

@@ -0,0 +1,15 @@
+#          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 String
+
+class String
+  unless method_defined?(:ord)
+
+    # compatibility with Ruby 1.9
+
+    def ord
+      self[0]
+    end
+  end
+end

data/lib/ramaze/snippets/string/snake_case.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 String

data/lib/ramaze/snippets/struct/fill.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 Struct
@@ -12,8 +12,10 @@ class Struct
 
   def self.fill(hash = {})
     instance = new
+    to_s = members.first.respond_to?(:to_str)
     hash.each do |key, value|
-      next unless members.include?(key.to_s)
+      key = to_s ? key.to_s : key.to_sym
+      next unless members.include?(key)
       instance.send("#{key}=", value)
     end
     instance

data/lib/ramaze/snippets/struct/values_at.rb

@@ -1,10 +1,10 @@
-#          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 Struct
 
 class Symbol
-  undef_method :to_int
+  undef_method :to_int if method_defined?(:to_int)
 end
 
 class Struct

data/lib/ramaze/snippets/symbol/to_proc.rb

@@ -1,17 +1,24 @@
-#          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 Symbol
 
 class Symbol
+  unless method_defined?(:to_proc)
 
-  # the well-known #to_proc
-  # creates a lambda that sends the symbol and any further arguments
-  # to the object yielded.
-  #   [1, 2, 3].map(&:to_s)    # => ['1', '2', '3']
-  #   %w[a b c].map(&:to_sym)  # => [:a, :b, :c]
+    # Turns the symbol into a simple proc, which is especially useful for enumerations. Examples:
+    #
+    #   # The same as people.collect { |p| p.name }
+    #   people.collect(&:name)
+    #
+    #   # The same as people.select { |p| p.manager? }.collect { |p| p.salary }
+    #   people.select(&:manager?).collect(&:salary)
+    #
+    #   [1, 2, 3].map(&:to_s)    # => ['1', '2', '3']
+    #   %w[a b c].map(&:to_sym)  # => [:a, :b, :c]
 
-  def to_proc
-    lambda{|o, *args| o.send(self, *args) }
+    def to_proc
+      Proc.new{|*args| args.shift.__send__(self, *args) }
+    end
   end
 end

data/lib/ramaze/snippets/thread/into.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 Thread

data/lib/ramaze/sourcereload.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'
@@ -14,7 +14,7 @@ module Ramaze
     attr_accessor :thread, :interval, :map
 
     # Reload everything which falls under this regex
-    trait :reload_glob => %r{(^\./)|#{Dir.pwd}|ramaze}
+    trait :reload_glob => Regexp.union(/^\.\//, Dir.pwd, 'ramaze')
 
     # Take interval for files that are going to be reloaded.
 
@@ -97,7 +97,7 @@ module Ramaze
         @map = map.compact
       end
 
-      m = @map.grep(class_trait[:reload_glob])
+      @map.grep(class_trait[:reload_glob])
     end
 
     # Safe mtime
@@ -148,6 +148,7 @@ module Ramaze
     def after_safe_load_succeed(file)
       Cache.compiled.clear
       Cache.resolved.clear
+      Cache.action_methods.clear
       SourceReloadHooks.after_safe_load(file)
     end
 

data/lib/ramaze/spec/helper.rb

@@ -1,27 +1,17 @@
-#          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/spec/helper/minimal'
-require 'ramaze/spec/helper/mock_http'
-require 'ramaze/spec/helper/simple_http'
-require 'ramaze/spec/helper/requester'
-require 'ramaze/spec/helper/browser'
-
-Spec::Runner.configure do |config|
-  config.include MockHTTP
+begin
+  require 'rubygems'
+rescue LoadError => ex
 end
 
+require 'timeout'
 
-if defined?(::Spec)
-  exclude = Ramaze::Controller.class_trait[:exclude_action_modules]
-  exclude += [Base64::Deprecated, Base64, Spec::Expectations::ObjectExpectations]
-  exclude << Spec::Mocks::Methods if defined?(Spec::Mock::Methods)
-end
+require 'ramaze'
+require 'ramaze/spec/helper/bacon'
 
-# start up ramaze with a given hash of options
-# that will be merged with the default-options.
-
-def ramaze_start hash = {}
+def ramaze(options = {})
   appdir = File.dirname(caller[0].split(':').first)
   options = {
     :template_root => appdir/:template,
@@ -32,27 +22,22 @@ def ramaze_start hash = {}
     :port         => 7007,
     :host         => '127.0.0.1',
     :force        => true,
+    :sourcereload => false,
     :origin       => :spec,
-  }.merge(hash)
+  }.merge(options)
 
   Ramaze.start(options)
 end
 
-alias ramaze ramaze_start
-
-# shutdown ramaze, this is not implemeted yet
-# (and might never be due to limited possibilites)
-
-def browser(*args, &block)
-  Browser.new(*args, &block)
-end
-
+SPEC_REQUIRE_DEPENDENCY = {
+  'sequel' => %w[sqlite3 sequel_model sequel_core]
+}
 
 # require each of the following and rescue LoadError, telling you why it failed.
-
-def testcase_requires(*following)
-  following.each do |file|
-    require(file.to_s)
+def spec_require(*following)
+  following << following.map{|f| SPEC_REQUIRE_DEPENDENCY[f] }
+  following.flatten.uniq.compact.reverse.each do |file|
+    require file.to_s
   end
 rescue LoadError => ex
   puts ex
@@ -61,3 +46,71 @@ rescue LoadError => ex
   puts "library and try again (if you want to use that feature later on)"
   exit
 end
+
+def testcase_requires(*following)
+  warn "'testcase_requires' is being deprecated, please use 'spec_require' instead"
+  spec_require(*following)
+end
+
+shared "http" do
+  require 'ramaze/spec/helper/mock_http'
+  extend MockHTTP
+end
+
+shared 'browser' do
+  require 'ramaze/spec/helper/simple_http'
+  require 'ramaze/spec/helper/browser'
+end
+
+shared 'requester' do
+  require 'ramaze/spec/helper/requester'
+end
+
+shared 'xpath' do
+  behaves_like 'http'
+
+  require 'rexml/document'
+  require 'rexml/xpath'
+
+  include REXML
+
+  class Rack::MockResponse
+    def match(xpath = '*')
+      REXML::XPath::match(REXML::Document.new(body), xpath)
+    end
+    alias / match
+    alias search match
+
+    def first(xpath = '*')
+      REXML::XPath::first(REXML::Document.new(body), xpath)
+    end
+    alias at first
+
+    def each(xpath = '*', &block)
+      REXML::XPath::each(REXML::Document.new(body), xpath, &block)
+    end
+  end
+
+  def xp_match(obj, xpath = '*')
+    XPath::match(rexml_doc(body), xpath, &block)
+  end
+  alias xp_search xp_match
+
+  def xp_first(obj, xpath = '*')
+    XPath::first(rexml_doc(body), xpath, &block)
+  end
+  alias xp_at xp_first
+
+  def xp_each(obj, xpath = '*', &block)
+    XPath::each(rexml_doc(body), xpath, &block)
+  end
+
+  def rexml_doc(obj)
+    case obj
+    when REXML::Document, REXML::Element
+      obj
+    else
+      REXML::Document.new(obj)
+    end
+  end
+end

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

@@ -0,0 +1,7 @@
+libdir = File.expand_path(File.join(File.dirname(__FILE__), '../../../'))
+$LOAD_PATH.unshift libdir
+require 'vendor/bacon'
+require 'ramaze/spec/helper/pretty_output'
+Bacon.extend Bacon::PrettyOutput
+# Bacon.extend Bacon::TestUnitOutput
+Bacon.summary_on_exit

data/lib/ramaze/spec/helper/browser.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 Browser
@@ -51,7 +51,6 @@ class Browser
       hash.clear
     end
 
-    puts "#{method.to_s.upcase} => #{@http.uri}"
     response = @http.send(method, hash).strip
     @history << @http.uri
     get_cookie

data/lib/ramaze/spec/helper/mock_http.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'

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

@@ -0,0 +1,70 @@
+module Bacon
+  module PrettyOutput
+    NAME = ''
+
+    def handle_specification(name)
+      NAME.replace name
+      yield
+    end
+
+    def handle_requirement(description)
+      error = yield
+
+      unless error.empty?
+        if defined?(Ramaze::Informing)
+          puts '', " #{NAME} -- #{description} ".center(70, '-'), ''
+          colors = Ramaze::Informer::COLORS
+
+          until RamazeLogger.log.empty?
+            tag, line = RamazeLogger.log.shift
+            out = "%6s | %s" % [tag.to_s, line]
+            puts out.send(colors[tag])
+          end
+        end
+
+        general_error
+      end
+    end
+
+    def general_error
+      puts "", ErrorLog
+      ErrorLog.scan(/^\s*(.*?):(\d+): #{NAME} - (.*?)$/) do
+        puts "#{ENV['EDITOR'] || 'vim'} #$1 +#$2 # #$3"
+      end
+      ErrorLog.replace ''
+    end
+
+    def handle_summary
+      puts "%d tests, %d assertions, %d failures, %d errors" %
+        Counter.values_at(:specifications, :requirements, :failed, :errors)
+    end
+  end
+end
+
+if defined?(Ramaze::Informing)
+  module Ramaze
+    class SpecLogger
+      include Ramaze::Informing
+      include Enumerable
+
+      attr_accessor :log
+
+      def initialize
+        @log = []
+      end
+
+      def each
+        @log.each{|e| yield(e) }
+      end
+
+      def inform(tag, str)
+        @log << [tag, str]
+      end
+    end
+  end
+
+  module Bacon::PrettyOutput
+    RamazeLogger = Ramaze::SpecLogger.new
+    Ramaze::Inform.loggers = [RamazeLogger]
+  end
+end