ramaze 2008.06 → 2008.11

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

@@ -1,10 +1,10 @@
 #          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 Thread
+
 class Thread
-  # Copy following:
-  #   :action, :response, :request, :session,
-  #   :task, :adapter, :controller, :exception
+  # Copy all thread variables into the new thread
 
   def self.into *args
     Thread.new(Thread.current, *args) do |thread, *args|

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

@@ -1,7 +1,7 @@
-require 'bacon'
-
-dir = File.dirname(__FILE__)
-require File.join(File.dirname(__FILE__), 'pretty_output')
-
+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/mock_http.rb

@@ -57,7 +57,7 @@ module MockHTTP
 	def make_query query
 		return query unless query and not query.is_a?(String)
     query.map{|key, value|
-      "#{CGI::escape(key.to_s)}=#{CGI::escape(value.to_s)}"
+      "#{Rack::Utils.escape(key)}=#{Rack::Utils.escape(value)}"
     }.join('&')
 	end
 end

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

@@ -16,9 +16,9 @@ module Bacon
       error = yield
 
       unless error.empty?
-        if defined?(Ramaze::Logging::Logging)
+        if defined?(Ramaze::Logging)
           puts '', " #{NAME} -- #{description} [FAILED]".center(70, '-'), ''
-          colors = Ramaze::Logging::Logger::Informer::COLORS
+          colors = Ramaze::Logger::Informer::COLORS
 
           until RamazeLogger.history.empty?
             tag, line = RamazeLogger.history.shift

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

@@ -1,6 +1,14 @@
 if caller
   snippet = caller.grep(%r!spec/snippets/!).first.split(':').first
   require File.expand_path(snippet).gsub('/spec/', '/lib/ramaze/')
+
+  if defined?(Ramaze::CoreExtensions)
+    Ramaze::CoreExtensions.constants.each do |const|
+      ext = Ramaze::CoreExtensions.const_get(const)
+      into = Module.const_get(const)
+      into.__send__(:include, ext)
+    end
+  end
 end
 
 require 'lib/ramaze/spec/helper/bacon'

data/lib/ramaze/template.rb

@@ -16,7 +16,10 @@ module Ramaze
 
     ENGINES = {} unless defined?(ENGINES)
 
-    AVAILABLE_ENGINES = %w[ Amrita2 Builder Erubis Haml Liquid Markaby Nagoro None RedCloth Remarkably Sass XSLT Tenjin Tagz ]
+    AVAILABLE_ENGINES = %w[
+      Amrita2 Builder Erubis Haml Liquid Markaby Maruku Nagoro None RedCloth
+      Remarkably Sass Tagz Tenjin XSLT
+    ]
 
     AVAILABLE_ENGINES.each do |const|
       autoload(const, "ramaze/template/#{const.downcase}")

data/lib/ramaze/template/ezamar/textpow.syntax

