enju_library 0.1.0.pre33 → 0.1.0.pre34

data/app/controllers/subscriptions_controller.rb

@@ -1,7 +1,7 @@
 class SubscriptionsController < ApplicationController
   load_and_authorize_resource
   before_filter :get_work
-  after_filter :solr_commit, :only => [:create, :update, :destroy]
+  after_filter :solr_commit, only: [:create, :update, :destroy]
 
   # GET /subscriptions
   # GET /subscriptions.json
@@ -14,7 +14,7 @@ class SubscriptionsController < ApplicationController
 
     respond_to do |format|
       format.html # index.html.erb
-      format.json { render :json => @subscriptions }
+      format.json { render json: @subscriptions }
     end
   end
 
@@ -23,7 +23,7 @@ class SubscriptionsController < ApplicationController
   def show
     respond_to do |format|
       format.html # show.html.erb
-      format.json { render :json => @subscription }
+      format.json { render json: @subscription }
     end
   end
 
@@ -34,7 +34,7 @@ class SubscriptionsController < ApplicationController
 
     respond_to do |format|
       format.html # new.html.erb
-      format.json { render :json => @subscription }
+      format.json { render json: @subscription }
     end
   end
 
@@ -50,11 +50,11 @@ class SubscriptionsController < ApplicationController
 
     respond_to do |format|
       if @subscription.save
-        format.html { redirect_to @subscription, :notice => t('controller.successfully_created', :model => t('activerecord.models.subscription')) }
-        format.json { render :json => @subscription, :status => :created, :location => @subscription }
+        format.html { redirect_to @subscription, notice:  t('controller.successfully_created', model:  t('activerecord.models.subscription')) }
+        format.json { render json: @subscription, status: :created, location:  @subscription }
       else
-        format.html { render :action => "new" }
-        format.json { render :json => @subscription.errors, :status => :unprocessable_entity }
+        format.html { render action: "new" }
+        format.json { render json: @subscription.errors, status: :unprocessable_entity }
       end
     end
   end
@@ -65,11 +65,11 @@ class SubscriptionsController < ApplicationController
     @subscription.assign_attributes(params[:subscription])
     respond_to do |format|
       if @subscription.save
-        format.html { redirect_to @subscription, :notice => t('controller.successfully_updated', :model => t('activerecord.models.subscription')) }
+        format.html { redirect_to @subscription, notice:  t('controller.successfully_updated', model:  t('activerecord.models.subscription')) }
         format.json { head :no_content }
       else
-        format.html { render :action => "edit" }
-        format.json { render :json => @subscription.errors, :status => :unprocessable_entity }
+        format.html { render action: "edit" }
+        format.json { render json: @subscription.errors, status: :unprocessable_entity }
       end
     end
   end

data/app/models/accept.rb

@@ -1,16 +1,15 @@
 class Accept < ActiveRecord::Base
   attr_accessible :item_identifier, :librarian_id, :item_id
-  default_scope :order => 'accepts.id DESC'
+  default_scope order: 'accepts.id DESC'
   belongs_to :basket
-  belongs_to :item
-  belongs_to :librarian, :class_name => 'User'
+  belongs_to :item, touch: true
+  belongs_to :librarian, class_name: 'User'
 
-  validates_uniqueness_of :item_id, :message => I18n.t('accept.already_accepted')
-  validates_presence_of :item_id, :message => I18n.t('accept.item_not_found')
+  validates_uniqueness_of :item_id, message:  I18n.t('accept.already_accepted')
+  validates_presence_of :item_id, message:  I18n.t('accept.item_not_found')
   validates_presence_of :basket_id
 
-  before_save :accept!, :on => :create
-  after_save :expire_manifestation_cache, if: Proc.new{|record| record.item.try(:manifestation).present?}
+  before_save :accept!, on: :create
 
   attr_accessor :item_identifier
 
