mongoid-data_table 1.1.0 → 1.1.1

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 (4) hide show
  1. data/Gemfile.lock +1 -1
  2. data/lib/mongoid/data_table/proxy.rb +1 -1
  3. data/lib/mongoid/data_table/version.rb +1 -1
  4. metadata +20 -20
data/Gemfile.lock CHANGED
@@ -1,7 +1,7 @@
1
1
  PATH
2
2
  remote: .
3
3
  specs:
4
- mongoid-data_table (1.1.0)
4
+ mongoid-data_table (1.1.1)
5
5
  kaminari (~> 0.12.4)
6
6
  rails (>= 3.0.0)
7
7
 
data/lib/mongoid/data_table/proxy.rb CHANGED
@@ -8,7 +8,7 @@ module Mongoid
8
8
  @klass = klass
9
9
  @controller = controller
10
10
  @options = klass.data_table_options.merge(options)
11
- @extension = block || klass.data_table_dataset || default_data_table_dataset
11
+ @extension = block || options[:dataset] || klass.data_table_dataset || default_data_table_dataset
12
12
 
13
13
  @params = options[:params] || (controller.params.dup rescue {})
14
14
  @criteria = options[:criteria] || klass.criteria
data/lib/mongoid/data_table/version.rb CHANGED
@@ -1,5 +1,5 @@
1
1
  module Mongoid
2
2
  module DataTable
3
- VERSION = "1.1.0"
3
+ VERSION = "1.1.1"
4
4
  end
5
5
  end
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: mongoid-data_table
3
3
  version: !ruby/object:Gem::Version
4
- version: 1.1.0
4
+ version: 1.1.1
5
5
  prerelease:
6
6
  platform: ruby
7
7
  authors:
@@ -10,11 +10,11 @@ authors:
10
10
  autorequire:
11
11
  bindir: bin
12
12
  cert_chain: []
13
- date: 2011-07-07 00:00:00.000000000 Z
13
+ date: 2011-07-09 00:00:00.000000000 Z
14
14
  dependencies:
15
15
  - !ruby/object:Gem::Dependency
16
16
  name: rails
17
- requirement: &2153756140 !ruby/object:Gem::Requirement
17
+ requirement: &2153509040 !ruby/object:Gem::Requirement
18
18
  none: false
19
19
  requirements:
20
20
  - - ! '>='
@@ -22,10 +22,10 @@ dependencies:
22
22
  version: 3.0.0
23
23
  type: :runtime
24
24
  prerelease: false
25
- version_requirements: *2153756140
25
+ version_requirements: *2153509040
26
26
  - !ruby/object:Gem::Dependency
27
27
  name: kaminari
28
- requirement: &2153755360 !ruby/object:Gem::Requirement
28
+ requirement: &2153508260 !ruby/object:Gem::Requirement
29
29
  none: false
30
30
  requirements:
31
31
  - - ~>
@@ -33,10 +33,10 @@ dependencies:
33
33
  version: 0.12.4
34
34
  type: :runtime
35
35
  prerelease: false
36
- version_requirements: *2153755360
36
+ version_requirements: *2153508260
37
37
  - !ruby/object:Gem::Dependency
38
38
  name: bson_ext
39
- requirement: &2153754820 !ruby/object:Gem::Requirement
39
+ requirement: &2153507540 !ruby/object:Gem::Requirement
40
40
  none: false
41
41
  requirements:
42
42
  - - ~>
@@ -44,10 +44,10 @@ dependencies:
44
44
  version: 1.3.1
45
45
  type: :development
46
46
  prerelease: false
47
- version_requirements: *2153754820
47
+ version_requirements: *2153507540
48
48
  - !ruby/object:Gem::Dependency
49
49
  name: mongoid
50
- requirement: &2153754220 !ruby/object:Gem::Requirement
50
+ requirement: &2153507000 !ruby/object:Gem::Requirement
51
51
  none: false
52
52
  requirements:
53
53
  - - ~>
@@ -55,10 +55,10 @@ dependencies:
55
55
  version: 2.0.2
56
56
  type: :development
57
57
  prerelease: false
58
- version_requirements: *2153754220
58
+ version_requirements: *2153507000
59
59
  - !ruby/object:Gem::Dependency
60
60
  name: mocha
61
- requirement: &2153753660 !ruby/object:Gem::Requirement
61
+ requirement: &2153506520 !ruby/object:Gem::Requirement
62
62
  none: false
63
63
  requirements:
64
64
  - - ~>
@@ -66,10 +66,10 @@ dependencies:
66
66
  version: 0.9.12
67
67
  type: :development
68
68
  prerelease: false
69
- version_requirements: *2153753660
69
+ version_requirements: *2153506520
70
70
  - !ruby/object:Gem::Dependency
71
71
  name: rspec
72
- requirement: &2153752720 !ruby/object:Gem::Requirement
72
+ requirement: &2153505960 !ruby/object:Gem::Requirement
73
73
  none: false
74
74
  requirements:
75
75
  - - ~>
@@ -77,10 +77,10 @@ dependencies:
77
77
  version: 2.6.0
78
78
  type: :development
79
79
  prerelease: false
80
- version_requirements: *2153752720
80
+ version_requirements: *2153505960
81
81
  - !ruby/object:Gem::Dependency
82
82
  name: shoulda
83
- requirement: &2153752040 !ruby/object:Gem::Requirement
83
+ requirement: &2156392820 !ruby/object:Gem::Requirement
84
84
  none: false
85
85
  requirements:
86
86
  - - ~>
@@ -88,10 +88,10 @@ dependencies:
88
88
  version: 2.11.3
89
89
  type: :development
90
90
  prerelease: false
91
- version_requirements: *2153752040
91
+ version_requirements: *2156392820
92
92
  - !ruby/object:Gem::Dependency
93
93
  name: watchr
94
- requirement: &2153751540 !ruby/object:Gem::Requirement
94
+ requirement: &2156392040 !ruby/object:Gem::Requirement
95
95
  none: false
96
96
  requirements:
97
97
  - - ~>
@@ -99,7 +99,7 @@ dependencies:
99
99
  version: '0.7'
100
100
  type: :development
101
101
  prerelease: false
102
- version_requirements: *2153751540
102
+ version_requirements: *2156392040
103
103
  description: Simple data preparation from Mongoid to the jQuery DataTables plugin
104
104
  email:
105
105
  - jason.dew@gmail.com
@@ -144,7 +144,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
144
144
  version: '0'
145
145
  segments:
146
146
  - 0
147
- hash: 1715428614077198418
147
+ hash: -2340657653357668163
148
148
  required_rubygems_version: !ruby/object:Gem::Requirement
149
149
  none: false
150
150
  requirements:
@@ -153,7 +153,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
153
153
  version: '0'
154
154
  segments:
155
155
  - 0
156
- hash: 1715428614077198418
156
+ hash: -2340657653357668163
157
157
  requirements: []
158
158
  rubyforge_project:
159
159
  rubygems_version: 1.8.5