databound 3.1.2 → 3.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 045bfebd7dbcfd1235c613b720a00734ea7f7db6
-  data.tar.gz: 82a32802692b1a40059cd541e3c80d217394de67
+  metadata.gz: 2f3852879063203ff4dcb3b65edd71d060cf72c7
+  data.tar.gz: 1b6f3ac813291d0ef28492b100ac5a264415d745
 SHA512:
-  metadata.gz: 37887b99be8b2b5fb91d4248bdabacad1ab0b6053c0967fd54bfdd9c35e7411a49c5ff701bb47e86fe879811df1e7f461f3d93da06d87bea180138c3ff29ddd9
-  data.tar.gz: 373c67bbfb09bcb578281cbe5c2bff7de53c2e6de57d6d501726f3fd6e4a7cc32d7dd3f850d67d1ee64e7f27f9c69c8cad3427b55b85dc97f90c60edcda541fc
+  metadata.gz: ec9c65b00740ada50f4a998a12cc91f58e81fdd745ff3bef8181c52a05f1c13fb68b3f343c9bae4fccfaeb0b1ddd24bc11d109cebd7da83be87ea1f6217e02e4
+  data.tar.gz: 4a0a8d40e64182fe98c784b0def718bd6d9812bf945c8568532e4ee1fedc8da51a56d7c4795e1ab454ca435b6eac21b59d3e1269070c00f1742d015d72f45f24

data/lib/databound/manager.rb

@@ -15,7 +15,7 @@ module Databound
     end
 
     def find_scoped_records(only_extra_scopes: false)
-      records = model.where(or_query(@scope, *@extra_where_scopes))
+      records = or_query(@scope, *@extra_where_scopes)
 
       unless only_extra_scopes
         records = filter_by_params!(records)
@@ -67,18 +67,15 @@ module Databound
         model.where(scope.to_h).where_values.reduce(:and)
       end
 
-      left_query = nodes.reduce(:or)
-      return unless left_query
-
-      [left_query.to_sql, *bound_values(scopes)]
+      model.where(nodes.reduce(:or)).tap do |q|
+        q.bind_values = bound_values(scopes)
+      end
     end
 
     def bound_values(scopes)
-      values = scopes.flat_map do |scope|
+      scopes.flat_map do |scope|
         model.where(scope.to_h).bind_values
       end
-
-      values.map(&:last)
     end
 
     def check_params!(action)
@@ -169,7 +166,7 @@ module Databound
     end
 
     def filter_by_params!(records)
-      records.where(or_query(params, *@extra_where_scopes))
+      records & or_query(params, *@extra_where_scopes)
     end
   end
 end

data/lib/databound/version.rb

@@ -1,3 +1,3 @@
 module Databound
-  VERSION = '3.1.2'
+  VERSION = '3.1.3'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: databound
 version: !ruby/object:Gem::Version
-  version: 3.1.2
+  version: 3.1.3
 platform: ruby
 authors:
 - Domas Bitvinskas