sinatra_resource 0.3.3 → 0.3.4

data/VERSION

@@ -1 +1 @@
-0.3.3
+0.3.4

data/lib/builder/action_definitions.rb

@@ -33,7 +33,7 @@ module SinatraResource
       def document_for_post(role, model, resource_config, leaf, parent_document, child_assoc)
         check_permission(:create, role, resource_config)
         check_params(:create, role, resource_config, leaf)
-        do_callback(:before_create, resource_config, nil)
+        do_callback(:before_create, resource_config, nil, parent_document)
         document = if resource_config[:parent]
           create_nested_document!(parent_document, child_assoc, model)
         else
@@ -42,7 +42,7 @@ module SinatraResource
         if resource_config[:parent]
           make_related(parent_document, document, resource_config)
         end
-        do_callback(:after_create, resource_config, document)
+        do_callback(:after_create, resource_config, document, parent_document)
         document
       end
       
@@ -57,13 +57,13 @@ module SinatraResource
         else
           find_document!(model, id)
         end
-        do_callback(:before_update, resource_config, document)
+        do_callback(:before_update, resource_config, document, parent_document)
         document = if resource_config[:parent]
           update_nested_document!(parent_document, child_assoc, model, id)
         else
           update_document!(model, id)
         end
-        do_callback(:after_update, resource_config, document)
+        do_callback(:after_update, resource_config, document, parent_document)
         document
       end
       
@@ -78,13 +78,13 @@ module SinatraResource
         else
           find_document!(model, id)
         end
-        do_callback(:before_destroy, resource_config, document)
+        do_callback(:before_destroy, resource_config, document, parent_document)
         document = if resource_config[:parent]
           delete_nested_document!(parent_document, child_assoc, model, id)
         else
           delete_document!(model, id)
         end
-        do_callback(:after_destroy, resource_config, document)
+        do_callback(:after_destroy, resource_config, document, parent_document)
         document
       end
 

data/lib/builder/helpers.rb

@@ -122,11 +122,30 @@ module SinatraResource
         convert(object)
       end
       
-      def do_callback(name, resource_config, document)
+      # Execute a callback.
+      #
+      # @param [Symbol] name
+      #   Valid values include:
+      #     * :before_create, :before_update, :before_destroy
+      #     * :after_create,  :after_update,  :after_destroy
+      #
+      # @param [Hash] resource_config
+      #
+      # @param [MongoMapper::Document, nil] document
+      #
+      # @param [MongoMapper::Document, nil] parent_document
+      #
+      # @return [undefined]
+      def do_callback(name, resource_config, document, parent_document)
         proc = resource_config[:callbacks][name]
         return unless proc
-        if document
+
+        if document && parent_document
+          proc.call(self, document, parent_document)
+        elsif document
           proc.call(self, document)
+        elsif parent_document
+          proc.call(self, parent_document)
         else
           proc.call(self)
         end

data/sinatra_resource.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{sinatra_resource}
-  s.version = "0.3.3"
+  s.version = "0.3.4"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["David James"]
-  s.date = %q{2009-10-29}
+  s.date = %q{2009-10-30}
   s.description = %q{A DSL for creating RESTful actions with Sinatra and MongoMapper. It embraces the Resource Oriented Architecture as explained by Leonard Richardson and Sam Ruby.}
   s.email = %q{djames@sunlightfoundation.com}
   s.extra_rdoc_files = [

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: sinatra_resource
 version: !ruby/object:Gem::Version 
-  version: 0.3.3
+  version: 0.3.4
 platform: ruby
 authors: 
 - David James
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-10-29 00:00:00 -04:00
+date: 2009-10-30 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency