enju_message 0.1.14.pre3 → 0.1.14.pre4

Sign up to get free protection for your applications and to get access to all the features.
Files changed (20) hide show
  1. checksums.yaml +7 -0
  2. data/app/models/enju_message/ability.rb +32 -0
  3. data/lib/enju_message/user.rb +1 -1
  4. data/lib/enju_message/version.rb +1 -1
  5. data/spec/controllers/message_templates_controller_spec.rb +2 -2
  6. data/spec/dummy/app/models/ability.rb +29 -27
  7. data/spec/dummy/app/models/user.rb +1 -1
  8. data/spec/dummy/db/test.sqlite3 +0 -0
  9. data/spec/dummy/solr/data/test/index/{_1b.fdt → _1z.fdt} +0 -0
  10. data/spec/dummy/solr/data/test/index/{_1b.fdx → _1z.fdx} +0 -0
  11. data/spec/dummy/solr/data/test/index/{_1b.fnm → _1z.fnm} +0 -0
  12. data/spec/dummy/solr/data/test/index/{_1b.frq → _1z.frq} +0 -0
  13. data/spec/dummy/solr/data/test/index/{_1b.nrm → _1z.nrm} +0 -0
  14. data/spec/dummy/solr/data/test/index/{_1b.prx → _1z.prx} +0 -0
  15. data/spec/dummy/solr/data/test/index/{_1b.tii → _1z.tii} +0 -0
  16. data/spec/dummy/solr/data/test/index/{_1b.tis → _1z.tis} +0 -0
  17. data/spec/dummy/solr/data/test/index/segments.gen +0 -0
  18. data/spec/dummy/solr/data/test/index/{segments_2p → segments_41} +0 -0
  19. data/spec/fixtures/message_templates.yml +14 -15
  20. metadata +45 -71
checksums.yaml ADDED
@@ -0,0 +1,7 @@
1
+ ---
2
+ SHA1:
3
+ metadata.gz: 0bbe2db6f2ea6139210bf831bf091d5455861548
4
+ data.tar.gz: 477c65cc92f1fb4be90479e86b2a702d1a1e66a4
5
+ SHA512:
6
+ metadata.gz: 2e1abcdaad6886aa9f039efca2f428a93d358980c95c39be2bcec37352a2fe2dca439c2d427072f5fd1d598354af50675eb39be29f688ce1849201abd00a1ae9
7
+ data.tar.gz: 0fb76d5552b9dc610d498d730162e18a2405006ca74578dee2db53b918dbbbd841ab74c671d0c3a145408a44a8ca8d5fb36e8760194dd043dba538bbf2bd5f9a
data/app/models/enju_message/ability.rb ADDED
@@ -0,0 +1,32 @@
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 [:read, :update, :destroy], MessageRequest
10
+ can [:read, :update], MessageTemplate
11
+ when 'Librarian'
12
+ can [:index, :create], Message
13
+ can [:update], Message do |message|
14
+ message.sender == user
15
+ end
16
+ can [:show, :destroy], Message do |message|
17
+ message.receiver == user
18
+ end
19
+ can [:read, :update, :destroy], MessageRequest
20
+ can :read, MessageTemplate
21
+ when 'User'
22
+ can [:read, :destroy], Message do |message|
23
+ message.receiver == user
24
+ end
25
+ can :index, Message
26
+ can :show, Message do |message|
27
+ message.receiver == user
28
+ end
29
+ end
30
+ end
31
+ end
32
+ end
data/lib/enju_message/user.rb CHANGED
@@ -5,7 +5,7 @@ module EnjuMessage
5
5
  end
6
6
 
7
7
  module ClassMethods
8
- def enju_message_user
8
+ def enju_message_user_model
9
9
  include InstanceMethods
10
10
  has_many :sent_messages, :foreign_key => 'sender_id', :class_name => 'Message'
11
11
  has_many :received_messages, :foreign_key => 'receiver_id', :class_name => 'Message'
data/lib/enju_message/version.rb CHANGED
@@ -1,3 +1,3 @@
1
1
  module EnjuMessage
2
- VERSION = "0.1.14.pre3"
2
+ VERSION = "0.1.14.pre4"
3
3
  end
