ajax 1.0.8 → 1.1.0

data/lib/ajax/application.rb

@@ -0,0 +1,62 @@
+require 'pathname'
+
+module Ajax
+  # A class with framework/application related methods like discovering
+  # which version of Rails we are running under.
+  class Application
+    # Return a boolean indicating whether the Rails constant is defined.
+    # Pass a <tt>version</tt> integer to determine whether the major version
+    # of Rails matches <tt>version</tt>.
+    #
+    # Example: rails?(3) returns true when Rails.version.to_i == 3.
+    #
+    # Returns false if Rails is not defined or the major version does not match.
+    def rails?(version=nil)
+      !!(if version.nil?
+        defined?(::Rails)
+      elsif defined?(::Rails)
+        if ::Rails.respond_to?(:version)
+          ::Rails.version.to_i == version
+        else
+          version <= 2 # Rails.version defined in 2.1.0
+        end
+      else
+        false
+      end)
+    end
+
+    def root
+      Pathname.new(rails? && Rails.root || Dir.getwd)
+    end
+
+    # Include framework hooks for Rails
+    #
+    # This method is called by <tt>init.rb</tt>, which is run by Rails on startup.
+    #
+    # Customize rendering.  Include custom headers and don't render the layout for AJAX.
+    # Insert the Rack::Ajax middleware to rewrite and handle requests.
+    # Add custom attributes to outgoing links.
+    #
+    # Hooks for Rails 3 are installed using Railties.
+    def init
+      return unless rails?
+      if rails?(3)
+        require 'ajax/railtie'
+      else
+        require 'ajax/action_controller'
+        require 'ajax/action_view'
+
+        Ajax.logger = ::Rails.logger
+        
+        # Customize rendering.  Include custom headers and don't render the layout for AJAX.
+        ::ActionController::Base.send(:include, Ajax::ActionController)
+
+        # Insert the Rack::Ajax middleware to rewrite and handle requests
+        ::ActionController::Dispatcher.middleware.insert_before(Rack::Head, Rack::Ajax)
+
+        # Add custom attributes to outgoing links
+        ::ActionView::Base.send(:include, Ajax::ActionView)
+      end
+    end
+  end
+end

data/lib/ajax/helpers/request_helper.rb

@@ -24,7 +24,7 @@ module Ajax
       # All Hash and Array values are deep-merged.
       # Hash keys are converted to Strings.
       def set_header(object, key, value)
-        headers = object.is_a?(::ActionController::Response) ? object.headers : object
+        headers = object.is_a?(Hash) ? object : object.headers # ::ActionController::Response
         key = key.to_s
 
         info = case headers["Ajax-Info"]
@@ -61,7 +61,7 @@ module Ajax
       # <tt>object</tt> can be a Hash or instance of <tt>ActionController::Request</tt>
       # <tt>key</tt> Symbol or String hash key, converted to String
       def get_header(object, key)
-        headers = object.is_a?(::ActionController::Request) ? object.headers : object
+        headers = object.is_a?(Hash) ? object : object.headers # ::ActionController::Request
         key = key.to_s
 
         info = case headers["Ajax-Info"]

data/lib/ajax/helpers/task_helper.rb

@@ -6,8 +6,8 @@ module Ajax
         app/views/ajax/framework.html.erb
         config/initializers/ajax.rb
         public/javascripts/ajax.js
-        public/javascripts/jquery.address-1.2rc.js
-        public/javascripts/jquery.address-1.2rc.min.js
+        public/javascripts/jquery.address-1.3.js
+        public/javascripts/jquery.address-1.3.min.js
         public/javascripts/jquery.json-2.2.min.js
         public/images/ajax-loading.gif]
 

data/lib/ajax/railtie.rb

@@ -1,7 +1,31 @@
+require 'ajax/action_controller'
+require 'ajax/action_view'
+
 module Ajax
   class Railtie < Rails::Railtie
     rake_tasks do
-      load(File.expand_path(File.join(File.dirname(__FILE__), '..', '..', 'tasks', 'ajax_tasks.rake')))
+      load(File.expand_path('../../../tasks/ajax_tasks.rake', __FILE__))
+    end
+
+    initializer 'ajax.action_integration' do
+      ActiveSupport.on_load :action_view do
+        include Ajax::ActionView
+      end
+      ActiveSupport.on_load :action_controller do
+        include Ajax::ActionController
+      end
+    end
+
+    initializer "ajax.middleware" do |app|
+      app.config.middleware.insert_before "ActionDispatch::Head", "Rack::Ajax"
+    end
+
+    initializer 'ajax.routes' do |app|
+      app.routes_reloader.paths << Ajax.root + 'rails/routes.rb'
+    end
+
+    initializer 'ajax.logger' do |app|
+      Ajax.logger = ::Rails.logger
     end
   end
 end

data/lib/ajax/routes.rb

@@ -1,5 +1,3 @@
-require 'ajax'
-
 module Ajax
   module Routes
     # In your <tt>config/routes.rb</tt> file call:
