enju_leaf 1.3.4 → 2.0.0.beta.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3ca08f8d46ba44a4dc2fedd7e4e603330e53365bc35f21d61bbf06fa38caaf36
-  data.tar.gz: 9ba8e77dacd2653bc5dda6bdec6a194cb5511944f83bc962656426c6f4ac8bad
+  metadata.gz: 602199f5d16aa5bc86247f221e820011187839881c295106b587ae4815f5cd8c
+  data.tar.gz: ebaaa6802346f19b15474f180e43285f038eceab1f623095e01c3533cf582dc1
 SHA512:
-  metadata.gz: 86b2152db5e578eb2b1d94ee9359e20560b5277e6e65f9a03113da23b658c1611d89688a737659334ad1db625abab96dac7a3783cc3da0c58af34c3ceb434a05
-  data.tar.gz: 7bec97e965c36e73e5ddbe036bce8ef704dd962ea86f7e956d3b2fd150e89d1bf8d6aaad505e0dd77451cc639c6f9a87781ebc51b3e24c119b585a3e48a9cc55
+  metadata.gz: b175016f211a158b551f7c85be496af6508dec760cfa254872844704a4ae5749b0eb8b993b0f1be101e57b55a6599b412797c1b26314b63527ff573b59bc6526
+  data.tar.gz: 5d64877150bb883919ae2720b5a7ff51fdcbf61e6458b55d936204af79cda1680bf7432d2e63a31260668efa67b87be2660b69e159ee24807d9689b36411227d

data/README.md

@@ -1,7 +1,6 @@
 # Next-L Enju Leaf
