forest_liana 1.3.37 → 1.3.38

Sign up to get free protection for your applications and to get access to all the features.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: a9bdf77b2d20699dff25bf3b8f3297c52856df5e
4
- data.tar.gz: 682c77779ad458936bcda2e95206cd8a80976479
3
+ metadata.gz: 1cde4bb3429644d835f65734a4f348c33b967208
4
+ data.tar.gz: f20804881cbec36f1f5f0df3b492d0428a7cb344
5
5
  SHA512:
6
- metadata.gz: 5b51ee6f64cd5535ad09fa6e6e8a1b50668985743eaa7479bfb2ff2b6b9b61caf73de87acf5ce05f54806c6f5c4303a2fb633c2178d23c849b47bc288143db38
7
- data.tar.gz: 631fce469a5368a553b3295bef4cb01cd4f02224ab5cd0d0da3c20e6091923676dd802bca94802991fc92fadb44ded123093f93f13a54b1eae940173c1eb2632
6
+ metadata.gz: 93673accf3fd1303ea835adaca35f3134d40cdac0dc2701ba50220e825e3a97083f7bb46ba1e11c566f1ecc1aa752dcc2bb285b46ef790dfe52b1923a2b5fe08
7
+ data.tar.gz: 70e8d8ceafbfef83d6a1cca8c5618a1a1f54814d728acc82dd6ba2b7ac54dbf19535164fec6ee1700227048f4a75d7e9068969b8c5eb262d862a59e40f448064
@@ -9,7 +9,7 @@ module ForestLiana
9
9
  end
10
10
 
11
11
  def perform
12
- value = @resource
12
+ value = @resource.unscoped
13
13
 
14
14
  @params[:filters].try(:each) do |filter|
15
15
  operator, filter_value = OperatorValueParser.parse(filter[:value])
@@ -3,30 +3,32 @@ module ForestLiana
3
3
 
4
4
  def self.parse(value)
5
5
  operator = nil
6
+ value_comparison = nil
6
7
 
7
8
  if value.first == '!'
8
9
  operator = '!='
9
- value.slice!(0)
10
+ value_comparison = value[1..-1]
10
11
  elsif value.first == '>'
11
12
  operator = '>'
12
- value.slice!(0)
13
+ value_comparison = value[1..-1]
13
14
  elsif value.first == '<'
14
15
  operator = '<'
15
- value.slice!(0)
16
+ value_comparison = value[1..-1]
16
17
  elsif value.include?('*')
17
18
  operator = 'LIKE'
18
- value.gsub!('*', '%')
19
+ value_comparison = value.gsub('*', '%')
19
20
  elsif value === '$present'
20
21
  operator = 'IS NOT NULL'
21
- value = nil
22
+ value_comparison = nil
22
23
  elsif value === '$blank'
23
24
  operator = 'IS NULL'
24
- value = nil
25
+ value_comparison = nil
25
26
  else
26
27
  operator = '='
28
+ value_comparison = value
27
29
  end
28
30
 
29
- [operator, value]
31
+ [operator, value_comparison]
30
32
  end
31
33
 
32
34
  def self.add_where(query, field, operator, value, resource)
@@ -25,6 +25,7 @@ module ForestLiana
25
25
  end
26
26
 
27
27
  value = value
28
+ .unscoped
28
29
  .group(@params[:group_by_field])
29
30
  .order("#{@params[:aggregate].downcase}_#{field} DESC")
30
31
  .send(@params[:aggregate].downcase, @params[:aggregate_field])
@@ -9,8 +9,8 @@ module ForestLiana
9
9
 
10
10
  def perform
11
11
  return if @params[:aggregate].blank?
12
- valueCurrent = @resource
13
- valuePrevious = @resource
12
+ valueCurrent = @resource.unscoped
13
+ valuePrevious = @resource.unscoped
14
14
 
15
15
  @params[:filters].try(:each) do |filter|
16
16
  operator, filter_value = OperatorValueParser.parse(filter[:value])
@@ -1,3 +1,3 @@
1
1
  module ForestLiana
2
- VERSION = "1.3.37"
2
+ VERSION = "1.3.38"
3
3
  end
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: forest_liana
3
3
  version: !ruby/object:Gem::Version
4
- version: 1.3.37
4
+ version: 1.3.38
5
5
  platform: ruby
6
6
  authors:
7
7
  - Sandro Munda
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2016-09-16 00:00:00.000000000 Z
11
+ date: 2016-09-20 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: rails