toast 0.8.9 → 0.8.10

data/app/controller/toast_controller.rb

@@ -31,6 +31,9 @@ class ToastController < ApplicationController
     rescue Toast::ResourceNotAcceptable => e
       return head(:not_acceptable)
 
+    rescue Toast::Conflict => e
+      return render :text => e.message, :status => :conflict
+
     rescue Exception => e
       log_exception e
       puts e if Rails.env == "test"

data/lib/toast/association.rb

@@ -125,7 +125,6 @@ module Toast
     end
 
     def link link_path_info
-
       slash, link_resource_name, link_id = link_path_info.split('/')
       link_model = Resource.get_class_by_resource_name(link_resource_name)
       link_record = link_model.find(link_id)
@@ -157,6 +156,9 @@ module Toast
       raise Toast::ResourceNotAcceptable
     rescue ActiveRecord::RecordNotFound
       raise Toast::ResourceNotFound
+    rescue ActiveRecord::RecordInvalid, ActiveRecord::RecordNotSaved, ActiveRecord::RecordNotUnique => e
+      # model validation failed (join model used for linking)
+      raise PayloadInvalid.new(e.message)
     end
 
     def unlink link_path_info

data/lib/toast/record.rb

@@ -47,7 +47,7 @@ module Toast
         unless (@record.respond_to?("#{vattr}=") && @record.method("#{vattr}=").arity == 1)
           raise "Toast Error: Connot find setter '#{@record.class}##{vattr}='"
         end
-
+        # FIXME: omitted virtual attributes are set to nil, omiited non-virtual attributes are ignored
         @record.send("#{vattr}=", payload.delete(vattr))
       end
 

data/lib/toast/resource.rb

@@ -3,6 +3,7 @@ module Toast
   class ResourceNotFound < Exception; end
   class MethodNotAllowed < Exception; end
   class PayloadInvalid < Exception; end
+  class LinkInvalid < Exception; end
   class PayloadFormatError < Exception; end
   class UnsupportedMediaType < Exception; end
   class RequestedVersionNotDefined < Exception; end

data/lib/toast/version.rb

@@ -1,3 +1,3 @@
 module Toast
-  VERSION = '0.8.9'
+  VERSION = '0.8.10'
 end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 8
-  - 9
-  version: 0.8.9
+  - 10
+  version: 0.8.10
 platform: ruby
 authors: 
 - "robokopp (Robert Anni\xC3\xA9s)"
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2013-01-30 00:00:00 +01:00
+date: 2013-09-16 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency