enju_event 0.1.17.pre19 → 0.1.17.pre20

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 363a80afc5aa4dd9e672f1a6f5e3b892787688e9
-  data.tar.gz: 12ee593d3824d87cd5b8740e0d9dc55e39cc3230
+  metadata.gz: 292b93a7c2f672e4d893d05b7efcbfc20b74d44d
+  data.tar.gz: 617d8466722ed9dfb1d858a3b288161691c8a4c4
 SHA512:
-  metadata.gz: 3da5de410c3b035d7a3b32b7078e5ed17a2c6818da98bc60f56df4bd6e94845c7fde1a835fa9010016b7b3c71bb6655bcd2dc74c7c93b9f35bcd8aaf62f031ac
-  data.tar.gz: c4496f7b6a4de8332a9b3e4336ea72feb9012c347a40693916b2f274eb57b83c2e21713714fd693cdd61727601ce5aa678b34a4e557753960e91dbd6dfdedb70
+  metadata.gz: 66cb76f1ea8bdc704f22963400372ba6627bc4b9bfc944761ce1e879267191846819d52618f350db7f42a59e9828ce7ed18510c3b6181bb85c7f3ff14c35cffa
+  data.tar.gz: 6a92adb6a5fda57990ba2eaa97ae0c561636efd14b6d294cefd7748d7c29a661803f143afdc2d0f26c17fe2cf3424afd157a672998b805f5f6201bb3a4e2a4bd

data/app/controllers/event_categories_controller.rb

@@ -1,17 +1,83 @@
-class EventCategoriesController < InheritedResources::Base
-  respond_to :html, :json
+class EventCategoriesController < ApplicationController
   load_and_authorize_resource
+  # GET /event_categories
+  # GET /event_categories.json
+  def index
+    @event_categories = EventCategory.all
+
+    respond_to do |format|
+      format.html # index.html.erb
+      format.json { render json: @event_categories }
+    end
+  end
+
+  # GET /event_categories/1
+  # GET /event_categories/1.json
+  def show
+    respond_to do |format|
+      format.html # show.html.erb
+      format.json { render json: @event_category }
+    end
+  end
+
+  # GET /event_categories/new
+  # GET /event_categories/new.json
+  def new
+    @event_category = EventCategory.new
+
+    respond_to do |format|
+      format.html # new.html.erb
+      format.json { render json: @event_category }
+    end
+  end
 
+  # GET /event_categories/1/edit
+  def edit
+  end
+
+  # POST /event_categories
+  # POST /event_categories.json
+  def create
+    @event_category = EventCategory.new(params[:event_category])
+
+    respond_to do |format|
+      if @event_category.save
+        format.html { redirect_to @event_category, notice:  t('controller.successfully_created', model:  t('activerecord.models.event_category')) }
+        format.json { render json: @event_category, status: :created, location: @event_category }
+      else
+        format.html { render action: "new" }
+        format.json { render json: @event_category.errors, status: :unprocessable_entity }
+      end
+    end
+  end
+
+  # PUT /event_categories/1
+  # PUT /event_categories/1.json
   def update
-    @event_category = EventCategory.find(params[:id])
     if params[:move]
       move_position(@event_category, params[:move])
       return
     end
-    update!
+
+    respond_to do |format|
+      if @event_category.update_attributes(params[:event_category])
+        format.html { redirect_to @event_category, notice:  t('controller.successfully_updated', model:  t('activerecord.models.event_category')) }
+        format.json { head :no_content }
+      else
+        format.html { render action: "edit" }
+        format.json { render json: @event_category.errors, status: :unprocessable_entity }
+      end
+    end
   end
 
-  def index
-    @event_categories = @event_categories.page(params[:page])
+  # DELETE /event_categories/1
+  # DELETE /event_categories/1.json
+  def destroy
+    @event_category.destroy
+
+    respond_to do |format|
+      format.html { redirect_to event_categories_url, notice: t('controller.successfully_deleted', model: t('activerecord.models.event_category')) }
+      format.json { head :no_content }
+    end
   end
 end

data/app/controllers/event_import_results_controller.rb

@@ -1,15 +1,39 @@
-class EventImportResultsController < InheritedResources::Base
-  respond_to :html, :json, :txt
+class EventImportResultsController < ApplicationController
   load_and_authorize_resource
-  has_scope :file_id
-  actions :index, :show, :destroy
-
+  # GET /event_import_results
+  # GET /event_import_results.json
   def index
-    @event_import_file = EventImportFile.where(:id => params[:event_import_file_id]).first
+    @event_import_file = EventImportFile.where(id: params[:event_import_file_id]).first
     if @event_import_file
       @event_import_results = @event_import_file.event_import_results.page(params[:page])
     else
       @event_import_results = EventImportResult.page(params[:page])
     end
+
+    respond_to do |format|
+      format.html # index.html.erb
+      format.json { render json: @event_import_results }
+      format.txt
+    end
+  end
+
+  # GET /event_import_results/1
+  # GET /event_import_results/1.json
+  def show
+    respond_to do |format|
+      format.html # show.html.erb
+      format.json { render json: @event_import_result }
+    end
+  end
+
+  # DELETE /event_import_results/1
+  # DELETE /event_import_results/1.json
+  def destroy
+    @event_import_result.destroy
+
+    respond_to do |format|
+      format.html { redirect_to event_import_results_url, notice: t('controller.successfully_deleted', model: t('activerecord.models.event_import_result')) }
+      format.json { head :no_content }
+    end
   end
 end

data/app/models/event_import_file.rb

@@ -5,7 +5,7 @@ class EventImportFile < ActiveRecord::Base
     :default_library_id, :default_event_category_id
   default_scope {order('event_import_files.id DESC')}
   scope :not_imported, -> {in_state(:pending)}
-  scope :stucked, -> {in_state(:pending).where('created_at < ?', 1.hour.ago)}
+  scope :stucked, -> {in_state(:pending).where('event_import_files.created_at < ?', 1.hour.ago)}
 
   if Setting.uploaded_file.storage == :s3
     has_attached_file :event_import, :storage => :s3,

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

@@ -6,8 +6,11 @@
   <tr>
     <th id="position"></th>
     <th><%= t('activerecord.attributes.event_category.name') -%></th>
-    <th><%= t('activerecord.attributes.event_category.display_name') -%></th>
-    <th><%= t('activerecord.attributes.event_category.note') -%></th>
+    <th>
+      <%= t('activerecord.attributes.event_category.display_name') -%>
+      /
+      <%= t('activerecord.attributes.event_category.note') -%>
+    </th>
     <th></th>
   </tr>
 
@@ -18,22 +21,24 @@
         <%= move_position(event_category) -%>
       <%- end -%>
     </td>
-    <td><%= link_to event_category.name, event_category -%></td>
-    <td><%= link_to event_category.display_name.localize, event_category -%></td>
-    <td><%= event_category.note -%></td>
+    <td><%= event_category.name -%></td>
+    <td>
+      <%= link_to event_category.display_name.localize, event_category -%>
+      <br />
+      <%= event_category.note %>
+    </td>
     <td>
       <%- if can? :update, event_category -%>
         <%= link_to t('page.edit'), edit_event_category_path(event_category) -%>
       <% end %>
       <%- if can? :delete, event_category -%>
-        <%= link_to t('page.destroy'), event_category, data: {confirm: t('page.are_you_sure')}, method: :delete -%>
+        <%= link_to t('page.destroy'), event_category_path(event_category), data: {confirm: t('page.are_you_sure')}, method: :delete -%>
       <%- end -%>
     </td>
   </tr>
 <%- end -%>
 </table>
 
-<%= paginate(@event_categories) -%>
 </div>
 </div>
 

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

@@ -1,6 +1,7 @@
 <div id="content_detail" class="ui-corner-all ui-widget-content">
 <h1 class="title"><%= t('page.listing', model: t('activerecord.models.event_import_file')) -%></h1>
 <div id="content_list">
+<p id="notice"><%= notice %></p>
 
 <table class="table table-striped index">
   <thead>

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

@@ -1,6 +1,7 @@
 <div id="content_detail" class="ui-corner-all ui-widget-content">
 <h1 class="title"><%= t('page.listing', model: t('activerecord.models.event')) -%></h1>
 <div id="content_list">
+<p id="notice"><%= notice %></p>
 
 <%- if @library -%>
   <h2><%= link_to @library.display_name.localize, @library -%></h2>

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

@@ -7,6 +7,11 @@
   <%= @event.display_name.localize -%>
 </h2>
 
+<p>
+  <strong><%= t('activerecord.attributes.event.name') -%>:</strong>
+  <%= @event.name %>
+</p>
+
 <p>
   <strong><%= t('activerecord.models.event_category') -%>:</strong>
   <%= @event.event_category.display_name.localize -%>
@@ -17,27 +22,20 @@
   <%= link_to @event.library.display_name.localize, @event.library -%>
 </p>
 
