manveru-ramaze 2009.04.08 → 2009.04.18

data/CHANGELOG

@@ -1,3 +1,116 @@
+[afb3336 | Sat Apr 18 02:28:37 UTC 2009] Michael Fellinger <m.fellinger@gmail.com>
+
+  * Improve tasks a bit
+
+[a4bbc31 | Fri Apr 17 02:37:14 UTC 2009] TJ Vanderpoel <bougy.man@gmail.com>
+
+  * Only use /proc in bin/ramaze if possible, otherwise fall back to ps
+
+    Signed-off-by: Michael Fellinger <m.fellinger@gmail.com>
+
+[35bf7c2 | Fri Apr 17 01:36:28 UTC 2009] TJ Vanderpoel <bougy.man@gmail.com>
+
+  * Added status command and moved IRB.start inline instead of exec.
+
+    * Status needs testing on WIN32 and OSX
+    
+    Signed-off-by: Michael Fellinger <m.fellinger@gmail.com>
+
+[df495ae | Fri Apr 17 07:48:58 UTC 2009] Michael Fellinger <m.fellinger@gmail.com>
+
+  * Specify correct behaviour of Request#accept_language_with_weight
+
+[7cee203 | Fri Apr 17 11:52:23 UTC 2009] Michael Fellinger <m.fellinger@gmail.com>
+
+  * Bring various Sequel specific stuff up to date
+
+[21e2c4d | Thu Apr 16 03:01:32 UTC 2009] TJ Vanderpoel <bougy.man@gmail.com>
+
+  * Defaults to webrick on port 7000 when starting now
+
+    Signed-off-by: Michael Fellinger <m.fellinger@gmail.com>
+
+[bc09190 | Thu Apr 16 02:51:38 UTC 2009] TJ Vanderpoel <bougy.man@gmail.com>
+
+  * Fixed "ramaze start" so it doesn't try and start a new instance
+
+    * added is_running? and check_running? as helpers
+    * refactored #stop to pass it's given pid to find_pid
+    
+    Signed-off-by: Michael Fellinger <m.fellinger@gmail.com>
+
+[c29043d | Thu Apr 16 12:47:02 UTC 2009] Michael Fellinger <m.fellinger@gmail.com>
+
+  * Adding app.rb to proto, explain new convention
+
+[2e0d0ba | Thu Apr 16 03:33:16 UTC 2009] Michael Fellinger <m.fellinger@gmail.com>
+
+  * Make sure proto spec runs in right directory
+
+[1a8c518 | Thu Apr 16 03:17:58 UTC 2009] Michael Fellinger <m.fellinger@gmail.com>
+
+  * Proto should use Etanni as well
+
+[146a4d6 | Thu Apr 16 03:05:43 UTC 2009] Michael Fellinger <m.fellinger@gmail.com>
+
+  * Remove old layout from proto
+
+[95e4e98 | Wed Apr 15 10:59:47 UTC 2009] Michael Fellinger <m.fellinger@gmail.com>
+
+  * Fix nagoro/render_partial, sorry for the mess
+
+[9eb1cf0 | Wed Apr 15 10:59:10 UTC 2009] Michael Fellinger <m.fellinger@gmail.com>
+
+  * Remove String#each, we are compatible with Rack spec
+
+[f95cdae | Wed Apr 15 02:12:02 UTC 2009] Michael Fellinger <m.fellinger@gmail.com>
+
+  * Use the render helper for nagoro/render_partial
+
+[730b17f | Mon Apr 13 14:35:18 UTC 2009] Michael Fellinger <m.fellinger@gmail.com>
+
+  * Try to please the github syntax highlighter
+
+[152aad6 | Mon Apr 13 04:58:24 UTC 2009] Michael Fellinger <m.fellinger@gmail.com>
+
+  * Rename Request#to_ivs to Request#to_instance_variables and add to_ivs alias for it
+
+[425e8ff | Sat Apr 11 04:18:39 UTC 2009] Michael Fellinger <m.fellinger@gmail.com>
+
+  * Make Rapp example run
+
+[518ab37 | Fri Apr 10 12:30:24 UTC 2009] Michael Fellinger <m.fellinger@gmail.com>
+
+  * Port specs to rack-test
+
+    * This breaks the spec for httpdigest helper since rack assumes that
+      plaintext auth consits of ['user:pass'].pack('m*') and we consider
+      plaintext auth as MD5 digest auth which includes the realm.
+
+[18fabfc | Fri Apr 10 10:31:17 UTC 2009] Michael Fellinger <m.fellinger@gmail.com>
+
+  * Add a `rake setup` task that takes care of installing dependencies
+
+[9567c23 | Thu Apr 09 11:00:33 UTC 2009] Michael Fellinger <m.fellinger@gmail.com>
+
+  * More improvments and fixes to the localize helper
+
+[e0d48c3 | Thu Apr 09 11:00:03 UTC 2009] Michael Fellinger <m.fellinger@gmail.com>
+
+  * This should fix the contrib EmailHelper
+
+[ed05392 | Wed Apr 08 09:19:29 UTC 2009] Michael Fellinger <m.fellinger@gmail.com>
+
+  * run Ramaze instead of Innate, just for better look
+
+[97b1bd8 | Thu Apr 09 17:52:05 UTC 2009] Michael Fellinger <m.fellinger@gmail.com>
+
+  * Add ContentLength middleware
+
+[591f1c0 | Tue Apr 07 17:15:59 UTC 2009] Michael Fellinger <m.fellinger@gmail.com>
+
+  * Version 2009.04.08
+
 [e2a87c9 | Mon Apr 06 02:27:14 UTC 2009] TJ Vanderpoel <bougy.man@gmail.com>
 
   * changed path search to use request.request_uri instead of request.fullpath, to handle fastcgi, mod_rack, and any other method where rack strips part of fullpath to derive request_uri

