comma 3.2.1 → 3.2.2

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 (26) hide show
  1. checksums.yaml +4 -4
  2. data/.travis.yml +18 -18
  3. data/Appraisals +1 -1
  4. data/Gemfile.lock +1 -1
  5. data/gemfiles/active3.0.20.gemfile.lock +1 -1
  6. data/gemfiles/active3.1.12.gemfile.lock +1 -1
  7. data/gemfiles/{active3.2.17.gemfile → active3.2.20.gemfile} +2 -2
  8. data/gemfiles/{active3.2.17.gemfile.lock → active3.2.20.gemfile.lock} +17 -17
  9. data/gemfiles/{active4.0.4.gemfile → active4.0.11.gemfile} +2 -2
  10. data/gemfiles/{active4.0.4.gemfile.lock → active4.0.11.gemfile.lock} +18 -20
  11. data/gemfiles/{active4.1.1.gemfile → active4.1.7.gemfile} +2 -2
  12. data/gemfiles/{active4.1.1.gemfile.lock → active4.1.7.gemfile.lock} +18 -18
  13. data/gemfiles/data_mapper1.2.0.gemfile.lock +1 -1
  14. data/gemfiles/mongoid3.1.6.gemfile.lock +1 -1
  15. data/gemfiles/rails3.0.20.gemfile.lock +1 -1
  16. data/gemfiles/rails3.1.12.gemfile.lock +1 -1
  17. data/gemfiles/{rails4.1.1.gemfile → rails3.2.20.gemfile} +1 -1
  18. data/gemfiles/{rails3.2.17.gemfile.lock → rails3.2.20.gemfile.lock} +37 -37
  19. data/gemfiles/{rails3.2.17.gemfile → rails4.0.11.gemfile} +1 -1
  20. data/gemfiles/{rails4.0.4.gemfile.lock → rails4.0.11.gemfile.lock} +39 -46
  21. data/gemfiles/{rails4.0.4.gemfile → rails4.1.7.gemfile} +1 -1
  22. data/gemfiles/{rails4.1.1.gemfile.lock → rails4.1.7.gemfile.lock} +43 -48
  23. data/lib/comma/relation.rb +9 -2
  24. data/lib/comma/version.rb +1 -1
  25. data/spec/comma/rails/active_record_spec.rb +16 -2
  26. metadata +14 -14
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: 1148831b95a426abff5aabe2b4df1819104d0dbb
4
- data.tar.gz: 785c98020b1551dc55dc60dbf2337b8d80367acb
3
+ metadata.gz: 3b2d25493dba929ebe51cae6b8c2ce5e424ea3be
4
+ data.tar.gz: a166da0ba2213549ae97d264c2a81c229fabdd65
5
5
  SHA512:
6
- metadata.gz: 2141128fdb4407e95e14a5a4b0559a1abee06dcb66f473d85e77ff1efb1ca29795033b72e79898a70f575a3f0cdd5eb64a7412f819482825dbce21641c7d314e
7
- data.tar.gz: 73a43cc8f172653e40f42d6e1fe60a22c5c09cfd74889014ce18f424eb7711d9070932a9d927b975f1aee1b155ad07f49d36427196a27256b6a31c0e980588f8
6
+ metadata.gz: 57968ae5512a393316c38b69064859afb934f47698ea418ecb3a1bdf347ef32a5633a81f8438f89b2abca648237e71e3b032efdcb9494d8c83137bee998d154f
7
+ data.tar.gz: ad17503255e34c05b79f22121e3d4bf5b97dd931ecdc0afa4de87961965880fafd683191f4756061a56a3c2a6f9754f66492c4a9c63a815af5b0e394ca16cba7
data/.travis.yml CHANGED
@@ -12,48 +12,48 @@ rvm:
12
12
  gemfile:
13
13
  - gemfiles/active3.0.20.gemfile
14
14
  - gemfiles/active3.1.12.gemfile
15
- - gemfiles/active3.2.17.gemfile
16
- - gemfiles/active4.0.4.gemfile
17
- - gemfiles/active4.1.1.gemfile
15
+ - gemfiles/active3.2.20.gemfile
16
+ - gemfiles/active4.0.11.gemfile
17
+ - gemfiles/active4.1.7.gemfile
18
18
  - gemfiles/data_mapper1.2.0.gemfile
19
19
  - gemfiles/mongoid3.1.6.gemfile
20
20
  - gemfiles/rails3.0.20.gemfile
21
21
  - gemfiles/rails3.1.12.gemfile
22
- - gemfiles/rails3.2.17.gemfile
23
- - gemfiles/rails4.0.4.gemfile
24
- - gemfiles/rails4.1.1.gemfile
22
+ - gemfiles/rails3.2.20.gemfile
23
+ - gemfiles/rails4.0.11.gemfile
24
+ - gemfiles/rails4.1.7.gemfile
25
25
  matrix:
26
26
  exclude:
27
27
  - rvm: ree
28
- gemfile: gemfiles/active4.0.4.gemfile
28
+ gemfile: gemfiles/active4.0.11.gemfile
29
29
  - rvm: ree
30
- gemfile: gemfiles/active4.1.1.gemfile
30
+ gemfile: gemfiles/active4.1.7.gemfile
31
31
  - rvm: ree
32
32
  gemfile: gemfiles/mongoid3.1.6.gemfile
33
33
  - rvm: ree
34
- gemfile: gemfiles/rails4.0.4.gemfile
34
+ gemfile: gemfiles/rails4.0.11.gemfile
35
35
  - rvm: ree
36
- gemfile: gemfiles/rails4.1.1.gemfile
36
+ gemfile: gemfiles/rails4.1.7.gemfile
37
37
  - rvm: 1.8.7
38
- gemfile: gemfiles/active4.0.4.gemfile
38
+ gemfile: gemfiles/active4.0.11.gemfile
39
39
  - rvm: 1.8.7
40
- gemfile: gemfiles/active4.1.1.gemfile
40
+ gemfile: gemfiles/active4.1.7.gemfile
41
41
  - rvm: 1.8.7
42
42
  gemfile: gemfiles/mongoid3.1.6.gemfile
43
43
  - rvm: 1.8.7
44
- gemfile: gemfiles/rails4.0.4.gemfile
44
+ gemfile: gemfiles/rails4.0.11.gemfile
45
45
  - rvm: 1.8.7
46
- gemfile: gemfiles/rails4.1.1.gemfile
46
+ gemfile: gemfiles/rails4.1.7.gemfile
47
47
  - rvm: 1.9.2
48
- gemfile: gemfiles/active4.0.4.gemfile
48
+ gemfile: gemfiles/active4.0.11.gemfile
49
49
  - rvm: 1.9.2
50
- gemfile: gemfiles/active4.1.1.gemfile
50
+ gemfile: gemfiles/active4.1.7.gemfile
51
51
  - rvm: 1.9.2
52
52
  gemfile: gemfiles/mongoid3.1.6.gemfile
53
53
  - rvm: 1.9.2
54
- gemfile: gemfiles/rails4.0.4.gemfile
54
+ gemfile: gemfiles/rails4.0.11.gemfile
55
55
  - rvm: 1.9.2
56
- gemfile: gemfiles/rails4.1.1.gemfile
56
+ gemfile: gemfiles/rails4.1.7.gemfile
57
57
  allow_failures:
58
58
  - rvm: rbx-2.1.1
59
59
  fast_finish: true
data/Appraisals CHANGED
@@ -1,4 +1,4 @@
1
- ['3.0.20', '3.1.12', '3.2.17', '4.0.4', '4.1.1'].each do |version_number|
1
+ ['3.0.20', '3.1.12', '3.2.20', '4.0.11', '4.1.7'].each do |version_number|
2
2
  clean_number = version_number.gsub(/[<>~=]*/, '')
3
3
  next if RUBY_VERSION < '1.9.3' && version_number >= '4.0.0'
4
4
 
data/Gemfile.lock CHANGED
@@ -1,7 +1,7 @@
1
1
  PATH
2
2
  remote: .
3
3
  specs:
4
- comma (3.2.1)
4
+ comma (3.2.2)
5
5
  activesupport (>= 3.0.0)
6
6
 
7
7
  GEM
data/gemfiles/active3.0.20.gemfile.lock CHANGED
@@ -1,7 +1,7 @@
1
1
  PATH
2
2
  remote: ..
3
3
  specs:
4
- comma (3.2.1)
4
+ comma (3.2.2)
5
5
  activesupport (>= 3.0.0)
6
6
 
7
7
  GEM
data/gemfiles/active3.1.12.gemfile.lock CHANGED
@@ -1,7 +1,7 @@
1
1
  PATH
2
2
  remote: ..
3
3
  specs:
4
- comma (3.2.1)
4
+ comma (3.2.2)
5
5
  activesupport (>= 3.0.0)
6
6
 
7
7
  GEM
data/gemfiles/{active3.2.17.gemfile → active3.2.20.gemfile} RENAMED
@@ -3,7 +3,7 @@
3
3
  source "http://rubygems.org"
4
4
 
5
5
  gem "fastercsv", :platforms=>:ruby_18
6
- gem "activesupport", "3.2.17"
7
- gem "activerecord", "3.2.17"
6
+ gem "activesupport", "3.2.20"
7
+ gem "activerecord", "3.2.20"
8
8
 
9
9
  gemspec :path=>"../"
data/gemfiles/{active3.2.17.gemfile.lock → active3.2.20.gemfile.lock} RENAMED
@@ -1,21 +1,21 @@
1
1
  PATH
2
- remote: ..
2
+ remote: ../
3
3
  specs:
4
- comma (3.2.1)
4
+ comma (3.2.2)
5
5
  activesupport (>= 3.0.0)
6
6
 
7
7
  GEM
8
8
  remote: http://rubygems.org/
9
9
  specs:
10
- activemodel (3.2.17)
11
- activesupport (= 3.2.17)
10
+ activemodel (3.2.20)
11
+ activesupport (= 3.2.20)
12
12
  builder (~> 3.0.0)
13
- activerecord (3.2.17)
14
- activemodel (= 3.2.17)
15
- activesupport (= 3.2.17)
13
+ activerecord (3.2.20)
14
+ activemodel (= 3.2.20)
15
+ activesupport (= 3.2.20)
16
16
  arel (~> 3.0.2)
17
17
  tzinfo (~> 0.3.29)
18
- activesupport (3.2.17)
18
+ activesupport (3.2.20)
19
19
  i18n (~> 0.6, >= 0.6.4)
20
20
  multi_json (~> 1.0)
21
21
  appraisal (0.4.1)
@@ -24,10 +24,10 @@ GEM
24
24
  arel (3.0.3)
25
25
  builder (3.0.4)
26
26
  diff-lcs (1.1.3)
27
- docile (1.1.3)
27
+ docile (1.1.5)
28
28
  fastercsv (1.5.5)
29
- i18n (0.6.9)
30
- multi_json (1.9.2)
29
+ i18n (0.6.11)
30
+ multi_json (1.10.1)
31
31
  rake (0.9.6)
32
32
  rspec (2.8.0)
33
33
  rspec-core (~> 2.8.0)
@@ -37,20 +37,20 @@ GEM
37
37
  rspec-expectations (2.8.0)
38
38
  diff-lcs (~> 1.1.2)
39
39
  rspec-mocks (2.8.0)
40
- simplecov (0.8.2)
40
+ simplecov (0.9.1)
41
41
  docile (~> 1.1.0)
42
- multi_json
42
+ multi_json (~> 1.0)
43
43
  simplecov-html (~> 0.8.0)
44
44
  simplecov-html (0.8.0)
45
- sqlite3 (1.3.9)
46
- tzinfo (0.3.39)
45
+ sqlite3 (1.3.10)
46
+ tzinfo (0.3.42)
47
47
 
48
48
  PLATFORMS
49
49
  ruby
50
50
 
51
51
  DEPENDENCIES
52
- activerecord (= 3.2.17)
53
- activesupport (= 3.2.17)
52
+ activerecord (= 3.2.20)
53
+ activesupport (= 3.2.20)
54
54
  appraisal (~> 0.4.1)
55
55
  comma!
56
56
  fastercsv
data/gemfiles/{active4.0.4.gemfile → active4.0.11.gemfile} RENAMED
@@ -3,7 +3,7 @@
3
3
  source "http://rubygems.org"
4
4
 
5
5
  gem "fastercsv", :platforms=>:ruby_18
6
- gem "activesupport", "4.0.4"
7
- gem "activerecord", "4.0.4"
6
+ gem "activesupport", "4.0.11"
7
+ gem "activerecord", "4.0.11"
8
8
 
9
9
  gemspec :path=>"../"
data/gemfiles/{active4.0.4.gemfile.lock → active4.0.11.gemfile.lock} RENAMED
@@ -1,22 +1,22 @@
1
1
  PATH
2
- remote: ..
2
+ remote: ../
3
3
  specs:
4
- comma (3.2.1)
4
+ comma (3.2.2)
5
5
  activesupport (>= 3.0.0)
6
6
 
7
7
  GEM
8
8
  remote: http://rubygems.org/
9
9
  specs:
10
- activemodel (4.0.4)
11
- activesupport (= 4.0.4)
10
+ activemodel (4.0.11)
11
+ activesupport (= 4.0.11)
12
12
  builder (~> 3.1.0)
13
- activerecord (4.0.4)
14
- activemodel (= 4.0.4)
13
+ activerecord (4.0.11)
14
+ activemodel (= 4.0.11)
15
15
  activerecord-deprecated_finders (~> 1.0.2)
16
- activesupport (= 4.0.4)
16
+ activesupport (= 4.0.11)
17
17
  arel (~> 4.0.0)
18
18
  activerecord-deprecated_finders (1.0.3)
19
- activesupport (4.0.4)
19
+ activesupport (4.0.11)
20
20
  i18n (~> 0.6, >= 0.6.9)
21
21
  minitest (~> 4.2)
22
22
  multi_json (~> 1.3)
@@ -26,14 +26,13 @@ GEM
26
26
  bundler
27
27
  rake
28
28
  arel (4.0.2)
29
- atomic (1.1.16)
30
29
  builder (3.1.4)
31
30
  diff-lcs (1.1.3)
32
- docile (1.1.3)
31
+ docile (1.1.5)
33
32
  fastercsv (1.5.5)
34
- i18n (0.6.9)
33
+ i18n (0.6.11)
35
34
  minitest (4.7.5)
36
- multi_json (1.9.2)
35
+ multi_json (1.10.1)
37
36
  rake (0.9.6)
38
37
  rspec (2.8.0)
39
38
  rspec-core (~> 2.8.0)
@@ -43,22 +42,21 @@ GEM
43
42
  rspec-expectations (2.8.0)
44
43
  diff-lcs (~> 1.1.2)
45
44
  rspec-mocks (2.8.0)
46
- simplecov (0.8.2)
45
+ simplecov (0.9.1)
47
46
  docile (~> 1.1.0)
48
- multi_json
47
+ multi_json (~> 1.0)
49
48
  simplecov-html (~> 0.8.0)
50
49
  simplecov-html (0.8.0)
51
- sqlite3 (1.3.9)
52
- thread_safe (0.3.1)
53
- atomic (>= 1.1.7, < 2)
54
- tzinfo (0.3.39)
50
+ sqlite3 (1.3.10)
51
+ thread_safe (0.3.4)
52
+ tzinfo (0.3.42)
55
53
 
56
54
  PLATFORMS
57
55
  ruby
58
56
 
59
57
  DEPENDENCIES
60
- activerecord (= 4.0.4)
61
- activesupport (= 4.0.4)
58
+ activerecord (= 4.0.11)
59
+ activesupport (= 4.0.11)
62
60
  appraisal (~> 0.4.1)
63
61
  comma!
64
62
  fastercsv
data/gemfiles/{active4.1.1.gemfile → active4.1.7.gemfile} RENAMED
@@ -3,7 +3,7 @@
3
3
  source "http://rubygems.org"
4
4
 
5
5
  gem "fastercsv", :platforms=>:ruby_18
6
- gem "activesupport", "4.1.1"
7
- gem "activerecord", "4.1.1"
6
+ gem "activesupport", "4.1.7"
7
+ gem "activerecord", "4.1.7"
8
8
 
9
9
  gemspec :path=>"../"
data/gemfiles/{active4.1.1.gemfile.lock → active4.1.7.gemfile.lock} RENAMED
@@ -1,20 +1,20 @@
1
1
  PATH
2
2
  remote: ../
3
3
  specs:
4
- comma (3.2.1)
4
+ comma (3.2.2)
5
5
  activesupport (>= 3.0.0)
6
6
 
7
7
  GEM
8
8
  remote: http://rubygems.org/
9
9
  specs:
10
- activemodel (4.1.1)
11
- activesupport (= 4.1.1)
10
+ activemodel (4.1.7)
11
+ activesupport (= 4.1.7)
12
12
  builder (~> 3.1)
13
- activerecord (4.1.1)
14
- activemodel (= 4.1.1)
15
- activesupport (= 4.1.1)
13
+ activerecord (4.1.7)
14
+ activemodel (= 4.1.7)
15
+ activesupport (= 4.1.7)
16
16
  arel (~> 5.0.0)
17
- activesupport (4.1.1)
17
+ activesupport (4.1.7)
18
18
  i18n (~> 0.6, >= 0.6.9)
19
19
  json (~> 1.7, >= 1.7.7)
20
20
  minitest (~> 5.1)
@@ -26,12 +26,12 @@ GEM
26
26
  arel (5.0.1.20140414130214)
27
27
  builder (3.2.2)
28
28
  diff-lcs (1.1.3)
29
- docile (1.1.3)
29
+ docile (1.1.5)
30
30
  fastercsv (1.5.5)
31
- i18n (0.6.9)
31
+ i18n (0.6.11)
32
32
  json (1.8.1)
33
- minitest (5.3.3)
34
- multi_json (1.10.0)
33
+ minitest (5.4.2)
34
+ multi_json (1.10.1)
35
35
  rake (0.9.6)
36
36
  rspec (2.8.0)
37
37
  rspec-core (~> 2.8.0)
@@ -41,22 +41,22 @@ GEM
41
41
  rspec-expectations (2.8.0)
42
42
  diff-lcs (~> 1.1.2)
43
43
  rspec-mocks (2.8.0)
44
- simplecov (0.8.2)
44
+ simplecov (0.9.1)
45
45
  docile (~> 1.1.0)
46
- multi_json
46
+ multi_json (~> 1.0)
47
47
  simplecov-html (~> 0.8.0)
48
48
  simplecov-html (0.8.0)
49
- sqlite3 (1.3.9)
50
- thread_safe (0.3.3)
51
- tzinfo (1.1.0)
49
+ sqlite3 (1.3.10)
50
+ thread_safe (0.3.4)
51
+ tzinfo (1.2.2)
52
52
  thread_safe (~> 0.1)
53
53
 
54
54
  PLATFORMS
55
55
  ruby
56
56
 
57
57
  DEPENDENCIES
58
- activerecord (= 4.1.1)
59
- activesupport (= 4.1.1)
58
+ activerecord (= 4.1.7)
59
+ activesupport (= 4.1.7)
60
60
  appraisal (~> 0.4.1)
61
61
  comma!
62
62
  fastercsv
data/gemfiles/data_mapper1.2.0.gemfile.lock CHANGED
@@ -1,7 +1,7 @@
1
1
  PATH
2
2
  remote: ..
3
3
  specs:
4
- comma (3.2.1)
4
+ comma (3.2.2)
5
5
  activesupport (>= 3.0.0)
6
6
 
7
7
  GEM
data/gemfiles/mongoid3.1.6.gemfile.lock CHANGED
@@ -1,7 +1,7 @@
1
1
  PATH
2
2
  remote: ..
3
3
  specs:
4
- comma (3.2.1)
4
+ comma (3.2.2)
5
5
  activesupport (>= 3.0.0)
6
6
 
7
7
  GEM
data/gemfiles/rails3.0.20.gemfile.lock CHANGED
@@ -1,7 +1,7 @@
1
1
  PATH
2
2
  remote: ..
3
3
  specs:
4
- comma (3.2.1)
4
+ comma (3.2.2)
5
5
  activesupport (>= 3.0.0)
6
6
 
7
7
  GEM
data/gemfiles/rails3.1.12.gemfile.lock CHANGED
@@ -1,7 +1,7 @@
1
1
  PATH
2
2
  remote: ..
3
3
  specs:
4
- comma (3.2.1)
4
+ comma (3.2.2)
5
5
  activesupport (>= 3.0.0)
6
6
 
7
7
  GEM
data/gemfiles/{rails4.1.1.gemfile → rails3.2.20.gemfile} RENAMED
@@ -3,7 +3,7 @@
3
3
  source "http://rubygems.org"
4
4
 
5
5
  gem "fastercsv", :platforms=>:ruby_18
6
- gem "rails", "4.1.1"
6
+ gem "rails", "3.2.20"
7
7
  gem "rspec-rails"
8
8
 
9
9
  gemspec :path=>"../"
data/gemfiles/{rails3.2.17.gemfile.lock → rails3.2.20.gemfile.lock} RENAMED
@@ -1,18 +1,18 @@
1
1
  PATH
2
- remote: ..
2
+ remote: ../
3
3
  specs:
4
- comma (3.2.1)
4
+ comma (3.2.2)
5
5
  activesupport (>= 3.0.0)
6
6
 
7
7
  GEM
8
8
  remote: http://rubygems.org/
9
9
  specs:
10
- actionmailer (3.2.17)
11
- actionpack (= 3.2.17)
10
+ actionmailer (3.2.20)
11
+ actionpack (= 3.2.20)
12
12
  mail (~> 2.5.4)
13
- actionpack (3.2.17)
14
- activemodel (= 3.2.17)
15
- activesupport (= 3.2.17)
13
+ actionpack (3.2.20)
14
+ activemodel (= 3.2.20)
15
+ activesupport (= 3.2.20)
16
16
  builder (~> 3.0.0)
17
17
  erubis (~> 2.7.0)
18
18
  journey (~> 1.0.4)
@@ -20,18 +20,18 @@ GEM
20
20
  rack-cache (~> 1.2)
21
21
  rack-test (~> 0.6.1)
22
22
  sprockets (~> 2.2.1)
23
- activemodel (3.2.17)
24
- activesupport (= 3.2.17)
23
+ activemodel (3.2.20)
24
+ activesupport (= 3.2.20)
25
25
  builder (~> 3.0.0)
26
- activerecord (3.2.17)
27
- activemodel (= 3.2.17)
28
- activesupport (= 3.2.17)
26
+ activerecord (3.2.20)
27
+ activemodel (= 3.2.20)
28
+ activesupport (= 3.2.20)
29
29
  arel (~> 3.0.2)
30
30
  tzinfo (~> 0.3.29)
31
- activeresource (3.2.17)
32
- activemodel (= 3.2.17)
33
- activesupport (= 3.2.17)
34
- activesupport (3.2.17)
31
+ activeresource (3.2.20)
32
+ activemodel (= 3.2.20)
33
+ activesupport (= 3.2.20)
34
+ activesupport (3.2.20)
35
35
  i18n (~> 0.6, >= 0.6.4)
36
36
  multi_json (~> 1.0)
37
37
  appraisal (0.4.1)
@@ -40,19 +40,19 @@ GEM
40
40
  arel (3.0.3)
41
41
  builder (3.0.4)
42
42
  diff-lcs (1.1.3)
43
- docile (1.1.3)
43
+ docile (1.1.5)
44
44
  erubis (2.7.0)
45
45
  fastercsv (1.5.5)
46
46
  hike (1.2.3)
47
- i18n (0.6.9)
47
+ i18n (0.6.11)
48
48
  journey (1.0.4)
49
49
  json (1.8.1)
50
50
  mail (2.5.4)
51
51
  mime-types (~> 1.16)
52
52
  treetop (~> 1.4.8)
53
53
  mime-types (1.25.1)
54
- multi_json (1.9.2)
55
- polyglot (0.3.4)
54
+ multi_json (1.10.1)
55
+ polyglot (0.3.5)
56
56
  rack (1.4.5)
57
57
  rack-cache (1.2)
58
58
  rack (>= 0.4)
@@ -60,17 +60,17 @@ GEM
60
60
  rack
61
61
  rack-test (0.6.2)
62
62
  rack (>= 1.0)
63
- rails (3.2.17)
64
- actionmailer (= 3.2.17)
65
- actionpack (= 3.2.17)
66
- activerecord (= 3.2.17)
67
- activeresource (= 3.2.17)
68
- activesupport (= 3.2.17)
63
+ rails (3.2.20)
64
+ actionmailer (= 3.2.20)
65
+ actionpack (= 3.2.20)
66
+ activerecord (= 3.2.20)
67
+ activeresource (= 3.2.20)
68
+ activesupport (= 3.2.20)
69
69
  bundler (~> 1.0)
70
- railties (= 3.2.17)
71
- railties (3.2.17)
72
- actionpack (= 3.2.17)
73
- activesupport (= 3.2.17)
70
+ railties (= 3.2.20)
71
+ railties (3.2.20)
72
+ actionpack (= 3.2.20)
73
+ activesupport (= 3.2.20)
74
74
  rack-ssl (~> 1.3.2)
75
75
  rake (>= 0.8.7)
76
76
  rdoc (~> 3.4)
@@ -91,23 +91,23 @@ GEM
91
91
  activesupport (>= 3.0)
92
92
  railties (>= 3.0)
93
93
  rspec (~> 2.8.0)
94
- simplecov (0.8.2)
94
+ simplecov (0.9.1)
95
95
  docile (~> 1.1.0)
96
- multi_json
96
+ multi_json (~> 1.0)
97
97
  simplecov-html (~> 0.8.0)
98
98
  simplecov-html (0.8.0)
99
- sprockets (2.2.2)
99
+ sprockets (2.2.3)
100
100
  hike (~> 1.2)
101
101
  multi_json (~> 1.0)
102
102
  rack (~> 1.0)
103
103
  tilt (~> 1.1, != 1.3.0)
104
- sqlite3 (1.3.9)
105
- thor (0.19.0)
104
+ sqlite3 (1.3.10)
105
+ thor (0.19.1)
106
106
  tilt (1.4.1)
107
107
  treetop (1.4.15)
108
108
  polyglot
109
109
  polyglot (>= 0.3.1)
110
- tzinfo (0.3.39)
110
+ tzinfo (0.3.42)
111
111
 
112
112
  PLATFORMS
113
113
  ruby
@@ -116,7 +116,7 @@ DEPENDENCIES
116
116
  appraisal (~> 0.4.1)
117
117
  comma!
118
118
  fastercsv
119
- rails (= 3.2.17)
119
+ rails (= 3.2.20)
120
120
  rake (~> 0.9.2)
121
121
  rspec (~> 2.8.0)
122
122
  rspec-rails
data/gemfiles/{rails3.2.17.gemfile → rails4.0.11.gemfile} RENAMED
@@ -3,7 +3,7 @@
3
3
  source "http://rubygems.org"
4
4
 
5
5
  gem "fastercsv", :platforms=>:ruby_18
6
- gem "rails", "3.2.17"
6
+ gem "rails", "4.0.11"
7
7
  gem "rspec-rails"
8
8
 
9
9
  gemspec :path=>"../"
data/gemfiles/{rails4.0.4.gemfile.lock → rails4.0.11.gemfile.lock} RENAMED
@@ -1,31 +1,31 @@
1
1
  PATH
2
- remote: ..
2
+ remote: ../
3
3
  specs:
4
- comma (3.2.1)
4
+ comma (3.2.2)
5
5
  activesupport (>= 3.0.0)
6
6
 
7
7
  GEM
8
8
  remote: http://rubygems.org/
9
9
  specs:
10
- actionmailer (4.0.4)
11
- actionpack (= 4.0.4)
12
- mail (~> 2.5.4)
13
- actionpack (4.0.4)
14
- activesupport (= 4.0.4)
10
+ actionmailer (4.0.11)
11
+ actionpack (= 4.0.11)
12
+ mail (~> 2.5, >= 2.5.4)
13
+ actionpack (4.0.11)
14
+ activesupport (= 4.0.11)
15
15
  builder (~> 3.1.0)
16
16
  erubis (~> 2.7.0)
17
17
  rack (~> 1.5.2)
18
18
  rack-test (~> 0.6.2)
19
- activemodel (4.0.4)
20
- activesupport (= 4.0.4)
19
+ activemodel (4.0.11)
20
+ activesupport (= 4.0.11)
21
21
  builder (~> 3.1.0)
22
- activerecord (4.0.4)
23
- activemodel (= 4.0.4)
22
+ activerecord (4.0.11)
23
+ activemodel (= 4.0.11)
24
24
  activerecord-deprecated_finders (~> 1.0.2)
25
- activesupport (= 4.0.4)
25
+ activesupport (= 4.0.11)
26
26
  arel (~> 4.0.0)
27
27
  activerecord-deprecated_finders (1.0.3)
28
- activesupport (4.0.4)
28
+ activesupport (4.0.11)
29
29
  i18n (~> 0.6, >= 0.6.9)
30
30
  minitest (~> 4.2)
31
31
  multi_json (~> 1.3)
@@ -35,35 +35,32 @@ GEM
35
35
  bundler
36
36
  rake
37
37
  arel (4.0.2)
38
- atomic (1.1.16)
39
38
  builder (3.1.4)
40
39
  diff-lcs (1.1.3)
41
- docile (1.1.3)
40
+ docile (1.1.5)
42
41
  erubis (2.7.0)
43
42
  fastercsv (1.5.5)
44
43
  hike (1.2.3)
45
- i18n (0.6.9)
46
- mail (2.5.4)
47
- mime-types (~> 1.16)
48
- treetop (~> 1.4.8)
49
- mime-types (1.25.1)
44
+ i18n (0.6.11)
45
+ mail (2.6.1)
46
+ mime-types (>= 1.16, < 3)
47
+ mime-types (2.4.3)
50
48
  minitest (4.7.5)
51
- multi_json (1.9.2)
52
- polyglot (0.3.4)
49
+ multi_json (1.10.1)
53
50
  rack (1.5.2)
54
51
  rack-test (0.6.2)
55
52
  rack (>= 1.0)
56
- rails (4.0.4)
57
- actionmailer (= 4.0.4)
58
- actionpack (= 4.0.4)
59
- activerecord (= 4.0.4)
60
- activesupport (= 4.0.4)
53
+ rails (4.0.11)
54
+ actionmailer (= 4.0.11)
55
+ actionpack (= 4.0.11)
56
+ activerecord (= 4.0.11)
57
+ activesupport (= 4.0.11)
61
58
  bundler (>= 1.3.0, < 2.0)
62
- railties (= 4.0.4)
63
- sprockets-rails (~> 2.0.0)
64
- railties (4.0.4)
65
- actionpack (= 4.0.4)
66
- activesupport (= 4.0.4)
59
+ railties (= 4.0.11)
60
+ sprockets-rails (~> 2.0)
61
+ railties (4.0.11)
62
+ actionpack (= 4.0.11)
63
+ activesupport (= 4.0.11)
67
64
  rake (>= 0.8.7)
68
65
  thor (>= 0.18.1, < 2.0)
69
66
  rake (0.9.6)
@@ -80,29 +77,25 @@ GEM
80
77
  activesupport (>= 3.0)
81
78
  railties (>= 3.0)
82
79
  rspec (~> 2.8.0)
83
- simplecov (0.8.2)
80
+ simplecov (0.9.1)
84
81
  docile (~> 1.1.0)
85
- multi_json
82
+ multi_json (~> 1.0)
86
83
  simplecov-html (~> 0.8.0)
87
84
  simplecov-html (0.8.0)
88
- sprockets (2.12.0)
85
+ sprockets (2.12.3)
89
86
  hike (~> 1.2)
90
87
  multi_json (~> 1.0)
91
88
  rack (~> 1.0)
92
89
  tilt (~> 1.1, != 1.3.0)
93
- sprockets-rails (2.0.1)
90
+ sprockets-rails (2.2.0)
94
91
  actionpack (>= 3.0)
95
92
  activesupport (>= 3.0)
96
- sprockets (~> 2.8)
97
- sqlite3 (1.3.9)
98
- thor (0.19.0)
99
- thread_safe (0.3.1)
100
- atomic (>= 1.1.7, < 2)
93
+ sprockets (>= 2.8, < 4.0)
94
+ sqlite3 (1.3.10)
95
+ thor (0.19.1)
96
+ thread_safe (0.3.4)
101
97
  tilt (1.4.1)
102
- treetop (1.4.15)
103
- polyglot
104
- polyglot (>= 0.3.1)
105
- tzinfo (0.3.39)
98
+ tzinfo (0.3.42)
106
99
 
107
100
  PLATFORMS
108
101
  ruby
@@ -111,7 +104,7 @@ DEPENDENCIES
111
104
  appraisal (~> 0.4.1)
112
105
  comma!
113
106
  fastercsv
114
- rails (= 4.0.4)
107
+ rails (= 4.0.11)
115
108
  rake (~> 0.9.2)
116
109
  rspec (~> 2.8.0)
117
110
  rspec-rails
data/gemfiles/{rails4.0.4.gemfile → rails4.1.7.gemfile} RENAMED
@@ -3,7 +3,7 @@
3
3
  source "http://rubygems.org"
4
4
 
5
5
  gem "fastercsv", :platforms=>:ruby_18
6
- gem "rails", "4.0.4"
6
+ gem "rails", "4.1.7"
7
7
  gem "rspec-rails"
