procore-sift 0.12.0 → 0.13.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: edabe4ead843ee8dd551b70d2408899b88dca98d
-  data.tar.gz: bbc128cae2da284235591505bfb60a4f7fcc3e93
+  metadata.gz: f18552ca0480672282156cc7664312b98dbad772
+  data.tar.gz: 81612b0c72fa8827496fe23af9e804993d4d1484
 SHA512:
-  metadata.gz: 5b699d7819a4ab9e29cedc03ccc26fa113e5603abff8c7e700421ecf2eca79bdd25b65c726898ef5e9018b57ca68e1ca4dfb10b7d13589dd71854e6b90d4391f
-  data.tar.gz: c5bec1b452aa2bf55192602c0316d367d044c32224b8c77d0db41eb6e2508a4725c325d024711e0e39f66d52a83548ffcab74823d781126555f4bcf45ba098b9
+  metadata.gz: 0dc882e598295f080ead00b2b791ecbd5a86722ac7108ce37d00835b7c47790d4dc90d70140cc0bfd8d0b9f66b8b0861072b24e7c84f5ac69170365aedf82572
+  data.tar.gz: 753c9f44ea32b532bc1fb99d5d1b840255c3132eaf5bcfab5842eec2778439b2069e0c631d4a17aba4b41dec583b17f243e341c9f7557ea4aae1ae30ab785403

data/lib/procore-sift.rb

@@ -39,20 +39,31 @@ module Sift
   def filter_validator
     @_filter_validator ||= FilterValidator.build(
       filters: filters,
-      sort_fields: self.class.sort_fields,
+      sort_fields: sort_fields,
       filter_params: filter_params,
       sort_params: sort_params,
     )
   end
 
   def filters
-    self.class.filters
+    self.class.ancestors
+      .take_while { |klass| klass.name != "Sift" }
+      .flat_map { |klass| klass.try(:filters) }
+      .compact
+      .uniq { |f| [f.param, f.class] }
   end
 
   def sorts_exist?
     filters.any? { |filter| filter.is_a?(Sort) }
   end
 
+  def sort_fields
+    self.class.ancestors
+      .take_while { |klass| klass.name != "Sift" }
+      .flat_map { |klass| klass.try(:sort_fields) }
+      .compact
+  end
+
   class_methods do
     def filter_on(parameter, type:, internal_name: parameter, default: nil, validate: nil, scope_params: [])
       filters << Filter.new(parameter, type, internal_name, default, validate, scope_params)

data/lib/sift/filter_validator.rb

@@ -52,7 +52,7 @@ module Sift
 
     def to_type(filter)
       if filter.type == :boolean
-        if Rails.version.starts_with?("5")
+        if Rails.version.starts_with?('5') || Rails.version.starts_with?('6')
           ActiveRecord::Type::Boolean.new.cast(filter_params[filter.param])
         else
           ActiveRecord::Type::Boolean.new.type_cast_from_user(filter_params[filter.param])

data/lib/sift/value_parser.rb

@@ -53,7 +53,7 @@ module Sift
     end
 
     def boolean_value
-      if Rails.version.starts_with?("5")
+      if Rails.version.to_i >= 5
         ActiveRecord::Type::Boolean.new.cast(value)
       else
         ActiveRecord::Type::Boolean.new.type_cast_from_user(value)

data/lib/sift/version.rb

@@ -1,3 +1,3 @@
 module Sift
-  VERSION = "0.12.0".freeze
+  VERSION = "0.13.0".freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: procore-sift
 version: !ruby/object:Gem::Version
-  version: 0.12.0
+  version: 0.13.0
 platform: ruby
 authors:
 - Procore Technologies
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-06-20 00:00:00.000000000 Z
+date: 2020-03-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -70,16 +70,16 @@ dependencies:
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.71.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.71.0
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement