enju_leaf 1.1.0.rc17 → 1.1.0.rc18

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a8d14bdad46e9c610c2389ca04b54bc526cd3877
-  data.tar.gz: b6cd6d4d8be8126685adcd08586fb5830d621a77
+  metadata.gz: b485d724e7c536952e92b1ba09b5a00f14eb6bcd
+  data.tar.gz: 24d48f269fe8f063b37f92160029564002f7b9f0
 SHA512:
-  metadata.gz: 4a40ca67ed8ac850e90aac0ba18e48b1b9985e47e4f65e453b8b794bd45a5b723e436e0da2d194863845a7bd66c0d48eedbd8e35f1321aedbb04c02faa20c46f
-  data.tar.gz: 729bdbf4a9d147afa295ebac0abc997f7a129ebd7088c3681de30b9465481d65af9a126bdb3228d51216109651caae1c95e60455d7e8c5ab52f93593fca4e029
+  metadata.gz: d3c3596996704276665024e8f0a268a29a8d708fdc773bfe79128059b2b2d3b774d912c30ace4cbe23d3be8c5ccba73620e2e2d47acef8b78ed49a0d2f846b11
+  data.tar.gz: ec8ff2d3b703245113f7a8d0da04446bd52404a618948571001101775b54d42e8b2d11f4885fcf15e7ffd745cf8616bc4daecfcb15b00fa922f5dd742d43c249

data/Rakefile

@@ -29,7 +29,7 @@ require 'rspec/core'
 require 'rspec/core/rake_task'
 
 RSpec::Core::RakeTask.new(:spec) do |spec|
-    spec.pattern = FileList['spec/**/*_spec.rb']
+  spec.pattern = FileList['spec/**/*_spec.rb']
 end
 
 task :default => :spec

data/app/controllers/user_export_files_controller.rb

@@ -16,7 +16,7 @@ class UserExportFilesController < ApplicationController
   # GET /user_export_files/1.json
   def show
     if @user_export_file.user_export.path
-      unless Setting.uploaded_file.storage == :s3
+      unless ENV['ENJU_STORAGE'] == 's3'
         file = @user_export_file.user_export.path
       end
     end
@@ -25,8 +25,9 @@ class UserExportFilesController < ApplicationController
       format.html # show.html.erb
       format.json { render json: @user_export_file }
       format.download {
-        if Setting.uploaded_file.storage == :s3
-          redirect_to @user_export_file.user_export.expiring_url(10)
+        if ENV['ENJU_STORAGE'] == 's3'
+          send_data Faraday.get(@user_export_file.user_export.expiring_url).body.force_encoding('UTF-8'),
+            filename: File.basename(@user_export_file.user_export_file_name), type: 'application/octet-stream'
         else
           send_file file, filename: @user_export_file.user_export_file_name, type: 'application/octet-stream'
         end

data/app/controllers/user_groups_controller.rb

@@ -93,7 +93,11 @@ class UserGroupsController < ApplicationController
       :number_of_day_to_notify_overdue,
       :number_of_day_to_notify_due_date,
       :number_of_time_to_notify_overdue,
-      :user_group_has_checkout_types_attributes # EnjuCirculation
+      # EnjuCirculation
+      {: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,
+      ]},
     )
   end
 

data/app/controllers/user_import_files_controller.rb

@@ -17,7 +17,7 @@ class UserImportFilesController < ApplicationController
   # GET /user_import_files/1.json
   def show
     if @user_import_file.user_import.path
-      unless Setting.uploaded_file.storage == :s3
+      unless ENV['ENJU_STORAGE'] == 's3'
         file = @user_import_file.user_import.path
       end
     end
