actionpack 1.6.0 → 1.7.0

data/lib/action_view/helpers/date_helper.rb

@@ -15,12 +15,23 @@ module ActionView
 
       # Reports the approximate distance in time between to Time objects. For example, if the distance is 47 minutes, it'll return
       # "about 1 hour". See the source for the complete wording list.
-      def distance_of_time_in_words(from_time, to_time)
-        distance_in_minutes = ((to_time - from_time) / 60).round
+      #Set <tt>include_seconds</tt> to true if you want more detailed approximations if distance < 1 minute
+      def distance_of_time_in_words(from_time, to_time, include_seconds = false)
+        distance_in_minutes = ((to_time - from_time) / 60).round.abs
+        distance_in_seconds = ((to_time - from_time)).round.abs
 
         case distance_in_minutes
-          when 0          then "less than a minute"
-          when 1          then "1 minute"
+          when 0..1
+            return (distance_in_minutes==0) ? "less than a minute" : "1 minute" unless include_seconds
+            case distance_in_seconds
+              when 0..5   then "less than 5 seconds"
+              when 6..10  then "less than 10 seconds"
+              when 11..20 then "less than 20 seconds"
+              when 21..40 then "half a minute"
+              when 41..59 then "less than a minute"
+              else             "1 minute"
+            end
+                                
           when 2..45      then "#{distance_in_minutes} minutes"
           when 46..90     then "about 1 hour"
           when 90..1440   then "about #{(distance_in_minutes.to_f / 60.0).round} hours"
@@ -28,10 +39,10 @@ module ActionView
           else                 "#{(distance_in_minutes / 1440).round} days"
         end
       end
-
+      
       # Like distance_of_time_in_words, but where <tt>to_time</tt> is fixed to <tt>Time.now</tt>.
-      def distance_of_time_in_words_to_now(from_time)
-        distance_of_time_in_words(from_time, Time.now)
+      def distance_of_time_in_words_to_now(from_time, include_seconds = false)
+        distance_of_time_in_words(from_time, Time.now, include_seconds)
       end
 
       # Returns a set of select tags (one for year, month, and day) pre-selected for accessing a specified date-based attribute (identified by

data/lib/action_view/helpers/javascript_helper.rb

@@ -148,17 +148,19 @@ module ActionView
         build_observer('Form.Observer', form_id, options)
       end
 
-    private
+      # Escape carrier returns and single and double quotes for Javascript segments.
       def escape_javascript(javascript)
-        (javascript || '').gsub('"', '\"')
+        (javascript || '').gsub(/\r\n|\n|\r/, "\\n").gsub(/["']/) { |m| "\\#{m}" }
       end
-      
+
+    private
       def options_for_ajax(options)
         js_options = build_callbacks(options)
         
         js_options['asynchronous'] = options[:type] != :synchronous
-        js_options['method'] = options[:method] if options[:method]
-        
+        js_options['method']       = options[:method] if options[:method]
+        js_options['insertion']    = "Insertion.#{options[:position].to_s.camelize}" if options[:position]
+	
         if options[:form]
           js_options['parameters'] = 'Form.serialize(this)'
         elsif options[:with]
@@ -181,7 +183,7 @@ module ActionView
         CALLBACKS.inject({}) do |callbacks, callback|
           if options[callback]
             name = 'on' + callback.to_s.capitalize
-            code = escape_javascript(options[callback])
+            code = options[callback]
             callbacks[name] = "function(request){#{code}}"
           end
           callbacks

data/lib/action_view/helpers/javascripts/prototype.js

@@ -5,11 +5,11 @@
  *  For details, see http://prototype.conio.net/
  */
 
-Prototype = {
-  Version: '1.0.1'
+var Prototype = {
+  Version: '1.1.0'
 }
 
-Class = {
+var Class = {
   create: function() {
     return function() { 
       this.initialize.apply(this, arguments);
@@ -17,7 +17,7 @@ Class = {
   }
 }
 
-Abstract = new Object();
+var Abstract = new Object();
 
 Object.prototype.extend = function(object) {
   for (property in object) {
@@ -40,7 +40,13 @@ Function.prototype.bindAsEventListener = function(object) {
   }
 }
 
-Try = {
+Number.prototype.toColorPart = function() {
+  var digits = this.toString(16);
+  if (this < 16) return '0' + digits;
+  return digits;
+}
+
+var Try = {
   these: function() {
     var returnValue;
     
@@ -56,10 +62,10 @@ Try = {
   }
 }
 
-Toggle = {
+var Toggle = {
   display: function() {
-    for (var i = 0; i < elements.length; i++) {
-      var element = $(elements[i]);
+    for (var i = 0; i < arguments.length; i++) {
+      var element = $(arguments[i]);
       element.style.display = 
         (element.style.display == 'none' ? '' : 'none');
     }
@@ -85,8 +91,8 @@ function $() {
   return elements;
 }
 
-function getElementsByClassName(className, element) {
-  var children = (element || document).getElementsByTagName('*');
+function getElementsByClassName(className) {
+  var children = document.getElementsByTagName('*') || document.all;
   var elements = new Array();
   
   for (var i = 0; i < children.length; i++) {
@@ -105,7 +111,7 @@ function getElementsByClassName(className, element) {
 
 /*--------------------------------------------------------------------------*/
 
-Ajax = {
+var Ajax = {
   getTransport: function() {
     return Try.these(
       function() {return new ActiveXObject('Msxml2.XMLHTTP')},
@@ -191,14 +197,22 @@ Ajax.Updater.prototype = (new Ajax.Base()).extend({
   },
   
   updateContent: function() {
-    this.container.innerHTML = this.request.transport.responseText;
-    if (this.onComplete) this.onComplete(this.request);
+    if (!this.options.insertion) {
+      this.container.innerHTML = this.request.transport.responseText;
+    } else {
+      new this.options.insertion(this.container,
+        this.request.transport.responseText);
+    }
+
+    if (this.onComplete) {
+      setTimeout((function() {this.onComplete(this.request)}).bind(this), 10);
+    }
   }
 });
 
 /*--------------------------------------------------------------------------*/
 
-Field = {
+var Field = {
   clear: function() {
     for (var i = 0; i < arguments.length; i++)
       $(arguments[i]).value = '';
@@ -217,7 +231,7 @@ Field = {
 
 /*--------------------------------------------------------------------------*/
 
-Form = {
+var Form = {
   serialize: function(form) {
     var elements = Form.getElements($(form));
     var queryComponents = new Array();
@@ -269,12 +283,14 @@ Form.Element.Serializers = {
   input: function(element) {
     switch (element.type.toLowerCase()) {
       case 'hidden':
+      case 'password':
       case 'text':
         return Form.Element.Serializers.textarea(element);
       case 'checkbox':  
       case 'radio':
         return Form.Element.Serializers.inputSelector(element);
     }
+    return false;
   },
 
   inputSelector: function(element) {
@@ -334,3 +350,105 @@ Form.Observer.prototype = (new Abstract.TimedObserver()).extend({
   }
 });
 
+
+/*--------------------------------------------------------------------------*/
+
+Abstract.Insertion = function(adjacency) {
+  this.adjacency = adjacency;
+}
+
+Abstract.Insertion.prototype = {
+  initialize: function(element, content) {
+    this.element = $(element);
+    this.content = content;
+    
+    if (this.adjacency && this.element.insertAdjacentHTML) {
+      this.element.insertAdjacentHTML(this.adjacency, this.content);
+    } else {
+      this.range = this.element.ownerDocument.createRange();
+      if (this.initializeRange) this.initializeRange();
+      this.fragment = this.range.createContextualFragment(this.content);
+      this.insertContent();
+    }
+  }
+}
+
+var Insertion = new Object();
+
+Insertion.Before = Class.create();
+Insertion.Before.prototype = (new Abstract.Insertion('beforeBegin')).extend({
+  initializeRange: function() {
+    this.range.setStartBefore(this.element);
+  },
+  
+  insertContent: function() {
+    this.element.parentNode.insertBefore(this.fragment, this.element);
+  }
+});
+
+Insertion.Top = Class.create();
+Insertion.Top.prototype = (new Abstract.Insertion('afterBegin')).extend({
+  initializeRange: function() {
+    this.range.selectNodeContents(this.element);
+    this.range.collapse(true);
+  },
+  
+  insertContent: function() {  
+    this.element.insertBefore(this.fragment, this.element.firstChild);
+  }
+});
+
+Insertion.Bottom = Class.create();
+Insertion.Bottom.prototype = (new Abstract.Insertion('beforeEnd')).extend({
+  initializeRange: function() {
+    this.range.selectNodeContents(this.element);
+    this.range.collapse(this.element);
+  },
+  
+  insertContent: function() {
+    this.element.appendChild(this.fragment);
+  }
+});
+
+Insertion.After = Class.create();
+Insertion.After.prototype = (new Abstract.Insertion('afterEnd')).extend({
+  initializeRange: function() {
+    this.range.setStartAfter(this.element);
+  },
+  
+  insertContent: function() {
+    this.element.parentNode.insertBefore(this.fragment, 
+      this.element.nextSibling);
+  }
+});
+
+/*--------------------------------------------------------------------------*/
+
+var Effect = new Object();
+
+Effect.Highlight = Class.create();
+Effect.Highlight.prototype = {
+  initialize: function(element) {
+    this.element = $(element);
+    this.start  = 153;
+    this.finish = 255;
+    this.current = this.start;
+    this.fade();
+  },
+  
+  fade: function() {
+    if (this.isFinished()) return;
+    if (this.timer) clearTimeout(this.timer);
+    this.highlight(this.element, this.current);
+    this.current += 17;
+    this.timer = setTimeout(this.fade.bind(this), 250);
+  },
+  
+  isFinished: function() {
+    return this.current > this.finish;
+  },
+  
+  highlight: function(element, current) {
+    element.style.backgroundColor = "#ffff" + current.toColorPart();
+  }
+}

data/lib/action_view/helpers/pagination_helper.rb

@@ -45,7 +45,7 @@ module ActionView
         
         returning html = '' do
           if options[:always_show_anchors] and not window_pages[0].first?
-            html << link_to(first.number, options[:name] => first)
+            html << link_to(first.number, { options[:name] => first }.update( options[:params] ))
             html << ' ... ' if window_pages[0].number - first.number > 1
             html << ' '
           end
@@ -54,14 +54,14 @@ module ActionView
             if paginator.current == page && !options[:link_to_current_page]
               html << page.number.to_s
             else
-              html << link_to(page.number, options[:name] => page)
+              html << link_to(page.number, { options[:name] => page }.update( options[:params] ))
             end
             html << ' '
           end
           
           if options[:always_show_anchors] && !window_pages.last.last?
             html << ' ... ' if last.number - window_pages[-1].number > 1
-            html << link_to(paginator.last.number, options[:name] => last)
+            html << link_to(paginator.last.number, { options[:name] => last }.update( options[:params]))
           end
         end
       end

data/lib/action_view/helpers/text_helper.rb

@@ -128,6 +128,26 @@ module ActionView
       def strip_links(text)
         text.gsub(/<a.*>(.*)<\/a>/m, '\1')
       end
+      
+      # Returns a formatted-for-humans file size.
+      # 
+      # Examples:
+      #   human_size(123)          => 123 Bytes
+      #   human_size(1234)         => 1.2 KB
+      #   human_size(12345)        => 12.1 KB
+      #   human_size(1234567)      => 1.2 MB
+      #   human_size(1234567890)   => 1.1 GB
+      def human_size(size)
+        begin
+          return "%d Bytes" % size                if size < 1.kilobytes
+          return "%.1f KB" % (size/1.0.kilobytes) if size < 1.megabytes
+          return "%.1f MB" % (size/1.0.megabytes) if size < 1.gigabytes
+          return "%.1f GB" % (size/1.0.gigabytes) if size < 1.terabytes
+          return "%.1f TB" % (size/1.0.terabytes) 
+        rescue
+          # just return nothing
+        end
+      end
 
       private
         # Returns a version of the text that's safe to use in a regular expression without triggering engine features.

data/rakefile

@@ -8,9 +8,14 @@ require 'rake/contrib/rubyforgepublisher'
 
 PKG_BUILD     = ENV['PKG_BUILD'] ? '.' + ENV['PKG_BUILD'] : ''
 PKG_NAME      = 'actionpack'
-PKG_VERSION   = '1.6.0' + PKG_BUILD
+PKG_VERSION   = '1.7.0' + PKG_BUILD
 PKG_FILE_NAME = "#{PKG_NAME}-#{PKG_VERSION}"
 
+RELEASE_NAME  = "REL #{PKG_VERSION}"
+
+RUBY_FORGE_PROJECT = "actionpack"
+RUBY_FORGE_USER    = "webster132"
+
 desc "Default Task"
 task :default => [ :test ]
 
@@ -32,14 +37,13 @@ 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.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" ]
 
 spec = Gem::Specification.new do |s|
@@ -57,7 +61,7 @@ spec = Gem::Specification.new do |s|
   s.has_rdoc = true
   s.requirements << 'none'
 
-  s.add_dependency('activesupport', '= 1.0.2' + PKG_BUILD)
+  s.add_dependency('activesupport', '= 1.0.3' + PKG_BUILD)
 
   s.require_path = 'lib'
   s.autorequire = 'action_controller'
@@ -77,35 +81,130 @@ Rake::GemPackageTask.new(spec) do |p|
 end
 
 
-# Publish beta gem
+# Publishing ------------------------------------------------------
+
 desc "Publish the API documentation"
 task :pgem => [:package] do 
   Rake::SshFilePublisher.new("davidhh@comox.textdrive.com", "public_html/gems/gems", "pkg", "#{PKG_FILE_NAME}.gem").upload
   `ssh davidhh@comox.textdrive.com './gemupdate.sh'`
 end
 
-# Publish documentation
 desc "Publish the API documentation"
 task :pdoc => [:rdoc] do 
   Rake::SshDirPublisher.new("davidhh@comox.textdrive.com", "public_html/ap", "doc").upload
 end
 
+desc "Publish the release files to RubyForge."
+task :release => [:package] do
+  files = ["gem", "tgz", "zip"].map { |ext| "pkg/#{PKG_FILE_NAME}.#{ext}" }
+
+  if RUBY_FORGE_PROJECT then
+    require 'net/http'
+    require 'open-uri'
+
+    project_uri = "http://rubyforge.org/projects/#{RUBY_FORGE_PROJECT}/"
+    project_data = open(project_uri) { |data| data.read }
+    group_id = project_data[/[?&]group_id=(\d+)/, 1]
+    raise "Couldn't get group id" unless group_id
+
+    # This echos password to shell which is a bit sucky
+    if ENV["RUBY_FORGE_PASSWORD"]
+      password = ENV["RUBY_FORGE_PASSWORD"]
+    else
+      print "#{RUBY_FORGE_USER}@rubyforge.org's password: "
+      password = STDIN.gets.chomp
+    end
 
-desc "Count lines in the main rake file"
-task :lines do
-  lines = 0
-  codelines = 0
-  Dir.foreach("lib/action_controller") { |file_name| 
-    next unless file_name =~ /.*rb/
-    
-    f = File.open("lib/action_controller/" + file_name)
-
-    while line = f.gets
-      lines += 1
-      next if line =~ /^\s*$/
-      next if line =~ /^\s*#/
-      codelines += 1
+    login_response = Net::HTTP.start("rubyforge.org", 80) do |http|
+      data = [
+        "login=1",
+        "form_loginname=#{RUBY_FORGE_USER}",
+        "form_pw=#{password}"
+      ].join("&")
+      http.post("/account/login.php", data)
     end
-  }
-  puts "Lines #{lines}, LOC #{codelines}"
-end
+
+    cookie = login_response["set-cookie"]
+    raise "Login failed" unless cookie
+    headers = { "Cookie" => cookie }
+
+    release_uri = "http://rubyforge.org/frs/admin/?group_id=#{group_id}"
+    release_data = open(release_uri, headers) { |data| data.read }
+    package_id = release_data[/[?&]package_id=(\d+)/, 1]
+    raise "Couldn't get package id" unless package_id
+
+    first_file = true
+    release_id = ""
+
+    files.each do |filename|
+      basename  = File.basename(filename)
+      file_ext  = File.extname(filename)
+      file_data = File.open(filename, "rb") { |file| file.read }
+
+      puts "Releasing #{basename}..."
+
+      release_response = Net::HTTP.start("rubyforge.org", 80) do |http|
+        release_date = Time.now.strftime("%Y-%m-%d %H:%M")
+        type_map = {
+          ".zip"    => "3000",
+          ".tgz"    => "3110",
+          ".gz"     => "3110",
+          ".gem"    => "1400"
+        }; type_map.default = "9999"
+        type = type_map[file_ext]
+        boundary = "rubyqMY6QN9bp6e4kS21H4y0zxcvoor"
+
+        query_hash = if first_file then
+          {
+            "group_id" => group_id,
+            "package_id" => package_id,
+            "release_name" => RELEASE_NAME,
+            "release_date" => release_date,
+            "type_id" => type,
+            "processor_id" => "8000", # Any
+            "release_notes" => "",
+            "release_changes" => "",
+            "preformatted" => "1",
+            "submit" => "1"
+          }
+        else
+          {
+            "group_id" => group_id,
+            "release_id" => release_id,
+            "package_id" => package_id,
+            "step2" => "1",
+            "type_id" => type,
+            "processor_id" => "8000", # Any
+            "submit" => "Add This File"
+          }
+        end
+
+        query = "?" + query_hash.map do |(name, value)|
+          [name, URI.encode(value)].join("=")
+        end.join("&")
+
+        data = [
+          "--" + boundary,
+          "Content-Disposition: form-data; name=\"userfile\"; filename=\"#{basename}\"",
+          "Content-Type: application/octet-stream",
+          "Content-Transfer-Encoding: binary",
+          "", file_data, ""
+          ].join("\x0D\x0A")
+
+        release_headers = headers.merge(
+          "Content-Type" => "multipart/form-data; boundary=#{boundary}"
+        )
+
+        target = first_file ? "/frs/admin/qrs.php" : "/frs/admin/editrelease.php"
+        http.post(target + query, data, release_headers)
+      end
+
+      if first_file then
+        release_id = release_response.body[/release_id=(\d+)/, 1]
+        raise("Couldn't get release id") unless release_id
+      end
+
+      first_file = false
+    end
+  end
+end