hammock 0.2.16 → 0.2.17

data/History.txt

@@ -1,3 +1,7 @@
+== 0.2.17 2009-04-17
+Refactored the logic from #update into #assign_and_save_record, and the #assign_attributes_for_save helper.
+
+
 == 0.2.16 2009-04-16
 Use #nested_params_for in #make_new_record, instead of #params_for, to set nesting attributes like foreign keys.
 Added #nested_params_for, to return the params for the current record plus all nestable 'blah_id' parameters.

data/hammock.gemspec

@@ -2,12 +2,21 @@
 
 Gem::Specification.new do |s|
   s.name = %q{hammock}
-  s.version = "0.2.16"
+  s.version = "0.2.17"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Ben Hoskings"]
-  s.date = %q{2009-04-16}
-  s.description = %q{Hammock is a Rails plugin that eliminates redundant code in a very RESTful manner. It does this in lots in lots of different places, but in one manner: it encourages specification in place of implementation.   Hammock enforces RESTful resource access by abstracting actions away from the controller in favour of a clean, model-like callback system.  Hammock tackles the hard and soft sides of security at once with a scoping security system on your models. Specify who can verb what resources under what conditions once, and everything else - the actual security, link generation, index filtering - just happens.  Hammock inspects your routes and resources to generate a routing tree for each resource. Parent resources in a nested route are handled transparently at every point - record retrieval, creation, and linking.  It makes more sense when you see how it works though, so check out the screencast!}
+  s.date = %q{2009-04-17}
+  s.description = %q{Hammock is a Rails plugin that eliminates redundant code in a very RESTful manner. It does this in lots in lots of different places, but in one manner: it encourages specification in place of implementation.
+
+
+Hammock enforces RESTful resource access by abstracting actions away from the controller in favour of a clean, model-like callback system.
+
+Hammock tackles the hard and soft sides of security at once with a scoping security system on your models. Specify who can verb what resources under what conditions once, and everything else - the actual security, link generation, index filtering - just happens.
+
+Hammock inspects your routes and resources to generate a routing tree for each resource. Parent resources in a nested route are handled transparently at every point - record retrieval, creation, and linking.
+
+It makes more sense when you see how it works though, so check out the screencast!}
   s.email = ["ben@hoskings.net"]
   s.extra_rdoc_files = ["History.txt", "Manifest.txt", "README.rdoc", "misc/scaffold.txt"]
   s.files = ["History.txt", "LICENSE", "Manifest.txt", "README.rdoc", "Rakefile", "hammock.gemspec", "lib/hammock.rb", "lib/hammock/ajaxinate.rb", "lib/hammock/callback.rb", "lib/hammock/callbacks.rb", "lib/hammock/canned_scopes.rb", "lib/hammock/constants.rb", "lib/hammock/controller_attributes.rb", "lib/hammock/export_scope.rb", "lib/hammock/hamlink_to.rb", "lib/hammock/javascript_buffer.rb", "lib/hammock/logging.rb", "lib/hammock/model_attributes.rb", "lib/hammock/model_logging.rb", "lib/hammock/monkey_patches/action_pack.rb", "lib/hammock/monkey_patches/active_record.rb", "lib/hammock/monkey_patches/array.rb", "lib/hammock/monkey_patches/hash.rb", "lib/hammock/monkey_patches/logger.rb", "lib/hammock/monkey_patches/module.rb", "lib/hammock/monkey_patches/numeric.rb", "lib/hammock/monkey_patches/object.rb", "lib/hammock/monkey_patches/route_set.rb", "lib/hammock/monkey_patches/string.rb", "lib/hammock/overrides.rb", "lib/hammock/resource_mapping_hooks.rb", "lib/hammock/resource_retrieval.rb", "lib/hammock/restful_actions.rb", "lib/hammock/restful_rendering.rb", "lib/hammock/restful_support.rb", "lib/hammock/route_drawing_hooks.rb", "lib/hammock/route_for.rb", "lib/hammock/route_node.rb", "lib/hammock/route_step.rb", "lib/hammock/scope.rb", "lib/hammock/suggest.rb", "lib/hammock/utils.rb", "misc/scaffold.txt", "misc/template.rb", "tasks/hammock_tasks.rake", "test/hammock_test.rb"]
@@ -16,12 +25,12 @@ Gem::Specification.new do |s|
   s.rdoc_options = ["--main", "README.rdoc"]
   s.require_paths = ["lib"]
   s.rubyforge_project = %q{hammock}
-  s.rubygems_version = %q{1.3.1}
+  s.rubygems_version = %q{1.3.2}
   s.summary = %q{Hammock is a Rails plugin that eliminates redundant code in a very RESTful manner}
 
   if s.respond_to? :specification_version then
     current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
-    s.specification_version = 2
+    s.specification_version = 3
 
     if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<rails>, ["~> 2.2"])

data/lib/hammock/restful_actions.rb

@@ -65,14 +65,7 @@ module Hammock
       # Updates the specified record with the supplied attributes if it is within the current write scope, defined by +write_scope+ and +write_scope_for+ on the current model.
       def update
         if find_record
-          # If params[:attribute] is given, update only that attribute. We mass-assign either way to filter through attr_accessible.
-          @record.attributes = if (attribute_name = params[:attribute])
-            { attribute_name => params_for(mdl.symbolize)[attribute_name] }
-          else
-            params_for mdl.symbolize
-          end
-
-          render_or_redirect_after save_record
+          render_or_redirect_after assign_and_save_record
         end
       end
 
@@ -124,6 +117,13 @@ module Hammock
       end
 
 
+      protected
+
+      def assign_and_save_record
+        save_record if assign_attributes_for_save
+      end
+
+
       private
 
       def tasks_for_index
@@ -145,6 +145,15 @@ module Hammock
         end
       end
 
+      def assign_attributes_for_save
+        # If params[:attribute] is given, update only that attribute. We mass-assign either way to filter through attr_accessible.
+        @record.attributes = if (attribute_name = params[:attribute])
+          { attribute_name => params_for(mdl.symbolize)[attribute_name] }
+        else
+          params_for mdl.symbolize
+        end
+      end
+
       def save_record
         verb = @record.new_record? ? 'create' : 'update'
         if callback("before_#{verb}") and callback(:before_save) and save

data/lib/hammock/restful_support.rb

@@ -67,7 +67,7 @@ module Hammock
       def nested_params_for resource
         params.
           dragnet(*resource.nestable_reflections.keys.map {|i| "#{i.to_s}_id" }).
-          merge(params_for(resource.symbolize)).tap{|obj| log obj.inspect }
+          merge(params_for(resource.symbolize))
       end
 
       def assign_entity record_or_records

data/lib/hammock.rb

@@ -4,7 +4,7 @@ require 'ambition'
 require 'ambition/adapters/active_record'
 
 module Hammock
-  VERSION = '0.2.16'
+  VERSION = '0.2.17'
 
   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.16
+  version: 0.2.17
 platform: ruby
 authors: 
 - Ben Hoskings
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-04-16 00:00:00 +10:00
+date: 2009-04-17 00:00:00 +10:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -52,7 +52,17 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: 1.8.0
     version: 
-description: "Hammock is a Rails plugin that eliminates redundant code in a very RESTful manner. It does this in lots in lots of different places, but in one manner: it encourages specification in place of implementation.   Hammock enforces RESTful resource access by abstracting actions away from the controller in favour of a clean, model-like callback system.  Hammock tackles the hard and soft sides of security at once with a scoping security system on your models. Specify who can verb what resources under what conditions once, and everything else - the actual security, link generation, index filtering - just happens.  Hammock inspects your routes and resources to generate a routing tree for each resource. Parent resources in a nested route are handled transparently at every point - record retrieval, creation, and linking.  It makes more sense when you see how it works though, so check out the screencast!"
+description: |-
+  Hammock is a Rails plugin that eliminates redundant code in a very RESTful manner. It does this in lots in lots of different places, but in one manner: it encourages specification in place of implementation.
+  
+  
+  Hammock enforces RESTful resource access by abstracting actions away from the controller in favour of a clean, model-like callback system.
+  
+  Hammock tackles the hard and soft sides of security at once with a scoping security system on your models. Specify who can verb what resources under what conditions once, and everything else - the actual security, link generation, index filtering - just happens.
+  
+  Hammock inspects your routes and resources to generate a routing tree for each resource. Parent resources in a nested route are handled transparently at every point - record retrieval, creation, and linking.
+  
+  It makes more sense when you see how it works though, so check out the screencast!
 email: 
 - ben@hoskings.net
 executables: []
@@ -113,6 +123,8 @@ files:
 - test/hammock_test.rb
 has_rdoc: true
 homepage: http://github.com/benhoskings/hammock
+licenses: []
+
 post_install_message: 
 rdoc_options: 
 - --main
@@ -134,9 +146,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: hammock
-rubygems_version: 1.3.1
+rubygems_version: 1.3.2
 signing_key: 
-specification_version: 2
+specification_version: 3
 summary: Hammock is a Rails plugin that eliminates redundant code in a very RESTful manner
 test_files: []