hammock 0.4.2 → 0.5.0

data/History.txt

@@ -1,3 +1,7 @@
+== 0.5.0 2009-10-27
+Redesigned ajaxinate implementation - instead of rendering JS separately for every link, use one generic method and a link map to store details for each link.
+
+
 == 0.4.2 2009-10-27
 Check rendered_or_redirected? on XHR requests as well as normal ones.
 Fix #ajaxinate to handle multiple entities.

data/VERSION

@@ -1 +1 @@
-0.4.2
+0.5.0

data/hammock.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{hammock}
-  s.version = "0.4.2"
+  s.version = "0.5.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Ben Hoskings"]
@@ -68,6 +68,7 @@ Gem::Specification.new do |s|
      "lib/hammock/utils.rb",
      "misc/scaffold.txt",
      "misc/template.rb",
+     "public/javascripts/ajax.js",
      "tasks/hammock_tasks.rake"
   ]
   s.homepage = %q{http://github.com/benhoskings/hammock}

data/lib/hammock/ajaxinate.rb

@@ -22,7 +22,7 @@ module Hammock
 
           content_tag :a,
             opts[:text] || route.verb.to_s.capitalize,
-            :class => [opts[:class], link_class_for(route.verb, entities)].squash.join(' '),
+            :class => ['hammock', opts[:class], link_class_for(route.verb, entities), "hammock_link_#{link_class_for(route.verb, entities)}"].squash.join(' '),
             :href => route.path,
             :onclick => 'return false;',
             :style => opts[:style]
@@ -37,64 +37,18 @@ module Hammock
         attribute = link_params[:attribute]
         link_class = link_class_for route.verb, entities, attribute
 
-        link_params[:_method] = route.http_method
-        link_params[:format] = opts[:format].to_s unless opts[:format].blank?
-
-        form_elements_hash = if route.get?
-          '{ }'
-        elsif attribute.blank?
-          "jQuery('form').serializeHash()"
-        else
-          "{ '#{entity.base_model}[#{attribute}]': $('.#{link_class}').val() }"
-        end
-
-        response_action = case link_params[:format].to_s
-        when 'js'
-          "eval(response);"
-        else
-          "jQuery('.#{opts[:target] || link_class + '_target'}').before(response).remove();"
-        end
-
-        # TODO check the response code in the callback, and replace :after with :success and :failure.
-        js = %Q{
-          jQuery('.#{link_class}').#{opts[:on] || 'click'}(function() {
-            var obj = null;
-
-            if (#{opts[:spinner] ? 'true' : 'false'}) {
-              obj = jQuery(this).parent().find('.statuses');
-              obj.find('.spinner').animate({opacity: 'show'}, 100);
-            }
-
-            /*if (#{attribute.blank? ? 'false' : 'true'} && (jQuery('.#{link_class}_target .original_value').html() == jQuery('.#{link_class}_target .modify input').val())) {
-              eval("#{clean_snippet opts[:skipped]}");
-            } else*/ if (false == eval("#{clean_snippet opts[:before]}")) {
-              // before callback failed
-            } else { // fire the request
-              jQuery.#{route.fake_http_method}(
-                '#{route.path}',
-                jQuery.extend(
-                  #{record_attributes.to_flattened_json},
-                  #{form_elements_hash},
-                  #{link_params.to_flattened_json},
-                  #{forgery_key_json(route.http_method)}
-                ),
-                function(response, textStatus) {
-                  #{response_action}
-                  if (obj) {
-                    obj.children('.spinner').hide();
-                    #{"if ('success' == textStatus) obj.children('.success').show().fadeOut(4000);" if opts[:spinner] != :pending}
-                  }
-                  eval("#{clean_snippet opts[:after]}");
-                }
-              );
-            }
-          });
+        link_data = {
+          :klass => link_class,
+          :path => route.path,
+          :http_method => route.http_method,
+          :fake_http_method => route.fake_http_method,
+          :format => (opts[:format].blank? ? 'html' : opts[:format].to_s)
         }
 
-        append_javascript js
+        append_javascript %Q{hammock_link_map['#{link_class}'] = #{link_data.to_json};}
         route
       end
-      
+
       def status_callback
         %Q{
           if ('success' == textStatus) {

data/public/javascripts/ajax.js

@@ -0,0 +1,53 @@
+var KEYS = { BACKSPACE:8, TAB:9, RETURN:13, ENTER:3, ESC:27, SPACE:32, LEFT:37, UP:38, RIGHT:39, DOWN:40, DELETE:46 };
+
+var hammock_link_map = {};
+
+var hamlink_log = function(link_key, message) {
+  if (console.log) console.log(link_key + ": " + message);
+};
+
+var hammock_ajax = function() {
+  $('a.hammock').live('click', function() {
+    link_key = $(this).attr('class').match(/hammock_link_(\w+)/)[1];
+    if (!hammock_link_map[link_key]) {
+      hamlink_log(link_key, 'no entry in link map');
+    } else {
+      fire_hammock_ajax(hammock_link_map[link_key]);
+    }
+  });
+};
+
+var fire_hammock_ajax = function(data) {
+  var obj = null;
+
+  if (data.spinner) {
+    obj = jQuery(this).parent().find('.statuses');
+    obj.find('.spinner').animate({opacity: 'show'}, 100);
+  }
+
+  if (data.before && false == data.before()) {
+    hamlink_log(data.klass, "before callback failed.");
+  } else {
+    jQuery[data.fake_http_method](
+      data.path,
+      {
+        '_method': data.http_method,
+        'format': data.format
+      },
+      function(response, textStatus) {
+        if (data.format == 'js') {
+          eval(response);
+        } else {
+          jQuery('.' + (data.target || data.klass + '_target')).before(response).remove();
+        }
+        if (data.after && false == data.after()) {
+          hamlink_log(data.klass, "after callback failed.");
+        }
+      }
+    );
+  }
+};
+
+$(function() {
+  hammock_ajax();
+});

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: hammock
 version: !ruby/object:Gem::Version 
-  version: 0.4.2
+  version: 0.5.0
 platform: ruby
 authors: 
 - Ben Hoskings
@@ -93,6 +93,7 @@ files:
 - lib/hammock/utils.rb
 - misc/scaffold.txt
 - misc/template.rb
+- public/javascripts/ajax.js
 - tasks/hammock_tasks.rake
 has_rdoc: true
 homepage: http://github.com/benhoskings/hammock