data/MANIFEST

@@ -182,6 +182,7 @@ examples/templates/view/external.rem
 examples/templates/view/external.rhtml
 examples/templates/view/external.tenjin
 examples/templates/view/external.zmr
+lib/proto/app.rb
 lib/proto/config.ru
 lib/proto/controller/init.rb
 lib/proto/controller/main.rb
@@ -196,7 +197,6 @@ lib/proto/public/ramaze.png
 lib/proto/spec/main.rb
 lib/proto/start.rb
 lib/proto/view/index.xhtml
-lib/proto/view/page.xhtml
 lib/ramaze.rb
 lib/ramaze/app.rb
 lib/ramaze/cache.rb
@@ -299,7 +299,6 @@ lib/ramaze/snippets/ramaze/fiber.rb
 lib/ramaze/snippets/ramaze/struct.rb
 lib/ramaze/snippets/string/camel_case.rb
 lib/ramaze/snippets/string/color.rb
-lib/ramaze/snippets/string/each.rb
 lib/ramaze/snippets/string/end_with.rb
 lib/ramaze/snippets/string/esc.rb
 lib/ramaze/snippets/string/ord.rb
@@ -397,7 +396,6 @@ spec/ramaze/helper/localize.rb
 spec/ramaze/helper/maruku.rb
 spec/ramaze/helper/pager.rb
 spec/ramaze/helper/paginate.rb
-spec/ramaze/helper/partial.rb
 spec/ramaze/helper/request_accessor.rb
 spec/ramaze/helper/sequel_form.rb
 spec/ramaze/helper/simple_captcha.rb
@@ -482,6 +480,7 @@ tasks/metric_changes.rake
 tasks/rcov.rake
 tasks/release.rake
 tasks/reversion.rake
+tasks/setup.rake
 tasks/todo.rake
 tasks/traits.rake
 tasks/yard.rake

data/Rakefile

@@ -6,7 +6,11 @@ require 'rake/gempackagetask'
 require 'time'
 require 'date'
 
-PROJECT_SPECS = Dir['spec/{contrib,examples,ramaze,snippets}/**/*.rb']
+PROJECT_SPECS = FileList[
+  'spec/{contrib,examples,ramaze,snippets}/**/*.rb',
+  'lib/proto/spec/*.rb'
+]
+
 PROJECT_MODULE = 'Ramaze'
 PROJECT_JQUERY_FILE = 'lib/proto/public/js/jquery.js'
 PROJECT_README = 'README.markdown'

data/bin/ramaze

@@ -19,24 +19,28 @@ def usage
   <<-TXT
   Usage:
 
-    ramaze <start [PIDFILE]|stop [PIDFILE]|restart [PIDFILE]|create PROJECT|console> [ruby/rack options]
+    ramaze <start [PIDFILE]|stop [PIDFILE]|restart [PIDFILE]|status [PIDFILE]|create PROJECT|console> [ruby/rack options]
 
     Commands:
-      start   - Starts an instance of this application. Supply a pidfile name if you do
-                not want it to use the default (PROJECT.pid).
+      * All commands which take an optional PIDFILE default to PROJECT.pid if you do not supply one.
+      * All commands which start a ramaze instance will default to webrick on port 7000 unless you supply
+        the rack options -p/--port PORT and/or * -s/--server SERVER.
 
-      stop    - Stops a running instance of this application. Supply a pidfile name if you
-                started it with a pidfile other than the default (PROJECT.pid).
+      start   - Starts an instance of this application.
+
+      stop    - Stops a running instance of this application.
 
       restart - Stops running instance of this application, then starts it back up.  Pidfile
                 (if supplied) is used for both stop and start.
 
+      status  - Gives status of a running ramaze instance
+
       create  - Creates a new prototype Ramaze application in a directory named PROJECT in
                 the current directory.  ramaze create foo would make ./foo containing an
-                application prototype. Rack options are meaningless here.
+                application prototype. Rack options are ignored here.
 
       console - Starts an irb console with app.rb (and irb completion) loaded. This command
-                ignores rack options.
+                ignores rack options, ARGV is passed on to IRB.
 
     Rack Options
       #{%x{rackup --help}.split("\n").reject { |line| line.match(/^Usage:/) }.join("\n\t")}
@@ -47,19 +51,24 @@ end
 def start
   # Find the name of this app
   app_name = default_pidfile.sub(/\.pid$/,'')
+  added_args = []
   if daemonize = OURARGS.detect { |arg| arg.match(/^(-[dD]|--daemonize)$/) }
     if pid_arg = OURARGS.detect { |arg| arg.match(/^(-P|--pid)/) }
       puts "User supplied pid: #{pid_arg}"
       pid_file = OURARGS[OURARGS.index(pid_arg) + 1]
       puts "Starting daemon with user defined pidfile: #{pid_file}"
-      exec("rackup", "config.ru", *ARGV)
     else
-      puts "Starting daemon with default pidfile: #{default_pidfile}"
-      exec("rackup", "config.ru", "-P", default_pidfile, *ARGV)
+      puts "Starting daemon with default pidfile: #{pid_file = default_pidfile}"
+      added_args += ["-P", pid_file]
+    end
+    if check_running?(pid_file)
+      $stderr.puts "Ramaze is already running with pidfile: #{pid_file}"
+      exit 127
     end
-  else
-    exec("rackup", "config.ru", *ARGV)
   end
+  added_args += ["-p", "7000"] unless OURARGS.detect { |arg| arg.match(/^(-p|--port)/) }
+  added_args += ["-s", "webrick"] unless OURARGS.detect { |arg| arg.match(/^(-s|--server)/) }
+  exec("rackup", "config.ru", *(ARGV + added_args))
 end
 
 def create(command)
@@ -84,34 +93,99 @@ def create(command)
 end
 
 def stop(command)
-  return false unless pid_file = find_pid(command)
+  unless pid_file = find_pid(OURARGS[OURARGS.index(command) + 1])
+    $stderr.puts "No pid_file found!  Cannot stop ramaze (may not be started)."
+    return false 
+  end
   pid = File.read(pid_file).to_i
-  puts "Killing pid #{pid}"
+  puts "Stopping pid #{pid}"
   Process.kill("INT", pid)
-  sleep 1
-  begin
-    Process.getpriority(Process::PRIO_PROCESS, pid)
-    $stdout.puts "Process #{pid} did not die, forcing it with -9"
+  sleep 2
+  if is_running?(pid)
+    $stderr.puts "Process #{pid} did not die, forcing it with -9"
     Process.kill(9, pid)
     File.unlink(pid_file) if File.file?(pid_file)
     true
-  rescue Errno::ESRCH
+  else
     File.unlink(pid_file) if File.file?(pid_file)
     true
   end
 end
 
