enju_leaf 1.1.4 → 1.2.0.beta.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f99d307e483123e2b9f2e35cc715e3c8d9c206b6
-  data.tar.gz: b8b568f5b35b43e90fa5dfc1fcf9283f1fa4a11d
+  metadata.gz: bddebc600e5d6d8fb8f3a0117cbd5bdaab34c711
+  data.tar.gz: ab1f301430da8166e9ac10b9d7b94c39dc607ffb
 SHA512:
-  metadata.gz: 733cd275871a981f143ea4218bdd3ff872d1322c5885786869145dc7afe58bcedda9564ea0a296f54ce23dac6ffcc9ed94e04bdd9566362ad3a16d20deea671a
-  data.tar.gz: 97493bbba2fcebd9fee021254ba845209c3a6b19c8584cdf4814a267e8880d4b00b31ec02ac332576984fe18730bf4820f90d9f545308b7f42771ac08329d2c1
+  metadata.gz: 5b2285b9dfdb9d0ecd2e6abdb888d9694336645b16d29369c73a45e29345f53ed9db4db4d2fd3496407d7abe6dfb87344ba3b5fb6ab923c69ac19f3319c33e1f
+  data.tar.gz: d31402743602b18a903e83c0ada8a6c33124cfc5a7561089e08c3b0666986fe441d999e94e12b2560cf8c322411d980e76e2b8546eb58df10a531de0480d3126

data/README.rdoc

@@ -1,7 +1,7 @@
 = Next-L Enju Leaf
-{<img src="https://travis-ci.org/next-l/enju_leaf.svg?branch=1.1" alt="Build Status" />}[https://travis-ci.org/next-l/enju_leaf]
-{<img src="https://coveralls.io/repos/next-l/enju_nii/badge.svg?branch=1.1&service=github" alt="Coverage Status" />}[https://coveralls.io/github/next-l/enju_nii?branch=1.1]
-{<img src="https://hakiri.io/github/next-l/enju_leaf/1.1.svg" alt="security" />}[https://hakiri.io/github/next-l/enju_leaf/1.1]
+{<img src="https://travis-ci.org/next-l/enju_leaf.svg?branch=1.2" alt="Build Status" />}[https://travis-ci.org/next-l/enju_leaf]
+{<img src="https://coveralls.io/repos/next-l/enju_leaf/badge.svg?branch=1.2&service=github" alt="Coverage Status" />}[https://coveralls.io/github/next-l/enju_leaf?branch=1.2]
+{<img src="https://hakiri.io/github/next-l/enju_leaf/1.2.svg" alt="security" />}[https://hakiri.io/github/next-l/enju_leaf/1.2]
 
 Next-L Enju Leaf は、{Project Next-L}[http://www.next-l.jp] で開発している図書館管理システムです。
 

data/app/assets/javascripts/autocomplete_agent.js

@@ -0,0 +1,30 @@
+$(document).ready(function(){
+  $("#creator_form").on('cocoon:after-insert', function(e, added_task){
+    $('.creator_full_name').focus(function(){
+      $(this).autocomplete({
+        minLength: 1,
+        //source: '/agents.json'
+        source: function(request, response){
+          $.ajax({
+            url: '/agents.json',
+            datatype: 'json',
+            data: {
+              query: request.term + '*'
+            },
+            success: function(data) {
+              response(data);
+            }
+          });
+        },
+        select: function(event, ui){
+          //console.log(added_task[0].getElementsByTagName('input')[0]);
+          added_task[0].getElementsByTagName('input')[0].value = ui.item.agent_id;
+        }
+      }).data("ui-autocomplete")._renderItem = function(ul, item) {
+        return $( "<li>" )
+          .append( "<a>" + item.label + "<br>" + item.desc + "</a>" )
+          .appendTo(ul);
+      };
+    });
+  });
+});

data/app/assets/javascripts/{menu.enju.js → enju.menu.js}

@@ -8,3 +8,8 @@ $(function(){
   });
   $('.hidden').removeClass('hidden');
 });
+
+$(document).ready(function(){
+  $("#tabs").tabs();
+  $('.hidden').removeClass('hidden');
+});

data/app/assets/javascripts/enju_leaf.js

@@ -4,9 +4,9 @@
 //= require jquery.shortcut
 //= require jquery.cookie
 //= require jquery.ui.menubar
-//= require menu.enju
 //= require select_locale
 //= require portlets
-//= require tab_view
+//= require enju.menu
 //= require jquery.powertip
-//= require jquery_nested_form
+//= require cocoon
+//= require autocomplete_agent

data/app/assets/javascripts/portlets.js

@@ -22,7 +22,7 @@ function saveOrder(year, month, day, root_path) {
 function restoreOrder() {
     $(".column").each(function(index, value) {
         var columnId = value.id;
-        var cookieName = "listOrder" + columnId
+        var cookieName = "listOrder" + columnId;
         var cookie = $.cookie(cookieName);
         if ( cookie == null ) { return; }
         var IDs = cookie.split(",");
@@ -32,7 +32,7 @@ function restoreOrder() {
                 continue;
             }
             var portletId = toks[0];
-            var visible = toks[1]
+            var visible = toks[1];
             var portlet = $(".column")
                 .find('#' + portletId)
                 .appendTo($('#' + columnId));

data/app/assets/stylesheets/enju.css

@@ -129,10 +129,6 @@ div#pickup_book_jacket{
   text-align: center;
 }
 
-img.book_jacket{
-  border: 1px solid;
-}
-
 img.screen_shot{
   border: 0;
 }
@@ -341,7 +337,18 @@ li{
 }
 
 input.resource_title{
-  width: 30em;
+  width: 100%;
+  box-sizing: border-box;
+}
+
+input.resource_name{
+  width: 80%;
+  box-sizing: border-box;
+}
+
+input.resource_subject{
+  width: 50%;
+  box-sizing: border-box;
 }
 
 input.resource_locale{
@@ -358,19 +365,25 @@ input.resource_zip_code{
 }
 
 input.resource_url{
-  width: 40em;
+  width: 100%;
+  box-sizing: border-box;
 }
 
-input.resource_isbn_issn, input.resource_identifier, input.resource_user_number, input.resource_user, input.resource_item_identifier{
-  width: 10em;
+input.resource_isbn_issn{
+  width: 20em;
   ime-mode: disabled;
 }
 
-input.resource_identifier_body{
+input.resource_identifier, input.resource_user_number, input.resource_user, input.resource_item_identifier{
   width: 20em;
   ime-mode: disabled;
 }
 
+input.resource_identifier_body{
+  width: 40em;
+  ime-mode: disabled;
+}
+
 input.resource_integer{
   width: 5em;
   ime-mode: disabled;
@@ -398,18 +411,11 @@ input.short_name{
 }
 
 textarea{
-  width: 40em;
+  width: 100%;
+  box-sizing: border-box;
   height: 10em;
 }
 
-p#post_to_twitter{
-  margin-left: 10px;
-}
-
-input.twitter_text{
-  width:40em;
-}
-
 textarea#message_body{
   width: 40em;
   height: 20em;
@@ -531,6 +537,10 @@ div.book_jacket{
   width: 190px;
 }
 
+div.book_jacket img.book_jacket{
+  border: 1px solid rgba(0, 0, 0, 0.25);
+}
+
 div.search_form{
   margin-bottom: 10px;
 }
@@ -539,3 +549,27 @@ div.search_form{
 
 .enju_table_header{
 }
+
+.bold {
+  font-weight: bold;
+}
+
+.normal-weight {
+  font-weight: normal;
+}
+
+.right {
+  text-align: right;
+}
+
+.center {
+  text-align: center;
+}
+
+.nowrap {
+  white-space: nowrap;
+}
+
+.display-none {
+  display: none;
+}

data/app/assets/stylesheets/enju_leaf.css

@@ -10,5 +10,7 @@
  *= require jquery.ui.menu
  *= require jquery.ui.datepicker
  *= require jquery.ui.menubar
+ *= require jquery.ui.autocomplete
+ *= require jquery.ui.theme
  *= require portlets
 */

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

@@ -0,0 +1,225 @@
+module EnjuLeaf
+  module Controller
+    extend ActiveSupport::Concern
+
+    included do
+      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 Errno::ECONNREFUSED, with: :render_500_nosolr
+      #rescue_from ActionView::MissingTemplate, with: :render_404_invalid_format
+    end
+
+    private
+
+    def render_403
+      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.json { render text: '{"error": "forbidden"}' }
+          format.rss {render template: 'page/403.xml', status: 403}
+        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.json { render text: '{"error": "forbidden"}' }
+          format.rss { render template: 'page/403.xml', status: 403 }
+        end
+      end
+    end
+
+    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.json { render text: '{"error": "not_found"}' }
+        format.rss { render template: 'page/404.xml', status: 404 }
+      end
+    end
+
+    def render_404_invalid_format
+      return if performed?
+      render file: "#{Rails.root}/public/404", formats: [:html]
+    end
+
+    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.json { render text: '{"error": "server_error"}' }
+        format.xml {render template: 'page/500.xml', status: 500}
+      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')
+      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.json { render text: '{"error": "server_error"}' }
+        format.xml {render template: 'page/500.xml', status: 500}
+      end
+    end
+
+    def after_sign_in_path_for(resource)
+      session[:locale] = nil
+      super
+    end
+
+    def set_locale
+      if params[:locale]
+        unless I18n.available_locales.include?(params[:locale].to_s.intern)
+          raise InvalidLocaleError
+        end
+      end
+      if user_signed_in?
+        locale = params[:locale] || session[:locale] || current_user.profile.try(:locale).try(:to_sym)
+      else
+        locale = params[:locale] || session[:locale]
+      end
+      if locale
+        I18n.locale = @locale = session[:locale] = locale.to_sym
+      else
+        I18n.locale = @locale = session[:locale] = I18n.default_locale
+      end
+    rescue InvalidLocaleError
+      @locale = I18n.default_locale
+    end
+
+    def default_url_options(options={})
+      {locale: nil}
+    end
+
+    def set_available_languages
+      if Rails.env == 'production'
+        @available_languages = Rails.cache.fetch('available_languages'){
+          Language.where(iso_639_1: I18n.available_locales.map{|l| l.to_s}).select([:id, :iso_639_1, :name, :native_name, :display_name, :position]).all
+        }
+      else
+        @available_languages = Language.where(iso_639_1: I18n.available_locales.map{|l| l.to_s})
+      end
+    end
+
+    def reset_params_session
+      session[:params] = nil
+    end
+
+    def not_found
+      raise ActiveRecord::RecordNotFound
+    end
+
+    def access_denied
+      raise Pundit::NotAuthorizedError
+    end
+
+    def get_user
+      @user = User.where(username: params[:user_id]).first if params[:user_id]
+      #authorize! :show, @user if @user
+    end
+
+    def get_user_group
+      @user_group = UserGroup.find(params[:user_group_id]) if params[:user_group_id]
+    end
+
+    def convert_charset
+      case params[:format]
+      when 'csv'
+        return unless LibraryGroup.site_config.settings[:csv_charset_conversion]
+        # TODO: 他の言語
+        if @locale.to_sym == :ja
+          headers["Content-Type"] = "text/csv; charset=Shift_JIS"
+          response.body = NKF::nkf('-Ws', response.body)
+        end
+      when 'xml'
+        if @locale.to_sym == :ja
+          headers["Content-Type"] = "application/xml; charset=Shift_JIS"
+          response.body = NKF::nkf('-Ws', response.body)
+        end
+      end
+    end
+
+    def store_page
+      if request.get? and request.format.try(:html?) and !request.xhr?
+        flash[:page] = params[:page] if params[:page].to_i > 0
+      end
+    end
+
+    def set_role_query(user, search)
+      role = user.try(:role) || Role.default_role
+      search.build do
+        with(:required_role_id).less_than_or_equal_to role.id
+      end
+    end
+
+    def get_version
+      @version = params[:version_id].to_i if params[:version_id]
+      @version = nil if @version == 0
+    end
+
+    def clear_search_sessions
+      session[:query] = nil
+      session[:params] = nil
+      session[:search_params] = nil
+      session[:manifestation_ids] = nil
+    end
+
+    def api_request?
+      true unless params[:format].nil? or params[:format] == 'html'
+    end
+
+    def get_top_page_content
+      if defined?(EnjuNews)
+        @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
+
+    def set_mobile_request
+      case params[:view]
+      when 'phone'
+        session[:enju_view] = :phone
+      when 'desktop'
+        session[:enju_view] = :desktop
+      when 'reset'
+        session[:enju_view] = nil
+      end
+
+      case session[:enju_view].try(:to_sym)
+      when :phone
+        request.variant = :phone
+      when :desktop
+        request.variant = nil
+      else
+        request.variant = :phone if browser.device.mobile?
+      end
+    end
+
+    def move_position(resource, direction, redirect = true)
+      if ['higher', 'lower'].include?(direction)
+        resource.send("move_#{direction}")
+        if redirect
+          redirect_to url_for(controller: resource.class.to_s.pluralize.underscore)
+          return
+        end
+      end
+    end
+
+    def store_current_location
+      store_location_for(:user, request.url)
+    end
+  end
+end

data/app/controllers/my_accounts_controller.rb

@@ -1,22 +1,20 @@
 class MyAccountsController < ApplicationController
-  before_filter :authenticate_user!
+  before_action :authenticate_user!
+  before_action :set_profile
 
   def show
-    @profile = current_user.profile
-
     respond_to do |format|
       format.html
+      format.html.phone
       format.json { render json: @profile }
     end
   end
 
   def edit
-    @profile = current_user.profile
     prepare_options
   end
 
   def update
-    @profile = current_user.profile
     user_attrs = [
       :id, :email, :current_password, :password, :password_confirmation
     ]
@@ -32,7 +30,7 @@ class MyAccountsController < ApplicationController
 
       if saved
         if @profile.save
-          sign_in(current_user, bypass: true)
+          bypass_sign_in(current_user)
           format.html { redirect_to my_account_url, notice: t('controller.successfully_updated', model: t('activerecord.models.user')) }
           format.json { head :no_content }
         else
@@ -52,7 +50,6 @@ class MyAccountsController < ApplicationController
   end
 
   def destroy
-    @profile = current_user.profile
     @profile.destroy
 
     respond_to do |format|
@@ -62,6 +59,11 @@ class MyAccountsController < ApplicationController
   end
 
   private
+  def set_profile
+    @profile = current_user.profile
+    authorize @profile
+  end
+
   def profile_params
     attrs = [
       :full_name, :full_name_transcription, :user_number,

data/app/controllers/names_controller.rb

@@ -0,0 +1,60 @@
+class NamesController < ApplicationController
+  before_action :set_name, only: [:show, :edit, :update, :destroy]
+  before_action :check_policy, only: [:index, :new, :create]
+
+  # GET /names
+  def index
+    @names = Name.paginate(params[:page])
+  end
+
+  # GET /names/1
+  def show
+  end
+
+  # GET /names/new
+  def new
+    @name = Name.new
+  end
+
+  # GET /names/1/edit
+  def edit
+  end
+
+  # POST /names
+  def create
+    @name = Name.new(name_params)
+
+    if @name.save
+      redirect_to @name, notice: 'Name was successfully created.'
+    else
+      render :new
+    end
+  end
+
+  # PATCH/PUT /names/1
+  def update
+    if @name.update(name_params)
+      redirect_to @name, notice: 'Name was successfully updated.'
+    else
+      render :edit
+    end
+  end
+
+  # DELETE /names/1
+  def destroy
+    @name.destroy
+    redirect_to names_url, notice: 'Name was successfully destroyed.'
+  end
+
+  private
+    # Use callbacks to share common setup or constraints between actions.
+    def set_name
+      @name = Name.find(params[:id])
+      authorize @name
+    end
+
+    # Only allow a trusted parameter "white list" through.
+    def name_params
+      params.require(:name).permit(:first_name, :middle_name, :last_name, :language_id, :profile_id, :position)
+    end
+end

data/app/controllers/page_controller.rb

@@ -1,8 +1,8 @@
 class PageController < ApplicationController
-  before_filter :clear_search_sessions, only: [:index, :advanced_search]
-  before_filter :store_location, only: [:advanced_search, :about, :add_on, :msie_accelerator, :statistics]
-  before_filter :authenticate_user!, except: [:index, :advanced_search, :about, :add_on, :msie_accelerator, :opensearch, :statistics, :routing_error]
-  before_filter :check_librarian, except: [:index, :advanced_search, :about, :add_on, :msie_accelerator, :opensearch, :statistics, :routing_error]
+  before_action :skip_authorization
+  before_action :clear_search_sessions, only: [:index, :advanced_search]
+  before_action :authenticate_user!, except: [:index, :advanced_search, :about, :add_on, :msie_accelerator, :opensearch, :statistics, :routing_error]
+  before_action :check_librarian, except: [:index, :advanced_search, :about, :add_on, :msie_accelerator, :opensearch, :statistics, :routing_error]
   helper_method :get_libraries
 
   # トップページを表示します。
@@ -40,6 +40,7 @@ class PageController < ApplicationController
 
     respond_to do |format|
       format.html
+      format.html.phone
     end
   end
 

data/app/controllers/profiles_controller.rb

@@ -1,8 +1,7 @@
-# -*- encoding: utf-8 -*-
 class ProfilesController < ApplicationController
-  load_and_authorize_resource except: [:index, :create]
-  authorize_resource only: [:index, :create]
-  before_filter :prepare_options, only: [:new, :edit]
+  before_action :set_profile, only: [:show, :edit, :update, :destroy]
+  before_action :check_policy, only: [:index, :new, :create]
+  before_action :prepare_options, only: [:new, :edit]
 
   # GET /profiles
   # GET /profiles.json
@@ -60,6 +59,7 @@ class ProfilesController < ApplicationController
 
     respond_to do |format|
       format.html # show.html.erb
+      format.html.phone
       format.json { render json: @profile }
     end
   end
@@ -163,6 +163,15 @@ class ProfilesController < ApplicationController
   end
 
   private
+  def set_profile
+    @profile = Profile.find(params[:id])
+    authorize @profile
+  end
+
+  def check_policy
+    authorize Profile
+  end
+
   def profile_params
     attrs = [
       :full_name, :full_name_transcription,

data/app/controllers/roles_controller.rb

@@ -1,6 +1,6 @@
 class RolesController < ApplicationController
-  load_and_authorize_resource except: :index
-  authorize_resource only: :index
+  before_action :set_role, only: [:show, :edit, :update, :destroy]
+  before_action :check_policy, only: [:index, :new, :create]
 
   # GET /roles
   # GET /roles.json
@@ -46,6 +46,15 @@ class RolesController < ApplicationController
   end
 
   private
+  def set_role
+    @role = Role.find(params[:id])
+    authorize @role
+  end
+
+  def check_policy
+    authorize Role
+  end
+
   def role_params
     params.require(:role).permit(:name, :display_name, :note)
   end

data/app/controllers/user_export_files_controller.rb

@@ -1,5 +1,6 @@
 class UserExportFilesController < ApplicationController
-  load_and_authorize_resource
+  before_action :set_user_export_file, only: [:show, :edit, :update, :destroy]
+  before_action :check_policy, only: [:index, :new, :create]
 
   # GET /user_export_files
   # GET /user_export_files.json
@@ -60,7 +61,7 @@ class UserExportFilesController < ApplicationController
     respond_to do |format|
       if @user_export_file.save
         if @user_export_file.mode == 'export'
-          Resque.enqueue(UserExportFileQueue, @user_export_file.id)
+          UserExportFileJob.perform_later(@user_export_file)
         end
         format.html { redirect_to @user_export_file, notice: t('export.successfully_created', model: t('activerecord.models.user_export_file')) }
         format.json { render json: @user_export_file, status: :created, location: @user_export_file }
@@ -77,7 +78,7 @@ class UserExportFilesController < ApplicationController
     respond_to do |format|
       if @user_export_file.update_attributes(user_export_file_params)
         if @user_export_file.mode == 'export'
-          UserExportFileQueue.perform(@user_export_file.id)
+          UserExportFileJob.perform_later(@user_export_file)
         end
         format.html { redirect_to @user_export_file, notice: t('controller.successfully_updated', model: t('activerecord.models.user_export_file')) }
         format.json { head :no_content }
@@ -100,6 +101,15 @@ class UserExportFilesController < ApplicationController
   end
 
   private
+  def set_user_export_file
+    @user_export_file = UserExportFile.find(params[:id])
+    authorize @user_export_file
+  end
+
+  def check_policy
+    authorize UserExportFile
+  end
+
   def user_export_file_params
     params.require(:user_export_file).permit(:mode)
   end