model_set 1.1.1 → 1.1.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.
data/.rbenv-gemsets CHANGED
@@ -1 +1,2 @@
1
1
  model_set
2
+
data/Gemfile CHANGED
@@ -1,3 +1,3 @@
1
1
  source "http://www.rubygems.org"
2
2
 
3
- gemspec
3
+ gemspec
data/VERSION CHANGED
@@ -1 +1 @@
1
- 1.1.1
1
+ 1.1.2
@@ -1,5 +1,4 @@
1
1
  require File.dirname(__FILE__) + '/../../vendor/sphinx_client/lib/sphinx'
2
- require 'system_timer'
3
2
 
4
3
  class ModelSet
5
4
  class SphinxQuery < Query
@@ -193,7 +192,7 @@ class ModelSet
193
192
  end
194
193
 
195
194
  begin
196
- @response = SystemTimer.timeout(max_query_time) do
195
+ @response = timeout(max_query_time) do
197
196
  search.Query(opts[:query], index)
198
197
  end
199
198
  unless response
data/model_set.gemspec CHANGED
@@ -9,13 +9,13 @@ Gem::Specification.new do |gem|
9
9
  gem.description = %q{Easy manipulation of sets of ActiveRecord models}
10
10
  gem.summary = gem.description
11
11
  gem.homepage = "https://github.com/ninjudd/model_set"
12
+ gem.license = 'MIT'
12
13
 
13
14
  gem.add_development_dependency 'shoulda', '3.0.1'
14
15
  gem.add_development_dependency 'mocha'
15
16
  gem.add_development_dependency 'rsolr'
16
17
  gem.add_development_dependency 'json'
17
18
  gem.add_development_dependency 'rake'
18
- gem.add_development_dependency 'system_timer'
19
19
  gem.add_development_dependency 'activerecord-postgresql-adapter'
20
20
 
21
21
  gem.add_dependency 'ordered_set', '>= 1.0.1'
metadata CHANGED
@@ -1,13 +1,13 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: model_set
3
3
  version: !ruby/object:Gem::Version
4
- hash: 17
4
+ hash: 23
5
5
  prerelease:
6
6
  segments:
7
7
  - 1
8
8
  - 1
9
- - 1
10
- version: 1.1.1
9
+ - 2
10
+ version: 1.1.2
11
11
  platform: ruby
12
12
  authors:
13
13
  - Justin Balthrop
@@ -15,7 +15,7 @@ autorequire:
15
15
  bindir: bin
16
16
  cert_chain: []
17
17
 
18
- date: 2013-07-02 00:00:00 -07:00
18
+ date: 2013-07-22 00:00:00 -07:00
19
19
  default_executable:
20
20
  dependencies:
21
21
  - !ruby/object:Gem::Dependency
@@ -91,7 +91,7 @@ dependencies:
91
91
  type: :development
92
92
  version_requirements: *id005
93
93
  - !ruby/object:Gem::Dependency
94
- name: system_timer
94
+ name: activerecord-postgresql-adapter
95
95
  prerelease: false
96
96
  requirement: &id006 !ruby/object:Gem::Requirement
97
97
  none: false
@@ -104,24 +104,10 @@ dependencies:
104
104
  version: "0"
105
105
  type: :development
106
106
  version_requirements: *id006
107
- - !ruby/object:Gem::Dependency
108
- name: activerecord-postgresql-adapter
109
- prerelease: false
110
- requirement: &id007 !ruby/object:Gem::Requirement
111
- none: false
112
- requirements:
113
- - - ">="
114
- - !ruby/object:Gem::Version
115
- hash: 3
116
- segments:
117
- - 0
118
- version: "0"
119
- type: :development
120
- version_requirements: *id007
121
107
  - !ruby/object:Gem::Dependency
122
108
  name: ordered_set
123
109
  prerelease: false
124
- requirement: &id008 !ruby/object:Gem::Requirement
110
+ requirement: &id007 !ruby/object:Gem::Requirement
125
111
  none: false
126
112
  requirements:
127
113
  - - ">="
@@ -133,11 +119,11 @@ dependencies:
133
119
  - 1
134
120
  version: 1.0.1
135
121
  type: :runtime
136
- version_requirements: *id008
122
+ version_requirements: *id007
137
123
  - !ruby/object:Gem::Dependency
138
124
  name: deep_clonable
139
125
  prerelease: false
140
- requirement: &id009 !ruby/object:Gem::Requirement
126
+ requirement: &id008 !ruby/object:Gem::Requirement
141
127
  none: false
142
128
  requirements:
143
129
  - - ">="
@@ -149,11 +135,11 @@ dependencies:
149
135
  - 0
150
136
  version: 1.1.0
151
137
  type: :runtime
152
- version_requirements: *id009
138
+ version_requirements: *id008
153
139
  - !ruby/object:Gem::Dependency
154
140
  name: activerecord
155
141
  prerelease: false
156
- requirement: &id010 !ruby/object:Gem::Requirement
142
+ requirement: &id009 !ruby/object:Gem::Requirement
157
143
  none: false
158
144
  requirements:
159
145
  - - ~>
@@ -165,7 +151,7 @@ dependencies:
165
151
  - 9
166
152
  version: 2.3.9
167
153
  type: :runtime
168
- version_requirements: *id010
154
+ version_requirements: *id009
169
155
  description: Easy manipulation of sets of ActiveRecord models
170
156
  email:
171
157
  - git@justinbalthrop.com
@@ -279,8 +265,8 @@ files:
279
265
  - vendor/sphinx_client/test.rb
280
266
  has_rdoc: true
281
267
  homepage: https://github.com/ninjudd/model_set
282
- licenses: []
283
-
268
+ licenses:
269
+ - MIT
284
270
  post_install_message:
285
271
  rdoc_options: []
286
272