toast 1.0.14 → 1.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: cb20068ccb6f141c38b26e707b274ced64694b53
-  data.tar.gz: b88e271b12dd5f243216284a9530aead835bbc4f
+SHA256:
+  metadata.gz: 5006fc39ec85167eec2ed0180d48bf319c0d66196588c87936ddee8f3187431e
+  data.tar.gz: 0507cd5e2f352e76697fa0c20827069bcb30ed132917bd97e9addd09fb896941
 SHA512:
-  metadata.gz: 77ae72c8df947ed7be17f89035dbd65caa67c3f96a5151d04cb2f83d84e07cedb39ecd45b4a157a773d987d196b32456dde3e1f66a35c54df4009b5e41d8b9a7
-  data.tar.gz: bc084558fdeedeb1b32199065c45c7e71328c363337c67960b6b2a573d59da0ccf949a903869a9322fb8f38e031e8ac08bcdf95ea9cd8ef315851603d8d6ba84
+  metadata.gz: c8a9dbb3b375a90d9cd6373b5f98797a2e8b68802fbe661327fa39790b409f1d0328d19d10816fd694cfd57fb30cb986e02097eb38b88586d7d6b6eb36200da9
+  data.tar.gz: 30d1f68fb1c1af20399eb4daca1e305eb0f2dc7a6fc3c7dcc9257aa0ba30a247478caff9d62d3f0069f4679c3db64fb7c7ddcca8f32d55dda060d9b212408058

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.name == @config.base_model_class.name
 
           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/config_dsl/base.rb

@@ -64,7 +64,7 @@ class Toast::ConfigDSL::Base
         self.associations = {}
       end
 
-      if Toast.expositions.detect{|exp| exp.model_class == config_data.model_class}
+      if Toast.expositions.detect{|exp| exp.model_class.name == config_data.model_class.name}
         raise_config_error "Model class #{exp.model_class} has already another configuration."
       end
 

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

@@ -53,7 +53,7 @@ class Toast::PluralAssocRequest
         source = @base_config.model_class.find(@id) # may raise ActiveRecord::RecordNotFound
         relation = call_handler(@config.via_get.handler, source, @uri_params) # may raise HandlerError
 
-        unless relation.is_a? ActiveRecord::Relation and relation.model == @config.target_model_class
+        unless relation.is_a? ActiveRecord::Relation and relation.model.name == @config.target_model_class.name
           return response :internal_server_error,
                           msg: "plural association handler returned `#{relation.class}', expected `ActiveRecord::Relation' (#{@config.target_model_class})"
         end
@@ -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/request_helpers.rb

@@ -4,7 +4,7 @@ module Toast::RequestHelpers
 
   def get_config model_class
     Toast.expositions.detect do |exp|
-      exp.model_class == model_class
+      exp.model_class.name == model_class.name
     end || raise(Toast::Errors::ConfigNotFound)
   end
 
@@ -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

@@ -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,
@@ -106,7 +107,7 @@ class Toast::SingularAssocRequest
             return response :not_found, msg: "target class `#{target_model_class.name}' is not an `ActiveRecord'"
           end
 
-          if  target_model_class != @config.target_model_class
+          if  target_model_class.name != @config.target_model_class.name
             return response :bad_request,
                             msg: "target class `#{target_model_class.name}' invalid, expect: `#{@config.target_model_class}'"
           end
@@ -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,
@@ -162,7 +164,7 @@ class Toast::SingularAssocRequest
           return response :not_found, msg: "target class `#{target_model_class.name}' is not an `ActiveRecord'"
         end
 
-        if target_model_class != @config.target_model_class
+        if target_model_class.name != @config.target_model_class.name
           return response :bad_request,
                           msg: "target class `#{target_model_class.name}' invalid, expect: `#{@config.target_model_class}'"
         end
@@ -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.14'
+  VERSION = '1.1.4'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: toast
 version: !ruby/object:Gem::Version
-  version: 1.0.14
+  version: 1.1.4
 platform: ruby
 authors:
 - robokopp (Robert Annies)
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-05-02 00:00:00.000000000 Z
+date: 2021-02-17 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).