8
8
 
9
9
  gemspec :path=>"../"
data/gemfiles/{rails4.1.1.gemfile.lock → rails4.1.7.gemfile.lock} RENAMED
@@ -1,33 +1,33 @@
1
1
  PATH
2
2
  remote: ../
3
3
  specs:
4
- comma (3.2.1)
4
+ comma (3.2.2)
5
5
  activesupport (>= 3.0.0)
6
6
 
7
7
  GEM
8
8
  remote: http://rubygems.org/
9
9
  specs:
10
- actionmailer (4.1.1)
11
- actionpack (= 4.1.1)
12
- actionview (= 4.1.1)
13
- mail (~> 2.5.4)
14
- actionpack (4.1.1)
15
- actionview (= 4.1.1)
16
- activesupport (= 4.1.1)
10
+ actionmailer (4.1.7)
11
+ actionpack (= 4.1.7)
12
+ actionview (= 4.1.7)
13
+ mail (~> 2.5, >= 2.5.4)
14
+ actionpack (4.1.7)
15
+ actionview (= 4.1.7)
16
+ activesupport (= 4.1.7)
17
17
  rack (~> 1.5.2)
18
18
  rack-test (~> 0.6.2)
19
- actionview (4.1.1)
20
- activesupport (= 4.1.1)
19
+ actionview (4.1.7)
20
+ activesupport (= 4.1.7)
21
21
  builder (~> 3.1)
22
22
  erubis (~> 2.7.0)
23
- activemodel (4.1.1)
24
- activesupport (= 4.1.1)
23
+ activemodel (4.1.7)
24
+ activesupport (= 4.1.7)
25
25
  builder (~> 3.1)
26
- activerecord (4.1.1)
27
- activemodel (= 4.1.1)
28
- activesupport (= 4.1.1)
26
+ activerecord (4.1.7)
27
+ activemodel (= 4.1.7)
28
+ activesupport (= 4.1.7)
29
29
  arel (~> 5.0.0)
30
- activesupport (4.1.1)
30
+ activesupport (4.1.7)
31
31
  i18n (~> 0.6, >= 0.6.9)
32
32
  json (~> 1.7, >= 1.7.7)
33
33
  minitest (~> 5.1)
@@ -39,35 +39,33 @@ GEM
39
39
  arel (5.0.1.20140414130214)
40
40
  builder (3.2.2)
41
41
  diff-lcs (1.1.3)
42
- docile (1.1.3)
42
+ docile (1.1.5)
43
43
  erubis (2.7.0)
44
44
  fastercsv (1.5.5)
45
45
  hike (1.2.3)
46
- i18n (0.6.9)
46
+ i18n (0.6.11)
47
47
  json (1.8.1)
48
- mail (2.5.4)
49
- mime-types (~> 1.16)
50
- treetop (~> 1.4.8)
51
- mime-types (1.25.1)
52
- minitest (5.3.3)
53
- multi_json (1.10.0)
54
- polyglot (0.3.4)
48
+ mail (2.6.1)
49
+ mime-types (>= 1.16, < 3)
50
+ mime-types (2.4.3)
51
+ minitest (5.4.2)
52
+ multi_json (1.10.1)
55
53
  rack (1.5.2)
56
54
  rack-test (0.6.2)
57
55
  rack (>= 1.0)
58
- rails (4.1.1)
59
- actionmailer (= 4.1.1)
60
- actionpack (= 4.1.1)
61
- actionview (= 4.1.1)
62
- activemodel (= 4.1.1)
63
- activerecord (= 4.1.1)
64
- activesupport (= 4.1.1)
56
+ rails (4.1.7)
57
+ actionmailer (= 4.1.7)
58
+ actionpack (= 4.1.7)
59
+ actionview (= 4.1.7)
60
+ activemodel (= 4.1.7)
61
+ activerecord (= 4.1.7)
62
+ activesupport (= 4.1.7)
65
63
  bundler (>= 1.3.0, < 2.0)
66
- railties (= 4.1.1)
64
+ railties (= 4.1.7)
67
65
  sprockets-rails (~> 2.0)
68
- railties (4.1.1)
69
- actionpack (= 4.1.1)
70
- activesupport (= 4.1.1)
66
+ railties (4.1.7)
67
+ actionpack (= 4.1.7)
68
+ activesupport (= 4.1.7)
71
69
  rake (>= 0.8.7)
72
70
  thor (>= 0.18.1, < 2.0)
73
71
  rake (0.9.6)
@@ -84,28 +82,25 @@ GEM
84
82
  activesupport (>= 3.0)
85
83
  railties (>= 3.0)
86
84
  rspec (~> 2.8.0)
87
- simplecov (0.8.2)
85
+ simplecov (0.9.1)
88
86
  docile (~> 1.1.0)
89
- multi_json
87
+ multi_json (~> 1.0)
90
88
  simplecov-html (~> 0.8.0)
91
89
  simplecov-html (0.8.0)
92
- sprockets (2.12.1)
90
+ sprockets (2.12.3)
93
91
  hike (~> 1.2)
94
92
  multi_json (~> 1.0)
95
93
  rack (~> 1.0)
96
94
  tilt (~> 1.1, != 1.3.0)
97
- sprockets-rails (2.1.3)
95
+ sprockets-rails (2.2.0)
98
96
  actionpack (>= 3.0)
99
97
  activesupport (>= 3.0)
100
- sprockets (~> 2.8)
101
- sqlite3 (1.3.9)
98
+ sprockets (>= 2.8, < 4.0)
99
+ sqlite3 (1.3.10)
102
100
  thor (0.19.1)
103
- thread_safe (0.3.3)
101
+ thread_safe (0.3.4)
104
102
  tilt (1.4.1)
