toast 1.0.3 → 1.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 277d6133963ef4bab7c92dec2cfcf4e57c59f7e3
-  data.tar.gz: f592710bc8498778fd12760cd8439eea36bab6f5
+  metadata.gz: bdefce8bc09422d780b660db05cbe93fbf3dd3d0
+  data.tar.gz: 9d596dba374e4602c302b83b5944683f1881981a
 SHA512:
-  metadata.gz: 95033345cb023b2ffcdf47b2ea000b6c2147a9daab5268de4e4bc565ae811fc6d6e3d5fd06a2d431b16d79c21b00872bc44d44f6913f70b4601d60e23b43a0f4
-  data.tar.gz: 7db559b1ae70778c937c1bb59c4888fb508e29e30f83cfa0c5cf65d7197d010583c479b31ebb8b2aae5194fcff97a8fdd8808012a66c981e89467bedcc71961f
+  metadata.gz: 837a7d4e4518a105190ee3dcf7ca9898ad3fc7e8397379cbe84b046afa5825cc9cd1dac0a0ddd1805c105197d8628dc090a0030d8e30edc4338943edbf890d94
+  data.tar.gz: 55d02a759ac0fa75686b5a7b0137d1cc479b339beaaa4f58ac3f82cfd20debc8f7e65d295e8444def7b41308c80bfdecb681a029fd9824c6a7363991a4f97946

data/lib/toast/canonical_request.rb

@@ -7,7 +7,7 @@ class Toast::CanonicalRequest
   def initialize id, base_config, auth, request
     @id          = id
     @base_config = base_config
-    @selected_attributes = request.query_parameters.delete(:toast_select).try(:split,',')
+    @selected_attributes = request.query_parameters[:toast_select].try(:split,/ *, */)
     @uri_params  = request.query_parameters
     @base_uri    = base_uri(request)
     @verb        = request.request_method.downcase
@@ -35,19 +35,17 @@ class Toast::CanonicalRequest
                msg: "GET not configured"
     else
       begin
-        model = @base_config.via_get.handler.call(
-          @base_config.model_class.find(@id), @uri_params
-        )
+        model_instance = @base_config.model_class.find(@id)
 
         # call allow blocks to authorize
-        if @base_config.via_get.permissions.all?{|p| p.call(@auth, model, @uri_params)}
-          response :ok,
-                   headers: {"Content-Type" => @base_config.media_type},
-                   msg: "sent #{model.class}##{model.id}",
-                   body: represent(model, @base_config)
-        else
-          response :unauthorized, msg: "authorization failed"
-        end
+        call_allow @base_config.via_get.permissions, @auth, model_instance, @uri_params
+
+        model_instance = call_handler(@base_config.via_get.handler, model_instance, @uri_params)
+
+        response :ok,
+                 headers: {"Content-Type" => @base_config.media_type},
+                 msg: "sent #{model_instance.class}##{model_instance.id}",
+                 body: represent(model_instance, @base_config)
 
       rescue ActiveRecord::RecordNotFound
         response :not_found, msg: "#{@base_config.model_class}##{@id} not found"
@@ -55,6 +53,15 @@ class Toast::CanonicalRequest
       rescue BadRequest => error
         response :bad_request, msg: "`#{error.message}' in: #{error.source_location}"
 
+      rescue AllowError => error
+        response :internal_server_error,
+                        msg: "exception raised in allow block: `#{error.orig_error.message}' in #{error.source_location}"
+      rescue HandlerError => error
+        response :internal_server_error,
+                        msg: "exception raised in via_get handler: `#{error.orig_error.message}' in #{error.source_location}"
+      rescue NotAllowed => error
+        response :unauthorized, msg: "not authorized by allow block in: #{error.source_location}"
+
       rescue => error
         response :internal_server_error, msg: "exception from via_get handler: " + error.message
       end

data/lib/toast/collection_request.rb

@@ -11,7 +11,7 @@ class Toast::CollectionRequest
     @base_uri        = base_uri(request)
     @verb            = request.request_method.downcase
     @requested_range = Toast::HttpRange.new(request.env['HTTP_RANGE'])
-    @selected_attributes = request.query_parameters.delete(:toast_select).try(:split,',')
+    @selected_attributes = request.query_parameters[:toast_select].try(:split,/ *, */)
     @uri_params      = request.query_parameters
     @auth            = auth
     @request         = request

data/lib/toast/plural_assoc_request.rb

@@ -10,7 +10,7 @@ class Toast::PluralAssocRequest
     @id          = id
     @config      = config
     @base_config = base_config
-    @selected_attributes = request.query_parameters.delete(:toast_select).try(:split,',')
+    @selected_attributes = request.query_parameters[:toast_select].try(:split,/ *, */)
     @uri_params  = request.query_parameters
     @base_uri    = base_uri(request)
     @verb        = request.request_method.downcase

data/lib/toast/single_request.rb

@@ -7,7 +7,7 @@ class Toast::SingleRequest
   def initialize  config, base_config, auth, request
     @config      = config
     @base_config = base_config
-    @selected_attributes = request.query_parameters.delete(:toast_select).try(:split,',')
+    @selected_attributes = request.query_parameters[:toast_select].try(:split,/ *, */)
     @uri_params  = request.query_parameters
     @base_uri    = base_uri(request)
     @verb        = request.request_method.downcase

data/lib/toast/singular_assoc_request.rb

@@ -9,7 +9,7 @@ class Toast::SingularAssocRequest
     @id          = id
     @config      = config
     @base_config = base_config
-    @selected_attributes = request.query_parameters.delete(:toast_select).try(:split,',')
+    @selected_attributes = request.query_parameters[:toast_select].try(:split,/ *, */)
     @uri_params  = request.query_parameters
     @base_uri    = base_uri(request)
     @verb        = request.request_method.downcase

data/lib/toast/version.rb

@@ -1,3 +1,3 @@
 module Toast
-  VERSION = '1.0.3'
+  VERSION = '1.0.4'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: toast
 version: !ruby/object:Gem::Version
-  version: 1.0.3
+  version: 1.0.4
 platform: ruby
 authors:
 - robokopp (Robert Annies)
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-09-14 00:00:00.000000000 Z
+date: 2017-10-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails