enju_event 0.0.27 → 0.1.0

data/app/models/event_import_result.rb

@@ -1,5 +1,4 @@
 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 :failed, where(:event_id => nil)

data/app/models/participate.rb

@@ -1,5 +1,4 @@
 class Participate < ActiveRecord::Base
-  attr_accessible :patron_id, :event_id
   belongs_to :patron
   belongs_to :event
 

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

@@ -2,7 +2,7 @@
 <h1 class="title"><%= t('page.listing', :model => t('activerecord.models.event_category')) -%></h1>
 <div id="content_list">
 
-<table class="table table-striped index">
+<table class="index">
   <tr>
     <th id="position"></th>
     <th><%= t('activerecord.attributes.event_category.name') -%></th>
@@ -26,7 +26,7 @@
         <%= link_to t('page.edit'), edit_event_category_path(event_category) -%>
       <% end %>
       <%- if can? :destroy, 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, :confirm => t('page.are_you_sure'), :method => :delete -%>
       <%- end -%>
     </td>
   </tr>

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

@@ -2,11 +2,11 @@
 <h1 class="title"><%= t('page.listing', :model => t('activerecord.models.event_import_file')) -%></h1>
 <div id="content_list">
 
-<table class="table table-striped index">
+<table class="index">
   <tr>
     <th>Id</th>
     <th><%= t('activerecord.attributes.event_import_file.event_import_file_name') -%></th>
-    <th><%= t('activerecord.attributes.event_import_file.executed_at') -%></th>
+    <th><%= t('activerecord.attributes.event_import_file.imported_at') -%></th>
     <th><%= t('activerecord.models.user') -%></th>
     <th><%= t('activerecord.attributes.event_import_file.edit_mode') -%></th>
     <th><%= t('activerecord.attributes.event_import_file.state') -%></th>
@@ -17,13 +17,13 @@
   <tr class="line<%= cycle("0", "1") -%>">
     <td><%= link_to (event_import_file.id), event_import_file -%></td>
     <td><%= link_to event_import_file.event_import_file_name, event_import_file -%></td>
-    <td><%= l(event_import_file.executed_at) if event_import_file.executed_at -%></td>
+    <td><%= l(event_import_file.imported_at) if event_import_file.imported_at -%></td>
     <td><%= link_to event_import_file.user.username, event_import_file.user -%></td>
     <td><%= event_import_file.edit_mode -%></td>
     <td><%= localized_state(event_import_file.state) -%></td>
     <td>
       <%= link_to t('page.show'), event_import_file -%>
-      <%= link_to t('page.destroy'), event_import_file, :data => {:confirm => t('page.are_you_sure')}, :method => :delete -%>
+      <%= link_to t('page.destroy'), event_import_file, :confirm => t('page.are_you_sure'), :method => :delete -%>
     </td>
   </tr>
 <%- end -%>

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

@@ -10,6 +10,7 @@
     <%= f.file_field :event_import -%>
   </div>
 
+  <!--
   <div class="field">
     <%= f.label :edit_mode -%><br />
     <%= f.radio_button :edit_mode, 'create', :checked => 'checked' %>
@@ -19,6 +20,7 @@
     <%= f.radio_button :edit_mode, 'destroy' %>
     <%= f.label :edit_mode, t('page.destroy'), :value => 'destroy' %>
   </div>
+  -->
 
   <div class="actions">
     <%= f.submit %>

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

@@ -34,8 +34,8 @@
 </p>
 
 <p>
-  <strong><%= t('activerecord.attributes.event_import_file.executed_at') -%>:</strong>
-  <%= l(@event_import_file.executed_at) if @event_import_file.executed_at -%>
+  <strong><%= t('activerecord.attributes.event_import_file.imported_at') -%>:</strong>
+  <%= l(@event_import_file.imported_at) if @event_import_file.imported_at -%>
 </p>
 
 <p>
@@ -44,15 +44,10 @@
 </p>
 
 <p>
-  <strong><%= t('activerecord.attributes.event_import_file.state') -%>:</strong>
+  <strong><%= t('activerecord.attributes.manifestation_import_file.state') -%>:</strong>
   <%= localized_state(@event_import_file.state) -%>
 </p>
 