data/spec/controllers/message_templates_controller_spec.rb CHANGED
@@ -11,7 +11,7 @@ describe MessageTemplatesController do
11
11
 
12
12
  it "assigns all message_templates as @message_templates" do
13
13
  get :index
14
- assigns(:message_templates).should eq(MessageTemplate.all)
14
+ assigns(:message_templates).should eq(MessageTemplate.page(1))
15
15
  end
16
16
  end
17
17
 
@@ -20,7 +20,7 @@ describe MessageTemplatesController do
20
20
 
21
21
  it "assigns all message_templates as @message_templates" do
22
22
  get :index
23
- assigns(:message_templates).should eq(MessageTemplate.all)
23
+ assigns(:message_templates).should eq(MessageTemplate.page(1))
24
24
  end
25
25
  end
26
26
 
data/spec/dummy/app/models/ability.rb CHANGED
@@ -1,30 +1,32 @@
1
- class Ability
2
- include CanCan::Ability
3
-
4
- def initialize(user)
5
- case user.try(:role).try(:name)
6
- when 'Administrator'
7
- can :manage, Message
8
- can [:read, :update, :destroy], MessageRequest
9
- can [:read, :update], MessageTemplate
10
- when 'Librarian'
11
- can [:index, :create], Message
12
- can [:update], Message do |message|
13
- message.sender == user
14
- end
15
- can [:show, :destroy], Message do |message|
16
- message.receiver == user
17
- end
18
- can [:read, :update, :destroy], MessageRequest
19
- can :read, MessageTemplate
20
- when 'User'
21
- can [:read, :destroy], Message do |message|
22
- message.receiver == user
23
- end
24
- can :index, Message
25
- can :show, Message do |message|
26
- message.receiver == user
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 [:read, :update, :destroy], MessageRequest
10
+ can [:read, :update], MessageTemplate
11
+ when 'Librarian'
12
+ can [:index, :create], Message
13
+ can [:update], Message do |message|
14
+ message.sender == user
15
+ end
16
+ can [:show, :destroy], Message do |message|
17
+ message.receiver == user
18
+ end
19
+ can [:read, :update, :destroy], MessageRequest
20
+ can :read, MessageTemplate
21
+ when 'User'
22
+ can [:read, :destroy], Message do |message|
23
+ message.receiver == user
24
+ end
25
+ can :index, Message
26
+ can :show, Message do |message|
27
+ message.receiver == user
28
+ end
27
29
  end
28
30
  end
29
31
  end
30
- end
32
+ #end
data/spec/dummy/app/models/user.rb CHANGED
@@ -14,7 +14,7 @@ class User < ActiveRecord::Base
14
14
  belongs_to :required_role, :class_name => 'Role', :foreign_key => 'required_role_id'
15
15
  before_create :set_role_and_patron
16
16
 
17
- enju_message_user
17
+ enju_message_user_model
18
18
 
19
19
  extend FriendlyId
20
20
  friendly_id :username
data/spec/dummy/db/test.sqlite3 CHANGED
Binary file
data/spec/fixtures/message_templates.yml CHANGED
@@ -68,18 +68,17 @@ message_template_00010:
68
68
  body: Item received
69
69
  position: 10
70
70
  locale: ja
71
-
72
- # == Schema Information
73
- #
74
- # Table name: message_templates
75
- #
76
- # id :integer not null, primary key
77
- # status :string(255) not null
78
- # title :text not null
79
- # body :text not null
80
- # position :integer
81
- # locale :string(255) default("en")
82
- # created_at :datetime not null
83
- # updated_at :datetime not null
84
- #
85
-
71
+ message_template_00011:
72
+ id: 11
73
+ status: reservation_postponed_for_patron
74
+ title: Reservation postponed
75
+ body: Reservation postponed
76
+ position: 11
77
+ locale: ja
78
+ message_template_00012:
79
+ id: 12
80
+ status: reservation_postponed_for_library
81
+ title: Reservation postponed
82
+ body: Reservation postponed
83
+ position: 12
84
+ locale: ja
metadata CHANGED
@@ -1,20 +1,18 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: enju_message
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.1.14.pre3
5
- prerelease: 7
4
+ version: 0.1.14.pre4
6
5
  platform: ruby
7
6
  authors:
8
7
  - Kosuke Tanabe
9
8
  autorequire:
10
9
  bindir: bin
11
10
  cert_chain: []
12
- date: 2012-12-13 00:00:00.000000000 Z
11
+ date: 2013-03-13 00:00:00.000000000 Z
13
12
  dependencies:
14
13
  - !ruby/object:Gem::Dependency
15
14
  name: rails
16
15
  requirement: !ruby/object:Gem::Requirement
17
- none: false
18
16
  requirements:
19
17
  - - ~>
20
18
  - !ruby/object:Gem::Version
@@ -22,7 +20,6 @@ dependencies:
22
20
  type: :runtime
23
21
  prerelease: false
24
22
  version_requirements: !ruby/object:Gem::Requirement
25
- none: false
26
23
  requirements:
27
24
  - - ~>
28
25
  - !ruby/object:Gem::Version
@@ -30,23 +27,20 @@ dependencies:
30
27
  - !ruby/object:Gem::Dependency
31
28
  name: simple_form
32
29
  requirement: !ruby/object:Gem::Requirement
33
- none: false
34
30
  requirements:
35
- - - ! '>='
31
+ - - '>='
36
32
  - !ruby/object:Gem::Version
37
33
  version: '0'
38
34
  type: :runtime
39
35
  prerelease: false
40
36
  version_requirements: !ruby/object:Gem::Requirement
41
- none: false
42
37
  requirements:
43
- - - ! '>='
38
+ - - '>='
44
39
  - !ruby/object:Gem::Version
45
40
  version: '0'
46
41
  - !ruby/object:Gem::Dependency
47
42
  name: awesome_nested_set
48
43
  requirement: !ruby/object:Gem::Requirement
49
- none: false
50
44
  requirements:
51
45
  - - ~>
52
46
  - !ruby/object:Gem::Version
@@ -54,7 +48,6 @@ dependencies:
54
48
  type: :runtime
55
49
  prerelease: false
56
50
  version_requirements: !ruby/object:Gem::Requirement
57
- none: false
58
51
  requirements:
59
52
  - - ~>
60
53
  - !ruby/object:Gem::Version
@@ -62,131 +55,115 @@ dependencies:
62
55
  - !ruby/object:Gem::Dependency
63
56
  name: state_machine
64
57
  requirement: !ruby/object:Gem::Requirement
65
- none: false
66
58
  requirements:
67
- - - ! '>='
59
+ - - '>='
68
60
  - !ruby/object:Gem::Version
69
61
  version: '0'
70
62
  type: :runtime
71
63
  prerelease: false
72
64
  version_requirements: !ruby/object:Gem::Requirement
73
- none: false
74
65
  requirements:
75
- - - ! '>='
66
+ - - '>='
76
67
  - !ruby/object:Gem::Version
77
68
  version: '0'
78
69
  - !ruby/object:Gem::Dependency
79
70
  name: inherited_resources
80
71
  requirement: !ruby/object:Gem::Requirement
81
- none: false
82
72
  requirements:
83
- - - ! '>='
73
+ - - '>='
84
74
  - !ruby/object:Gem::Version
85
75
  version: '0'
86
76
  type: :runtime
87
77
  prerelease: false
88
78
  version_requirements: !ruby/object:Gem::Requirement
89
- none: false
90
79
  requirements:
91
- - - ! '>='
80
+ - - '>='
92
81
  - !ruby/object:Gem::Version
93
82
  version: '0'
94
83
  - !ruby/object:Gem::Dependency
95
84
  name: enju_core
96
85
  requirement: !ruby/object:Gem::Requirement
97
- none: false
98
86
  requirements:
99
87
  - - ~>
100
88
  - !ruby/object:Gem::Version
101
- version: 0.1.1.pre2
89
+ version: 0.1.1.pre3
102
90
  type: :runtime
103
91
  prerelease: false
104
92
  version_requirements: !ruby/object:Gem::Requirement
105
- none: false
106
93
  requirements:
107
94
  - - ~>
108
95
  - !ruby/object:Gem::Version
109
- version: 0.1.1.pre2
96
+ version: 0.1.1.pre3
110
97
  - !ruby/object:Gem::Dependency
111
98
  name: resque_mailer
112
99
  requirement: !ruby/object:Gem::Requirement
113
- none: false
114
100
  requirements:
115
- - - ! '>='
101
+ - - '>='
116
102
  - !ruby/object:Gem::Version
117
103
  version: '0'
118
104
  type: :runtime
119
105
  prerelease: false
120
106
  version_requirements: !ruby/object:Gem::Requirement
121
- none: false
122
107
  requirements:
123
- - - ! '>='
108
+ - - '>='
124
109
  - !ruby/object:Gem::Version
125
110
  version: '0'
126
111
  - !ruby/object:Gem::Dependency
127
112
  name: sqlite3
128
113
  requirement: !ruby/object:Gem::Requirement
129
- none: false
130
114
  requirements:
131
- - - ! '>='
115
+ - - '>='
132
116
  - !ruby/object:Gem::Version
133
117
  version: '0'
134
118
  type: :development
135
119
  prerelease: false
136
120
  version_requirements: !ruby/object:Gem::Requirement
137
- none: false
138
121
  requirements:
139
- - - ! '>='
122
+ - - '>='
140
123
  - !ruby/object:Gem::Version
141
124
  version: '0'
142
125
  - !ruby/object:Gem::Dependency
143
126
  name: rspec-rails
144
127
  requirement: !ruby/object:Gem::Requirement
145
- none: false
146
128
  requirements:
147
- - - ! '>='
129
+ - - '>='
148
130
  - !ruby/object:Gem::Version
149
131
  version: '0'
150
132
  type: :development
151
133
  prerelease: false
152
134
  version_requirements: !ruby/object:Gem::Requirement
153
- none: false
154
135
  requirements:
155
- - - ! '>='
136
+ - - '>='
156
137
  - !ruby/object:Gem::Version
157
138
  version: '0'
158
139
  - !ruby/object:Gem::Dependency
159
140
  name: factory_girl_rails
160
141
  requirement: !ruby/object:Gem::Requirement
161
- none: false
162
142
  requirements:
163
- - - ! '>='
143
+ - - '>='
164
144
  - !ruby/object:Gem::Version
165
145
  version: '0'
166
146
  type: :development
167
147
  prerelease: false
168
148
  version_requirements: !ruby/object:Gem::Requirement
169
- none: false
170
149
  requirements:
171
- - - ! '>='
150
+ - - '>='
172
151
  - !ruby/object:Gem::Version
173
152
  version: '0'
174
153
  - !ruby/object:Gem::Dependency
175
154
  name: sunspot_solr
176
155
  requirement: !ruby/object:Gem::Requirement
177
- none: false
178
156
  requirements:
179
157
  - - ~>
180
158
  - !ruby/object:Gem::Version
181
- version: 2.0.0.pre.120925
159
+ version: 2.0.0
182
160
  type: :development
183
161
  prerelease: false
184
162
  version_requirements: !ruby/object:Gem::Requirement
185
- none: false
186
163
  requirements:
187
164
  - - ~>
188
165
  - !ruby/object:Gem::Version
189
- version: 2.0.0.pre.120925
166
+ version: 2.0.0
190
167
  description: Message management for Next-L Enju
191
168
  email:
192
169
  - tanabe@mwr.mediacom.keio.ac.jp
@@ -198,6 +175,7 @@ files:
198
175
  - app/controllers/message_templates_controller.rb
199
176
  - app/controllers/messages_controller.rb
200
177
  - app/helpers/messages_helper.rb
178
+ - app/models/enju_message/ability.rb
201
179
  - app/models/message.rb
202
180
  - app/models/message_request.rb
203
181
  - app/models/message_template.rb
@@ -318,16 +296,16 @@ files:
318
296
  - spec/dummy/solr/conf/spellings.txt
319
297
  - spec/dummy/solr/conf/stopwords.txt
320
298
  - spec/dummy/solr/conf/synonyms.txt
321
- - spec/dummy/solr/data/test/index/_1b.fdt
322
- - spec/dummy/solr/data/test/index/_1b.fdx
323
- - spec/dummy/solr/data/test/index/_1b.fnm
324
- - spec/dummy/solr/data/test/index/_1b.frq
325
- - spec/dummy/solr/data/test/index/_1b.nrm
326
- - spec/dummy/solr/data/test/index/_1b.prx
327
- - spec/dummy/solr/data/test/index/_1b.tii
328
- - spec/dummy/solr/data/test/index/_1b.tis
299
+ - spec/dummy/solr/data/test/index/_1z.fdt
300
+ - spec/dummy/solr/data/test/index/_1z.fdx
301
+ - spec/dummy/solr/data/test/index/_1z.fnm
302
+ - spec/dummy/solr/data/test/index/_1z.frq
303
+ - spec/dummy/solr/data/test/index/_1z.nrm
304
+ - spec/dummy/solr/data/test/index/_1z.prx
305
+ - spec/dummy/solr/data/test/index/_1z.tii
306
+ - spec/dummy/solr/data/test/index/_1z.tis
329
307
  - spec/dummy/solr/data/test/index/segments.gen
330
- - spec/dummy/solr/data/test/index/segments_2p
308
+ - spec/dummy/solr/data/test/index/segments_41
331
309
  - spec/dummy/solr/data/test/spellchecker/segments.gen
332
310
  - spec/dummy/solr/data/test/spellchecker/segments_1
333
311
  - spec/factories/message.rb
@@ -349,32 +327,28 @@ files:
349
327
  - spec/spec_helper.rb
350
328
  - spec/support/controller_macros.rb
351
329
  - spec/support/devise.rb
352
- homepage: https://github.com/nabeta/enju_message
330
+ homepage: https://github.com/next-l/enju_message
353
331
  licenses: []
332
+ metadata: {}
354
333
  post_install_message:
355
334
  rdoc_options: []
356
335
  require_paths:
357
336
  - lib
358
337
  required_ruby_version: !ruby/object:Gem::Requirement
359
- none: false
360
338
  requirements:
361
- - - ! '>='
339
+ - - '>='
362
340
  - !ruby/object:Gem::Version
363
341
  version: '0'
364
- segments:
365
- - 0
366
- hash: 3990901655970059189
367
342
  required_rubygems_version: !ruby/object:Gem::Requirement
368
- none: false
369
343
  requirements:
370
- - - ! '>'
344
+ - - '>'
371
345
  - !ruby/object:Gem::Version
372
346
  version: 1.3.1
373
347
  requirements: []
374
348
  rubyforge_project:
375
- rubygems_version: 1.8.23
349
+ rubygems_version: 2.0.0
376
350
  signing_key:
377
- specification_version: 3
351
+ specification_version: 4
378
352
  summary: enju_message plugin
379
353
  test_files:
380
354
  - spec/controllers/message_requests_controller_spec.rb
@@ -457,16 +431,16 @@ test_files:
457
431
  - spec/dummy/solr/conf/spellings.txt
458
432
  - spec/dummy/solr/conf/stopwords.txt
459
433
  - spec/dummy/solr/conf/synonyms.txt
460
- - spec/dummy/solr/data/test/index/_1b.fdt
461
- - spec/dummy/solr/data/test/index/_1b.fdx
462
- - spec/dummy/solr/data/test/index/_1b.fnm
463
- - spec/dummy/solr/data/test/index/_1b.frq
464
- - spec/dummy/solr/data/test/index/_1b.nrm
465
- - spec/dummy/solr/data/test/index/_1b.prx
466
- - spec/dummy/solr/data/test/index/_1b.tii
467
- - spec/dummy/solr/data/test/index/_1b.tis
434
+ - spec/dummy/solr/data/test/index/_1z.fdt
435
+ - spec/dummy/solr/data/test/index/_1z.fdx
436
+ - spec/dummy/solr/data/test/index/_1z.fnm
437
+ - spec/dummy/solr/data/test/index/_1z.frq
438
+ - spec/dummy/solr/data/test/index/_1z.nrm
439
+ - spec/dummy/solr/data/test/index/_1z.prx
440
+ - spec/dummy/solr/data/test/index/_1z.tii
441
+ - spec/dummy/solr/data/test/index/_1z.tis
468
442
  - spec/dummy/solr/data/test/index/segments.gen
469
- - spec/dummy/solr/data/test/index/segments_2p
443
+ - spec/dummy/solr/data/test/index/segments_41
470
444
  - spec/dummy/solr/data/test/spellchecker/segments.gen
471
445
  - spec/dummy/solr/data/test/spellchecker/segments_1
472
446
  - spec/factories/message.rb