enju_message 0.1.14.pre14 → 0.1.14.pre15

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

@@ -1,5 +1,5 @@
 <div id="content_detail" class="ui-corner-all ui-widget-content">
-<h1 class="title"><%= t('page.editing', :model => t('activerecord.models.message')) -%></h1>
+<h1 class="title"><%= t('page.editing', model: t('activerecord.models.message')) -%></h1>
 <div id="content_list">
 
 <%= form_for(@message) do |f| -%>
@@ -13,17 +13,17 @@
 
   <div class="field">
     <%= f.label t('message.receiver') -%><br />
-    <%= f.text_field :recipient, :class => 'resource_title', :value => @message.receiver.username -%>
+    <%= f.text_field :recipient, class: 'resource_title', value: @message.receiver.username -%>
   </div>
 
   <div class="field">
     <%= f.label :subject -%><br />
-    <%= f.text_field :subject, :class => 'resource_title' -%>
+    <%= f.text_field :subject, class: 'resource_title' -%>
   </div>
 
   <div class="field">
     <%= f.label :body -%><br />
-    <%= f.text_area :body, :id => 'message_body' -%>
+    <%= f.text_area :body, id: 'message_body' -%>
   </div>
 
   <div class="actions">
@@ -37,6 +37,6 @@
 <div id="submenu" class="ui-corner-all ui-widget-content">
   <ul>
     <li><%= link_to t('page.show'), @message -%></li>
-    <li><%= link_to t('page.listing', :model => t('activerecord.models.message')), messages_path -%></li>
+    <li><%= link_to t('page.listing', model: t('activerecord.models.message')), messages_path -%></li>
   </ul>
 </div>

data/app/views/messages/index.atom.builder

@@ -3,9 +3,9 @@ atom_feed do |feed|
   feed.updated(@messages.first ? @messages.first.created_at : Time.zone.now)
 
   @messages.each do |message|
-    feed.entry(message, :url => message_url(message)) do |entry|
+    feed.entry(message, url: message_url(message)) do |entry|
      entry.title   message.subject
-      entry.content message.body, :type => 'html'
+      entry.content message.body, type: 'html'
 
       entry.author do |author|
         author.name message.sender.login

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

@@ -1,14 +1,14 @@
 <div id="content_detail" class="ui-corner-all ui-widget-content">
 <h1 class="title"><%= t('activerecord.models.message') -%></h1>
 <div id="content_list">
-<%= form_for :messages, :url => messages_path, :html => {:method => 'get'} do -%>
+<%= form_for :messages, url: messages_path, html: {method: 'get'} do -%>
   <p>
-    <%= label_tag :search_form_top, t('page.search_term') -%>: <%= search_field_tag 'query', h(@query), {:id => 'search_form_top', :class => 'search_form', :placeholder => t('page.search_term')} -%>
+    <%= label_tag :search_form_top, t('page.search_term') -%>: <%= search_field_tag 'query', h(@query), {id: 'search_form_top', class: 'search_form', placeholder: t('page.search_term')} -%>
     <%= submit_tag t('page.search') -%>
    </p>
 <%- end -%>
 
-<%= form_for :message, :url => destroy_selected_messages_path do |form| -%>
+<%= form_for :message, url: destroy_selected_messages_path do |form| -%>
   <table class="table table-striped index">
     <tr>
       <th></th>
@@ -28,7 +28,7 @@
           <%= link_to message.subject, message -%>
         <% unless message.read? %></strong><% end %>
       </td>
-      <td><%= link_to message.sender.username, message.sender -%></td>
+      <td><%= link_to message.sender.username, message.sender.profile if message.sender.try(:profile) -%></td>
       <td><%= l(message.created_at) -%></td>
     </tr>
   <%- end -%>
@@ -48,19 +48,19 @@
       <li>
         <% facet.value ? facet_mode = 'read' : facet_mode = 'unread' %>
         <%- if facet_mode == mode -%><strong><%- end -%>
-          <%= link_to t("message.#{facet_mode}"), url_for(params.merge(:page => nil, :mode => facet_mode, :only_path => true)) -%>
+          <%= link_to t("message.#{facet_mode}"), url_for(params.merge(page: nil, mode: facet_mode, only_path: true)) -%>
         (<%= facet.count -%>)
         <%- if facet_mode == mode -%></strong><%- end -%>
       </li>
     <%- end -%>
     <% if mode.present? %>
-      <li><%= link_to t('page.remove_this_facet'), url_for(params.merge(:mode => nil, :page => nil, :only_path => true)) -%></li>
+      <li><%= link_to t('page.remove_this_facet'), url_for(params.merge(mode: nil, page: nil, only_path: true)) -%></li>
     <% end %>
   </ul>
 
   <ul>
     <% if can? :create, Message %>
-      <li><%= link_to t('page.new', :model => t('activerecord.models.message')), new_message_path -%></li>
+      <li><%= link_to t('page.new', model: t('activerecord.models.message')), new_message_path -%></li>
     <% end %>
   </ul>
 </div>

data/app/views/messages/index.rss.builder

@@ -4,23 +4,23 @@ xml.rss('version' => "2.0",
   'xmlns:atom' => "http://www.w3.org/2005/Atom"){
   xml.channel{
     if @user
-      xml.title t('message.user_message', :login_name => @user.username)
-      xml.link messages_url(@user, :format => :rss)
+      xml.title t('message.user_message', login_name: @user.username)
+      xml.link messages_url(@user, format: :rss)
     else
-      xml.title t('message.library_group_message', :library_group_name => @library_group.display_name.localize)
-      xml.link messages_url(:format => :rss)
+      xml.title t('message.library_group_message', library_group_name: @library_group.display_name.localize)
+      xml.link messages_url(format: :rss)
     end
     xml.description "Next-L Enju, an open source integrated library system developed by Project Next-L"
     xml.language @locale.to_s
     xml.ttl "60"
     if @user
-      xml.tag! "atom:link", :rel => 'self', :href => messages_url(:format => :rss)
-      xml.tag! "atom:link", :rel => 'alternate', :href => messages_url(:format => :rss)
+      xml.tag! "atom:link", rel: 'self', href: messages_url(format: :rss)
+      xml.tag! "atom:link", rel: 'alternate', href: messages_url(format: :rss)
     else
-      xml.tag! "atom:link", :rel => 'self', :href => messages_url(:format => :rss)
-      xml.tag! "atom:link", :rel => 'alternate', :href => messages_url
+      xml.tag! "atom:link", rel: 'self', href: messages_url(format: :rss)
+      xml.tag! "atom:link", rel: 'alternate', href: messages_url
     end
-    #xml.tag! "atom:link", :rel => 'search', :type => 'application/opensearchdescription+xml', :href => "http://#{request.host_with_port}/page/opensearch"
+    #xml.tag! "atom:link", rel: 'search', type: 'application/opensearchdescription+xml', href: "http://#{request.host_with_port}/page/opensearch"
     unless params[:query].blank?
       xml.tag! "opensearch:totalResults", @messages.total_entries
       xml.tag! "opensearch:startIndex", @messages.offset + 1

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

@@ -1,29 +1,29 @@
 <div id="content_detail" class="ui-corner-all ui-widget-content">
-  <h1 class="title"><%= t('page.new', :model => t('activerecord.models.message')) -%></h1>
+  <h1 class="title"><%= t('page.new', model: t('activerecord.models.message')) -%></h1>
 <div id="content_list">
   <fieldset>
 
-    <%= simple_form_for(@message, :url => messages_path, :validate => true) do |f| -%>
+    <%= simple_form_for(@message, url: messages_path, validate: true) do |f| -%>
       <%= f.error_notification -%>
 
       <div class="field">
         <label for="message_recepient"><%= t('message.recipient') -%>:</label>
         <%- if @message.recipient -%>
           <%= link_to @message.recipient, user_path(@message.recipient) -%>
-          <%= f.hidden_field :recipient, :value => @message.recipient -%>
+          <%= f.hidden_field :recipient, value: @message.recipient -%>
         <%- else -%>
-          <%= f.text_field :recipient, :class => 'resource_title', :value => @message.recipient -%>
+          <%= f.text_field :recipient, class: 'resource_title', value: @message.recipient -%>
         <%- end -%>
       </div>
 
       <div class="field">
         <%= f.label :subject -%>:
-        <%= f.text_field :subject, :class => 'resource_title' -%>
+        <%= f.text_field :subject, class: 'resource_title' -%>
       </div>
 
       <div class="field">
         <%= f.label :body -%>:<br />
-        <%= f.text_area :body, :id => 'message_body' -%>
+        <%= f.text_area :body, id: 'message_body' -%>
       </div>
 
       <div class="field">
@@ -38,6 +38,6 @@
 
 <div id="submenu" class="ui-corner-all ui-widget-content">
   <ul>
-    <li><%= link_to t('page.listing', :model => t('activerecord.models.message')), messages_path -%></li>
+    <li><%= link_to t('page.listing', model: t('activerecord.models.message')), messages_path -%></li>
   </ul>
 </div>

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

@@ -6,11 +6,11 @@
   <fieldset>
       <p>
         <label for="message_receiver_name" ><strong><%= t('message.receiver') -%>:</strong></label>
-        <%= link_to @message.receiver.username, @message.receiver -%>
+        <%= link_to @message.receiver.username, @message.receiver.profile if @message.receiver.try(:profile) -%>
       </p>
       <p>
         <label for="message_sender_name" ><strong><%= t('message.sender') -%>:</strong></label>
-        <%= link_to @message.sender.username, @message.sender -%>
+        <%= link_to @message.sender.username, @message.sender.profile if @message.sender.try(:profile) -%>
       </p>
 
       <p>
@@ -38,11 +38,11 @@
     <% if request.referer %>
       <li><%= link_to t('page.back'), :back -%></li>
     <% else %>
-      <li><%= link_to t('page.listing', :model => t('activerecord.models.message')), messages_path -%></li>
+      <li><%= link_to t('page.listing', model: t('activerecord.models.message')), messages_path -%></li>
     <% end %>
-    <li><%= link_to t('message.reply'), new_message_path(:parent_id => @message.id) -%></li>
+    <li><%= link_to t('message.reply'), new_message_path(parent_id: @message.id) -%></li>
     <% if can? :delete, :message %>
-      <li><%= link_to t('page.destroy'), @message, :data => {:confirm => t('page.are_you_sure')}, :method => :delete -%></li>
+      <li><%= link_to t('page.destroy'), @message, data: {confirm: t('page.are_you_sure')}, method: :delete -%></li>
     <% end %>
   </ul>
 </div>

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

@@ -10,5 +10,5 @@ A new message arrived from <%= @sender_name -%>.
 -----
 
 -- 
-<%= LibraryGroup.system_name(@message.receiver.locale) %>
+<%= LibraryGroup.system_name(@message.receiver.profile.locale) %>
 <%= LibraryGroup.site_config.url %>

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

@@ -10,5 +10,5 @@
 -----
 
 -- 
-<%= LibraryGroup.system_name(@message.receiver.locale) %>
+<%= LibraryGroup.system_name(@message.receiver.profile.locale) %>
 <%= LibraryGroup.site_config.url %>

data/config/initializers/statesman.rb

@@ -0,0 +1,3 @@
+Statesman.configure do
+  storage_adapter(Statesman::Adapters::ActiveRecord)
+end

data/db/migrate/154_create_messages.rb

@@ -6,7 +6,6 @@ class CreateMessages < ActiveRecord::Migration
       t.string   :subject, :null => false
       t.text     :body
       t.integer :message_request_id
-      t.string :state
       t.integer :parent_id
 
       t.timestamps

data/db/migrate/20080819181903_create_message_requests.rb

@@ -7,11 +7,9 @@ class CreateMessageRequests < ActiveRecord::Migration
       t.datetime :sent_at
       t.datetime :deleted_at
       t.text :body
-      t.string :state
 
       t.timestamps
     end
-    add_index :message_requests, :state
   end
 
   def self.down

data/db/migrate/20140518111006_create_message_transitions.rb

@@ -0,0 +1,14 @@
+class CreateMessageTransitions < ActiveRecord::Migration
+  def change
+    create_table :message_transitions do |t|
+      t.string :to_state
+      t.text :metadata, default: "{}"
+      t.integer :sort_key
+      t.integer :message_id
+      t.timestamps
+    end
+
+    add_index :message_transitions, :message_id
+    add_index :message_transitions, [:sort_key, :message_id], unique: true
+  end
+end

data/db/migrate/20140518135713_create_message_request_transitions.rb

@@ -0,0 +1,14 @@
+class CreateMessageRequestTransitions < ActiveRecord::Migration
+  def change
+    create_table :message_request_transitions do |t|
+      t.string :to_state
+      t.text :metadata, default: "{}"
+      t.integer :sort_key
+      t.integer :message_request_id
+      t.timestamps
+    end
+
+    add_index :message_request_transitions, :message_request_id
+    add_index :message_request_transitions, [:sort_key, :message_request_id], unique: true, name: "index_message_request_transitions_on_sort_key_and_request_id"
+  end
+end

data/lib/enju_message/engine.rb

@@ -1,5 +1,5 @@
 require 'enju_seed'
-require 'state_machine'
+require 'statesman'
 require 'inherited_resources'
 require 'awesome_nested_set'
 require 'resque_mailer'

data/lib/enju_message/user.rb

@@ -18,9 +18,9 @@ module EnjuMessage
           request = MessageRequest.new
           request.sender = self.class.find(1)
           request.receiver = self
-          request.message_template = MessageTemplate.localized_template(status, self.locale)
+          request.message_template = MessageTemplate.localized_template(status, profile.locale)
           request.save_message_body(options)
-          request.sm_send_message!
+          request.transition_to!(:sent)
         end
       end
     end

data/lib/enju_message/version.rb

@@ -1,3 +1,3 @@
 module EnjuMessage
-  VERSION = "0.1.14.pre14"
+  VERSION = "0.1.14.pre15"
 end

data/lib/generators/enju_message/setup/setup_generator.rb

@@ -1,8 +1,10 @@
 class EnjuMessage::SetupGenerator < Rails::Generators::Base
   source_root File.expand_path('../templates', __FILE__)
+  argument :file, :type => :string, :default => "all"
 
   def copy_setup_files
     directory("db/fixtures", "db/fixtures/enju_message")
+    return if file == 'fixture'
     rake("enju_message_engine:install:migrations")
     inject_into_file 'app/models/user.rb',
       "  enju_message_user_model\n", :after => "enju_leaf_user_model\n"

data/lib/generators/enju_message/setup/templates/db/fixtures/message_templates.yml

@@ -1,43 +1,43 @@
 message_template_00001:
   id: 1
   status: reservation_accepted_for_patron
-  title: Reservation accepted
-  body: Reservation accepted
+  title: 予約を受け付けました
+  body: 予約を受け付けました。
   position: 1
   locale: ja
 message_template_00002:
   id: 2
   status: item_received_for_patron
-  title: Item received
-  body: Item received
+  title: 資料を確保しました
+  body: 資料を確保しました。
   position: 2
   locale: ja
 message_template_00003:
   id: 3
   status: reservation_expired_for_patron
-  title: Reservation expired
-  body: Reservation expired
+  title: 予約の期限が切れました
+  body: 予約の期限が切れました。
   position: 3
   locale: ja
 message_template_00004:
   id: 4
   status: reservation_expired_for_library
-  title: Reservation expired
-  body: Reservation expired
+  title: 予約の期限が切れました
+  body: 予約の期限が切れました。
   position: 4
   locale: ja
 message_template_00005:
   id: 5
   status: reservation_canceled_for_patron
-  title: Reservation canceled
-  body: Reservation canceled
+  title: 予約を取り消しました
+  body: 予約を取り消しました。
   position: 5
   locale: ja
 message_template_00006:
   id: 6
   status: reservation_canceled_for_library
-  title: Reservation canceled
-  body: Reservation canceled
+  title: 予約を取り消しました
+  body: 予約を取り消しました。
   position: 6
   locale: ja
 message_template_00007:
@@ -57,28 +57,49 @@ message_template_00008:
 message_template_00009:
   id: 9
   status: reservation_accepted_for_library
-  title: Reservation accepted
-  body: Reservation accepted
+  title: 予約を受け付けました
+  body: 予約を受け付けました。
   position: 9
   locale: ja
 message_template_00010:
   id: 10
   status: item_received_for_library
-  title: Item received
-  body: Item received
+  title: 資料を確保しました
+  body: 資料を確保しました。
   position: 10
   locale: ja
 message_template_00011:
   id: 11
   status: reservation_postponed_for_patron
-  title: Reservation postponed
-  body: Reservation postponed
+  title: 予約を延期しました
+  body: 予約を延期しました。
   position: 11
   locale: ja
 message_template_00012:
   id: 12
   status: reservation_postponed_for_library
-  title: Reservation postponed
-  body: Reservation postponed
+  title: 予約を延期しました
+  body: 予約を延期しました。
   position: 12
   locale: ja
+message_template_00013:
+  id: 13
+  status: import_completed
+  title: インポートが完了しました
+  body: インポートが完了しました。
+  position: 13
+  locale: ja
+message_template_00014:
+  id: 14
+  status: counting_completed
+  title: 集計が完了しました
+  body: 集計が完了しました。
+  position: 14
+  locale: ja
+message_template_00015:
+  id: 15
+  status: export_completed
+  title: エクスポートが完了しました
+  body: エクスポートが完了しました。
+  position: 15
+  locale: ja

data/lib/tasks/enju_message_tasks.rake

@@ -1,4 +1,6 @@
 require 'active_record/fixtures'
+require 'tasks/message_template'
+
 namespace :enju_message do
   desc "create initial records for enju_message"
   task :setup => :environment do
@@ -11,4 +13,12 @@ namespace :enju_message do
   task :send => :environment do
     MessageRequest.send_messages if defined?(EnjuMessage)
   end
+
+  desc "upgrade enju_message"
+  task :upgrade => :environment do
+    MessageTemplate.transaction do
+      update_message_template
+    end
+    puts 'enju_message: The upgrade completed successfully.'
+  end
 end

data/lib/tasks/message_template.rb

@@ -0,0 +1,13 @@
+def update_message_template
+  YAML.load(open('db/fixtures/enju_message/message_templates.yml').read).each do |line|
+    l = line[1].select!{|k, v| %w(status locale title body).include?(k)}
+    template = MessageTemplate.where(
+      status: l["status"], locale: l["locale"]
+    ).first
+    if template
+      template.update_attributes!(l)
+    else
+      MessageTemplate.create!(l)
+    end
+  end
+end

data/spec/controllers/message_requests_controller_spec.rb

@@ -7,7 +7,7 @@ describe MessageRequestsController do
 
   describe "GET index" do
     describe "When logged in as Administrator" do
-      login_admin
+      login_fixture_admin
 
       it "assigns all message_requests as @message_requests" do
         get :index
@@ -16,7 +16,7 @@ describe MessageRequestsController do
     end
 
     describe "When logged in as Librarian" do
-      login_librarian
+      login_fixture_librarian
 
       it "assigns all message_requests as @message_requests" do
         get :index
@@ -25,7 +25,7 @@ describe MessageRequestsController do
     end
 
     describe "When logged in as User" do
-      login_user
+      login_fixture_user
 
       it "assigns all message_requests as @message_requests" do
         get :index
@@ -43,7 +43,7 @@ describe MessageRequestsController do
 
   describe "GET show" do
     describe "When logged in as Administrator" do
-      login_admin
+      login_fixture_admin
 
       it "assigns the requested message_request as @message_request" do
         message_request = FactoryGirl.create(:message_request)
@@ -53,7 +53,7 @@ describe MessageRequestsController do
     end
 
     describe "When logged in as Librarian" do
-      login_librarian
+      login_fixture_librarian
 
       it "assigns the requested message_request as @message_request" do
         message_request = FactoryGirl.create(:message_request)
@@ -63,7 +63,7 @@ describe MessageRequestsController do
     end
 
     describe "When logged in as User" do
-      login_user
+      login_fixture_user
 
       it "assigns the requested message_request as @message_request" do
         message_request = FactoryGirl.create(:message_request)
@@ -83,7 +83,7 @@ describe MessageRequestsController do
 
   describe "GET edit" do
     describe "When logged in as Administrator" do
-      login_admin
+      login_fixture_admin
 
       it "assigns the requested message_request as @message_request" do
         message_request = FactoryGirl.create(:message_request)
@@ -93,7 +93,7 @@ describe MessageRequestsController do
     end
 
     describe "When logged in as Librarian" do
-      login_librarian
+      login_fixture_librarian
 
       it "assigns the requested message_request as @message_request" do
         message_request = FactoryGirl.create(:message_request)
@@ -103,7 +103,7 @@ describe MessageRequestsController do
     end
 
     describe "When logged in as User" do
-      login_user
+      login_fixture_user
 
       it "assigns the requested message_request as @message_request" do
         message_request = FactoryGirl.create(:message_request)
@@ -129,7 +129,7 @@ describe MessageRequestsController do
     end
 
     describe "When logged in as Administrator" do
-      login_admin
+      login_fixture_admin
 
       describe "with valid params" do
         it "updates the requested message_request" do
@@ -151,7 +151,7 @@ describe MessageRequestsController do
     end
 
     describe "When logged in as Librarian" do
-      login_librarian
+      login_fixture_librarian
 
       describe "with valid params" do
         it "updates the requested message_request" do
@@ -174,7 +174,7 @@ describe MessageRequestsController do
     end
 
     describe "When logged in as User" do
-      login_user
+      login_fixture_user
 
       describe "with valid params" do
         it "updates the requested message_request" do
@@ -223,7 +223,7 @@ describe MessageRequestsController do
     end
 
     describe "When logged in as Administrator" do
-      login_admin
+      login_fixture_admin
 
       it "destroys the requested message_request" do
         delete :destroy, :id => @message_request.id
@@ -236,7 +236,7 @@ describe MessageRequestsController do
     end
 
     describe "When logged in as Librarian" do
-      login_librarian
+      login_fixture_librarian
 
       it "destroys the requested message_request" do
         delete :destroy, :id => @message_request.id
@@ -249,7 +249,7 @@ describe MessageRequestsController do
     end
 
     describe "When logged in as User" do
-      login_user
+      login_fixture_user
 
       it "destroys the requested message_request" do
         delete :destroy, :id => @message_request.id