enju_message 0.0.17 → 0.0.18

Sign up to get free protection for your applications and to get access to all the features.
Files changed (8) hide show
  1. data/app/models/message_template.rb +1 -1
  2. data/db/fixtures/message_templates.yml +17 -1
  3. data/lib/enju_message/version.rb +1 -1
  4. data/spec/controllers/message_templates_controller_spec.rb +0 -4
  5. data/spec/dummy/db/schema.rb +2 -1
  6. data/spec/dummy/db/test.sqlite3 +0 -0
  7. data/spec/fixtures/message_templates.yml +24 -19
  8. metadata +41 -41
data/app/models/message_template.rb CHANGED
@@ -1,5 +1,5 @@
1
1
  class MessageTemplate < ActiveRecord::Base
2
- default_scope :order => "position"
2
+ default_scope :order => "message_templates.position"
3
3
  has_many :message_requests
4
4
 
5
5
  validates_uniqueness_of :status
data/db/fixtures/message_templates.yml CHANGED
@@ -4,51 +4,67 @@ message_template_00001:
4
4
  title: Reservation accepted
5
5
  body: Reservation accepted
6
6
  position: 1
7
+ locale: ja
7
8
  message_template_00002:
8
9
  id: 2
9
- status: item_received
10
+ status: item_received_for_patron
10
11
  title: Item received
11
12
  body: Item received
12
13
  position: 2
14
+ locale: ja
13
15
  message_template_00003:
14
16
  id: 3
15
17
  status: reservation_expired_for_patron
16
18
  title: Reservation expired
17
19
  body: Reservation expired
18
20
  position: 3
21
+ locale: ja
19
22
  message_template_00004:
20
23
  id: 4
21
24
  status: reservation_expired_for_library
22
25
  title: Reservation expired
23
26
  body: Reservation expired
24
27
  position: 4
28
+ locale: ja
25
29
  message_template_00005:
26
30
  id: 5
27
31
  status: reservation_canceled_for_patron
28
32
  title: Reservation canceled
29
33
  body: Reservation canceled
30
34
  position: 5
35
+ locale: ja
31
36
  message_template_00006:
32
37
  id: 6
33
38
  status: reservation_canceled_for_library
34
39
  title: Reservation canceled
35
40
  body: Reservation canceled
36
41
  position: 6
42
+ locale: ja
37
43
  message_template_00007:
38
44
  id: 7
39
45
  status: recall_item
40
46
  title: Recall item
41
47
  body: Recall item
42
48
  position: 7
49
+ locale: ja
43
50
  message_template_00008:
44
51
  id: 8
45
52
  status: recall_overdue_item
46
53
  title: Recall overdue item
47
54
  body: Recall overdue item
48
55
  position: 8
56
+ locale: ja
49
57
  message_template_00009:
50
58
  id: 9
51
59
  status: reservation_accepted_for_library
52
60
  title: Reservation accepted
53
61
  body: Reservation accepted
54
62
  position: 9
63
+ locale: ja
64
+ message_template_00010:
65
+ id: 10
66
+ status: item_received_for_library
67
+ title: Item received
68
+ body: Item received
69
+ position: 10
70
+ locale: ja
data/lib/enju_message/version.rb CHANGED
@@ -1,3 +1,3 @@
1
1
  module EnjuMessage
2
- VERSION = "0.0.17"
2
+ VERSION = "0.0.18"
3
3
  end
data/spec/controllers/message_templates_controller_spec.rb CHANGED
@@ -6,10 +6,6 @@ describe MessageTemplatesController do
6
6
  disconnect_sunspot
7
7
 
8
8
  describe "GET index" do
9
- before(:each) do
10
- FactoryGirl.create(:message_template)
11
- end
12
-
13
9
  describe "When logged in as Administrator" do
14
10
  login_admin
15
11
 
data/spec/dummy/db/schema.rb CHANGED
@@ -11,7 +11,7 @@
11
11
  #
12
12
  # It's strongly recommended to check this file into your version control system.
13
13
 
14
- ActiveRecord::Schema.define(:version => 20120125050502) do
14
+ ActiveRecord::Schema.define(:version => 20120213092115) do
15
15
 
16
16
  create_table "delayed_jobs", :force => true do |t|
17
17
  t.integer "priority", :default => 0
@@ -24,6 +24,7 @@ ActiveRecord::Schema.define(:version => 20120125050502) do
24
24
  t.string "locked_by"
25
25
  t.datetime "created_at", :null => false
26
26
  t.datetime "updated_at", :null => false
27
+ t.string "queue"
27
28
  end
28
29
 
29
30
  add_index "delayed_jobs", ["priority", "run_at"], :name => "delayed_jobs_priority"