+def status(command)
+  unless pid_file = find_pid(OURARGS[OURARGS.index(command) + 1])
+    $stderr.puts "No pid_file found! Ramaze may not be started."
+    exit 1
+  end
+  puts "Pid file #{pid_file} found, PID is #{pid = File.read(pid_file)}"
+  unless is_running?(pid.to_i)
+    $stderr.puts "PID #{pid} is not running"
+    exit 1
+  end
+  if Object.const_defined?("WIN32OLE")
+    wmi = WIN32OLE.connect("winmgmts://")
+    processes, ours = wmi.ExecQuery("select * from win32_process where ProcessId = #{pid}"), []
+    processes.each { |p| ours << [p.Name, p.CommandLine, p.VirtualSize, p.CreationDate, p.ExecutablePath, p.Status ] }
+    puts "Ramaze is running!\n\tName: %s\n\tCommand Line: %s\n\tVirtual Size: %s\n\tStarted: %s\n\tExec Path: %s\n\tStatus: %s" % ours.first
+  else
+    require "pathname"
+    # Check for /proc
+    if File.directory?(proc_dir = Pathname.new("/proc"))
+      proc_dir = proc_dir.join(pid)
+      # If we have a "stat" file, we'll assume linux and get as much info
+      # as we can
+      if File.file?(stat_file = proc_dir.join("stat"))
+        stats = File.read(stat_file).split
+        puts "Ramaze is running!\n\tCommand Line: %s\n\tVirtual Size: %s\n\tStarted: %s\n\tExec Path: %s\n\tStatus: %s" % [
+          File.read(proc_dir.join("cmdline")).split("\000").join(" "),
+          "%s k" % (stats[22].to_f / 1024),
+          File.mtime(proc_dir),
+          File.readlink(proc_dir.join("exe")),
+          stats[2]
+        ]
+        exit
+      end
+    end
+    # Fallthrough status, just print a ps
+    puts "Ramaze process #{pid} is running!"
+    begin
+      puts %x{ps l #{pid}}
+    rescue
+      puts "No further information available"
+    end
+  end
+end
+
 ## End Command methods }}}
 
 # Helper methods {{{
 def default_pidfile
   return @default_pidfile if @default_pidfile
   @default_pidfile = (File.basename(File.expand_path(ENV["PWD"])) + ".pid").strip
-  @default_pidfile
 end
 
-def find_pid(command)
-  pid_file = OURARGS[OURARGS.index(command) + 1]
+def is_running?(pid)
+  if Object.const_defined?("WIN32OLE")
+    wmi = WIN32OLE.connect("winmgmts://")
+    processes, ours = wmi.ExecQuery("select * from win32_process where ProcessId = #{pid}"), []
+    processes.each { |process| ours << process.Name }
+    ours.first.nil?
+  else
+    begin
+      prio = Process.getpriority(Process::PRIO_PROCESS, pid)
+      true
+    rescue Errno::ESRCH
+      false
+    end
+  end
+end
+
+def check_running?(pid_file)
+  return false unless File.file?(pid_file)
+  is_running?(File.read(pid_file).to_i)
+end
+
+def find_pid(pid_file)
   if pid_file.nil? or not File.file?(pid_file)
     pid_file = default_pidfile
   end
@@ -125,7 +199,7 @@ end
 ## End helper methods }}}
 
 OURARGS = ARGV.dup
-command = ARGV.detect { |arg| arg.match(/^(?:--?)?(?:start|stop|restart|create|h(?:elp)?|v(?:ersion)?|console)/) }
+command = ARGV.detect { |arg| arg.match(/^(?:--?)?(?:start|stop|restart|create|h(?:elp)?|v(?:ersion)?|console|status)/) }
 if command.nil?
   command = ""
 else
@@ -133,6 +207,8 @@ else
 end
 
 case command
+when /^(?:--?)?status$/
+  status(command)
 when /^(?:--?)?restart$/
   stop(command)
   start
@@ -142,13 +218,19 @@ when /^(?:--?)?create$/
   create(command)
 when /^(?:--?)?stop$/
   if stop(command)
-    puts "Ramazement has ended, go in peace"
+    puts "Ramazement has ended, go in peace."
     $stdout.flush
   else
     puts "Ramaze failed to stop (or was not running)"
   end
 when /^(?:--?)?console$/
-  exec("irb", "-r", "irb/completion", "-r", "app", *ARGV)
+  require "ramaze"
+  require "irb"
+  require "irb/completion"
+  Ramaze.options.started = true
+  require "start"
+  IRB.start
+  puts "Ramazement has ended, go in peace."
 when /^(?:--?)?h(elp)?$/
   puts usage
 when /^(?:--?)?v(ersion)?$/

data/examples/misc/rapp.rb

@@ -4,10 +4,13 @@
 require 'rubygems'
 require 'ramaze'
 require 'sequel'
+require 'abbrev'
 
-DB = Sequel.sqlite :logger => Ramaze::Log
+DB = Sequel.sqlite
 
 class Post < Sequel::Model
+  plugin :schema
+  plugin :hook_class_methods
   set_schema{ primary_key :id; time :created_at; text :text }
   before_create{ self.created_at ||= Time.now }
   create_table
@@ -18,27 +21,35 @@ end
 class MainController < Ramaze::Controller
   def index
     @posts = Post.order(:created_at.desc).first(10)
-%q(<h1>Welcome to Rapp</h1>
-<h2>A minimal chat wall</h2>
-<p>Recent Posts:</p>
-<div id="posts" class="container">
-  <?r @posts.each do |post| ?>
-    <div id="post-#{post.id}" class="post">
-      <p class="text">#{post.text}</p>
-      <p class="created">#{post.created_at}</p>
+
+    <<-'TEMPLATE'.strip
+<html>
+  <head><title>Rapp</title></head>
+  <body>
+    <h1>Welcome to Rapp</h1>
+    <h2>A minimal chat wall</h2>
+    <p>Recent Posts:</p>
+    <div id="posts" class="container">
+      <?r @posts.each do |post| ?>
+        <div id="post-#{post.id}" class="post">
+          <p class="text">#{post.text}</p>
+          <p class="created">#{post.created_at}</p>
+        </div>
+      <?r end ?>
     </div>
-  <?r end ?>
-</div>
-<p>Post Something:</p>
-<form action="#{Rs(:create)}" method="POST">
-  <input type="text" size="40" name="text" />
-  <input type="submit" value="Post Message!" />
-</form>)
+    <p>Post Something:</p>
+    <form action="#{r(:create)}" method="POST">
+      <input type="text" size="40" name="text" />
+      <input type="submit" value="Post Message!" />
+    </form>
+  </body>
+</html>
+    TEMPLATE
   end
 
   def create
     Post.create(:text => request[:text])
-    redirect Rs(:/)
+    redirect r(:/)
   end
 end
 

data/lib/proto/app.rb

@@ -0,0 +1,15 @@
+# This file contains your application, it requires dependencies and necessary
+# parts of the application.
+#
+# It will be required from either `config.ru` or `start.rb`
+
+require 'rubygems'
+require 'ramaze'
+
+# Add the directory this file resides in to the load path, so you can run the
+# app from any other working directory
+$LOAD_PATH.unshift(__DIR__)
+
+# Initialize controllers and models
+require 'model/init'
+require 'controller/init'

data/lib/proto/config.ru

@@ -11,7 +11,6 @@
 # application as FastCGI, CGI, or standalone with Mongrel or WEBrick—all from
 # the same configuration.
 
-cwd = File.dirname(__FILE__)
-require "#{cwd}/start"
-Ramaze.start(:started => true)
-run Innate
+require File.expand_path('app', File.dirname(__FILE__))
+Ramaze.start(:file => __FILE__, :started => true)
+run Ramaze

data/lib/proto/controller/init.rb

@@ -2,9 +2,9 @@
 # controllers
 
 class Controller < Ramaze::Controller
-  layout 'default'
+  layout :default
   helper :xhtml
-  engine :Nagoro
+  engine :Etanni
 end
 
 # Here go your requires for subclasses of Controller:

data/lib/proto/spec/main.rb

@@ -2,21 +2,20 @@ require 'ramaze'
 require 'ramaze/spec'
 
 require __DIR__('../start')
+Ramaze.options.roots = __DIR__('../')
 
 describe MainController do
   behaves_like :mock
 
   should 'show start page' do
-    got = get('/')
-    got.status.should == 200
-    got['Content-Type'].should == 'text/html'
-    got.body.should =~ /<h1>Welcome to Ramaze!<\/h1>/
+    get('/').status.should == 200
+    last_response['Content-Type'].should == 'text/html'
+    last_response.should =~ /<h1>Welcome to Ramaze!<\/h1>/
   end
 
   should 'show /notemplate' do
-    got = get('/notemplate')
-    got.status.should == 200
-    got['Content-Type'].should == 'text/html'
-    got.body.should =~ /there is no 'notemplate.xhtml' associated with this action/
+    get('/notemplate').status.should == 200
+    last_response['Content-Type'].should == 'text/html'
+    last_response.should =~ /there is no 'notemplate\.xhtml' associated with this action/
   end
 end

data/lib/proto/start.rb

@@ -1,12 +1,8 @@
-require 'rubygems'
-require 'ramaze'
+# Use this file directly like `ruby start.rb` if you don't want to use the
+# `ramaze start` command.
+# All application related things should go into `app.rb`, this file is simply
+# for options related to running the application locally.
 
-# Add the directory this file resides in to the load path, so you can run the
-# app from any other working directory
-$LOAD_PATH.unshift(__DIR__)
+require File.expand_path('app', File.dirname(__FILE__))
 
-# Initialize controllers and models
-require 'controller/init'
-require 'model/init'
-
-Ramaze.start(:adapter => :webrick, :port => 7000) if __FILE__ == $0
+Ramaze.start(:adapter => :webrick, :port => 7000, :file => __FILE__)

data/lib/ramaze/contrib/email.rb

@@ -30,6 +30,8 @@ require 'net/smtp'
 
 module Ramaze
   class EmailHelper
+    include Innate::Traited
+
     # Required to be set
     trait :smtp_server => 'smtp.your-isp.com'
     trait :smtp_helo_domain => 'your.helo.domain.com'

data/lib/ramaze/contrib/sequel/create_join.rb

@@ -1,4 +1,5 @@
 require 'sequel'
+require 'sequel/extensions/inflector'
 
 module Sequel
   class Model

data/lib/ramaze/contrib/sequel/form_field.rb

@@ -94,14 +94,14 @@ class FormField
       select(gestalt)
     else
       case db_type
-      when 'varchar', 'integer'
+      when /varchar|integer/
         input(gestalt)
-      when 'boolean'
+      when /boolean/
         checkbox(gestalt)
-      when 'string'
+      when /string/
         textarea(gestalt)
       else
-        raise "Unsupported type: (#{db_type || hint} : #{field})"
+        raise("Unsupported type: (%p : %p)" % [db_type || hint, field])
       end
     end
   end

data/lib/ramaze/contrib/sequel/image.rb

@@ -7,7 +7,7 @@
 # Usage:
 #   class Avatar < Sequel::Model
 #     IMAGE = {
-#       # specifies belongs_to, will create relation and foreign key
+#       # specifies many_to_one, will create relation and foreign key
 #
 #       :owner => :User,
 #
@@ -51,8 +51,8 @@
 module SequelImage
   def self.included(model)
     args = model::IMAGE
-    set_foreign_key = args[:foreign_key] || "#{args[:owner]}_id".downcase.to_sym
-    set_belongs_to  = args[:belongs_to]  ||    args[:owner].to_s.downcase.to_sym
+    set_foreign_key = args[:foreign_key]  || "#{args[:owner]}_id".downcase.to_sym
+    set_many_to_one  = args[:many_to_one] ||    args[:owner].to_s.downcase.to_sym
 
     # Define schema
     model.set_schema do
@@ -68,21 +68,19 @@ module SequelImage
     end
 
     # Define Relations
-    model.belongs_to set_belongs_to
+    model.many_to_one set_many_to_one
 
     # Define Hooks
-    model.send(:hooks).clear
-
-    model.before_create do
+    model.before_create :generate_thumbnails do
       generate_thumbnails
       self.created_at = Time.now
     end
 
-    model.before_save do
+    model.before_save :update_time do
       self.updated_at = Time.now
     end
 
-    model.before_destroy do
+    model.before_destroy :cleanup do
       cleanup if conf[:cleanup]
     end
 
@@ -110,7 +108,7 @@ module SequelImage
       tempfile = file[:tempfile]
       raise ArgumentError, 'Empty tempfile' if tempfile.size == 0
 
-      ext         = Ramaze::Tool::MIME.ext_for(type)
+      ext         = Rack::Mime::MIME_TYPES.invert[type]
       image.mime  = type
       target_name = image.next_name(File.basename(filename, File.extname(filename)), ext)
       target_path = File.join(image.public_root, image.path, target_name)
@@ -150,7 +148,7 @@ module SequelImage
     end
 
     def public_root
-      Ramaze::Global.public_root
+      Ramaze.options.roots.first
     end
 
     def filename(size)