mongoid-data_table 1.0.6 → 1.0.7

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 +4 -2
  3. data/lib/mongoid/data_table/version.rb +1 -1
  4. metadata +10 -16
data/Gemfile.lock CHANGED
@@ -1,7 +1,7 @@
1
1
  PATH
2
2
  remote: .
3
3
  specs:
4
- mongoid-data_table (1.0.6)
4
+ mongoid-data_table (1.0.7)
5
5
  kaminari (~> 0.12.4)
6
6
  rails (>= 3.0.0)
7
7
 
data/lib/mongoid/data_table/proxy.rb CHANGED
@@ -2,7 +2,7 @@ module Mongoid
2
2
  module DataTable
3
3
  class Proxy < ::Mongoid::Relations::Proxy
4
4
 
5
- attr_reader :klass, :controller, :options, :extension, :params, :criteria, :unscoped, :fields, :aliases
5
+ attr_reader :klass, :controller, :options, :extension, :params, :criteria, :unscoped, :fields, :aliases, :locals
6
6
 
7
7
  def initialize(klass, controller, options = {}, &block)
8
8
  @klass = klass
@@ -16,6 +16,8 @@ module Mongoid
16
16
  @fields = options[:fields] || klass.data_table_fields
17
17
  @aliases = options[:aliases] || @fields
18
18
 
19
+ @locals = options[:locals] || {}
20
+
19
21
  params[:iDisplayLength] = conditions.count if (params[:iDisplayLength].to_i rescue 0) == -1
20
22
  end
21
23
 
@@ -122,7 +124,7 @@ module Mongoid
122
124
  self.instance_eval(&data_table.send(:render_data_table_block, klass, value, object, ''))
123
125
  end))
124
126
  else
125
- result << render_to_string(:inline => item.to_s, :locals => { :"#{klass.name.underscore}" => object, :object => object })
127
+ result << render_to_string(:inline => item.to_s, :locals => data_table.locals.reverse_merge(:"#{klass.name.underscore}" => object, :object => object))
126
128
  end
127
129
  result
128
130
  end
data/lib/mongoid/data_table/version.rb CHANGED
@@ -1,5 +1,5 @@
1
1
  module Mongoid
2
2
  module DataTable
3
- VERSION = "1.0.6"
3
+ VERSION = "1.0.7"
4
4
  end
5
5
  end
metadata CHANGED
@@ -2,7 +2,7 @@
2
2
  name: mongoid-data_table
3
3
  version: !ruby/object:Gem::Version
4
4
  prerelease:
5
- version: 1.0.6
5
+ version: 1.0.7
6
6
  platform: ruby
7
7
  authors:
8
8
  - Jason Dew
@@ -11,10 +11,11 @@ autorequire:
11
11
  bindir: bin
12
12
  cert_chain: []
13
13
 
14
- date: 2011-06-08 00:00:00 Z
14
+ date: 2011-06-16 00:00:00 Z
15
15
  dependencies:
16
16
  - !ruby/object:Gem::Dependency
17
17
  name: rails
18
+ prerelease: false
18
19
  requirement: &id001 !ruby/object:Gem::Requirement
19
20
  none: false
20
21
  requirements:
@@ -22,10 +23,10 @@ dependencies:
22
23
  - !ruby/object:Gem::Version
23
24
  version: 3.0.0
24
25
  type: :runtime
25
- prerelease: false
26
26
  version_requirements: *id001
27
27
  - !ruby/object:Gem::Dependency
28
28
  name: kaminari
29
+ prerelease: false
29
30
  requirement: &id002 !ruby/object:Gem::Requirement
30
31
  none: false
31
32
  requirements:
@@ -33,10 +34,10 @@ dependencies:
33
34
  - !ruby/object:Gem::Version
34
35
  version: 0.12.4
35
36
  type: :runtime
36
- prerelease: false
37
37
  version_requirements: *id002
38
38
  - !ruby/object:Gem::Dependency
39
39
  name: bson_ext
40
+ prerelease: false
40
41
  requirement: &id003 !ruby/object:Gem::Requirement
41
42
  none: false
42
43
  requirements:
@@ -44,10 +45,10 @@ dependencies:
44
45
  - !ruby/object:Gem::Version
45
46
  version: 1.3.1
46
47
  type: :development
47
- prerelease: false
48
48
  version_requirements: *id003
49
49
  - !ruby/object:Gem::Dependency
50
50
  name: mongoid
51
+ prerelease: false
51
52
  requirement: &id004 !ruby/object:Gem::Requirement
52
53
  none: false
53
54
  requirements:
@@ -55,10 +56,10 @@ dependencies:
55
56
  - !ruby/object:Gem::Version
56
57
  version: 2.0.2
57
58
  type: :development
58
- prerelease: false
59
59
  version_requirements: *id004
60
60
  - !ruby/object:Gem::Dependency
61
61
  name: mocha
62
+ prerelease: false
62
63
  requirement: &id005 !ruby/object:Gem::Requirement
63
64
  none: false
64
65
  requirements:
@@ -66,10 +67,10 @@ dependencies:
66
67
  - !ruby/object:Gem::Version
67
68
  version: 0.9.12
68
69
  type: :development
69
- prerelease: false
70
70
  version_requirements: *id005
71
71
  - !ruby/object:Gem::Dependency
72
72
  name: rspec
73
+ prerelease: false
73
74
  requirement: &id006 !ruby/object:Gem::Requirement
74
75
  none: false
75
76
  requirements:
@@ -77,10 +78,10 @@ dependencies:
77
78
  - !ruby/object:Gem::Version
78
79
  version: 2.6.0
79
80
  type: :development
80
- prerelease: false
81
81
  version_requirements: *id006
82
82
  - !ruby/object:Gem::Dependency
83
83
  name: shoulda
84
+ prerelease: false
84
85
  requirement: &id007 !ruby/object:Gem::Requirement
85
86
  none: false
86
87
  requirements:
@@ -88,10 +89,10 @@ dependencies:
88
89
  - !ruby/object:Gem::Version
89
90
  version: 2.11.3
90
91
  type: :development
91
- prerelease: false
92
92
  version_requirements: *id007
93
93
  - !ruby/object:Gem::Dependency
94
94
  name: watchr
95
+ prerelease: false
95
96
  requirement: &id008 !ruby/object:Gem::Requirement
96
97
  none: false
97
98
  requirements:
@@ -99,7 +100,6 @@ dependencies:
99
100
  - !ruby/object:Gem::Version
100
101
  version: "0.7"
101
102
  type: :development
102
- prerelease: false
103
103
  version_requirements: *id008
104
104
  description: Simple data preparation from Mongoid to the jQuery DataTables plugin
105
105
  email:
@@ -146,18 +146,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
146
146
  requirements:
147
147
  - - ">="
148
148
  - !ruby/object:Gem::Version
149
- hash: -4201636343347705602
150
- segments:
151
- - 0
152
149
  version: "0"
153
150
  required_rubygems_version: !ruby/object:Gem::Requirement
154
151
  none: false
155
152
  requirements:
156
153
  - - ">="
157
154
  - !ruby/object:Gem::Version
158
- hash: -4201636343347705602
159
- segments:
160
- - 0
161
155
  version: "0"
162
156
  requirements: []
163
157