actionpack 1.11.2 → 1.12.0

data/lib/action_view/helpers/scriptaculous_helper.rb

@@ -0,0 +1,135 @@
+require File.dirname(__FILE__) + '/javascript_helper'
+
+module ActionView
+  module Helpers
+    # Provides a set of helpers for calling Scriptaculous JavaScript 
+    # functions, including those which create Ajax controls and visual effects.
+    #
+    # To be able to use these helpers, you must include the Prototype 
+    # JavaScript framework and the Scriptaculous JavaScript library in your 
+    # pages. See the documentation for ActionView::Helpers::JavaScriptHelper
+    # for more information on including the necessary JavaScript.
+    #
+    # The Scriptaculous helpers' behavior can be tweaked with various options.
+    # See the documentation at http://script.aculo.us for more information on
+    # using these helpers in your application.
+    module ScriptaculousHelper
+      unless const_defined? :TOGGLE_EFFECTS
+        TOGGLE_EFFECTS = [:toggle_appear, :toggle_slide, :toggle_blind]
+      end
+      
+      # Returns a JavaScript snippet to be used on the Ajax callbacks for
+      # starting visual effects.
+      #
+      # Example:
+      #   <%= link_to_remote "Reload", :update => "posts", 
+      #         :url => { :action => "reload" }, 
+      #         :complete => visual_effect(:highlight, "posts", :duration => 0.5)
+      #
+      # If no element_id is given, it assumes "element" which should be a local
+      # variable in the generated JavaScript execution context. This can be 
+      # used for example with drop_receiving_element:
+      #
+      #   <%= drop_receving_element (...), :loading => visual_effect(:fade) %>
+      #
+      # This would fade the element that was dropped on the drop receiving 
+      # element.
+      #
+      # For toggling visual effects, you can use :toggle_appear, :toggle_slide, and
+      # :toggle_blind which will alternate between appear/fade, slidedown/slideup, and
+      # blinddown/blindup respectively.
+      #
+      # You can change the behaviour with various options, see
+      # http://script.aculo.us for more documentation.
+      def visual_effect(name, element_id = false, js_options = {})
+        element = element_id ? element_id.to_json : "element"
+        
+        js_options[:queue] = if js_options[:queue].is_a?(Hash)
+          '{' + js_options[:queue].map {|k, v| k == :limit ? "#{k}:#{v}" : "#{k}:'#{v}'" }.join(',') + '}'
+        elsif js_options[:queue]
+          "'#{js_options[:queue]}'"
+        end if js_options[:queue]
+        
+        if TOGGLE_EFFECTS.include? name.to_sym
+          "Effect.toggle(#{element},'#{name.to_s.gsub(/^toggle_/,'')}',#{options_for_javascript(js_options)});"
+        else
+          "new Effect.#{name.to_s.camelize}(#{element},#{options_for_javascript(js_options)});"
+        end
+      end
+      
+      # Makes the element with the DOM ID specified by +element_id+ sortable
+      # by drag-and-drop and make an Ajax call whenever the sort order has
+      # changed. By default, the action called gets the serialized sortable
+      # element as parameters.
+      #
+      # Example:
+      #   <%= sortable_element("my_list", :url => { :action => "order" }) %>
+      #
+      # In the example, the action gets a "my_list" array parameter 
+      # containing the values of the ids of elements the sortable consists 
+      # of, in the current order.
+      #
+      # You can change the behaviour with various options, see
+      # http://script.aculo.us for more documentation.
+      def sortable_element(element_id, options = {})
+        javascript_tag(sortable_element_js(element_id, options).chop!)
+      end
+      
+      def sortable_element_js(element_id, options = {}) #:nodoc:
+        options[:with]     ||= "Sortable.serialize(#{element_id.to_json})"
+        options[:onUpdate] ||= "function(){" + remote_function(options) + "}"
+        options.delete_if { |key, value| PrototypeHelper::AJAX_OPTIONS.include?(key) }
+  
+        [:tag, :overlap, :constraint, :handle].each do |option|
+          options[option] = "'#{options[option]}'" if options[option]
+        end
+  
+        options[:containment] = array_or_string_for_javascript(options[:containment]) if options[:containment]
+        options[:only] = array_or_string_for_javascript(options[:only]) if options[:only]
+  
+        %(Sortable.create(#{element_id.to_json}, #{options_for_javascript(options)});)
+      end
+
+      # Makes the element with the DOM ID specified by +element_id+ draggable.
+      #
+      # Example:
+      #   <%= draggable_element("my_image", :revert => true)
+      # 
+      # You can change the behaviour with various options, see
+      # http://script.aculo.us for more documentation.
+      def draggable_element(element_id, options = {})
+        javascript_tag(draggable_element_js(element_id, options).chop!)
+      end
+      
+      def draggable_element_js(element_id, options = {}) #:nodoc:
+        %(new Draggable(#{element_id.to_json}, #{options_for_javascript(options)});)
+      end
+
+      # Makes the element with the DOM ID specified by +element_id+ receive
+      # dropped draggable elements (created by draggable_element).
+      # and make an AJAX call  By default, the action called gets the DOM ID 
+      # of the element as parameter.
+      #
+      # Example:
+      #   <%= drop_receiving_element("my_cart", :url => 
+      #     { :controller => "cart", :action => "add" }) %>
+      #
+      # You can change the behaviour with various options, see
+      # http://script.aculo.us for more documentation.
+      def drop_receiving_element(element_id, options = {})
+        javascript_tag(drop_receiving_element_js(element_id, options).chop!)
+      end
+      
+      def drop_receiving_element_js(element_id, options = {}) #:nodoc:
+        options[:with]     ||= "'id=' + encodeURIComponent(element.id)"
+        options[:onDrop]   ||= "function(element){" + remote_function(options) + "}"
+        options.delete_if { |key, value| PrototypeHelper::AJAX_OPTIONS.include?(key) }
+
+        options[:accept] = array_or_string_for_javascript(options[:accept]) if options[:accept]    
+        options[:hoverclass] = "'#{options[:hoverclass]}'" if options[:hoverclass]
+        
+        %(Droppables.add(#{element_id.to_json}, #{options_for_javascript(options)});)
+      end
+    end
+  end
+end

data/lib/action_view/helpers/text_helper.rb

@@ -20,12 +20,12 @@ module ActionView
       # if the +text+ is longer than +length+.
       def truncate(text, length = 30, truncate_string = "...")
         if text.nil? then return end
-
+        l = length - truncate_string.length
         if $KCODE == "NONE"
-          text.length > length ? text[0..(length - 3)] + truncate_string : text
+          text.length > length ? text[0...l] + truncate_string : text
         else
           chars = text.split(//)
-          chars.length > length ? chars[0..(length-3)].join + truncate_string : text
+          chars.length > length ? chars[0...l].join + truncate_string : text
         end
       end
 
@@ -77,7 +77,7 @@ module ActionView
       end
 
       begin
-        require "redcloth"
+        require_library_or_gem "redcloth"
 
         # Returns the text with all the Textile codes turned into HTML-tags.
         # <i>This method is only available if RedCloth can be required</i>.
@@ -104,7 +104,7 @@ module ActionView
       end
 
       begin
-        require "bluecloth"
+        require_library_or_gem "bluecloth"
 
         # Returns the text with all the Markdown codes turned into HTML-tags.
         # <i>This method is only available if BlueCloth can be required</i>.
@@ -142,6 +142,7 @@ module ActionView
       #     truncate(text, 15)
       #   end
       def auto_link(text, link = :all, href_options = {}, &block)
+        return '' if text.blank?
         case link
           when :all             then auto_link_urls(auto_link_email_addresses(text, &block), href_options, &block)
           when :email_addresses then auto_link_email_addresses(text, &block)
@@ -324,7 +325,7 @@ module ActionView
                           (?:www\.)             # www.*
                         ) 
                         (
-                          ([\w]+[=?&\/.-]?)*    # url segment
+                          ([\w]+:?[=?&\/.-]?)*    # url segment
                           \w+[\/]?              # url tail
                           (?:\#\w*)?            # trailing anchor
                         )

data/lib/action_view/helpers/url_helper.rb

@@ -10,16 +10,26 @@ module ActionView
       include JavaScriptHelper
       
       # Returns the URL for the set of +options+ provided. This takes the same options 
-      # as url_for. For a list, see the url_for documentation in link:classes/ActionController/Base.html#M000079.
+      # as url_for. For a list, see the documentation for ActionController::Base#url_for.
       # Note that it'll set :only_path => true so you'll get /controller/action instead of the 
       # http://example.com/controller/action part (makes it harder to parse httpd log files)
+      # 
+      # When called from a view, url_for returns an HTML escaped url. If you need an unescaped
+      # url, pass :escape => false to url_for.
+      # 
       def url_for(options = {}, *parameters_for_method_reference)
-        options = { :only_path => true }.update(options.symbolize_keys) if options.kind_of? Hash
-        @controller.send(:url_for, options, *parameters_for_method_reference)
+        if options.kind_of? Hash
+          options = { :only_path => true }.update(options.symbolize_keys)
+          escape = options.key?(:escape) ? options.delete(:escape) : true
+        else
+          escape = true
+        end
+        url = @controller.send(:url_for, options, *parameters_for_method_reference)
+        escape ? html_escape(url) : url
       end
 
       # Creates a link tag of the given +name+ using an URL created by the set of +options+. See the valid options in
-      # link:classes/ActionView/Helpers/UrlHelper.html#M000304. It's also possible to pass a string instead of an options hash to
+      # the documentation for ActionController::Base#url_for. It's also possible to pass a string instead of an options hash to
       # get a link tag that just points without consideration. If nil is passed as a name, the link itself will become the name.
       #
       # The html_options has three special features. One for creating javascript confirm alerts where if you pass :confirm => 'Are you sure?',
@@ -46,8 +56,8 @@ module ActionView
         else
           tag_options = nil
         end
-        url = html_escape(options.is_a?(String) ? options : url_for(options, *parameters_for_method_reference))
-        "<a href=\"#{url}\"#{tag_options}>#{name||url}</a>"
+        url = options.is_a?(String) ? options : self.url_for(options, *parameters_for_method_reference)
+        "<a href=\"#{url}\"#{tag_options}>#{name || url}</a>"
       end
 
       # Generates a form containing a sole button that submits to the
@@ -104,11 +114,10 @@ module ActionView
         if confirm = html_options.delete("confirm")
           html_options["onclick"] = "return #{confirm_javascript_function(confirm)};"
         end
-
-        url, name = options.is_a?(String) ?
-          [ options,  name || options ] :
-          [ url_for(options), name || html_escape(url_for(options)) ]
-
+        
+        url = options.is_a?(String) ? options : url_for(options)
+        name ||= url
+        
         html_options.merge!("type" => "submit", "value" => name)
 
         "<form method=\"post\" action=\"#{h url}\" class=\"button-to\"><div>" +
@@ -218,7 +227,7 @@ module ActionView
           for i in 0...tmp.length
             string << sprintf("%%%x",tmp[i])
           end
-          "<script type=\"text/javascript\" language=\"javascript\">eval(unescape('#{string}'))</script>"
+          "<script type=\"text/javascript\">eval(unescape('#{string}'))</script>"
         elsif encode == 'hex'
           for i in 0...email_address.length
             if email_address[i,1] =~ /\w/
@@ -235,7 +244,7 @@ module ActionView
 
       # Returns true if the current page uri is generated by the options passed (in url_for format).
       def current_page?(options)
-        url_for(options) == @controller.request.request_uri
+        CGI.escapeHTML(url_for(options)) == @controller.request.request_uri
       end
 
       private
@@ -269,7 +278,7 @@ module ActionView
         end
         
         def post_javascript_function
-          "f = document.createElement('form'); document.body.appendChild(f); f.method = 'POST'; f.action = this.href; f.submit();"
+          "var f = document.createElement('form'); this.parentNode.appendChild(f); f.method = 'POST'; f.action = this.href; f.submit();"
         end
 
         # Processes the _html_options_ hash, converting the boolean

data/lib/action_view/partials.rb

@@ -54,7 +54,11 @@ module ActionView
       add_counter_to_local_assigns!(partial_name, local_assigns)
       add_object_to_local_assigns!(partial_name, local_assigns, object)
 
-      ActionController::Base.benchmark("Rendered #{path}/_#{partial_name}", Logger::DEBUG, false) do
+      if logger
+        ActionController::Base.benchmark("Rendered #{path}/_#{partial_name}", Logger::DEBUG, false) do
+          render("#{path}/_#{partial_name}", local_assigns)
+        end
+      else
         render("#{path}/_#{partial_name}", local_assigns)
       end
     end
@@ -111,10 +115,14 @@ module ActionView
         counter_name = partial_counter_name(partial_name)
         local_assigns[counter_name] = 1 unless local_assigns.has_key?(counter_name)
       end
-      
+
       def add_object_to_local_assigns!(partial_name, local_assigns, object)
-        local_assigns[partial_name.intern] ||= object.is_a?(ActionView::Base::ObjectWrapper) ? object.value : object
-        local_assigns[partial_name.intern] ||= controller.instance_variable_get("@#{partial_name}")
+        local_assigns[partial_name.intern] ||=
+          if object.is_a?(ActionView::Base::ObjectWrapper)
+            object.value
+          else
+            object
+          end || controller.instance_variable_get("@#{partial_name}")
       end
   end
 end

data/rakefile

@@ -31,19 +31,25 @@ Rake::TestTask.new { |t|
   t.verbose = true
 }
 
+desc 'ActiveRecord Integration Tests'
+Rake::TestTask.new(:test_active_record_integration) do |t|
+  t.libs << "test"
+  t.test_files = Dir.glob("test/activerecord/*_test.rb")
+  t.verbose = true
+end
+
 
 # Genereate the RDoc documentation
 
 Rake::RDocTask.new { |rdoc|
   rdoc.rdoc_dir = 'doc'
   rdoc.title    = "Action Pack -- On rails from request to response"
-  rdoc.options << '--line-numbers --inline-source --main README'
+  rdoc.options << '--line-numbers' << '--inline-source'
   rdoc.template = "#{ENV['template']}.rb" if ENV['template']
   rdoc.rdoc_files.include('README', 'RUNNING_UNIT_TESTS', 'CHANGELOG')
   rdoc.rdoc_files.include('lib/**/*.rb')
 }
 
-
 # Create compressed packages
 dist_dirs = [ "lib", "test", "examples" ]
 
@@ -62,7 +68,7 @@ spec = Gem::Specification.new do |s|
   s.has_rdoc = true
   s.requirements << 'none'
 
-  s.add_dependency('activesupport', '= 1.2.5' + PKG_BUILD)
+  s.add_dependency('activesupport', '= 1.3.0' + PKG_BUILD)
 
   s.require_path = 'lib'
   s.autorequire = 'action_controller'
@@ -108,11 +114,13 @@ end
 # Publishing ------------------------------------------------------
 
 task :update_scriptaculous do
-  system("svn export --force http://dev.rubyonrails.org/svn/rails/spinoffs/scriptaculous/src/ #{File.dirname(__FILE__)}/lib/action_view/helpers/javascripts/")
+  for js in %w( controls dragdrop effects )
+    system("svn export --force http://dev.rubyonrails.org/svn/rails/spinoffs/scriptaculous/src/#{js}.js #{File.dirname(__FILE__)}/lib/action_view/helpers/javascripts/#{js}.js")
+  end
 end
 
 desc "Updates actionpack to the latest version of the javascript spinoffs"
-task :update_js => [:update_scriptaculous]
+task :update_js => [ :update_scriptaculous ]
 
 # Publishing ------------------------------------------------------
 

data/test/abstract_unit.rb

@@ -1,13 +1,14 @@
 $:.unshift(File.dirname(__FILE__) + '/../lib')
-$:.unshift(File.dirname(__FILE__) + '/../../activesupport/lib')
+$:.unshift(File.dirname(__FILE__) + '/../../activesupport/lib/active_support')
 $:.unshift(File.dirname(__FILE__) + '/fixtures/helpers')
 
+require 'yaml'
 require 'test/unit'
 require 'action_controller'
+require 'breakpoint'
 
 require 'action_controller/test_process'
 
 ActionController::Base.logger = nil
 ActionController::Base.ignore_missing_templates = false
-ActionController::Routing::Routes.reload rescue nil
-
+ActionController::Routing::Routes.reload rescue nil

data/test/active_record_unit.rb

@@ -0,0 +1,88 @@
+require  File.dirname(__FILE__) + '/abstract_unit'
+
+# Define the essentials
+class ActiveRecordTestConnector
+  cattr_accessor :able_to_connect
+  cattr_accessor :connected
+  
+  # Set our defaults
+  self.connected = false
+  self.able_to_connect = true
+end
+
+# Try to grab AR
+begin
+  PATH_TO_AR = File.dirname(__FILE__) + '/../../activerecord'
+  require "#{PATH_TO_AR}/lib/active_record" unless Object.const_defined?(:ActiveRecord)
+  require "#{PATH_TO_AR}/lib/active_record/fixtures" unless Object.const_defined?(:Fixtures)
+rescue Object => e
+  $stderr.puts "\nSkipping ActiveRecord assertion tests: #{e}"
+  ActiveRecordTestConnector.able_to_connect = false
+end
+
+# Define the rest of the connector
+class ActiveRecordTestConnector  
+  def self.setup
+    unless self.connected || !self.able_to_connect
+      setup_connection
+      load_schema
+      self.connected = true
+    end
+  rescue Object => e
+    $stderr.puts "\nSkipping ActiveRecord assertion tests: #{e}"
+    #$stderr.puts "  #{e.backtrace.join("\n  ")}\n"
+    self.able_to_connect = false
+  end
+  
+  private
+  
+  def self.setup_connection
+    if Object.const_defined?(:ActiveRecord)
+          
+      begin
+        ActiveRecord::Base.establish_connection(:adapter => 'sqlite3', :dbfile => ':memory:')
+        ActiveRecord::Base.connection
+      rescue Object
+        $stderr.puts 'SQLite 3 unavailable; falling to SQLite 2.'
+        ActiveRecord::Base.establish_connection(:adapter => 'sqlite', :dbfile => ':memory:')
+        ActiveRecord::Base.connection
+      end
+    
+      Object.send(:const_set, :QUOTED_TYPE, ActiveRecord::Base.connection.quote_column_name('type')) unless Object.const_defined?(:QUOTED_TYPE)
+    else
+      raise "Couldn't locate ActiveRecord."
+    end
+  end
+  
+  # Load actionpack sqlite tables
+  def self.load_schema
+    File.read(File.dirname(__FILE__) + "/fixtures/db_definitions/sqlite.sql").split(';').each do |sql|
+      ActiveRecord::Base.connection.execute(sql) unless sql.blank?
+    end
+  end
+end
+  
+# Test case for inheiritance  
+class ActiveRecordTestCase < Test::Unit::TestCase
+  # Set our fixture path
+  self.fixture_path = "#{File.dirname(__FILE__)}/fixtures/"
+  
+  def setup
+    abort_tests unless ActiveRecordTestConnector.connected = true
+  end
+  
+  # Default so Test::Unit::TestCase doesn't complain
+  def test_truth
+  end
+  
+  private
+  
+  # If things go wrong, we don't want to run our test cases. We'll just define them to test nothing.
+  def abort_tests
+    self.class.public_instance_methods.grep(/^test./).each do |method|
+      self.class.class_eval { define_method(method.to_sym){} }
+    end
+  end
+end
+
+ActiveRecordTestConnector.setup