enju_leaf 1.1.4 → 1.2.0.beta.1

data/config/locales/translation_ja.yml

@@ -134,7 +134,7 @@ ja:
     checkout: "貸出"
     checkin: "返却"
     name: "名前"
-    are_you_sure: "ほんとうですか？"
+    are_you_sure: "本当に実行してもよろしいですか？"
     file: "ファイル"
     cancel: "取消"
     feed: "フィード"
@@ -289,7 +289,7 @@ ja:
     successfully_deleted: "%{model}は正常に削除されました。"
   advanced_search:
     from: ""
-    to: "から"
+    to: "〜"
     all_libraries: "全ての図書館"
     check_all: "全て選択/解除"
   work:

data/config/routes.rb

@@ -1,8 +1,5 @@
 Rails.application.routes.draw do
-  authenticate :user, lambda {|u| u.role.try(:name) == 'Administrator' } do
-    mount Resque::Server.new, :at => "/resque", :as => :resque
-  end
-
+  resources :names
   resources :profiles
 
   resources :user_export_files

data/db/migrate/20151126005552_add_provider_to_identity.rb

@@ -0,0 +1,5 @@
+class AddProviderToIdentity < ActiveRecord::Migration
+  def change
+    add_column :identities, :provider, :string
+  end
+end

data/db/migrate/20160627232219_add_most_recent_to_user_import_file_transitions.rb

@@ -0,0 +1,9 @@
+class AddMostRecentToUserImportFileTransitions < ActiveRecord::Migration
+  def up
+    add_column :user_import_file_transitions, :most_recent, :boolean, null: true
+  end
+
+  def down
+    remove_column :user_import_file_transitions, :most_recent
+  end
+end

data/db/migrate/20160627232316_add_most_recent_to_user_export_file_transitions.rb

@@ -0,0 +1,9 @@
+class AddMostRecentToUserExportFileTransitions < ActiveRecord::Migration
+  def up
+    add_column :user_export_file_transitions, :most_recent, :boolean, null: true
+  end
+
+  def down
+    remove_column :user_export_file_transitions, :most_recent
+  end
+end

data/lib/enju_leaf/engine.rb

@@ -1,25 +1,21 @@
 require 'kaminari'
 require 'devise'
-require 'cancancan'
+require 'pundit'
 require 'acts_as_list'
-require 'attribute_normalizer'
+require 'strip_attributes'
 require 'friendly_id'
 require 'addressable/uri'
 require 'sunspot_rails'
-require 'resque/server'
-require 'nested_form'
+require 'cocoon'
 require 'enju_biblio'
 require 'enju_library'
 require 'enju_manifestation_viewer'
 require 'kramdown'
-require 'mobylette'
 require 'rails_autolink'
-require 'devise-encryptable'
 require 'sitemap_generator'
-require 'redis-rails'
 require 'jquery-ui-rails'
 require 'statesman'
-require 'resque/scheduler/server'
+require 'browser'
 
 module EnjuLeaf
   class Engine < ::Rails::Engine

data/lib/enju_leaf/helper.rb

@@ -97,7 +97,7 @@ module EnjuLeaf
       if options == nil
         options = {}
       else
-        options.reject!{|key, value| value.blank?}
+        options.reject!{|_key, value| value.blank?}
         options.delete(:page) if options[:page].to_i == 1
       end
       unless controller_name == 'test'

data/lib/enju_leaf/version.rb

@@ -1,3 +1,3 @@
 module EnjuLeaf
-  VERSION = "1.1.4"
+  VERSION = "1.2.0.beta.1"
 end

data/lib/enju_leaf.rb

@@ -1,264 +1,15 @@
 require "enju_leaf/engine"
 require "enju_leaf/version"
-require "enju_leaf/controller"
-require "enju_leaf/user"
 require "enju_leaf/helper"
-require "enju_leaf/calculate_stat"
-require "enju_leaf/import_file"
-require "enju_leaf/export_file"
 require "enju_leaf/localized_name"
-require "enju_leaf/master_model"
 require "enju_leaf/url_validator"
 
 require 'csv'
-#require 'mathn'
 require 'rss'
 require 'nkf'
 require 'ipaddr'
-require 'plugins'
 
 module EnjuLeaf
-  def self.included(base)
-    base.extend(ClassMethods)
-  end
-
-  module InstanceMethods
-    private
-    def after_sign_in_path_for(resource)
-      session[:locale] = nil
-      super
-    end
-
-    def render_403
-      return if performed?
-      if user_signed_in?
-        respond_to do |format|
-          format.html {render template: 'page/403', status: 403}
-          format.mobile {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 new_user_session_url }
-          format.mobile { 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.mobile { 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.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}
-      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.mobile {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 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 CanCan::AccessDenied
-    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 store_location
-      if request.get? and request.format.try(:html?) and !request.xhr?
-        session[:user_return_to] = request.fullpath
-      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 solr_commit
-      Sunspot.commit
-    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 current_ability
-      @current_ability ||= EnjuLeaf::Ability.new(current_user, request.remote_ip.split('%')[0])
-      @current_ability.merge(EnjuBiblio::Ability.new(current_user, request.remote_ip.split('%')[0])) if defined?(EnjuBiblio)
-      @current_ability.merge(EnjuLibrary::Ability.new(current_user, request.remote_ip.split('%')[0])) if defined?(EnjuLibrary)
-      @current_ability.merge(EnjuNii::Ability.new(current_user, request.remote_ip.split('%')[0])) if defined?(EnjuNii)
-      @current_ability.merge(EnjuSubject::Ability.new(current_user, request.remote_ip.split('%')[0])) if defined?(EnjuSubject)
-      @current_ability.merge(EnjuPurchaseRequest::Ability.new(current_user, request.remote_ip.split('%')[0])) if defined?(EnjuPurchaseRequest)
-      @current_ability.merge(EnjuQuestion::Ability.new(current_user, request.remote_ip.split('%')[0])) if defined?(EnjuQuestion)
-      @current_ability.merge(EnjuBookmark::Ability.new(current_user, request.remote_ip.split('%')[0])) if defined?(EnjuBookmark)
-      @current_ability.merge(EnjuResourceMerge::Ability.new(current_user, request.remote_ip.split('%')[0])) if defined?(EnjuResourceMerge)
-      @current_ability.merge(EnjuCirculation::Ability.new(current_user, request.remote_ip.split('%')[0])) if defined?(EnjuCirculation)
-      @current_ability.merge(EnjuMessage::Ability.new(current_user, request.remote_ip.split('%')[0])) if defined?(EnjuMessage)
-      @current_ability.merge(EnjuInterLibraryLoan::Ability.new(current_user, request.remote_ip.split('%')[0])) if defined?(EnjuInterLibraryLoan)
-      @current_ability.merge(EnjuInventory::Ability.new(current_user, request.remote_ip.split('%')[0])) if defined?(EnjuInventory)
-      @current_ability.merge(EnjuEvent::Ability.new(current_user, request.remote_ip.split('%')[0])) if defined?(EnjuEvent)
-      @current_ability.merge(EnjuNews::Ability.new(current_user, request.remote_ip.split('%')[0])) if defined?(EnjuNews)
-      @current_ability.merge(EnjuSearchLog::Ability.new(current_user, request.remote_ip.split('%')[0])) if defined?(EnjuSearchLog)
-      @current_ability.merge(EnjuIr::Ability.new(current_user, request.remote_ip.split('%')[0])) if defined?(EnjuIr)
-      @current_ability
-    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
-      if params[:mobile_view]
-        case params[:mobile_view]
-        when 'true'
-          session[:mobylette_override] = :force_mobile
-          request.format = :mobile
-        when 'false'
-          session[:mobylette_override] = :ignore_mobile
-          unless params[:format]
-            request.format = :html if request.format == :mobile
-          end
-        end
-      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
-  end
-
   class InvalidLocaleError < StandardError
   end
 end
-
-ActiveRecord::Base.send(:include, EnjuLeaf::EnjuUser)
-ActionController::Base.send(:include, EnjuLeaf)

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

@@ -7,12 +7,14 @@ class EnjuLeaf::SetupGenerator < Rails::Generators::Base
     directory("solr", "example/solr")
     copy_file("Procfile", "Procfile")
     copy_file("config/schedule.rb", "config/schedule.rb")
+    copy_file("config/initializers/enju_leaf.rb", "config/initializers/enju_leaf.rb")
     copy_file("config/initializers/resque.rb", "config/initializers/resque.rb")
     append_to_file("config/initializers/assets.rb", "Rails.application.config.assets.precompile += %w( *.png )")
     inject_into_file 'config/application.rb', after: /# config.i18n.default_locale = :de$\n/ do
       <<"EOS"
     config.i18n.available_locales = [:en, :ja]
     config.i18n.enforce_available_locales = true
+    config.active_job.queue_adapter = :resque
 EOS
     end
     gsub_file 'config/application.rb', /# config.i18n.default_locale = :de$/,
@@ -38,7 +40,7 @@ EOS
     gsub_file 'app/models/user.rb', /, :trackable, :validatable$/, <<EOS
 , :trackable, #:validatable, 
       :lockable, :lock_strategy => :none, :unlock_strategy => :none
-  enju_leaf_user_model
+  include EnjuLeaf::EnjuUser
 EOS
     generate("sunspot_rails:install")
     generate("kaminari:config")
@@ -50,33 +52,30 @@ EOS
     gsub_file 'config/initializers/kaminari_config.rb',
       /# config.default_per_page = 25$/,
       "config.default_per_page = 10"
-    if Rails::VERSION::MAJOR >= 4
-      generate("friendly_id")
-      gsub_file 'config/initializers/friendly_id.rb', /# config.use :finders$/, "config.use :finders"
-      gsub_file "app/assets/javascripts/application.js",
-        /\/\/= require turbolinks$/,
-        ""
-    end
+    generate("friendly_id")
+    gsub_file "app/assets/javascripts/application.js",
+      /\/\/= require turbolinks$/,
+      ""
     gsub_file 'config/routes.rb', /devise_for :users$/, "devise_for :users, skip: [:registration]"
+    inject_into_file 'config/routes.rb', after: /Rails.application.routes.draw do$\n/ do
+      <<"EOS"
+  authenticate :user, lambda {|u| u.role.try(:name) == 'Administrator' } do
+    mount Resque::Server.new, at: "/resque", as: :resque
+  end
+EOS
+    end
     gsub_file 'config/initializers/devise.rb', '# config.email_regexp = /\A[^@]+@[^@]+\z/', 'config.email_regexp = /\A([\w\.%\+\-]+)@([\w\-]+\.)+([\w]{2,})\z/i'
     gsub_file 'config/initializers/devise.rb', '# config.authentication_keys = [:email]', 'config.authentication_keys = [:username]'
     gsub_file 'config/initializers/devise.rb', '# config.secret_key', 'config.secret_key'
-    gsub_file 'config/initializers/devise.rb',
-      "# config.navigational_formats = ['*/*', :html]",
-      "config.navigational_formats = ['*/*', :html, :mobile]"
 
     inject_into_class "app/controllers/application_controller.rb", ApplicationController do
       <<"EOS"
-  enju_leaf
-  enju_biblio
-  enju_library
+  include EnjuLeaf::Controller
+  include EnjuBiblio::Controller
+  include EnjuLibrary::Controller
 
-  mobylette_config do |config|
-    config[:skip_xhr_requests] = false
-    config[:skip_user_agents] = ENV['ENJU_SKIP_MOBILE_AGENTS'].to_s.split(',').map{|a|
-      a.to_sym
-    }
-  end
+  include Pundit
+  after_action :verify_authorized, unless: :devise_controller?
 EOS
     end
 
@@ -101,12 +100,6 @@ EOS
       <<"EOS"
 require 'rack/protection'
 use Rack::Protection, except: [:escaped_params, :json_csrf, :http_origin, :session_hijacking, :remote_token]
-EOS
-    end
-    create_file 'config/initializers/mobile.rb' do <<"EOS"
-ActionController::Responder.class_eval do
-  alias :to_mobile :to_html
-end
 EOS
     end
     remove_file "public/index.html"

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

@@ -0,0 +1 @@
+Item.include(EnjuLibrary::EnjuItem)

data/lib/tasks/enju_leaf_tasks.rake

@@ -5,7 +5,7 @@ namespace :enju_leaf do
   desc "create initial records for enju_leaf"
   task :setup => :environment do
     Dir.glob(Rails.root.to_s + '/db/fixtures/enju_leaf/*.yml').each do |file|
-      ActiveRecord::Fixtures.create_fixtures('db/fixtures/enju_leaf', File.basename(file, '.*'))
+      ActiveRecord::FixtureSet.create_fixtures('db/fixtures/enju_leaf', File.basename(file, '.*'))
     end
 
     Rake::Task['enju_biblio:setup'].invoke
@@ -33,7 +33,7 @@ namespace :enju_leaf do
   end
 
   desc "reindex all models"
-  task :reindex, [:batch_size, :models, :silence] => :environment do |t, args|
+  task :reindex, [:batch_size, :models, :silence] => :environment do |_t, args|
     Rails::Engine.subclasses.each{|engine| engine.instance.eager_load!}
     Rake::Task['sunspot:reindex'].execute(args)
   end

data/spec/controllers/profiles_controller_spec.rb

@@ -1,19 +1,16 @@
-# -*- encoding: utf-8 -*-
 require 'rails_helper'
 
 describe ProfilesController do
   fixtures :all
 
-  describe "GET index", :solr => true do
-    before do
-      Profile.reindex
-    end
-
+  describe "GET index" do
     describe "When logged in as Administrator" do
       login_fixture_admin
 
       it "assigns all profiles as @profiles" do
         get :index
+        Sunspot.session.should be_a_search_for(Profile)
+        Sunspot.session.should have_search_params(:fulltext, '')
         assigns(:profiles).should_not be_nil
       end
     end
@@ -23,19 +20,26 @@ describe ProfilesController do
 
       it "assigns all profiles as @profiles" do
         get :index
+        Sunspot.session.should be_a_search_for(Profile)
+        Sunspot.session.should have_search_params(:fulltext, '')
         assigns(:profiles).should_not be_nil
       end
 
       it "should get index with query" do
         get :index, :query => 'user1'
         response.should be_success
-        assigns(:profiles).should_not be_empty
+        Sunspot.session.should be_a_search_for(Profile)
+        Sunspot.session.should have_search_params(:fulltext, 'user1')
+        assigns(:profiles).should_not be_nil
       end
 
       it "should get sorted index" do
         get :index, :query => 'user1', :sort_by => 'username', :order => 'desc'
         response.should be_success
-        assigns(:profiles).should_not be_empty
+        Sunspot.session.should be_a_search_for(Profile)
+        Sunspot.session.should have_search_params(:fulltext, 'user1')
+        Sunspot.session.should have_search_params(:order_by, :username, :desc)
+        assigns(:profiles).should_not be_nil
       end
     end
 
@@ -66,6 +70,12 @@ describe ProfilesController do
         get :show, id: profiles(:admin).id
         assigns(:profile).should eq(profiles(:admin))
       end
+      it "assigns the another requested user as @profile" do
+        admin_profile = FactoryGirl.create :admin_profile
+        get :show, id: admin_profile.id
+        expect(response).not_to be_forbidden
+        expect(assigns(:profile)).to eq admin_profile
+      end
     end
 
     describe "When logged in as Librarian" do
@@ -141,7 +151,7 @@ describe ProfilesController do
 
       it "should not assign the requested user as @profile" do
         get :new
-        assigns(:profile).should_not be_valid
+        assigns(:profile).should be_nil
         response.should be_forbidden
       end
     end
@@ -149,7 +159,7 @@ describe ProfilesController do
     describe "When not logged in" do
       it "should not assign the requested user as @profile" do
         get :new
-        assigns(:profile).should_not be_valid
+        assigns(:profile).should be_nil
         response.should redirect_to(new_user_session_url)
       end
     end
@@ -546,8 +556,8 @@ describe ProfilesController do
 
       it "should not be able to delete other librarian user" do
         librarian = FactoryGirl.create(:librarian_profile)
-        ability = EnjuLeaf::Ability.new(@user, "0.0.0.0")
-        ability.should_not be_able_to( :destroy, librarian )
+        delete :destroy, id: librarian.id
+        response.should be_forbidden
       end
     end
 

data/spec/controllers/user_export_files_controller_spec.rb

@@ -18,7 +18,7 @@ describe UserExportFilesController do
 
       it "assigns empty as @user_export_files" do
         get :index
-        assigns(:user_export_files).should be_empty
+        assigns(:user_export_files).should be_nil
       end
     end
 
@@ -27,7 +27,7 @@ describe UserExportFilesController do
 
       it "assigns empty as @user_export_files" do
         get :index
-        assigns(:user_export_files).should be_empty
+        assigns(:user_export_files).should be_nil
         expect(response).to be_forbidden
       end
     end
@@ -35,7 +35,7 @@ describe UserExportFilesController do
     describe "When not logged in" do
       it "assigns empty as @user_export_files" do
         get :index
-        assigns(:user_export_files).should be_empty
+        assigns(:user_export_files).should be_nil
         expect(response).to redirect_to(new_user_session_url)
       end
     end
@@ -97,7 +97,7 @@ describe UserExportFilesController do
 
       it "should not assign the requested user_export_file as @user_export_file" do
         get :new
-        assigns(:user_export_file).should_not be_valid
+        assigns(:user_export_file).should be_nil
         expect(response).to be_forbidden
       end
     end
@@ -107,7 +107,7 @@ describe UserExportFilesController do
 
       it "should not assign the requested user_export_file as @user_export_file" do
         get :new
-        assigns(:user_export_file).should_not be_valid
+        assigns(:user_export_file).should be_nil
         expect(response).to be_forbidden
       end
     end
@@ -115,7 +115,7 @@ describe UserExportFilesController do
     describe "When not logged in" do
       it "should not assign the requested user_export_file as @user_export_file" do
         get :new
-        assigns(:user_export_file).should_not be_valid
+        assigns(:user_export_file).should be_nil
         expect(response).to redirect_to(new_user_session_url)
       end
     end
@@ -138,8 +138,7 @@ describe UserExportFilesController do
 
       it "should create agent_export_file" do
         post :create, user_export_file: {mode: 'export'}
-        assigns(:user_export_file).should_not be_valid
-        assigns(:user_export_file).user.should be_nil
+        assigns(:user_export_file).should be_nil
         expect(response).to be_forbidden
       end
     end
@@ -149,7 +148,7 @@ describe UserExportFilesController do
 
       it "should be forbidden" do
         post :create, user_export_file: {mode: 'export'}
-        assigns(:user_export_file).user.should be_nil
+        assigns(:user_export_file).should be_nil
         expect(response).to be_forbidden
       end
     end
@@ -157,7 +156,7 @@ describe UserExportFilesController do
     describe "When not logged in" do
       it "should be redirected to new session url" do
         post :create, user_export_file: {mode: 'export'}
-        assigns(:user_export_file).user.should be_nil
+        assigns(:user_export_file).should be_nil
         expect(response).to redirect_to new_user_session_url
       end
     end