@@ -8,8 +6,14 @@ module Ajax
     #
     # Adds an <tt>ajax_framework_path</tt> pointing to <tt>Ajax.framework_path</tt>
     # which is <tt>/ajax/framework</tt> by default.
+    #
+    # Only applies when installed as a gem in Rails 2 or less.
     def self.draw(map)
-      map.ajax_framework Ajax.framework_path, :controller => 'ajax', :action => 'framework'
+      if Ajax.app.rails?(3) && map.respond_to?(:match)
+        map.match Ajax.framework_path, :to => 'ajax#framework', :as => 'ajax_framework'
+      else
+        map.ajax_framework Ajax.framework_path, :controller => 'ajax', :action => 'framework'
+      end
     end
   end
 end

data/lib/ajax/rspec.rb

@@ -0,0 +1,2 @@
+require 'ajax/rspec/extension'
+require 'ajax/rspec/helpers'

data/lib/ajax/{spec → rspec}/extension.rb

@@ -1,6 +1,9 @@
 module Ajax
-  module Spec
+  module RSpec
     module Extension
+      def included(base)
+        require 'ajax/rspec/integration'
+      end
 
       def integrate_ajax
         Ajax.enabled = true
@@ -21,14 +24,4 @@ module Ajax
       end
     end
   end
-end
-
-module ActiveSupport
-  class TestCase
-    include Ajax::Spec::Extension
-
-    before(:all) do
-      ::Ajax.enabled = false
-    end if method_defined?(:before)
-  end
 end

data/lib/ajax/{spec → rspec}/helpers.rb

@@ -1,7 +1,7 @@
 require 'uri'
 
 module Ajax
-  module Spec
+  module RSpec
     module Helpers
 
       def create_app
@@ -55,14 +55,14 @@ module Ajax
       # Response must be [code, {headers}, ['Response']]
       # Headers must contain the Content-Type header
       def should_be_a_valid_response
-        return if @response.is_a?(::ActionController::Response)
-        @response.should be_a_kind_of(Array)
+        return if !@response.is_a?(Array) # ::ActionController::Response
+        @response.should be_a(Array)
         @response.size.should == 3
-        @response[0].should be_a_kind_of(Integer)
-        @response[1].should be_a_kind_of(Hash)
+        @response[0].should be_a(Integer)
+        @response[1].should be_a(Hash)
         @response[1]['Content-Type'].should =~ %r[^text\/\w+]
-        @response[2].should be_a_kind_of(Array)
-        @response[2][0].should be_a_kind_of(String)
+        @response[2].should be_a(Array)
+        @response[2][0].should be_a(String)
       end
 
       def env(uri, request_method, options={})
@@ -76,15 +76,15 @@ module Ajax
       end
 
       def response_body
-        @response.is_a?(::ActionController::Response) ? @response.body : @response[2][0]
+        @response.is_a?(Array) ? @response[2][0] : @response.body
       end
 
       def response_code
-        @response.is_a?(::ActionController::Response) ? @response.status.to_i : @response[0]
+        @response.is_a?(Array) ? @response[0] : @response.status.to_i
       end
 
       def response_headers
-        @response.is_a?(::ActionController::Response) ? @response.headers.to_hash : @response[1]
+        @response.is_a?(Array) ? @response[1] : @response.headers.to_hash
       end
 
       def response_body_as_hash

data/lib/ajax/rspec/integration.rb

@@ -0,0 +1,24 @@
+# Only require integration module when extensions are included.
+# RSpec integration.  Add a before filter to disable Ajax before all tests.
+module Ajax::RSpec::Integration
+  if defined?(RSpec)
+    RSpec.configure do |c|
+      c.before do
+        ::Ajax.enabled = false
+      end
+    end
+  elsif defined?(Spec)
+    Spec::Runner.configure do |c|
+      c.before :all do
+        ::Ajax.enabled = false
+      end
+    end
+  end
+end
+
+# ActiveSupport::TestCase integration
+module ActiveSupport
+  class TestCase
+    include Ajax::RSpec::Extension
+  end
+end

data/lib/rack-ajax.rb

@@ -49,7 +49,7 @@ module Rack
       # To test rewrites, return a 200 response with
       # the modified request environment encoded as Yaml.
       #
-      # The Ajax::Spec::Helpers module includes a helper
+      # The Ajax::RSpec::Helpers module includes a helper
       # method to test the result of a rewrite.
       if ::Ajax.is_mocked?
         rack_response.nil? ? Rack::Ajax::Parser.rack_response(encode_env(env)) : rack_response

data/lib/rack-ajax/parser.rb

@@ -10,7 +10,7 @@ module Rack
       # easier to introspect the headers.
       def initialize(env)
         @env = env
-        @request = ActionController::Request.new(env)
+        @request = Rack::Request.new(env)
       end
 
       protected
@@ -20,7 +20,7 @@ module Rack
       end
 
       def ajax_request?
-        @request.xml_http_request?
+        @request.xhr?
       end
 
       def get_request?

data/public/javascripts/{jquery.address-1.2rc.js → jquery.address-1.3.js}

