calculable_attrs 0.0.14 → 0.0.15

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: ecc688e611d2c4ae90744580be8781f6b195b131
4
- data.tar.gz: 128a18247d8821f4bf88695e73323661087732a7
3
+ metadata.gz: c1c95c7d8a6f0d41b8d8de94dd379c32500c4065
4
+ data.tar.gz: f0162476b1e45f5b935d5bdfd2ef94d6153781ad
5
5
  SHA512:
6
- metadata.gz: dab3a4979da1031dc462552ca32384c889ad178561a58737006bae457d343be26b1be33d5ef00f2fd845f8ad3e469ab108460de2e236d9df41f5a49c10e6c928
7
- data.tar.gz: febab48f25d4a64e30e6029aaa8c444bb5389feb329abb550c0e808020b354ed54764fce2cd849a3447c81faa064c542c2d04581d39ef86bf6a1e238832caaa8
6
+ metadata.gz: 2ee51005cd066dded1e8041a313b298ec8d7c0a2e5e5a195fed5a6240f334c21006255138a65eece5e479569b7ac5259c13e54f74bc550bc04215a7ae1195b3f
7
+ data.tar.gz: 14f3e949a512b72f62b7fad0ed6e0d456d9e61f3e8a0eedc1f877fb496df3c704c83b51aa4d1831d0661a7285eb163739c1d703304f6765515cbeda2a161e4ac
@@ -146,7 +146,7 @@ module CalculableAttrs::ActiveRecord::Relation
146
146
  end
147
147
 
148
148
  def append_included_calculable_attrs
149
- unless calculable_attrs_included.empty?
149
+ unless calculable_attrs_included.empty? && calculable_attrs_joined.empty?
150
150
  #attrs = calculable_attrs_included - calculable_attrs_joined
151
151
  attrs = calculable_attrs_included | calculable_attrs_joined
152
152
  models_calculable_scopes = collect_calculable_scopes(attrs)
@@ -1,3 +1,3 @@
1
1
  module CalculableAttrs
2
- VERSION = "0.0.14"
2
+ VERSION = "0.0.15"
3
3
  end
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: calculable_attrs
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.0.14
4
+ version: 0.0.15
5
5
  platform: ruby
6
6
  authors:
7
7
  - Dmitry Sharkov
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2014-09-10 00:00:00.000000000 Z
11
+ date: 2014-09-14 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: activerecord