hammock 0.2.25 → 0.3.0

data/History.txt

@@ -1,3 +1,7 @@
+== 0.3.0 2009-05-25
+Updated ajax_link, ajaxinate and related methods to accept explicit args instead of a splatted list - this makes it a lot easier to handle different amounts of entities.
+Only do obj replacement in jquery_xhr callback if it's set.
+
 == 0.2.25 2009-05-25
 Added String#clean_email[!].
 Moved set_new_or_deleted_before_save callback from controller to model.

data/hammock.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{hammock}
-  s.version = "0.2.25"
+  s.version = "0.3.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Ben Hoskings"]

data/lib/hammock/ajaxinate.rb

@@ -16,25 +16,30 @@ module Hammock
         ajax_link verb, record, opts.merge(:class => [opts[:class], 'button'].squash.join(' '))
       end
 
-      def ajax_link verb, record, opts = {}
-        if can_verb_entity?(verb, record)
-          route = ajaxinate verb, record, opts
+      def ajax_link verb, entities, opts
+        entities = [entities] unless entities.is_a?(Array)
+
+        if can_verb_entity?(verb, entities.last)
+          route = ajaxinate verb, entities, opts
 
           content_tag :a,
             opts[:text] || route.verb.to_s.capitalize,
-            :class => [opts[:class], link_class_for(route.verb, record)].squash.join(' '),
+            :class => [opts[:class], link_class_for(route.verb, entities)].squash.join(' '),
             :href => route.path,
             :onclick => 'return false;',
             :style => opts[:style]
         end
       end
 
-      def ajaxinate verb, record, opts = {}
-        record_attributes = {record.base_model => record.unsaved_attributes}
-        link_params = {record.base_model => (opts.delete(:record) || {}) }.merge(opts[:params] || {})
-        route = route_for verb, record
+      def ajaxinate verb, entities, opts = {}
+        entities = [entities] unless entities.is_a?(Array)
+        entity = entities.last
+
+        record_attributes = entity.is_a?(ActiveRecord::Base) ? {entity.base_model => entity.unsaved_attributes} : {}
+        link_params = {entity.base_model => (opts.delete(:record) || {}) }.merge(opts[:params] || {})
+        route = route_for verb, *entities
         attribute = link_params[:attribute]
-        link_class = link_class_for route.verb, record, 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?
@@ -44,7 +49,7 @@ module Hammock
         elsif attribute.blank?
           "jQuery('form').serializeHash()"
         else
-          "{ '#{record.base_model}[#{attribute}]': $('.#{link_class}').val() }"
+          "{ '#{entity.base_model}[#{attribute}]': $('.#{link_class}').val() }"
         end
 
         response_action = case link_params[:format].to_s
@@ -115,7 +120,7 @@ module Hammock
         when 'js'
           "eval(data);"
         else
-          "obj.replaceWith(data);"
+          "if (typeof(obj) != 'undefined') { obj.replaceWith(data); }"
         end
 
         %Q{
@@ -141,8 +146,8 @@ module Hammock
 
       private
 
-      def link_class_for verb, record, attribute = nil
-        [verb, record.description, attribute].compact.join('_')
+      def link_class_for verb, entitites, attribute = nil
+        [verb, entitites.map(&:description), attribute].flatten.compact.join '_'
       end
 
       def clean_snippet snippet

data/lib/hammock/monkey_patches/array.rb

@@ -37,6 +37,10 @@ module Hammock
         self
       end
 
+      def extract_verb!
+        first.is_a?(::Symbol) ? shift : nil
+      end
+
       def as_index_for &value_function
         inject({}) do |accum, elem|
           accum[elem] = value_function.call(elem)

data/lib/hammock/restful_actions.rb

@@ -104,7 +104,7 @@ module Hammock
           @queries = params[:q].downcase.split(/\s+/)
 
           mdl.send :with_scope, :find => suggest_scope.to_hash do
-            mdl.suggest fields, @queries
+            mdl.suggest fields, @queries, params[:limit].to_i
           end
         end
         

data/lib/hammock.rb

@@ -4,7 +4,7 @@ require 'ambition'
 require 'ambition/adapters/active_record'
 
 module Hammock
-  VERSION = '0.2.25'
+  VERSION = '0.3.0'
 
   def self.included base # :nodoc:
     puts "Loading Hammock from #{loaded_from_gem? ? 'gem' : 'plugin'}"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: hammock
 version: !ruby/object:Gem::Version 
-  version: 0.2.25
+  version: 0.3.0
 platform: ruby
 authors: 
 - Ben Hoskings