siphon 0.2.4 → 0.2.5
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/lib/siphon/boilerplate.rb +1 -3
- data/lib/siphon/version.rb +1 -1
- metadata +3 -3
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA1:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: 78d9af7e442c0c0c6d5efc53ef449858d6abb2da
|
|
4
|
+
data.tar.gz: 9d6ee29efdf72049e898ad1ba25e9eeec96e59bf
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: c75a3109e9b143a322bda5fc7a0ed5030e7b9b169282854b4054156bc720fce34b46f18e0974770c69a755acc347bad9c42c559190240b596c1be4ae87cc9047
|
|
7
|
+
data.tar.gz: 9a3e7f1b04d39f37c317ada78d2161a6733842a2f952d8ff01b74b80cab9a4ba0896b2777f2a2dc52d680e31dcef3e3b4dc17387172d1c8a75f1aa4b956601ae
|
data/lib/siphon/boilerplate.rb
CHANGED
|
@@ -51,9 +51,7 @@ module Siphon
|
|
|
51
51
|
# memoized or it'll break after attributes reconciled
|
|
52
52
|
def result
|
|
53
53
|
@result ||= begin
|
|
54
|
-
relation =
|
|
55
|
-
merge(ransack.result).
|
|
56
|
-
merge(siphoned)
|
|
54
|
+
relation = siphoned.merge(ransack.result)
|
|
57
55
|
# reconcile all params for the search form (?)
|
|
58
56
|
self.attributes= attributes.merge(params_ransack)
|
|
59
57
|
relation
|
data/lib/siphon/version.rb
CHANGED
metadata
CHANGED
|
@@ -1,14 +1,14 @@
|
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
|
2
2
|
name: siphon
|
|
3
3
|
version: !ruby/object:Gem::Version
|
|
4
|
-
version: 0.2.
|
|
4
|
+
version: 0.2.5
|
|
5
5
|
platform: ruby
|
|
6
6
|
authors:
|
|
7
7
|
- Charles Sistovaris
|
|
8
8
|
autorequire:
|
|
9
9
|
bindir: bin
|
|
10
10
|
cert_chain: []
|
|
11
|
-
date:
|
|
11
|
+
date: 2017-03-23 00:00:00.000000000 Z
|
|
12
12
|
dependencies:
|
|
13
13
|
- !ruby/object:Gem::Dependency
|
|
14
14
|
name: activesupport
|
|
@@ -166,7 +166,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
|
|
|
166
166
|
version: '0'
|
|
167
167
|
requirements: []
|
|
168
168
|
rubyforge_project:
|
|
169
|
-
rubygems_version: 2.
|
|
169
|
+
rubygems_version: 2.6.8
|
|
170
170
|
signing_key:
|
|
171
171
|
specification_version: 4
|
|
172
172
|
summary: Siphon enables you to easily apply/combine/exclude your ActiveRecord scopes
|