toast 0.7.1 → 0.7.2

data/app/controller/toast_controller.rb

@@ -17,6 +17,7 @@ class ToastController < ApplicationController
       return head(:not_found)
 
     rescue Toast::PayloadInvalid => e
+      raise e if Rails.env == "test"
       return render :text => e.message, :status => :forbidden
 
     rescue Toast::PayloadFormatError => e

data/lib/toast/collection.rb

@@ -28,16 +28,16 @@ module Toast
       unless @model_or_relation.respond_to?(@collection)
         raise "Toast Error: Cannot find class method '#{@collection}' of model '#{@model_or_relation}', which is configured in 'acts_as_resource > collections'."
       end
-      
+
       # FIXME: This is a lot of hallooballoo to check if the #send
       #        will be successful, but if it's not checked the error
       #        message is not helpful to find the error.
 
-      records = if @config_out.pass_params_to.include?(@collection)                                  
-                  if @target_model.method(@collection).arity != 1  
+      records = if @config_out.pass_params_to.include?(@collection)
+                  if @target_model.method(@collection).arity**2 != 1
                     raise "Toast Error: Class method '#{@collection}' of model '#{@target_model}' must accept one parameter, as configured by 'acts_as_resource > pass_params_to'."
                   end
-                  # fetch results 
+                  # fetch results
                   @model_or_relation.send(@collection, @params)
 
                 else
@@ -78,14 +78,11 @@ module Toast
     def post payload, media_type
       raise MethodNotAllowed unless @config_in.postable?
 
+
       if media_type != @config_in.media_type
         raise UnsupportedMediaType
       end
 
-      if @collection != "all"
-        raise MethodNotAllowed
-      end
-
       begin
         payload = ActiveSupport::JSON.decode(payload)
       rescue
@@ -100,8 +97,18 @@ module Toast
         payload.delete(rof)
       end
 
+
       begin
-        record = @model_or_relation.create! payload
+
+        if @collection != "all"
+          # post on scope?
+          record = @model_or_relation.create! payload do |obj|
+            hook = @config_in.before_scoped_create[@collection]
+            obj.send(hook) if hook
+          end
+        else
+          record = @model_or_relation.create! payload
+        end
 
         {
           :json => record.represent( @config_out.exposed_attributes,

data/lib/toast/config_dsl.rb

@@ -14,6 +14,7 @@ module Toast
         @deletable = false
         @postable = false
         @pass_params_to = []
+        @before_scoped_create = {}
         @in_collection = ConfigDSL::InCollection.new model, self
         @media_type = "application/json"
 
@@ -76,6 +77,17 @@ module Toast
         self.pass_params_to = arg
       end
 
+      def before_scoped_create= arg
+        for key in arg.keys
+          @before_scoped_create[key.to_s] = arg[key].to_sym
+        end
+      end
+
+      def before_scoped_create arg={}
+        return(@before_scoped_create) if arg.empty?
+        self.before_scoped_create = arg
+      end
+
       def collections= collections=[]
         @collections = ConfigDSL.sanitize(collections, "collections")
       end

data/lib/toast/record.rb

@@ -86,11 +86,18 @@ module Toast
     def delete
       raise MethodNotAllowed unless @config_out.deletable?
 
-      @record.destroy
-      {
-        :nothing => true,
-        :status => :ok
-      }
+      if @record.destroy
+        {
+          :nothing => true,
+          :status => :ok
+        }
+      else
+        {
+          :nothing => true,
+          :status => :conflict
+        }
+      end
+
     end
 
     def link l

data/lib/toast/version.rb

@@ -1,3 +1,3 @@
 module Toast
-  VERSION = '0.7.1'
+  VERSION = '0.7.2'
 end

metadata

@@ -1,12 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: toast
 version: !ruby/object:Gem::Version 
-  prerelease: false
+  hash: 7
+  prerelease: 
   segments: 
   - 0
   - 7
-  - 1
-  version: 0.7.1
+  - 2
+  version: 0.7.2
 platform: ruby
 authors: 
 - "robokopp (Robert Anni\xC3\xA9s)"
@@ -14,16 +15,17 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-07-13 00:00:00 +02:00
-default_executable: 
+date: 2012-07-19 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: shoulda
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
         segments: 
         - 0
         version: "0"
@@ -33,9 +35,11 @@ dependencies:
   name: rails
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
         segments: 
         - 3
         - 1
@@ -47,9 +51,11 @@ dependencies:
   name: blockenspiel
   prerelease: false
   requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 11
         segments: 
         - 0
         - 4
@@ -61,9 +67,11 @@ dependencies:
   name: rack-accept-media-types
   prerelease: false
   requirement: &id004 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 25
         segments: 
         - 0
         - 9
@@ -74,9 +82,11 @@ dependencies:
   name: ffaker
   prerelease: false
   requirement: &id005 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
         segments: 
         - 0
         version: "0"
@@ -108,7 +118,6 @@ files:
 - lib/toast/single.rb
 - lib/toast/scoped_association.rb
 - README.md
-has_rdoc: true
 homepage: https://github.com/robokopp/toast
 licenses: []
 
@@ -118,23 +127,27 @@ rdoc_options: []
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.6
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Toast adds a RESTful interface to ActiveRecord models in Ruby on Rails.