hammock 0.5.6 → 0.5.7

data/History.txt

@@ -1,3 +1,8 @@
+== 0.5.7 2010-02-21
+Flatten resource lists instead of splatting, to avoid implicit #to_a on Ambition contexts.
+Don't eval JS responses in the XHR callback, since it already happens automatically.
+
+
 == 0.5.6 2010-01-07
 Fixed Hammock.loaded_from_gem? to work for any gem path, not just `gem env gemdir`.
 

data/VERSION

@@ -1 +1 @@
-0.5.6
+0.5.7

data/hammock.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{hammock}
-  s.version = "0.5.6"
+  s.version = "0.5.7"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Ben Hoskings"]
-  s.date = %q{2010-01-07}
+  s.date = %q{2010-02-21}
   s.description = %q{}
   s.email = %q{ben@hoskings.net}
   s.extra_rdoc_files = [

data/lib/hammock/ajaxinate.rb

@@ -104,7 +104,7 @@ module Hammock
       private
 
       def link_class_for verb, entities, attribute = nil
-        [*entities].map(&:description).
+        [entities].flatten.map(&:description).
           unshift(verb).push(attribute).
           compact.join('_')
       end

data/lib/hammock/monkey_patches/active_record.rb

@@ -70,7 +70,7 @@ module Hammock
         subclasses.each &:reset_cached_column_info
       end
       
-      def find_or_new_with(find_attributes, create_attributes = {})
+      def find_or_new_with(find_attributes, create_attributes = {}, should_assign = false)
         finder = respond_to?(:find_with_destroyed) ? :find_with_destroyed : :find
 
         if record = send(finder, :first, :conditions => find_attributes.discard(:deleted_at))
@@ -80,6 +80,7 @@ module Hammock
           # (c) it is deleted, but we want to find one that's deleted, or
           # (d) we don't want a deleted record, and undestruction succeeds.
           if (finder != :find_with_destroyed) || !record.deleted? || create_attributes[:deleted_at] || record.restore
+            record.attributes = create_attributes if should_assign
             record
           end
         else

data/lib/hammock/monkey_patches/object.rb

@@ -28,7 +28,12 @@ module Hammock
         yield self
         self
       end
-      
+
+      def tapp
+        log self.inspect
+        self
+      end
+
       # The reverse of <tt>Enumerable#include?</tt> - returns +true+ if +self+ is
       # equal to one of the elements of +args+.
       def in? first, *rest

data/lib/hammock/resource_retrieval.rb

@@ -89,7 +89,7 @@ module Hammock
 
       def returning_login_path
         session[:path_after_login] = request.request_uri
-        login_path
+        signin_path
       end
 
       def escort_for_bad_request

data/lib/hammock/restful_support.rb

@@ -73,18 +73,16 @@ module Hammock
           merge(params_for(resource.symbolize))
       end
 
-      def assign_entity record_or_records
-        @entity = if record_or_records.nil?
-          # Fail
-        elsif record_or_records.is_a? ActiveRecord::Base
-          instance_variable_set "@#{mdl_name}", (@record = record_or_records)
-        elsif record_or_records.is_a? Ambition::Context
-          # log "Unkicked query: #{record_or_records.to_hash.inspect}"
-          instance_variable_set "@#{mdl_name.pluralize}", (@records = record_or_records)
-        elsif record_or_records.is_a? Array
-          instance_variable_set "@#{mdl_name.pluralize}", (@records = record_or_records)
-        else
-          raise "Unknown record(s) type #{record_or_records.class}."
+      def assign_entity entity
+        @entity = if entity.is_a? ActiveRecord::Base
+          instance_variable_set "@#{mdl_name}", (@record = entity)
+        elsif entity.is_a? Ambition::Context
+          # log "Unkicked query: #{entity.to_hash.inspect}"
+          instance_variable_set "@#{mdl_name.pluralize}", (@records = entity)
+        elsif entity.is_a? Array
+          instance_variable_set "@#{mdl_name.pluralize}", (@records = entity)
+        elsif !entity.nil?
+          raise "Unknown record(s) type #{entity.class}."
         end
 
         @entity if assign_nesting_entities

data/lib/hammock/scope.rb

@@ -45,11 +45,11 @@ module Hammock
         route = route_for verb, *entities
         if route.verb.in?(:save, :create) && record.new_record?
           returning record.createable_by?(current_user) ? :ok : :unauthed do |result|
-            dlog "#{requester_name} can#{"'t" unless result == :ok} create a #{record.class} with #{record.attributes.inspect}. #{describe_call_point 4}"
+            # dlog "#{requester_name} can#{"'t" unless result == :ok} create a #{record.class} with #{record.attributes.inspect}. #{describe_call_point 4}"
           end
         else
           returning record_in_scope?(route, record) ? :ok : :not_found do |result|
-            dlog "#{requester_name} can#{"'t" unless result == :ok} #{verb} #{record.class}<#{record.id}>. #{describe_call_point 4}"
+            # dlog "#{requester_name} can#{"'t" unless result == :ok} #{verb} #{record.class}<#{record.id}>. #{describe_call_point 4}"
           end
         end
       end

data/public/javascripts/ajax.js

@@ -52,7 +52,7 @@ var fire_hammock_ajax = function(data) {
       ),
       function(response, textStatus) {
         if (data.format == 'js') {
-          eval(response);
+          // JS responses are evaluated automatically
         } else {
           jQuery('.' + (data.target || data.klass + '_target')).before(response).remove();
         }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: hammock
 version: !ruby/object:Gem::Version 
-  version: 0.5.6
+  version: 0.5.7
 platform: ruby
 authors: 
 - Ben Hoskings
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-01-07 00:00:00 +10:00
+date: 2010-02-21 00:00:00 +11:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency