enju_event 0.1.17.pre12 → 0.1.17.pre13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 75cfb7a9dccdda17e0a3e2656b365a732f90f5ba
-  data.tar.gz: 02871690112a62a925adc55d8f6516b897626ccc
+  metadata.gz: f41f516c5391f7a1a2b5ce7a0a6a8044dac7d586
+  data.tar.gz: fb4f0d3d2332c7be954fe65b551119a7225fd021
 SHA512:
-  metadata.gz: 6410ff81fd6ee4dbd3ef87a727d887e607b95450d22024ebc3f2e14fb12ac4a9e2783ecc78c4f0f7753e0664dac0e08c4839f554c8372fbc2626c1bf124df9a6
-  data.tar.gz: 9d889993b2e13f5b74e5a1612b2addb3fab5e71f477b87ff4afdbf57a99d50ca9f3bc8be14ee09f9f4eceb431ff483d49250bd68959a0cf6e8bbaaf4e1cf5af4
+  metadata.gz: aa323aee02ec299ec2f5678ab675aed4c9fc9543fe9e73116b7cb9bf21d33a9ff51f1ca3e6f6a8a2e82dc3e9824d945a2895a4de81e4944d923e96a89a9e6b21
+  data.tar.gz: 03dd7c320eaa9c4b04342a2bfb4856682cd65dfc1dc4bfdc2a906ebad59a291302b476c2add062c4bed857296f8b4f6935b2cf1b3b9e624d5b80effc8c04fbc4

data/app/controllers/event_import_results_controller.rb

@@ -9,7 +9,7 @@ class EventImportResultsController < InheritedResources::Base
     if @event_import_file
       @event_import_results = @event_import_file.event_import_results.page(params[:page])
     else
-      @event_import_results = @event_import_results.page(params[:page])
+      @event_import_results = EventImportResult.page(params[:page])
     end
   end
 end

data/app/controllers/events_controller.rb

@@ -1,7 +1,7 @@
 # -*- encoding: utf-8 -*-
 class EventsController < ApplicationController
   load_and_authorize_resource
-  before_filter :get_library, :get_patron
+  before_filter :get_library, :get_agent
   before_filter :get_libraries, :except => :destroy
   before_filter :prepare_options
   before_filter :store_page, :only => :index

data/app/models/event.rb

@@ -13,7 +13,7 @@ class Event < ActiveRecord::Base
   belongs_to :library, :validate => true
   has_many :picture_files, :as => :picture_attachable
   has_many :participates, :dependent => :destroy
-  has_many :patrons, :through => :participates
+  has_many :agents, :through => :participates
   has_one :event_import_result
 
   has_event_calendar

data/app/models/event_import_file.rb

@@ -36,12 +36,12 @@ class EventImportFile < ActiveRecord::Base
       transition :started => :failed
     end
 
-    before_transition any => :started do |patron_import_file|
-      patron_import_file.executed_at = Time.zone.now
+    before_transition any => :started do |agent_import_file|
+      agent_import_file.executed_at = Time.zone.now
     end
 
-    before_transition any => :completed do |patron_import_file|
-      patron_import_file.error_message = nil
+    before_transition any => :completed do |agent_import_file|
+      agent_import_file.error_message = nil
     end
   end
 
@@ -232,10 +232,9 @@ end
 #  event_import_file_size    :integer
 #  event_import_updated_at   :datetime
 #  edit_mode                 :string(255)
-#  event_import_fingerprint  :string(255)
 #  created_at                :datetime         not null
 #  updated_at                :datetime         not null
-#  event_fingerprint         :string(255)
+#  event_import_fingerprint  :string(255)
 #  error_message             :text
 #
 

data/app/models/participate.rb

@@ -1,10 +1,10 @@
 class Participate < ActiveRecord::Base
-  attr_accessible :patron_id, :event_id
-  belongs_to :patron
+  attr_accessible :agent_id, :event_id
+  belongs_to :agent
   belongs_to :event
 
-  validates_presence_of :patron_id, :event_id
-  validates_uniqueness_of :patron_id, :scope => :event_id
+  validates_presence_of :agent_id, :event_id
+  validates_uniqueness_of :agent_id, :scope => :event_id
   acts_as_list :scope => :event_id
 
   paginates_per 10
@@ -15,7 +15,7 @@ end
 # Table name: participates
 #
 #  id         :integer          not null, primary key
-#  patron_id  :integer          not null
+#  agent_id   :integer          not null
 #  event_id   :integer          not null
 #  position   :integer
 #  created_at :datetime         not null

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

@@ -14,7 +14,7 @@
 </p>
 
 <p>
-  <b><%= t('activerecord.attributes.patron_import_result.body') %></b>
+  <b><%= t('activerecord.attributes.agent_import_result.body') %></b>
   <%= @event_import_result.body %>
 </p>
 

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

@@ -6,8 +6,8 @@
   <%= f.error_messages %>
 
   <div class="field">
-    <%= f.label t('activerecord.models.patron') -%><br />
-    <%= f.text_field :patron_id %>
+    <%= f.label t('activerecord.models.agent') -%><br />
+    <%= f.text_field :agent_id %>
   </div>
   <div class="field">
     <%= f.label t('activerecord.models.event') -%><br />

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

@@ -4,13 +4,13 @@
 
 <table class="table table-striped index">
   <tr>
-    <th><%= t('activerecord.models.patron') -%></th>
+    <th><%= t('activerecord.models.agent') -%></th>
     <th><%= t('activerecord.models.event') -%></th>
   </tr>
 
 <%- @participates.each do |participate| %>
   <tr class="line<%= cycle("0", "1") -%>">
-    <td><%= link_to participate.patron.full_name, participate.patron %>
+    <td><%= link_to participate.agent.full_name, participate.agent %>
     <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>

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

@@ -6,8 +6,8 @@
   <%= f.error_messages %>
 
   <div class="field">
-    <%= f.label t('activerecord.models.patron') -%><br />
-    <%= f.text_field :patron_id %>
+    <%= f.label t('activerecord.models.agent') -%><br />
+    <%= f.text_field :agent_id %>
   </div>
   <div class="field">
     <%= f.label t('activerecord.models.event') -%><br />

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

@@ -4,8 +4,8 @@
 <p id="notice"><%= notice %></p>
 
 <p>
-  <strong><%= t('activerecord.models.patron') -%>:</strong>
-  <%= link_to @participate.patron.full_name, @participate.patron %>
+  <strong><%= t('activerecord.models.agent') -%>:</strong>
+  <%= link_to @participate.agent.full_name, @participate.agent %>
 </p>
 
 <p>

data/db/migrate/20090519203307_create_participates.rb

@@ -1,14 +1,14 @@
 class CreateParticipates < ActiveRecord::Migration
   def self.up
     create_table :participates do |t|
-      t.integer :patron_id, :null => false
+      t.integer :agent_id, :null => false
       t.integer :event_id, :null => false
       t.integer :position
 
       t.timestamps
     end
     add_index :participates, :event_id
-    add_index :participates, :patron_id
+    add_index :participates, :agent_id
   end
 
   def self.down

data/lib/enju_event/version.rb

@@ -1,3 +1,3 @@
 module EnjuEvent
-  VERSION = "0.1.17.pre12"
+  VERSION = "0.1.17.pre13"
 end

data/spec/dummy/app/controllers/application_controller.rb

@@ -1,108 +1,7 @@
 class ApplicationController < ActionController::Base
   protect_from_forgery
