benhoskings-hammock 0.2.15.1 → 0.2.16

data/History.txt

@@ -1,3 +1,12 @@
+== 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.
+Updated the implementation of current_hammock_resource to use #chomp! instead of regex matching and #gsub.
+Fixed the find in find_record_on_create to query correctly with the current_nest_scope.
+Use AR::Base.nestable_reflections in #determine_routing_parent instead of manual implementation.
+Added AR::Base.nestable_reflections.
+
+
 == 0.2.15.1 2009-04-15
 Convert action_name to a symbol instead of a string before checking for ImpliedUnsafeActions.
 Revert "Switched from #in? to #include? for non-literal args, since it splats into a nested array and breaks."

data/hammock.gemspec

@@ -2,11 +2,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{hammock}
-  s.version = "0.2.15.1"
+  s.version = "0.2.16"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Ben Hoskings"]
-  s.date = %q{2009-04-15}
+  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.email = ["ben@hoskings.net"]
   s.extra_rdoc_files = ["History.txt", "Manifest.txt", "README.rdoc", "misc/scaffold.txt"]

data/lib/hammock.rb

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

data/lib/hammock/monkey_patches/active_record.rb

@@ -21,6 +21,14 @@ module Hammock
         }
       end
 
+      def nestable_reflections
+        if nestable_routing_resources.nil?
+          reflections
+        else
+          reflections.dragnet *nestable_routing_resources
+        end
+      end
+
       def sorter
         # TODO updated_at DESC
         proc {|record| record.id }

data/lib/hammock/restful_actions.rb

@@ -136,7 +136,7 @@ module Hammock
 
       def find_record_on_create
         if findable_on_create?
-          if record = current_nest_scope.find(:first, :conditions => params_for(mdl.symbolize))
+          if record = mdl.ambition_context.within(current_nest_scope).find(:first, :conditions => params_for(mdl.symbolize))
             log "suitable record already exists: #{record}"
             assign_entity record
           else

data/lib/hammock/restful_support.rb

@@ -42,7 +42,7 @@ module Hammock
 
       # Returns the node in the Hammock routing map corresponding to the (possibly nested) resource handling the current request.
       def current_hammock_resource
-        nesting_resources = params.keys.select {|k| /_id$/ =~ k }.map {|k| k.gsub(/_id$/, '').pluralize }
+        nesting_resources = params.keys.map {|k| k.dup.chomp!('_id') }.compact.map(&:pluralize)
         ActionController::Routing::Routes.route_map.base_for nesting_resources.push(mdl.resource_name).map(&:to_sym)
       end
 
@@ -64,6 +64,12 @@ module Hammock
         params[key] || {}
       end
 
+      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 }
+      end
+
       def assign_entity record_or_records
         @entity = if record_or_records.nil?
           # Fail
@@ -98,7 +104,7 @@ module Hammock
       end
 
       def make_new_record resource = mdl
-        resource.new_with(params_for(resource.symbolize))
+        resource.new_with nested_params_for resource
       end
 
       def assign_createable

data/lib/hammock/route_node.rb

@@ -124,7 +124,7 @@ module Hammock
         nil
       else
         # puts "reflections: #{resource.reflections.keys.inspect}"
-        scannable_reflections = resource.nestable_routing_resources.nil? ? resource.reflections : resource.reflections.dragnet(*resource.nestable_routing_resources)
+        scannable_reflections = resource.nestable_reflections
         # puts "scannable reflections: #{scannable_reflections.keys.inspect}"
         valid_reflections = scannable_reflections.selekt {|k,v|
           # puts "#{v.klass}<#{v.object_id}> == #{parent.resource}<#{parent.resource.object_id}> #=> #{v.klass == parent.resource}"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: benhoskings-hammock
 version: !ruby/object:Gem::Version 
-  version: 0.2.15.1
+  version: 0.2.16
 platform: ruby
 authors: 
 - Ben Hoskings
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-04-15 00:00:00 -07:00
+date: 2009-04-16 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency