zena 1.1.3 → 1.2.0

data/bricks/zena/zena/migrate/20111214112233_add_comment_to_relations.rb

@@ -0,0 +1,9 @@
+class AddCommentToRelations < ActiveRecord::Migration
+  def self.up
+    add_column :relations, :comment, :text
+  end
+
+  def self.down
+    remove_column :relations, :comment
+  end
+end

data/config/bricks.yml

@@ -4,10 +4,13 @@ test:
   tags:        ON
   captcha:     ON
   acls:        ON
+  grid:        ON
   static:      OFF
   sphinx:      OFF
   worker:      OFF
   uv:          OFF
+  spreadsheet: ON
+
 
 development:
   asset_port: 7999
@@ -25,8 +28,14 @@ development:
     switch: ON
     live:   ON
 
+  spreadsheet:
+    switch:  ON
+    activate_if:
+      gem: 'simple_xlsx'
+
   tags:     ON
   captcha:  ON
+  grid:     ON
   acls:     ON
   static:   OFF
   sphinx:
@@ -51,6 +60,10 @@ production:
     switch:  ON
     activate_if:
       gem: 'uv'
+  spreadsheet:
+    switch:  ON
+    activate_if:
+      gem: 'simple_xlsx'
   pdf:
     switch: ON
     engine: prince
@@ -59,6 +72,7 @@ production:
     live:   ON
   tags:     ON
   captcha:  ON
+  grid:     ON
   acls:     ON
   static:   OFF
   single:   OFF
@@ -68,7 +82,7 @@ production:
       gem: 'thinking_sphinx'
       adapter: 'mysql,postgresql'
     run_if:
-      file: 'log/searchd.production.pid'
+      file: 'log/searchd.pid'
   worker:
     switch:  OFF
     activate_if:

data/config/environments/production.rb

@@ -1,5 +1,5 @@
 # Settings specified here will take precedence over those in config/environment.rb
-config.log_level = :debug
+config.log_level = :info
 
 # The production environment is meant for finished, "live" apps.
 # Code is not reloaded between requests
@@ -24,4 +24,4 @@ CachedPage.perform_caching                           = true
 # config.action_controller.asset_host                  = "http://assets.example.com"
 
 # Disable delivery errors if you bad email addresses should just be ignored
-# config.action_mailer.raise_delivery_errors = false
+# config.action_mailer.raise_delivery_errors = false

data/config/gems.yml

@@ -15,13 +15,15 @@ httparty:       '= 0.7.8'
 open4:
 daemons:        # upload progress
 gem_plugin:     # upload progress
+simple_xlsx_writer:    # spreadsheet
+  lib:          'simple_xlsx'
 
 querybuilder:   '= 1.1.0'
 yamltest:       '= 0.7.0'
 rubyless:       '= 0.8.6'
 property:       '= 2.2.0'
 versions:       '= 0.3.1'
-zafu:           '= 0.8.4'
+zafu:           '= 0.8.6'
 
 jeweler:
 
@@ -29,6 +31,9 @@ RedCloth:
   lib:          'redcloth'
   version:      '= 3.0.4'
 
+# ultraviolet needs oniguruma, which needs headers to compile
+# ultraviolet:
+
 # Cannot do "gem 'rmagick', '= 1.3.14'" on some hosts. Leave this alone and
 # let 'require' pick whatever it can.
 # rmagick:

data/doc/zafu_changes.yml

@@ -35,7 +35,7 @@ v_title: "title"
 "<r:text/>": "mat"
 "on_if_node='ancestor'": "on_if='is_ancestor?(main)'"
 "<div do='admin_links'/>": "<ol class='admin_links' do='admin_links'>
-    <li do='each' do='show'><a href='#'>do this</a></li>
+    <li do='each' do='show'><a href='javascript:void(0)'>do this</a></li>
   </ol>"
 "set_class='li_s[v_status]'": "class='li_s#{v.status}'"
 "<meta name='keywords' do='void' set_content='[d_keywords]'/>": "<meta name='keywords' content='#{keywords}'/>"

data/lib/tasks/zena.rake

@@ -430,13 +430,17 @@ namespace :zena do
     end
   end
 
-  tests = ['test/unit/**/*_test.rb', 'test/functional/*_test.rb', 'test/integration/*_test.rb'].map {|p| "#{Zena::ROOT}/#{p}"}
+  tests = ['test/unit/**/*_test.rb', 'test/functional/*_test.rb', 'test/integration/*_test.rb'].map do |p|
+    Dir.glob(
+      "#{Zena::ROOT}/#{p}"
+    )
+  end.flatten
 
   tests += Bricks.test_files
 
   Rake::TestTask.new(:test => ["zena:test:prepare", "zena:build_fixtures"]) do |t|
     t.libs << "test"
-    t.pattern = tests
+    t.test_files = tests
     t.verbose = true
   end
   Rake::Task['zena:test'].comment = "Run the tests in test/helpers and test/unit"

data/lib/zena/app.rb

@@ -75,4 +75,4 @@ module Zena
       end
     end
   end
-end
+end

data/lib/zena/code/default_syntax.rb

@@ -19,7 +19,11 @@ module Zena
             "<code class='#{code_class}'>#{convertor.convert(@text, false)}</code>"
           else
             if pre_params = opts[:pre_params]
-              tag = "<pre #{pre_params.join(' ')} class='#{code_class}'>"
+              if pre_params =~ /^(.*)class\s*=\s*('|")([^\2]+)\2(.*)$/
+                code_class = "#{code_class} #{$3}"
+                pre_params = "#{$1} #{$4}"
+              end
+              tag = "<pre #{pre_params} class='#{code_class}'>"
             else
               tag = "<pre class='#{code_class}'>"
             end

data/lib/zena/db_helper/mysql.rb

@@ -92,6 +92,10 @@ module Zena
             "DATE(#{arg})"
           when 'random'
             'RAND()'
+          when 'min'
+            "MIN(#{args.join(',')})"
+          when 'max'
+            "MAX(#{args.join(',')})"
           when 'coalesce'
             "COALESCE(#{args.join(',')})"
           else
@@ -165,7 +169,7 @@ module Zena
                 if error.message =~ DEADLOCK_REGEX
                   retry_count += 1
                   if retry_count < DEADLOCK_MAX_RETRY
-                    Node.logger.warn "#{Time.now.strftim('%Y-%m-%d %H:%M:%S')} [#{current_site.host}] Retry (#{retry_count}) #{error.message}"
+                    Node.logger.warn "#{Time.now.strftime('%Y-%m-%d %H:%M:%S')} [#{current_site.host}] Retry (#{retry_count}) #{error.message}"
                     retry
                   else
                     raise

data/lib/zena/deploy/app_init.rhtml

@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
 #
-# Zena Startup script (automatically generated by 'cap debian:app_setup')
+# Zena Startup script (automatically generated by 'cap debian:setup')
 #
 # chkconfig: - 85 15
 # description: zena_<%= config[:db_name] %> starts and stop services for <%= config[:db_name] %> Zena application.
@@ -20,7 +20,8 @@ operations = [
   'rake worker:',
 <% if config[:app_type] == :mongrel %>
   'mongrel_rails cluster::',
-<% end %>
+<% end %>  
+  # 'rake sphinx:',
 ]
 
 if %w{stop restart}.include?(cmd)
@@ -40,14 +41,17 @@ end
 
 if %w{start restart}.include?(cmd)
   puts "Starting #{APP_ROOT}..."
-  operations.each do |op|
-    run "cd #{APP_ROOT} && #{op}start"
-  end
-
+  
   <% if config[:haproxy_port] %>
-  # Start haproxy
+  # Start haproxy first
   run "cd #{APP_ROOT} && haproxy -D -f config/haproxy.cnf"
   <% end %>
+  # Clear to make sure it all starts cleanly and we do not hang with
+  # dangling pid files.
+  run "cd #{APP_ROOT} && rm log/mongrel*.pid"
+  operations.each do |op|
+    run "cd #{APP_ROOT} && #{op}start"
+  end
 end
 
 unless %w{start stop restart}.include?(cmd)

data/lib/zena/deploy/awstats.conf.rhtml

@@ -185,7 +185,7 @@ HostAliases="localhost 127.0.0.1 <%= config[:host] %> stats.<%= config[:host] %>
 # 2 - DNS Lookup is made only from static DNS cache file (if it exists)
 # Default: 2
 #
-DNSLookup=2
+DNSLookup=1
 
 
 # When AWStats updates its statistics, it stores results of its analysis in

data/lib/zena/deploy/start_stop.rhtml

@@ -1,19 +1,19 @@
 #! /bin/sh
 ### BEGIN INIT INFO
-# Provides:          zena
-# Required-Start:    $remote_fs
-# Required-Stop:     $remote_fs
+# Provides:          Zena_<%= config[:db_name] %>
+# Required-Start:    $remote_fs $syslog $mysql
+# Required-Stop:     $remote_fs $syslog $mysql
 # Default-Start:     2 3 4 5
 # Default-Stop:      0 1 6
 # Short-Description: launch <%= init_script %>
 ### END INIT INFO
 
 # Author: Gaspard Bucher <gaspard@teti.ch>
-#
+# Zena Startup script (automatically generated by 'cap debian:setup')
 
 # PATH should only include /usr/* if it runs after the mountnfs.sh script
 PATH=/sbin:/usr/sbin:/bin:/usr/bin:/usr/local/bin
-DESC="Zena server"
+DESC="Zena <%= db_name %> server"
 
 case "$1" in
   start)

data/lib/zena/deploy/vhost.rhtml

@@ -62,8 +62,22 @@
   # Rewrite to check for Rails cached page
   RewriteRule ^([^.]+)$ $1.html [QSA]
 
-  # Redirect all non-static requests to cluster
-	RewriteCond %{DOCUMENT_ROOT}/%{REQUEST_FILENAME}%{QUERY_STRING} !-f
+  # Serve static (cached) assets
+  RewriteCond %{QUERY_STRING} ^[0-9]+$
+  RewriteCond %{DOCUMENT_ROOT}/%{REQUEST_FILENAME}.%{QUERY_STRING} -f
+  # We have to use '.'. If we use '?' apache won't find the file.
+  RewriteRule ^/(.*)$ %{REQUEST_FILENAME}.%{QUERY_STRING} [L]
+
+  # Rails assets (static CSS, JS).
+  RewriteCond %{QUERY_STRING} ^[0-9]+$
+  RewriteCond %{DOCUMENT_ROOT}/%{REQUEST_FILENAME} -f
+  RewriteRule ^/(.*)$ %{REQUEST_FILENAME} [L]
+
+  # else
+  #  Request with query string (if some page is cached, the same page with a query should not be served as static)
+  RewriteCond %{QUERY_STRING} ^.+$ [OR]
+  #  All non-static
+  RewriteCond %{DOCUMENT_ROOT}/%{REQUEST_FILENAME} !-f
   RewriteRule ^/(.*)$ balancer://<%= config[:balancer] %>%{REQUEST_URI} [P,QSA,L]
 <% elsif config[:app_type] == :passenger %>
   PassengerAppRoot <%= config[:app_root] %>

data/lib/zena/deploy.rb

@@ -123,6 +123,7 @@ Capistrano::Configuration.instance(:must_exist).load do
     clear_zafu
     clear_cache
   end
+  after "deploy:update", "after_update"
 
   desc "update symlink to 'sites' directory"
   task :app_update_symlinks, :roles => :app do
@@ -149,6 +150,7 @@ Capistrano::Configuration.instance(:must_exist).load do
   desc "create a new site [-s host='...' -s pass='...' -s lang='...']"
   task :mksite, :roles => :app do
     run "#{in_current} rake zena:mksite HOST='#{self[:host]}' PASSWORD='#{self[:pass]}' RAILS_ENV='production' HOST_LANG='#{self[:lang] || 'en'}'"
+    run "test -e #{sites_root}/#{self[:host]} || mkdir #{sites_root}/#{self[:host]}"
     create_vhost
     create_awstats
     logrotate
@@ -401,7 +403,7 @@ Capistrano::Configuration.instance(:must_exist).load do
         else
           init_name = db_name
         end
-        run "cd /usr/local/bin && test -e /usr/local/bin/#{init_name} || ln -sf /usr/local/bin/zena_#{db_name} /usr/local/bin/#{init_name}"
+        run "cd /usr/local/bin && test -e /usr/local/bin/#{init_name}"
 
         if self[:rvm_ruby_string]
           run "rvm wrapper #{self[:rvm_ruby_string]} init zena_#{db_name}"
@@ -410,7 +412,7 @@ Capistrano::Configuration.instance(:must_exist).load do
           init_script = "/usr/local/bin/zena_#{db_name}"
         end
 
-        start_stop = render("#{templates}/start_stop.rhtml", :config => self, :init_script => init_script)
+        start_stop = render("#{templates}/start_stop.rhtml", :config => self, :db_name => db_name, :init_script => init_script)
         put(start_stop, "/etc/init.d/zena_#{db_name}")
         run "chmod 755 /etc/init.d/zena_#{db_name}"
         # Install defaults
