enju_message 0.1.16 → 0.2.0.beta.1
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/README.rdoc +3 -3
- data/app/controllers/message_requests_controller.rb +13 -3
- data/app/controllers/message_templates_controller.rb +12 -1
- data/app/controllers/messages_controller.rb +17 -6
- data/app/models/concerns/enju_message/enju_user.rb +21 -0
- data/app/models/message.rb +1 -1
- data/app/models/message_template.rb +0 -1
- data/app/policies/message_policy.rb +37 -0
- data/app/policies/message_request_policy.rb +21 -0
- data/app/policies/message_template_policy.rb +21 -0
- data/app/views/message_requests/show.html.erb +1 -1
- data/app/views/message_templates/index.html.erb +4 -4
- data/app/views/message_templates/show.html.erb +2 -2
- data/app/views/messages/index.html.erb +2 -2
- data/app/views/messages/show.html.erb +2 -2
- data/db/migrate/20160703185015_add_most_recent_to_message_transitions.rb +9 -0
- data/lib/enju_message/engine.rb +0 -1
- data/lib/enju_message/version.rb +1 -1
- data/lib/enju_message.rb +0 -3
- data/lib/generators/enju_message/setup/setup_generator.rb +3 -2
- data/lib/tasks/enju_message_tasks.rake +1 -1
- data/spec/controllers/message_requests_controller_spec.rb +2 -2
- data/spec/controllers/message_templates_controller_spec.rb +14 -14
- data/spec/controllers/messages_controller_spec.rb +57 -33
- data/spec/dummy/app/controllers/application_controller.rb +6 -2
- data/spec/dummy/app/models/user.rb +2 -2
- data/spec/dummy/config/application.rb +6 -24
- data/spec/dummy/config/environments/development.rb +25 -14
- data/spec/dummy/config/environments/production.rb +50 -31
- data/spec/dummy/config/environments/test.rb +21 -18
- data/spec/dummy/db/migrate/20140821151023_create_colors.rb +14 -0
- data/spec/dummy/db/migrate/20150924115059_create_withdraws.rb +13 -0
- data/spec/dummy/db/migrate/20151213070943_add_translation_table_to_library_group.rb +13 -0
- data/spec/dummy/db/migrate/20151213072705_add_footer_banner_to_library_group.rb +9 -0
- data/spec/dummy/db/schema.rb +37 -2
- data/spec/support/devise.rb +2 -2
- metadata +83 -34
- data/app/models/enju_message/ability.rb +0 -33
- data/lib/enju_message/user.rb +0 -28
- data/spec/dummy/config/application.yml +0 -38
- data/spec/dummy/config/initializers/resque_mailer.rb +0 -1
metadata
CHANGED
@@ -1,43 +1,43 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: enju_message
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 0.1
|
4
|
+
version: 0.2.0.beta.1
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- Kosuke Tanabe
|
8
8
|
autorequire:
|
9
9
|
bindir: bin
|
10
10
|
cert_chain: []
|
11
|
-
date: 2016-
|
11
|
+
date: 2016-07-31 00:00:00.000000000 Z
|
12
12
|
dependencies:
|
13
13
|
- !ruby/object:Gem::Dependency
|
14
14
|
name: simple_form
|
15
15
|
requirement: !ruby/object:Gem::Requirement
|
16
16
|
requirements:
|
17
|
-
- - "
|
17
|
+
- - "~>"
|
18
18
|
- !ruby/object:Gem::Version
|
19
|
-
version: '
|
19
|
+
version: '3.2'
|
20
20
|
type: :runtime
|
21
21
|
prerelease: false
|
22
22
|
version_requirements: !ruby/object:Gem::Requirement
|
23
23
|
requirements:
|
24
|
-
- - "
|
24
|
+
- - "~>"
|
25
25
|
- !ruby/object:Gem::Version
|
26
|
-
version: '
|
26
|
+
version: '3.2'
|
27
27
|
- !ruby/object:Gem::Dependency
|
28
28
|
name: awesome_nested_set
|
29
29
|
requirement: !ruby/object:Gem::Requirement
|
30
30
|
requirements:
|
31
|
-
- - "
|
31
|
+
- - "~>"
|
32
32
|
- !ruby/object:Gem::Version
|
33
|
-
version: '
|
33
|
+
version: '3.1'
|
34
34
|
type: :runtime
|
35
35
|
prerelease: false
|
36
36
|
version_requirements: !ruby/object:Gem::Requirement
|
37
37
|
requirements:
|
38
|
-
- - "
|
38
|
+
- - "~>"
|
39
39
|
- !ruby/object:Gem::Version
|
40
|
-
version: '
|
40
|
+
version: '3.1'
|
41
41
|
- !ruby/object:Gem::Dependency
|
42
42
|
name: statesman
|
43
43
|
requirement: !ruby/object:Gem::Requirement
|
@@ -53,7 +53,7 @@ dependencies:
|
|
53
53
|
- !ruby/object:Gem::Version
|
54
54
|
version: '1.3'
|
55
55
|
- !ruby/object:Gem::Dependency
|
56
|
-
name:
|
56
|
+
name: rails_autolink
|
57
57
|
requirement: !ruby/object:Gem::Requirement
|
58
58
|
requirements:
|
59
59
|
- - ">="
|
@@ -67,13 +67,13 @@ dependencies:
|
|
67
67
|
- !ruby/object:Gem::Version
|
68
68
|
version: '0'
|
69
69
|
- !ruby/object:Gem::Dependency
|
70
|
-
name:
|
70
|
+
name: sqlite3
|
71
71
|
requirement: !ruby/object:Gem::Requirement
|
72
72
|
requirements:
|
73
73
|
- - ">="
|
74
74
|
- !ruby/object:Gem::Version
|
75
75
|
version: '0'
|
76
|
-
type: :
|
76
|
+
type: :development
|
77
77
|
prerelease: false
|
78
78
|
version_requirements: !ruby/object:Gem::Requirement
|
79
79
|
requirements:
|
@@ -81,7 +81,7 @@ dependencies:
|
|
81
81
|
- !ruby/object:Gem::Version
|
82
82
|
version: '0'
|
83
83
|
- !ruby/object:Gem::Dependency
|
84
|
-
name:
|
84
|
+
name: mysql2
|
85
85
|
requirement: !ruby/object:Gem::Requirement
|
86
86
|
requirements:
|
87
87
|
- - ">="
|
@@ -95,47 +95,75 @@ dependencies:
|
|
95
95
|
- !ruby/object:Gem::Version
|
96
96
|
version: '0'
|
97
97
|
- !ruby/object:Gem::Dependency
|
98
|
-
name:
|
98
|
+
name: pg
|
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'
|
111
|
+
- !ruby/object:Gem::Dependency
|
112
|
+
name: enju_leaf
|
99
113
|
requirement: !ruby/object:Gem::Requirement
|
100
114
|
requirements:
|
101
115
|
- - "~>"
|
102
116
|
- !ruby/object:Gem::Version
|
103
|
-
version: 0.
|
117
|
+
version: 1.2.0.beta.1
|
104
118
|
type: :development
|
105
119
|
prerelease: false
|
106
120
|
version_requirements: !ruby/object:Gem::Requirement
|
107
121
|
requirements:
|
108
122
|
- - "~>"
|
109
123
|
- !ruby/object:Gem::Version
|
110
|
-
version: 0.
|
124
|
+
version: 1.2.0.beta.1
|
111
125
|
- !ruby/object:Gem::Dependency
|
112
|
-
name:
|
126
|
+
name: enju_library
|
113
127
|
requirement: !ruby/object:Gem::Requirement
|
114
128
|
requirements:
|
115
|
-
- - "
|
129
|
+
- - "~>"
|
116
130
|
- !ruby/object:Gem::Version
|
117
|
-
version:
|
131
|
+
version: 0.2.0.beta.1
|
118
132
|
type: :development
|
119
133
|
prerelease: false
|
120
134
|
version_requirements: !ruby/object:Gem::Requirement
|
121
135
|
requirements:
|
122
|
-
- - "
|
136
|
+
- - "~>"
|
123
137
|
- !ruby/object:Gem::Version
|
124
|
-
version:
|
138
|
+
version: 0.2.0.beta.1
|
125
139
|
- !ruby/object:Gem::Dependency
|
126
|
-
name:
|
140
|
+
name: enju_biblio
|
127
141
|
requirement: !ruby/object:Gem::Requirement
|
128
142
|
requirements:
|
129
143
|
- - "~>"
|
130
144
|
- !ruby/object:Gem::Version
|
131
|
-
version:
|
145
|
+
version: 0.2.0.beta.1
|
132
146
|
type: :development
|
133
147
|
prerelease: false
|
134
148
|
version_requirements: !ruby/object:Gem::Requirement
|
135
149
|
requirements:
|
136
150
|
- - "~>"
|
137
151
|
- !ruby/object:Gem::Version
|
138
|
-
version:
|
152
|
+
version: 0.2.0.beta.1
|
153
|
+
- !ruby/object:Gem::Dependency
|
154
|
+
name: enju_manifestation_viewer
|
155
|
+
requirement: !ruby/object:Gem::Requirement
|
156
|
+
requirements:
|
157
|
+
- - "~>"
|
158
|
+
- !ruby/object:Gem::Version
|
159
|
+
version: 0.2.0.beta.1
|
160
|
+
type: :development
|
161
|
+
prerelease: false
|
162
|
+
version_requirements: !ruby/object:Gem::Requirement
|
163
|
+
requirements:
|
164
|
+
- - "~>"
|
165
|
+
- !ruby/object:Gem::Version
|
166
|
+
version: 0.2.0.beta.1
|
139
167
|
- !ruby/object:Gem::Dependency
|
140
168
|
name: rspec-rails
|
141
169
|
requirement: !ruby/object:Gem::Requirement
|
@@ -235,7 +263,21 @@ dependencies:
|
|
235
263
|
- !ruby/object:Gem::Version
|
236
264
|
version: '0'
|
237
265
|
- !ruby/object:Gem::Dependency
|
238
|
-
name:
|
266
|
+
name: coveralls
|
267
|
+
requirement: !ruby/object:Gem::Requirement
|
268
|
+
requirements:
|
269
|
+
- - ">="
|
270
|
+
- !ruby/object:Gem::Version
|
271
|
+
version: '0'
|
272
|
+
type: :development
|
273
|
+
prerelease: false
|
274
|
+
version_requirements: !ruby/object:Gem::Requirement
|
275
|
+
requirements:
|
276
|
+
- - ">="
|
277
|
+
- !ruby/object:Gem::Version
|
278
|
+
version: '0'
|
279
|
+
- !ruby/object:Gem::Dependency
|
280
|
+
name: resque_mailer
|
239
281
|
requirement: !ruby/object:Gem::Requirement
|
240
282
|
requirements:
|
241
283
|
- - ">="
|
@@ -262,7 +304,7 @@ files:
|
|
262
304
|
- app/controllers/message_templates_controller.rb
|
263
305
|
- app/controllers/messages_controller.rb
|
264
306
|
- app/helpers/messages_helper.rb
|
265
|
-
- app/models/enju_message/
|
307
|
+
- app/models/concerns/enju_message/enju_user.rb
|
266
308
|
- app/models/message.rb
|
267
309
|
- app/models/message_request.rb
|
268
310
|
- app/models/message_request_state_machine.rb
|
@@ -270,6 +312,9 @@ files:
|
|
270
312
|
- app/models/message_state_machine.rb
|
271
313
|
- app/models/message_template.rb
|
272
314
|
- app/models/message_transition.rb
|
315
|
+
- app/policies/message_policy.rb
|
316
|
+
- app/policies/message_request_policy.rb
|
317
|
+
- app/policies/message_template_policy.rb
|
273
318
|
- app/views/layouts/messages.html.erb
|
274
319
|
- app/views/message_requests/edit.html.erb
|
275
320
|
- app/views/message_requests/index.html.erb
|
@@ -301,9 +346,9 @@ files:
|
|
301
346
|
- db/migrate/20120125050502_add_depth_to_message.rb
|
302
347
|
- db/migrate/20140518111006_create_message_transitions.rb
|
303
348
|
- db/migrate/20140518135713_create_message_request_transitions.rb
|
349
|
+
- db/migrate/20160703185015_add_most_recent_to_message_transitions.rb
|
304
350
|
- lib/enju_message.rb
|
305
351
|
- lib/enju_message/engine.rb
|
306
|
-
- lib/enju_message/user.rb
|
307
352
|
- lib/enju_message/version.rb
|
308
353
|
- lib/generators/enju_message/setup/USAGE
|
309
354
|
- lib/generators/enju_message/setup/setup_generator.rb
|
@@ -327,7 +372,6 @@ files:
|
|
327
372
|
- spec/dummy/bin/setup
|
328
373
|
- spec/dummy/config.ru
|
329
374
|
- spec/dummy/config/application.rb
|
330
|
-
- spec/dummy/config/application.yml
|
331
375
|
- spec/dummy/config/boot.rb
|
332
376
|
- spec/dummy/config/database.yml
|
333
377
|
- spec/dummy/config/environment.rb
|
@@ -339,7 +383,6 @@ files:
|
|
339
383
|
- spec/dummy/config/initializers/friendly_id.rb
|
340
384
|
- spec/dummy/config/initializers/inflections.rb
|
341
385
|
- spec/dummy/config/initializers/mime_types.rb
|
342
|
-
- spec/dummy/config/initializers/resque_mailer.rb
|
343
386
|
- spec/dummy/config/initializers/secret_token.rb
|
344
387
|
- spec/dummy/config/initializers/session_store.rb
|
345
388
|
- spec/dummy/config/initializers/wrap_parameters.rb
|
@@ -468,6 +511,7 @@ files:
|
|
468
511
|
- spec/dummy/db/migrate/20140811031145_add_expired_at_to_profile.rb
|
469
512
|
- spec/dummy/db/migrate/20140813182425_add_publication_place_to_manifestation.rb
|
470
513
|
- spec/dummy/db/migrate/20140817155043_add_extent_of_text_to_manifestation.rb
|
514
|
+
- spec/dummy/db/migrate/20140821151023_create_colors.rb
|
471
515
|
- spec/dummy/db/migrate/20140822114527_add_error_message_to_resource_import_result.rb
|
472
516
|
- spec/dummy/db/migrate/20140823083524_add_extent_to_manifestation.rb
|
473
517
|
- spec/dummy/db/migrate/20140823094847_add_dimensions_to_manifestation.rb
|
@@ -475,6 +519,9 @@ files:
|
|
475
519
|
- spec/dummy/db/migrate/20141003181336_add_full_name_transcription_to_profile.rb
|
476
520
|
- spec/dummy/db/migrate/20141003182825_add_date_of_birth_to_profile.rb
|
477
521
|
- spec/dummy/db/migrate/20150221063719_add_settings_to_library_group.rb
|
522
|
+
- spec/dummy/db/migrate/20150924115059_create_withdraws.rb
|
523
|
+
- spec/dummy/db/migrate/20151213070943_add_translation_table_to_library_group.rb
|
524
|
+
- spec/dummy/db/migrate/20151213072705_add_footer_banner_to_library_group.rb
|
478
525
|
- spec/dummy/db/schema.rb
|
479
526
|
- spec/dummy/public/404.html
|
480
527
|
- spec/dummy/public/422.html
|
@@ -517,9 +564,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
|
|
517
564
|
version: '0'
|
518
565
|
required_rubygems_version: !ruby/object:Gem::Requirement
|
519
566
|
requirements:
|
520
|
-
- - "
|
567
|
+
- - ">"
|
521
568
|
- !ruby/object:Gem::Version
|
522
|
-
version:
|
569
|
+
version: 1.3.1
|
523
570
|
requirements: []
|
524
571
|
rubyforge_project:
|
525
572
|
rubygems_version: 2.5.1
|
@@ -542,7 +589,6 @@ test_files:
|
|
542
589
|
- spec/dummy/bin/rake
|
543
590
|
- spec/dummy/bin/setup
|
544
591
|
- spec/dummy/config/application.rb
|
545
|
-
- spec/dummy/config/application.yml
|
546
592
|
- spec/dummy/config/boot.rb
|
547
593
|
- spec/dummy/config/database.yml
|
548
594
|
- spec/dummy/config/environment.rb
|
@@ -554,7 +600,6 @@ test_files:
|
|
554
600
|
- spec/dummy/config/initializers/friendly_id.rb
|
555
601
|
- spec/dummy/config/initializers/inflections.rb
|
556
602
|
- spec/dummy/config/initializers/mime_types.rb
|
557
|
-
- spec/dummy/config/initializers/resque_mailer.rb
|
558
603
|
- spec/dummy/config/initializers/secret_token.rb
|
559
604
|
- spec/dummy/config/initializers/session_store.rb
|
560
605
|
- spec/dummy/config/initializers/wrap_parameters.rb
|
@@ -684,6 +729,7 @@ test_files:
|
|
684
729
|
- spec/dummy/db/migrate/20140811031145_add_expired_at_to_profile.rb
|
685
730
|
- spec/dummy/db/migrate/20140813182425_add_publication_place_to_manifestation.rb
|
686
731
|
- spec/dummy/db/migrate/20140817155043_add_extent_of_text_to_manifestation.rb
|
732
|
+
- spec/dummy/db/migrate/20140821151023_create_colors.rb
|
687
733
|
- spec/dummy/db/migrate/20140822114527_add_error_message_to_resource_import_result.rb
|
688
734
|
- spec/dummy/db/migrate/20140823083524_add_extent_to_manifestation.rb
|
689
735
|
- spec/dummy/db/migrate/20140823094847_add_dimensions_to_manifestation.rb
|
@@ -691,6 +737,9 @@ test_files:
|
|
691
737
|
- spec/dummy/db/migrate/20141003181336_add_full_name_transcription_to_profile.rb
|
692
738
|
- spec/dummy/db/migrate/20141003182825_add_date_of_birth_to_profile.rb
|
693
739
|
- spec/dummy/db/migrate/20150221063719_add_settings_to_library_group.rb
|
740
|
+
- spec/dummy/db/migrate/20150924115059_create_withdraws.rb
|
741
|
+
- spec/dummy/db/migrate/20151213070943_add_translation_table_to_library_group.rb
|
742
|
+
- spec/dummy/db/migrate/20151213072705_add_footer_banner_to_library_group.rb
|
694
743
|
- spec/dummy/db/schema.rb
|
695
744
|
- spec/dummy/public/404.html
|
696
745
|
- spec/dummy/public/422.html
|
@@ -1,33 +0,0 @@
|
|
1
|
-
module EnjuMessage
|
2
|
-
class Ability
|
3
|
-
include CanCan::Ability
|
4
|
-
|
5
|
-
def initialize(user, ip_address = nil)
|
6
|
-
case user.try(:role).try(:name)
|
7
|
-
when 'Administrator'
|
8
|
-
can :manage, Message
|
9
|
-
can :destroy_selected, Message
|
10
|
-
can [:read, :update, :destroy, :delete], MessageRequest
|
11
|
-
can [:read, :update], MessageTemplate
|
12
|
-
when 'Librarian'
|
13
|
-
can [:index, :create], Message
|
14
|
-
can [:update], Message do |message|
|
15
|
-
message.sender == user
|
16
|
-
end
|
17
|
-
can [:show, :destroy, :delete, :destroy_selected], Message do |message|
|
18
|
-
message.receiver == user
|
19
|
-
end
|
20
|
-
can [:read, :update, :destroy, :delete], MessageRequest
|
21
|
-
can :read, MessageTemplate
|
22
|
-
when 'User'
|
23
|
-
can [:show, :destroy, :delete, :destroy_selected], Message do |message|
|
24
|
-
message.receiver == user
|
25
|
-
end
|
26
|
-
can :index, Message
|
27
|
-
can :show, Message do |message|
|
28
|
-
message.receiver == user
|
29
|
-
end
|
30
|
-
end
|
31
|
-
end
|
32
|
-
end
|
33
|
-
end
|
data/lib/enju_message/user.rb
DELETED
@@ -1,28 +0,0 @@
|
|
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_model
|
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, profile.locale)
|
22
|
-
request.save_message_body(options)
|
23
|
-
request.transition_to!(:sent)
|
24
|
-
end
|
25
|
-
end
|
26
|
-
end
|
27
|
-
end
|
28
|
-
end
|
@@ -1,38 +0,0 @@
|
|
1
|
-
defaults: &defaults
|
2
|
-
enju:
|
3
|
-
web_hostname: localhost
|
4
|
-
web_port_number: 3000
|
5
|
-
|
6
|
-
family_name_first: true
|
7
|
-
max_number_of_results: 500
|
8
|
-
write_search_log_to_file: true
|
9
|
-
csv_charset_conversion: true
|
10
|
-
|
11
|
-
# Choose a locale from 'ca', 'de', 'fr', 'jp', 'uk', 'us'
|
12
|
-
#AMAZON_AWS_HOSTNAME = 'ecs.amazonaws.com'
|
13
|
-
amazon:
|
14
|
-
aws_hostname: ecs.amazonaws.jp
|
15
|
-
hostname: www.amazon.co.jp
|
16
|
-
access_key: REPLACE_WITH_YOUR_AMAZON_ACCESS_KEY
|
17
|
-
secret_access_key: REPLACE_WITH_YOUR_AMAZON_SECRET_ACCESS_KEY
|
18
|
-
|
19
|
-
# :google, :amazon
|
20
|
-
book_jacket:
|
21
|
-
source: :google
|
22
|
-
unknown_resource:
|
23
|
-
|
24
|
-
# :mozshot, :simpleapi, :heartrails, :thumbalizr
|
25
|
-
screenshot:
|
26
|
-
generator: :mozshot
|
27
|
-
|
28
|
-
uploaded_file:
|
29
|
-
storage: :local
|
30
|
-
|
31
|
-
development:
|
32
|
-
<<: *defaults
|
33
|
-
|
34
|
-
test:
|
35
|
-
<<: *defaults
|
36
|
-
|
37
|
-
production:
|
38
|
-
<<: *defaults
|
@@ -1 +0,0 @@
|
|
1
|
-
Resque::Mailer.excluded_environments = [:test, :cucumber]
|