enju_message 0.0.23 → 0.0.24
Sign up to get free protection for your applications and to get access to all the features.
- data/app/views/message_requests/index.html.erb +1 -1
- data/app/views/message_templates/index.html.erb +1 -1
- data/app/views/messages/show.html.erb +1 -1
- data/lib/enju_message/engine.rb +1 -8
- data/lib/enju_message/user.rb +28 -0
- data/lib/enju_message/version.rb +1 -1
- data/lib/enju_message.rb +3 -0
- data/spec/dummy/app/models/user.rb +2 -13
- data/spec/dummy/config/application.rb +0 -2
- data/spec/dummy/db/test.sqlite3 +0 -0
- metadata +5 -140
- data/spec/dummy/lib/enju_leaf/localized_name.rb +0 -13
- data/spec/dummy/lib/enju_leaf/master_model.rb +0 -41
- data/spec/dummy/lib/enju_leaf/url_validator.rb +0 -10
- data/spec/dummy/lib/enju_leaf.rb +0 -4
@@ -31,7 +31,7 @@
|
|
31
31
|
<td>
|
32
32
|
<%= link_to t('page.show'), message_request -%>
|
33
33
|
<%= link_to t('page.edit'), edit_message_request_path(message_request) -%>
|
34
|
-
<%= link_to t('page.destroy'), message_request, :confirm => t('page.are_you_sure'), :method => :delete -%>
|
34
|
+
<%= link_to t('page.destroy'), message_request, :data => {:confirm => t('page.are_you_sure')}, :method => :delete -%>
|
35
35
|
</td>
|
36
36
|
</tr>
|
37
37
|
<%- end -%>
|
@@ -26,7 +26,7 @@
|
|
26
26
|
<%= link_to t('page.edit'), edit_message_template_path(message_template) -%>
|
27
27
|
<% end %>
|
28
28
|
<%- if can? :destroy, message_template -%>
|
29
|
-
<%= link_to t('page.destroy'), message_template, :confirm => t('page.are_you_sure'), :method => :delete -%>
|
29
|
+
<%= link_to t('page.destroy'), message_template, :data => {:confirm => t('page.are_you_sure')}, :method => :delete -%>
|
30
30
|
<%- end -%>
|
31
31
|
</td>
|
32
32
|
</tr>
|
@@ -42,7 +42,7 @@
|
|
42
42
|
<% end %>
|
43
43
|
<li><%= link_to t('message.reply'), new_message_path(:parent_id => @message.id) -%></li>
|
44
44
|
<% if can? :destroy, :message %>
|
45
|
-
<li><%= link_to t('page.destroy'), @message, :confirm => t('page.are_you_sure'), :method => :delete -%></li>
|
45
|
+
<li><%= link_to t('page.destroy'), @message, :data => {:confirm => t('page.are_you_sure')}, :method => :delete -%></li>
|
46
46
|
<% end %>
|
47
47
|
</ul>
|
48
48
|
</div>
|
data/lib/enju_message/engine.rb
CHANGED
@@ -1,16 +1,9 @@
|
|
1
|
+
require 'enju_core'
|
1
2
|
require 'configatron'
|
2
3
|
require 'delayed_job_active_record'
|
3
|
-
require 'devise'
|
4
|
-
require 'cancan'
|
5
4
|
require 'state_machine'
|
6
5
|
require 'inherited_resources'
|
7
|
-
require 'attribute_normalizer'
|
8
|
-
require 'addressable/uri'
|
9
|
-
require 'friendly_id'
|
10
6
|
require 'awesome_nested_set'
|
11
|
-
require 'will_paginate'
|
12
|
-
require 'sunspot_rails'
|
13
|
-
require 'acts_as_list'
|
14
7
|
|
15
8
|
module EnjuMessage
|
16
9
|
class Engine < ::Rails::Engine
|
@@ -0,0 +1,28 @@
|
|
1
|
+
module EnjuMessage
|
2
|
+
module MessageUser
|
3
|
+
def self.included(base)
|
4
|
+
base.extend ClassMethods
|
5
|
+
end
|
6
|
+
|
7
|
+
module ClassMethods
|
8
|
+
def enju_message_user
|
9
|
+
include InstanceMethods
|
10
|
+
has_many :sent_messages, :foreign_key => 'sender_id', :class_name => 'Message'
|
11
|
+
has_many :received_messages, :foreign_key => 'receiver_id', :class_name => 'Message'
|
12
|
+
end
|
13
|
+
end
|
14
|
+
|
15
|
+
module InstanceMethods
|
16
|
+
def send_message(status, options = {})
|
17
|
+
MessageRequest.transaction do
|
18
|
+
request = MessageRequest.new
|
19
|
+
request.sender = self.class.find(1)
|
20
|
+
request.receiver = self
|
21
|
+
request.message_template = MessageTemplate.localized_template(status, self.locale)
|
22
|
+
request.save_message_body(options)
|
23
|
+
request.sm_send_message!
|
24
|
+
end
|
25
|
+
end
|
26
|
+
end
|
27
|
+
end
|
28
|
+
end
|
data/lib/enju_message/version.rb
CHANGED
data/lib/enju_message.rb
CHANGED
@@ -12,10 +12,10 @@ class User < ActiveRecord::Base
|
|
12
12
|
has_one :patron
|
13
13
|
belongs_to :user_group
|
14
14
|
belongs_to :required_role, :class_name => 'Role', :foreign_key => 'required_role_id'
|
15
|
-
has_many :sent_messages, :foreign_key => 'sender_id', :class_name => 'Message'
|
16
|
-
has_many :received_messages, :foreign_key => 'receiver_id', :class_name => 'Message'
|
17
15
|
before_create :set_role_and_patron
|
18
16
|
|
17
|
+
enju_message_user
|
18
|
+
|
19
19
|
extend FriendlyId
|
20
20
|
friendly_id :username
|
21
21
|
|
@@ -39,15 +39,4 @@ class User < ActiveRecord::Base
|
|
39
39
|
false
|
40
40
|
end
|
41
41
|
end
|
42
|
-
|
43
|
-
def send_message(status, options = {})
|
44
|
-
MessageRequest.transaction do
|
45
|
-
request = MessageRequest.new
|
46
|
-
request.sender = User.find(1)
|
47
|
-
request.receiver = self
|
48
|
-
request.message_template = MessageTemplate.localized_template(status, self.locale)
|
49
|
-
request.save_message_body(options)
|
50
|
-
request.sm_send_message!
|
51
|
-
end
|
52
|
-
end
|
53
42
|
end
|
data/spec/dummy/db/test.sqlite3
CHANGED
Binary file
|
metadata
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: enju_message
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 0.0.
|
4
|
+
version: 0.0.24
|
5
5
|
prerelease:
|
6
6
|
platform: ruby
|
7
7
|
authors:
|
@@ -9,7 +9,7 @@ authors:
|
|
9
9
|
autorequire:
|
10
10
|
bindir: bin
|
11
11
|
cert_chain: []
|
12
|
-
date: 2012-
|
12
|
+
date: 2012-06-22 00:00:00.000000000 Z
|
13
13
|
dependencies:
|
14
14
|
- !ruby/object:Gem::Dependency
|
15
15
|
name: rails
|
@@ -91,70 +91,6 @@ dependencies:
|
|
91
91
|
- - ~>
|
92
92
|
- !ruby/object:Gem::Version
|
93
93
|
version: '2.1'
|
94
|
-
- !ruby/object:Gem::Dependency
|
95
|
-
name: friendly_id
|
96
|
-
requirement: !ruby/object:Gem::Requirement
|
97
|
-
none: false
|
98
|
-
requirements:
|
99
|
-
- - ~>
|
100
|
-
- !ruby/object:Gem::Version
|
101
|
-
version: '4.0'
|
102
|
-
type: :runtime
|
103
|
-
prerelease: false
|
104
|
-
version_requirements: !ruby/object:Gem::Requirement
|
105
|
-
none: false
|
106
|
-
requirements:
|
107
|
-
- - ~>
|
108
|
-
- !ruby/object:Gem::Version
|
109
|
-
version: '4.0'
|
110
|
-
- !ruby/object:Gem::Dependency
|
111
|
-
name: will_paginate
|
112
|
-
requirement: !ruby/object:Gem::Requirement
|
113
|
-
none: false
|
114
|
-
requirements:
|
115
|
-
- - ~>
|
116
|
-
- !ruby/object:Gem::Version
|
117
|
-
version: '3.0'
|
118
|
-
type: :runtime
|
119
|
-
prerelease: false
|
120
|
-
version_requirements: !ruby/object:Gem::Requirement
|
121
|
-
none: false
|
122
|
-
requirements:
|
123
|
-
- - ~>
|
124
|
-
- !ruby/object:Gem::Version
|
125
|
-
version: '3.0'
|
126
|
-
- !ruby/object:Gem::Dependency
|
127
|
-
name: devise
|
128
|
-
requirement: !ruby/object:Gem::Requirement
|
129
|
-
none: false
|
130
|
-
requirements:
|
131
|
-
- - ! '>='
|
132
|
-
- !ruby/object:Gem::Version
|
133
|
-
version: '0'
|
134
|
-
type: :runtime
|
135
|
-
prerelease: false
|
136
|
-
version_requirements: !ruby/object:Gem::Requirement
|
137
|
-
none: false
|
138
|
-
requirements:
|
139
|
-
- - ! '>='
|
140
|
-
- !ruby/object:Gem::Version
|
141
|
-
version: '0'
|
142
|
-
- !ruby/object:Gem::Dependency
|
143
|
-
name: cancan
|
144
|
-
requirement: !ruby/object:Gem::Requirement
|
145
|
-
none: false
|
146
|
-
requirements:
|
147
|
-
- - ! '>='
|
148
|
-
- !ruby/object:Gem::Version
|
149
|
-
version: '0'
|
150
|
-
type: :runtime
|
151
|
-
prerelease: false
|
152
|
-
version_requirements: !ruby/object:Gem::Requirement
|
153
|
-
none: false
|
154
|
-
requirements:
|
155
|
-
- - ! '>='
|
156
|
-
- !ruby/object:Gem::Version
|
157
|
-
version: '0'
|
158
94
|
- !ruby/object:Gem::Dependency
|
159
95
|
name: state_machine
|
160
96
|
requirement: !ruby/object:Gem::Requirement
|
@@ -188,39 +124,7 @@ dependencies:
|
|
188
124
|
- !ruby/object:Gem::Version
|
189
125
|
version: '0'
|
190
126
|
- !ruby/object:Gem::Dependency
|
191
|
-
name:
|
192
|
-
requirement: !ruby/object:Gem::Requirement
|
193
|
-
none: false
|
194
|
-
requirements:
|
195
|
-
- - ! '>='
|
196
|
-
- !ruby/object:Gem::Version
|
197
|
-
version: '0'
|
198
|
-
type: :runtime
|
199
|
-
prerelease: false
|
200
|
-
version_requirements: !ruby/object:Gem::Requirement
|
201
|
-
none: false
|
202
|
-
requirements:
|
203
|
-
- - ! '>='
|
204
|
-
- !ruby/object:Gem::Version
|
205
|
-
version: '0'
|
206
|
-
- !ruby/object:Gem::Dependency
|
207
|
-
name: attribute_normalizer
|
208
|
-
requirement: !ruby/object:Gem::Requirement
|
209
|
-
none: false
|
210
|
-
requirements:
|
211
|
-
- - ~>
|
212
|
-
- !ruby/object:Gem::Version
|
213
|
-
version: '1.1'
|
214
|
-
type: :runtime
|
215
|
-
prerelease: false
|
216
|
-
version_requirements: !ruby/object:Gem::Requirement
|
217
|
-
none: false
|
218
|
-
requirements:
|
219
|
-
- - ~>
|
220
|
-
- !ruby/object:Gem::Version
|
221
|
-
version: '1.1'
|
222
|
-
- !ruby/object:Gem::Dependency
|
223
|
-
name: sunspot_rails
|
127
|
+
name: enju_core
|
224
128
|
requirement: !ruby/object:Gem::Requirement
|
225
129
|
none: false
|
226
130
|
requirements:
|
@@ -235,38 +139,6 @@ dependencies:
|
|
235
139
|
- - ! '>='
|
236
140
|
- !ruby/object:Gem::Version
|
237
141
|
version: '0'
|
238
|
-
- !ruby/object:Gem::Dependency
|
239
|
-
name: sunspot_solr
|
240
|
-
requirement: !ruby/object:Gem::Requirement
|
241
|
-
none: false
|
242
|
-
requirements:
|
243
|
-
- - ! '>='
|
244
|
-
- !ruby/object:Gem::Version
|
245
|
-
version: '0'
|
246
|
-
type: :runtime
|
247
|
-
prerelease: false
|
248
|
-
version_requirements: !ruby/object:Gem::Requirement
|
249
|
-
none: false
|
250
|
-
requirements:
|
251
|
-
- - ! '>='
|
252
|
-
- !ruby/object:Gem::Version
|
253
|
-
version: '0'
|
254
|
-
- !ruby/object:Gem::Dependency
|
255
|
-
name: acts_as_list
|
256
|
-
requirement: !ruby/object:Gem::Requirement
|
257
|
-
none: false
|
258
|
-
requirements:
|
259
|
-
- - ~>
|
260
|
-
- !ruby/object:Gem::Version
|
261
|
-
version: 0.1.6
|
262
|
-
type: :runtime
|
263
|
-
prerelease: false
|
264
|
-
version_requirements: !ruby/object:Gem::Requirement
|
265
|
-
none: false
|
266
|
-
requirements:
|
267
|
-
- - ~>
|
268
|
-
- !ruby/object:Gem::Version
|
269
|
-
version: 0.1.6
|
270
142
|
- !ruby/object:Gem::Dependency
|
271
143
|
name: sqlite3
|
272
144
|
requirement: !ruby/object:Gem::Requirement
|
@@ -316,7 +188,7 @@ dependencies:
|
|
316
188
|
- !ruby/object:Gem::Version
|
317
189
|
version: '0'
|
318
190
|
- !ruby/object:Gem::Dependency
|
319
|
-
name:
|
191
|
+
name: sunspot_solr
|
320
192
|
requirement: !ruby/object:Gem::Requirement
|
321
193
|
none: false
|
322
194
|
requirements:
|
@@ -493,6 +365,7 @@ files:
|
|
493
365
|
- db/migrate/20110913115320_add_lft_and_rgt_to_message.rb
|
494
366
|
- db/migrate/20120125050502_add_depth_to_message.rb
|
495
367
|
- lib/enju_message/engine.rb
|
368
|
+
- lib/enju_message/user.rb
|
496
369
|
- lib/enju_message/version.rb
|
497
370
|
- lib/enju_message.rb
|
498
371
|
- lib/tasks/enju_message_tasks.rake
|
@@ -559,10 +432,6 @@ files:
|
|
559
432
|
- spec/dummy/db/production.sqlite3
|
560
433
|
- spec/dummy/db/schema.rb
|
561
434
|
- spec/dummy/db/test.sqlite3
|
562
|
-
- spec/dummy/lib/enju_leaf/localized_name.rb
|
563
|
-
- spec/dummy/lib/enju_leaf/master_model.rb
|
564
|
-
- spec/dummy/lib/enju_leaf/url_validator.rb
|
565
|
-
- spec/dummy/lib/enju_leaf.rb
|
566
435
|
- spec/dummy/public/404.html
|
567
436
|
- spec/dummy/public/422.html
|
568
437
|
- spec/dummy/public/500.html
|
@@ -696,10 +565,6 @@ test_files:
|
|
696
565
|
- spec/dummy/db/production.sqlite3
|
697
566
|
- spec/dummy/db/schema.rb
|
698
567
|
- spec/dummy/db/test.sqlite3
|
699
|
-
- spec/dummy/lib/enju_leaf/localized_name.rb
|
700
|
-
- spec/dummy/lib/enju_leaf/master_model.rb
|
701
|
-
- spec/dummy/lib/enju_leaf/url_validator.rb
|
702
|
-
- spec/dummy/lib/enju_leaf.rb
|
703
568
|
- spec/dummy/public/404.html
|
704
569
|
- spec/dummy/public/422.html
|
705
570
|
- spec/dummy/public/500.html
|
@@ -1,13 +0,0 @@
|
|
1
|
-
module LocalizedName
|
2
|
-
def localize(locale = I18n.locale.to_s)
|
3
|
-
values = Hash[*self.strip.split("\n").map{|n| n.split(':', 2)}.flatten]
|
4
|
-
name = values[locale.to_s] || self
|
5
|
-
name.strip
|
6
|
-
rescue ArgumentError
|
7
|
-
self
|
8
|
-
end
|
9
|
-
end
|
10
|
-
|
11
|
-
class String
|
12
|
-
include LocalizedName
|
13
|
-
end
|
@@ -1,41 +0,0 @@
|
|
1
|
-
module MasterModel
|
2
|
-
def self.included(base)
|
3
|
-
#base.extend ClassMethods
|
4
|
-
base.send :include, InstanceMethods
|
5
|
-
base.class_eval do
|
6
|
-
acts_as_list
|
7
|
-
validates_uniqueness_of :name, :case_sensitive => false
|
8
|
-
validates_presence_of :name, :display_name
|
9
|
-
before_validation :set_display_name, :on => :create
|
10
|
-
normalize_attributes :name
|
11
|
-
end
|
12
|
-
end
|
13
|
-
|
14
|
-
module InstanceMethods
|
15
|
-
def set_display_name
|
16
|
-
self.display_name = self.name if self.display_name.blank?
|
17
|
-
end
|
18
|
-
|
19
|
-
def check_creatable
|
20
|
-
if creatable?
|
21
|
-
raise NotModifiableError
|
22
|
-
end
|
23
|
-
end
|
24
|
-
|
25
|
-
def check_deletable
|
26
|
-
if deletable?
|
27
|
-
raise NotModifiableError
|
28
|
-
end
|
29
|
-
end
|
30
|
-
|
31
|
-
def creatable?
|
32
|
-
false
|
33
|
-
end
|
34
|
-
|
35
|
-
def deletable?
|
36
|
-
false
|
37
|
-
end
|
38
|
-
end
|
39
|
-
|
40
|
-
class NotModifiableError < StandardError; end
|
41
|
-
end
|
data/spec/dummy/lib/enju_leaf.rb
DELETED