enju_message 0.0.24 → 0.0.25

data/app/views/checked_items/_checkouts.html.erb

@@ -14,7 +14,7 @@
         <%= render 'manifestations/holding', :manifestation => checkout.item.manifestation -%>
       </td>
       <td><%= link_to checkout.item.item_identifier, checkout.item -%></td>
-      <td><%= l(checkout.due_date, :format => :only_date) -%></td>
+      <td><%= l(checkout.due_date, :formats => :only_date) -%></td>
     </tr>
   <%- end -%>
 </table>

data/app/views/checked_items/_list.html.erb

@@ -26,7 +26,7 @@
       <%= render 'manifestations/show_index', :manifestation => checked_item.item.manifestation -%>
     </td>
     <td><%= link_to checked_item.item.item_identifier, checked_item.item -%></td>
-    <td><%= l(checked_item.due_date, :format => :only_date) -%></td>
+    <td><%= l(checked_item.due_date, :formats => :only_date) -%></td>
     <td><%= link_to t('page.destroy'), checked_item, :confirm => t('page.are_you_sure'), :method => :delete -%></td>
   </tr>
 <%- end -%>

data/app/views/checkins/_list.html.erb

@@ -36,7 +36,7 @@
     </td>
     <td>
       <%- if checkin.checkout -%>
-        <%= l(checkin.checkout.due_date, :format => :only_date) -%>
+        <%= l(checkin.checkout.due_date, :formats => :only_date) -%>
       <%- end -%>
     </td>
     <td>

data/app/views/checkouts/_list.html.erb

@@ -21,7 +21,7 @@
       (<%= link_to checkout.item.item_identifier, checkout.item -%>)
     </td>
     <td>
-      <%= l(checkout.due_date, :format => :only_date) -%>
+      <%= l(checkout.due_date, :formats => :only_date) -%>
       <br />
       <% if checkout.checkin %>
         <strong><%= t('checkout.returned') %></strong>

data/app/views/checkouts/edit.html.erb

@@ -7,7 +7,7 @@
 <h3><%= t('checkout.renewal') -%></h3>
 <%- if @checkout.checkout_renewable? -%>
   <%= form_for(@checkout) do |f| -%>
-    <%= t('checkout.new_due_date') -%>: <%= l(@new_due_date, :format => :only_date) if @new_due_date -%>
+    <%= t('checkout.new_due_date') -%>: <%= l(@new_due_date, :formats => :only_date) if @new_due_date -%>
     <%= f.hidden_field :due_date, :value => @new_due_date -%>
     <br />
     <%= f.submit %>

data/app/views/checkouts/show.html.erb

@@ -10,7 +10,7 @@
   </p>
   <p>
     <strong><%= t('activerecord.attributes.checkout.due_date') -%></strong><br />
-    <%= l(@checkout.due_date, :format => :only_date) if @checkout.due_date -%>
+    <%= l(@checkout.due_date, :formats => :only_date) if @checkout.due_date -%>
   </p>
   <%- if can? :destroy, @checkout -%>
     <p>

data/app/views/lending_policies/show.html.erb

@@ -21,7 +21,7 @@
 
 <p>
   <strong><%= t('activerecord.attributes.lending_policy.fixed_due_date') -%>:</strong>
-  <%= l(@lending_policy.fixed_due_date, :format => :only_date) if @lending_policy.fixed_due_date -%>
+  <%= l(@lending_policy.fixed_due_date, :formats => :only_date) if @lending_policy.fixed_due_date -%>
 </p>
 
 <p>

data/app/views/reserves/index.html.erb

@@ -22,7 +22,7 @@
       <%= render 'title', :reserve => reserve -%>
     </td>
     <td><%= i18n_state(reserve.state) -%></td>
-    <td><%= l(reserve.expired_at, :format => :only_date) -%></td>
+    <td><%= l(reserve.expired_at, :formats => :only_date) -%></td>
     <%- if can? :destroy, reserve -%>
       <td>
         <%= link_to t('page.edit'), edit_reserve_path(reserve) -%>

data/app/views/reserves/show.html.erb

@@ -33,7 +33,7 @@
 
 <p>
   <strong><%= t('activerecord.attributes.reserve.expired_at') -%>:</strong>
-  <%= l(@reserve.expired_at, :format => :only_date) if @reserve.expired_at -%>
+  <%= l(@reserve.expired_at, :formats => :only_date) if @reserve.expired_at -%>
 </p>
 
 <p>

data/lib/enju_message/version.rb

@@ -1,3 +1,3 @@
 module EnjuMessage
-  VERSION = "0.0.24"
+  VERSION = "0.0.25"
 end

data/spec/controllers/messages_controller_spec.rb

@@ -4,6 +4,10 @@ describe MessagesController do
   fixtures :all
 
   describe "GET index", :solr => true do
+    before do
+      Message.reindex
+    end
+
     describe "When logged in as Administrator" do
       before(:each) do
         @user = FactoryGirl.create(:admin)

data/spec/dummy/db/migrate/20111201155513_add_devise_to_users.rb

@@ -1,19 +1,40 @@
 class AddDeviseToUsers < ActiveRecord::Migration
   def self.up
     change_table(:users) do |t|
-      t.database_authenticatable :null => false
-      t.recoverable
-      t.rememberable
-      t.trackable
+      ## Database authenticatable
+      t.string :email,              :null => false, :default => ""
+      t.string :encrypted_password, :null => false, :default => ""
 
-      # t.encryptable
-      # t.confirmable
-      # t.lockable :lock_strategy => :failed_attempts, :unlock_strategy => :both
-      # t.token_authenticatable
+      ## Recoverable
+      t.string   :reset_password_token
+      t.datetime :reset_password_sent_at
 
+      ## Rememberable
+      t.datetime :remember_created_at
 
-      # Uncomment below if timestamps were not included in your original model.
-      # t.timestamps
+      ## Trackable
+      t.integer  :sign_in_count, :default => 0
+      t.datetime :current_sign_in_at
+      t.datetime :last_sign_in_at
+      t.string   :current_sign_in_ip
+      t.string   :last_sign_in_ip
+
+      ## Encryptable
+      t.string :password_salt
+
+      ## Confirmable
+      t.string   :confirmation_token
+      t.datetime :confirmed_at
+      t.datetime :confirmation_sent_at
+      t.string   :unconfirmed_email # Only if using reconfirmable
+
+      ## Lockable
+      t.integer  :failed_attempts, :default => 0 # Only if lock strategy is :failed_attempts
+      t.string   :unlock_token # Only if unlock strategy is :email or :both
+      t.datetime :locked_at
+
+      # Token authenticatable
+      t.string :authentication_token
     end
 
     add_index :users, :email #,                :unique => true

data/spec/dummy/db/schema.rb

@@ -207,18 +207,27 @@ ActiveRecord::Schema.define(:version => 20120213092115) do
     t.text     "note"
     t.string   "locale"
     t.string   "user_number"
-    t.datetime "created_at",                                            :null => false
-    t.datetime "updated_at",                                            :null => false
-    t.string   "email",                                 :default => "", :null => false
-    t.string   "encrypted_password",     :limit => 128, :default => "", :null => false
+    t.datetime "created_at",                             :null => false
+    t.datetime "updated_at",                             :null => false
+    t.string   "email",                  :default => "", :null => false
+    t.string   "encrypted_password",     :default => "", :null => false
     t.string   "reset_password_token"
     t.datetime "reset_password_sent_at"
     t.datetime "remember_created_at"
-    t.integer  "sign_in_count",                         :default => 0
+    t.integer  "sign_in_count",          :default => 0
     t.datetime "current_sign_in_at"
     t.datetime "last_sign_in_at"
     t.string   "current_sign_in_ip"
     t.string   "last_sign_in_ip"
+    t.string   "password_salt"
+    t.string   "confirmation_token"
+    t.datetime "confirmed_at"
+    t.datetime "confirmation_sent_at"
+    t.string   "unconfirmed_email"
+    t.integer  "failed_attempts",        :default => 0
+    t.string   "unlock_token"
+    t.datetime "locked_at"
+    t.string   "authentication_token"
   end
 
   add_index "users", ["email"], :name => "index_users_on_email"

data/spec/dummy/solr/data/test/index/{_0.fnm → _f.fnm}

@@ -1,3 +1,3 @@
-����
+����
 idtype
 class_name	subject_s

data/spec/spec_helper.rb

@@ -38,7 +38,7 @@ RSpec.configure do |config|
   config.before :each, :solr => true do
     Sunspot::Rails::Tester.start_original_sunspot_session
     Sunspot.session = $original_sunspot_session
-    #Sunspot.remove_all!
+    Sunspot.remove_all!
   end
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: enju_message
 version: !ruby/object:Gem::Version
-  version: 0.0.24
+  version: 0.0.25
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-06-22 00:00:00.000000000 Z
+date: 2012-07-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -192,17 +192,17 @@ dependencies:
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.0.0.pre.120720
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.0.0.pre.120720
 description: Message management for Next-L Enju
 email:
 - tanabe@mwr.mediacom.keio.ac.jp
@@ -449,16 +449,16 @@ files:
 - spec/dummy/solr/conf/spellings.txt
 - spec/dummy/solr/conf/stopwords.txt
 - spec/dummy/solr/conf/synonyms.txt
-- spec/dummy/solr/data/test/index/_0.fdt
-- spec/dummy/solr/data/test/index/_0.fdx
-- spec/dummy/solr/data/test/index/_0.fnm
-- spec/dummy/solr/data/test/index/_0.frq
-- spec/dummy/solr/data/test/index/_0.nrm
-- spec/dummy/solr/data/test/index/_0.prx
-- spec/dummy/solr/data/test/index/_0.tii
-- spec/dummy/solr/data/test/index/_0.tis
+- spec/dummy/solr/data/test/index/_f.fdt
+- spec/dummy/solr/data/test/index/_f.fdx
+- spec/dummy/solr/data/test/index/_f.fnm
+- spec/dummy/solr/data/test/index/_f.frq
+- spec/dummy/solr/data/test/index/_f.nrm
+- spec/dummy/solr/data/test/index/_f.prx
+- spec/dummy/solr/data/test/index/_f.tii
+- spec/dummy/solr/data/test/index/_f.tis
 - spec/dummy/solr/data/test/index/segments.gen
-- spec/dummy/solr/data/test/index/segments_2
+- spec/dummy/solr/data/test/index/segments_x
 - spec/dummy/solr/data/test/spellchecker/segments.gen
 - spec/dummy/solr/data/test/spellchecker/segments_1
 - spec/factories/message.rb
@@ -582,16 +582,16 @@ test_files:
 - spec/dummy/solr/conf/spellings.txt
 - spec/dummy/solr/conf/stopwords.txt
 - spec/dummy/solr/conf/synonyms.txt
-- spec/dummy/solr/data/test/index/_0.fdt
-- spec/dummy/solr/data/test/index/_0.fdx
-- spec/dummy/solr/data/test/index/_0.fnm
-- spec/dummy/solr/data/test/index/_0.frq
-- spec/dummy/solr/data/test/index/_0.nrm
-- spec/dummy/solr/data/test/index/_0.prx
-- spec/dummy/solr/data/test/index/_0.tii
-- spec/dummy/solr/data/test/index/_0.tis
+- spec/dummy/solr/data/test/index/_f.fdt
+- spec/dummy/solr/data/test/index/_f.fdx
+- spec/dummy/solr/data/test/index/_f.fnm
+- spec/dummy/solr/data/test/index/_f.frq
+- spec/dummy/solr/data/test/index/_f.nrm
+- spec/dummy/solr/data/test/index/_f.prx
+- spec/dummy/solr/data/test/index/_f.tii
+- spec/dummy/solr/data/test/index/_f.tis
 - spec/dummy/solr/data/test/index/segments.gen
-- spec/dummy/solr/data/test/index/segments_2
+- spec/dummy/solr/data/test/index/segments_x
 - spec/dummy/solr/data/test/spellchecker/segments.gen
 - spec/dummy/solr/data/test/spellchecker/segments_1
 - spec/factories/message.rb