-  include Mobylette::RespondToMobileRequests
-
-  rescue_from CanCan::AccessDenied, :with => :render_403
-  rescue_from ActiveRecord::RecordNotFound, :with => :render_404
-
-  before_filter :set_locale
-
-  private
-  def render_403
-    return if performed?
-    if user_signed_in?
-      respond_to do |format|
-        format.html {render :template => 'page/403', :status => 403}
-        format.mobile {render :template => 'page/403', :status => 403}
-        format.xml {render :template => 'page/403', :status => 403}
-        format.json
-      end
-    else
-      respond_to do |format|
-        format.html {redirect_to new_user_session_url}
-        format.mobile {redirect_to new_user_session_url}
-        format.xml {render :template => 'page/403', :status => 403}
-        format.json
-      end
-    end
-  end
-
-  def render_404
-    return if performed?
-    respond_to do |format|
-      format.html {render :template => 'page/404', :status => 404}
-      format.mobile {render :template => 'page/404', :status => 404}
-      format.xml {render :template => 'page/404', :status => 404}
-      format.json
-    end
-  end
-
-  def get_patron
-    @patron = Patron.find(params[:patron_id]) if params[:patron_id]
-    authorize! :show, @patron if @patron
-  end
-
-  def get_library
-    @library = Library.find(params[:library_id]) if params[:library_id]
-  end
-
-  def get_libraries
-    @libraries = Library.all_cache
-  end
-
-  def set_locale
-    if params[:locale]
-      unless I18n.available_locales.include?(params[:locale].to_s.intern)
-        raise InvalidLocaleError
-      end
-    end
-    if user_signed_in?
-      locale = params[:locale] || session[:locale] || current_user.locale.try(:to_sym)
-    else
-      locale = params[:locale] || session[:locale]
-    end
-    if locale
-      I18n.locale = @locale = session[:locale] = locale.to_sym
-    else
-      I18n.locale = @locale = session[:locale] = I18n.default_locale
-    end
-  rescue InvalidLocaleError
-    @locale = I18n.default_locale
-  end
-
-  def solr_commit
-    Sunspot.commit
-  end
-
-  def convert_charset
-    case params[:format]
-    when 'csv'
-      return unless Setting.csv_charset_conversion
-      # TODO: 他の言語
-      if @locale.to_sym == :ja
-        headers["Content-Type"] = "text/csv; charset=Shift_JIS"
-        response.body = NKF::nkf('-Ws', response.body)
-      end
-    when 'xml'
-      if @locale.to_sym == :ja
-        headers["Content-Type"] = "application/xml; charset=Shift_JIS"
-        response.body = NKF::nkf('-Ws', response.body)
-      end
-    end
-  end
-
-  def store_page
-    flash[:page] = params[:page] if params[:page].to_i > 0
-  end
-
-  def move_position(resource, direction)
-    if ['higher', 'lower'].include?(direction)
-      resource.send("move_#{direction}")
-      redirect_to url_for(:controller => resource.class.to_s.pluralize.underscore)
-      return
-    end
-  end
-end
-
-class InvalidLocaleError < StandardError
+  enju_leaf
+  enju_biblio
+  enju_library
+  enju_event
 end

data/spec/dummy/config/application.rb

@@ -3,6 +3,7 @@ require File.expand_path('../boot', __FILE__)
 require 'rails/all'
 
 Bundler.require
+require 'enju_event'
 
 module Dummy
   class Application < Rails::Application
@@ -42,6 +43,5 @@ module Dummy
   end
 end
 
-require 'enju_biblio'
-require 'enju_library'
+require 'enju_leaf'
 require 'mobylette'

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

@@ -3,4 +3,3 @@
 # Add new mime types for use in respond_to blocks:
 # Mime::Type.register "text/richtext", :rtf
 # Mime::Type.register_alias "text/html", :iphone
-Mime::Type.register "application/octet-stream",  :download

data/spec/dummy/db/migrate/{001_create_patrons.rb → 001_create_agents.rb}

@@ -1,6 +1,6 @@
-class CreatePatrons < ActiveRecord::Migration
+class CreateAgents < ActiveRecord::Migration
   def change
-    create_table :patrons do |t|
+    create_table :agents do |t|
       t.integer :user_id
       t.string :last_name
       t.string :middle_name
@@ -35,7 +35,7 @@ class CreatePatrons < ActiveRecord::Migration
       t.datetime :date_of_death
       t.integer :language_id, :default => 1, :null => false
       t.integer :country_id, :default => 1, :null => false
-      t.integer :patron_type_id, :default => 1, :null => false
+      t.integer :agent_type_id, :default => 1, :null => false
       t.integer :lock_version, :default => 0, :null => false
       t.text :note
       t.integer :required_role_id, :default => 1, :null => false
@@ -44,10 +44,10 @@ class CreatePatrons < ActiveRecord::Migration
       t.text :email
       t.text :url
     end
-    add_index :patrons, :user_id, :unique => true
-    add_index :patrons, :language_id
-    add_index :patrons, :country_id
-    add_index :patrons, :required_role_id
-    add_index :patrons, :full_name
+    add_index :agents, :user_id, :unique => true
+    add_index :agents, :language_id
+    add_index :agents, :country_id
+    add_index :agents, :required_role_id
+    add_index :agents, :full_name
   end
 end

data/spec/dummy/db/migrate/012_create_owns.rb

@@ -1,12 +1,12 @@
 class CreateOwns < ActiveRecord::Migration
   def change
     create_table :owns do |t|
-      t.references :patron, :null => false
+      t.references :agent, :null => false
       t.references :item, :null => false
       t.integer :position
       t.timestamps
     end
-    add_index :owns, :patron_id
+    add_index :owns, :agent_id
     add_index :owns, :item_id
   end
 end

data/spec/dummy/db/migrate/015_create_creates.rb

@@ -1,12 +1,12 @@
 class CreateCreates < ActiveRecord::Migration
   def change
     create_table :creates do |t|
-      t.references :patron, :null => false
+      t.references :agent, :null => false
       t.references :work, :null => false
       t.integer :position
       t.timestamps
     end
-    add_index :creates, :patron_id
+    add_index :creates, :agent_id
     add_index :creates, :work_id
   end
 end

data/spec/dummy/db/migrate/047_create_produces.rb

@@ -1,12 +1,12 @@
 class CreateProduces < ActiveRecord::Migration
   def change
     create_table :produces do |t|
-      t.references :patron, :null => false
+      t.references :agent, :null => false
       t.references :manifestation, :null => false
       t.integer :position
       t.timestamps
     end
-    add_index :produces, :patron_id
+    add_index :produces, :agent_id
     add_index :produces, :manifestation_id
   end
 end

data/spec/dummy/db/migrate/059_create_libraries.rb

@@ -1,7 +1,7 @@
 class CreateLibraries < ActiveRecord::Migration
   def self.up
     create_table :libraries do |t|
-      t.references :patron, :polymorphic => true
+      t.references :agent, :polymorphic => true
       t.string :name, :null => false
       t.text :display_name
       t.string :short_display_name, :null => false
@@ -23,7 +23,7 @@ class CreateLibraries < ActiveRecord::Migration
       t.timestamps
       t.datetime :deleted_at
     end
-    add_index :libraries, :patron_id, :unique => true
+    add_index :libraries, :agent_id, :unique => true
     add_index :libraries, :library_group_id
     add_index :libraries, :name, :unique => true
   end

data/spec/dummy/db/migrate/125_create_donates.rb

@@ -1,12 +1,12 @@
 class CreateDonates < ActiveRecord::Migration
   def change
     create_table :donates do |t|
-      t.integer :patron_id, :null => false
+      t.integer :agent_id, :null => false
       t.integer :item_id, :null => false
 
       t.timestamps
     end
-    add_index :donates, :patron_id
+    add_index :donates, :agent_id
     add_index :donates, :item_id
   end
 end

data/spec/dummy/db/migrate/20080830154109_create_realizes.rb

@@ -1,13 +1,13 @@
 class CreateRealizes < ActiveRecord::Migration
   def change
     create_table :realizes do |t|
-      t.references :patron, :null => false
+      t.references :agent, :null => false
       t.references :expression, :null => false
       t.integer :position
 
       t.timestamps
     end
-    add_index :realizes, :patron_id
+    add_index :realizes, :agent_id
     add_index :realizes, :expression_id
   end
 end