dase 3.2.5 → 3.2.6

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.
Files changed (3) hide show
  1. data/lib/dase/mp_active_record_relation.rb +2 -1
  2. data/lib/dase/version.rb +1 -1
  3. metadata +73 -68
data/lib/dase/mp_active_record_relation.rb CHANGED
@@ -33,7 +33,8 @@ module Dase
33
33
 
34
34
  def merge(r)
35
35
  super(r).tap do |result|
36
- if r.dase_values.present?
36
+ # it's ok to get nil here - ActiveRecord works fine in that case
37
+ if !r.nil? and r.dase_values.present?
37
38
  result.dase_values ||= {}
38
39
  result.dase_values.merge!(r.dase_values)
39
40
  end
data/lib/dase/version.rb CHANGED
@@ -1,3 +1,3 @@
1
1
  module Dase
2
- VERSION = "3.2.5"
2
+ VERSION = "3.2.6"
3
3
  end
metadata CHANGED
@@ -1,91 +1,93 @@
1
- --- !ruby/object:Gem::Specification
1
+ --- !ruby/object:Gem::Specification
2
2
  name: dase
3
- version: !ruby/object:Gem::Version
4
- version: 3.2.5
3
+ version: !ruby/object:Gem::Version
5
4
  prerelease:
5
+ version: 3.2.6
6
6
  platform: ruby
7
- authors:
7
+ authors:
8
8
  - Vladimir Yartsev
9
9
  autorequire:
10
10
  bindir: bin
11
11
  cert_chain: []
12
- date: 2012-11-11 00:00:00.000000000 Z
13
- dependencies:
14
- - !ruby/object:Gem::Dependency
12
+
13
+ date: 2013-02-27 00:00:00 Z
14
+ dependencies:
15
+ - !ruby/object:Gem::Dependency
15
16
  name: activesupport
16
- requirement: &70173173459420 !ruby/object:Gem::Requirement
17
+ prerelease: false
18
+ requirement: &id001 !ruby/object:Gem::Requirement
17
19
  none: false
18
- requirements:
20
+ requirements:
19
21
  - - ~>
20
- - !ruby/object:Gem::Version
22
+ - !ruby/object:Gem::Version
21
23
  version: 3.2.0
22
24
  type: :runtime
23
- prerelease: false
24
- version_requirements: *70173173459420
25
- - !ruby/object:Gem::Dependency
25
+ version_requirements: *id001
26
+ - !ruby/object:Gem::Dependency
26
27
  name: shoulda
27
- requirement: &70173173458740 !ruby/object:Gem::Requirement
28
+ prerelease: false
29
+ requirement: &id002 !ruby/object:Gem::Requirement
28
30
  none: false
29
- requirements:
30
- - - ! '>='
31
- - !ruby/object:Gem::Version
32
- version: '0'
31
+ requirements:
32
+ - - ">="
33
+ - !ruby/object:Gem::Version
34
+ version: "0"
33
35
  type: :development
34
- prerelease: false
35
- version_requirements: *70173173458740
36
- - !ruby/object:Gem::Dependency
36
+ version_requirements: *id002
37
+ - !ruby/object:Gem::Dependency
37
38
  name: activerecord
38
- requirement: &70173173458200 !ruby/object:Gem::Requirement
39
+ prerelease: false
40
+ requirement: &id003 !ruby/object:Gem::Requirement
39
41
  none: false
40
- requirements:
42
+ requirements:
41
43
  - - ~>
42
- - !ruby/object:Gem::Version
44
+ - !ruby/object:Gem::Version
43
45
  version: 3.2.0
44
46
  type: :runtime
45
- prerelease: false
46
- version_requirements: *70173173458200
47
- - !ruby/object:Gem::Dependency
47
+ version_requirements: *id003
48
+ - !ruby/object:Gem::Dependency
48
49
  name: sqlite3
49
- requirement: &70173173457620 !ruby/object:Gem::Requirement
50
+ prerelease: false
51
+ requirement: &id004 !ruby/object:Gem::Requirement
50
52
  none: false
51
- requirements:
53
+ requirements:
52
54
  - - ~>
53
- - !ruby/object:Gem::Version
55
+ - !ruby/object:Gem::Version
54
56
  version: 1.3.3