105
- treetop (1.4.15)
106
- polyglot
107
- polyglot (>= 0.3.1)
108
- tzinfo (1.1.0)
103
+ tzinfo (1.2.2)
109
104
  thread_safe (~> 0.1)
110
105
 
111
106
  PLATFORMS
@@ -115,7 +110,7 @@ DEPENDENCIES
115
110
  appraisal (~> 0.4.1)
116
111
  comma!
117
112
  fastercsv
118
- rails (= 4.1.1)
113
+ rails (= 4.1.7)
119
114
  rake (~> 0.9.2)
120
115
  rspec (~> 2.8.0)
121
116
  rspec-rails
data/lib/comma/relation.rb CHANGED
@@ -1,5 +1,12 @@
1
1
  class ActiveRecord::Relation
2
2
  def to_comma(style = :default)
3
- Comma::Generator.new(self, style).run(:find_each)
3
+ iterator_method =
4
+ if arel.ast.limit || !arel.ast.orders.empty?
5
+ Rails.logger.warn "#to_comma is being used on a relation with limit or order clauses. Falling back to iterating with :each. This can cause performance issues." if defined?(Rails)
6
+ :each
7
+ else
8
+ :find_each
9
+ end
10
+ Comma::Generator.new(self, style).run(iterator_method)
4
11
  end
5
- end
12
+ end
data/lib/comma/version.rb CHANGED
@@ -1,3 +1,3 @@
1
1
  module Comma
2
- VERSION = "3.2.1"
2
+ VERSION = "3.2.2"
3
3
  end
data/spec/comma/rails/active_record_spec.rb CHANGED
@@ -78,13 +78,27 @@ if defined? ActiveRecord
78
78
  Picture.create(:name => 'photo.jpg', :imageable_id => @person.id, :imageable_type => 'Person')
79
79
  end
80
80
 
81
- describe "case" do
81
+ describe "#to_comma on scopes" do
82
82
  it 'should extend ActiveRecord::NamedScope::Scope to add a #to_comma method which will return CSV content for objects within the scope' do
83
83
  Person.teenagers.to_comma.should == "Name,Age\nJunior,18\n"
84
84
  end
85
85
 
86
86
  it 'should find in batches' do
87
- Person.teenagers.to_comma
87
+ scope = Person.teenagers
88
+ scope.should_receive(:find_each).and_yield @person
89
+ scope.to_comma
90
+ end
91
+
92
+ it 'should fall back to iterating with each when scope has limit clause' do
93
+ scope = Person.limit(1)
94
+ scope.should_receive(:each).and_yield @person
95
+ scope.to_comma
96
+ end
97
+
98
+ it 'should fall back to iterating with each when scope has order clause' do
99
+ scope = Person.order(:age)
100
+ scope.should_receive(:each).and_yield @person
101
+ scope.to_comma
88
102
  end
89
103
  end
90
104
 
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: comma
3
3
  version: !ruby/object:Gem::Version
4
- version: 3.2.1
4
+ version: 3.2.2
5
5
  platform: ruby
6
6
  authors:
7
7
  - Marcus Crafter
@@ -9,7 +9,7 @@ authors:
9
9
  autorequire:
10
10
  bindir: bin
11
11
  cert_chain: []
12
- date: 2014-05-22 00:00:00.000000000 Z
12
+ date: 2014-11-02 00:00:00.000000000 Z
13
13
  dependencies:
14
14
  - !ruby/object:Gem::Dependency
15
15
  name: activesupport
@@ -117,12 +117,12 @@ files:
117
117
  - gemfiles/active3.0.20.gemfile.lock
118
118
  - gemfiles/active3.1.12.gemfile
119
119
  - gemfiles/active3.1.12.gemfile.lock
120
- - gemfiles/active3.2.17.gemfile
121
- - gemfiles/active3.2.17.gemfile.lock
122
- - gemfiles/active4.0.4.gemfile
123
- - gemfiles/active4.0.4.gemfile.lock
124
- - gemfiles/active4.1.1.gemfile
125
- - gemfiles/active4.1.1.gemfile.lock
120
+ - gemfiles/active3.2.20.gemfile
121
+ - gemfiles/active3.2.20.gemfile.lock
122
+ - gemfiles/active4.0.11.gemfile
123
+ - gemfiles/active4.0.11.gemfile.lock
124
+ - gemfiles/active4.1.7.gemfile
125
+ - gemfiles/active4.1.7.gemfile.lock
126
126
  - gemfiles/data_mapper1.2.0.gemfile
127
127
  - gemfiles/data_mapper1.2.0.gemfile.lock
128
128
  - gemfiles/mongoid3.1.6.gemfile
@@ -131,12 +131,12 @@ files:
131
131
  - gemfiles/rails3.0.20.gemfile.lock
132
132
  - gemfiles/rails3.1.12.gemfile
133
133
  - gemfiles/rails3.1.12.gemfile.lock
134
- - gemfiles/rails3.2.17.gemfile
135
- - gemfiles/rails3.2.17.gemfile.lock
136
- - gemfiles/rails4.0.4.gemfile
137
- - gemfiles/rails4.0.4.gemfile.lock
138
- - gemfiles/rails4.1.1.gemfile
139
- - gemfiles/rails4.1.1.gemfile.lock
134
+ - gemfiles/rails3.2.20.gemfile
135
+ - gemfiles/rails3.2.20.gemfile.lock
136
+ - gemfiles/rails4.0.11.gemfile
137
+ - gemfiles/rails4.0.11.gemfile.lock
138
+ - gemfiles/rails4.1.7.gemfile
139
+ - gemfiles/rails4.1.7.gemfile.lock
140
140
  - init.rb
141
141
  - lib/comma.rb
142
142
  - lib/comma/array.rb