@@ -26,7 +26,7 @@ class UserImportFilesController < ApplicationController
       format.html # show.html.erb
       format.json { render json: @user_import_file }
       format.download {
-        if Setting.uploaded_file.storage == :s3
+        if ENV['ENJU_STORAGE'] == 's3'
           redirect_to @user_import_file.user_import.expiring_url(10)
         else
           send_file file, filename: @user_import_file.user_import_file_name, type: 'application/octet-stream'

data/app/models/profile.rb

@@ -71,14 +71,19 @@ end
 #  user_id                  :integer
 #  user_group_id            :integer
 #  library_id               :integer
-#  locale                   :string(255)
-#  user_number              :string(255)
+#  locale                   :string
+#  user_number              :string
 #  full_name                :text
 #  note                     :text
 #  keyword_list             :text
 #  required_role_id         :integer
-#  created_at               :datetime         not null
-#  updated_at               :datetime         not null
-#  checkout_icalendar_token :string(255)
+#  created_at               :datetime
+#  updated_at               :datetime
+#  checkout_icalendar_token :string
 #  save_checkout_history    :boolean          default(FALSE), not null
+#  expired_at               :datetime
+#  save_search_history      :boolean
+#  share_bookmarks          :boolean
+#  full_name_transcription  :text
+#  date_of_birth            :datetime
 #

data/app/models/role.rb

@@ -41,8 +41,8 @@ end
 # Table name: roles
 #
 #  id           :integer          not null, primary key
-#  name         :string(255)      not null
-#  display_name :string(255)
+#  name         :string           not null
+#  display_name :string
 #  note         :text
 #  created_at   :datetime
 #  updated_at   :datetime

data/app/models/user_export_file.rb

@@ -2,9 +2,15 @@ class UserExportFile < ActiveRecord::Base
   include Statesman::Adapters::ActiveRecordQueries
   include ExportFile
   enju_export_file_model
-  if Setting.uploaded_file.storage == :s3
+
+  if ENV['ENJU_STORAGE'] == 's3'
     has_attached_file :user_export, storage: :s3,
-      s3_credentials: Setting.amazon,
+      s3_credentials: {
+        access_key: ENV['AWS_ACCESS_KEY_ID'],
+        secret_access_key: ENV['AWS_SECRET_ACCESS_KEY'],
+        bucket: ENV['S3_BUCKET_NAME'],
+        s3_host_name: ENV['S3_HOST_NAME']
+      },
       s3_permissions: :private
   else
     has_attached_file :user_export,
@@ -51,13 +57,12 @@ end
 #
 # Table name: user_export_files
 #
-#  id                       :integer          not null, primary key
-#  user_id                  :integer
-#  user_export_file_name    :string(255)
-#  user_export_content_type :string(255)
-#  user_export_file_size    :integer
-#  user_export_updated_at   :datetime
-#  executed_at              :datetime
-#  created_at               :datetime         not null
-#  updated_at               :datetime         not null
+#  id                   :integer          not null, primary key
+#  user_id              :integer
+#  executed_at          :datetime
+#  created_at           :datetime
+#  updated_at           :datetime
+#  user_export_id       :string
+#  user_export_size     :integer
+#  user_import_filename :string
 #

data/app/models/user_export_file_transition.rb

@@ -11,10 +11,10 @@ end
 # Table name: user_export_file_transitions
 #
 #  id                  :integer          not null, primary key
-#  to_state            :string(255)
-#  metadata            :text             default("{}")
+#  to_state            :string
+#  metadata            :text             default({})
 #  sort_key            :integer
 #  user_export_file_id :integer
-#  created_at          :datetime         not null
-#  updated_at          :datetime         not null
+#  created_at          :datetime
+#  updated_at          :datetime
 #

data/app/models/user_group.rb

@@ -18,12 +18,12 @@ end
 # Table name: user_groups
 #
 #  id                               :integer          not null, primary key
-#  name                             :string(255)
+#  name                             :string
 #  display_name                     :text
 #  note                             :text
 #  position                         :integer
-#  created_at                       :datetime         not null
-#  updated_at                       :datetime         not null
+#  created_at                       :datetime
+#  updated_at                       :datetime
 #  deleted_at                       :datetime
 #  valid_period_for_new_user        :integer          default(0), not null
 #  expired_at                       :datetime

data/app/models/user_has_role.rb

@@ -14,6 +14,6 @@ end
 #  id         :integer          not null, primary key
 #  user_id    :integer
 #  role_id    :integer
-#  created_at :datetime         not null
-#  updated_at :datetime         not null
+#  created_at :datetime
+#  updated_at :datetime
 #

data/app/models/user_import_file.rb

@@ -5,9 +5,14 @@ class UserImportFile < ActiveRecord::Base
   scope :not_imported, -> { in_state(:pending) }
   scope :stucked, -> { in_state(:pending).where('user_import_files.created_at < ?', 1.hour.ago) }
 
-  if Setting.uploaded_file.storage == :s3
+  if ENV['ENJU_STORAGE'] == 's3'
     has_attached_file :user_import, storage: :s3,
-      s3_credentials: Setting.amazon,
+      s3_credentials: {
+        access_key: ENV['AWS_ACCESS_KEY_ID'],
+        secret_access_key: ENV['AWS_SECRET_ACCESS_KEY'],
+        bucket: ENV['S3_BUCKET_NAME'],
+        s3_host_name: ENV['S3_HOST_NAME']
+      },
       s3_permissions: :private
   else
     has_attached_file :user_import,
@@ -92,6 +97,8 @@ class UserImportFile < ActiveRecord::Base
             num[:failed] += 1
           end
         else
+          import_result.error_message = new_user.errors.full_messages.join("\n")
+          import_result.save
           num[:failed] += 1
         end
       end
@@ -307,16 +314,18 @@ end
 #  user_id                  :integer
 #  note                     :text
 #  executed_at              :datetime
-#  user_import_file_name    :string(255)
-#  user_import_content_type :string(255)
-#  user_import_file_size    :string(255)
+#  user_import_file_name    :string
+#  user_import_content_type :string
+#  user_import_file_size    :integer
 #  user_import_updated_at   :datetime
-#  user_import_fingerprint  :string(255)
-#  edit_mode                :string(255)
+#  user_import_fingerprint  :string
+#  edit_mode                :string
 #  error_message            :text
-#  created_at               :datetime         not null
-#  updated_at               :datetime         not null
-#  user_encoding            :string(255)
+#  created_at               :datetime
+#  updated_at               :datetime
+#  user_encoding            :string
 #  default_library_id       :integer
 #  default_user_group_id    :integer
+#  user_import_id           :string
+#  user_import_size         :integer
 #

data/app/models/user_import_file_transition.rb

@@ -11,10 +11,10 @@ end
 # Table name: user_import_file_transitions
 #
 #  id                  :integer          not null, primary key
-#  to_state            :string(255)
-#  metadata            :text             default("{}")
+#  to_state            :string
+#  metadata            :text             default({})
 #  sort_key            :integer
 #  user_import_file_id :integer
-#  created_at          :datetime         not null
-#  updated_at          :datetime         not null
+#  created_at          :datetime
+#  updated_at          :datetime
 #

data/app/models/user_import_result.rb

@@ -15,6 +15,7 @@ end
 #  user_import_file_id :integer
 #  user_id             :integer
 #  body                :text
-#  created_at          :datetime         not null
-#  updated_at          :datetime         not null
+#  created_at          :datetime
+#  updated_at          :datetime
+#  error_message       :text
 #

data/app/views/layouts/application.html.erb

@@ -12,7 +12,7 @@
       <%= auto_discovery_link_tag(:atom, news_posts_url(format: :atom, locale: @locale), title: (t('news_post.library_group_news_post', library_group_name: @library_group.display_name.localize) + " (Atom)")) %>
     <% end %>
   <% end %>
-  <%= book_jacket_header(Setting.book_jacket.source) %>
+  <%= book_jacket_header(@library_group.settings[:book_jacket_source]) %>
   <% if controller.controller_name == 'page' %>
     <%= render 'page/portlets' %>
   <% end %>

data/app/views/my_accounts/_edit_credential.html.erb

@@ -44,7 +44,7 @@
 
     <div class="field">
       <%= user_form.label :locked -%>
-      <%= user_form.check_box :locked -%>
+      <%= user_form.check_box :locked, disabled: 'disabled' -%>
     </div>
 
     <div class="field">

data/app/views/page/_menu.html.erb

@@ -125,8 +125,8 @@
             <% if defined?(EnjuSearchLog) %>
               <li><%= link_to t('activerecord.models.search_history'), search_histories_path %></li>
             <% end %>
-            <% if Setting.enju.erms_url %>
-              <li><%= link_to t('page.electronic_resource_management'), Setting.enju.erms_url -%></li>
+            <% if @library_group.settings[:erms_url] %>
+              <li><%= link_to t('page.electronic_resource_management'), @library_group.settings[:erms_url] -%></li>
             <% end %>
             <li><%= link_to t('page.configuration'), page_configuration_path -%></li>
           <% else %>

data/app/views/page/advanced_search.html.erb

@@ -4,6 +4,14 @@
 
 <%= form_tag({controller: 'manifestations'}, {method: 'get'}) do -%>
   <table style="width: 100%">
+    <tr>
+      <td><%= label_tag :library_adv, t('activerecord.models.library') %>:</td>
+      <td>
+        <% @libraries.sort_by{|l| l.position }.each do |library| %>
+          <label><%= check_box_tag "library_adv[]", library.name %><%= library.display_name.localize %></label>
+        <% end %>
+      </td>
+    </tr>
     <tr>
       <td><%= label_tag :query, t('page.search_term') -%>:</td>
       <td><%= search_field_tag 'query', nil, class: 'search_form_short', placeholder: t('page.search_term') -%></td>
@@ -34,6 +42,10 @@
       <td><label><%= t('activerecord.attributes.manifestation.issn') -%>:</label></td>
       <td><%= text_field_tag 'issn' -%></td>
     </tr>
+    <tr>
+      <td><label><%= t('activerecord.attributes.item.call_number') %>:</label></td>
+      <td><%= text_field_tag 'call_number' %></td>
+    </tr>
     <tr>
       <td><label><%= t('activerecord.attributes.item.item_identifier') -%>:</label></td>
       <td><%= text_field_tag 'item_identifier' -%></td>

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

@@ -18,6 +18,11 @@
   <%= localized_state(@user_export_file.current_state) -%>
 </p>
 
+<p>
+  <strong><%= t('page.created_at') -%>:</strong>
+  <%= l(@user_export_file.created_at) if @user_export_file.created_at -%>
+</p>
+
 </div>
 </div>
 

data/app/workers/user_export_file_queue.rb

@@ -1,5 +1,5 @@
 class UserExportFileQueue
-  @queue = :user_export_file
+  @queue = :enju_leaf
 
   def self.perform(user_export_id)
     UserExportFile.find(user_export_id).export!

data/app/workers/user_import_file_queue.rb

@@ -1,5 +1,5 @@
 class UserImportFileQueue
-  @queue = :user_import_file
+  @queue = :enju_leaf
 
   def self.perform(user_import_file_id)
     UserImportFile.find(user_import_file_id).import_start

data/config/initializers/redis.rb

@@ -0,0 +1,3 @@
+if ENV["REDIS_URL"]
+  $redis = Redis.new(url: ENV["REDIS_URL"])
+end

data/config/locales/simple_form.ja.yml

@@ -3,7 +3,7 @@ ja:
     "yes": 'はい'
     "no": 'いいえ'
     required:
-      text: '必須'
+      text: 'required'
       mark: '*'
       message: '印のついている項目は入力が必須です。'
       # You can uncomment the line below if you need to overwrite the whole required html.

data/db/migrate/20150506105356_add_error_message_to_user_import_result.rb

@@ -0,0 +1,5 @@
+class AddErrorMessageToUserImportResult < ActiveRecord::Migration
+  def change
+    add_column :user_import_results, :error_message, :text
+  end
+end

data/lib/enju_leaf.rb

@@ -4,7 +4,6 @@ require "enju_leaf/controller"
 require "enju_leaf/user"
 require "enju_leaf/helper"
 require "enju_leaf/calculate_stat"
-require "enju_leaf/calculate_stat"
 require "enju_leaf/import_file"
 require "enju_leaf/export_file"
 require "enju_leaf/localized_name"
@@ -72,8 +71,8 @@ module EnjuLeaf
       return if performed?
       #flash[:notice] = t('page.connection_failed')
       respond_to do |format|
-        format.html {render file: "#{Rails.root.to_s}/public/500", layout: false, status: 500}
-        format.mobile {render file: "#{Rails.root.to_s}/public/500", layout: false, status: 500}
+        format.html {render file: "#{Rails.root}/public/500", layout: false, status: 500}
+        format.mobile {render file: "#{Rails.root}/public/500", layout: false, status: 500}
         format.xml {render template: 'page/500', status: 500}
         format.json { render text: '{"error": "server_error"}' }
         format.xml {render template: 'page/500.xml', status: 500}
@@ -138,7 +137,7 @@ module EnjuLeaf
     def convert_charset
       case params[:format]
       when 'csv'
-        return unless Setting.csv_charset_conversion
+        return unless LibraryGroup.site_config.settings[:csv_charset_conversion]
         # TODO: 他の言語
         if @locale.to_sym == :ja
           headers["Content-Type"] = "text/csv; charset=Shift_JIS"
@@ -214,8 +213,8 @@ module EnjuLeaf
 
     def get_top_page_content
       if defined?(EnjuNews)
-        @news_feeds = Rails.cache.fetch('news_feed_all'){NewsFeed.all}
-        @news_posts = NewsPost.limit(Setting.news_post.number.top_page)
+        @news_feeds = Rails.cache.fetch('news_feed_all'){NewsFeed.order(:position)}
+        @news_posts = NewsPost.limit(LibraryGroup.site_config.settings[:news_post_number_top_page] || 10)
       end
       @libraries = Library.real
     end

data/lib/enju_leaf/calculate_stat.rb

@@ -28,10 +28,10 @@ module CalculateStat
     end
 
     def send_message
-      sender = User.find(1) # system
+      sender = User.find(1) #system
       message_template = MessageTemplate.localized_template('counting_completed', user.profile.locale)
       request = MessageRequest.new
-      request.assign_attributes({:sender => sender, :receiver => user, :message_template => message_template})
+      request.assign_attributes({sender: sender, receiver: user, message_template: message_template})
       request.save_message_body
       request.transition_to!(:sent)
     end

data/lib/enju_leaf/engine.rb

@@ -7,12 +7,11 @@ require 'friendly_id'
 require 'addressable/uri'
 require 'sunspot_rails'
 require 'resque/server'
-require 'settingslogic'
 require 'nested_form'
 require 'enju_biblio'
 require 'enju_library'
 require 'enju_manifestation_viewer'
-require 'redcarpet'
+require 'kramdown'
 require 'mobylette'
 require 'rails_autolink'
 require 'devise-encryptable'