enju_library 0.1.0.pre36 → 0.1.0.pre37

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8b94a2674d770a3478bbbff653c266530e3db08b
-  data.tar.gz: c566bfd340977a3df85685428d38dccc75acab0e
+  metadata.gz: d3abe64373ec9eb8255947166b0601bd8bd27ed6
+  data.tar.gz: 9ed1ae62421c5cc69ce9bd9f1fa86e4075e154f0
 SHA512:
-  metadata.gz: f7a081eff08d89d647199231ce7be31ee935a936b54d024e3d9e9286bc972b9d8f1c8bd7aa72520af223d29a9397e2fce865d81a287f10ceadeb40ae340095df
-  data.tar.gz: 24db20754ef9360aa26a8438a72420396db9a1da7b393314d1c762ade2e0cdac9c58e500eda5ce99480f8f32b7ea9953c5fbcb5114b9afc1b8ed95e6fa0175ce
+  metadata.gz: 9feb46a901187ef69f835f5306e7c8aff4bb46e8b51a7b745ff7ec3bd8afe05a4341bab5869a9fd673196afa7a0f93a42ea018530d6af231628ecf71d5c21f65
+  data.tar.gz: 2c1ebb03bc329f2cf47339c276ef5effd56177757270cd1e9674445879677ac885a01c648f635d7aedc8a2987b7a2b9a21715a219acf7fcb2dad42d797c3fcc5

data/app/controllers/accepts_controller.rb

@@ -11,11 +11,11 @@ class AcceptsController < ApplicationController
     else
       if params[:accept]
         @query = params[:accept][:item_identifier].to_s.strip
-        item = Item.where(:item_identifier => @query).first if @query.present?
+        item = Item.where(item_identifier: @query).first if @query.present?
       end
 
       if item
-        @accepts = Accept.order('accepts.created_at DESC').where(:item_id => item.id).page(params[:page])
+        @accepts = Accept.order('accepts.created_at DESC').where(item_id: item.id).page(params[:page])
       else
         if @basket
           @accepts = @basket.accepts.page(params[:page])
@@ -75,7 +75,7 @@ class AcceptsController < ApplicationController
     if @accept.item_identifier.blank?
       flash[:message] << t('accept.enter_item_identifier') if @accept.item_identifier.blank?
     else
-      item = Item.where(:item_identifier => @accept.item_identifier.to_s.strip).first
+      item = Item.where(item_identifier: @accept.item_identifier.to_s.strip).first
     end
     @accept.item = item
 

data/app/controllers/libraries_controller.rb

@@ -6,7 +6,7 @@ class LibrariesController < ApplicationController
   # GET /libraries
   # GET /libraries.json
   def index
-    sort = {:sort_by => 'position', :order => 'asc'}
+    sort = {sort_by: 'position', order: 'asc'}
     case params[:sort_by]
     when 'name'
       sort[:sort_by] = 'name'
@@ -18,7 +18,7 @@ class LibrariesController < ApplicationController
 
     @libraries = Library.search(include: [:shelves]) do
       fulltext query if query.present?
-      paginate :page => page.to_i, :per_page => Library.default_per_page
+      paginate page: page.to_i, per_page: Library.default_per_page
       order_by sort[:sort_by], sort[:order]
     end.results
 
@@ -33,9 +33,9 @@ class LibrariesController < ApplicationController
   def show
     if defined?(EnjuEvent)
       search = Sunspot.new_search(Event)
-      library = @library.dup
+      library_id = @library.id
       search.build do
-        with(:library_id).equal_to library.id
+        with(:library_id).equal_to library_id
         order_by(:start_at, :desc)
       end
       page = params[:event_page] || 1
@@ -117,6 +117,7 @@ class LibrariesController < ApplicationController
   end
 
   private
+
   def prepare_options
     @library_groups = LibraryGroup.all
     @countries = Country.all_cache

data/app/controllers/library_groups_controller.rb

@@ -32,7 +32,6 @@ class LibraryGroupsController < ApplicationController
   def update
     respond_to do |format|
       if @library_group.update_attributes(params[:library_group])