55
57
  type: :development
56
- prerelease: false
57
- version_requirements: *70173173457620
58
- - !ruby/object:Gem::Dependency
58
+ version_requirements: *id004
59
+ - !ruby/object:Gem::Dependency
59
60
  name: rake
60
- requirement: &70173173457020 !ruby/object:Gem::Requirement
61
+ prerelease: false
62
+ requirement: &id005 !ruby/object:Gem::Requirement
61
63
  none: false
62
- requirements:
63
- - - ! '>='
64
- - !ruby/object:Gem::Version
65
- version: '0'
64
+ requirements:
65
+ - - ">="
66
+ - !ruby/object:Gem::Version
67
+ version: "0"
66
68
  type: :development
67
- prerelease: false
68
- version_requirements: *70173173457020
69
- - !ruby/object:Gem::Dependency
69
+ version_requirements: *id005
70
+ - !ruby/object:Gem::Dependency
70
71
  name: rspec-core
71
- requirement: &70173173456380 !ruby/object:Gem::Requirement
72
+ prerelease: false
73
+ requirement: &id006 !ruby/object:Gem::Requirement
72
74
  none: false
73
- requirements:
74
- - - ! '>='
75
- - !ruby/object:Gem::Version
76
- version: '0'
75
+ requirements:
76
+ - - ">="
77
+ - !ruby/object:Gem::Version
78
+ version: "0"
77
79
  type: :development
78
- prerelease: false
79
- version_requirements: *70173173456380
80
- description: ! "Dase gem creates includes_count_of method in ActiveRecord::Relation\n
81
- \ to count associated records efficiently. See examples at
82
- https://github.com/vovayartsev/dase\n "
83
- email:
80
+ version_requirements: *id006
81
+ description: "Dase gem creates includes_count_of method in ActiveRecord::Relation\n to count associated records efficiently. See examples at https://github.com/vovayartsev/dase\n "
82
+ email:
84
83
  - vovayartsev@gmail.com
85
84
  executables: []
85
+
86
86
  extensions: []
87
+
87
88
  extra_rdoc_files: []
88
- files:
89
+
90
+ files:
89
91
  - .gitignore
90
92
  - .travis.yml
91
93
  - Gemfile
@@ -112,30 +114,32 @@ files:
112
114
  - test/test_dase.rb
113
115
  homepage: https://github.com/vovayartsev/dase
114
116
  licenses: []
117
+
115
118
  post_install_message:
116
119
  rdoc_options: []
117
- require_paths:
120
+
121
+ require_paths:
118
122
  - lib
119
- required_ruby_version: !ruby/object:Gem::Requirement
123
+ required_ruby_version: !ruby/object:Gem::Requirement
120
124
  none: false
121
- requirements:
122
- - - ! '>='
123
- - !ruby/object:Gem::Version
124
- version: '0'
125
- required_rubygems_version: !ruby/object:Gem::Requirement
125
+ requirements:
126
+ - - ">="
127
+ - !ruby/object:Gem::Version
128
+ version: "0"
129
+ required_rubygems_version: !ruby/object:Gem::Requirement
126
130
  none: false
127
- requirements:
128
- - - ! '>='
129
- - !ruby/object:Gem::Version
130
- version: '0'
131
+ requirements:
132
+ - - ">="
133
+ - !ruby/object:Gem::Version
134
+ version: "0"
131
135
  requirements: []
136
+
132
137
  rubyforge_project:
133
- rubygems_version: 1.8.11
138
+ rubygems_version: 1.8.23
134
139
  signing_key:
135
140
  specification_version: 3
136
- summary: Provides includes_count_of method on ActiveRecord::Relation to count associated
137
- records efficiently
138
- test_files:
141
+ summary: Provides includes_count_of method on ActiveRecord::Relation to count associated records efficiently
142
+ test_files:
139
143
  - test/fixtures/author.rb
140
144
  - test/fixtures/authors.yml
141
145
  - test/fixtures/book.rb
@@ -147,3 +151,4 @@ test_files:
147
151
  - test/fixtures/schema.rb
148
152
  - test/helper.rb
149
153
  - test/test_dase.rb
154
+ has_rdoc: