toast 1.1.0 → 1.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7b13e469679d7d7b0d50207808e3b03a634d8ea3
-  data.tar.gz: d61fdc8ec1c63c7c1b45bedc0d79930d07d5574d
+  metadata.gz: f9a6abb704a427b250f834207658a733b8bacedf
+  data.tar.gz: 2d7994ff30427fc8e1bfa1eb5cff1be83019f7e6
 SHA512:
-  metadata.gz: 80e314e9b379d2766b966651a0bb62777907823572ffbd6ad15353bcee9de63043ad078f85f320a148394c2e722a9c9b454a127483fe00c9e55e73699388c0ed
-  data.tar.gz: bd67aa8501fc98050bd51b910388659dfa380c696a6abfb980779e673d01a89c85db08042f4be7d4876226c89eb8a2b25b092247acf46789a4a49d1bbcead56c
+  metadata.gz: d791670e8698a667d462841d2ff374f84fa71b355131796cf0547d57a78a12f523115cc327d6e52cf22f467a66f7724361736c536cade3a51e6fdc03a47de3fe
+  data.tar.gz: 23be4cf6a59aa885c470f59de9bffe88d323d7075a9370e8a1d2913313f5bcfceaac54f9575f2c6caefc3cc78fc339ada92680ace8f6d47779fc97262e98f32e

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.name == @config.base_model_class.name
+          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

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

data/lib/toast/version.rb

@@ -1,3 +1,3 @@
 module Toast
-  VERSION = '1.1.0'
+  VERSION = '1.1.1'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: toast
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.1.1
 platform: ruby
 authors:
 - robokopp (Robert Annies)
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-05-06 00:00:00.000000000 Z
+date: 2019-05-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails