enju_message 0.0.24 → 0.0.25

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 (31) hide show
  1. data/app/views/checked_items/_checkouts.html.erb +1 -1
  2. data/app/views/checked_items/_list.html.erb +1 -1
  3. data/app/views/checkins/_list.html.erb +1 -1
  4. data/app/views/checkouts/_list.html.erb +1 -1
  5. data/app/views/checkouts/edit.html.erb +1 -1
  6. data/app/views/checkouts/show.html.erb +1 -1
  7. data/app/views/lending_policies/show.html.erb +1 -1
  8. data/app/views/reserves/index.html.erb +1 -1
  9. data/app/views/reserves/show.html.erb +1 -1
  10. data/lib/enju_message/version.rb +1 -1
  11. data/spec/controllers/messages_controller_spec.rb +4 -0
  12. data/spec/dummy/db/migrate/20111201155513_add_devise_to_users.rb +31 -10
  13. data/spec/dummy/db/schema.rb +14 -5
  14. data/spec/dummy/db/test.sqlite3 +0 -0
  15. data/spec/dummy/solr/data/test/index/_f.fdt +0 -0
  16. data/spec/dummy/solr/data/test/index/_f.fdx +0 -0
  17. data/spec/dummy/solr/data/test/index/{_0.fnm → _f.fnm} +1 -1
  18. data/spec/dummy/solr/data/test/index/_f.tis +0 -0
  19. data/spec/dummy/solr/data/test/index/segments.gen +0 -0
  20. data/spec/dummy/solr/data/test/index/segments_x +0 -0
  21. data/spec/dummy/solr/data/test/spellchecker/segments_1 +0 -0
  22. data/spec/spec_helper.rb +1 -1
  23. metadata +24 -24
  24. data/spec/dummy/solr/data/test/index/_0.fdt +0 -0
  25. data/spec/dummy/solr/data/test/index/_0.fdx +0 -0
  26. data/spec/dummy/solr/data/test/index/_0.tis +0 -0
  27. data/spec/dummy/solr/data/test/index/segments_2 +0 -0
  28. /data/spec/dummy/solr/data/test/index/{_0.frq → _f.frq} +0 -0
  29. /data/spec/dummy/solr/data/test/index/{_0.nrm → _f.nrm} +0 -0
  30. /data/spec/dummy/solr/data/test/index/{_0.prx → _f.prx} +0 -0
  31. /data/spec/dummy/solr/data/test/index/{_0.tii → _f.tii} +0 -0
@@ -14,7 +14,7 @@
14
14
  <%= render 'manifestations/holding', :manifestation => checkout.item.manifestation -%>
15
15
  </td>
16
16
  <td><%= link_to checkout.item.item_identifier, checkout.item -%></td>
17
- <td><%= l(checkout.due_date, :format => :only_date) -%></td>
17
+ <td><%= l(checkout.due_date, :formats => :only_date) -%></td>
18
18
  </tr>
19
19
  <%- end -%>
20
20
  </table>
@@ -26,7 +26,7 @@
26
26
  <%= render 'manifestations/show_index', :manifestation => checked_item.item.manifestation -%>
27
27
  </td>
28
28
  <td><%= link_to checked_item.item.item_identifier, checked_item.item -%></td>
29
- <td><%= l(checked_item.due_date, :format => :only_date) -%></td>
29
+ <td><%= l(checked_item.due_date, :formats => :only_date) -%></td>
30
30
  <td><%= link_to t('page.destroy'), checked_item, :confirm => t('page.are_you_sure'), :method => :delete -%></td>
31
31
  </tr>
32
32
  <%- end -%>
@@ -36,7 +36,7 @@
36
36
  </td>
37
37
  <td>
38
38
  <%- if checkin.checkout -%>
39
- <%= l(checkin.checkout.due_date, :format => :only_date) -%>
39
+ <%= l(checkin.checkout.due_date, :formats => :only_date) -%>
40
40
  <%- end -%>
41
41
  </td>
42
42
  <td>
@@ -21,7 +21,7 @@
21
21
  (<%= link_to checkout.item.item_identifier, checkout.item -%>)
22
22
  </td>
23
23
  <td>
24
- <%= l(checkout.due_date, :format => :only_date) -%>
24
+ <%= l(checkout.due_date, :formats => :only_date) -%>
25
25
  <br />
26
26
  <% if checkout.checkin %>
27
27
  <strong><%= t('checkout.returned') %></strong>
@@ -7,7 +7,7 @@
7
7
  <h3><%= t('checkout.renewal') -%></h3>
8
8
  <%- if @checkout.checkout_renewable? -%>
9
9
  <%= form_for(@checkout) do |f| -%>
10
- <%= t('checkout.new_due_date') -%>: <%= l(@new_due_date, :format => :only_date) if @new_due_date -%>
10
+ <%= t('checkout.new_due_date') -%>: <%= l(@new_due_date, :formats => :only_date) if @new_due_date -%>
11
11
  <%= f.hidden_field :due_date, :value => @new_due_date -%>
12
12
  <br />
13
13
  <%= f.submit %>
@@ -10,7 +10,7 @@
10
10
  </p>
11
11
  <p>
12
12
  <strong><%= t('activerecord.attributes.checkout.due_date') -%></strong><br />
13
- <%= l(@checkout.due_date, :format => :only_date) if @checkout.due_date -%>
13
+ <%= l(@checkout.due_date, :formats => :only_date) if @checkout.due_date -%>
14
14
  </p>
15
15
  <%- if can? :destroy, @checkout -%>
16
16
  <p>
@@ -21,7 +21,7 @@
21
21
 
22
22
  <p>
23
23
  <strong><%= t('activerecord.attributes.lending_policy.fixed_due_date') -%>:</strong>
24
- <%= l(@lending_policy.fixed_due_date, :format => :only_date) if @lending_policy.fixed_due_date -%>
24
+ <%= l(@lending_policy.fixed_due_date, :formats => :only_date) if @lending_policy.fixed_due_date -%>
25
25
  </p>
26
26
 
27
27
  <p>
@@ -22,7 +22,7 @@
22
22
  <%= render 'title', :reserve => reserve -%>
23
23
  </td>
24
24
  <td><%= i18n_state(reserve.state) -%></td>
25
- <td><%= l(reserve.expired_at, :format => :only_date) -%></td>
25
+ <td><%= l(reserve.expired_at, :formats => :only_date) -%></td>
26
26
  <%- if can? :destroy, reserve -%>
27
27
  <td>
28
28
  <%= link_to t('page.edit'), edit_reserve_path(reserve) -%>
@@ -33,7 +33,7 @@
33
33
 
34
34
  <p>
35
35
  <strong><%= t('activerecord.attributes.reserve.expired_at') -%>:</strong>
36
- <%= l(@reserve.expired_at, :format => :only_date) if @reserve.expired_at -%>
36
+ <%= l(@reserve.expired_at, :formats => :only_date) if @reserve.expired_at -%>
37
37
  </p>
38
38
 
39
39
  <p>
@@ -1,3 +1,3 @@
1
1
  module EnjuMessage
2
- VERSION = "0.0.24"
2
+ VERSION = "0.0.25"
3
3
  end
@@ -4,6 +4,10 @@ describe MessagesController do
4
4
  fixtures :all
5
5
 
6
6
  describe "GET index", :solr => true do
7
+ before do
8
+ Message.reindex
9
+ end
10
+
7
11
  describe "When logged in as Administrator" do
8
12
  before(:each) do
9
13
  @user = FactoryGirl.create(:admin)
@@ -1,19 +1,40 @@
1
1
  class AddDeviseToUsers < ActiveRecord::Migration
2
2
  def self.up
3
3
  change_table(:users) do |t|
4
- t.database_authenticatable :null => false
5
- t.recoverable
6
- t.rememberable
7
- t.trackable
4
+ ## Database authenticatable
5
+ t.string :email, :null => false, :default => ""
6
+ t.string :encrypted_password, :null => false, :default => ""
8
7
 
9
- # t.encryptable
10
- # t.confirmable
11
- # t.lockable :lock_strategy => :failed_attempts, :unlock_strategy => :both
12
- # t.token_authenticatable
8
+ ## Recoverable
9
+ t.string :reset_password_token
10
+ t.datetime :reset_password_sent_at
13
11
 
12
+ ## Rememberable
13
+ t.datetime :remember_created_at
14
14
 
15
- # Uncomment below if timestamps were not included in your original model.
16
- # t.timestamps
15
+ ## Trackable
16
+ t.integer :sign_in_count, :default => 0
17
+ t.datetime :current_sign_in_at
18
+ t.datetime :last_sign_in_at
19
+ t.string :current_sign_in_ip
20
+ t.string :last_sign_in_ip
21
+
22
+ ## Encryptable
23
+ t.string :password_salt
24
+
25
+ ## Confirmable
26
+ t.string :confirmation_token
27
+ t.datetime :confirmed_at
28
+ t.datetime :confirmation_sent_at
29
+ t.string :unconfirmed_email # Only if using reconfirmable
30
+
31
+ ## Lockable
32
+ t.integer :failed_attempts, :default => 0 # Only if lock strategy is :failed_attempts
33
+ t.string :unlock_token # Only if unlock strategy is :email or :both
34
+ t.datetime :locked_at
35
+
36
+ # Token authenticatable
37
+ t.string :authentication_token
17
38
  end
18
39
 
19
40
  add_index :users, :email #, :unique => true
@@ -207,18 +207,27 @@ ActiveRecord::Schema.define(:version => 20120213092115) do
207
207
  t.text "note"
208
208
  t.string "locale"
209
209
  t.string "user_number"
210
- t.datetime "created_at", :null => false
211
- t.datetime "updated_at", :null => false
212
- t.string "email", :default => "", :null => false
213
- t.string "encrypted_password", :limit => 128, :default => "", :null => false
210
+ t.datetime "created_at", :null => false
211
+ t.datetime "updated_at", :null => false
212
+ t.string "email", :default => "", :null => false
213
+ t.string "encrypted_password", :default => "", :null => false
214
214
  t.string "reset_password_token"
215
215
  t.datetime "reset_password_sent_at"
216
216
  t.datetime "remember_created_at"
217
- t.integer "sign_in_count", :default => 0
217
+ t.integer "sign_in_count", :default => 0
218
218
  t.datetime "current_sign_in_at"
219
219
  t.datetime "last_sign_in_at"
220
220
  t.string "current_sign_in_ip"
221
221
  t.string "last_sign_in_ip"
222
+ t.string "password_salt"
223
+ t.string "confirmation_token"
224
+ t.datetime "confirmed_at"
225
+ t.datetime "confirmation_sent_at"
226
+ t.string "unconfirmed_email"
227
+ t.integer "failed_attempts", :default => 0
228
+ t.string "unlock_token"
229
+ t.datetime "locked_at"
230
+ t.string "authentication_token"
222
231
  end
223
232
 
224
233
  add_index "users", ["email"], :name => "index_users_on_email"
Binary file
@@ -1,3 +1,3 @@
1
- ����
1
+ ����
2
2
  idtype
3
3
  class_name subject_s
data/spec/spec_helper.rb CHANGED
@@ -38,7 +38,7 @@ RSpec.configure do |config|
38
38
  config.before :each, :solr => true do
39
39
  Sunspot::Rails::Tester.start_original_sunspot_session
40
40
  Sunspot.session = $original_sunspot_session
41
- #Sunspot.remove_all!
41
+ Sunspot.remove_all!
42
42
  end
43
43
  end
44
44
 
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.24
4
+ version: 0.0.25
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-06-22 00:00:00.000000000 Z
12
+ date: 2012-07-21 00:00:00.000000000 Z
13
13
  dependencies:
14
14
  - !ruby/object:Gem::Dependency
15
15
  name: rails
@@ -192,17 +192,17 @@ dependencies:
192
192
  requirement: !ruby/object:Gem::Requirement
193
193
  none: false
194
194
  requirements:
195
- - - ! '>='
195
+ - - ~>
196
196
  - !ruby/object:Gem::Version
197
- version: '0'
197
+ version: 2.0.0.pre.120720
198
198
  type: :development
199
199
  prerelease: false
200
200
  version_requirements: !ruby/object:Gem::Requirement
201
201
  none: false
202
202
  requirements:
203
- - - ! '>='
203
+ - - ~>
204
204
  - !ruby/object:Gem::Version
205
- version: '0'
205
+ version: 2.0.0.pre.120720
206
206
  description: Message management for Next-L Enju
207
207
  email:
208
208
  - tanabe@mwr.mediacom.keio.ac.jp
@@ -449,16 +449,16 @@ files:
449
449
  - spec/dummy/solr/conf/spellings.txt
450
450
  - spec/dummy/solr/conf/stopwords.txt
451
451
  - spec/dummy/solr/conf/synonyms.txt
452
- - spec/dummy/solr/data/test/index/_0.fdt
453
- - spec/dummy/solr/data/test/index/_0.fdx
454
- - spec/dummy/solr/data/test/index/_0.fnm
455
- - spec/dummy/solr/data/test/index/_0.frq
456
- - spec/dummy/solr/data/test/index/_0.nrm
457
- - spec/dummy/solr/data/test/index/_0.prx
458
- - spec/dummy/solr/data/test/index/_0.tii
459
- - spec/dummy/solr/data/test/index/_0.tis
452
+ - spec/dummy/solr/data/test/index/_f.fdt
453
+ - spec/dummy/solr/data/test/index/_f.fdx
454
+ - spec/dummy/solr/data/test/index/_f.fnm
455
+ - spec/dummy/solr/data/test/index/_f.frq
456
+ - spec/dummy/solr/data/test/index/_f.nrm
457
+ - spec/dummy/solr/data/test/index/_f.prx
458
+ - spec/dummy/solr/data/test/index/_f.tii
459
+ - spec/dummy/solr/data/test/index/_f.tis
460
460
  - spec/dummy/solr/data/test/index/segments.gen
461
- - spec/dummy/solr/data/test/index/segments_2
461
+ - spec/dummy/solr/data/test/index/segments_x
462
462
  - spec/dummy/solr/data/test/spellchecker/segments.gen
463
463
  - spec/dummy/solr/data/test/spellchecker/segments_1
464
464
  - spec/factories/message.rb
@@ -582,16 +582,16 @@ test_files:
582
582
  - spec/dummy/solr/conf/spellings.txt
583
583
  - spec/dummy/solr/conf/stopwords.txt
584
584
  - spec/dummy/solr/conf/synonyms.txt
585
- - spec/dummy/solr/data/test/index/_0.fdt
586
- - spec/dummy/solr/data/test/index/_0.fdx
587
- - spec/dummy/solr/data/test/index/_0.fnm
588
- - spec/dummy/solr/data/test/index/_0.frq
589
- - spec/dummy/solr/data/test/index/_0.nrm
590
- - spec/dummy/solr/data/test/index/_0.prx
591
- - spec/dummy/solr/data/test/index/_0.tii
592
- - spec/dummy/solr/data/test/index/_0.tis
585
+ - spec/dummy/solr/data/test/index/_f.fdt
586
+ - spec/dummy/solr/data/test/index/_f.fdx
587
+ - spec/dummy/solr/data/test/index/_f.fnm
588
+ - spec/dummy/solr/data/test/index/_f.frq
589
+ - spec/dummy/solr/data/test/index/_f.nrm
590
+ - spec/dummy/solr/data/test/index/_f.prx
591
+ - spec/dummy/solr/data/test/index/_f.tii
592
+ - spec/dummy/solr/data/test/index/_f.tis
593
593
  - spec/dummy/solr/data/test/index/segments.gen
594
- - spec/dummy/solr/data/test/index/segments_2
594
+ - spec/dummy/solr/data/test/index/segments_x
595
595
  - spec/dummy/solr/data/test/spellchecker/segments.gen
596
596
  - spec/dummy/solr/data/test/spellchecker/segments_1
597
597
  - spec/factories/message.rb
Binary file
Binary file
Binary file
File without changes
File without changes
File without changes
File without changes