enju_event 0.1.17.pre21 → 0.1.17.pre22

data/app/controllers/calendar_controller.rb

@@ -11,11 +11,12 @@ class CalendarController < ApplicationController
     @shown_month = Time.zone.local(@year, @month, 1) rescue Time.zone.now
 
     # TODO: Solrを使って取得
-    if get_library
-      @event_strips = Event.at(@library).event_strips_for_month(@shown_month)
-    else
-      @event_strips = Event.event_strips_for_month(@shown_month)
-    end
+    #if get_library
+    #  @event_strips = Event.at(@library).event_strips_for_month(@shown_month)
+    #else
+      #@event_strips = Event.event_strips_for_month(@shown_month)
+      @event_strips = Event.all
+    #end
     get_libraries
   end
 

data/app/controllers/events_controller.rb

@@ -45,7 +45,7 @@ class EventsController < ApplicationController
 
     respond_to do |format|
       format.html # index.html.erb
-      format.json { render json: @events }
+      format.json
       format.rss  { render layout: false }
       format.txt
       format.atom

data/app/models/event.rb

@@ -3,7 +3,7 @@ class Event < ActiveRecord::Base
   attr_accessible :library_id, :event_category_id, :name, :note, :start_at,
     :end_at, :all_day, :display_name
 
-  scope :closing_days, -> { includes(:event_category).where('event_categories.name = ?', 'closed') }
+  scope :closing_days, -> { includes(:event_category).where('event_categories.name' => 'closed') }
   scope :on, lambda {|datetime| where('start_at >= ? AND start_at < ?', datetime.beginning_of_day, datetime.tomorrow.beginning_of_day + 1)}
   scope :past, lambda {|datetime| where('end_at <= ?', Time.zone.parse(datetime).beginning_of_day)}
   scope :upcoming, lambda {|datetime| where('start_at >= ?', Time.zone.parse(datetime).beginning_of_day)}
@@ -16,8 +16,6 @@ class Event < ActiveRecord::Base
   has_many :agents, through: :participates
   has_one :event_import_result
 
-  has_event_calendar
-
   searchable do
     text :name, :note
     integer :library_id

data/app/models/event_import_result.rb

@@ -1,7 +1,7 @@
 class EventImportResult < ActiveRecord::Base
   attr_accessible :event_id, :event_import_file_id, :body, as: :admin
   default_scope { order('event_import_results.id') }
-  scope :file_id, proc{|file_id| {:conditions => {:event_import_file_id => file_id}}}
+  scope :file_id, proc{|file_id| where(event_import_file_id: file_id)}
   scope :failed, -> { where(event_id: nil) }
 
   belongs_to :event_import_file

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

@@ -0,0 +1,13 @@
+    <p>
+    </p>
+
+    <div id="calendar"></div>
+
+<script>
+  $(document).ready(function() {
+    $('#calendar').fullCalendar({
+      events: '<%= url_for(params.merge(format: :json, only_path: true)) %>',
+      lang: '<%= @locale.to_s %>'
+    });
+  });
+</script>

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

@@ -9,74 +9,82 @@
   <h2><%= t('event.all_libraries') -%></h2>
 <%- end -%>
 
-<%= 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')} -%>
-    <%= submit_tag t('page.search') -%>
-  </p>
-<%- end -%>
+<% if params[:mode] == 'calendar' %>
+  <%= render 'calendar' %>
+<% else %>
+  <%= 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')} -%>
+      <%= submit_tag t('page.search') -%>
+    </p>
+  <%- end -%>
 
-<p>
-  <%- case params[:mode]
+  <p>
+    <%- case params[:mode]
       when 'upcoming' -%>
-    <%= 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)) -%>
-  <%- 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)) -%>
-    <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)) -%>
-  <%- end -%>
-</p>
+      <%= 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)) -%>
+    <%- 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)) -%>
+      <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)) -%>
+    <%- end -%>
+  </p>
 
-<table class="table table-striped index">
-  <tr>
-    <th><%= t('activerecord.models.library') -%></th>
-    <th><%= t('activerecord.attributes.event.name') -%></th>
-    <th></th>
-  </tr>
+  <table class="table table-striped index">
+    <tr>
+      <th><%= t('activerecord.models.library') -%></th>
+      <th><%= t('activerecord.attributes.event.name') -%></th>
+      <th></th>
+    </tr>
 