@@ -512,4 +514,4 @@ Capistrano::Configuration.instance(:must_exist).load do
     end
 
   end # deploy
-end
+end

data/lib/zena/info.rb

@@ -1,4 +1,4 @@
 module Zena
-  VERSION        = '1.1.3'
+  VERSION        = '1.2.0'
   ROOT           = File.expand_path(File.join(File.dirname(__FILE__), '..', '..'))
 end

data/lib/zena/parser/zazen_rules.rb

@@ -334,18 +334,18 @@ module Zena
             "<pre>\\ZAZENBLOCKCODE#{block_counter}ZAZENBLOCKCODE\\</pre>"
           else
             params, text = $1, $2
-            divparams = []
+            pre_params = []
             if params =~ /\A(.*)lang\s*=\s*("|')([^"']+)\2(.*)\Z/m
               pre, lang, post = $1.strip, $3, $4.strip
-              divparams << pre if pre && pre != ""
-              divparams << post if post && post != ""
+              pre_params << pre if pre && pre != ""
+              pre_params << post if post && post != ""
             else
-              divparams << params.strip if params != ''
+              pre_params << params.strip if params != ''
               lang = ''
             end
-            #divparams << "class='code'" unless params =~ /class\s*=/
-            divparams = nil if divparams.empty?
-            @escaped_code << [lang, text, divparams]
+            #pre_params << "class='code'" unless params =~ /class\s*=/
+            pre_params = pre_params.blank? ? nil : pre_params.join(' ')
+            @escaped_code << [lang, text, pre_params]
             block_counter += 1
             "<pre>\\ZAZENBLOCKCODE#{block_counter}ZAZENBLOCKCODE\\</pre>"
           end

data/lib/zena/remote/node.rb

@@ -41,6 +41,13 @@ module Zena
         @attributes['tag_names'] = SerializableArray.new('tag_names', 'tag', list)
       end
 
+      def parent_id(v)
+        if v then
+          # Cannot have nil values here (root node special case).
+          @attributes['parent_id'] = v
+        end
+      end
+
       def id
         @attributes['id']
       end

data/lib/zena/routes.rb

@@ -12,11 +12,10 @@ module Zena
 
       resource  :session, :controller => "user_sessions"   # singleton resource
       resources :pings
-      resources :users, :member => { :preferences => :get }
+      resources :users, :member => { :preferences => :get}
       resources :groups
       resources :acls
       resources :iformats
-      resources :acls
 
 
       connect ':prefix/*path?:cachestamp',  :controller => 'nodes', :action => 'show', :prefix => /\w\w/, :cachestamp => /\d+/
@@ -29,7 +28,7 @@ module Zena
                          :order => :any, :clear_order => :any,
                          :zafu => :get, :drop => :put, :attribute => :get,
                          :find => :get # same as search but starting on current node instead of root
-                       }.merge(Zena::Use::Grid::Routes) do |nodes|
+                       }.merge(Zena::Use.routes('nodes')) do |nodes|
         nodes.resources :versions,
                         :member => { :edit    => :get,
                                      :diff    => :get,
@@ -66,7 +65,7 @@ module Zena
 
       resources :columns
 
-      resources :sites, :member => { :action => :put }
+      resources :sites, :member => { :action => :put, :jobs => :get }
 
       resources :comments,
                     :collection => { :empty_bin => :delete },
@@ -83,4 +82,4 @@ module Zena
       connect '*path',  :controller => 'nodes',    :action => 'catch_all'
     end
   end # Routes
-end # Zena
+end # Zena

data/lib/zena/test_controller.rb

@@ -39,7 +39,19 @@ module Zena
     end
 
     def test_render
-      render :inline => @text
+      if params[:format] and params[:format] != 'html' then
+        met = :"render_to_#{params[:format]}"
+        if respond_to?(met)
+          result = self.send(met, {:inline => @text})
+          render :text => result[:data]
+          headers.merge!(result[:type])
+          return
+        else
+          render :text => "Cannot handle #{params[:format]} rendering."
+        end
+      else
+        render :inline => @text
+      end
     rescue => err
       render :text => ([err.message] + err.backtrace[0..4]).join("    \n")
     end
@@ -70,6 +82,11 @@ module Zena
       params.delete(:text)
       params.delete(:url)
 
+      tz = params.delete(:tz)
+      if tz
+        visitor.time_zone = tz
+      end
+
       if controller = params.delete(:fake_controller)
         # This is used when we need url rewriting.
         case controller

data/lib/zena/use/action.rb

@@ -6,10 +6,14 @@ module Zena
         # This method renders an action link without using Rails actions so that we can feed it with
         # erb from Zafu.
         def node_action_link(action, node_zip, opts={})
-          publish = opts[:publish]
           text  = opts[:text].blank? ? _("btn_#{action}") : opts[:text]
           title = opts[:title] || _("btn_title_#{action}")
-          query = publish ? ["?=#{publish}"] : []
+          query = []
+          if params = opts[:params]
+            params.each do |k,v|
+              query << "#{k}=#{v}"
+            end
+          end
 
           if %w{edit drive add_doc}.include?(action)
             case action
@@ -223,7 +227,7 @@ class #{node.klass}: #{Array(node.klass).first.columns.keys.join(', ')}
         end
 
         def r_action
-          return parser_error("Missing 'action' parameter.") unless action = @params[:select]
+          return parser_error("Missing 'select' parameter.") unless action = @params[:select]
 
           if self.node.will_be? Node
             node = self.node
@@ -233,7 +237,12 @@ class #{node.klass}: #{Array(node.klass).first.columns.keys.join(', ')}
             return parser_error("Invalid option 'actions' for #{node.klass}.")
           end
 
-          out node_action_link(action, "<%= #{node}.zip %>", :text => text_for_link(''), :publish => @params[:publish])
+          params = {}
+          @params.each do |k,v|
+            next if k == :select
+            params[k] = RubyLess.translate_string(self, v)
+          end
+          out node_action_link(action, "<%= #{node}.zip %>", :text => text_for_link(''), :params => params)
         end
 
         def filter_actions

data/lib/zena/use/ajax.rb

@@ -13,7 +13,7 @@ module Zena
               return "#{params[:dom_id]}_#{node.zip}"
             end
           elsif append_form && node.kind_of?(Node) && params[:zadd]
-            return "#{params[:dom_id]}_form"
+            return "#{params[:dom_id]}_#{node.zip.to_i}"
           end
 
           @dom_id || params[:udom_id] || params[:dom_id]
@@ -74,7 +74,7 @@ module Zena
                 page.replace params[:dom_id], :file => template_path_from_template_url + ".erb"
               end
               if params[:done] && params[:zadd]
-                page.toggle "#{params[:dom_id]}_form", "#{params[:dom_id]}_add"
+                page.toggle "#{params[:dom_id]}_0", "#{params[:dom_id]}_add"
                 page << params[:done]
               elsif params[:done]
                 page << params[:done]
@@ -104,7 +104,7 @@ module Zena
               if params[:done]
                 page << params[:done]
               elsif params[:zadd]
-                page.toggle "#{params[:dom_id]}_form", "#{params[:dom_id]}_add"
+                page.toggle "#{params[:dom_id]}_0", "#{params[:dom_id]}_add"
               end
             when 'update'
               page.replace ndom_id, :file => template_path_from_template_url + ".erb"
@@ -138,6 +138,9 @@ module Zena
               end
             end
           end
+          if params[:redir]
+            page << "window.location.href = '#{params[:redir]}';"
+          end
           page << render_js(false)
         end
 
@@ -313,6 +316,9 @@ module Zena
             # We reuse the 'each' block.
             target = parent
           else
+            # Avoid altering parent node
+            @context[:node] = node.dup
+
             node.dom_prefix = dom_name
             target = self
           end
@@ -484,7 +490,7 @@ module Zena
             else
 
               if dom_id = target.markup.dyn_params[:id] || target.markup.params[:id]
-                if dom_id =~ /^<%=\s+(.*?)\s+%>_form$/
+                if dom_id =~ /^<%=\s+(.*?)\s+%>_0$/
                   # Rare case when we have a [drop] with [add]. (add element and then drop on it).
                   dom_id = $1
                 elsif dom_id =~ /^<%=\s+(.*?)\s+%>$/

data/lib/zena/use/authlogic.rb

@@ -81,7 +81,7 @@ module Zena
           # Create a fake cookie based on HTTP_AUTH using session_id and render_token. This is
           # only used for requests to localhost.
           def forge_cookie_with_http_auth
-            if request.host == 'localhost' && request.port == Zena::ASSET_PORT
+            if (request.host == '127.0.0.1' || request.host == 'localhost') && request.port == Zena::ASSET_PORT
               authenticate_with_http_basic do |login, password|
                 # login    = visitor.id
                 # password = persistence_token

data/lib/zena/use/calendar.rb

@@ -329,8 +329,12 @@ module Zena
 
               # HACK to render sub-elements...
               bak = @blocks
+                saved_template = @context[:saved_template]
+                # reset saved scope
+                @context[:saved_template] = nil
                 @blocks = opts[:cell].blocks
                 cell_code   = expand_if(var, node.move_to(var, [klass]))
+                @context[:saved_template] = saved_template
               @blocks = bak
             @markup = markup
 

data/lib/zena/use/conditional.rb

@@ -35,6 +35,9 @@ module Zena::Use::Conditional
         return parser_error("Invalid role or class '#{class_name}'")
       end
 
+      # Class filtering should not block 'saved_dom_id' propagation.
+      new_node.saved_dom_id = node.saved_dom_id
+
       if parent.method == 'case'
         with_context(:node => new_node) do
           r_elsif(cond)

data/lib/zena/use/dates.rb

@@ -163,7 +163,7 @@ module Zena
           @main_dates ||= {}
           @main_dates[tz] ||= begin
             if params[:date]
-              if date = params[:date].to_utc(ISO_DATE_FORMAT, tz)
+              if date = params[:date].to_utc(_(DATETIME), tz)
                 date
               else
                 # FIXME: when date parsing fails: show an error, not a 500...
@@ -293,14 +293,54 @@ module Zena
         rescue TZInfo::AmbiguousTime
           ''
         end
+
+        def year_tz(tz = nil)
+          if tz.blank?
+            tz = visitor.tz
+          elsif tz.kind_of?(String)
+            tz = TZInfo::Timezone.get(tz)
+          end
+          tz.utc_to_local(self).year
+        rescue TZInfo::InvalidTimezoneIdentifier
+          0
+        rescue TZInfo::AmbiguousTime
+          0
+        end
+
+        def to_date_tz(tz = nil)
+          if tz.blank?
+            tz = visitor.tz
+          elsif tz.kind_of?(String)
+            tz = TZInfo::Timezone.get(tz)
+          end
+          tz.utc_to_local(self).to_date
+        rescue TZInfo::InvalidTimezoneIdentifier
+          ''
+        rescue TZInfo::AmbiguousTime
+          ''
+        end
       end
 
       module ZafuMethods
         include RubyLess
-        safe_method_for Time, :year       => {:class => Number, :pre_processor => true}
-        safe_method_for Time, [:strftime, String] => {:class => String, :pre_processor => true, :method => 'strftime_tz'}
-        safe_method_for Time, [:strftime, String, String] => {:class => String, :pre_processor => true, :method => 'strftime_tz'}
+        safe_method_for Time, [:advance, {
+          :years   => Number,
+          :months  => Number,
+          :weeks   => Number,
+          :days    => Number,
+          :hours   => Number,
+          :minutes => Number,
+          :seconds => Number}] => Time
+        safe_method_for Time, :to_i    => {:class => Number, :pre_processor => true}
+        safe_method_for Time, :year                      => {:class => Number, :pre_processor => true, :method => 'year_tz'}
+        safe_method_for Time, [:year, String]            => {:class => Number, :pre_processor => true, :method => 'year_tz'}
+        safe_method_for Time, [:year, TZInfo::Timezone]  => {:class => Number, :pre_processor => true, :method => 'year_tz'}
+        safe_method_for Time, [:strftime, String]                   => {:class => String, :pre_processor => true, :method => 'strftime_tz'}
+        safe_method_for Time, [:strftime, String, String]           => {:class => String, :pre_processor => true, :method => 'strftime_tz'}
         safe_method_for Time, [:strftime, String, TZInfo::Timezone] => {:class => String, :pre_processor => true, :method => 'strftime_tz'}
+        safe_method_for Time, :to_date                     => {:class => Date, :pre_processor => true, :method => 'to_date_tz'}
+        safe_method_for Time, [:to_date, String]           => {:class => Date, :pre_processor => true, :method => 'to_date_tz'}
+        safe_method_for Time, [:to_date, TZInfo::Timezone] => {:class => Date, :pre_processor => true, :method => 'to_date_tz'}
         safe_method_for TZInfo::Timezone, :to_s => {:class => String, :pre_processor => true}
 
         safe_method :date                     => :get_date