@@ -1,12 +1,12 @@
 /*
- * jQuery Address Plugin v1.2rc
+ * jQuery Address Plugin v1.3
  * http://www.asual.com/jquery/address/
  *
  * Copyright (c) 2009-2010 Rostislav Hristov
  * Dual licensed under the MIT or GPL Version 2 licenses.
  * http://jquery.org/license
  *
- * Date: 2010-03-31 11:35:36 +0300 (Wed, 31 Mar 2010)
+ * Date: 2010-09-26 17:58:16 +0300 (Sun, 26 Sep 2010)
  */
 (function ($) {
 
@@ -34,14 +34,22 @@
                 );
             },
             _bind = function(value, data, fn) {
-                if (fn || data) {
-                    $($.address).bind(value, fn || data, fn && data);
-                }
+                $($.address).bind(value, data, fn);
                 return $.address;
             },
-            _hash = function() {
+            _supportsState = function() {
+                return (_h.pushState && typeof _opts.state !== UNDEFINED);
+            },
+            _hrefState = function() {
+                return '/' + _l.pathname.replace(new RegExp(_opts.state), '') + 
+                    _l.search + (_hrefHash() ? '#' + _hrefHash() : '');
+            },
+            _hrefHash = function() {
                 var index = _l.href.indexOf('#');
-                return index != -1 ? _ec(_dc(_crawl(_l.href.substr(index + 1), FALSE))) : '';
+                return index != -1 ? _crawl(_l.href.substr(index + 1), FALSE) : '';
+            },
+            _href = function() {
+                return _supportsState() ? _hrefState() : _hrefHash();
             },
             _window = function() {
                 try {
@@ -59,10 +67,6 @@
                 }
                 return value;
             },
-            _local = function(value, direction) {
-                return (_msie && _l.protocol == 'file:') ? 
-                    (direction ? _value.replace(/\?/, '%3F') : _value.replace(/%253F/, '?')) : value;
-            },
             _crawl = function(value, direction) {
                 if (_opts.crawlable && direction) {
                     return (value != '' ? '!' : '') + value;
@@ -87,9 +91,9 @@
             },
             _listen = function() {
                 if (!_silent) {
-                    var hash = _hash(),
+                    var hash = _href(),
                         diff = _value != hash;
-                    if (_safari && _version < 523) {
+                    if (_webkit && _version < 523) {
                         if (_length != _h.length) {
                             _length = _h.length;
                             if (typeof _stack[_length - 1] != UNDEFINED) {
@@ -97,11 +101,16 @@
                             }
                             _update(FALSE);
                         }
-                    } else if (_msie && _version < 7 && diff) {
-                        _l.reload();
                     } else if (diff) {
-                        _value = hash;
-                        _update(FALSE);
+                        if (_msie && _version < 7) {
+                            _l.reload();
+                        } else {
+                            if (_msie && _version < 8 && _opts.history) {
+                                _st(_html, 50);
+                            }
+                            _value = hash;
+                            _update(FALSE);
+                        }
                     }
                 }
             },
@@ -111,38 +120,67 @@
                 _st(_track, 10);
             },
             _track = function() {
-                var value = (_l.pathname + (/\/$/.test(_l.pathname) ? '' : '/') + $.address.value()).replace(/\/\//, '/').replace(/^\/$/, ''),
-                    fn = window[_opts.tracker];
-                if (typeof fn == FUNCTION) {
-                    fn(value);
-                } else if (typeof _gaq != UNDEFINED && typeof _gaq.push == FUNCTION) {
-                    _gaq.push(['_trackPageview', value]);
-                } else if (typeof pageTracker != UNDEFINED && typeof pageTracker._trackPageview == FUNCTION) {
-                    pageTracker._trackPageview(value);
-                } else if (typeof urchinTracker == FUNCTION) {
-                    urchinTracker(value);
+                if (_opts.tracker !== 'null' && _opts.tracker !== null) {
+                    var fn = $.isFunction(_opts.tracker) ? _opts.tracker : _t[_opts.tracker],
+                        value = (_l.pathname + _l.search + 
+                                ($.address && !_supportsState() ? $.address.value() : ''))
+                                .replace(/\/\//, '/').replace(/^\/$/, '');
+                    if ($.isFunction(fn)) {
+                        fn(value);
+                    } else if ($.isFunction(_t.urchinTracker)) {
+                        _t.urchinTracker(value);
+                    } else if (typeof _t.pageTracker != UNDEFINED && $.isFunction(_t.pageTracker._trackPageview)) {
+                        _t.pageTracker._trackPageview(value);
+                    } else if (typeof _t._gaq != UNDEFINED && $.isFunction(_t._gaq.push)) {
+                        _t._gaq.push(['_trackPageview', value]);
+                    }
                 }
             },
             _html = function() {
-                var doc = _frame.contentWindow.document;
-                doc.open();
-                doc.write('<html><head><title>' + _d.title + '</title><script>var ' + ID + ' = "' + _hash() + '";</' + 'script></head></html>');
-                doc.close();
+                var src = _js() + ':' + FALSE + ';document.open();document.writeln(\'<html><head><title>' + 
+                    _d.title + '</title><script>var ' + ID + ' = "' + _href() + 
+                    (_d.domain != _l.host ? '";document.domain="' + _d.domain : '') + 
+                    '";</' + 'script></head></html>\');document.close();';
+                if (_version < 7) {
+                    _frame.src = src;
+                } else {
+                    _frame.contentWindow.location.replace(src);
+                }
+            },
+            _options = function() {
+                if (_url && _qi != -1) {
+                    var param, params = _url.substr(_qi + 1).split('&');
+                    for (i = 0; i < params.length; i++) {
+                        param = params[i].split('=');
+                        if (/^(autoUpdate|crawlable|history|strict|wrap)$/.test(param[0])) {
+                            _opts[param[0]] = (isNaN(param[1]) ? /^(true|yes)$/i.test(param[1]) : (parseInt(param[1], 10) !== 0));
+                        }
+                        if (/^(state|tracker)$/.test(param[0])) {
+                            _opts[param[0]] = param[1];
+                        }
+                    }
+                    _url = null;
+                }
+                _value = _href();
             },
             _load = function() {
                 if (!_loaded) {
                     _loaded = TRUE;
+                    _options();
+                    var body = $('body').ajaxComplete(function() {
+                        _enable.call(this);
+                        _unescape.call(this);
+                    }).trigger('ajaxComplete');
                     if (_opts.wrap) {
-                        var body = $('body');
-                            wrap = $('body > *')
-                                .wrapAll('<div style="padding:' + 
-                                    (_cssint(body, 'marginTop') + _cssint(body, 'paddingTop')) + 'px ' + 
-                                    (_cssint(body, 'marginRight') + _cssint(body, 'paddingRight')) + 'px ' + 
-                                    (_cssint(body, 'marginBottom') + _cssint(body, 'paddingBottom')) + 'px ' + 
-                                    (_cssint(body, 'marginLeft') + _cssint(body, 'paddingLeft')) + 'px;" />')
-                                .parent()
-                                .wrap('<div id="' + ID + '" style="height:100%; overflow:auto;' + 
-                                    (_safari ? (window.statusbar.visible && !/chrome/i.test(_agent) ? '' : ' resize:both;') : '') + '" />');
+                        var wrap = $('body > *')
+                            .wrapAll('<div style="padding:' + 
+                                (_cssint(body, 'marginTop') + _cssint(body, 'paddingTop')) + 'px ' + 
+                                (_cssint(body, 'marginRight') + _cssint(body, 'paddingRight')) + 'px ' + 
+                                (_cssint(body, 'marginBottom') + _cssint(body, 'paddingBottom')) + 'px ' + 
+                                (_cssint(body, 'marginLeft') + _cssint(body, 'paddingLeft')) + 'px;" />')
+                            .parent()
+                            .wrap('<div id="' + ID + '" style="height:100%; overflow:auto;' + 
+                                (_webkit ? (window.statusbar.visible && !/chrome/i.test(_agent) ? '' : ' resize:both;') : '') + '" />');
                         $('html, body')
                             .css({
                                 height: '100%',
@@ -150,7 +188,7 @@
                                 padding: 0,
                                 overflow: 'hidden'
                             });
-                        if (_safari) {
+                        if (_webkit) {
                             $('<style type="text/css" />')
                                 .appendTo('head')
                                 .text('#' + ID + '::-webkit-resizer { background-color: #fff; }');
@@ -162,12 +200,12 @@
                         if (frameset) {
                             frameset.insertAdjacentElement('beforeEnd', _frame);
                             frameset[frameset.cols ? 'cols' : 'rows'] += ',0';
-                            _frame.src = _js() + ':' + FALSE;
                             _frame.noResize = TRUE;
                             _frame.frameBorder = _frame.frameSpacing = 0;
                         } else {
-                            _frame.src = _js() + ':' + FALSE;
                             _frame.style.display = 'none';
+                            _frame.style.width = _frame.style.height = 0;
+                            _frame.tabIndex = -1;
                             _d.body.insertAdjacentElement('afterBegin', _frame);
                         }
                         _st(function() {
@@ -175,16 +213,16 @@
                                 var win = _frame.contentWindow;
                                 var src = win.location.href;
                                 _value = (typeof win[ID] != UNDEFINED ? win[ID] : '');
-                                if (_value != _hash()) {
+                                if (_value != _href()) {
                                     _update(FALSE);
-                                    _l.hash = _local(_crawl(_value, TRUE), TRUE);
+                                    _l.hash = _crawl(_value, TRUE);
                                 }
                             });
                             if (typeof _frame.contentWindow[ID] == UNDEFINED) {
                                 _html();
                             }
                         }, 50);
-                    } else if (_safari) {
+                    } else if (_webkit) {
                         if (_version < 418) {
                             $(_d.body).append('<form id="' + ID + '" style="position:absolute;top:-9999px;" method="get"></form>');
                             _form = _d.getElementById(ID);
@@ -201,17 +239,40 @@
                         _trigger('init');
                         _update(FALSE);
                     }, 1);
-                    
-                    if ((_msie && _version > 7) || (!_msie && ('on' + HASH_CHANGE) in _t)) {
-                        if (_t.addEventListener) {
-                            _t.addEventListener(HASH_CHANGE, _listen, false);
-                        } else if (_t.attachEvent) {
-                            _t.attachEvent('on' + HASH_CHANGE, _listen);
+
+                    if (!_supportsState()) {
+                        if ((_msie && _version > 7) || (!_msie && ('on' + HASH_CHANGE) in _t)) {
+                            if (_t.addEventListener) {
+                                _t.addEventListener(HASH_CHANGE, _listen, false);
+                            } else if (_t.attachEvent) {
+                                _t.attachEvent('on' + HASH_CHANGE, _listen);
+                            }
+                        } else {
+                            _si(_listen, 50);
                         }
-                    } else {
-                        _si(_listen, 50);
                     }
-                    $('a[rel*=address:]').address();
+                }
+            },
+            _enable = function() {
+                var el, 
+                    elements = $('a'), 
+                    length = elements.size(),
+                    delay = 1,
+                    index = -1;
+                _st(function() {
+                    if (++index != length) {
+                        el = $(elements.get(index));
+                        if (el.is('[rel*=address:]')) {
+                            el.address();
+                        }
+                        _st(arguments.callee, delay);
+                    }
+                }, delay);
+            },
+            _popstate = function() {
+                if (_value != _href()) {
+                    _value = _href();
+                    _update(FALSE);
                 }
             },
             _unload = function() {
@@ -221,8 +282,74 @@
                     _t.detachEvent('on' + HASH_CHANGE, _listen);
                 }
             },
+            _unescape = function() {
+                var base = _l.pathname.replace(/\/$/, ''),
+                    fragment = '_escaped_fragment_';
+                if ($('body').html().indexOf(fragment) != -1) {
+                    $('a[href]:not([href^=http]), , a[href*=' + document.domain + ']', this).each(function() {
+                        var href = $(this).attr('href').replace(/^http:/, '').replace(new RegExp(base + '/?$'), '');
+                        if (href == '' || href.indexOf(fragment) != -1) {
+                            $(this).attr('href', '#' + this.decode(href.replace(new RegExp('/(.*)\\?' + fragment + '=(.*)$'), '!$2')));
+                        }
+                    });
+                }
+            },
+            _encode = function(value) {
+                return encodeURIComponent(value).replace(/%20/g, '+');
+            }, 
+            _path = function(value) {
+                return value.split('#')[0].split('?')[0];
+            },
+            _pathNames = function(value) {
+                var path = _path(value),
+                    names = path.replace(/\/{2,9}/g, '/').split('/');
+                if (path.substr(0, 1) == '/' || path.length === 0) {
+                    names.splice(0, 1);
+                }
+                if (path.substr(path.length - 1, 1) == '/') {
+                    names.splice(names.length - 1, 1);
+                }
+                return names;
+            },
+            _queryString = function(value) {
+                var arr = value.split('?');
+                return arr.slice(1, arr.length).join('?').split('#')[0];
+            },
+            _parameter = function(name, value) {
+                value = _queryString(value);
+                if (value) {
+                    params = value.split('&');
+                    var r = [];
+                    for (i = 0; i < params.length; i++) {
+                        var p = params[i].split('=');
+                        if (p[0] == name) {
+                            r.push(p.slice(1).join('='));
+                        }
+                    }
+                    if (r.length !== 0) {
+                        return r.length != 1 ? r : r[0];
+                    }
+                }
+            },
+            _parameterNames = function(value) {
+                var qs = _queryString(value),
+                    names = [];
+                if (qs && qs.indexOf('=') != -1) {
+                    var params = qs.split('&');
+                    for (var i = 0; i < params.length; i++) {
+                        var name = params[i].split('=')[0];
+                        if ($.inArray(name, names) == -1) {
+                            names.push(name);
+                        }
+                    }
+                }
+                return names;
+            },
+            _hash = function(value) {
+                var arr = value.split('#');
+                return arr.slice(1, arr.length).join('#');
+            },
             ID = 'jQueryAddress',
-            FUNCTION = 'function',
             UNDEFINED = 'undefined',
             HASH_CHANGE = 'hashchange',
             INIT = 'init',
@@ -243,7 +370,7 @@
             _mozilla = _browser.mozilla,
             _msie = _browser.msie,
             _opera = _browser.opera,
-            _safari = _browser.safari,
+            _webkit = _browser.webkit,
             _supported = FALSE,
             _t = _window(),
             _d = _t.document,
@@ -251,8 +378,6 @@
             _l = _t.location,
             _si = setInterval,
             _st = setTimeout, 
-            _dc = decodeURI,
-            _ec = encodeURI,
             _agent = navigator.userAgent,            
             _frame,
             _form,
@@ -267,7 +392,7 @@
             _updating = FALSE,
             _stack = [], 
             _listeners = {}, 
-            _value = _hash();
+            _value = _href();
             
         if (_msie) {
             _version = parseFloat(_agent.substr(_agent.indexOf('MSIE') + 4));
@@ -275,7 +400,7 @@
                 _version = _d.documentMode != 8 ? 7 : 8;
             }
             $(document).bind('propertychange', function() {
-                if (_d.title != _title && _d.title.indexOf('#' + _hash()) != -1) {
+                if (_d.title != _title && _d.title.indexOf('#' + _href()) != -1) {
                     _d.title = _title;
                 }
             });
@@ -285,69 +410,64 @@
             (_mozilla && _version >= 1) || 
             (_msie && _version >= 6) ||
             (_opera && _version >= 9.5) ||
-            (_safari && _version >= 312);
+            (_webkit && _version >= 312);
             
         if (_supported) {
-        
             for (var i = 1; i < _length; i++) {
                 _stack.push('');
             }
-            
             _stack.push(_value);
-        
-            if (_msie && _l.hash != _value) {
-                _l.hash = '#' + _local(_crawl(_value, TRUE), TRUE);
-            }
-            
             if (_opera) {
-                history.navigationMode = 'compatible'; 
+                history.navigationMode = 'compatible';
             }
-            
-            if (_url && _qi != -1) {
-                var param, params = _url.substr(_qi + 1).split('&');
-                for (i = 0; i < params.length; i++) {
-                    param = params[i].split('=');
-                    if (/^(autoUpdate|crawlable|history|strict|wrap)$/.test(param[0])) {
-                        _opts[param[0]] = (isNaN(param[1]) ? /^(true|yes)$/i.test(param[1]) : (parseInt(param[1], 10) !== 0));
+            if (document.readyState == 'complete') {
+                var interval = setInterval(function() {
+                    if ($.address) {
+                        _load();
+                        clearInterval(interval);
                     }
-                    if (/^tracker$/.test(param[0])) {
-                        _opts[param[0]] = param[1];
+                }, 50);
+            } else {
+                _options();
+                $(_load);
+            }
+            var hrefState = _hrefState();
+            if (typeof _opts.state !== UNDEFINED) {
+                if (_h.pushState) {
+                    if (hrefState.substr(0, 3) == '/#/') {
+                        _l.replace(_opts.state.replace(/^\/$/, '') + hrefState.substr(2));
                     }
+                } else if (hrefState != '/' && hrefState.replace(/^\/#/, '') != _hrefHash()) {
+                    _l.replace(_opts.state.replace(/^\/$/, '') + '/#' + hrefState);
                 }
             }
-
-            if (document.readyState == 'complete') {
-                _load();
-            }
-            $(_load);
-            $(window).bind('unload', _unload);
-            
-        } else if ((!_supported && _hash() != '') || 
-            (_safari && _version < 418 && _hash() != '' && _l.search != '')) {
-            _d.open();
-            _d.write('<html><head><meta http-equiv="refresh" content="0;url=' + 
-                encodeURI(_l.href.substr(0, _l.href.indexOf('#'))) + '" /></head></html>');
-            _d.close();
+            $(window).bind('popstate', _popstate).bind('unload', _unload);
+        } else if ((!_supported && _hrefHash() != '') || 
+            (_webkit && _version < 418 && _hrefHash() != '' && _l.search != '')) {
+            _l.replace(_l.href.substr(0, _l.href.indexOf('#')));
         } else {
             _track();
         }
 
         return {
-            init: function(data, fn) {
-                return _bind(INIT, data, fn);
+            bind: function(type, data, fn) {
+                return _bind(type, data, fn);
             },
-            change: function(data, fn) {
-                return _bind(CHANGE, data, fn);
+            init: function(fn) {
+                return _bind(INIT, fn);
             },
-            internalChange: function(data, fn) {
-                return _bind(INTERNAL_CHANGE, data, fn);
+            change: function(fn) {
+                return _bind(CHANGE, fn);
             },
-            externalChange: function(data, fn) {
-                return _bind(EXTERNAL_CHANGE, data, fn);
+            internalChange: function(fn) {
+                return _bind(INTERNAL_CHANGE, fn);
+            },
+            externalChange: function(fn) {
+                return _bind(EXTERNAL_CHANGE, fn);
             },
             baseURL: function() {
                 var url = _l.href;
-                if (_hash() != '') {
+                if (url.indexOf('#') != -1) {
                     url = url.substr(0, url.indexOf('#'));
                 }
                 if (/\/$/.test(url)) {
@@ -376,6 +496,13 @@
                 }
                 return _opts.history;
             },
+            state: function(value) {
+                if (value !== undefined) {
+                    _opts.state = value;
+                    return this;
+                }
+                return _opts.state;
+            },
             strict: function(value) {
                 if (value !== undefined) {
                     _opts.strict = value;
@@ -403,9 +530,51 @@
                 _updating = FALSE;
                 return this;
             },
+            encode: function(value) {
+                var pathNames = _pathNames(value),
+                    parameterNames = _parameterNames(value),
+                    queryString = _queryString(value),
+                    hash = _hash(value),
+                    first = value.substr(0, 1),
+                    last = value.substr(value.length - 1),
+                    encoded = '';
+                $.each(pathNames, function(i, v) {
+                    encoded += '/' + _encode(v);
+                });
+                if (queryString !== '') {
+                    encoded += '?';
+                    if (parameterNames.length === 0) {
+                        encoded += queryString;
+                    } else {
+                        $.each(parameterNames, function(i, v) {
+                            var pv = _parameter(v, value);
+                            if (typeof pv !== 'string') {
+                                $.each(pv, function(ni, nv) {
+                                    encoded += _encode(v) + '=' + _encode(nv) + '&';
+                                });
+                            } else {
+                                encoded += _encode(v) + '=' + _encode(pv) + '&';
+                            }
+                        });
+                        encoded = encoded.substr(0, encoded.length - 1);
+                    }
+                }
+                if (hash !== '') {
+                    encoded += '#' + _encode(hash);
+                }
+                if (first != '/' && encoded.substr(0, 1) == '/') {
+                    encoded = encoded.substr(1);
+                }
+                if (/#|&|\?/.test(last)) {
+                    encoded += last;
+                }
+                return encoded;
+            },
+            decode: function(value) {
+                return decodeURIComponent(value.replace(/\+/g, '%20'));
+            },
             title: function(value) {
                 if (value !== undefined) {
-                    value = _dc(value);
                     _st(function() {
                         _title = _d.title = value;
                         if (_juststart && _frame && _frame.contentWindow && _frame.contentWindow.document) {
@@ -423,7 +592,7 @@
             },
             value: function(value) {
                 if (value !== undefined) {
-                    value = _ec(_dc(_strict(value, TRUE)));
+                    value = _strict(this.encode(value), TRUE);
                     if (value == '/') {
                         value = '';
                     }
@@ -433,52 +602,57 @@
                     _justset = TRUE;
                     _value = value;
                     if (_opts.autoUpdate || _updating) {
-                        _silent = TRUE;
                         _update(TRUE);
-                        _stack[_h.length] = _value;
-                        if (_safari) {
-                            if (_opts.history) {
-                                _l[ID][_l.pathname] = _stack.toString();
-                                _length = _h.length + 1;
-                                if (_version < 418) {
-                                    if (_l.search == '') {
-                                        _form.action = '#' + _crawl(_value, TRUE);
-                                        _form.submit();
+                        if (_supportsState()) {
+                            _h[_opts.history ? 'pushState' : 'replaceState']({}, '', 
+                                    _opts.state.replace(/\/$/, '') + (_value == '' ? '/' : _value));
+                        } else {
+                            _silent = TRUE;
+                            _stack[_h.length] = _value;
+                            if (_webkit) {
+                                if (_opts.history) {
+                                    _l[ID][_l.pathname] = _stack.toString();
+                                    _length = _h.length + 1;
+                                    if (_version < 418) {
+                                        if (_l.search == '') {
+                                            _form.action = '#' + _crawl(_value, TRUE);
+                                            _form.submit();
+                                        }
+                                    } else if (_version < 523 || _value == '') {
+                                        var evt = _d.createEvent('MouseEvents');
+                                        evt.initEvent('click', TRUE, TRUE);
+                                        var anchor = _d.createElement('a');
+                                        anchor.href = '#' + _crawl(_value, TRUE);
+                                        anchor.dispatchEvent(evt);                
+                                    } else {
+                                        _l.hash = '#' + _crawl(_value, TRUE);
                                     }
-                                } else if (_version < 523 || _value == '') {
-                                    var evt = _d.createEvent('MouseEvents');
-                                    evt.initEvent('click', TRUE, TRUE);
-                                    var anchor = _d.createElement('a');
-                                    anchor.href = '#' + _crawl(_value, TRUE);
-                                    anchor.dispatchEvent(evt);                
                                 } else {
+                                    _l.replace('#' + _crawl(_value, TRUE));
+                                }
+                            } else if (_value != _href()) {
+                                if (_opts.history) {
                                     _l.hash = '#' + _crawl(_value, TRUE);
+                                } else {
+                                    _l.replace('#' + _crawl(_value, TRUE));
                                 }
-                            } else {
-                                _l.replace('#' + _crawl(_value, TRUE));
                             }
-                        } else if (_value != _hash()) {
-                            if (_opts.history) {
-                                _l.hash = '#' + _local(_crawl(_value, TRUE), TRUE);
+                            if ((_msie && _version < 8) && _opts.history) {
+                                _st(_html, 50);
+                            }
+                            if (_webkit) {
+                                _st(function(){ _silent = FALSE; }, 1);
                             } else {
-                                _l.replace('#' + _crawl(_value, TRUE));
+                                _silent = FALSE;
                             }
                         }
-                        if ((_msie && _version < 8) && _opts.history) {
-                            _st(_html, 50);
-                        }
-                        if (_safari) {
-                            _st(function(){ _silent = FALSE; }, 1);
-                        } else {
-                            _silent = FALSE;
-                        }
                     }
                     return this;
                 }
                 if (!_supported) {
                     return null;
                 }
-                return _dc(_strict(_local(_value, FALSE), FALSE));
+                return _strict(this.decode(_value), FALSE);
             },
             path: function(value) {
                 if (value !== undefined) {
@@ -487,7 +661,10 @@
                     this.value(value + (qs ? '?' + qs : '') + (hash ? '#' + hash : ''));
                     return this;
                 }
-                return this.value().split('#')[0].split('?')[0];
+                return _path(this.value());
+            },
+            pathNames: function() {
+                return _pathNames(this.value());
             },
             queryString: function(value) {
                 if (value !== undefined) {
@@ -495,8 +672,7 @@
                     this.value(this.path() + (value ? '?' + value : '') + (hash ? '#' + hash : ''));
                     return this;
                 }
-                var arr = this.value().split('?');
-                return arr.slice(1, arr.length).join('?').split('#')[0];
+                return _queryString(this.value());
             },
             parameter: function(name, value, append) {
                 var i, params;
@@ -510,90 +686,57 @@
                             v = [v];
                         }
                         if (n == name) {
-                            v = (value === null || value == '') ? [] : 
+                            v = (value === null || value === '') ? [] : 
                                 (append ? v.concat([value]) : [value]);
                         }
                         for (var j = 0; j < v.length; j++) {
                             params.push(n + '=' + v[j]);
                         }
                     }
-                    if ($.inArray(name, names) == -1) {
+                    if ($.inArray(name, names) == -1 && value !== null && value !== '') {
                         params.push(name + '=' + value);
                     }
                     this.queryString(params.join('&'));
                     return this;
                 }
-                value = this.queryString();
-                if (value) {
-                    params = value.split('&');
-                    var r = [];
-                    for (i = 0; i < params.length; i++) {
-                        var p = params[i].split('=');
-                        if (p[0] == name) {
-                            r.push(p[1]);
-                        }
-                    }
-                    if (r.length !== 0) {
-                        return r.length != 1 ? r : r[0];
-                    }
-                }
-            },
-            pathNames: function() {
-                var path = this.path(),
-                    names = path.replace(/\/{2,9}/g, '/').split('/');
-                if (path.substr(0, 1) == '/' || path.length === 0) {
-                    names.splice(0, 1);
-                }
-                if (path.substr(path.length - 1, 1) == '/') {
-                    names.splice(names.length - 1, 1);
-                }
-                return names;
+                return _parameter(name, this.value());
             },
             parameterNames: function() {
-                var qs = this.queryString(),
-                    names = [];
-                if (qs && qs.indexOf('=') != -1) {
-                    var params = qs.split('&');
-                    for (var i = 0; i < params.length; i++) {
-                        var name = params[i].split('=')[0];
-                        if ($.inArray(name, names) == -1) {
-                            names.push(name);
-                        }
-                    }
-                }
-                return names;
+                return _parameterNames(this.value());
             },
             hash: function(value) {
                 if (value !== undefined) {
                     this.value(this.value().split('#')[0] + (value ? '#' + value : ''));
                     return this;
                 }
-                var arr = this.value().split('#');
-                return arr.slice(1, arr.length).join('#');
-            }            
+                return _hash(this.value());
+            }
         };
-        
+      
     })();
     
-    $.fn.address = function (fn) {
-        this.each(function() {
-            if (this.tagName.toLowerCase() == 'form') {
-                $('form').live('submit', function() {
-                    var value = fn ? fn.call(this) : $(this).attr('action') + '?' + $(this).serialize();
-                    $.address.value(value);
-                    return false;
-                });
-            } else {
-                var f = function() {
+    $.fn.address = function(fn) {
+        if (!$(this).attr('address')) {
+            var f = function(e) {
+                if ($(this).is('a')) {
                     var value = fn ? fn.call(this) : 
                         /address:/.test($(this).attr('rel')) ? $(this).attr('rel').split('address:')[1].split(' ')[0] : 
-                        $(this).attr('href').replace(/^#\!?/, '');
+                        typeof $.address.state() !== 'undefined' && $.address.state() != '/' ? 
+                                $(this).attr('href').replace(new RegExp('^(.*' + $.address.state() + '|\\.)'), '') : 
+                                $(this).attr('href').replace(/^(#\!?|\.)/, '');
                     $.address.value(value);
-                    return false;
-                };
-                $(this).click(f).live('click', f);
-            }
-        });
+                    e.preventDefault();
+                }
+            };
+            $(this).click(f).live('click', f).submit(function(e) {
+                if ($(this).is('form')) {
+                    var value = fn ? fn.call(this) : $(this).attr('action') + '?' + $.address.decode($(this).serialize());
+                    $.address.value(value);
+                    e.preventDefault();
+                }
+            }).attr('address', true);
+        }
+        return this;
     };
     
 }(jQuery));