-<%- @events.each_with_index do |event, i| -%>
-  <tr class="line<%= cycle("0", "1") -%>">
-    <td>
-      <%= link_to event.library.display_name.localize, event.library -%>
-      <br />
-      <%= event.event_category.display_name.localize -%>
-    </td>
-    <td>
-      <%= link_to event.display_name.localize, event -%>
-      <br />
-      <%= l(event.start_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 -%>
-      <%- end -%>
-    </td>
-  </tr>
-<%- end -%>
-</table>
+  <%- @events.each_with_index do |event, i| -%>
+    <tr class="line<%= cycle("0", "1") -%>">
+      <td>
+        <%= link_to event.library.display_name.localize, event.library -%>
+        <br />
+        <%= event.event_category.display_name.localize -%>
+      </td>
+      <td>
+        <%= link_to event.display_name.localize, event -%>
+        <br />
+        <%= l(event.start_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 -%>
+        <%- end -%>
+      </td>
+    </tr>
+  <%- end -%>
+  </table>
 
-<%= paginate(@events) -%>
+  <%= paginate(@events) -%>
+<% end %>
 </div>
 </div>
 
 <div id="submenu" class="ui-corner-all ui-widget-content">
   <ul>
-    <li><%= link_to t('page.calendar'), calendar_path -%></li>
+    <% if params[:mode] == 'calendar' %>
+      <li><%= link_to t('event.table'), url_for(params.merge(mode: nil)) -%></li>
+    <% else %>
+      <li><%= link_to t('event.calendar'), url_for(params.merge(mode: 'calendar')) -%></li>
+    <% end %>
   </ul>
   <ul>
     <%- 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_event_path(library_id: @library.name) -%></li>
         <%- else -%>
           <li><%= link_to t('page.new', model: t('activerecord.models.event')), new_event_path(date: params[:date]) -%></li>
         <%- end -%>
@@ -85,21 +93,28 @@
     <%- end -%>
   </ul>
   <ul>
+    <li><%= link_to t('event.all_libraries'), events_path(mode: params[:mode]) -%></li>
     <%- @libraries.each do |library| -%>
-      <li><%= link_to library.display_name.localize, library_events_path(library) -%></li>
+      <li><%= link_to library.display_name.localize, events_path(library_id: library.name, mode: params[:mode]) -%></li>
     <%- end -%>
   </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: '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) -%>)
+      <%= link_to (image_tag 'icons/feed.png', size: '16x16', alt: t('page.feed'), class: 'icon'), events_path(library_id: @library.name, format: :rss) -%>
+      (<%= link_to 'RSS', events_path(library_id: @library.name, format: :rss) -%>)
+      <%= link_to (image_tag 'icons/page_white_excel.png', size: '16x16', alt: 'TSV', class: 'icon'), events_path(library_id: @library.name, format: :txt, locale: @locale.to_s) -%>
+      (<%= link_to 'TSV', events_path(library_id: @library.name, format: :txt, locale: @locale.to_s) -%>)
+      <br />
+      <%= link_to (image_tag 'icons/calendar.png', size: '16x16', alt: 'iCalendar', class: 'icon'), events_path(library_id: @library.name, format: :ics, locale: @locale.to_s) -%>
+      (<%= link_to 'iCalendar', events_path(library_id: @library.name, format: :ics, 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: 'TSV', class: 'icon'), events_path(format: :txt, locale: @locale.to_s) -%>
       (<%= link_to 'TSV', events_path(format: :txt, locale: @locale.to_s) -%>)
+      <br />
+      <%= link_to (image_tag 'icons/calendar.png', size: '16x16', alt: 'iCalendar', class: 'icon'), events_path(format: :ics, locale: @locale.to_s) -%>
+      (<%= link_to 'iCalendar', events_path(format: :ics, locale: @locale.to_s) -%>)
     <%- end -%>
   </p>
   <%= render 'page/login' unless current_user -%>

data/app/views/events/index.json.jbuilder

@@ -0,0 +1,13 @@
+json.array!(@events) do |event|
+  json.extract! event, :id
+  json.title event.display_name.localize
+  if event.all_day
+    json.start event.start_at.iso8601
+    json.end event.end_at.tomorrow.beginning_of_day.iso8601
+    json.allDay event.all_day
+  else
+    json.start event.start_at.iso8601
+    json.end event.end_at.iso8601
+  end
+  json.url event_url(event)
+end

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

@@ -9,7 +9,7 @@
 <div id="submenu" class="ui-corner-all ui-widget-content">
   <ul>
     <%- if @library -%>
-      <li><%= link_to t('page.back'), library_events_path(@library) -%></li>
+      <li><%= link_to t('page.back'), events_path(library_id: @library.name) -%></li>
     <%- else -%>
       <li><%= link_to t('page.back'), events_path -%></li>
     <%- end -%>

data/config/locales/translation_ja.yml

@@ -50,6 +50,8 @@ ja:
     all: "全ての催し物"
     past: "過去の催し物"
     upcoming: "今後の催し物"
+    table: 一覧表示
+    calendar: カレンダー表示
   calendar:
     calendar: "カレンダー"
     library_calendar: "%{library_name}のカレンダー"

data/config/routes.rb

@@ -3,16 +3,8 @@ Rails.application.routes.draw do
 
   resources :event_import_files
 
-  resources :events do
-    resources :picture_files
-  end
+  resources :events
   resources :event_categories
-  resources :libraries do
-    resources :events
-  end
   resources :event_import_results, :only => [:index, :show, :destroy]
   resources :participates
-
-  get '/calendar(/:year(/:month))' => 'calendar#index', :as => :calendar, :constraints => {:year => /\d{4}/, :month => /\d{1,2}/}
-  get "/calendar/:year/:month/:day" => "calendar#show"
 end

data/lib/enju_event.rb

@@ -1,5 +1,4 @@
 require "enju_event/engine"
-require 'event_calendar'
 
 module EnjuEvent
   def self.included(base)

data/lib/enju_event/engine.rb

@@ -9,6 +9,7 @@ begin
   require 'charlock_holmes/string'
 rescue LoadError
 end
+require "protected_attributes" if Rails::VERSION::MAJOR == 4
 
 module EnjuEvent
   class Engine < ::Rails::Engine

data/lib/enju_event/version.rb

@@ -1,3 +1,3 @@
 module EnjuEvent
-  VERSION = "0.1.17.pre21"
+  VERSION = "0.1.17.pre22"
 end

data/spec/controllers/events_controller_spec.rb

@@ -55,8 +55,8 @@ describe EventsController do
         assigns(:events).should_not be_nil
       end
 
-      it "assigns all events as @events in csv format" do
-        get :index, :format => 'csv'
+      it "assigns all events as @events in txt format" do
+        get :index, :format => 'txt'
         assigns(:events).should_not be_nil
       end
 

data/spec/dummy/config/boot.rb

@@ -1,5 +1,5 @@
 require 'rubygems'
-gemfile = File.expand_path('../../../../Gemfile', __FILE__)
+gemfile = ENV['BUNDLE_GEMFILE'] || File.expand_path('../../../../Gemfile', __FILE__)
 
 if File.exist?(gemfile)
   ENV['BUNDLE_GEMFILE'] = gemfile
@@ -7,4 +7,4 @@ if File.exist?(gemfile)
   Bundler.setup
 end
 
-$:.unshift File.expand_path('../../../../lib', __FILE__)
+$:.unshift File.expand_path('../../../../lib', __FILE__)

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

@@ -0,0 +1,90 @@
+# FriendlyId Global Configuration
+#
+# Use this to set up shared configuration options for your entire application.
+# Any of the configuration options shown here can also be applied to single
+# models by passing arguments to the `friendly_id` class method or defining
+# methods in your model.
+#
+# To learn more, check out the guide:
+#
+# http://norman.github.io/friendly_id/file.Guide.html
+
+if Rails::VERSION::MAJOR == 4
+FriendlyId.defaults do |config|
+  # ## Reserved Words
+  #
+  # Some words could conflict with Rails's routes when used as slugs, or are
+  # undesirable to allow as slugs. Edit this list as needed for your app.
+  config.use :reserved
+
+  config.reserved_words = %w(new edit index session login logout users admin
+    stylesheets assets javascripts images)
+
+  #  ## Friendly Finders
+  #
+  # Uncomment this to use friendly finders in all models. By default, if
+  # you wish to find a record by its friendly id, you must do:
+  #
+  #    MyModel.friendly.find('foo')
+  #
+  # If you uncomment this, you can do:
+  #
+  #    MyModel.find('foo')
+  #
+  # This is significantly more convenient but may not be appropriate for
+  # all applications, so you must explicity opt-in to this behavior. You can
+  # always also configure it on a per-model basis if you prefer.
+  #
+  # Something else to consider is that using the :finders addon boosts
+  # performance because it will avoid Rails-internal code that makes runtime
+  # calls to `Module.extend`.
+  #
+  config.use :finders
+  #
+  # ## Slugs
+  #
+  # Most applications will use the :slugged module everywhere. If you wish
+  # to do so, uncomment the following line.
+  #
+  # config.use :slugged
+  #
+  # By default, FriendlyId's :slugged addon expects the slug column to be named
+  # 'slug', but you can change it if you wish.
+  #
+  # config.slug_column = 'slug'
+  #
+  # When FriendlyId can not generate a unique ID from your base method, it appends
+  # a UUID, separated by a single dash. You can configure the character used as the
+  # separator. If you're upgrading from FriendlyId 4, you may wish to replace this
+  # with two dashes.
+  #
+  # config.sequence_separator = '-'
+  #
+  #  ## Tips and Tricks
+  #
+  #  ### Controlling when slugs are generated
+  #
+  # As of FriendlyId 5.0, new slugs are generated only when the slug field is
+  # nil, but if you're using a column as your base method can change this
+  # behavior by overriding the `should_generate_new_friendly_id` method that
+  # FriendlyId adds to your model. The change below makes FriendlyId 5.0 behave
+  # more like 4.0.
+  #
+  # config.use Module.new {
+  #   def should_generate_new_friendly_id?
+  #     slug.blank? || <your_column_name_here>_changed?
+  #   end
+  # }
+  #
+  # FriendlyId uses Rails's `parameterize` method to generate slugs, but for
+  # languages that don't use the Roman alphabet, that's not usually suffient. Here
+  # we use the Babosa library to transliterate Russian Cyrillic slugs to ASCII. If
+  # you use this, don't forget to add "babosa" to your Gemfile.
+  #
+  # config.use Module.new {
+  #   def normalize_friendly_id(text)
+  #     text.to_slug.normalize! :transliterations => [:russian, :latin]
+  #   end
+  # }
+end
+end

data/spec/dummy/db/schema.rb

@@ -61,7 +61,6 @@ ActiveRecord::Schema.define(:version => 20140823095740) do
   create_table "agent_import_results", :force => true do |t|
     t.integer  "agent_import_file_id"
     t.integer  "agent_id"
-    t.integer  "user_id"
     t.text     "body"
     t.datetime "created_at",           :null => false
     t.datetime "updated_at",           :null => false
@@ -98,7 +97,6 @@ ActiveRecord::Schema.define(:version => 20140823095740) do
   end
 
   create_table "agents", :force => true do |t|
-    t.integer  "user_id"
     t.string   "last_name"
     t.string   "middle_name"
     t.string   "first_name"
@@ -151,7 +149,6 @@ ActiveRecord::Schema.define(:version => 20140823095740) do
   add_index "agents", ["full_name"], :name => "index_agents_on_full_name"
   add_index "agents", ["language_id"], :name => "index_agents_on_language_id"
   add_index "agents", ["required_role_id"], :name => "index_agents_on_required_role_id"
-  add_index "agents", ["user_id"], :name => "index_agents_on_user_id", :unique => true
 
   create_table "baskets", :force => true do |t|
     t.integer  "user_id"
@@ -426,8 +423,8 @@ ActiveRecord::Schema.define(:version => 20140823095740) do
   end
 
   create_table "events", :force => true 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"
@@ -453,15 +450,6 @@ ActiveRecord::Schema.define(:version => 20140823095740) do
   add_index "exemplifies", ["item_id"], :name => "index_exemplifies_on_item_id", :unique => true
   add_index "exemplifies", ["manifestation_id"], :name => "index_exemplifies_on_manifestation_id"
 
-  create_table "extents", :force => true do |t|
-    t.string   "name",         :null => false
-    t.text     "display_name"
-    t.text     "note"
-    t.integer  "position"
-    t.datetime "created_at",   :null => false
-    t.datetime "updated_at",   :null => false
-  end
-
   create_table "form_of_works", :force => true do |t|
     t.string   "name",         :null => false
     t.text     "display_name"
@@ -742,7 +730,6 @@ ActiveRecord::Schema.define(:version => 20140823095740) do
     t.string   "access_address"
     t.integer  "language_id",                     :default => 1,     :null => false
     t.integer  "carrier_type_id",                 :default => 1,     :null => false
-    t.integer  "extent_id",                       :default => 1,     :null => false
     t.integer  "start_page"
     t.integer  "end_page"
     t.integer  "height"
@@ -1152,7 +1139,7 @@ ActiveRecord::Schema.define(:version => 20140823095740) do
   end
 
   add_index "series_statement_merges", ["series_statement_id"], :name => "index_series_statement_merges_on_series_statement_id"
-  add_index "series_statement_merges", ["series_statement_merge_list_id"], :name => "index_series_statement_merges_on_series_statement_merge_list_id"
+  add_index "series_statement_merges", ["series_statement_merge_list_id"], :name => "index_series_statement_merges_on_list_id"
 
   create_table "series_statements", :force => true do |t|
     t.text     "original_title"