-        expire_page '/page/opensearch'
         format.html { redirect_to @library_group, notice:  t('controller.successfully_updated', model:  t('activerecord.models.library_group')) }
         format.json { head :no_content }
       else

data/app/controllers/shelves_controller.rb

@@ -15,7 +15,7 @@ class ShelvesController < ApplicationController
       render partial: 'select_form'
       return
     else
-      sort = {:sort_by => 'name', :order => 'asc'}
+      sort = {sort_by: 'name', order: 'asc'}
       #case params[:sort_by]
       #when 'name'
       #  sort[:sort_by] = 'name'
@@ -28,7 +28,7 @@ class ShelvesController < ApplicationController
 
       search = Shelf.search(include: [:library]) do
         fulltext query if query.present?
-        paginate :page => page.to_i, :per_page => Shelf.default_per_page
+        paginate page: page.to_i, per_page: Shelf.default_per_page
         if library
           with(:library).equal_to library.name
           order_by :position, :asc
@@ -50,7 +50,7 @@ class ShelvesController < ApplicationController
   # GET /shelves/1
   # GET /shelves/1.json
   def show
-    @shelf = Shelf.find(params[:id], include: :library)
+    @shelf = Shelf.includes(:library).find(params[:id])
 
     respond_to do |format|
       format.html # show.html.erb
@@ -75,7 +75,7 @@ class ShelvesController < ApplicationController
 
   # GET /shelves/1/edit
   def edit
-    @shelf = Shelf.find(params[:id], include: :library)
+    @shelf = Shelf.includes(:library).find(params[:id])
   end
 
   # POST /shelves

data/app/helpers/shelves_helper.rb

@@ -1,16 +1,15 @@
 module ShelvesHelper
   def library_shelf_facet(current_library, facet)
-    library = Library.where(:name => facet.value).select([:name, :display_name]).first
+    library = Library.where(name: facet.value).select([:name, :display_name]).first
     return nil unless library
-    string = ''
     current = true if current_library.try(:name) == library.name
     content_tag :li do
       if current
         content_tag :strong do
-          link_to("#{library.display_name.localize} (" + facet.count.to_s + ")", url_for(params.merge(:page => nil, :library_id => library.name, :only_path => true)))
+          link_to("#{library.display_name.localize} (" + facet.count.to_s + ")", url_for(params.merge(page: nil, library_id: library.name, only_path: true)))
         end
       else
-        link_to("#{library.display_name.localize} (" + facet.count.to_s + ")", url_for(params.merge(:page => nil, :library_id => library.name, :only_path => true)))
+        link_to("#{library.display_name.localize} (" + facet.count.to_s + ")", url_for(params.merge(page: nil, library_id: library.name, only_path: true)))
       end
     end
   end

data/app/models/accept.rb

@@ -1,6 +1,6 @@
 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, touch: true
   belongs_to :librarian, class_name: 'User'

data/app/models/basket.rb

@@ -1,7 +1,7 @@
 class Basket < ActiveRecord::Base
   attr_accessible :note, :user_number
-  default_scope order: 'baskets.id DESC'
-  scope :will_expire, lambda {|date| {:conditions => ['created_at < ?', date]}}
+  default_scope { order('baskets.id DESC') }
+  scope :will_expire, lambda {|date| where('created_at < ?', date)}
   belongs_to :user, validate: true
   has_many :accepts
 

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,8 +1,14 @@
 class BudgetType < ActiveRecord::Base
   attr_accessible :name, :display_name, :note, :position
   include MasterModel
-  default_scope order: 'budget_types.position'
+  validates :name, presence: true, format: { with: /\A[0-9A-Za-z][0-9A-Za-z_\-\s,]*[0-9a-z]\Z/ }
+  default_scope { order('budget_types.position') }
   has_many :items
+
+  private
+  def valid_name?
+    true
+  end
 end
 
 # == Schema Information

data/app/models/color.rb

@@ -0,0 +1,22 @@
+class Color < ActiveRecord::Base
+  attr_accessible :code, :property
+
+  belongs_to :library_group
+  validates :code, presence: true, format: /\A[A-Fa-f0-9]{6}\Z/
+  validates :property, presence: true, uniqueness: true, format: /\A[a-z][0-9a-z_]*[0-9a-z]\Z/
+
+  acts_as_list
+end
+
+# == Schema Information
+#
+# Table name: colors
+#
+#  id               :integer          not null, primary key
+#  library_group_id :integer
+#  property         :string(255)
+#  code             :string(255)
+#  position         :integer
+#  created_at       :datetime         not null
+#  updated_at       :datetime         not null
+#

data/app/models/enju_library/ability.rb

@@ -11,11 +11,11 @@ module EnjuLibrary
         end
         can [:read, :create, :update], Library
         can [:delete, :destroy], Library do |library|
-          library.shelves.empty? and !library.web?
+          library.shelves.empty? && !library.web?
         end
         can [:read, :create, :update], Shelf
         can [:delete, :destroy], Shelf do |shelf|
-          shelf.items.empty? and !shelf.web_shelf?
+          shelf.items.empty? && !shelf.web_shelf?
         end
         can :manage, [
           Accept,
@@ -28,7 +28,7 @@ module EnjuLibrary
           LibraryGroup,
           RequestStatusType,
           RequestType
-        ] if LibraryGroup.site_config.network_access_allowed?(ip_address, :network_type => :admin)
+        ] if LibraryGroup.site_config.network_access_allowed?(ip_address, network_type: :admin)
         can :read, [
           LibraryGroup,
           RequestStatusType,

data/app/models/library.rb

@@ -6,11 +6,11 @@ class Library < ActiveRecord::Base
     :country_id, :opening_hour, :isil, :position
 
   include MasterModel
-  default_scope order: 'libraries.position'
-  scope :real, where('id != 1')
-  has_many :shelves, order: 'shelves.position'
+  default_scope { order('libraries.position') }
+  scope :real, -> { where('id != 1') }
+  has_many :shelves
   belongs_to :library_group, validate: true
-  has_many :users
+  has_many :profiles
   belongs_to :country
 
   extend FriendlyId
@@ -25,13 +25,14 @@ class Library < ActiveRecord::Base
   end
 
   validates_associated :library_group
-  validates_presence_of :short_display_name, :library_group
-  validates_uniqueness_of :short_display_name, :case_sensitive => false
+  validates :short_display_name, presence: true
+  validates :library_group, presence: true
+  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
-  after_validation :geocode, :if => :address_changed?
+  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
   after_destroy :clear_all_cache
@@ -40,7 +41,7 @@ class Library < ActiveRecord::Base
 
   def self.all_cache
     if Rails.env == 'production'
-      Rails.cache.fetch('library_all'){Library.all}
+      Rails.cache.fetch('library_all'){ Library.all }
     else
       Library.all
     end
@@ -52,13 +53,13 @@ class Library < ActiveRecord::Base
 
   def create_shelf
     shelf = Shelf.new
-    shelf.name = "#{self.name}_default"
+    shelf.name = "#{name}_default"
     shelf.library = self
     shelf.save!
   end
 
   def web?
-    return true if self.id == 1
+    return true if id == 1
     false
   end
 
@@ -69,24 +70,26 @@ class Library < ActiveRecord::Base
   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)}"
+      "#{region.to_s.localize(locale)}#{locality.to_s.localize(locale)}#{street.to_s.localize(locale)}"
     else
-      "#{self.street.to_s.localize(locale)} #{self.locality.to_s.localize(locale)} #{self.region.to_s.localize(locale)}"
+      "#{street.to_s.localize(locale)} #{locality.to_s.localize(locale)} #{region.to_s.localize(locale)}"
     end
   rescue
     nil
   end
 
   def address_changed?
-    return true if region_changed? or locality_changed? or street_changed?
+    return true if region_changed? || locality_changed? || street_changed?
     false
   end
 
   if defined?(EnjuEvent)
-    has_many :events, :include => :event_category
+    has_many :events
 
     def closed?(date)
