ramaze 0.1.4 → 0.2.0

data/lib/ramaze/snippets/numeric/filesize_format.rb

@@ -0,0 +1,19 @@
+#          Copyright (c) 2006 Michael Fellinger m.fellinger@gmail.com
+# All files in this distribution are subject to the terms of the Ruby license.
+
+class Numeric
+  FILESIZE_FORMAT = [
+      ['%.1fT', 1 << 40],
+      ['%.1fG', 1 << 30],
+      ['%.1fM', 1 << 20],
+      ['%.1fK', 1 << 10],
+    ]
+
+  def filesize_format
+    FILESIZE_FORMAT.each do |format, size|
+      return format % (self.to_f / size) if self >= size
+    end
+
+    self.to_s
+  end
+end

data/lib/ramaze/snippets/ordered_set.rb

@@ -0,0 +1,31 @@
+#          Copyright (c) 2006 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 =~ /^__/ }
+
+  def initialize(*args)
+    @set = *args
+    @set ||= []
+    @set = [@set] unless Array === @set
+    @set.uniq!
+  end
+
+  def method_missing(meth, *args, &block)
+    case meth.to_s
+    when /push|unshift|\<\</
+      @set.delete *args
+    when '[]='
+      @set.map! do |e|
+        if Array === args.last
+          args.last.include?(e) ? nil : e
+        else
+          args.last == e ? nil : e
+        end
+      end
+    end
+    @set.__send__(meth, *args, &block)
+  ensure
+    @set.delete nil
+  end
+end

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

@@ -5,7 +5,7 @@
 
 class String
 
-  # A convinient way to do File.join
+  # A convenient way to do File.join
   #
   # Example:
   #   'a' / 'b'                      # -> 'a/b'

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

@@ -10,6 +10,6 @@ class String
   #   'FooBar'.snake_case # => 'foo_bar'
 
   def snake_case
-    gsub(/\B[A-Z]/, '_\&').downcase.gsub(' ', '_')
+    gsub(/\B[A-Z][^A-Z]/, '_\&').downcase.gsub(' ', '_')
   end
 end

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

@@ -18,6 +18,10 @@ class Struct
   #  # => [15, 10]
 
   def values_at(*keys)
-    keys.map{|k| self[k.to_sym] }
+    if keys.all?{|key| key.respond_to?(:to_int) }
+      keys.map{|key| values[key.to_int] }
+    else
+      keys.map{|k| self[k] }
+    end
   end
 end

data/lib/ramaze/snippets/thread/into.rb

@@ -0,0 +1,25 @@
+# Copyright (c) 2006 Michael Fellinger m.fellinger@gmail.com
+# All files in this distribution are subject to the terms of the Ruby license.
+
+class Thread
+  # Copy following:
+  #   :action, :response, :request, :session,
+  #   :task, :adapter, :controller, :exception
+
+  def self.into
+    Thread.new(Thread.current) do |thread|
+      current = Thread.current
+
+      vars = Dir["#{Ramaze::BASEDIR}/**/*.rb"].
+        map{|f| File.readlines(f).
+          map{|l| l[/Thread\.current\[:([^\]]*)\]/, 1] } }
+
+      vars.flatten.compact.uniq.each do |var|
+        var = var.to_sym
+        current[var] = thread[var]
+      end
+
+      yield
+    end
+  end
+end

data/lib/ramaze/sourcereload.rb

@@ -11,23 +11,29 @@ module Ramaze
   # manner.
 
   class SourceReload
-    attr_accessor :thread, :interval, :reload_glob, :map
+    attr_accessor :thread, :interval, :map
 
-    # Take interval and a regular expression for files that are going to be reloaded.
-    def initialize interval = 1, reload_glob = %r{(^\./)|#{Dir.pwd}|ramaze}
-      @interval, @reload_glob = interval, reload_glob
+    # Reload everything which falls under this regex
+    trait :reload_glob => %r{(^\./)|#{Dir.pwd}|ramaze}
+
+    # Take interval for files that are going to be reloaded.
+
+    def initialize(interval = 1)
+      @interval = interval
       @map, @files, @paths = [], [], []
       @mtimes = {}
     end
 
     # start reloader-thread and assign it to this instance.
+
     def start
-      Inform.debug("initialize automatic source reload every #{interval} seconds")
+      Inform.dev("initialize automatic source reload every #{interval} seconds")
       @thread = reloader
     end
 
     # Takes value of Global.sourcereload and unless it's false calls #start
-    def self.startup options = {}
+
+    def self.startup(options = {})
       interval = Global.sourcereload
       instance = new(interval)
       Thread.main[:sourcereload] = instance
@@ -36,6 +42,7 @@ module Ramaze
     end
 
     # Start reload loop in separate Thread
+
     def reloader
       Thread.new do
         loop do
@@ -45,16 +52,17 @@ module Ramaze
       end
     end
 
-    # One iteration of reload will look for files that changed since the last iteration
-    # and will try to #safe_load it.
-    # This method is quite handy if you want direct control over when your code is reloaded
+    # One iteration of reload will look for files that changed since the last
+    # iteration and will try to #safe_load it.
+    # This method is quite handy if you want direct control over when your
+    # code is reloaded
     #
     # Usage example:
     #
-    # trap :HUB do
-    #   Ramaze::Inform.info "reloading source"
-    #   Thread.main[:sourcereload].reload
-    # end
+    #   trap :HUP do
+    #     Ramaze::Inform.info "reloading source"
+    #     Thread.main[:sourcereload].reload
+    #   end
     #
 
     def reload
@@ -71,32 +79,38 @@ module Ramaze
     end
 
     # Scans loaded features and paths for file-paths, filters them in the end
-    # according to the @reload_glob
+    # according to the trait[:reload_glob]
+
     def all_reload_files
-      files, paths = $LOADED_FEATURES, Array['', './', *$LOAD_PATH]
+      files = Array[$0, *$LOADED_FEATURES]
+      paths = Array['', './', *$LOAD_PATH]
 
       unless [@files, @paths] == [files, paths]
         @files, @paths = files.dup, paths.dup
 
         map = files.map do |file|
-          possible = paths.map{|pa| File.join(pa.to_s, file.to_s) }
-          possible.find{|po| File.exists?(po) }
+          paths.map{|pa|
+            File.expand_path(File.join(pa.to_s, file.to_s))
+          }.find{|po| File.exists?(po) }
         end
 
         @map = map.compact
       end
 
-      m = @map.grep(@reload_glob)
+      m = @map.grep(class_trait[:reload_glob])
     end
 
     # Safe mtime
+
     def mtime(file)
       File.mtime(file)
     rescue Errno::ENOENT
       false
     end
 
-    # A safe Kernel::load, issuing the SourceReloadHooks dependin on the result.
+    # A safe Kernel::load, issuing the SourceReloadHooks depending on the
+    # result.
+
     def safe_load(file)
       SourceReloadHooks.before_safe_load(file)
       load(file)
@@ -134,6 +148,12 @@ module Ramaze
     def after_safe_load_succeed(file)
       Cache.compiled.clear
       Cache.resolved.clear
+      SourceReloadHooks.after_safe_load(file)
+    end
+
+    # Overwrite to add custom hook in addition to default Cache cleaning
+
+    def after_safe_load(file)
     end
 
     # Overwrite to add actions after a file is Kernel::load-ed unsuccessfully,

data/lib/ramaze/spec/helper.rb

@@ -5,7 +5,7 @@ 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/context'
+require 'ramaze/spec/helper/browser'
 
 Spec::Runner.configure do |config|
   config.include MockHTTP
@@ -22,7 +22,10 @@ end
 # that will be merged with the default-options.
 
 def ramaze_start hash = {}
+  appdir = File.dirname(caller[0].split(':').first)
   options = {
+    :template_root => appdir/:template,
+    :public_root => appdir/:public,
     :adapter      => false,
     :run_loose    => true,
     :error_page   => false,

data/lib/ramaze/spec/helper/{context.rb → browser.rb}

@@ -1,3 +1,6 @@
+#          Copyright (c) 2006 Michael Fellinger m.fellinger@gmail.com
+# All files in this distribution are subject to the terms of the Ruby license.
+
 class Browser
   attr_reader :cookie
 

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

@@ -1,3 +1,6 @@
+#          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/spec/helper/wrap'
 
 class SpecLayout

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

@@ -1,3 +1,6 @@
+#          Copyright (c) 2006 Michael Fellinger m.fellinger@gmail.com
+# All files in this distribution are subject to the terms of the Ruby license.
+
 require 'timeout'
 
 begin

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

@@ -1,3 +1,6 @@
+#          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'
 require 'rack/mock'
 
@@ -40,7 +43,7 @@ module MockHTTP
   def process_request(path, query)
     options = {}
     FISHING.each{|key, value|
-      options[value] = query.delete(key)}
+      options[value] = query.delete(key)} if query.is_a?(Hash)
     [create_url(path, query), options]
   end
 
@@ -52,9 +55,9 @@ module MockHTTP
   end
 
 	def make_query query
-		return query unless query && query.class == Hash
-    query.inject([]) do |s, (key, value)|
-			s + [CGI::escape(key) + "=" + CGI::escape(value)]
-    end.join('&')
+		return query unless query and not query.is_a?(String)
+    query.map{|key, value|
+      "#{CGI::escape(key.to_s)}=#{CGI::escape(value.to_s)}"
+    }.join('&')
 	end
 end

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

@@ -1,3 +1,6 @@
+#          Copyright (c) 2006 Michael Fellinger m.fellinger@gmail.com
+# All files in this distribution are subject to the terms of the Ruby license.
+
 module Requester
   def get url = '/', hash = {}
     request(:get, url, hash)
@@ -10,7 +13,7 @@ module Requester
   def request method, url, hash = {}
     http = SimpleHttp.new(url2uri(url))
     if method == :get and not hash.empty?
-      http.uri.query = hash.inject([]){|s,(k,v)| s << "#{k}=#{v}"}.join('&')
+      http.uri.query = hash.map{|k,v| "#{k}=#{v}"}.join('&')
       hash = {}
     end
 

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

@@ -1,3 +1,6 @@
+#          Copyright (c) 2006 Michael Fellinger m.fellinger@gmail.com
+# All files in this distribution are subject to the terms of the Ruby license.
+
 require 'pp'
 require 'set'
 
@@ -9,7 +12,7 @@ end
 begin
   require 'systemu'
 rescue LoadError
-  puts "Please install systemu for better-looking results"
+  puts "Please install systemu for accurate results"
 
   # small drop-in replacement for systemu... far from perfect though, so please
   # install the library
@@ -65,7 +68,10 @@ class SpecWrap
   end
 
   def run
-    @specs.sort_by{|s| s.last}.each do |file, name|
+    total = @specs.size
+    n_width = (total.to_s.size * 2) + 4
+    @specs.sort_by{|s| s.last}.each_with_index do |(file, name), idx|
+      print "(#{idx+1}/#{total}) ".ljust(n_width)
       spec = SpecFile.new(file, name, term_width)
       spec.run
       spec.short_summary
@@ -118,7 +124,7 @@ class SpecFile
   end
 
   def init
-    print "Running #@name... ".ljust(@term_width + 20)
+    print "#@name ".ljust(@term_width + 10)
   end
 
   def execute
@@ -141,7 +147,8 @@ class SpecFile
     elsif failed?
       text = "#{total} specs - #{failed} failed".rjust(width)
       if @stdout =~ /Usually you should not worry about this failure, just install the/
-        lib = @stdout.scan(/^no such file to load -- (.*?)$/).flatten.first
+        lib = @stdout[/^no such file to load -- (.*?)$/, 1] ||
+              @stdout[/RubyGem version error: (.*)$/, 1]
         text = "needs #{lib}".center(width)
         @mark_passed = true
       end
@@ -154,9 +161,10 @@ class SpecFile
   end
 
   def long_summary
-    puts "[ #@name ]".center(80, '-'), "ExitStatus:".yellow
-    pp @status
-    puts "StdOut:".yellow, @stdout, "StdErr:".yellow, @stderr
+    puts "[ #@name ]".center(80, '-')
+    puts "ExitStatus:".yellow, PP.pp(@status)
+    puts "StdOut:".yellow, @stdout
+    puts "StdErr:".yellow, PP.pp(@stderr, '')
   end
 
   def parse

data/lib/ramaze/template.rb

@@ -16,7 +16,8 @@ module Ramaze
 
     ENGINES = {} unless defined?(ENGINES)
 
-    %w[ Amrita2 Erubis Haml Liquid Markaby Remarkably Sass ].each do |const|
+    %w[ Amrita2 Erubis Haml Liquid Markaby Nagoro None Remarkably Sass XSLT ].
+      each do |const|
       autoload(const, "ramaze/template/#{const.downcase}")
     end
 
@@ -63,7 +64,10 @@ module Ramaze
 
         def wrap_compile(action, template = nil)
           template ||= reaction_or_file(action).to_s
+          caching_compile(action, template)
+        end
 
+        def caching_compile(action, template)
           if Global.compile
             Cache.compiled[action.relaxed_hash] ||= compile(action, template)
           else

data/lib/ramaze/template/ezamar/engine.rb

@@ -12,7 +12,6 @@ require 'digest/sha1'
 module Ezamar
 
   require 'ramaze/template/ezamar/element'
-  require 'ramaze/template/ezamar/morpher'
 
   # This class is responsible for initializing and compiling the template.
 
@@ -56,11 +55,11 @@ module Ezamar
       start_heredoc, end_heredoc = "\n<<#{start_heredoc}\n", "\n#{start_heredoc}\n"
       bufadd = "_out_ << "
 
-      temp.gsub!(/<%\s+(.*?)\s+%>/m,
+      temp.gsub!(/<%(?!=)\s*(.*?)\s*%>/m,
             "#{end_heredoc} \\1; #{bufadd} #{start_heredoc}")
       temp.gsub!(/<\?r\s+(.*?)\s+\?>/m,
             "#{end_heredoc} \\1; #{bufadd} #{start_heredoc}")
-      temp.gsub!(/<%=\s+(.*?)\s+%>/m,
+      temp.gsub!(/<%=\s*(.*?)\s*%>/m,
             "#{end_heredoc} #{bufadd} (\\1); #{bufadd} #{start_heredoc}")
 
       @compiled = "_out_ = ''

data/lib/ramaze/template/ezamar/morpher.rb

@@ -2,6 +2,12 @@
 # All files in this distribution are subject to the terms of the Ruby license.
 
 require 'ramaze/template/ezamar/engine'
+begin
+  require 'hpricot'
+rescue LoadError => ex
+  Ramaze::Inform.error "Please install hpricot (for example via `gem install hpricot`) to get morphing"
+  puts ex
+end
 
 # This applies a morphing-replace for the template.
 #
@@ -20,16 +26,16 @@ require 'ramaze/template/ezamar/engine'
 # from:
 #   Ramaze::Template::Ezamar::TRANSFORM_PIPELINE
 # or do:
-#   Ramaze::Morpher.trait[:morphs] = {}
+#   Ramaze::Morpher::MORPHS.clear
 #
 # The latter is a tad slower, but i mention the possibility in case you
 # find good use for it.
 #
-# You can add your own morphers in Ramaze::Morpher.trait[:morphs]
+# You can add your own morphers in Ramaze::Morpher::MORPHS
 #
 # For Example:
 #
-#   Morpher.trait[:morphs]['if'] = '<?r %morph %expression ?>%content<?r end ?>'
+#   Morpher::MORPHS['if'] = '<?r %morph %expression ?>%content<?r end ?>'
 #
 # Now, assuming that some tag in your template is '<a if="@foo">x</a>'
 #
@@ -40,12 +46,12 @@ require 'ramaze/template/ezamar/engine'
 class Ezamar::Morpher
 
   # Use this trait to define your custom morphs.
-  trait :morphs => {
-                      'if'     => '<?r %morph %expression ?>%content<?r end ?>',
-                      'unless' => '<?r %morph %expression ?>%content<?r end ?>',
-                      'for'    => '<?r %morph %expression ?>%content<?r end ?>',
-                      'each'   => '<?r %expression.%morph do |_e| ?>%content<?r end ?>',
-                      'times'  => '<?r %expression.%morph do |_t| ?>%content<?r end ?>',
+  MORPHS = {
+            'if'     => '<?r %morph %expression ?>%content<?r end ?>',
+            'unless' => '<?r %morph %expression ?>%content<?r end ?>',
+            'for'    => '<?r %morph %expression ?>%content<?r end ?>',
+            'each'   => '<?r %expression.%morph do |_e| ?>%content<?r end ?>',
+            'times'  => '<?r %expression.%morph do |_t| ?>%content<?r end ?>',
   }
 
   # Since the functionality is best explained by examples, here they come.
@@ -107,49 +113,24 @@ class Ezamar::Morpher
   #   - Add pure Ruby implementation as a fall-back.
 
   def self.transform(template)
-    morphs =
-      trait[:morphs].map{|k,v| [k.to_s, v.to_s]}.select do |(k,v)|
-        template.to_s.include?("#{k}=")
-      end
-
-    morphs = Hash[*morphs.flatten]
-
-    return template if morphs.empty?
-
-    require 'hpricot'
-
+    template = template.to_s
     hp = Hpricot(template)
-    hp.each_child do |child|
-      if child.elem?
-        morphs.each_pair do |morph, replacement|
-          if expression = child[morph]
-            old = child.to_html
-            child.remove_attribute(morph)
-
-            replacement = replacement.dup.
-              gsub('%morph',      morph).
-              gsub('%expression', expression).
-              gsub('%content',    child.to_html)
-
-            template.gsub!(old, replacement)
-          end
-        end
-      end
-    end
 
-    template
+    MORPHS.each do |morph, replacement|
+      hp.search("[@#{morph}]") do |elem|
+        expr = elem[morph]
 
-  rescue LoadError => ex
-    error "Please install hpricot (for example via `gem install hpricot`) to get morphing"
+        elem.remove_attribute(morph)
 
-    # replace this method with a stub that only returns the template.
+        repl = replacement.
+          sub('%morph', morph).
+          sub('%expression', expr).
+          sub('%content', elem.to_html)
 
-    self.class_eval do
-      def self.transform(template)
-        template
+        elem.swap(repl)
       end
     end
 
-    template
+    hp.to_html
   end
 end