toast 1.0.13 → 1.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 15d8c91556868fec4a2eb93b977cab39e2d2d06c
-  data.tar.gz: 22412e33779968782f5ae7c6dac0f6eb9c3e686d
+SHA256:
+  metadata.gz: 3ffc230d6241fe54b81431776232f63395f8149f3632e01ef7151ea353de46bd
+  data.tar.gz: f04101583f930052ad231149b6fb8026784eea410c01f170caea81729026deb7
 SHA512:
-  metadata.gz: 3cfef32e7435032a2534965f03d5cbf22b766bcaa9533b7f9354706fbccee07ed543b6e18b46287b1e3f100e909a9fff7f966c9cf7d09d3dc0d6bb3fe85b9415
-  data.tar.gz: c08a6e341dd4cf532773961d623832e32091e18e5b3b540cdc782bc7fc91b84802cc3dc0f2131f1e3b884281f170675005d033a405c46854aa4714c075a45f9e
+  metadata.gz: ee500860d0639ae2c7e8e9e767d8acd6d9a1edd005237a83adb85401800bd68124f2d8add562039439c04833444ddcccc9fd88e7c744775feda96379d28e15d7
+  data.tar.gz: ea3d957809f004f730786b4182ddaa16a7616e1089bd0a1c7cd4141e68f6e603e4feaf4ab1e23f3b6a18920fcedbdff05c82fdc85d5e5c1c88d4671d92aec1d6

data/lib/toast/canonical_request.rb

@@ -51,7 +51,8 @@ class Toast::CanonicalRequest
         response :not_found, msg: "#{@base_config.model_class}##{@id} not found"
 
       rescue BadRequest => error
-        response :bad_request, msg: "`#{error.message}' in: #{error.source_location}"
+        response :bad_request, msg: "`#{error.message}' in: #{error.source_location}",
+                  headers: {'X-Toast-Error' => error.code}
 
       rescue AllowError => error
         response :internal_server_error,
@@ -117,7 +118,8 @@ class Toast::CanonicalRequest
         response :not_found, msg: error.message
 
       rescue BadRequest => error
-        response :bad_request, msg: "`#{error.message}' in: #{error.source_location}"
+        response :bad_request, msg: "`#{error.message}' in: #{error.source_location}",
+                  headers: {'X-Toast-Error' => error.code}
 
       rescue AllowError => error
         response :internal_server_error,
@@ -165,7 +167,8 @@ class Toast::CanonicalRequest
                         msg: "exception raised in allow block: `#{error.orig_error.message}' in #{error.source_location}"
 
       rescue BadRequest => error
-        response :bad_request, msg: "`#{error.message}' in: #{error.source_location}"
+        response :bad_request, msg: "`#{error.message}' in: #{error.source_location}",
+                  headers: {'X-Toast-Error' => error.code}
 
       rescue HandlerError => error
         return response :internal_server_error,

data/lib/toast/collection_request.rb

@@ -49,14 +49,11 @@ class Toast::CollectionRequest
                     @auth, relation, @uri_params)
 
         if relation.is_a?(ActiveRecord::Relation) and
-          relation.model == @config.base_model_class
+          relation.model== @config.base_model_class
 
           result = relation.limit(window).offset(range_start)
 
-          # count = relation.count doesn't always work
-          # fix problematic select extensions for counting (-> { select(...) })
-          # this fails if the where clause depends on the the extended select
-          count = relation.count_by_sql relation.to_sql.sub(/SELECT.+FROM/,'SELECT COUNT(*) FROM')
+          count = relation.unscope(:select).select(:id).count
           headers = {"Content-Type" => @config.media_type}
 
           if count > 0
@@ -80,7 +77,8 @@ class Toast::CollectionRequest
                         msg: "not authorized by allow block in: #{error.source_location}"
 
       rescue BadRequest => error
-        response :bad_request, msg: "`#{error.message}' in: #{error.source_location}"
+        response :bad_request, msg: "`#{error.message}' in: #{error.source_location}",
+                  headers: {'X-Toast-Error' => error.code}
 
       rescue HandlerError => error
         return response :internal_server_error,
@@ -139,7 +137,8 @@ class Toast::CollectionRequest
                         msg: "not authorized by allow block in: #{error.source_location}"
 
       rescue BadRequest => error
-        response :bad_request, msg: "`#{error.message}' in: #{error.source_location}"
+        response :bad_request, msg: "`#{error.message}' in: #{error.source_location}",
+                  headers: {'X-Toast-Error' => error.code}
 
       rescue HandlerError => error
         return response :internal_server_error,

data/lib/toast/engine.rb

@@ -19,16 +19,19 @@ module Toast
 
       # skip init if in test mode: Toast.init should be called in each test
       unless Rails.env == 'test'
-        begin
-          Toast.info 'Loading Toast'
-          Toast.init
-          Toast.info "Exposed model classes: #{Toast.expositions.map{|e| e.model_class.name}.join(' ')}"
+        # defer initilization after auto-loader has registered all models
+        app.config.after_initialize do
+          begin
+            Toast.info 'Loading Toast'
+            Toast.init
+            Toast.info "Exposed model classes: #{Toast.expositions.map{|e| e.model_class.name}.join(' ')}"
 
-        rescue Toast::ConfigError => error
-          error.message.split("\n").each do |line|
-            Toast.info line
+          rescue Toast::ConfigError => error
+            error.message.split("\n").each do |line|
+              Toast.info line
+            end
+            Toast.disable
           end
-          Toast.disable
         end
       end
     end

data/lib/toast/errors.rb

@@ -24,9 +24,11 @@ module Toast::Errors
 
   class BadRequest < StandardError
     attr_accessor :source_location
+    attr_accessor :code
 
-    def initialize message, source_location
+    def initialize message, source_location, code = nil
       @source_location = source_location
+      @code = code
       super message
     end
   end

data/lib/toast/plural_assoc_request.rb

@@ -67,8 +67,7 @@ class Toast::PluralAssocRequest
         # this fails if the where clause depends on the the extended select
         # also remove any ORDER clauses
 
-        # How can we do this with the ActiveRecord API in a cleaner way?
-        count = relation.count_by_sql relation.to_sql.sub(/SELECT.+FROM/,'SELECT COUNT(*) FROM').sub(/ORDER BY.*/,'')
+        count = relation.unscope(:select).select(:id).count
         headers = {"Content-Type" => @config.media_type}
 
         if count > 0
@@ -90,7 +89,8 @@ class Toast::PluralAssocRequest
                         msg: "exception raised in allow block: `#{error.orig_error.message}' in #{error.source_location}"
 
       rescue BadRequest => error
-        response :bad_request, msg: "`#{error.message}' in: #{error.source_location}"
+        response :bad_request, msg: "`#{error.message}' in: #{error.source_location}",
+                  headers: {'X-Toast-Error' => error.code}
 
       rescue HandlerError => error
         return response :internal_server_error,
@@ -159,7 +159,8 @@ class Toast::PluralAssocRequest
                         msg: "exception raised in allow block: `#{error.orig_error.message}' in #{error.source_location}"
 
       rescue BadRequest => error
-        response :bad_request, msg: "`#{error.message}' in: #{error.source_location}"
+        response :bad_request, msg: "`#{error.message}' in: #{error.source_location}",
+                  headers: {'X-Toast-Error' => error.code}
 
       rescue HandlerError => error
         return response :internal_server_error,
@@ -206,14 +207,15 @@ class Toast::PluralAssocRequest
         call_handler(@config.via_link.handler, source, target, @uri_params)
 
         response :ok,
-                 msg: "linked #{target_model_class.name}##{@id} with #{source.class}##{source.id}.#{@config.assoc_name}",
+                 msg: "linked #{target_model_class.name}##{target_id} with #{source.class}##{source.id}.#{@config.assoc_name}",
                  body: Toast.settings.link_unlink_via_post ? '' : nil
 
       rescue ActiveRecord::RecordNotFound => error
         response :not_found, msg: error.message
 
       rescue BadRequest => error
-        response :bad_request, msg: "`#{error.message}' in: #{error.source_location}"
+        response :bad_request, msg: "`#{error.message}' in: #{error.source_location}",
+                  headers: {'X-Toast-Error' => error.code}
 
       rescue AllowError => error
         return response :internal_server_error,
@@ -245,7 +247,7 @@ class Toast::PluralAssocRequest
           return response :bad_request, msg: "Link header missing or invalid"
         end
 
-        name, id = split_link_header(link)
+        name, target_id = split_link_header(link)
         target_model_class = name.singularize.classify.constantize
 
         unless is_active_record? target_model_class
@@ -253,10 +255,10 @@ class Toast::PluralAssocRequest
         end
 
         call_allow(@config.via_unlink.permissions, @auth, source, @uri_params)
-        call_handler(@config.via_unlink.handler, source, target_model_class.find(id), @uri_params)
+        call_handler(@config.via_unlink.handler, source, target_model_class.find(target_id), @uri_params)
 
         response :ok,
-                 msg: "unlinked #{target_model_class.name}##{id} from #{source.class}##{source.id}.#{@config.assoc_name}",
+                 msg: "unlinked #{target_model_class.name}##{target_id} from #{source.class}##{source.id}.#{@config.assoc_name}",
                  body: Toast.settings.link_unlink_via_post ? '' : nil
 
       rescue ActiveRecord::RecordNotFound => error
@@ -267,7 +269,8 @@ class Toast::PluralAssocRequest
                         msg: "exception raised in allow block: `#{error.orig_error.message}' in #{error.source_location}"
 
       rescue BadRequest => error
-        response :bad_request, msg: "`#{error.message}' in: #{error.source_location}"
+        response :bad_request, msg: "`#{error.message}' in: #{error.source_location}",
+                  headers: {'X-Toast-Error' => error.code}
 
       rescue HandlerError => error
         return response :internal_server_error,

data/lib/toast/rack_app.rb

@@ -18,7 +18,7 @@ class Toast::RackApp
     request = ActionDispatch::Request.new(env)
     Toast.request = request
 
-    Toast.logger.info "[#{Thread.current.object_id}] processing: <#{request.method} #{URI.decode(request.fullpath)}>"
+    Toast.logger.info "processing: <#{request.method} #{URI.decode(request.fullpath)}>"
 
     # Authentication: respond with 401 on exception or falsy return value:
     begin

data/lib/toast/request_helpers.rb

@@ -90,7 +90,7 @@ module Toast::RequestHelpers
   #
   # Return: Rack conform response
   def response status_sym, headers: {}, msg: nil, body: nil
-    Toast.logger.info "[#{Thread.current.object_id}] done: #{msg}"
+    Toast.logger.info "done: #{msg}"
 
     unless Rails.env == 'production'
       # put message in body, too, if body is free
@@ -122,8 +122,8 @@ module Toast::RequestHelpers
 
     begin
       context = Object.new
-      context.define_singleton_method(:bad_request) do |message|
-        raise Toast::Errors::BadRequest.new message, caller.first.sub(/:in.*/,'')
+      context.define_singleton_method(:bad_request) do |message, options = {}|
+        raise Toast::Errors::BadRequest.new message, caller.first.sub(/:in.*/,''), options[:code]
       end
 
       result = context.instance_exec *args, &proc

data/lib/toast/single_request.rb

@@ -49,7 +49,8 @@ class Toast::SingleRequest
                         msg: "exception raised in allow block: `#{error.orig_error.message}' in #{error.source_location}"
 
       rescue BadRequest => error
-        response :bad_request, msg: "`#{error.message}' in: #{error.source_location}"
+        response :bad_request, msg: "`#{error.message}' in: #{error.source_location}",
+                  headers: {'X-Toast-Error' => error.code}
 
       rescue HandlerError => error
         return response :internal_server_error,

data/lib/toast/singular_assoc_request.rb

@@ -50,7 +50,7 @@ class Toast::SingularAssocRequest
           response :ok,
                    headers: {"Content-Type" => @config.media_type},
                    body: represent(model_instance, target_config),
-                   msg: "sent ##{@config.model_class}##{@id}"
+                   msg: "sent #{target_config.model_class}##{model_instance.id}"
         end
 
       rescue NotAllowed => error
@@ -58,7 +58,8 @@ class Toast::SingularAssocRequest
 
 
       rescue BadRequest => error
-        response :bad_request, msg: "`#{error.message}' in: #{error.source_location}"
+        response :bad_request, msg: "`#{error.message}' in: #{error.source_location}",
+                  headers: {'X-Toast-Error' => error.code}
 
       rescue HandlerError => error
         return response :internal_server_error,
@@ -120,7 +121,8 @@ class Toast::SingularAssocRequest
           return response :unauthorized, msg: "not authorized by allow block in: #{error.source_location}"
 
         rescue BadRequest => error
-          response :bad_request, msg: "`#{error.message}' in: #{error.source_location}"
+          response :bad_request, msg: "`#{error.message}' in: #{error.source_location}",
+                   headers: {'X-Toast-Error' => error.code}
 
         rescue HandlerError => error
           return response :internal_server_error,
@@ -191,7 +193,8 @@ class Toast::SingularAssocRequest
                         msg: "not authorized by allow block in: #{error.source_location}"
 
       rescue BadRequest => error
-        response :bad_request, msg: "`#{error.message}' in: #{error.source_location}"
+        response :bad_request, msg: "`#{error.message}' in: #{error.source_location}",
+                  headers: {'X-Toast-Error' => error.code}
 
       rescue HandlerError => error
         return response :internal_server_error,

data/lib/toast/version.rb

@@ -1,3 +1,3 @@
 module Toast
-  VERSION = '1.0.13'
+  VERSION = '1.1.3'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: toast
 version: !ruby/object:Gem::Version
-  version: 1.0.13
+  version: 1.1.3
 platform: ruby
 authors:
 - robokopp (Robert Annies)
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-05-02 00:00:00.000000000 Z
+date: 2021-01-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -94,8 +94,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.5.2.3
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Toast exposes ActiveRecord models as a web service (REST API).