toast 0.4.0 → 0.4.1

data/lib/toast/association.rb

@@ -39,15 +39,23 @@ module Toast
     def put payload
       # only for has_one/belongs_to assocs            
       raise MethodNotAllowed if @is_collection
+
       
-      # update see record
-      if self.media_type != @associate_model.toast_config.media_type
-        raise UnsupportedMediaType
+      begin 
+        payload = ActiveSupport::JSON.decode(payload)
+      rescue
+        raise PayloadFormatError
       end
 
+
       unless payload.is_a? Hash
         raise PayloadFormatError
       end
+      
+      # update see record
+      if self.media_type != @associate_model.toast_config.media_type
+        raise UnsupportedMediaType
+      end
 
       # silently ignore all exposed readable, but not writable fields
       (@associate_model.toast_config.readables - @associate_model.toast_config.writables).each do |rof|
@@ -76,16 +84,23 @@ module Toast
         raise UnsupportedMediaType
       end
 
-
-      # silently ignore all exposed readable, but not writable fields
-      (@associate_model.toast_config.readables - @associate_model.toast_config.writables).each do |rof|
-        payload.delete(rof)
+      begin 
+        payload = ActiveSupport::JSON.decode(payload)
+      rescue
+        raise PayloadFormatError
       end
 
       unless payload.is_a? Hash
         raise PayloadFormatError
       end 
 
+
+      # silently ignore all exposed readable, but not writable fields
+      (@associate_model.toast_config.readables - @associate_model.toast_config.writables).each do |rof|
+        payload.delete(rof)
+      end
+
+      
       begin
         record = @record.send(@assoc).create! payload
       

data/lib/toast/engine.rb

@@ -2,7 +2,6 @@ require 'toast/active_record_extensions.rb'
 require 'toast/resource.rb'
 require 'toast/root_collection'
 require 'toast/association'
-require 'toast/attribute'
 require 'toast/record'
 require 'toast/single'
 

data/lib/toast/record.rb

@@ -17,14 +17,21 @@ module Toast
     # argument for ActionController#render
 
     def put payload       
+      
       if self.media_type != @model.toast_config.media_type
         raise UnsupportedMediaType
       end
 
+      begin 
+        payload = ActiveSupport::JSON.decode(payload)
+      rescue
+        raise PayloadFormatError
+      end
+      
       unless payload.is_a? Hash
         raise PayloadFormatError
       end
-
+      
       # silently ignore all exposed readable, but not writable fields
       (@model.toast_config.readables - @model.toast_config.writables).each do |rof|
         payload.delete(rof)

data/lib/toast/resource.rb

@@ -42,7 +42,7 @@ module Toast
               else
                 raise ResourceNotFound
               end
-
+        
         rsc.media_type = request.media_type
 
         rsc
@@ -72,7 +72,7 @@ module Toast
       
       case method
       when "PUT","POST"
-        self.send(method.downcase, ActiveSupport::JSON.decode(payload))
+        self.send(method.downcase, payload)
       when "DELETE","GET"
         self.send(method.downcase)
       else

data/lib/toast/root_collection.rb

@@ -61,6 +61,11 @@ module Toast
         raise UnsupportedMediaType
       end
 
+      begin 
+        payload = ActiveSupport::JSON.decode(payload)
+      rescue
+        raise PayloadFormatError
+      end
       unless payload.is_a? Hash
         raise PayloadFormatError
       end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 4
-  - 0
-  version: 0.4.0
+  - 1
+  version: 0.4.1
 platform: ruby
 authors: 
 - Robert Annies