enju_library 0.1.0.pre40 → 0.1.0.pre41

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 43ae415d2c7916d8d10576cb4e6f6e6ca35c4efc
-  data.tar.gz: 2c2cd4dcfc3dd1715278b4b441bb73d7422dc7d7
+  metadata.gz: a94a8fc6ca5f6bada67b337668886e4c21179433
+  data.tar.gz: 3c77b8a345eae6e32a70cfacbdedf5c566292c84
 SHA512:
-  metadata.gz: c8e071bad6eb78a01366fcaffd2c653185773b2d04b1e6b5d8b9c3fad6e12c9167dad62184fa1cdee1ecbf6c894f4d8a7421df2e1e8dfd5f7149581c574a3c0b
-  data.tar.gz: a105c67e432856dcb48cde413e792064f7b4623e11c22e5651d7b7c7ff4efe58dc8671d1502336d00993a23f87e94ae0d8fbce635e69f87b3c59ff23fcfc6a88
+  metadata.gz: dfbf92ceb07f554b5ed71cfe4bdfae02053a545cc5f072a3bcc97796a8c06b751ed45636c240b6d5943b9854f019035e987247872a812568656e007eb7cf7e59
+  data.tar.gz: 64c36bf84ee802cc52aa294f89f32f78182eb79b013d5a80d5d0353e87edf1b9a495f7489b8e70ef774bce298307ffe95b6c474cb17117a2297cea3093f0cef0

data/app/controllers/library_groups_controller.rb

@@ -47,6 +47,8 @@ class LibraryGroupsController < ApplicationController
     params.require(:library_group).permit(
       :name, :display_name, :short_name, :my_networks,
       :login_banner, :note, :country_id, :admin_networks, :url,
+      :max_number_of_results,
+      :book_jacket_source, :screenshot_generator, :erms_url,
       :allow_bookmark_external_url, # EnjuBookmark
       {
         :colors_attributes =>  [:id, :property, :code]

data/app/models/library_group.rb

@@ -8,7 +8,25 @@ class LibraryGroup < ActiveRecord::Base
   belongs_to :country
 
   validates :url, presence: true, url: true
+  validates :max_number_of_results, numericality: {
+      greater_than_or_equal_to: 0
+    }
   accepts_nested_attributes_for :colors, update_only: true
+  if Rails::VERSION::MAJOR >= 4
+    store :settings, accessors: [
+      :max_number_of_results, :family_name_first,
+      :pub_year_facet_range_interval,
+      :book_jacket_source, :book_jacket_unknown_resource,
+      :screenshot_generator, :erms_url
+    ], coder: JSON
+  else
+    store :settings, accessors: [
+      :max_number_of_results, :family_name_first,
+      :pub_year_facet_range_interval,
+      :book_jacket_source, :book_jacket_unknown_resource,
+      :screenshot_generator, :erms_url
+    ]
+  end
 
   def self.site_config
     LibraryGroup.find(1)

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

@@ -26,6 +26,11 @@
     <%= f.text_area :login_banner -%>
   </div>
 
+  <div class="field">
+    <%= f.label :max_number_of_results -%><br />
+    <%= f.number_field :max_number_of_results -%>
+  </div>
+
   <div class="field">
     <%= f.label :color -%><br />
     <%= f.fields_for :colors do |color_form| %>

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

@@ -28,6 +28,11 @@
   <%= markdown_helper(@library_group.login_banner) -%>
 </div>
 
+<div>
+  <strong><%= t('activerecord.attributes.library_group.max_number_of_results') -%>:</strong>
+  <%= @library_group.max_number_of_results -%>
+</div>
+
 <div>
   <strong><%= t('activerecord.attributes.library_group.color') -%>:</strong>
   <ul>

data/config/locales/translation_en.yml

@@ -54,6 +54,7 @@ en:
         post_to_union_catalog: Post to union catalog
         url: URL
         color: Color
+        max_number_of_results: Max number of results
       bookstore:
         name: Name
         zip_code: Zip code
@@ -105,3 +106,5 @@ en:
     address: "Address"
   shelf:
     update_display_order: Update display order
+  page:
+    restart_required: "Web server restart required"

data/config/locales/translation_ja.yml

@@ -54,6 +54,7 @@ ja:
         post_to_union_catalog: 総合目録に登録する
         url: URL
         color: 色
+        max_number_of_results: 検索結果の最大件数
       bookstore:
         name: 名前
         zip_code: 郵便番号
@@ -105,3 +106,5 @@ ja:
     address: "住所"
   shelf:
     update_display_order: "表示順序を変更する"
+  page:
+    restart_required: "Webサーバの再起動が必要です"

data/db/migrate/20150221063719_add_settings_to_library_group.rb

@@ -0,0 +1,5 @@
+class AddSettingsToLibraryGroup < ActiveRecord::Migration
+  def change
+    add_column :library_groups, :settings, :text
+  end
+end

data/lib/enju_library/version.rb

@@ -1,3 +1,3 @@
 module EnjuLibrary
-  VERSION = "0.1.0.pre40"
+  VERSION = "0.1.0.pre41"
 end

data/lib/generators/enju_library/setup/setup_generator.rb

@@ -5,6 +5,5 @@ class EnjuLibrary::SetupGenerator < Rails::Generators::Base
   def copy_setup_files
     directory("db/fixtures", "db/fixtures/enju_library")
     return if file == 'fixture'
-    rake("enju_library_engine:install:migrations")
   end
 end

data/lib/generators/enju_library/setup/templates/db/fixtures/library_groups.yml

@@ -10,3 +10,4 @@ library_group_00001:
   login_banner: Next-L Enju, an open-source integrated library system. You can edit this message after logging in as Administrator.
   admin_networks: "0.0.0.0/0\r\n\
     ::/0"
+  settings: "{\"max_number_of_results\":500, \"family_name_first\":true, \"skip_mobile_agents\":\"ipad\"}"

data/lib/tasks/enju_library_tasks.rake

@@ -13,6 +13,13 @@ namespace :enju_library do
   task :upgrade => :environment do
     LibraryGroup.transaction do
       update_color
+      library_group = LibraryGroup.find(1)
+      library_group.settings[:skip_mobile_agents] = ''
+      library_group.settings[:max_number_of_results] = 500
+      library_group.settings[:family_name_first] = true
+      library_group.settings[:book_jacket_source] = 'google'
+      library_group.settings[:screenshot_generator] = 'mozshot'
+      library_group.save!
     end
     puts 'enju_library: The upgrade completed successfully.'
   end

data/spec/dummy/app/helpers/application_helper.rb

@@ -1,25 +1,4 @@
 module ApplicationHelper
   include EnjuLeaf::EnjuLeafHelper
   include EnjuBiblio::BiblioHelper
-
-  def back_to_index(options = {})
-    if options == nil
-      options = {}
-    else
-      options.reject!{|key, value| value.blank?}
-      options.delete(:page) if options[:page].to_i == 1
-    end
-    unless controller_name == 'test'
-      link_to t('page.listing', :model => t("activerecord.models.#{controller_name.singularize}")), url_for(params.merge(:controller => controller_name, :action => :index, :id => nil, :only_path => true).merge(options))
-    end
-  end
-
-  def markdown_helper(string)
-    return unless string
-    markdown = Redcarpet::Markdown.new(
-      Redcarpet::Render::HTML,
-      :autolink => true, :safe_links_only => true
-    )
-    markdown.render(string.to_s).html_safe
-  end
 end