-<p>
-  <strong><%= t('activerecord.attributes.event_import_file.error_message') -%>:</strong>
-  <%= @event_import_file.error_message -%>
-</p>
-
 <p>
   <strong><%= t('activerecord.models.user') -%>:</strong>
   <%= link_to @event_import_file.user.username, @event_import_file.user -%>

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

@@ -7,7 +7,7 @@
     </h2>
   <% end %>
 
-<table class="table table-striped index">
+<table class="index">
   <tr>
     <th><%= t('activerecord.models.event_import_file') %></th>
     <th><%= t('activerecord.models.event') %></th>
@@ -24,7 +24,7 @@
     <td><%= link_to event_import_result.event.display_name.localize, event_import_result.event if event_import_result.event %></td>
     <td>
       <%= link_to t('page.show'), event_import_result %>
-      <%= link_to t('page.destroy'), event_import_result, :data => {:confirm => t('page.are_you_sure')}, :method => :delete %>
+      <%= link_to t('page.destroy'), event_import_result, :confirm => t('page.are_you_sure'), :method => :delete %>
     </td>
   </tr>
 <% end %>

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

@@ -1,5 +1,5 @@
 <%= simple_form_for(@event, :validate => true) do |f| -%>
-  <%= f.error_messages %>
+  <%= f.error_notification %>
 
   <div class="field">
     <%= f.label t('activerecord.models.event_category') -%><br />

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

@@ -18,21 +18,21 @@
 <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'), params.merge(:mode => nil) -%>
     <strong><%= t('event.upcoming') -%></strong>
-    <%= link_to t('event.past'), url_for(params.merge(:mode => 'past', :only_path => true)) -%>
+    <%= link_to t('event.past'), params.merge(:mode => 'past') -%>
   <%- 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'), params.merge(:mode => nil) -%>
+    <%= link_to t('event.upcoming'), params.merge(:mode => 'upcoming') -%>
     <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'), params.merge(:mode => 'upcoming') -%>
+    <%= link_to t('event.past'), params.merge(:mode => 'past') -%>
   <%- end -%>
 </p>
 
-<table class="table table-striped index">
+<table class="index">
   <tr>
     <th><%= t('activerecord.models.library') -%></th>
     <th><%= t('activerecord.attributes.event.name') -%></th>
@@ -56,7 +56,7 @@
     <td>
       <%- if can? :destroy, event -%>
         <%= link_to image_tag('icons/page_white_edit.png', :size => '16x16', :alt => t('page.edit')), edit_event_path(event) -%>
-        <%= link_to image_tag('icons/delete.png', :size => '16x16', :alt => t('page.destroy')), event, :data => {:confirm => t('page.are_you_sure')}, :method => :delete -%>
+        <%= link_to image_tag('icons/delete.png', :size => '16x16', :alt => t('page.destroy')), event, :confirm => t('page.are_you_sure'), :method => :delete -%>
       <%- end -%>
     </td>
   </tr>

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

@@ -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'), params.merge(:mode => nil) -%>
     <strong><%= t('event.upcoming') -%></strong>
-    <%= link_to t('event.past'), url_for(params.merge(:mode => 'past', :only_path => true)) -%>
+    <%= link_to t('event.past'), params.merge(:mode => 'past') -%>
   <%- 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'), params.merge(:mode => nil) -%>
+    <%= link_to t('event.upcoming'), params.merge(:mode => 'upcoming') -%>
     <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'), params.merge(:mode => 'upcoming') -%>
+    <%= link_to t('event.past'), params.merge(:mode => 'past') -%>
   <%- end -%>
 </p>
 </div>

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

@@ -4,11 +4,11 @@ xml.rss('version' => "2.0",
   '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.link "#{request.protocol}#{request.host_with_port}#{url_for(params.merge(:format => nil))}"
     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 => 'self', :href => "#{request.protocol}#{request.host_with_port}#{url_for(params.merge(:format => :rss))}"
     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?

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

@@ -2,7 +2,7 @@
 <h1 class="title"><%= t('page.listing', :model => t('activerecord.models.participate')) -%></h1>
 <div id="content_list">
 
-<table class="table table-striped index">
+<table class="index">
   <tr>
     <th><%= t('activerecord.models.patron') -%></th>
     <th><%= t('activerecord.models.event') -%></th>
@@ -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, :confirm => t('page.are_you_sure'), :method => :delete %></td>
   </tr>
 <%- end %>
 </table>

data/config/locales/translation_en.yml

@@ -26,11 +26,10 @@ en:
         event_import_file_size: Size
         event_import_fingerprint: File hash
         note: Note
-        executed_at: Executed at
+        imported_at: Imported at
         event_import_updated_at: Updated at
         state: State
         edit_mode: Edit mode
-        error_message: Error message
       event_import_result:
         body: Body
 

data/config/locales/translation_ja.yml

@@ -26,11 +26,10 @@ ja:
         event_import_file_size: ファイルサイズ
         event_import_fingerprint: ファイルのハッシュ
         note: 注記
-        executed_at: 実行時刻
+        imported_at: インポート時刻
         event_import_updated_at: 更新時刻
         state: 状態
         edit_mode: 編集モード
-        error_message: エラーメッセージ
       event_import_result:
         body: 本文
 

data/config/routes.rb

@@ -11,7 +11,4 @@ Rails.application.routes.draw do
   end
   resources :event_import_results, :only => [:index, :show, :destroy]
   resources :participates
-
-  match '/calendar(/:year(/:month))' => 'calendar#index', :as => :calendar, :constraints => {:year => /\d{4}/, :month => /\d{1,2}/}
-  match "/calendar/:year/:month/:day" => "calendar#show"
 end

data/db/migrate/20120413051535_add_event_fingerprint_to_event_import_file.rb

@@ -0,0 +1,5 @@
+class AddEventFingerprintToEventImportFile < ActiveRecord::Migration
+  def change
+    add_column :event_import_files, :event_fingerprint, :string
+  end
+end

data/lib/enju_event.rb

@@ -2,21 +2,4 @@ require "enju_event/engine"
 require 'event_calendar'
 
 module EnjuEvent
-  def self.included(base)
-    base.extend(ClassMethods)
-  end
-
-  module ClassMethods
-    def enju_event
-      include EnjuEvent::InstanceMethods
-    end
-  end
-
-  module InstanceMethods
-    def get_event
-      @event = Event.find(params[:event_id]) if params[:event_id]
-    end
-  end
 end
-
-ActionController::Base.send(:include, EnjuEvent)

data/lib/enju_event/engine.rb

@@ -1,13 +1,20 @@
-require "enju_core"
+require "devise"
+require "cancan"
+require "attribute_normalizer"
 require "inherited_resources"
+require "friendly_id"
+require "will_paginate"
+require "sunspot_rails"
 require "has_scope"
 require "configatron"
 require "paperclip"
 require "state_machine"
+require "addressable/uri"
 require "csv"
 require "nkf"
+require "acts_as_list"
 
 module EnjuEvent
-  class Engine < ::Rails::Engine
+  class Engine < Rails::Engine
   end
 end

data/lib/enju_event/version.rb

@@ -1,3 +1,3 @@
 module EnjuEvent
-  VERSION = "0.0.27"
+  VERSION = "0.1.0"
 end

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

@@ -0,0 +1,44 @@
+class Country < ActiveRecord::Base
+  include MasterModel
+  default_scope :order => "position"
+  has_many :patrons
+  #has_many :people
+  #has_many :corporate_bodies
+  #has_many :families
+  has_many :libraries
+  has_one :library_group
+
+  # If you wish to change the field names for brevity, feel free to enable/modify these.
+  # alias_attribute :iso, :alpha_2
+  # alias_attribute :iso3, :alpha_3
+  # alias_attribute :numeric, :numeric_3
+
+  # Validations
+  validates_presence_of :alpha_2, :alpha_3, :numeric_3
+
+  after_save :clear_all_cache
+  after_destroy :clear_all_cache
+
+  def self.all_cache
+    Rails.cache.fetch('country_all'){Country.all}
+  end
+
+  def clear_all_cache
+    Rails.cache.delete('country_all')
+  end
+end
+
+# == Schema Information
+#
+# Table name: countries
+#
+#  id           :integer         not null, primary key
+#  name         :string(255)     not null
+#  display_name :text
+#  alpha_2      :string(255)
+#  alpha_3      :string(255)
+#  numeric_3    :string(255)
+#  note         :text
+#  position     :integer
+#
+

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

@@ -0,0 +1,4 @@
+class Language < ActiveRecord::Base
+  has_many :manifestations
+  has_many :patrons
+end

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

@@ -0,0 +1,128 @@
+# -*- encoding: utf-8 -*-
+class Library < ActiveRecord::Base
+  include MasterModel
+  default_scope :order => 'libraries.position'
+  scope :real, where('id != 1')
+  has_many :shelves, :order => 'shelves.position'
+  belongs_to :library_group, :validate => true
+  has_many :events, :include => :event_category
+  #belongs_to :holding_patron, :polymorphic => true, :validate => true
+  belongs_to :patron #, :validate => true
+  has_many :inter_library_loans, :foreign_key => 'borrowing_library_id'
+  has_many :users
+  belongs_to :country
+
+  extend FriendlyId
+  friendly_id :name
+  #geocoded_by :address
+
+  searchable do
+    text :name, :display_name, :note, :address
+    time :created_at
+    time :updated_at
+    integer :position
+  end
+
+  #validates_associated :library_group, :holding_patron
+  validates_associated :library_group, :patron
+  validates_presence_of :short_display_name, :library_group, :patron
+  validates_uniqueness_of :short_display_name, :case_sensitive => false
+  validates :display_name, :uniqueness => true
+  validates :name, :format => {:with => /^[a-z][0-9a-z]{2,254}$/}
+  before_validation :set_patron, :on => :create
+  #before_save :set_calil_neighborhood_library
+  after_validation :geocode, :if => :address_changed?
+  after_create :create_shelf
+  after_save :clear_all_cache
+  after_destroy :clear_all_cache
+
+  def self.per_page
+    10
+  end
+
+  def self.all_cache
+    if Rails.env == 'production'
+      Rails.cache.fetch('library_all'){Library.all}
+    else
+      Library.all
+    end
+  end
+
+  def clear_all_cache
+    Rails.cache.delete('library_all')
+  end
+
+  def set_patron
+    self.patron = Patron.new(
+      :full_name => self.name
+    )
+  end
+
+  def create_shelf
+    Shelf.create!(:name => "#{self.name}_default", :library => self)
+  end
+
+  def closed?(date)
+    events.closing_days.collect{|c| c.start_at.beginning_of_day}.include?(date.beginning_of_day)
+  end
+
+  def web?
+    return true if self.id == 1
+    false
+  end
+
+  def self.web
+    Library.find(1)
+  end
+
+  def address(locale = I18n.locale)
+    case locale.to_sym
+    when :ja
+      "#{self.region.to_s.localize(locale)}#{self.locality.to_s.localize(locale)}#{self.street.to_s.localize(locale)}"
+    else
+      "#{self.street.to_s.localize(locale)} #{self.locality.to_s.localize(locale)} #{self.region.to_s.localize(locale)}"
+    end
+  rescue
+    nil
+  end
+
+  def address_changed?
+    return true if region_changed? or locality_changed? or street_changed?
+    false
+  end
+end
+
+# == Schema Information
+#
+# Table name: libraries
+#
+#  id                          :integer         not null, primary key
+#  patron_id                   :integer
+#  patron_type                 :string(255)
+#  name                        :string(255)     not null
+#  display_name                :text
+#  short_display_name          :string(255)     not null
+#  zip_code                    :string(255)
+#  street                      :text
+#  locality                    :text
+#  region                      :text
+#  telephone_number_1          :string(255)
+#  telephone_number_2          :string(255)
+#  fax_number                  :string(255)
+#  note                        :text
+#  call_number_rows            :integer         default(1), not null
+#  call_number_delimiter       :string(255)     default("|"), not null
+#  library_group_id            :integer         default(1), not null
+#  users_count                 :integer         default(0), not null
+#  position                    :integer
+#  country_id                  :integer
+#  created_at                  :datetime
+#  updated_at                  :datetime
+#  deleted_at                  :datetime
+#  opening_hour                :text
+#  latitude                    :float
+#  longitude                   :float
+#  calil_systemid              :string(255)
+#  calil_neighborhood_systemid :text
+#
+