-<%- if @event.all_day -%>
-  <p>
-    <strong><%= t('activerecord.attributes.event.start_at') -%>:</strong>
-    <%= l(@event.start_at, format: :only_date) -%>
-  </p>
-
-  <p>
-    <strong><%= t('activerecord.attributes.event.end_at') -%>:</strong>
-    <%= l(@event.end_at, format: :only_date) -%>
-  </p>
-<%- else -%>
-  <p>
-    <strong><%= t('activerecord.attributes.event.start_at') -%>:</strong>
-    <%= l(@event.start_at, format: :short) -%>
-  </p>
-
-  <p>
-    <strong><%= t('activerecord.attributes.event.end_at') -%>:</strong>
-    <%= l(@event.end_at, format: :short) -%>
-  </p>
-<%- end -%>
+<p>
+  <strong><%= t('activerecord.attributes.event.start_at') -%>:</strong>
+  <%= l(@event.start_at, format: :only_date) -%>
+</p>
+
+<p>
+  <strong><%= t('activerecord.attributes.event.end_at') -%>:</strong>
+  <%= l(@event.end_at, format: :only_date) -%>
+</p>
+
+<p>
+  <strong><%= t('activerecord.attributes.event.all_day') -%>:</strong>
+  <%= localized_boolean(@event.all_day) %>
+</p>
 
 <p>
   <strong><%= t('activerecord.attributes.event.note') -%>:</strong>

data/app/views/picture_files/_index_event.html.erb

@@ -0,0 +1,54 @@
+<div id="content_detail" class="ui-corner-all ui-widget-content">
+  <h1 class="title"><%= t('page.listing', model: t('activerecord.models.picture_file')) -%></h1>
+<div id="content_list">
+<p id="notice"><%= notice %></p>
+
+<h2 class="resource_title"><%= link_to event.display_name.localize, event -%></h2>
+
+<table class="table table-striped index">
+  <tr>
+    <th id="position"></th>
+    <th><%= t('page.attachable') -%></th>
+    <th><%= t('activerecord.attributes.picture_file.picture_file_size') -%></th>
+    <th><%= t('activerecord.attributes.picture_file.picture_content_type') -%></th>
+    <th><%= t('activerecord.attributes.picture_file.picture_file_name') -%></th>
+    <th></th>
+  </tr>
+  <%- @picture_files.each do |picture_file| -%>
+    <tr class="line<%= cycle("0", "1") -%>">
+      <td>
+        <%- if can? :update, picture_file -%>
+          <%= move_position(picture_file) -%>
+        <%- end -%>
+      </td>
+      <td>
+        <%= link_to "#{h(picture_file.picture_attachable_type)}/#{h(picture_file.picture_attachable_id)}", picture_file.picture_attachable if picture_file.picture_attachable -%>
+      </td>
+      <td><%= picture_file.picture_file_size -%></td>
+      <td><%= picture_file.picture_content_type -%></td>
+      <td><%= link_to picture_file.picture_file_name, picture_file_path(picture_file, format: :download, size: 'original') -%></td>
+      <td>
+        <%= link_to t('page.show'), picture_file -%>
+        <%- if can? :update, picture_file -%>
+          <%= link_to t('page.edit'), edit_picture_file_path(picture_file) -%>
+        <% end %>
+        <%- if can? :delete, picture_file -%>
+          <%= link_to t('page.destroy'), picture_file, data: {confirm: t('page.are_you_sure')}, method: :delete -%>
+        <%- end -%>
+      </td>
+    </tr>
+  <%- end -%>
+</table>
+
+<%= paginate(@picture_files) -%>
+</div>
+</div>
+
+<div id="submenu" class="ui-corner-all ui-widget-content">
+  <%- if can? :create, PictureFile -%>
+    <ul>
+      <li><%= link_to t('page.new', model: t('activerecord.models.picture_file')), new_picture_file_path(event_id: event.id) -%></li>
+      <li><%= link_to t('picture_file.all_picture'), picture_files_path -%></li>
+    </ul>
+  <%- end -%>
+</div>

data/lib/enju_event/engine.rb

@@ -1,6 +1,5 @@
 require "enju_seed"
-require "inherited_resources"
-require "has_scope"
+require "enju_message"
 require "paperclip"
 require "statesman"
 require "ri_cal"

data/lib/enju_event/version.rb

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

data/spec/dummy/private/system/event_import_files/event_imports/000/000/004/original/event_import_file_sample1.tsv

@@ -1,7 +1,7 @@
-name	category	library	start_at	end_at	all_day	note	dummy
-イベント名	カテゴリ。休館日の場合はclosed	図書館名	開始日	終了日	終日	注記	インポート省略
-hogehoge	おはなし会	kamata	2009-04-01	2009-04-03		無視（dummyあり）	t
-hogehoge		hachioji				失敗	
-休館日	closed	kamata	2011-04-01	2011-04-03		成功（end_atなし、all_dayあり）	
-イベント2		kamata	2014-07-01			失敗（end_atなし、all_dayなし）	
-イベント3			2014-07-01		t	成功（end_atなし、all_dayあり）	
+name	display_name	event_category	library	start_at	end_at	all_day	note	dummy	invalid
+イベント名	イベントの表示名	カテゴリ。休館日の場合はclosed	図書館名	開始日	終了日	終日	注記	インポート省略	この列は無視されます
+hogehoge	ほげほげ	おはなし会	kamata	2009-04-01	2009-04-03		無視（dummyあり）	t	
+event1			hachioji				失敗（start_atなし、end_atなし）		
+休館日1		closed	kamata	2011-04-01	2011-04-03	t	成功		
+event2	イベント2		kamata	2014-07-01			失敗（end_atなし）		
+event3	イベント3			2014-07-01	2014-07-31 14:00		成功		

data/spec/dummy/private/system/event_import_files/event_imports/000/000/004/original/event_import_file_sample2.tsv

@@ -1,3 +1,7 @@
-"name"	"library"	"start_at"	"end_at"
-"���{��̍Â���"	"kamata"	"2011-03-26"	"2011-03-27"
-"���{��̍Â���2"	"kamata"	"2011-03-26"	"2011-03-27"
+name	display_name	event_category	library	start_at	end_at	all_day	note	dummy	invalid
+�C�x���g��	�C�x���g�̕\����	�J�e�S���B�x�ٓ��̏ꍇ��closed	�}���ٖ�	�J�n��	�I����	�I��	���L	�C���|�[�g�ȗ�	���̗�͖�������܂�
+hogehoge	�ق��ق�	���͂Ȃ���	kamata	2009-04-01	2009-04-03		�����idummy����j	t	
+event1			hachioji				���s�istart_at�Ȃ��Aend_at�Ȃ��j		
+�x�ٓ�1		closed	kamata	2011-04-01	2011-04-03	t	����		
+event2	�C�x���g2		kamata	2014-07-01			���s�iend_at�Ȃ��j		
+event3	�C�x���g3			2014-07-01	2014-07-31 14:00		����		

data/spec/dummy/private/system/event_import_files/event_imports/000/000/004/original/event_update_file.tsv

@@ -1,4 +1,4 @@
-id	name	category	library	start_at	end_at	all_day	note	dummy
+id	name	event_category	library	start_at	end_at	all_day	note	dummy
 1	変更後のイベント名		kamata	2012-04-01	2012-04-02			
 2			mita		2012-04-03	FALSE		
 3	変更後のイベント名							この行は無視される

data/spec/dummy/public/system/event_export_files/event_exports/000/000/004/original/event_export_file_20140818-66894-1um2gwb.txt

@@ -0,0 +1,9 @@
+name	event_category	library	start_at	end_at	all_day
+仕事始め	unknown	kamata	2008-01-12 17:54:00 UTC	2008-01-13 17:54:00 UTC	false
+テスト	closed	kamata	2008-01-12 17:54:00 UTC	2008-01-13 17:54:00 UTC	false
+ミーティング	unknown	kamata	2008-01-12 15:00:00 UTC	2008-02-04 15:00:00 UTC	false
+テスト	movie_theater	hachioji	2008-02-04 15:00:00 UTC	2008-02-05 15:00:00 UTC	false
+test	unknown	kamata	2008-02-04 15:00:00 UTC	2008-02-07 15:00:00 UTC	false
+なんとかかんとか	closed	kamata	2008-02-04 15:00:00 UTC	2008-02-07 15:00:00 UTC	false
+test	unknown	kamata	2008-02-04 15:00:00 UTC	2008-02-07 15:00:00 UTC	false
+test	unknown	kamata	2008-02-05 06:00:00 UTC	2008-02-05 06:00:00 UTC	false

data/spec/dummy/public/system/event_export_files/event_exports/000/000/004/original/event_export_file_20140818-67059-j0f46.txt

@@ -0,0 +1,9 @@
+name	event_category	library	start_at	end_at	all_day
+仕事始め	unknown	kamata	2008-01-12 17:54:00 UTC	2008-01-13 17:54:00 UTC	false
+テスト	closed	kamata	2008-01-12 17:54:00 UTC	2008-01-13 17:54:00 UTC	false
+ミーティング	unknown	kamata	2008-01-12 15:00:00 UTC	2008-02-04 15:00:00 UTC	false
+テスト	movie_theater	hachioji	2008-02-04 15:00:00 UTC	2008-02-05 15:00:00 UTC	false
+test	unknown	kamata	2008-02-04 15:00:00 UTC	2008-02-07 15:00:00 UTC	false
+なんとかかんとか	closed	kamata	2008-02-04 15:00:00 UTC	2008-02-07 15:00:00 UTC	false
+test	unknown	kamata	2008-02-04 15:00:00 UTC	2008-02-07 15:00:00 UTC	false
+test	unknown	kamata	2008-02-05 06:00:00 UTC	2008-02-05 06:00:00 UTC	false

data/spec/dummy/tmp/cache/stdout

@@ -25,3 +25,54 @@
 [89189] 21 Jul 04:42:39.830 - 0 clients connected (0 slaves), 952944 bytes in use
 [89189] 21 Jul 04:42:44.899 - 0 clients connected (0 slaves), 952944 bytes in use
 [89189] 21 Jul 04:42:49.926 - 0 clients connected (0 slaves), 952944 bytes in use
+[66898] 18 Aug 12:55:34.308 * Increased maximum number of open files to 10032 (it was originally set to 256).
+                _._                                                  
+           _.-``__ ''-._                                             
+      _.-``    `.  `_.  ''-._           Redis 2.8.13 (00000000/0) 64 bit
+  .-`` .-```.  ```\/    _.,_ ''-._                                   
+ (    '      ,       .-`  | `,    )     Running in stand alone mode
+ |`-._`-...-` __...-.``-._|'` _.-'|     Port: 9736
+ |    `-._   `._    /     _.-'    |     PID: 66898
+  `-._    `-._  `-./  _.-'    _.-'                                   
+ |`-._`-._    `-.__.-'    _.-'_.-'|                                  
+ |    `-._`-._        _.-'_.-'    |           http://redis.io        
+  `-._    `-._`-.__.-'_.-'    _.-'                                   
+ |`-._`-._    `-.__.-'    _.-'_.-'|                                  
+ |    `-._`-._        _.-'_.-'    |                                  
+  `-._    `-._`-.__.-'_.-'    _.-'                                   
+      `-._    `-.__.-'    _.-'                                       
+          `-._        _.-'                                           
+              `-.__.-'                                               
+
+[66898] 18 Aug 12:55:34.317 # Server started, Redis version 2.8.13
+[66898] 18 Aug 12:55:34.317 * The server is now ready to accept connections on port 9736
+[66898] 18 Aug 12:55:35.313 - 0 clients connected (0 slaves), 952944 bytes in use
+[66898] 18 Aug 12:55:40.352 - 0 clients connected (0 slaves), 952944 bytes in use
+[66898] 18 Aug 12:55:45.391 - 0 clients connected (0 slaves), 952944 bytes in use
+[66898] 18 Aug 12:55:50.434 - 0 clients connected (0 slaves), 952944 bytes in use
+[66898] 18 Aug 12:55:55.473 - 0 clients connected (0 slaves), 952944 bytes in use
+[67064] 18 Aug 12:57:05.792 * Increased maximum number of open files to 10032 (it was originally set to 256).
+                _._                                                  
+           _.-``__ ''-._                                             
+      _.-``    `.  `_.  ''-._           Redis 2.8.13 (00000000/0) 64 bit
+  .-`` .-```.  ```\/    _.,_ ''-._                                   
+ (    '      ,       .-`  | `,    )     Running in stand alone mode
+ |`-._`-...-` __...-.``-._|'` _.-'|     Port: 9736
+ |    `-._   `._    /     _.-'    |     PID: 67064
+  `-._    `-._  `-./  _.-'    _.-'                                   
+ |`-._`-._    `-.__.-'    _.-'_.-'|                                  
+ |    `-._`-._        _.-'_.-'    |           http://redis.io        
+  `-._    `-._`-.__.-'_.-'    _.-'                                   
+ |`-._`-._    `-.__.-'    _.-'_.-'|                                  
+ |    `-._`-._        _.-'_.-'    |                                  
+  `-._    `-._`-.__.-'_.-'    _.-'                                   
+      `-._    `-.__.-'    _.-'                                       
+          `-._        _.-'                                           
+              `-.__.-'                                               
+
+[67064] 18 Aug 12:57:05.793 # Server started, Redis version 2.8.13
+[67064] 18 Aug 12:57:05.794 * The server is now ready to accept connections on port 9736
+[67064] 18 Aug 12:57:05.794 - 0 clients connected (0 slaves), 952944 bytes in use
+[67064] 18 Aug 12:57:10.831 - 0 clients connected (0 slaves), 952944 bytes in use
+[67064] 18 Aug 12:57:15.875 - 0 clients connected (0 slaves), 952944 bytes in use
+[67064] 18 Aug 12:57:20.918 - 0 clients connected (0 slaves), 952944 bytes in use

data/spec/dummy/tmp/pids/redis-test.pid

@@ -1 +1 @@
-89189
+67064

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: enju_event
 version: !ruby/object:Gem::Version
-  version: 0.1.17.pre19
+  version: 0.1.17.pre20
 platform: ruby
 authors:
 - Kosuke Tanabe
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-16 00:00:00.000000000 Z
+date: 2014-08-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: event-calendar
@@ -38,20 +38,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: inherited_resources
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: paperclip
   requirement: !ruby/object:Gem::Requirement
@@ -86,14 +72,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.14.pre16
+        version: 0.1.14.pre17
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.14.pre16
+        version: 0.1.14.pre17
 - !ruby/object:Gem::Dependency
   name: enju_seed
   requirement: !ruby/object:Gem::Requirement
@@ -184,14 +170,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.1.0.rc13
+        version: 1.1.0.rc14
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.1.0.rc13
+        version: 1.1.0.rc14
 - !ruby/object:Gem::Dependency
   name: sunspot_solr
   requirement: !ruby/object:Gem::Requirement
@@ -340,6 +326,7 @@ files:
 - app/views/participates/index.html.erb
 - app/views/participates/new.html.erb
 - app/views/participates/show.html.erb
+- app/views/picture_files/_index_event.html.erb
 - app/workers/event_export_file_queue.rb
 - app/workers/event_import_file_queue.rb
 - config/locales/translation_en.yml
@@ -582,6 +569,8 @@ files:
 - spec/dummy/public/422.html
 - spec/dummy/public/500.html
 - spec/dummy/public/favicon.ico
+- spec/dummy/public/system/event_export_files/event_exports/000/000/004/original/event_export_file_20140818-66894-1um2gwb.txt
+- spec/dummy/public/system/event_export_files/event_exports/000/000/004/original/event_export_file_20140818-67059-j0f46.txt
 - spec/dummy/script/rails
 - spec/dummy/solr/conf/admin-extra.html
 - spec/dummy/solr/conf/elevate.xml
@@ -593,38 +582,38 @@ files:
 - spec/dummy/solr/conf/spellings.txt
 - spec/dummy/solr/conf/stopwords.txt
 - spec/dummy/solr/conf/synonyms.txt
-- spec/dummy/solr/default/data/index/_1dz.fdt
-- spec/dummy/solr/default/data/index/_1dz.fdx
-- spec/dummy/solr/default/data/index/_1dz.fnm
-- spec/dummy/solr/default/data/index/_1dz.nvd
-- spec/dummy/solr/default/data/index/_1dz.nvm
-- spec/dummy/solr/default/data/index/_1dz.si
-- spec/dummy/solr/default/data/index/_1dz_Lucene41_0.doc
-- spec/dummy/solr/default/data/index/_1dz_Lucene41_0.pos
-- spec/dummy/solr/default/data/index/_1dz_Lucene41_0.tim
-- spec/dummy/solr/default/data/index/_1dz_Lucene41_0.tip
-- spec/dummy/solr/default/data/index/_1e0.fdt
-- spec/dummy/solr/default/data/index/_1e0.fdx
-- spec/dummy/solr/default/data/index/_1e0.fnm
-- spec/dummy/solr/default/data/index/_1e0.nvd
-- spec/dummy/solr/default/data/index/_1e0.nvm
-- spec/dummy/solr/default/data/index/_1e0.si
-- spec/dummy/solr/default/data/index/_1e0_Lucene41_0.doc
-- spec/dummy/solr/default/data/index/_1e0_Lucene41_0.pos
-- spec/dummy/solr/default/data/index/_1e0_Lucene41_0.tim
-- spec/dummy/solr/default/data/index/_1e0_Lucene41_0.tip
+- spec/dummy/solr/default/data/index/_1fd.fdt
+- spec/dummy/solr/default/data/index/_1fd.fdx
+- spec/dummy/solr/default/data/index/_1fd.fnm
+- spec/dummy/solr/default/data/index/_1fd.nvd
+- spec/dummy/solr/default/data/index/_1fd.nvm
+- spec/dummy/solr/default/data/index/_1fd.si
+- spec/dummy/solr/default/data/index/_1fd_Lucene41_0.doc
+- spec/dummy/solr/default/data/index/_1fd_Lucene41_0.pos
+- spec/dummy/solr/default/data/index/_1fd_Lucene41_0.tim
+- spec/dummy/solr/default/data/index/_1fd_Lucene41_0.tip
+- spec/dummy/solr/default/data/index/_1fe.fdt
+- spec/dummy/solr/default/data/index/_1fe.fdx
+- spec/dummy/solr/default/data/index/_1fe.fnm
+- spec/dummy/solr/default/data/index/_1fe.nvd
+- spec/dummy/solr/default/data/index/_1fe.nvm
+- spec/dummy/solr/default/data/index/_1fe.si
+- spec/dummy/solr/default/data/index/_1fe_Lucene41_0.doc
+- spec/dummy/solr/default/data/index/_1fe_Lucene41_0.pos
+- spec/dummy/solr/default/data/index/_1fe_Lucene41_0.tim
+- spec/dummy/solr/default/data/index/_1fe_Lucene41_0.tip
 - spec/dummy/solr/default/data/index/segments.gen
-- spec/dummy/solr/default/data/index/segments_1yj
-- spec/dummy/solr/default/data/tlog/tlog.0000000000000002528
-- spec/dummy/solr/default/data/tlog/tlog.0000000000000002529
-- spec/dummy/solr/default/data/tlog/tlog.0000000000000002530
-- spec/dummy/solr/default/data/tlog/tlog.0000000000000002531
-- spec/dummy/solr/default/data/tlog/tlog.0000000000000002532
-- spec/dummy/solr/default/data/tlog/tlog.0000000000000002533
-- spec/dummy/solr/default/data/tlog/tlog.0000000000000002534
-- spec/dummy/solr/default/data/tlog/tlog.0000000000000002535
-- spec/dummy/solr/default/data/tlog/tlog.0000000000000002536
-- spec/dummy/solr/default/data/tlog/tlog.0000000000000002537
+- spec/dummy/solr/default/data/index/segments_20r
+- spec/dummy/solr/default/data/tlog/tlog.0000000000000002608
+- spec/dummy/solr/default/data/tlog/tlog.0000000000000002609
+- spec/dummy/solr/default/data/tlog/tlog.0000000000000002610
+- spec/dummy/solr/default/data/tlog/tlog.0000000000000002611
+- spec/dummy/solr/default/data/tlog/tlog.0000000000000002612
+- spec/dummy/solr/default/data/tlog/tlog.0000000000000002613
+- spec/dummy/solr/default/data/tlog/tlog.0000000000000002614
+- spec/dummy/solr/default/data/tlog/tlog.0000000000000002615
+- spec/dummy/solr/default/data/tlog/tlog.0000000000000002616
+- spec/dummy/solr/default/data/tlog/tlog.0000000000000002617
 - spec/dummy/solr/development/data/index/segments.gen
 - spec/dummy/solr/development/data/index/segments_1
 - spec/dummy/solr/solr.xml
@@ -929,6 +918,8 @@ test_files:
 - spec/dummy/public/422.html
 - spec/dummy/public/500.html
 - spec/dummy/public/favicon.ico
+- spec/dummy/public/system/event_export_files/event_exports/000/000/004/original/event_export_file_20140818-66894-1um2gwb.txt
+- spec/dummy/public/system/event_export_files/event_exports/000/000/004/original/event_export_file_20140818-67059-j0f46.txt
 - spec/dummy/Rakefile
 - spec/dummy/script/rails
 - spec/dummy/solr/conf/admin-extra.html
@@ -941,38 +932,38 @@ test_files:
 - spec/dummy/solr/conf/spellings.txt
 - spec/dummy/solr/conf/stopwords.txt
 - spec/dummy/solr/conf/synonyms.txt
-- spec/dummy/solr/default/data/index/_1dz.fdt
-- spec/dummy/solr/default/data/index/_1dz.fdx
-- spec/dummy/solr/default/data/index/_1dz.fnm
-- spec/dummy/solr/default/data/index/_1dz.nvd
-- spec/dummy/solr/default/data/index/_1dz.nvm
-- spec/dummy/solr/default/data/index/_1dz.si
-- spec/dummy/solr/default/data/index/_1dz_Lucene41_0.doc
-- spec/dummy/solr/default/data/index/_1dz_Lucene41_0.pos
-- spec/dummy/solr/default/data/index/_1dz_Lucene41_0.tim
-- spec/dummy/solr/default/data/index/_1dz_Lucene41_0.tip
-- spec/dummy/solr/default/data/index/_1e0.fdt
-- spec/dummy/solr/default/data/index/_1e0.fdx
-- spec/dummy/solr/default/data/index/_1e0.fnm
-- spec/dummy/solr/default/data/index/_1e0.nvd
-- spec/dummy/solr/default/data/index/_1e0.nvm
-- spec/dummy/solr/default/data/index/_1e0.si
-- spec/dummy/solr/default/data/index/_1e0_Lucene41_0.doc
-- spec/dummy/solr/default/data/index/_1e0_Lucene41_0.pos
-- spec/dummy/solr/default/data/index/_1e0_Lucene41_0.tim
-- spec/dummy/solr/default/data/index/_1e0_Lucene41_0.tip
+- spec/dummy/solr/default/data/index/_1fd.fdt
+- spec/dummy/solr/default/data/index/_1fd.fdx
+- spec/dummy/solr/default/data/index/_1fd.fnm
+- spec/dummy/solr/default/data/index/_1fd.nvd
+- spec/dummy/solr/default/data/index/_1fd.nvm
+- spec/dummy/solr/default/data/index/_1fd.si
+- spec/dummy/solr/default/data/index/_1fd_Lucene41_0.doc
+- spec/dummy/solr/default/data/index/_1fd_Lucene41_0.pos
+- spec/dummy/solr/default/data/index/_1fd_Lucene41_0.tim
+- spec/dummy/solr/default/data/index/_1fd_Lucene41_0.tip
+- spec/dummy/solr/default/data/index/_1fe.fdt
+- spec/dummy/solr/default/data/index/_1fe.fdx
+- spec/dummy/solr/default/data/index/_1fe.fnm
+- spec/dummy/solr/default/data/index/_1fe.nvd
+- spec/dummy/solr/default/data/index/_1fe.nvm
+- spec/dummy/solr/default/data/index/_1fe.si
+- spec/dummy/solr/default/data/index/_1fe_Lucene41_0.doc
+- spec/dummy/solr/default/data/index/_1fe_Lucene41_0.pos
+- spec/dummy/solr/default/data/index/_1fe_Lucene41_0.tim
+- spec/dummy/solr/default/data/index/_1fe_Lucene41_0.tip
 - spec/dummy/solr/default/data/index/segments.gen
-- spec/dummy/solr/default/data/index/segments_1yj
-- spec/dummy/solr/default/data/tlog/tlog.0000000000000002528
-- spec/dummy/solr/default/data/tlog/tlog.0000000000000002529
-- spec/dummy/solr/default/data/tlog/tlog.0000000000000002530
-- spec/dummy/solr/default/data/tlog/tlog.0000000000000002531
-- spec/dummy/solr/default/data/tlog/tlog.0000000000000002532
-- spec/dummy/solr/default/data/tlog/tlog.0000000000000002533
-- spec/dummy/solr/default/data/tlog/tlog.0000000000000002534
-- spec/dummy/solr/default/data/tlog/tlog.0000000000000002535
-- spec/dummy/solr/default/data/tlog/tlog.0000000000000002536
-- spec/dummy/solr/default/data/tlog/tlog.0000000000000002537
+- spec/dummy/solr/default/data/index/segments_20r
+- spec/dummy/solr/default/data/tlog/tlog.0000000000000002608
+- spec/dummy/solr/default/data/tlog/tlog.0000000000000002609
+- spec/dummy/solr/default/data/tlog/tlog.0000000000000002610
+- spec/dummy/solr/default/data/tlog/tlog.0000000000000002611
+- spec/dummy/solr/default/data/tlog/tlog.0000000000000002612
+- spec/dummy/solr/default/data/tlog/tlog.0000000000000002613
+- spec/dummy/solr/default/data/tlog/tlog.0000000000000002614
+- spec/dummy/solr/default/data/tlog/tlog.0000000000000002615
+- spec/dummy/solr/default/data/tlog/tlog.0000000000000002616
+- spec/dummy/solr/default/data/tlog/tlog.0000000000000002617
 - spec/dummy/solr/development/data/index/segments.gen
 - spec/dummy/solr/development/data/index/segments_1
 - spec/dummy/solr/solr.xml