@@ -18,16 +17,12 @@ class Accept < ActiveRecord::Base
 
   def accept!
     if defined?(EnjuCirculation)
-      circulation_status = CirculationStatus.where(:name => 'Available On Shelf').first
+      circulation_status = CirculationStatus.where(name: 'Available On Shelf').first
       item.update_column(:circulation_status_id, circulation_status.id) if circulation_status
       use_restriction = UseRestriction.where(name: 'Limited Circulation, Normal Loan Period').first
       item.use_restriction = use_restriction if use_restriction
     end
   end
-
-  def expire_manifestation_cache
-    ExpireFragmentCache.expire_fragment_cache(item.manifestation)
-  end
 end
 
 # == Schema Information

data/app/models/basket.rb

@@ -1,13 +1,13 @@
 class Basket < ActiveRecord::Base
   attr_accessible :note, :user_number
-  default_scope :order => 'baskets.id DESC'
+  default_scope order: 'baskets.id DESC'
   scope :will_expire, lambda {|date| {:conditions => ['created_at < ?', date]}}
-  belongs_to :user, :validate => true
+  belongs_to :user, validate: true
   has_many :accepts
 
-  validates_associated :user, :on => :create
+  validates_associated :user, on: :create
   # 貸出完了後にかごのユーザidは破棄する
-  validates_presence_of :user, :on => :create
+  validates_presence_of :user, on: :create
   validate :check_suspended
 
   attr_accessor :user_number
@@ -26,8 +26,8 @@ class Basket < ActiveRecord::Base
   end
 
   if defined?(EnjuCirculation)
-    has_many :checked_items, :dependent => :destroy
-    has_many :items, :through => :checked_items
+    has_many :checked_items, dependent: :destroy
+    has_many :items, through: :checked_items
     has_many :checkouts
     has_many :checkins
 

data/app/models/bookstore.rb

@@ -1,12 +1,12 @@
 class Bookstore < ActiveRecord::Base
   attr_accessible :name, :zip_code, :address, :note, :telephone_number,
     :fax_number, :url
-  default_scope :order => "bookstores.position"
+  default_scope order: "bookstores.position"
   has_many :items
 
   acts_as_list
   validates_presence_of :name
-  validates :url, :url => true, :allow_blank => true, :length => {:maximum => 255}
+  validates :url, url: true, allow_blank: true, length: {:maximum => 255}
 
   paginates_per 10
 

data/app/models/budget_type.rb

@@ -1,7 +1,7 @@
 class BudgetType < ActiveRecord::Base
   attr_accessible :name, :display_name, :note, :position
   include MasterModel
-  default_scope :order => 'budget_types.position'
+  default_scope order: 'budget_types.position'
   has_many :items
 end
 

data/app/models/library.rb

@@ -6,10 +6,10 @@ class Library < ActiveRecord::Base
     :country_id, :opening_hour, :isil, :position
 
   include MasterModel
-  default_scope :order => 'libraries.position'
+  default_scope order: 'libraries.position'
   scope :real, where('id != 1')
-  has_many :shelves, :order => 'shelves.position'
-  belongs_to :library_group, :validate => true
+  has_many :shelves, order: 'shelves.position'
+  belongs_to :library_group, validate: true
   has_many :users
   belongs_to :country
 
@@ -27,10 +27,10 @@ class Library < ActiveRecord::Base
   validates_associated :library_group
   validates_presence_of :short_display_name, :library_group
   validates_uniqueness_of :short_display_name, :case_sensitive => false
-  validates_uniqueness_of :isil, :allow_blank => true
-  validates :display_name, :uniqueness => true
-  validates :name, :format => {:with => /\A[a-z][0-9a-z\-_]{1,253}[0-9a-z]\Z/}
-  validates :isil, :format => {:with => /\A[A-Za-z]{1,4}-[A-Za-z0-9\/:\-]{2,11}\z/}, :allow_blank => true
+  validates_uniqueness_of :isil, allow_blank: true
+  validates :display_name, uniqueness: true
+  validates :name, format: {with: /\A[a-z][0-9a-z\-_]{1,253}[0-9a-z]\Z/}
+  validates :isil, format: {with: /\A[A-Za-z]{1,4}-[A-Za-z0-9\/:\-]{2,11}\z/}, allow_blank: true
   after_validation :geocode, :if => :address_changed?
   after_create :create_shelf
   after_save :clear_all_cache
@@ -91,7 +91,7 @@ class Library < ActiveRecord::Base
   end
 
   if defined?(EnjuInterLibraryLoan)
-    has_many :inter_library_loans, :foreign_key => 'borrowing_library_id'
+    has_many :inter_library_loans, foreign_key: 'borrowing_library_id'
   end
 end
 

data/app/models/library_group.rb

@@ -1,6 +1,6 @@
 # -*- encoding: utf-8 -*-
 class LibraryGroup < ActiveRecord::Base
-  attr_accessible :name, :display_name, :short_name, :email, :my_networks,
+  attr_accessible :name, :display_name, :short_name, :my_networks,
     :login_banner, :note, :country_id, :admin_networks, :url
 
   #include Singleton
@@ -9,22 +9,10 @@ class LibraryGroup < ActiveRecord::Base
   has_many :libraries
   belongs_to :country
 
-  validates :email, :format => {:with => /\A([\w\.%\+\-]+)@([\w\-]+\.)+([\w]{2,})\z/i}, :presence => true
-  validates :url, :presence => true, :url => true
-  after_save :clear_site_config_cache, :save_system_email
-
-  def clear_site_config_cache
-    Rails.cache.delete('library_site_config')
-  end
+  validates :url, presence: true, url: true
 
   def self.site_config
-    #if Rails.env == 'production'
-    #  Rails.cache.fetch('library_site_config'){LibraryGroup.find(1)}
-    #else
-      LibraryGroup.find(1)
-    #end
-  rescue ActiveRecord::RecordNotFound
-    nil
+    LibraryGroup.find(1)
   end
 
   def self.system_name(locale = I18n.locale)
@@ -60,10 +48,8 @@ class LibraryGroup < ActiveRecord::Base
     return false
   end
 
-  def save_system_email
-    user = User.find(1)
-    user.email = email
-    user.save!
+  def user
+    User.find(1)
   end
 end
 
@@ -75,7 +61,6 @@ end
 #  name           :string(255)      not null
 #  display_name   :text
 #  short_name     :string(255)      not null
-#  email          :string(255)
 #  my_networks    :text
 #  login_banner   :text
 #  note           :text
@@ -86,4 +71,3 @@ end
 #  admin_networks :text
 #  url            :string(255)      default("http://localhost:3000/")
 #
-

data/app/models/request_status_type.rb

@@ -1,7 +1,7 @@
 class RequestStatusType < ActiveRecord::Base
   attr_accessible :name, :display_name, :note
   include MasterModel
-  default_scope :order => 'position'
+  default_scope order: 'position'
   has_many :reserves
 end
 

data/app/models/request_type.rb

@@ -1,7 +1,7 @@
 class RequestType < ActiveRecord::Base
   attr_accessible :name, :display_name, :note
   include MasterModel
-  default_scope :order => 'position'
+  default_scope order: 'position'
 end
 
 # == Schema Information

data/app/models/search_engine.rb

@@ -1,14 +1,14 @@
 class SearchEngine < ActiveRecord::Base
   attr_accessible :name, :display_name, :url, :base_url, :http_method,
     :query_param, :additional_param, :note
-  default_scope :order => "search_engines.position"
+  default_scope order: "search_engines.position"
   acts_as_list
 
