enju_event 0.1.17.pre18 → 0.1.17.pre19

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

@@ -1,5 +1,5 @@
 <div id="content_detail" class="ui-corner-all ui-widget-content">
-<h1 class="title"><%= t('page.showing', :model => t('activerecord.models.event_import_result')) -%></h1>
+<h1 class="title"><%= t('page.showing', model: t('activerecord.models.event_import_result')) -%></h1>
 <div id="content_list">
 <p id="notice"><%= notice %></p>
 

data/app/views/events/_form.html.erb

@@ -1,4 +1,4 @@
-<%= simple_form_for(@event, :validate => true) do |f| -%>
+<%= simple_form_for(@event, validate: true) do |f| -%>
   <%= f.error_messages %>
 
   <div class="field">
@@ -13,29 +13,29 @@
 
   <div class="field">
     <%= f.label :name -%><br />
-    <%= f.text_field :name, :class => 'resource_title' -%>
+    <%= f.text_field :name, class: 'resource_title' -%>
   </div>
 
   <div class="field">
     <%= f.label :display_name -%><br />
-    <%= f.text_area :display_name, :class => 'resource_textarea' -%>
+    <%= f.text_area :display_name, class: 'resource_textarea' -%>
   </div>
 
   <div class="field">
     <%= f.label :start_at -%><br />
-    <%= f.datetime_select :start_at, :use_month_numbers => true -%>
+    <%= f.datetime_select :start_at, use_month_numbers: true -%>
     <%= f.label :all_day -%>
     <%= f.check_box :all_day -%>
   </div>
 
   <div class="field">
     <%= f.label :end_at -%><br />
-    <%= f.datetime_select :end_at, :use_month_numbers => true -%>
+    <%= f.datetime_select :end_at, use_month_numbers: true -%>
   </div>
 
   <div class="field">
     <%= f.label :note -%><br />
-    <%= f.text_area :note, :class => 'resource_textarea' -%>
+    <%= f.text_area :note, class: 'resource_textarea' -%>
   </div>
 
   <div class="actions">

data/app/views/events/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.event')) -%></h1>
+<h1 class="title"><%= t('page.editing', model: t('activerecord.models.event')) -%></h1>
 <div id="content_list">
   <%= render 'form' %>
   <%= render 'all_day' %>
@@ -9,6 +9,6 @@
 <div id="submenu" class="ui-corner-all ui-widget-content">
   <ul>
     <li><%= link_to t('page.show'), @event -%></li>
-    <li><%= link_to t('page.back'), events_path(:page => flash[:page] ||= nil) -%></li>
+    <li><%= link_to t('page.back'), events_path(page: flash[:page] ||= nil) -%></li>
   </ul>
 </div>

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

@@ -1,5 +1,5 @@
-atom_feed(:url => events_url(:format => :atom)) do |feed|
-  feed.title t('event.library_group_event', :library_group_name => @library_group.display_name.localize)
+atom_feed(url: events_url(format: :atom)) do |feed|
+  feed.title t('event.library_group_event', library_group_name: @library_group.display_name.localize)
   feed.updated(@events.first ? @events.first.created_at : Time.zone.now)
 
   @events.each do |event|

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

@@ -1,5 +1,5 @@
 <div id="content_detail" class="ui-corner-all ui-widget-content">
-<h1 class="title"><%= t('page.listing', :model => t('activerecord.models.event')) -%></h1>
+<h1 class="title"><%= t('page.listing', model: t('activerecord.models.event')) -%></h1>
 <div id="content_list">
 
 <%- if @library -%>
@@ -8,9 +8,9 @@
   <h2><%= t('event.all_libraries') -%></h2>
 <%- end -%>
 
-<%= form_for :events, :url => events_path, :html => {:method => 'get'} do -%>
+<%= form_for :events, url: events_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 -%>
@@ -18,17 +18,17 @@
 <p>
   <%- case params[:mode]
       when 'upcoming' -%>
-    <%= link_to t('event.all'), url_for(params.merge(:mode => nil, :only_path => true)) -%>
+    <%= link_to t('event.all'), url_for(params.merge(mode: nil, only_path: true)) -%>
     <strong><%= t('event.upcoming') -%></strong>
-    <%= link_to t('event.past'), url_for(params.merge(:mode => 'past', :only_path => true)) -%>
+    <%= link_to t('event.past'), url_for(params.merge(mode: 'past', only_path: true)) -%>
   <%- when 'past' -%>
-    <%= link_to t('event.all'), url_for(params.merge(:mode => nil, :only_path => true)) -%>
-    <%= link_to t('event.upcoming'), url_for(params.merge(:mode => 'upcoming', :only_path => true)) -%>
+    <%= link_to t('event.all'), url_for(params.merge(mode: nil, only_path: true)) -%>
+    <%= link_to t('event.upcoming'), url_for(params.merge(mode: 'upcoming', only_path: true)) -%>
     <strong><%= t('event.past') -%></strong>
   <%- else -%>
     <strong><%= t('event.all') -%></strong>
-    <%= link_to t('event.upcoming'), url_for(params.merge(:mode => 'upcoming', :only_path => true)) -%>
-    <%= link_to t('event.past'), url_for(params.merge(:mode => 'past', :only_path => true)) -%>
+    <%= link_to t('event.upcoming'), url_for(params.merge(mode: 'upcoming', only_path: true)) -%>
+    <%= link_to t('event.past'), url_for(params.merge(mode: 'past', only_path: true)) -%>
   <%- end -%>
 </p>
 
@@ -49,14 +49,14 @@
     <td>
       <%= link_to event.display_name.localize, event -%>
       <br />
-      <%= l(event.start_at, :format => :short) -%>
+      <%= l(event.start_at, format: :short) -%>
       -
-      <%= l(event.end_at, :format => :short) -%>
+      <%= l(event.end_at, format: :short) -%>
     </td>
     <td>
       <%- if can? :delete, event -%>
         <%= link_to t('page.edit'), edit_event_path(event) -%>
-        <%= link_to t('page.destroy'), event, :data => {:confirm => t('page.are_you_sure')}, :method => :delete -%>
+        <%= link_to t('page.destroy'), event, data: {confirm: t('page.are_you_sure')}, method: :delete -%>
       <%- end -%>
     </td>
   </tr>
@@ -75,9 +75,9 @@
     <%- if user_signed_in? -%>
       <%- if current_user.has_role?('Librarian') -%>
         <%- if @library -%>
-          <li><%= link_to t('page.new', :model => t('activerecord.models.event')), new_library_event_path(@library) -%></li>
+          <li><%= link_to t('page.new', model: t('activerecord.models.event')), new_library_event_path(@library) -%></li>
         <%- else -%>
-          <li><%= link_to t('page.new', :model => t('activerecord.models.event')), new_event_path(:date => params[:date]) -%></li>
+          <li><%= link_to t('page.new', model: t('activerecord.models.event')), new_event_path(date: params[:date]) -%></li>
         <%- end -%>
         <li><%= link_to t('event.import_event'), event_import_files_path -%></li>
       <%- end -%>
@@ -90,15 +90,15 @@
   </ul>
   <p>
     <%- if @library -%>
-      <%= link_to (image_tag 'icons/feed.png', :size => '16x16', :alt => t('page.feed'), :class => 'icon'), library_events_path(@library, :format => :rss) -%>
-      (<%= link_to 'RSS', library_events_path(@library, :format => :rss) -%>)
-      <%= link_to (image_tag 'icons/page_white_excel.png', :size => '16x16', :alt => 'CSV', :class => 'icon'), library_events_path(@library, :format => :csv, :locale => @locale.to_s) -%>
-      (<%= link_to 'CSV', library_events_path(@library, :format => :csv, :locale => @locale.to_s) -%>)
+      <%= link_to (image_tag 'icons/feed.png', size: '16x16', alt: t('page.feed'), class: 'icon'), library_events_path(@library, format: :rss) -%>
+      (<%= link_to 'RSS', library_events_path(@library, format: :rss) -%>)
+      <%= link_to (image_tag 'icons/page_white_excel.png', size: '16x16', alt: 'TSV', class: 'icon'), library_events_path(@library, format: :txt, locale: @locale.to_s) -%>
+      (<%= link_to 'TSV', library_events_path(@library, format: :txt, locale: @locale.to_s) -%>)
     <%- else -%>