-      events.closing_days.collect{|c| c.start_at.beginning_of_day}.include?(date.beginning_of_day)
+      events.closing_days.map{ |c|
+        c.start_at.beginning_of_day
+      }.include?(date.beginning_of_day)
     end
   end
 

data/app/models/library_group.rb

@@ -1,15 +1,21 @@
 # -*- encoding: utf-8 -*-
 class LibraryGroup < ActiveRecord::Base
   attr_accessible :name, :display_name, :short_name, :my_networks,
-    :login_banner, :note, :country_id, :admin_networks, :url
+    :login_banner, :note, :country_id, :admin_networks, :url,
+    :colors_attributes
+  if defined?(EnjuBookmark)
+    attr_accessible :allow_bookmark_external_url
+  end
 
   #include Singleton
   include MasterModel
 
   has_many :libraries
+  has_many :colors
   belongs_to :country
 
   validates :url, presence: true, url: true
+  accepts_nested_attributes_for :colors, update_only: true
 
   def self.site_config
     LibraryGroup.find(1)
@@ -29,13 +35,13 @@ class LibraryGroup < ActiveRecord::Base
   end
 
   def network_access_allowed?(ip_address, options = {})
-    options = {:network_type => :lan}.merge(options)
+    options = { network_type: :lan }.merge(options)
     client_ip = IPAddr.new(ip_address)
     case options[:network_type]
     when :admin
-      allowed_networks = self.admin_networks.to_s.split
+      allowed_networks = admin_networks.to_s.split
     else
-      allowed_networks = self.my_networks.to_s.split
+      allowed_networks = my_networks.to_s.split
     end
     allowed_networks.each do |allowed_network|
       begin

data/app/models/request_status_type.rb

@@ -1,8 +1,14 @@
 class RequestStatusType < ActiveRecord::Base
   attr_accessible :name, :display_name, :note
   include MasterModel
-  default_scope order: 'position'
+  validates :name, presence: true, format: { with: /\A[0-9A-Za-z][0-9A-Za-z_\-\s,]*[0-9a-z]\Z/ }
+  default_scope { order('request_status_types.position') }
   has_many :reserves
+
+  private
+  def valid_name?
+    true
+  end
 end
 
 # == Schema Information

data/app/models/request_type.rb

@@ -1,7 +1,13 @@
 class RequestType < ActiveRecord::Base
   attr_accessible :name, :display_name, :note
   include MasterModel
-  default_scope order: 'position'
+  validates :name, presence: true, format: { with: /\A[0-9A-Za-z][0-9A-Za-z_\-\s,]*[0-9a-z]\Z/ }
+  default_scope { order('request_types.position') }
+
+  private
+  def valid_name?
+    true
+  end
 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 :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
 
@@ -20,9 +20,9 @@ class SearchEngine < ActiveRecord::Base
 
   def search_params(query)
     params = {}
-    if self.additional_param
-      self.additional_param.gsub('{query}', query).to_s.split.each do |param|
-        p = param.split("=")
+    if additional_param
+      additional_param.gsub('{query}', query).to_s.split.each do |param|
+        p = param.split('=')
         params[p[0].to_sym] = p[1]
       end
       return params

data/app/models/shelf.rb

@@ -1,15 +1,15 @@
 class Shelf < ActiveRecord::Base
   attr_accessible :name, :display_name, :note, :library_id, :closed
   include MasterModel
-  scope :real, where('library_id != 1')
+  scope :real, -> { where('library_id != 1') }
   belongs_to :library, validate: true
-  has_many :items, :include => [:circulation_status]
+  has_many :items
   has_many :picture_files, as: :picture_attachable, dependent: :destroy
 
   validates_associated :library
-  validates_presence_of :library
+  validates :library, presence: true
   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 :name, format: { with: /\A[a-z][0-9a-z\-_]{1,253}[0-9a-z]\Z/ }
 
   acts_as_list scope: :library
 
@@ -27,7 +27,7 @@ class Shelf < ActiveRecord::Base
   paginates_per 10
 
   def web_shelf?
-    return true if self.id == 1
+    return true if id == 1
     false
   end