@@ -0,0 +1,34 @@
+--- 
+name: HTML (Ezamar)
+fileTypes:
+- xhtml
+scopeName: text.html.ruby
+uuid: 45D7E1FC-7D0B-4205-A1A2-3D10BB555A5C
+foldingStartMarker: |-
+  (?x)
+  		(<(?i:head|body|table|thead|tbody|tfoot|tr|div|select|fieldset|style|script|ul|ol|form|dl)\b.*?>
+  		|<!--(?!.*-->)
+  		|\{\s*($|\?>\s*$|//|/\*(.*\*/\s*$|(?!.*?\*/)))
+  		)
+patterns:
+- name: source.ruby.ezamar.embedded.html
+  captures:
+    "0":
+      name: punctuation.section.embedded.ruby
+  begin: "<?r"
+  end: "?>"
+  patterns:
+  - name: comment.line.number-sign.ruby
+    captures:
+      "1":
+        name: punctuation.definition.comment.ruby
+    match: (#).*?(?=-?\?>)
+  - include: source.ruby.ezamar
+- include: text.html.basic
+foldingStopMarker: |-
+  (?x)
+  		(</(?i:head|body|table|thead|tbody|tfoot|tr|div|select|fieldset|style|script|ul|ol|form|dl)>
+  		|^\s*-->
+  		|(^|\s)\}
+  		)
+keyEquivalent: ^~R

data/lib/ramaze/template/maruku.rb

@@ -0,0 +1,34 @@
+#          Copyright (c) 2008 Michael Fellinger m.fellinger@gmail.com
+# All files in this distribution are subject to the terms of the Ruby license.
+
+require 'maruku'
+
+module Ramaze
+  module Template
+
+    # Is responsible for compiling a template using the Ezamar templating engine.
+
+    class Maruku < Template
+
+      ENGINES[self] = %w[ mkd ]
+
+      class << self
+
+        # Transforms an action into the XHTML code for parsing and returns
+        # the result
+        def transform(action)
+          maruku = wrap_compile(action)
+          maruku.to_html
+        end
+
+        # Compile a template, applying all transformations from the pipeline
+        # and returning an instance of ::Ezamar::Template
+
+        def compile(action, template)
+          ::Maruku.new(template)
+        end
+      end
+    end
+  end
+end
+

data/lib/ramaze/template/tagz.rb

@@ -55,11 +55,11 @@ module Ramaze
         end
 
         def p *a
-          a.each{|elem| tagz << "#{ CGI.escapeHTML elem.inspect }#{ eol }"}
+          a.each{|elem| tagz << "#{ Rack::Utils.escape_html elem.inspect }#{ eol }"}
         end
 
         def pp *a
-          a.each{|elem| tagz << "#{ CGI.escapeHTML PP.pp(elem, '') }#{ eol }"}
+          a.each{|elem| tagz << "#{ Rack::Utils.escape_html PP.pp(elem, '') }#{ eol }"}
         end
 
         def eol

data/lib/ramaze/template/xslt.rb

@@ -55,8 +55,8 @@ module Ramaze
         end
 
         # Synchronize the block to run with the mutex
-        def ext_functions_synchronize &block
-          XSLT_EXT_FUNCTIONS_LOCK.synchronize &block
+        def ext_functions_synchronize(&block)
+          XSLT_EXT_FUNCTIONS_LOCK.synchronize(&block)
         end
 
         # Expose functors

data/lib/ramaze/tool/create.rb

@@ -1,6 +1,8 @@
 #          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/tool/project_creator'
+
 module Ramaze
   module Tool
 
@@ -14,60 +16,32 @@ module Ramaze
     # where project is the directory you want the content put into.
 
     class Create
-      class << self
-
-        # a method to create a new project by copying the contents of lib/proto
-        # to the position you specify (project)
-        #
-        # It is just a nice wrapper showing you what files/directories are put
-        # in place.
-
-        def create project
-          @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)
-
-          puts "Copying skeleton project to new project (#@destdir)..."
-
-          directories, files =
-            Dir[@basedir / '**' / '*'].partition{ |f| File.directory?(f) }
-
-          # gem packaging removes empty model directory, so add it in ourselves
-          create_dirs(*Array[ @basedir/'model', *directories ].uniq)
-          copy_files(*files)
-
-          puts "\nStart your new ramaze app: ruby #{project}/start.rb"
-        end
-
-        # create the directories recursivly
-
-        def create_dirs(*dirs)
-          dirs.each do |dir|
-            dest = dir.gsub(@basedir, @destdir)
-
-            puts "Create directory: '#{dest}'"
-            FileUtils.mkdir_p(dest)
-          end
-        end
-
-        # copy the files over
-
-        def copy_files(*files)
-          files.each do |file|
-            dest = file.gsub(@basedir, @destdir)
 
-            puts "Copy file: '#{dest}'"
-            FileUtils.cp(file, dest)
-          end
-        end
+      # Default options passed to Create::create
+      #   :proto  is the directory to duplicate
+      #   :amend  no files may be overwritten but missing files will be added
+      #   :force  will overwrite existing files
+      #   :layout copy one subdirectory in +proto+
+
+      DEFAULT = {
+        :proto => File.join(::Ramaze::BASEDIR, 'proto'),
+        :amend => false,
+        :force => false,
+        :layout => '/',
+      }
+
+      # Using ProjectCreator to copy all files and directories from lib/proto
+      # to another location.
+      # +options+ are described in the DEFAULT constant and should be:
+      #   :force  => (true|false|nil)
+      #   :amend  => (true|false|nil)
+      #   :layout => (String|nil)
+      #   :proto  => String
+
+      def self.create(project, options = {})
+        options = DEFAULT.merge(options)
+        creator = ProjectCreator.new(project, options)
+        creator.create
       end
     end
   end

data/lib/ramaze/tool/localize.rb

@@ -63,10 +63,14 @@ module Ramaze
 
         def call(response, options = {})
           return response unless trait[:enable]
-          return response if response.body.nil?
-          return response if response.body.respond_to?(:read)
-          response.body = localize_body(response.body, options)
-          response
+
+          body = []
+
+          response.body.each do |chunk|
+            body << localize_body(chunk, options)
+          end
+
+          response.body = body
         end
 
         # Localizes a response body.  It reacts to a regular expression as given

data/lib/ramaze/tool/mime.rb

@@ -15,10 +15,20 @@ module Ramaze
 
         # Get MIME-type for the given filename based on extension.
         # Answers with an empty string if none is found.
-        def type_for file
+        def type_for(file)
           ext = File.extname(file)
           trait[:types][ext].to_s
         end
+
+        def ext_for(mime)
+          exts = []
+
+          trait[:types].each do |ext, mime_type|
+            exts << ext if mime == mime_type
+          end
+
+          exts.sort_by{|e| e.size }.first
+        end
       end
     end
   end

data/lib/ramaze/tool/project_creator.rb

@@ -0,0 +1,110 @@
+#          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'
+require 'find'
+
+class ProjectCreator
+  PROTO = ['~/.proto/']
+  attr_accessor :name, :options
+
+  def initialize(name, options = {})
+    @name, @options = name, options
+  end
+
+  def target
+    File.expand_path(name)
+  end
+
+  def proto
+    PROTO.map!{|pr| File.expand_path(pr) }
+    proto = options[:proto] ||= PROTO.find{|f| File.directory?(f) }
+    layout = options[:layout] ||= '/'
+    File.expand_path(File.join(proto, layout))
+  end
+
+  def create_root?
+    return true unless File.directory?(target)
+    return true if amend? or force?
+    fatal "%p is a directory, choose different project name or use --amend/--force" % target
+  end
+
+  def got_proto?
+    return true if File.directory?(proto)
+    fatal "Cannot create, %p doesn't exist, use --proto or create the proto directory" % proto
+  end
+
+  def create
+    got_proto?
+
+    puts "Found proto at: %p, proceeding...\n\n" % proto
+    mkdir(relate('/')) if create_root?
+    proceed
+  end
+
+  def proceed
+    files, directories = partition{|path| File.file?(path) }
+    proceed_directories(directories)
+    proceed_files(files)
+  end
+
+  def proceed_files(files)
+    files.each{|file| copy(file, relate(file)) }
+  end
+
+  def proceed_directories(dirs)
+    dirs.each{|dir| mkdir(relate(dir)) }
+  end
+
+  def mkdir(dir)
+    exists = File.directory?(dir)
+    return if exists and amend?
+    return if exists and not force?
+    puts "mkdir(%p)" % dir
+    FileUtils.mkdir_p(dir)
+  end
+
+  def copy(from, to)
+    return unless copy_check(to)
+    puts "copy(%p, %p)" % [from, to]
+    FileUtils.cp(from, to)
+    post_process(to)
+  end
+
+  def copy_check(to)
+    exists = File.file?(to)
+    return if exists and amend?
+    return if exists and not force?
+    return true
+  end
+
+  # Think about a useful way to process the generated files it should be
+  # possible to substitute some things like the project name in the
+  # configuration
+
+  def post_process(file)
+    return
+    source = File.read(file)
+    File.open(file, 'w+') do |io|
+      io.write(source.gsub('$project', "'#@name'"))
+    end
+  end
+
+  def relate(path)
+    File.join(target, path.to_s.sub(proto, ''))
+  end
+
+  def amend?; options[:amend] end
+  def force?; options[:force] end
+
+  def fatal(message)
+    warn message
+    exit 1
+  end
+
+  def each
+    Dir["#{proto}/**/*"].each{|path| yield(path) }
+  end
+
+  include Enumerable
+end

data/lib/ramaze/trinity.rb

@@ -2,12 +2,15 @@
 # All files in this distribution are subject to the terms of the Ruby license.
 
 module Ramaze
+  STATE = State.new
 
   # The module to be included into the Controller it basically just provides
   # #request, #response and #session, each accessing Thread.current to
   # retrieve the demanded object
 
   module Trinity
-    thread_accessor :request, :response, :session
+    extend StateAccessor
+
+    state_accessor :request, :response, :session
   end
 end

data/lib/ramaze/version.rb

@@ -2,5 +2,5 @@
 # All files in this distribution are subject to the terms of the Ruby license.
 
 module Ramaze
-  VERSION = "2008.06"
+  VERSION = "2008.10"
 end