-      <%= link_to (image_tag 'icons/feed.png', :size => '16x16', :alt => t('page.feed'), :class => 'icon'), events_path(:format => :rss) -%>
-      (<%= link_to 'RSS', events_path(:format => :rss) -%>)
-      <%= link_to (image_tag 'icons/page_white_excel.png', :size => '16x16', :alt => 'CSV', :class => 'icon'), events_path(:format => :csv, :locale => @locale.to_s) -%>
-      (<%= link_to 'CSV', events_path(:format => :csv, :locale => @locale.to_s) -%>)
+      <%= link_to (image_tag 'icons/feed.png', size: '16x16', alt: t('page.feed'), class: 'icon'), events_path(format: :rss) -%>
+      (<%= link_to 'RSS', events_path(format: :rss) -%>)
+      <%= link_to (image_tag 'icons/page_white_excel.png', size: '16x16', alt: 'TSV', class: 'icon'), events_path(format: :txt, locale: @locale.to_s) -%>
+      (<%= link_to 'TSV', events_path(format: :txt, locale: @locale.to_s) -%>)
     <%- end -%>
   </p>
   <%= render 'page/login' unless current_user -%>

data/app/views/events/index.mobile.erb

@@ -1,5 +1,5 @@
 <div data-role="header">
-<h1 class="title"><%= t('page.listing', :model => t('activerecord.models.event')) -%></h1>
+<h1 class="title"><%= t('page.listing', model: t('activerecord.models.event')) -%></h1>
 </div>
 
 <div data-role="content">
@@ -10,9 +10,9 @@
 <%- end -%>
 
   <div data-role="fieldcontain">
-    <%= form_for :events, :url => events_path, :html => {:method => 'get'} do -%>
+    <%= form_for :events, url: events_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 -%>
@@ -21,17 +21,17 @@
 <p>
   <%- case params[:mode]
       when 'upcoming' -%>
-    <%= link_to t('event.all'), url_for(params.merge(:mode => nil, :only_path => true)) -%>
+    <%= link_to t('event.all'), url_for(params.merge(mode: nil, only_path: true)) -%>
     <strong><%= t('event.upcoming') -%></strong>
-    <%= link_to t('event.past'), url_for(params.merge(:mode => 'past', :only_path => true)) -%>
+    <%= link_to t('event.past'), url_for(params.merge(mode: 'past', only_path: true)) -%>
   <%- when 'past' -%>
-    <%= link_to t('event.all'), url_for(params.merge(:mode => nil, :only_path => true)) -%>
-    <%= link_to t('event.upcoming'), url_for(params.merge(:mode => 'upcoming', :only_path => true)) -%>
+    <%= link_to t('event.all'), url_for(params.merge(mode: nil, only_path: true)) -%>
+    <%= link_to t('event.upcoming'), url_for(params.merge(mode: 'upcoming', only_path: true)) -%>
     <strong><%= t('event.past') -%></strong>
   <%- else -%>
     <strong><%= t('event.all') -%></strong>
-    <%= link_to t('event.upcoming'), url_for(params.merge(:mode => 'upcoming', :only_path => true)) -%>
-    <%= link_to t('event.past'), url_for(params.merge(:mode => 'past', :only_path => true)) -%>
+    <%= link_to t('event.upcoming'), url_for(params.merge(mode: 'upcoming', only_path: true)) -%>
+    <%= link_to t('event.past'), url_for(params.merge(mode: 'past', only_path: true)) -%>
   <%- end -%>
 </p>
 </div>
@@ -41,9 +41,9 @@
     <li>
       <%= link_to event.display_name.localize, event -%>
       <br />
-      <%= l(event.start_at, :format => :short) -%>
+      <%= l(event.start_at, format: :short) -%>
       -
-      <%= l(event.end_at, :format => :short) -%>
+      <%= l(event.end_at, format: :short) -%>
     </li>
   <%- end -%>
 </ul>

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

@@ -3,14 +3,14 @@ xml.rss('version' => "2.0",
   'xmlns:opensearch' => "http://a9.com/-/spec/opensearch/1.1/",
   'xmlns:atom' => "http://www.w3.org/2005/Atom"){
   xml.channel{
-    xml.title t('event.library_group_event', :library_group_name => @library_group.display_name.localize)
-    xml.link "#{request.protocol}#{request.host_with_port}#{url_for(params.merge(:format => nil, :only_path => true))}"
+    xml.title t('event.library_group_event', library_group_name: @library_group.display_name.localize)
+    xml.link "#{request.protocol}#{request.host_with_port}#{url_for(params.merge(format: nil, only_path: true))}"
     xml.description "Next-L Enju, an open source integrated library system developed by Project Next-L"
     xml.language @locale.to_s
     xml.ttl "60"
-    xml.tag! "atom:link", :rel => 'self', :href => "#{request.protocol}#{request.host_with_port}#{url_for(params.merge(:format => :rss, :only_path => true))}"
-    xml.tag! "atom:link", :rel => 'alternate', :href => events_url
-    #xml.tag! "atom:link", :rel => 'search', :type => 'application/opensearchdescription+xml', :href => "http://#{request.host_with_port}/page/opensearch"
+    xml.tag! "atom:link", rel: 'self', href: "#{request.protocol}#{request.host_with_port}#{url_for(params.merge(format: :rss, only_path: true))}"
+    xml.tag! "atom:link", rel: 'alternate', href: events_url
+    #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", @count[:query_result]
       xml.tag! "opensearch:startIndex", @events.offset + 1

data/app/views/events/index.txt.erb

@@ -0,0 +1,4 @@
+library	name	note	start_at	end_at
+<%- @events.each do |event| -%>
+"<%=h event.library.display_name.gsub(/"/, '""') -%>"	"<%=h event.display_name.localize.gsub(/"/, '""') -%>"	"<%=h event.note.to_s.gsub(/"/, '""') -%>"	"<%=h event.start_at.to_s.gsub(/"/, '""') -%>"	"<%=h event.end_at.to_s.gsub(/"/, '""') %>
+<%- end -%>

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

@@ -1,5 +1,5 @@
 <div id="content_detail" class="ui-corner-all ui-widget-content">
-<h1 class="title"><%= t('page.new', :model => t('activerecord.models.event')) -%></h1>
+<h1 class="title"><%= t('page.new', model: t('activerecord.models.event')) -%></h1>
 <div id="content_list">
   <%= render 'form' %>
   <%= render 'all_day' %>

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

@@ -1,5 +1,5 @@
 <div id="content_detail" class="ui-corner-all ui-widget-content">
-<h1 class="title"><%= t('page.showing', :model => t('activerecord.models.event')) -%></h1>
+<h1 class="title"><%= t('page.showing', model: t('activerecord.models.event')) -%></h1>
 <div id="content_list">
 <p id="notice"><%= notice %></p>
 
@@ -20,22 +20,22 @@
 <%- if @event.all_day -%>
   <p>
     <strong><%= t('activerecord.attributes.event.start_at') -%>:</strong>
-    <%= l(@event.start_at, :format => :only_date) -%>
+    <%= l(@event.start_at, format: :only_date) -%>
   </p>
 
   <p>
     <strong><%= t('activerecord.attributes.event.end_at') -%>:</strong>
-    <%= l(@event.end_at, :format => :only_date) -%>
+    <%= l(@event.end_at, format: :only_date) -%>
   </p>
 <%- else -%>
   <p>
     <strong><%= t('activerecord.attributes.event.start_at') -%>:</strong>
-    <%= l(@event.start_at, :format => :short) -%>
+    <%= l(@event.start_at, format: :short) -%>
   </p>
 
   <p>
     <strong><%= t('activerecord.attributes.event.end_at') -%>:</strong>
-    <%= l(@event.end_at, :format => :short) -%>
+    <%= l(@event.end_at, format: :short) -%>
   </p>
 <%- end -%>
 

data/app/views/events/show.mobile.erb

@@ -1,5 +1,5 @@
 <div data-role="header">
-  <h1 class="title"><%= t('page.showing', :model => t('activerecord.models.event')) -%></h1>
+  <h1 class="title"><%= t('page.showing', model: t('activerecord.models.event')) -%></h1>
 </div>
 
 <div data-role="content">
@@ -20,17 +20,17 @@
 <%- if @event.all_day -%>
   <p>
     <strong><%= t('activerecord.attributes.event.all_day') -%>:</strong>
-    <%= l(@event.start_at, :format => :only_date) -%>
+    <%= l(@event.start_at, format: :only_date) -%>
   </p>
 <%- else -%>
   <p>
     <strong><%= t('activerecord.attributes.event.start_at') -%>:</strong>
-    <%= l(@event.start_at, :format => :short) -%>
+    <%= l(@event.start_at, format: :short) -%>
   </p>
 
   <p>
     <strong><%= t('activerecord.attributes.event.end_at') -%>:</strong>
-    <%= l(@event.end_at, :format => :short) -%>
+    <%= l(@event.end_at, format: :short) -%>
   </p>
 <%- end -%>
 

data/app/views/layouts/calendar.html.erb

@@ -3,13 +3,13 @@
 <head>
   <meta charset="UTF-8" />
   <%- if @library -%>
-    <title><%= t('calendar.library_calendar', :library_name => @library.display_name.localize) -%> - <%= LibraryGroup.system_name(@locale) -%></title>
+    <title><%= t('calendar.library_calendar', library_name: @library.display_name.localize) -%> - <%= LibraryGroup.system_name(@locale) -%></title>
   <%- else -%>
     <title><%= t('calendar.calendar') -%> - <%= LibraryGroup.system_name(@locale) -%></title>
   <%- end -%>
   <%= render 'page/include' -%>
-  <%= auto_discovery_link_tag(:rss, events_url(:format => :rss), :title => (t('event.library_group_event', :library_group_name => @library_group.display_name.localize) + " (RSS)")) %>
-  <%= auto_discovery_link_tag(:atom, events_url(:format => :atom), :title => (t('event.library_group_event', :library_group_name => @library_group.display_name.localize) + " (Atom)")) %>
+  <%= auto_discovery_link_tag(:rss, events_url(format: :rss), title: (t('event.library_group_event', library_group_name: @library_group.display_name.localize) + " (RSS)")) %>
+  <%= auto_discovery_link_tag(:atom, events_url(format: :atom), title: (t('event.library_group_event', library_group_name: @library_group.display_name.localize) + " (Atom)")) %>
   <link rel="search" type="application/opensearchdescription+xml" href="<%= page_opensearch_url -%>" title="<%= @library_group.display_name.localize -%>" />
 </head>
 <body>

data/app/views/participates/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.participate')) -%></h1>
+<h1 class="title"><%= t('page.editing', model: t('activerecord.models.participate')) -%></h1>
 <div id="content_list">
 
 <%= form_for(@participate) do |f| %>

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

@@ -1,5 +1,5 @@
 <div id="content_detail" class="ui-corner-all ui-widget-content">
-<h1 class="title"><%= t('page.listing', :model => t('activerecord.models.participate')) -%></h1>
+<h1 class="title"><%= t('page.listing', model: t('activerecord.models.participate')) -%></h1>
 <div id="content_list">
 
 <table class="table table-striped index">
@@ -14,7 +14,7 @@
     <td><%= link_to participate.event.display_name.localize, participate.event %>
     <td><%= link_to t('page.show'), participate %></td>
     <td><%= link_to t('page.edit'), edit_participate_path(participate) %></td>
-    <td><%= link_to t('page.destroy'), participate, :data => {:confirm => t('page.are_you_sure')}, :method => :delete %></td>
+    <td><%= link_to t('page.destroy'), participate, data: {confirm: t('page.are_you_sure')}, method: :delete %></td>
   </tr>
 <%- end %>
 </table>
@@ -25,6 +25,6 @@
 
 <div id="submenu" class="ui-corner-all ui-widget-content">
   <ul>
-    <li><%= link_to t('page.new', :model => t('activerecord.models.participate')), new_participate_path -%></li>
+    <li><%= link_to t('page.new', model: t('activerecord.models.participate')), new_participate_path -%></li>
   </ul>
 </div>

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

@@ -1,5 +1,5 @@
 <div id="content_detail" class="ui-corner-all ui-widget-content">
-<h1 class="title"><%= t('page.new', :model => t('activerecord.models.participate')) -%></h1>
+<h1 class="title"><%= t('page.new', model: t('activerecord.models.participate')) -%></h1>
 <div id="content_list">
 
 <%= form_for(@participate) do |f| %>

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

@@ -1,5 +1,5 @@
 <div id="content_detail" class="ui-corner-all ui-widget-content">
-<h1 class="title"><%= t('page.showing', :model => t('activerecord.models.participate')) -%></h1>
+<h1 class="title"><%= t('page.showing', model: t('activerecord.models.participate')) -%></h1>
 <div id="content_list">
 <p id="notice"><%= notice %></p>
 

data/app/workers/event_export_file_queue.rb

@@ -0,0 +1,7 @@
+class EventExportFileQueue
+  @queue = :event_export_file
+
+  def self.perform(event_export_id)
+    EventExportFile.find(event_export_id).export!
+  end
+end

data/config/locales/translation_en.yml

@@ -6,6 +6,7 @@ en:
       event_import_file: Event import file
       event_import_result: Event Import Result
       participate: Participate
+      event_export_file: Event export
 
     attributes:
       event_category:
@@ -33,8 +34,14 @@ en:
         edit_mode: Edit mode
         error_message: Error message
         user_encoding: Encoding
+        default_library_id: Default library
+        default_event_category_id: Default event category
       event_import_result:
         body: Body
+      event_export_file:
+        event_export_file_name: Filename
+        event_export_file_size: Size
+        state: State
 
   event:
     library_group_event: "Events at %{library_group_name}"
@@ -46,3 +53,6 @@ en:
   calendar:
     calendar: "Calendar"
     library_calendar: "Calendar of events at %{library_name}"
+  event_import_file:
+    default_library: If "library" column is not set in the TSV file, this library is set to the new event.
+    default_event_category: If "event_category" column is not set in the TSV file, this event category is set to the new event.

data/config/locales/translation_ja.yml

@@ -1,11 +1,12 @@
 ja:
   activerecord:
     models:
-      event_category: 催し物の種類
+      event_category: 催し物の種別
       event: 開館日と催し物
       event_import_file: 催し物のインポート用ファイル
       event_import_result: 催し物インポートの結果
       participate: 参加
+      event_export_file: 催し物情報のエクスポート
 
     attributes:
       event_category:
@@ -33,8 +34,14 @@ ja:
         edit_mode: 編集モード
         error_message: エラーメッセージ
         user_encoding: 文字コード
+        default_library_id: 既定の図書館
+        default_event_category_id: 既定の催し物の種別
       event_import_result:
         body: 本文
+      event_export_file:
+        event_export_file_name: ファイル名
+        event_export_file_size: ファイルサイズ
+        state: 状態
 
   event:
     library_group_event: "%{library_group_name} での催し物"
@@ -46,3 +53,6 @@ ja:
   calendar:
     calendar: "カレンダー"
     library_calendar: "%{library_name}のカレンダー"
+  event_import_file:
+    default_library: TSVファイルで"library"列が指定されていない場合、この図書館が登録されます。
+    default_event_category: TSVファイルで"event_category"列が指定されていない場合、この種別が登録されます。

data/config/routes.rb

@@ -1,4 +1,8 @@
 Rails.application.routes.draw do
+  resources :event_export_files
+
+  resources :event_import_files
+
   resources :events do
     resources :picture_files
   end
@@ -6,9 +10,6 @@ Rails.application.routes.draw do
   resources :libraries do
     resources :events
   end
-  resources :event_import_files do
-    resources :event_import_results, :only => [:index, :show, :destroy]
-  end
   resources :event_import_results, :only => [:index, :show, :destroy]
   resources :participates
 

data/db/migrate/113_create_events.rb

@@ -1,8 +1,8 @@
 class CreateEvents < ActiveRecord::Migration
   def self.up
     create_table :events do |t|
-      t.integer :library_id, :default => 1, :null => false
-      t.integer :event_category_id, :default => 1, :null => false
+      t.integer :library_id, :null => false
+      t.integer :event_category_id, :null => false
       t.string :name
       t.text :note
       t.datetime :start_at

data/db/migrate/20140720192418_add_default_library_id_to_event_import_file.rb

@@ -0,0 +1,5 @@
+class AddDefaultLibraryIdToEventImportFile < ActiveRecord::Migration
+  def change
+    add_column :event_import_files, :default_library_id, :integer
+  end
+end

data/db/migrate/20140812152348_create_event_export_files.rb

@@ -0,0 +1,11 @@
+class CreateEventExportFiles < ActiveRecord::Migration
+  def change
+    create_table :event_export_files do |t|
+      t.integer :user_id
+      t.attachment :event_export
+      t.datetime :executed_at
+
+      t.timestamps
+    end
+  end
+end

data/db/migrate/20140812153137_create_event_export_file_transitions.rb

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

data/db/migrate/20140814070854_add_default_event_category_id_to_event_import_file.rb

@@ -0,0 +1,5 @@
+class AddDefaultEventCategoryIdToEventImportFile < ActiveRecord::Migration
+  def change
+    add_column :event_import_files, :default_event_category_id, :integer
+  end
+end

data/lib/enju_event/version.rb

@@ -1,3 +1,3 @@
 module EnjuEvent
-  VERSION = "0.1.17.pre18"
+  VERSION = "0.1.17.pre19"
 end

data/spec/controllers/calendar_controller_spec.rb

@@ -9,7 +9,7 @@ describe CalendarController do
     end
 
     describe "When logged in as Administrator" do
-      login_admin
+      login_fixture_admin
 
       it "assigns all event_stripss as @event_stripss" do
         get :index
@@ -43,7 +43,7 @@ describe CalendarController do
 
   describe "GET show" do
     describe "When logged in as Administrator" do
-      login_admin
+      login_fixture_admin
 
       it "should redirect to a new event" do
         get :show, :year => '2011', :month => '1', :day => '1'