-  validates :name, :presence => true
-  validates :query_param, :presence => true
-  validates :http_method, :presence => true, :inclusion => %w(get post)
-  validates :url, :presence => true, :url => true, :length => {:maximum => 255}
-  validates :base_url, :presence => true, :url => true, :length => {:maximum => 255}
+  validates :name, presence: true
+  validates :query_param, presence: true
+  validates :http_method, presence: true, :inclusion => %w(get post)
+  validates :url, presence: true, url: true, length: {:maximum => 255}
+  validates :base_url, presence: true, url: true, length: {:maximum => 255}
   after_save :clear_all_cache
   after_destroy :clear_all_cache
 

data/app/models/shelf.rb

@@ -2,16 +2,16 @@ class Shelf < ActiveRecord::Base
   attr_accessible :name, :display_name, :note, :library_id, :closed
   include MasterModel
   scope :real, where('library_id != 1')
-  belongs_to :library, :validate => true
+  belongs_to :library, validate: true
   has_many :items, :include => [:circulation_status]
-  has_many :picture_files, :as => :picture_attachable, :dependent => :destroy
+  has_many :picture_files, as: :picture_attachable, dependent: :destroy
 
   validates_associated :library
   validates_presence_of :library
-  validates_uniqueness_of :display_name, :scope => :library_id
-  validates :name, :format => {:with => /\A[a-z][0-9a-z\-_]{1,253}[0-9a-z]\Z/}
+  validates_uniqueness_of :display_name, scope: :library_id
+  validates :name, format: {with: /\A[a-z][0-9a-z\-_]{1,253}[0-9a-z]\Z/}
 
-  acts_as_list :scope => :library
+  acts_as_list scope: :library
 
   searchable do
     string :name

data/app/models/subscribe.rb

@@ -1,11 +1,11 @@
 class Subscribe < ActiveRecord::Base
   attr_accessible :subscription_id, :work_id, :start_at, :end_at
-  belongs_to :subscription, :counter_cache => true, :validate => true
-  belongs_to :work, :class_name => 'Manifestation', :validate => true
+  belongs_to :subscription, :counter_cache => true, validate: true
+  belongs_to :work, class_name: 'Manifestation', validate: true
 
   validates_associated :subscription, :work
   validates_presence_of :subscription, :work, :start_at, :end_at
-  validates_uniqueness_of :work_id, :scope => :subscription_id
+  validates_uniqueness_of :work_id, scope: :subscription_id
 end
 
 # == Schema Information

data/app/models/subscription.rb

@@ -1,10 +1,10 @@
 class Subscription < ActiveRecord::Base
   attr_accessible :title, :note, :order_list_id, :user_id
-  has_many :subscribes, :dependent => :destroy
-  has_many :works, :through => :subscribes
-  belongs_to :user, :validate => true
+  has_many :subscribes, dependent: :destroy
+  has_many :works, through: :subscribes
+  belongs_to :user, validate: true
   if defined?(EnjuPurchasRequest)
-    belongs_to :order_list, :validate => true
+    belongs_to :order_list, validate: true
   end
 
   validates_presence_of :title, :user
@@ -14,7 +14,7 @@ class Subscription < ActiveRecord::Base
     text :title, :note
     time :created_at
     time :updated_at
-    integer :work_ids, :multiple => true
+    integer :work_ids, multiple: true
   end
 
   paginates_per 10

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

@@ -1,5 +1,5 @@
 <%= simple_form_for(@accept) do |f| %>
-  <%= f.error_notification %>
+  <%= f.error_messages %>
 
   <div class="form-inputs">
     <%= f.input :item_id %>

data/app/views/accepts/_list.html.erb

@@ -1,11 +1,11 @@
 <div style="color: red"><%= flash[:message] -%></div>
 
 <div class="search_form">
-<%= form_for(:accept, :url => basket_accepts_path(@basket), :remote => true) do |f| %>
+<%= form_for(:accept, url: basket_accepts_path(@basket), remote: true) do |f| %>
   <%= f.error_messages %>
   <p>
     <%= label_tag :item_identifier, t('activerecord.attributes.item.item_identifier') -%>:
-    <%= f.search_field :item_identifier, :class => 'resource_item_identifier', :value => nil -%>
+    <%= f.search_field :item_identifier, class: 'resource_item_identifier', value: nil -%>
     <%= f.submit t('accept.accept'), 'data-disable-with' => t('page.saving') -%>
   </p>
 <%- end -%>
@@ -18,7 +18,7 @@
   <%- @accepts.each_with_index do |accept, i| -%>
     <tr class="line<%= cycle("0", "1") -%>">
       <td>
-        <%= render 'manifestations/show_index', :manifestation => accept.item.manifestation %>
+        <%= render 'manifestations/show_index', manifestation: accept.item.manifestation %>
         <%= link_to accept.item.item_identifier, accept.item -%> / <%= accept.item.call_number %>
         (<%= link_to accept.item.shelf.library.display_name.localize, accept.item.shelf.library %> /
         <%= link_to accept.item.shelf.display_name.localize, accept.item.shelf %>)<br />

data/app/views/accepts/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.accept')) -%></h1>
+<h1 class="title"><%= t('page.editing', model: t('activerecord.models.accept')) -%></h1>
 <div id="content_list">
   <%= render 'form' %>
 </div>

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

@@ -1,12 +1,12 @@
 <div id="content_detail" class="ui-corner-all ui-widget-content">
-<h1 class="title"><%= t('page.listing', :model => t('activerecord.models.accept')) -%></h1>
+<h1 class="title"><%= t('page.listing', model: t('activerecord.models.accept')) -%></h1>
 <div id="content_list">
 
 <div class="search_form">
-  <%= form_for(:accept, :html => {:method => :get}) do |f| %>
+  <%= form_for(:accept, html: {method: :get}) do |f| %>
     <p>
       <%= label_tag :item_identifier, t('activerecord.attributes.item.item_identifier') -%>:
-      <%= f.search_field :item_identifier, :value => @query, :class => 'resource_item_identifier' -%>
+      <%= f.search_field :item_identifier, value: @query, class: 'resource_item_identifier' -%>
       <%= f.submit t('page.search') -%>
     </p>
   <%- end -%>
@@ -21,7 +21,7 @@
     <tr class="line<%= cycle("0", "1") -%>">
       <td>
         <% if accept.item %>
-          <%= render 'manifestations/show_index', :manifestation => accept.item.manifestation %>
+          <%= render 'manifestations/show_index', manifestation: accept.item.manifestation %>
           <%= link_to accept.item.item_identifier, accept.item -%> / <%= accept.item.call_number %>
           (<%= link_to accept.item.shelf.library.display_name.localize, accept.item.shelf.library %> /
           <%= link_to accept.item.shelf.display_name.localize, accept.item.shelf %>)<br />
@@ -30,7 +30,7 @@
       </td>
       <td>
         <%- if can? :delete, accept -%>
-          <%= link_to t('page.destroy'), accept, :data => {:confirm => t('page.are_you_sure')}, :method => :delete -%>
+          <%= link_to t('page.destroy'), accept, data: {confirm: t('page.are_you_sure')}, method: :delete -%>
         <%- end -%>
       </td>
     </tr>
@@ -44,6 +44,6 @@
 
 <div id="submenu" class="ui-corner-all ui-widget-content">
   <ul>
-    <li><%= link_to t('page.new', :model => t('activerecord.models.accept')), new_accept_path -%></li>
+    <li><%= link_to t('page.new', model: t('activerecord.models.accept')), new_accept_path -%></li>
   </ul>
 </div>

data/app/views/accepts/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.accept')) -%></h1>
+<h1 class="title"><%= t('page.new', model: t('activerecord.models.accept')) -%></h1>
 <div id="content_list">
   <div id="accept_list">
     <%= render 'list' -%>