enju_library 0.2.5 → 0.3.0.beta.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 68aa97ed6ffa7f1b6171341f4418c4515261e491
-  data.tar.gz: 972c34fe9c4fe4f7f7e7c278f2a04c024a51cfc5
+  metadata.gz: 76e70f51dcbfc0d739e4dccd6858dd1602a0ef97
+  data.tar.gz: 573f27ebf7af76f3362f6774fd4000b8fba2c2f9
 SHA512:
-  metadata.gz: 7ce9f626875d6fec18c594cec82fff8b64e16befb3102b452b6bfaaad86d18ea2f715bd4b64a64e025221d463d6d1a6330904e63a4ff25109d2940fe7cd578ed
-  data.tar.gz: 103923704202a2704aa121e9cb4b295fec7f40debdb839a092114850ea284b73349401a075abbad8cb6e12d1207d0783c2fc4e8bd16d31b7cb1050a55164a4f4
+  metadata.gz: c6d9eadfdaeac6544a2a2e1717f16cbc398eca1a6cd7135ae8d20e5cb160a9c63e623637fa5fdfe27a27b08267d506f3a3d773ed01bb6e536ec06a95bfbe53a3
+  data.tar.gz: 3f08ec9cfc1e90d61208aee9a82afc2c6d80aeb6c5426622abd42bb23245930c6deeb80a3d9131049a5ec71e2086e6379f2950febfeb453bc23c0fbe52d4ce11

data/README.rdoc

@@ -1,7 +1,7 @@
 = EnjuLibrary
-{<img src="https://travis-ci.org/next-l/enju_library.svg?branch=1.2" alt="Build Status" />}[https://travis-ci.org/next-l/enju_library]
-{<img src="https://coveralls.io/repos/next-l/enju_library/badge.svg?branch=1.2&service=github" alt="Coverage Status" />}[https://coveralls.io/github/next-l/enju_library?branch=1.2]
-{<img src="https://hakiri.io/github/next-l/enju_library/1.2.svg" alt="security" />}[https://hakiri.io/github/next-l/enju_library/1.2]
+{<img src="https://travis-ci.org/next-l/enju_library.svg?branch=1.3" alt="Build Status" />}[https://travis-ci.org/next-l/enju_library]
+{<img src="https://coveralls.io/repos/next-l/enju_library/badge.svg?branch=1.3&service=github" alt="Coverage Status" />}[https://coveralls.io/github/next-l/enju_library?branch=1.3]
+{<img src="https://hakiri.io/github/next-l/enju_library/1.3.svg" alt="security" />}[https://hakiri.io/github/next-l/enju_library/1.3]
 
 This project rocks and uses MIT-LICENSE.
 

data/app/controllers/accepts_controller.rb

@@ -121,6 +121,7 @@ class AcceptsController < ApplicationController
   end
 
   private
+
   def set_accept
     @accept = Accept.find(params[:id])
     authorize @accept

data/app/controllers/baskets_controller.rb

@@ -80,8 +80,8 @@ class BasketsController < ApplicationController
     end
 
     respond_to do |format|
-      #if @basket.update_attributes({})
-      if @basket.save(:validate => false)
+      # if @basket.update_attributes({})
+      if @basket.save(validate: false)
         # 貸出完了時
         format.html { redirect_to checkouts_url(user_id: @basket.user.username), notice: t('basket.checkout_completed') }
         format.json { head :no_content }
@@ -105,6 +105,7 @@ class BasketsController < ApplicationController
   end
 
   private
+
   def set_basket
     @basket = Basket.find(params[:id])
     authorize @basket

data/app/controllers/bookstores_controller.rb

@@ -84,6 +84,7 @@ class BookstoresController < ApplicationController
   end
 
   private
+
   def set_bookstore
     @bookstore = Bookstore.find(params[:id])
     authorize @bookstore

data/app/controllers/budget_types_controller.rb

@@ -84,6 +84,7 @@ class BudgetTypesController < ApplicationController
   end
 
   private
+
   def set_budget_type
     @budget_type = BudgetType.find(params[:id])
     authorize @budget_type

data/app/controllers/concerns/enju_library/controller.rb

@@ -6,9 +6,9 @@ module EnjuLibrary
       before_action :get_library_group, :set_locale, :set_available_languages, :set_mobile_request
       before_action :store_current_location, unless: :devise_controller?
       rescue_from Pundit::NotAuthorizedError, with: :render_403
-      #rescue_from ActiveRecord::RecordNotFound, with: :render_404
+      # rescue_from ActiveRecord::RecordNotFound, with: :render_404
       rescue_from Errno::ECONNREFUSED, with: :render_500_nosolr
-      #rescue_from ActionView::MissingTemplate, with: :render_404_invalid_format
+      # rescue_from ActionView::MissingTemplate, with: :render_404_invalid_format
       helper_method :filtered_params
     end
 
@@ -18,19 +18,19 @@ module EnjuLibrary
       return if performed?
       if user_signed_in?
         respond_to do |format|
-          format.html {render template: 'page/403', status: 403}
-          #format.html.phone {render template: 'page/403', status: 403}
-          format.xml {render template: 'page/403', status: 403}
+          format.html {render template: 'page/403', status: :forbidden}
+          # format.html.phone {render template: 'page/403', status: 403}
+          format.xml {render template: 'page/403', status: :forbidden}
           format.json { render text: '{"error": "forbidden"}' }
-          format.rss {render template: 'page/403.xml', status: 403}
+          format.rss {render template: 'page/403.xml', status: :forbidden}
         end
       else
         respond_to do |format|
           format.html { redirect_to main_app.new_user_session_url }
-          #format.html.phone { redirect_to new_user_session_url }
-          format.xml { render template: 'page/403', status: 403 }
+          # format.html.phone { redirect_to new_user_session_url }
+          format.xml { render template: 'page/403', status: :forbidden }
           format.json { render text: '{"error": "forbidden"}' }
-          format.rss { render template: 'page/403.xml', status: 403 }
+          format.rss { render template: 'page/403.xml', status: :forbidden }
         end
       end
     end
@@ -38,11 +38,11 @@ module EnjuLibrary
     def render_404
       return if performed?
       respond_to do |format|
-        format.html { render template: 'page/404', status: 404 }
-        #format.html.phone { render template: 'page/404', status: 404 }
-        format.xml { render template: 'page/404', status: 404 }
+        format.html { render template: 'page/404', status: :not_found }
+        # format.html.phone { render template: 'page/404', status: 404 }
+        format.xml { render template: 'page/404', status: :not_found }
         format.json { render text: '{"error": "not_found"}' }
-        format.rss { render template: 'page/404.xml', status: 404 }
+        format.rss { render template: 'page/404.xml', status: :not_found }
       end
     end
 
@@ -54,24 +54,24 @@ module EnjuLibrary
     def render_500
       return if performed?
       respond_to do |format|
-        format.html {render file: "#{Rails.root}/public/500", layout: false, status: 500}
-        #format.html.phone {render file: "#{Rails.root}/public/500", layout: false, status: 500}
-        format.xml {render template: 'page/500', status: 500}
+        format.html {render file: "#{Rails.root}/public/500", layout: false, status: :internal_server_error}
+        # format.html.phone {render file: "#{Rails.root}/public/500", layout: false, status: 500}
+        format.xml {render template: 'page/500', status: :internal_server_error}
         format.json { render text: '{"error": "server_error"}' }
-        format.xml {render template: 'page/500.xml', status: 500}
+        format.xml {render template: 'page/500.xml', status: :internal_server_error}
       end
     end
 
     def render_500_nosolr
       Rails.logger.fatal("please confirm that the Solr is running.")
       return if performed?
-      #flash[:notice] = t('page.connection_failed')
+      # flash[:notice] = t('page.connection_failed')
       respond_to do |format|
-        format.html {render template: "page/500_nosolr", layout: false, status: 500}
-        #format.html.phone {render template: "page/500_nosolr", layout: false, status: 500}
-        format.xml {render template: 'page/500', status: 500}
+        format.html {render template: "page/500_nosolr", layout: false, status: :internal_server_error}
+        # format.html.phone {render template: "page/500_nosolr", layout: false, status: 500}
+        format.xml {render template: 'page/500', status: :internal_server_error}
         format.json { render text: '{"error": "server_error"}' }
-        format.xml {render template: 'page/500.xml', status: 500}
+        format.xml {render template: 'page/500.xml', status: :internal_server_error}
       end
     end
 
@@ -129,7 +129,7 @@ module EnjuLibrary
 
     def get_user
       @user = User.where(username: params[:user_id]).first if params[:user_id]
-      #authorize! :show, @user if @user
+      # authorize! :show, @user if @user
     end
 
     def get_user_group
@@ -154,7 +154,7 @@ module EnjuLibrary
     end
 
     def store_page
-      if request.get? and request.format.try(:html?) and !request.xhr?
+      if request.get? && request.format.try(:html?) && !request.xhr?
         flash[:page] = params[:page] if params[:page].to_i > 0
       end
     end
@@ -179,7 +179,7 @@ module EnjuLibrary
     end
 
     def api_request?
-      true unless params[:format].nil? or params[:format] == 'html'
+      true unless params[:format].nil? || (params[:format] == 'html')
     end
 
     def get_top_page_content

data/app/controllers/libraries_controller.rb

@@ -118,6 +118,7 @@ class LibrariesController < ApplicationController
   end
 
   private
+
   def set_library
     @library = Library.friendly.find(params[:id])
     authorize @library

data/app/controllers/library_groups_controller.rb

@@ -60,6 +60,7 @@ class LibraryGroupsController < ApplicationController
   end
 
   private
+
   def set_library_group
     @library_group = LibraryGroup.find(params[:id])
     if request.format == :download
@@ -82,10 +83,10 @@ class LibraryGroupsController < ApplicationController
       :header_logo, :delete_header_logo,
       :allow_bookmark_external_url, # EnjuBookmark
       {
-        :colors_attributes =>  [:id, :property, :code]
+        colors_attributes: [:id, :property, :code]
       },
       {
-        :user_attributes => [:email]
+        user_attributes: [:email]
       },
       *LibraryGroup.globalize_attribute_names,
     )

data/app/controllers/request_status_types_controller.rb

@@ -84,6 +84,7 @@ class RequestStatusTypesController < ApplicationController
   end
 
   private
+
   def set_request_status_type
     @request_status_type = RequestStatusType.find(params[:id])
     authorize @request_status_type

data/app/controllers/request_types_controller.rb

@@ -84,6 +84,7 @@ class RequestTypesController < ApplicationController
   end
 
   private
+
   def set_request_type
     @request_type = RequestType.find(params[:id])
     authorize @request_type

data/app/controllers/search_engines_controller.rb

@@ -84,6 +84,7 @@ class SearchEnginesController < ApplicationController
   end
 
   private
+
   def set_search_engine
     @search_engine = SearchEngine.find(params[:id])
     authorize @search_engine

data/app/controllers/shelves_controller.rb

@@ -17,10 +17,10 @@ class ShelvesController < ApplicationController
       return
     else
       sort = {sort_by: 'name', order: 'asc'}
-      #case params[:sort_by]
-      #when 'name'
+      # case params[:sort_by]
+      # when 'name'
       #  sort[:sort_by] = 'name'
-      #end
+      # end
       sort[:order] = 'desc' if params[:order] == 'desc'
 
       query = @query = params[:query].to_s.strip
@@ -67,7 +67,7 @@ class ShelvesController < ApplicationController
     @shelf = Shelf.new
     @library = current_user.profile.library unless @library
     @shelf.library = @library
-    #@shelf.user = current_user
+    # @shelf.user = current_user
 
     respond_to do |format|
       format.html # new.html.erb
@@ -87,7 +87,7 @@ class ShelvesController < ApplicationController
     if @library
       @shelf.library = @library
     else
-      @shelf.library = Library.web #unless current_user.has_role?('Librarian')
+      @shelf.library = Library.web # unless current_user.has_role?('Librarian')
     end
 
     respond_to do |format|
@@ -137,6 +137,7 @@ class ShelvesController < ApplicationController
   end
 
   private
+
   def set_shelf
     @shelf = Shelf.find(params[:id])
     authorize @shelf

data/app/controllers/subscribes_controller.rb

@@ -82,6 +82,7 @@ class SubscribesController < ApplicationController
   end
 
   private
+
   def set_subscribe
     @subscribe = Subscribe.find(params[:id])
     authorize @subscribe

data/app/controllers/subscriptions_controller.rb

@@ -86,6 +86,7 @@ class SubscriptionsController < ApplicationController
   end
 
   private
+
   def set_subscription
     @subscription = Subscription.find(params[:id])
     authorize @subscription

data/app/controllers/user_export_files_controller.rb

@@ -101,6 +101,7 @@ class UserExportFilesController < ApplicationController
   end
 
   private
+
   def set_user_export_file
     @user_export_file = UserExportFile.find(params[:id])
     authorize @user_export_file

data/app/controllers/user_groups_controller.rb

@@ -86,6 +86,7 @@ class UserGroupsController < ApplicationController
   end
 
   private
+
   def set_user_group
     @user_group = UserGroup.find(params[:id])
     authorize @user_group
@@ -103,7 +104,7 @@ class UserGroupsController < ApplicationController
       :number_of_day_to_notify_due_date,
       :number_of_time_to_notify_overdue,
       # EnjuCirculation
-      {:user_group_has_checkout_types_attributes => [
+      {user_group_has_checkout_types_attributes: [
         :id, :checkout_type_id, :checkout_limit, :checkout_period, :checkout_renewal_limit,
         :reservation_limit, :reservation_expired_period, :set_due_date_before_closing_day
       ]},

data/app/controllers/user_import_files_controller.rb

@@ -106,6 +106,7 @@ class UserImportFilesController < ApplicationController
   end
 
   private
+
   def set_user_import_file
     @user_import_file = UserImportFile.find(params[:id])
     authorize @user_import_file

data/app/controllers/user_import_results_controller.rb

@@ -40,6 +40,7 @@ class UserImportResultsController < ApplicationController
   end
 
   private
+
   def set_user_import_result
     @user_import_result = UserImportResult.find(params[:id])
     authorize @user_import_result

data/app/controllers/withdraws_controller.rb

@@ -122,6 +122,7 @@ class WithdrawsController < ApplicationController
   end
 
   private
+
   def set_withdraw
     @withdraw = Withdraw.find(params[:id])
     authorize @withdraw

data/app/models/budget_type.rb

@@ -4,6 +4,7 @@ class BudgetType < ActiveRecord::Base
   has_many :items
 
   private
+
   def valid_name?
     true
   end

data/app/models/concerns/export_file.rb

@@ -14,6 +14,7 @@ module ExportFile
     request = MessageRequest.new
     request.assign_attributes({sender: sender, receiver: user, message_template: message_template})
     request.save_message_body
+    request.save!
     request.transition_to!(:sent)
   end
 end

data/app/models/concerns/import_file.rb

@@ -55,6 +55,7 @@ module ImportFile
   end
 
   private
+
   def nkf_encode(line)
     case user_encoding
     when 'auto_detect'

data/app/models/library.rb

@@ -5,7 +5,7 @@ class Library < ActiveRecord::Base
   has_many :shelves
   belongs_to :library_group, validate: true
   has_many :profiles
-  belongs_to :country
+  belongs_to :country, optional: true
 
   extend FriendlyId
   friendly_id :name
@@ -71,7 +71,7 @@ class Library < ActiveRecord::Base
   end
 
   def address_changed?
-    return true if region_changed? || locality_changed? || street_changed?
+    return true if saved_change_to_region? || saved_change_to_locality? || saved_change_to_street?
     false
   end
 

data/app/models/library_group.rb

@@ -4,8 +4,8 @@ class LibraryGroup < ActiveRecord::Base
 
   has_many :libraries
   has_many :colors
-  belongs_to :country
-  belongs_to :user
+  belongs_to :country, optional: true
+  belongs_to :user, optional: true
 
   validates :url, presence: true, url: true
   validates :max_number_of_results, numericality: {

data/app/models/request_status_type.rb

@@ -4,6 +4,7 @@ class RequestStatusType < ActiveRecord::Base
   has_many :reserves
 
   private
+
   def valid_name?
     true
   end

data/app/models/request_type.rb

@@ -3,6 +3,7 @@ class RequestType < ActiveRecord::Base
   validates :name, presence: true, format: { with: /\A[0-9A-Za-z][0-9A-Za-z_\-\s,]*[0-9a-z]\Z/ }
 
   private
+
   def valid_name?
     true
   end

data/app/models/subscribe.rb

@@ -1,5 +1,5 @@
 class Subscribe < ActiveRecord::Base
-  belongs_to :subscription, :counter_cache => true, validate: true
+  belongs_to :subscription, counter_cache: true, validate: true
   belongs_to :work, class_name: 'Manifestation', validate: true
 
   validates_associated :subscription, :work

data/app/models/user_export_file.rb

@@ -17,7 +17,7 @@ class UserExportFile < ActiveRecord::Base
   end
   validates_attachment_content_type :user_export, content_type: /\Atext\/plain\Z/
 
-  has_many :user_export_file_transitions, autosave: false
+  has_many :user_export_file_transitions, autosave: false, dependent: :destroy
 
   def state_machine
     UserExportFileStateMachine.new(self, transition_class: UserExportFileTransition)

data/app/models/user_import_file.rb

@@ -26,12 +26,12 @@ class UserImportFile < ActiveRecord::Base
     'application/vnd.ms-excel'
   ]
   validates_attachment_presence :user_import
-  belongs_to :user, validate: true
+  belongs_to :user
   belongs_to :default_user_group, class_name: 'UserGroup'
   belongs_to :default_library, class_name: 'Library'
-  has_many :user_import_results
+  has_many :user_import_results, dependent: :destroy
 
-  has_many :user_import_file_transitions, autosave: false
+  has_many :user_import_file_transitions, autosave: false, dependent: :destroy
 
   attr_accessor :mode
 
@@ -204,6 +204,7 @@ class UserImportFile < ActiveRecord::Base
   end
 
   private
+
   def self.transition_class
     UserImportFileTransition
   end
@@ -254,6 +255,7 @@ class UserImportFile < ActiveRecord::Base
   end
 
   private
+
   # ユーザ情報のパラメータを設定します。
   # @param [Hash] row 利用者情報のハッシュ
   def set_user_params(row)