data/spec/dummy/db/test.sqlite3 CHANGED
Binary file
data/spec/fixtures/message_templates.yml CHANGED
@@ -1,65 +1,70 @@
1
1
  message_template_00001:
2
2
  id: 1
3
- status: reservation_accepted
3
+ status: reservation_accepted_for_patron
4
4
  title: Reservation accepted
5
5
  body: Reservation accepted
6
6
  position: 1
7
+ locale: ja
7
8
  message_template_00002:
8
9
  id: 2
9
- status: item_received
10
+ status: item_received_for_patron
10
11
  title: Item received
11
12
  body: Item received
12
13
  position: 2
14
+ locale: ja
13
15
  message_template_00003:
14
16
  id: 3
15
17
  status: reservation_expired_for_patron
16
18
  title: Reservation expired
17
19
  body: Reservation expired
18
20
  position: 3
21
+ locale: ja
19
22
  message_template_00004:
20
23
  id: 4
21
24
  status: reservation_expired_for_library
22
25
  title: Reservation expired
23
26
  body: Reservation expired
24
27
  position: 4
28
+ locale: ja
25
29
  message_template_00005:
26
30
  id: 5
27
31
  status: reservation_canceled_for_patron
28
32
  title: Reservation canceled
29
33
  body: Reservation canceled
30
34
  position: 5
35
+ locale: ja
31
36
  message_template_00006:
32
37
  id: 6
33
38
  status: reservation_canceled_for_library
34
39
  title: Reservation canceled
35
40
  body: Reservation canceled
36
41
  position: 6
42
+ locale: ja
37
43
  message_template_00007:
38
44
  id: 7
39
45
  status: recall_item
40
46
  title: Recall item
41
47
  body: Recall item
42
48
  position: 7
49
+ locale: ja
43
50
  message_template_00008:
44
51
  id: 8
45
52
  status: recall_overdue_item
46
53
  title: Recall overdue item
47
54
  body: Recall overdue item
48
55
  position: 8
49
-
50
-
51
-
52
- # == Schema Information
53
- #
54
- # Table name: message_templates
55
- #
56
- # id :integer not null, primary key
57
- # status :string(255) not null
58
- # title :text not null
59
- # body :text not null
60
- # position :integer
61
- # created_at :datetime
62
- # updated_at :datetime
63
- # locale :string(255) default("ja")
64
- #
65
-
56
+ locale: ja
57
+ message_template_00009:
58
+ id: 9
59
+ status: reservation_accepted_for_library
60
+ title: Reservation accepted
61
+ body: Reservation accepted
62
+ position: 9
63
+ locale: ja
64
+ message_template_00010:
65
+ id: 10
66
+ status: item_received_for_library
67
+ title: Item received
68
+ body: Item received
69
+ position: 10
70
+ locale: ja
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.17
4
+ version: 0.0.18
5
5
  prerelease:
6
6
  platform: ruby
7
7
  authors:
@@ -13,7 +13,7 @@ date: 2012-04-22 00:00:00.000000000 Z
13
13
  dependencies:
14
14
  - !ruby/object:Gem::Dependency
15
15
  name: rails
16
- requirement: &70348841933220 !ruby/object:Gem::Requirement
16
+ requirement: &70359529382500 !ruby/object:Gem::Requirement
17
17
  none: false
18
18
  requirements:
19
19
  - - ~>
@@ -21,10 +21,10 @@ dependencies:
21
21
  version: '3.2'
22
22
  type: :runtime
23
23
  prerelease: false
24
- version_requirements: *70348841933220
24
+ version_requirements: *70359529382500
25
25
  - !ruby/object:Gem::Dependency
26
26
  name: simple_form
27
- requirement: &70348841932580 !ruby/object:Gem::Requirement
27
+ requirement: &70359529381960 !ruby/object:Gem::Requirement
28
28
  none: false
29
29
  requirements:
30
30
  - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
32
32
  version: '0'
33
33
  type: :runtime
34
34
  prerelease: false
35
- version_requirements: *70348841932580
35
+ version_requirements: *70359529381960
36
36
  - !ruby/object:Gem::Dependency
37
37
  name: configatron
38
- requirement: &70348841931840 !ruby/object:Gem::Requirement
38
+ requirement: &70359529397860 !ruby/object:Gem::Requirement
39
39
  none: false
40
40
  requirements:
41
41
  - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
43
43
  version: '0'
44
44
  type: :runtime
45
45
  prerelease: false
46
- version_requirements: *70348841931840
46
+ version_requirements: *70359529397860
47
47
  - !ruby/object:Gem::Dependency
48
48
  name: delayed_job_active_record
49
- requirement: &70348841930980 !ruby/object:Gem::Requirement
49
+ requirement: &70359529397440 !ruby/object:Gem::Requirement
50
50
  none: false
51
51
  requirements:
52
52
  - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
54
54
  version: '0'
55
55
  type: :runtime
56
56
  prerelease: false
57
- version_requirements: *70348841930980
57
+ version_requirements: *70359529397440
58
58
  - !ruby/object:Gem::Dependency
59
59
  name: awesome_nested_set
60
- requirement: &70348841930040 !ruby/object:Gem::Requirement
60
+ requirement: &70359529396900 !ruby/object:Gem::Requirement
61
61
  none: false
62
62
  requirements:
63
63
  - - ~>
@@ -65,10 +65,10 @@ dependencies:
65
65
  version: '2.1'
66
66
  type: :runtime
67
67
  prerelease: false
68
- version_requirements: *70348841930040
68
+ version_requirements: *70359529396900
69
69
  - !ruby/object:Gem::Dependency
70
70
  name: friendly_id
71
- requirement: &70348841929220 !ruby/object:Gem::Requirement
71
+ requirement: &70359529396400 !ruby/object:Gem::Requirement
72
72
  none: false
73
73
  requirements:
74
74
  - - ~>
@@ -76,10 +76,10 @@ dependencies:
76
76
  version: '4.0'
77
77
  type: :runtime
78
78
  prerelease: false
79
- version_requirements: *70348841929220
79
+ version_requirements: *70359529396400
80
80
  - !ruby/object:Gem::Dependency
81
81
  name: will_paginate
82
- requirement: &70348841928480 !ruby/object:Gem::Requirement
82
+ requirement: &70359529395940 !ruby/object:Gem::Requirement
83
83
  none: false
84
84
  requirements:
85
85
  - - ~>
@@ -87,10 +87,10 @@ dependencies:
87
87
  version: '3.0'
88
88
  type: :runtime
89
89
  prerelease: false
90
- version_requirements: *70348841928480
90
+ version_requirements: *70359529395940
91
91
  - !ruby/object:Gem::Dependency
92
92
  name: devise
93
- requirement: &70348841927780 !ruby/object:Gem::Requirement
93
+ requirement: &70359529395520 !ruby/object:Gem::Requirement
94
94
  none: false
95
95
  requirements:
96
96
  - - ! '>='
@@ -98,10 +98,10 @@ dependencies:
98
98
  version: '0'
99
99
  type: :runtime
100
100
  prerelease: false
101
- version_requirements: *70348841927780
101
+ version_requirements: *70359529395520
102
102
  - !ruby/object:Gem::Dependency
103
103
  name: cancan
104
- requirement: &70348841927100 !ruby/object:Gem::Requirement
104
+ requirement: &70359529395040 !ruby/object:Gem::Requirement
105
105
  none: false
106
106
  requirements:
107
107
  - - ! '>='
@@ -109,10 +109,10 @@ dependencies:
109
109
  version: '0'
110
110
  type: :runtime
111
111
  prerelease: false
112
- version_requirements: *70348841927100
112
+ version_requirements: *70359529395040
113
113
  - !ruby/object:Gem::Dependency
114
114
  name: state_machine
115
- requirement: &70348841942860 !ruby/object:Gem::Requirement
115
+ requirement: &70359529394460 !ruby/object:Gem::Requirement
116
116
  none: false
117
117
  requirements:
118
118
  - - ! '>='
@@ -120,10 +120,10 @@ dependencies:
120
120
  version: '0'
121
121
  type: :runtime
122
122
  prerelease: false
123
- version_requirements: *70348841942860
123
+ version_requirements: *70359529394460
124
124
  - !ruby/object:Gem::Dependency
125
125
  name: inherited_resources
126
- requirement: &70348841942140 !ruby/object:Gem::Requirement
126
+ requirement: &70359529393940 !ruby/object:Gem::Requirement
127
127
  none: false
128
128
  requirements:
129
129
  - - ! '>='
@@ -131,10 +131,10 @@ dependencies:
131
131
  version: '0'
132
132
  type: :runtime
133
133
  prerelease: false
134
- version_requirements: *70348841942140
134
+ version_requirements: *70359529393940
135
135
  - !ruby/object:Gem::Dependency
136
136
  name: addressable
137
- requirement: &70348841941720 !ruby/object:Gem::Requirement
137
+ requirement: &70359529393300 !ruby/object:Gem::Requirement
138
138
  none: false
139
139
  requirements:
140
140
  - - ! '>='
@@ -142,10 +142,10 @@ dependencies:
142
142
  version: '0'
143
143
  type: :runtime
144
144
  prerelease: false
145
- version_requirements: *70348841941720
145
+ version_requirements: *70359529393300
146
146
  - !ruby/object:Gem::Dependency
147
147
  name: attribute_normalizer
148
- requirement: &70348841941200 !ruby/object:Gem::Requirement
148
+ requirement: &70359529392600 !ruby/object:Gem::Requirement
149
149
  none: false
150
150
  requirements:
151
151
  - - ~>
@@ -153,10 +153,10 @@ dependencies:
153
153
  version: '1.1'
154
154
  type: :runtime
155
155
  prerelease: false
156
- version_requirements: *70348841941200
156
+ version_requirements: *70359529392600
157
157
  - !ruby/object:Gem::Dependency
158
158
  name: sunspot_rails
159
- requirement: &70348841940780 !ruby/object:Gem::Requirement
159
+ requirement: &70359529392160 !ruby/object:Gem::Requirement
160
160
  none: false
161
161
  requirements:
162
162
  - - ! '>='
@@ -164,10 +164,10 @@ dependencies:
164
164
  version: '0'
165
165
  type: :runtime
166
166
  prerelease: false
167
- version_requirements: *70348841940780
167
+ version_requirements: *70359529392160
168
168
  - !ruby/object:Gem::Dependency
169
169
  name: sunspot_solr
170
- requirement: &70348841940280 !ruby/object:Gem::Requirement
170
+ requirement: &70359529391540 !ruby/object:Gem::Requirement
171
171
  none: false
172
172
  requirements:
173
173
  - - ! '>='
@@ -175,10 +175,10 @@ dependencies:
175
175
  version: '0'
176
176
  type: :runtime
177
177
  prerelease: false
178
- version_requirements: *70348841940280
178
+ version_requirements: *70359529391540
179
179
  - !ruby/object:Gem::Dependency
180
180
  name: acts_as_list
181
- requirement: &70348841939780 !ruby/object:Gem::Requirement
181
+ requirement: &70359529390840 !ruby/object:Gem::Requirement
182
182
  none: false
183
183
  requirements:
184
184
  - - ~>
@@ -186,10 +186,10 @@ dependencies:
186
186
  version: 0.1.5
187
187
  type: :runtime
188
188
  prerelease: false
189
- version_requirements: *70348841939780
189
+ version_requirements: *70359529390840
190
190
  - !ruby/object:Gem::Dependency
191
191
  name: sqlite3
192
- requirement: &70348841939320 !ruby/object:Gem::Requirement
192
+ requirement: &70359529390280 !ruby/object:Gem::Requirement
193
193
  none: false
194
194
  requirements:
195
195
  - - ! '>='
@@ -197,10 +197,10 @@ dependencies:
197
197
  version: '0'
198
198
  type: :development
199
199
  prerelease: false
200
- version_requirements: *70348841939320
200
+ version_requirements: *70359529390280
201
201
  - !ruby/object:Gem::Dependency
202
202
  name: rspec-rails
203
- requirement: &70348841938840 !ruby/object:Gem::Requirement
203
+ requirement: &70359529405820 !ruby/object:Gem::Requirement
204
204
  none: false
205
205
  requirements:
206
206
  - - ! '>='
@@ -208,10 +208,10 @@ dependencies:
208
208
  version: '0'
209
209
  type: :development
210
210
  prerelease: false
211
- version_requirements: *70348841938840
211
+ version_requirements: *70359529405820
212
212
  - !ruby/object:Gem::Dependency
213
213
  name: factory_girl_rails
214
- requirement: &70348841938200 !ruby/object:Gem::Requirement
214
+ requirement: &70359529405280 !ruby/object:Gem::Requirement
215
215
  none: false
216
216
  requirements:
217
217
  - - ~>
@@ -219,10 +219,10 @@ dependencies:
219
219
  version: '3.1'
220
220
  type: :development
221
221
  prerelease: false
222
- version_requirements: *70348841938200
222
+ version_requirements: *70359529405280
223
223
  - !ruby/object:Gem::Dependency
224
224
  name: sunspot-rails-tester
225
- requirement: &70348841937660 !ruby/object:Gem::Requirement
225
+ requirement: &70359529404820 !ruby/object:Gem::Requirement
226
226
  none: false
227
227
  requirements:
228
228
  - - ! '>='
@@ -230,7 +230,7 @@ dependencies:
230
230
  version: '0'
231
231
  type: :development
232
232
  prerelease: false
233
- version_requirements: *70348841937660
233
+ version_requirements: *70359529404820
234
234
  description: Message management for Next-L Enju
235
235
  email:
236
236
  - tanabe@mwr.mediacom.keio.ac.jp