searchlogic 2.4.32 → 2.5.19

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 (52) hide show
  1. checksums.yaml +7 -0
  2. data/.gitignore +7 -0
  3. data/.ruby-version +1 -0
  4. data/Appraisals +6 -0
  5. data/Gemfile +2 -10
  6. data/Gemfile.lock +29 -29
  7. data/README.rdoc +2 -0
  8. data/Rakefile +4 -21
  9. data/gemfiles/ar2.3.10.gemfile +7 -0
  10. data/gemfiles/ar2.3.10.gemfile.lock +28 -0
  11. data/gemfiles/ar2.3.11.gemfile +7 -0
  12. data/gemfiles/ar2.3.11.gemfile.lock +28 -0
  13. data/gemfiles/ar2.3.12.gemfile +7 -0
  14. data/gemfiles/ar2.3.12.gemfile.lock +28 -0
  15. data/gemfiles/ar2.3.14.gemfile +7 -0
  16. data/gemfiles/ar2.3.14.gemfile.lock +28 -0
  17. data/gemfiles/ar2.3.9.gemfile +7 -0
  18. data/gemfiles/ar2.3.9.gemfile.lock +28 -0
  19. data/lib/searchlogic/active_record/consistency.rb +4 -4
  20. data/lib/searchlogic/active_record/named_scope_tools.rb +7 -7
  21. data/lib/searchlogic/active_record/scope.rb +30 -0
  22. data/lib/searchlogic/core_ext/proc.rb +1 -1
  23. data/lib/searchlogic/named_scopes/alias_scope.rb +15 -14
  24. data/lib/searchlogic/named_scopes/association_conditions.rb +16 -16
  25. data/lib/searchlogic/named_scopes/association_ordering.rb +8 -9
  26. data/lib/searchlogic/named_scopes/base.rb +16 -0
  27. data/lib/searchlogic/named_scopes/{conditions.rb → column_conditions.rb} +47 -28
  28. data/lib/searchlogic/named_scopes/or_conditions.rb +65 -37
  29. data/lib/searchlogic/named_scopes/ordering.rb +9 -10
  30. data/lib/searchlogic/rails_helpers.rb +5 -1
  31. data/lib/searchlogic/search/conditions.rb +4 -4
  32. data/lib/searchlogic/search/method_missing.rb +7 -12
  33. data/lib/searchlogic/search/ordering.rb +5 -1
  34. data/lib/searchlogic/search/to_yaml.rb +2 -2
  35. data/lib/searchlogic/version.rb +3 -0
  36. data/lib/searchlogic.rb +9 -9
  37. data/searchlogic.gemspec +21 -92
  38. data/spec/searchlogic/active_record/association_proxy_spec.rb +1 -1
  39. data/spec/searchlogic/active_record/consistency_spec.rb +1 -1
  40. data/spec/searchlogic/core_ext/object_spec.rb +1 -1
  41. data/spec/searchlogic/core_ext/proc_spec.rb +1 -1
  42. data/spec/searchlogic/named_scopes/alias_scope_spec.rb +9 -2
  43. data/spec/searchlogic/named_scopes/association_conditions_spec.rb +34 -1
  44. data/spec/searchlogic/named_scopes/association_ordering_spec.rb +1 -1
  45. data/spec/searchlogic/named_scopes/{conditions_spec.rb → column_conditions_spec.rb} +16 -5
  46. data/spec/searchlogic/named_scopes/or_conditions_spec.rb +33 -15
  47. data/spec/searchlogic/named_scopes/ordering_spec.rb +4 -10
  48. data/spec/searchlogic/search_spec.rb +105 -74
  49. data/spec/spec_helper.rb +10 -12
  50. metadata +136 -60
  51. data/VERSION.yml +0 -5
  52. data/lib/searchlogic/active_record/association_proxy.rb +0 -20
metadata CHANGED
@@ -1,67 +1,150 @@
1
- --- !ruby/object:Gem::Specification
1
+ --- !ruby/object:Gem::Specification
2
2
  name: searchlogic
3
- version: !ruby/object:Gem::Version
4
- prerelease:
5
- version: 2.4.32
3
+ version: !ruby/object:Gem::Version
4
+ version: 2.5.19
6
5
  platform: ruby
7
- authors:
8
- - Ben Johnson of Binary Logic
6
+ authors:
7
+ - Ben Johnson
9
8
  autorequire:
10
9
  bindir: bin
11
10
  cert_chain: []
12
-
13
- date: 2011-03-07 00:00:00 -05:00
14
- default_executable:
15
- dependencies:
16
- - !ruby/object:Gem::Dependency
11
+ date: 2014-09-03 00:00:00.000000000 Z
12
+ dependencies:
13
+ - !ruby/object:Gem::Dependency
17
14
  name: activerecord
18
- requirement: &id001 !ruby/object:Gem::Requirement
19
- none: false
20
- requirements:
21
- - - ~>
22
- - !ruby/object:Gem::Version
23
- version: 2.3.11
15
+ requirement: !ruby/object:Gem::Requirement
16
+ requirements:
17
+ - - "~>"
18
+ - !ruby/object:Gem::Version
19
+ version: 2.3.12
24
20
  type: :runtime
25
21
  prerelease: false
26
- version_requirements: *id001
27
- - !ruby/object:Gem::Dependency
28
- name: activerecord
29
- requirement: &id002 !ruby/object:Gem::Requirement
30
- none: false
31
- requirements:
32
- - - ~>
33
- - !ruby/object:Gem::Version
34
- version: 2.3.11
22
+ version_requirements: !ruby/object:Gem::Requirement
23
+ requirements:
24
+ - - "~>"
25
+ - !ruby/object:Gem::Version
26
+ version: 2.3.12
27
+ - !ruby/object:Gem::Dependency
28
+ name: activesupport
29
+ requirement: !ruby/object:Gem::Requirement
30
+ requirements:
31
+ - - "~>"
32
+ - !ruby/object:Gem::Version
33
+ version: 2.3.12
35
34
  type: :runtime
36
35
  prerelease: false
37
- version_requirements: *id002
36
+ version_requirements: !ruby/object:Gem::Requirement
37
+ requirements:
38
+ - - "~>"
39
+ - !ruby/object:Gem::Version
40
+ version: 2.3.12
41
+ - !ruby/object:Gem::Dependency
42
+ name: rspec
43
+ requirement: !ruby/object:Gem::Requirement
44
+ requirements:
45
+ - - "~>"
46
+ - !ruby/object:Gem::Version
47
+ version: 1.3.1
48
+ type: :development
49
+ prerelease: false
50
+ version_requirements: !ruby/object:Gem::Requirement
51
+ requirements:
52
+ - - "~>"
53
+ - !ruby/object:Gem::Version
54
+ version: 1.3.1
55
+ - !ruby/object:Gem::Dependency
56
+ name: timecop
57
+ requirement: !ruby/object:Gem::Requirement
58
+ requirements:
59
+ - - "~>"
60
+ - !ruby/object:Gem::Version
61
+ version: 0.5.9.1
62
+ type: :development
63
+ prerelease: false
64
+ version_requirements: !ruby/object:Gem::Requirement
65
+ requirements:
66
+ - - "~>"
67
+ - !ruby/object:Gem::Version
68
+ version: 0.5.9.1
69
+ - !ruby/object:Gem::Dependency
70
+ name: sqlite3
71
+ requirement: !ruby/object:Gem::Requirement
72
+ requirements:
73
+ - - "~>"
74
+ - !ruby/object:Gem::Version
75
+ version: 1.3.8
76
+ type: :development
77
+ prerelease: false
78
+ version_requirements: !ruby/object:Gem::Requirement
79
+ requirements:
80
+ - - "~>"
81
+ - !ruby/object:Gem::Version
82
+ version: 1.3.8
83
+ - !ruby/object:Gem::Dependency
84
+ name: appraisal
85
+ requirement: !ruby/object:Gem::Requirement
86
+ requirements:
87
+ - - '='
88
+ - !ruby/object:Gem::Version
89
+ version: 0.4.1
90
+ type: :development
91
+ prerelease: false
92
+ version_requirements: !ruby/object:Gem::Requirement
93
+ requirements:
94
+ - - '='
95
+ - !ruby/object:Gem::Version
96
+ version: 0.4.1
97
+ - !ruby/object:Gem::Dependency
98
+ name: pry
99
+ requirement: !ruby/object:Gem::Requirement
100
+ requirements:
101
+ - - ">="
102
+ - !ruby/object:Gem::Version
103
+ version: '0'
104
+ type: :development
105
+ prerelease: false
106
+ version_requirements: !ruby/object:Gem::Requirement
107
+ requirements:
108
+ - - ">="
109
+ - !ruby/object:Gem::Version
110
+ version: '0'
38
111
  description: Searchlogic makes using ActiveRecord named scopes easier and less repetitive.
39
- email: bjohnson@binarylogic.com
112
+ email:
113
+ - bjohnson@binarylogic.com
40
114
  executables: []
41
-
42
115
  extensions: []
43
-
44
- extra_rdoc_files:
45
- - LICENSE
46
- - README.rdoc
47
- files:
116
+ extra_rdoc_files: []
117
+ files:
118
+ - ".gitignore"
119
+ - ".ruby-version"
120
+ - Appraisals
48
121
  - Gemfile
49
122
  - Gemfile.lock
50
123
  - LICENSE
51
124
  - README.rdoc
52
125
  - Rakefile
53
- - VERSION.yml
126
+ - gemfiles/ar2.3.10.gemfile
127
+ - gemfiles/ar2.3.10.gemfile.lock
128
+ - gemfiles/ar2.3.11.gemfile
129
+ - gemfiles/ar2.3.11.gemfile.lock
130
+ - gemfiles/ar2.3.12.gemfile
131
+ - gemfiles/ar2.3.12.gemfile.lock
132
+ - gemfiles/ar2.3.14.gemfile
133
+ - gemfiles/ar2.3.14.gemfile.lock
134
+ - gemfiles/ar2.3.9.gemfile
135
+ - gemfiles/ar2.3.9.gemfile.lock
54
136
  - init.rb
55
137
  - lib/searchlogic.rb
56
- - lib/searchlogic/active_record/association_proxy.rb
57
138
  - lib/searchlogic/active_record/consistency.rb
58
139
  - lib/searchlogic/active_record/named_scope_tools.rb
140
+ - lib/searchlogic/active_record/scope.rb
59
141
  - lib/searchlogic/core_ext/object.rb
60
142
  - lib/searchlogic/core_ext/proc.rb
61
143
  - lib/searchlogic/named_scopes/alias_scope.rb
62
144
  - lib/searchlogic/named_scopes/association_conditions.rb
63
145
  - lib/searchlogic/named_scopes/association_ordering.rb
64
- - lib/searchlogic/named_scopes/conditions.rb
146
+ - lib/searchlogic/named_scopes/base.rb
147
+ - lib/searchlogic/named_scopes/column_conditions.rb
65
148
  - lib/searchlogic/named_scopes/or_conditions.rb
66
149
  - lib/searchlogic/named_scopes/ordering.rb
67
150
  - lib/searchlogic/rails_helpers.rb
@@ -75,6 +158,7 @@ files:
75
158
  - lib/searchlogic/search/scopes.rb
76
159
  - lib/searchlogic/search/to_yaml.rb
77
160
  - lib/searchlogic/search/unknown_condition_error.rb
161
+ - lib/searchlogic/version.rb
78
162
  - rails/init.rb
79
163
  - searchlogic.gemspec
80
164
  - spec/searchlogic/active_record/association_proxy_spec.rb
@@ -84,43 +168,35 @@ files:
84
168
  - spec/searchlogic/named_scopes/alias_scope_spec.rb
85
169
  - spec/searchlogic/named_scopes/association_conditions_spec.rb
86
170
  - spec/searchlogic/named_scopes/association_ordering_spec.rb
87
- - spec/searchlogic/named_scopes/conditions_spec.rb
171
+ - spec/searchlogic/named_scopes/column_conditions_spec.rb
88
172
  - spec/searchlogic/named_scopes/or_conditions_spec.rb
89
173
  - spec/searchlogic/named_scopes/ordering_spec.rb
90
174
  - spec/searchlogic/search_spec.rb
91
175
  - spec/spec_helper.rb
92
- has_rdoc: true
93
176
  homepage: http://github.com/binarylogic/searchlogic
94
177
  licenses: []
95
-
178
+ metadata: {}
96
179
  post_install_message:
97
180
  rdoc_options: []
98
-
99
- require_paths:
181
+ require_paths:
100
182
  - lib
101
- required_ruby_version: !ruby/object:Gem::Requirement
102
- none: false
103
- requirements:
183
+ required_ruby_version: !ruby/object:Gem::Requirement
184
+ requirements:
104
185
  - - ">="
105
- - !ruby/object:Gem::Version
106
- hash: -3829860769572842136
107
- segments:
108
- - 0
109
- version: "0"
110
- required_rubygems_version: !ruby/object:Gem::Requirement
111
- none: false
112
- requirements:
186
+ - !ruby/object:Gem::Version
187
+ version: '0'
188
+ required_rubygems_version: !ruby/object:Gem::Requirement
189
+ requirements:
113
190
  - - ">="
114
- - !ruby/object:Gem::Version
115
- version: "0"
191
+ - !ruby/object:Gem::Version
192
+ version: '0'
116
193
  requirements: []
117
-
118
194
  rubyforge_project:
119
- rubygems_version: 1.5.2
195
+ rubygems_version: 2.2.2
120
196
  signing_key:
121
- specification_version: 3
197
+ specification_version: 4
122
198
  summary: Searchlogic makes using ActiveRecord named scopes easier and less repetitive.
123
- test_files:
199
+ test_files:
124
200
  - spec/searchlogic/active_record/association_proxy_spec.rb
125
201
  - spec/searchlogic/active_record/consistency_spec.rb
126
202
  - spec/searchlogic/core_ext/object_spec.rb
@@ -128,7 +204,7 @@ test_files:
128
204
  - spec/searchlogic/named_scopes/alias_scope_spec.rb
129
205
  - spec/searchlogic/named_scopes/association_conditions_spec.rb
130
206
  - spec/searchlogic/named_scopes/association_ordering_spec.rb
131
- - spec/searchlogic/named_scopes/conditions_spec.rb
207
+ - spec/searchlogic/named_scopes/column_conditions_spec.rb
132
208
  - spec/searchlogic/named_scopes/or_conditions_spec.rb
133
209
  - spec/searchlogic/named_scopes/ordering_spec.rb
134
210
  - spec/searchlogic/search_spec.rb
data/VERSION.yml DELETED
@@ -1,5 +0,0 @@
1
- ---
2
- :major: 2
3
- :minor: 4
4
- :patch: 32
5
- :build:
@@ -1,20 +0,0 @@
1
- module Searchlogic
2
- module ActiveRecord
3
- module AssociationProxy
4
- def self.included(klass)
5
- klass.class_eval do
6
- alias_method_chain :send, :searchlogic
7
- end
8
- end
9
-
10
- def send_with_searchlogic(method, *args, &block)
11
- # create the scope if it doesn't exist yet, then delegate back to the original method
12
- if !proxy_respond_to?(method) && proxy_reflection.macro != :belongs_to && !proxy_reflection.options[:polymorphic] && proxy_reflection.klass.condition?(method)
13
- proxy_reflection.klass.send(method, *args, &block)
14
- end
15
-
16
- send_without_searchlogic(method, *args, &block)
17
- end
18
- end
19
- end
20
- end