-[![Travis CI](https://travis-ci.com/next-l/enju_leaf.svg?branch=1.3)](https://travis-ci.com/next-l/enju_leaf)
-[![Coverage Status](https://coveralls.io/repos/github/next-l/enju_leaf/badge.svg?branch=1.3)](https://coveralls.io/github/next-l/enju_leaf?branch=1.3)
-[![security](https://hakiri.io/github/next-l/enju_leaf/1.3.svg)](https://hakiri.io/github/next-l/enju_leaf/1.3)
+[![CircleCI](https://circleci.com/gh/next-l/enju_leaf/tree/2.x.svg?style=svg)](https://circleci.com/gh/next-l/enju_leaf/tree/2.x)
+[![Coverage Status](https://coveralls.io/repos/github/next-l/enju_leaf/badge.svg?branch=2.x)](https://coveralls.io/github/next-l/enju_leaf?branch=2.x)
 
 Next-L Enju Leaf は、[Project Next-L](https://www.next-l.jp) で開発している図書館管理システムです。
 
@@ -35,4 +34,3 @@ library system maintained by Japanese volunteers interested in libraries.
 ## 製作者・貢献者 (Authors and contributors)
 * [TANABE, Kosuke](https://github.com/nabeta) ([@nabeta](https://twitter.com/nabeta))
 * [Project Next-L](https://www.next-l.jp) ([@ProjectNextL](https://twitter.com/ProjectNextL))
-

data/app/assets/javascripts/enju_leaf/application.js

@@ -0,0 +1,12 @@
+//= require jquery.ui.all
+//= require jquery-colorbox/jquery.colorbox
+//= require jquery.highlight
+//= require jquery.shortcut
+//= require jquery.cookie
+//= require jquery.ui.menubar
+//= require enju_leaf/select_locale
+//= require enju_leaf/portlets
+//= require enju_leaf/menu
+//= require jquery-powertip/dist/jquery.powertip
+//= require cocoon
+//= require enju_leaf/autocomplete_agent

data/app/assets/javascripts/enju_leaf/mobile.js

@@ -0,0 +1,5 @@
+//= require rails-ujs
+//= require jquery/dist/jquery
+//= require jquery-migrate/dist/jquery-migrate
+//= require jquery.mobile-1.4.5
+//= require jquery-colorbox/jquery.colorbox

data/app/assets/stylesheets/{enju_leaf.css → enju_leaf/application.scss}

@@ -1,10 +1,10 @@
 /*
  *= require html5-doctor-reset-stylesheet.min
- *= require scaffold_modified
- *= require enju
- *= require colorbox
- *= require pagination
- *= require jquery.powertip
+ *= require enju_leaf/scaffold_modified
+ *= require enju_leaf/enju
+ *= require jquery-colorbox/example1/colorbox
+ *= require enju_leaf/pagination
+ *= require jquery-powertip/dist/css/jquery.powertip
  *= require jquery.ui.button
  *= require jquery.ui.tabs
  *= require jquery.ui.menu
@@ -12,5 +12,5 @@
  *= require jquery.ui.menubar
  *= require jquery.ui.autocomplete
  *= require jquery.ui.theme
- *= require portlets
+ *= require enju_leaf/portlets
 */

data/app/assets/stylesheets/{mobile.css → enju_leaf/mobile.css}

@@ -4,5 +4,5 @@
  * the top of the compiled file, but it's generally better to create a new file per style scope.
  *= require_self
  *= require jquery.mobile-1.4.5
- *= require enju_mobile
+ *= require enju_leaf/enju_mobile
 */

data/app/assets/stylesheets/{print.css → enju_leaf/print.css}

@@ -3,5 +3,5 @@
  * and any sub-directories. You're free to add application-wide styles to this file and they'll appear at
  * the top of the compiled file, but it's generally better to create a new file per style scope.
  *= require_self
- *= require enju_print
+ *= require enju_leaf/enju_print
 */

data/app/views/devise/registrations/edit.html.erb

@@ -2,7 +2,7 @@
   <h2 class="title"><%= t('activerecord.models.registration') %></h2>
   <div id="content_list">
 
-<%= form_for(resource, as: resource_name, url: user_registration_path, html: { method: :put }) do |f| %>
+<%= form_for(resource, as: resource_name, url: registration_path(resource_name), html: { method: :put }) do |f| %>
   <%= devise_error_messages! %>
 
   <div class="field">

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

@@ -5,11 +5,11 @@
   <%= render 'page/include' %>
   <title><%= title(controller.controller_name) %></title>
   <%- if controller.controller_name == 'manifestations' and controller.action_name == 'index' -%>
-    <%= auto_discovery_link_tag(:rss, url_for(params.permit.merge(format: 'rss', page: nil, commit: nil, only_path: true)), title: (t('manifestation.library_group_manifestation', library_group_name: @library_group.display_name.localize) + " (RSS)")) %>
-    <%= auto_discovery_link_tag(:atom, url_for(params.permit.merge(format: 'atom', page: nil, commit: nil, only_path: true)), title: (t('manifestation.library_group_manifestation', library_group_name: @library_group.display_name.localize) + " (Atom)")) %>
+    <%= auto_discovery_link_tag(:rss, url_for(params.permit.merge(format: 'rss', page: nil, commit: nil, only_path: true)), title: (t('manifestation.library_group_manifestation', library_group_name: @library_group.display_name) + " (RSS)")) %>
+    <%= auto_discovery_link_tag(:atom, url_for(params.permit.merge(format: 'atom', page: nil, commit: nil, only_path: true)), title: (t('manifestation.library_group_manifestation', library_group_name: @library_group.display_name) + " (Atom)")) %>
     <% if defined?(EnjuNews) %>
-      <%= auto_discovery_link_tag(:rss, news_posts_url(format: :rss, locale: @locale), title: (t('news_post.library_group_news_post', library_group_name: @library_group.display_name.localize) + " (RSS)")) %>
-      <%= 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)")) %>
+      <%= auto_discovery_link_tag(:rss, news_posts_url(format: :rss, locale: @locale), title: (t('news_post.library_group_news_post', library_group_name: @library_group.display_name) + " (RSS)")) %>
+      <%= 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) + " (Atom)")) %>
     <% end %>
   <% end %>
   <%= book_jacket_header(@library_group.book_jacket_source) %>

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

@@ -1,5 +1,5 @@
 <%= stylesheet_link_tag 'application' %>
-<%= stylesheet_link_tag 'print', media: :print %>
+<%= stylesheet_link_tag 'enju_leaf/print', media: :print %>
 <%= javascript_include_tag 'application' %>
 <%= csrf_meta_tag %>
 

data/app/views/page/_index.html+phone.erb

@@ -1,5 +1,5 @@
   <div data-role="header">
-    <h1><%= @library_group.display_name.localize %></h1>
+    <h1><%= @library_group.display_name %></h1>
     </div>
   <div data-role="content">
     <h2 class="title">

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

@@ -91,7 +91,7 @@
             <li><%= link_to t('page.calendar'), events_path(mode: 'calendar') -%></li>
             <li><%= link_to t('event.all'), events_path -%></li>
             <%- @library_group.real_libraries.each do |library| -%>
-              <li><%= link_to library.display_name.localize, events_path(library_id: library.name) -%></li>
+              <li><%= link_to library.display_name, events_path(library_id: library.name) -%></li>
             <%- end -%>
             <%- if policy(Event).create? -%>
               <li><%= link_to t('page.import'), new_event_import_file_path -%></li>

data/app/views/page/_mobile.html+phone.erb

@@ -1,3 +1,3 @@
 <meta name="viewport" content="width=device-width, initial-scale=1" />
-<%= javascript_include_tag 'mobile' %>
-<%= stylesheet_link_tag 'mobile' %>
+<%= javascript_include_tag 'enju_leaf/mobile' %>
+<%= stylesheet_link_tag 'enju_leaf/mobile' %>

data/app/views/page/about.en.html.erb

@@ -29,8 +29,8 @@
   </li>
   <li>This system has been using bibliographic data from the following services and databases.
   <ul>
-    <li><a href="https://iss.ndl.go.jp/">NDL Search</a></li>
-    <li><a href="https://crd.ndl.go.jp/jp/public/">National Diet Library Collaborative Reference Database</a></li>
+    <li><a href="http://iss.ndl.go.jp/">NDL Search</a></li>
+    <li><a href="http://crd.ndl.go.jp/jp/public/">National Diet Library Collaborative Reference Database</a></li>
   </ul>
   </li>
   <li>This system has been using book jacket images from the following service.
@@ -51,8 +51,8 @@
 
 <div id="submenu" class="ui-corner-all ui-widget-content">
   <ul>
-    <li><a href="https://www.next-l.jp/">Project Next-L</a></li>
+    <li><a href="http://www.next-l.jp/">Project Next-L</a></li>
     <li><a href="https://github.com/next-l/enju_leaf">this project on GitHub</a></li>
-    <li><a href="https://www.next-l.jp/?page=%A5%E1%A1%BC%A5%EA%A5%F3%A5%B0%A5%EA%A5%B9%A5%C8">Mailing list</a> (in Japanese)</li>
+    <li><a href="http://www.next-l.jp/?page=%A5%E1%A1%BC%A5%EA%A5%F3%A5%B0%A5%EA%A5%B9%A5%C8">Mailing list</a> (in Japanese)</li>
   </ul>
 </div>

data/app/views/page/about.ja.html.erb

@@ -28,8 +28,8 @@
   </li>
   <li>このシステムは、以下のサービスやデータベースから得た書誌データを利用しています。
   <ul>
-    <li><a href="https://iss.ndl.go.jp/">国立国会図書館サーチ (NDLサーチ)</a></li>
-    <li><a href="https://crd.ndl.go.jp/jp/public/">国立国会図書館レファレンス協同データベース</a></li>
+    <li><a href="http://iss.ndl.go.jp/">国立国会図書館サーチ (NDLサーチ)</a></li>
+    <li><a href="http://crd.ndl.go.jp/jp/public/">国立国会図書館レファレンス協同データベース</a></li>
   </ul>
   </li>
   <li>このシステムは、以下のサービスから得た書影を利用しています。
@@ -50,8 +50,8 @@
 
 <div id="submenu" class="ui-corner-all ui-widget-content">
   <ul>
-    <li><a href="https://www.next-l.jp/">Project Next-L</a></li>
+    <li><a href="http://www.next-l.jp/">Project Next-L</a></li>
     <li><a href="https://github.com/next-l/enju_leaf">GitHubでのプロジェクトのページ</a></li>
-    <li><a href="https://www.next-l.jp/?page=%A5%E1%A1%BC%A5%EA%A5%F3%A5%B0%A5%EA%A5%B9%A5%C8">メーリングリスト</a></li>
+    <li><a href="http://www.next-l.jp/?page=%A5%E1%A1%BC%A5%EA%A5%F3%A5%B0%A5%EA%A5%B9%A5%C8">メーリングリスト</a></li>
   </ul>
 </div>

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

@@ -11,9 +11,9 @@
           <ul>
             <% @libraries.sort_by{|l| l.position }.each do |library| %>
               <li>
-                <%= label_tag :"#{library.name}_shelf", library.display_name.localize %>:
+                <%= label_tag :"#{library.name}_shelf", library.display_name %>:
                 <% Shelf.where(library_id: library.id).sort_by{|s| s.position }.each do |shelf| %>
-                  <label><%= check_box_tag "#{library.name}_shelf[]", shelf.name %><%= shelf.display_name.localize %></label>
+                  <label><%= check_box_tag "#{library.name}_shelf[]", shelf.name %><%= shelf.display_name %></label>
                 <% end %>
                 <span class="check_all"><%= check_all_button "#{library.name}_shelf_", t('advanced_search.check_all') %></span>
               </li>
@@ -26,7 +26,7 @@
         <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>
+            <label><%= check_box_tag "library_adv[]", library.name %><%= library.display_name %></label>
           <% end %>
           <div class="check_all"><%= check_all_button "library_adv_", t('advanced_search.check_all') %></div>
         </td>
@@ -75,7 +75,7 @@
         <td><label><%= t('activerecord.models.classification') %>:</label></td>
         <td>
           <%- types = ClassificationType.all.select{|t| ! t.classifications.empty? } -%> 
-          <%= select_tag 'classification_type', options_from_collection_for_select( types, :id, Proc.new{|e| e.display_name.localize } ) -%>
+          <%= select_tag 'classification_type', options_from_collection_for_select( types, :id, Proc.new{|e| e.display_name } ) -%>
           <%= text_field_tag 'classification' -%>
         </td>
       </tr>
@@ -106,7 +106,7 @@
         <select id="library_top" name="library">
           <option value=""><%= t('advanced_search.all_libraries') -%></option>
           <%- @libraries.each do |library| -%>
-            <option value="<%= library.name -%>"><%= library.display_name.localize -%></option>
+            <option value="<%= library.name -%>"><%= library.display_name -%></option>
           <%- end -%>
         </select>
       </td>

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

@@ -125,8 +125,6 @@
         <li><%= link_to t('activerecord.models.realize_type'), realize_types_path -%></li>
         <li><%= link_to t('activerecord.models.produce_type'), produce_types_path -%></li>
         -->
-        <li><%= link_to t('activerecord.models.manifestation_custom_property'), manifestation_custom_properties_path -%></li>
-        <li><%= link_to t('activerecord.models.item_custom_property'), item_custom_properties_path -%></li>
       </ul>
     </div>
   </div>

data/app/views/page/opensearch.xml.builder

@@ -2,8 +2,8 @@ xml.instruct! :xml, :version=>"1.0"
 xml.OpenSearchDescription(
   'xmlns' => "http://a9.com/-/spec/opensearch/1.1/",
   'xmlns:moz' => 'http://www.mozilla.org/2006/browser/search/'){
-  xml.ShortName @library_group.display_name.localize
-  xml.Description @library_group.display_name.localize
+  xml.ShortName @library_group.display_name
+  xml.Description @library_group.display_name
   xml.Tags 'Library Catalog'
   xml.Contact @library_group.user.email
   xml.Url type: 'text/html', template: "#{manifestations_url}?query={searchTerms}"

data/config/locales/en.yml

@@ -9,10 +9,6 @@ en:
   time:
     am: am
     formats:
-      default: ! '%a, %d %b %Y %H:%M:%S %z'
-      long: ! '%B %d, %Y %H:%M'
-      short: ! '%d %b %H:%M'
       only_date: "%B %d, %Y"
       only_year_and_month: "%m, %Y"
       only_month: "%m"
-    pm: pm

data/config/locales/ja.yml

@@ -9,10 +9,6 @@ ja:
   time:
     am: 午前
     formats:
-      default: ! '%Y/%m/%d %H:%M:%S'
-      long: ! '%Y年%m月%d日(%a) %H時%M分%S秒 %z'
-      short: ! '%y/%m/%d %H:%M'
       only_date: "%Y年%m月%d日"
       only_year_and_month: "%Y年%m月"
       only_month: "%m月"
-    pm: 午後

data/lib/enju_leaf/engine.rb

@@ -6,7 +6,7 @@ require 'jquery-ui-rails'
 module EnjuLeaf
   class Engine < ::Rails::Engine
     initializer :assets do |config|
-      Rails.application.config.assets.precompile += %w( mobile.js mobile.css print.css )
+      Rails.application.config.assets.precompile += %w( enju_leaf/mobile.js enju_leaf/mobile.css enju_leaf/print.css )
     end
   end
 end

data/lib/enju_leaf/version.rb

@@ -1,3 +1,3 @@
 module EnjuLeaf
-  VERSION = "1.3.4".freeze
+  VERSION = "2.0.0.beta.1"
 end

data/lib/generators/enju_leaf/quick_install/quick_install_generator.rb

@@ -10,14 +10,17 @@ class EnjuLeaf::QuickInstallGenerator < Rails::Generators::Base
     rake("enju_biblio_engine:install:migrations")
     rake("enju_manifestation_viewer_engine:install:migrations")
     rake("enju_subject_engine:install:migrations")
-    rake("enju_inventory_engine:install:migrations")
     if !ENV['ENJU_SKIP_CONFIG']
       generate("enju_seed:setup")
       generate("enju_library:setup")
       generate("enju_biblio:setup")
       generate("enju_circulation:setup")
       generate("enju_subject:setup")
-      generate("enju_inventory:setup")
     end
+    rake("enju_ndl_engine:install:migrations")
+    append_to_file "app/models/user.rb", <<EOS.strip_heredoc
+      Manifestation.include(EnjuManifestationViewer::EnjuManifestation)
+      Manifestation.include(EnjuNdl::EnjuManifestation)
+EOS
   end
 end

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

@@ -11,10 +11,9 @@ class EnjuLeaf::SetupGenerator < Rails::Generators::Base
       <<"EOS"
     config.i18n.available_locales = [:en, :ja]
     config.i18n.enforce_available_locales = true
+    config.active_job.queue_adapter = :resque
     config.i18n.default_locale = :ja
-    config.i18n.fallbacks = [I18n.default_locale]
     config.time_zone = 'Tokyo'
-    config.active_job.queue_adapter = :resque
 EOS
     end
     gsub_file 'config/schedule.rb', /\/path\/to\/enju_leaf/, Rails.root.to_s
@@ -31,13 +30,23 @@ EOS
     end
     inject_into_class "app/controllers/application_controller.rb", ApplicationController do
       <<"EOS"
+  include EnjuLibrary::Controller
+  include EnjuBiblio::Controller
+
   include Pundit
-  before_action :set_paper_trail_whodunnit
   after_action :verify_authorized, unless: :devise_controller?
 EOS
     end
+    rake("active_storage:install")
+    rake("sitemap:install")
     generate("devise:install")
     generate("devise", "User")
+    gsub_file 'app/models/user.rb', /, :registerable,$/, ', #:registerable,'
+    gsub_file 'app/models/user.rb', /, :validatable$/, <<EOS
+, #:validatable,
+      :lockable, lock_strategy: :none, unlock_strategy: :none
+  include EnjuSeed::EnjuUser
+EOS
     generate("sunspot_rails:install")
     generate("kaminari:config")
     generate("simple_form:install")
@@ -84,14 +93,15 @@ EOS
 
     inject_into_file "app/assets/javascripts/application.js", after: /\/\/= require rails-ujs$\n/ do
       <<"EOS"
-//= require jquery2
-//= require enju_leaf
+//= require jquery/dist/jquery
+//= require jquery-migrate/dist/jquery-migrate
+//= require enju_leaf/application
 EOS
     end
     inject_into_file "app/assets/stylesheets/application.css", after: / *= require_self$\n/ do
-      " *= require enju_leaf\n"
+      " *= require enju_leaf/application\n"
     end
-    inject_into_file "config.ru", after: /require_relative 'config\/environment'$\n/ do
+    inject_into_file "config.ru", after: /require ::File.expand_path\(\'..\/config\/environment\',  __FILE__\)$\n/ do
       <<"EOS"
 require 'rack/protection'
 use Rack::Protection, except: [:escaped_params, :json_csrf, :http_origin, :session_hijacking, :remote_token]
@@ -102,18 +112,13 @@ EOS
     gsub_file 'config/environments/production.rb',
       /config.serve_static_assets = false$/,
       "config.serve_static_assets = true"
-    if Rails::VERSION::STRING =~ /^5\.1/
-      gsub_file 'config/environments/production.rb',
-        /# config.cache_store = :mem_cache_store$/,
-        "config.cache_store = :redis_store, ENV['REDIS_URL'], { expires_in: 1.day }"
-    else
-      gsub_file 'config/environments/production.rb',
-        /# config.cache_store = :mem_cache_store$/,
-        "config.cache_store = :redis_cache_store, { url: ENV['REDIS_URL'], expires_in: 1.day }"
-    end
-
+    gsub_file 'config/environments/production.rb',
+      /# config.cache_store = :mem_cache_store$/,
+      "config.cache_store = :redis_cache_store, { url: ENV['REDIS_URL'], expires_in: 1.day }"
     gsub_file 'config/environments/production.rb',
       /# config.assets.precompile \+= %w\( search.js \)$/,
       "config.assets.precompile += %w( mobile.js mobile.css print.css )"
+    remove_file "public/favicon.ico"
+    copy_file("../../../../../app/assets/images/enju_leaf/favicon.ico", "#{Rails.root.to_s}/public/favicon.ico")
   end
 end

data/lib/generators/enju_leaf/setup/templates/Procfile

@@ -1,3 +1,3 @@
 solr: bundle exec rake sunspot:solr:run
-resque: bundle exec rake environment resque:work QUEUE=enju_leaf,mailers TERM_CHILD=1
-web: bundle exec rails s -p 3000
+resque: bundle exec rake environment resque:work QUEUE=default,mailers TERM_CHILD=1
+web: bundle exec rails s

data/lib/generators/enju_leaf/setup/templates/config/schedule.rb

@@ -23,11 +23,11 @@ set :path, '/path/to/enju_leaf'
 set :environment, :development
 set :output, "#{path}/log/cron_log.log"
 
-every 1.day, :at => '0:00 am' do
+every 1.day, at: '0:00 am' do
   runner "User.lock_expired_users"
 end
 
-every 1.day, :at => '3:00 am' do
+every 1.day, at: '3:00 am' do
   rake "sunspot:reindex"
 #  rake "sitemap:refresh:no_ping"
 end

data/lib/generators/enju_leaf/setup/templates/db/seeds.rb

@@ -31,10 +31,6 @@ profile.save!
 system_user.profile = profile
 system_user.save!
 LibraryGroup.first.update!(user: system_user)
-UserGroup.order(created_at: :desc).first.update!(
-  number_of_day_to_notify_overdue: 7,
-  number_of_day_to_notify_due_date: 3
-)
 
 user = User.new
 user.username = username