hammock 0.5.4 → 0.5.5

data/History.txt

@@ -1,3 +1,9 @@
+== 0.5.5 2009-12-14
+Attributes in #ajaxinate link_data render as hashes now, not strings of json hashes, so they're converted to json properly.
+Send record/form/passed attributes in non-GET ajax requests.
+Updated $() to jQuery() calls in ajax.js.
+
+
 == 0.5.4 2009-11-18
 Use self.attributes in AR::Base#adjust_attributes.
 

data/VERSION

@@ -1 +1 @@
-0.5.4
+0.5.5

data/hammock.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{hammock}
-  s.version = "0.5.4"
+  s.version = "0.5.5"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Ben Hoskings"]
-  s.date = %q{2009-11-18}
+  s.date = %q{2009-12-14}
   s.description = %q{}
   s.email = %q{ben@hoskings.net}
   s.extra_rdoc_files = [

data/lib/hammock/ajaxinate.rb

@@ -42,6 +42,11 @@ module Hammock
           :path => route.path,
           :http_method => route.http_method,
           :fake_http_method => route.fake_http_method,
+          :resource => entity.base_model,
+          :attribute => link_params[:attribute],
+          :record_attributes => record_attributes.to_param_hash,
+          :passed_attributes => link_params.to_param_hash,
+          :forgery_key => forgery_key_json(route.http_method),
           :format => (opts[:format].blank? ? 'html' : opts[:format].to_s)
         }
 
@@ -85,7 +90,7 @@ module Hammock
             jQuery.extend(
               #{params},
               {format: '#{opts[:format] || 'html'}', _method: '#{route.http_method}'},
-              #{forgery_key_json(route.http_method)}
+              #{forgery_key_json(route.http_method).to_flattened_json}
             ),
             function(data, textStatus) {
               #{response_action}
@@ -111,9 +116,9 @@ module Hammock
 
       def forgery_key_json request_method = nil
         if !protect_against_forgery? || (:get == (request_method || request.method))
-          '{ }'
+          {}
         else
-          "{ '#{request_forgery_protection_token}': '#{escape_javascript(form_authenticity_token)}' }"
+          {request_forgery_protection_token => escape_javascript(form_authenticity_token)}
         end
       end
 

data/public/javascripts/ajax.js

@@ -7,8 +7,8 @@ var hamlink_log = function(link_key, message) {
 };
 
 var hammock_ajax = function() {
-  $('a.hammock').live('click', function() {
-    link_key = $(this).attr('class').match(/hammock_link_(\w+)/)[1];
+  jQuery('a.hammock').live('click', function() {
+    link_key = jQuery(this).attr('class').match(/hammock_link_(\w+)/)[1];
     if (!hammock_link_map[link_key]) {
       hamlink_log(link_key, 'no entry in link map');
     } else {
@@ -28,12 +28,28 @@ var fire_hammock_ajax = function(data) {
   if (data.before && false == data.before()) {
     hamlink_log(data.klass, "before callback failed.");
   } else {
+    if (data.http_method == 'get') {
+      form_attributes = {};
+    // } else if (data.attribute) {
+    //   resource = data.resource;
+    //   attribute = data.attribute;
+    //   form_attributes = {resource: {attribute: jQuery('.' + data.klass).val() } };
+    } else {
+      form_attributes = jQuery('form').serializeHash();
+    }
+
     jQuery[data.fake_http_method](
       data.path,
-      {
-        '_method': data.http_method,
-        'format': data.format
-      },
+      jQuery.extend(
+        data.record_attributes,
+        form_attributes,
+        {
+          '_method': data.http_method,
+          'format': data.format
+        },
+        data.passed_attributes,
+        data.forgery_key
+      ),
       function(response, textStatus) {
         if (data.format == 'js') {
           eval(response);
@@ -48,6 +64,6 @@ var fire_hammock_ajax = function(data) {
   }
 };
 
-$(function() {
+jQuery(function() {
   hammock_ajax();
 });

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: hammock
 version: !ruby/object:Gem::Version 
-  version: 0.5.4
+  version: 0.5.5
 platform: ruby
 authors: 
 - Ben Hoskings
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-11-18 00:00:00 +11:00
+date: 2009-12-14 00:00:00 +11:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency