enju_message 0.1.9 → 0.1.11

data/README.rdoc

@@ -1,3 +1,3 @@
-= EnjuMessage
+= EnjuMessage {<img src="https://secure.travis-ci.org/nabeta/enju_message.png?branch=master" alt="Build Status" />}[http://travis-ci.org/nabeta/enju_message]
 
-This project rocks and uses MIT-LICENSE.
+This project rocks and uses MIT-LICENSE.

data/app/models/message.rb

@@ -51,7 +51,7 @@ class Message < ActiveRecord::Base
   end
 
   def send_notification
-    Notifier.delay.message_notification(self) if receiver.try(:email).present?
+    Notifier.message_notification(id).deliver if receiver.try(:email).present?
   end
 
   def read

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/message_requests/index.html.erb

@@ -2,7 +2,7 @@
 <h1 class="title"><%= t('page.listing', :model => t('activerecord.models.message_request')) -%></h1>
 <div id="content_list">
 
-<table class="index">
+<table class="table table-striped index">
   <tr>
     <th>
       <%= t('message.sender') -%>

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

@@ -2,7 +2,7 @@
 <h1 class="title"><%= t('page.listing', :model => t('activerecord.models.message_template')) -%></h1>
 <div id="content_list">
 
-<table class="index">
+<table class="table table-striped index">
   <tr>
     <th id="position"></th>
     <th><%= t('activerecord.attributes.message_template.status') -%></th>

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

@@ -9,7 +9,7 @@
 <%- end -%>
 
 <%= form_for :message, :url => destroy_selected_messages_path do |form| -%>
-  <table class="index">
+  <table class="table table-striped index">
     <tr>
       <th></th>
       <th><%= t('activerecord.attributes.message.subject') -%></th>

data/app/views/notifier/message_notification.en.text.erb

@@ -1,4 +1,4 @@
-<%= @message.receiver.patron.full_name -%> :
+<%= @message.receiver.full_name -%> :
 
 A new message arrived from <%= @sender_name -%>.
 <%= messages_url %>

data/app/views/notifier/message_notification.ja.text.erb

@@ -1,4 +1,4 @@
-<%= @message.receiver.patron.full_name -%> さん
+<%= @message.receiver.full_name -%> さん
 
 <%= @sender_name -%> さんから新しいメッセージが届きました。
 <%= messages_url %>

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/engine.rb

@@ -1,9 +1,8 @@
 require 'enju_core'
-require 'configatron'
-require 'delayed_job_active_record'
 require 'state_machine'
 require 'inherited_resources'
 require 'awesome_nested_set'
+require 'resque_mailer'
 
 module EnjuMessage
   class Engine < ::Rails::Engine

data/lib/enju_message/version.rb

@@ -1,3 +1,3 @@
 module EnjuMessage
-  VERSION = "0.1.9"
+  VERSION = "0.1.11"
 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/app/mailers/notifier.rb

@@ -1,14 +1,16 @@
 class Notifier < ActionMailer::Base
+  include Resque::Mailer
   if LibraryGroup.site_config.try(:url)
     uri = Addressable::URI.parse(LibraryGroup.site_config.url)
     default_url_options[:host] = uri.host
-    default_url_options[:port] = uri.port if configatron.enju.web_port_number != 80
+    default_url_options[:port] = uri.port
   else
-    default_url_options[:host] = configatron.enju.web_hostname
-    default_url_options[:port] = configatron.enju.web_port_number if configatron.enju.web_port_number != 80
+    default_url_options[:host] = 'library.example.jp'
+    default_url_options[:port] = 80
   end
 
-  def message_notification(message)
+  def message_notification(message_id)
+    message = Message.find(message_id)
     I18n.locale = message.receiver.locale.try(:to_sym) || I18n.default_locale
     from = "#{LibraryGroup.system_name(message.receiver.locale)} <#{LibraryGroup.site_config.email}>"
     if message.subject
@@ -17,7 +19,7 @@ class Notifier < ActionMailer::Base
       subject = I18n.t('message.new_message_from_library', :library => LibraryGroup.system_name(message.receiver.user.locale))
     end
     if message.sender
-      @sender_name = message.sender.patron.full_name
+      @sender_name = message.sender.full_name
     else
       @sender_name = LibraryGroup.system_name(message.receiver.locale)
     end

data/spec/dummy/app/models/user.rb

@@ -39,4 +39,8 @@ class User < ActiveRecord::Base
       false
     end
   end
+
+  def full_name
+    username
+  end
 end

data/spec/dummy/config/initializers/resque_mailer.rb

@@ -0,0 +1 @@
+Resque::Mailer.excluded_environments = [:test, :cucumber]

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/factories/message.rb

@@ -1,7 +1,7 @@
 FactoryGirl.define do
   factory :message do |f|
     f.recipient{FactoryGirl.create(:user).username}
-    f.sender_id{FactoryGirl.create(:user).id}
+    f.sender{FactoryGirl.create(:user)}
     f.subject 'new message'
     f.body 'new message body is really short'
   end

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.1.9
+  version: 0.1.11
   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
@@ -44,23 +44,23 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: configatron
+  name: awesome_nested_set
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.1'
 - !ruby/object:Gem::Dependency
-  name: delayed_job_active_record
+  name: state_machine
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
@@ -76,23 +76,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: awesome_nested_set
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '2.1'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '2.1'
-- !ruby/object:Gem::Dependency
-  name: state_machine
+  name: inherited_resources
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
@@ -108,7 +92,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: inherited_resources
+  name: enju_core
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
@@ -124,7 +108,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: enju_core
+  name: resque_mailer
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
@@ -192,17 +176,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
@@ -406,6 +390,7 @@ files:
 - spec/dummy/config/initializers/devise.rb
 - spec/dummy/config/initializers/inflections.rb
 - spec/dummy/config/initializers/mime_types.rb
+- spec/dummy/config/initializers/resque_mailer.rb
 - spec/dummy/config/initializers/secret_token.rb
 - spec/dummy/config/initializers/session_store.rb
 - spec/dummy/config/initializers/wrap_parameters.rb
@@ -449,16 +434,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
@@ -539,6 +524,7 @@ test_files:
 - spec/dummy/config/initializers/devise.rb
 - spec/dummy/config/initializers/inflections.rb
 - spec/dummy/config/initializers/mime_types.rb
+- spec/dummy/config/initializers/resque_mailer.rb
 - spec/dummy/config/initializers/secret_token.rb
 - spec/dummy/config/initializers/session_store.rb
 - spec/dummy/config/initializers/wrap_parameters.rb
@@ -582,16 +568,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