enju_leaf 1.1.0.rc18 → 1.1.0.rc19

data/app/views/user_import_files/new.html.slim

@@ -0,0 +1,64 @@
+.row
+  #submenu.col-md-3
+    .panel.panel-default
+      .panel-heading
+        h2.panel-title
+          = t('activerecord.models.user_import_file')
+      ul.list-group
+        li.list-group-item
+          = back_to_index(flash[:page_info])
+  #content_list.col-md-9
+    .panel.panel-default
+      .panel-heading
+        h1.panel-title
+          = t('page.new', model: t('activerecord.models.user_import_file'))
+      .panel-body
+        = form_for(@user_import_file, html: { multipart: true }) do |f|
+          = f.error_messages
+          .form-group
+            = f.label t('page.file')
+            br
+            = f.file_field :user_import
+          .form-group
+            = f.label :edit_mode
+            br
+            .radio-inline
+              = f.radio_button :edit_mode, 'create', checked: 'checked'
+              = f.label :edit_mode, t('page.create'), value: 'create'
+            .radio-inline
+              = f.radio_button :edit_mode, 'update'
+              = f.label :edit_mode, t('page.update'), value: 'update'
+            .radio-inline
+              = f.radio_button :edit_mode, 'update_relationship'
+              = f.label :edit_mode, t('resource_import_file.update_relationship'), value: 'update_relationship'
+            .radio-inline
+              = f.radio_button :edit_mode, 'destroy'
+              = f.label :edit_mode, t('page.destroy'), value: 'destroy'
+          .form-group
+            = f.label :user_encoding
+            br
+            .radio-inline
+              = f.radio_button :user_encoding, 'auto_detect', checked: 'checked'
+              = f.label :user_encoding, t('import.auto_detect'), value: 'auto_detect'
+            .radio-inline
+              = f.radio_button :user_encoding, 'utf-8'
+              = f.label :user_encoding, 'UTF-8', value: 'utf-8'
+            .radio-inline
+              = f.radio_button :user_encoding, 'shift_jis'
+              = f.label :user_encoding, 'Shift_JIS', value: 'shift_jis'
+            .radio-inline
+              = f.radio_button :user_encoding, 'euc-jp'
+              = f.label :user_encoding, 'EUC-JP', value: 'euc-jp'
+          .form-group
+            = f.label :default_user_group_id
+            = f.select(:default_user_group_id, @user_groups.collect{|u| [u.display_name.localize, u.id]}, {}, {class: 'form-control'})
+            br
+            = t('user_import_file.default_user_group')
+          .form-group
+            = f.label :default_library_id
+            = f.select(:default_library_id, @libraries.collect{|l| [l.display_name.localize, l.id]}, {}, {class: 'form-control'})
+            br
+            = t('user_import_file.default_library')
+          .form-group
+            = f.hidden_field :mode, value: 'import'
+            = f.submit t('page.start_import'), class: 'btn btn-default'

data/config/locales/devise.ja.yml

@@ -37,7 +37,7 @@ ja:
       signed_up_but_locked: "You have signed up successfully. However, we could not sign you in because your account is locked."
       signed_up_but_unconfirmed: "A message with a confirmation link has been sent to your email address. Please follow the link to activate your account."
       update_needs_confirmation: "You updated your account successfully, but we need to verify your new email address. Please check your email and follow the confirm link to confirm your new email address."
-      updated: "Your account has been updated successfully."
+      updated: "アカウントは正常に更新されました。"
     sessions:
       signed_in: "ログインしました。"
       signed_out: "ログアウトしました。"

data/config/locales/translation_en.yml

@@ -185,7 +185,7 @@ en:
     sort_by: "Sort by"
     bookmarklet: "Bookmarklet"
     add_file: "Add a file"
-    telephone_number: "Telephoone number"
+    telephone_number: "Telephone number"
     about_this_system: "About this system"
     report_bugs: "Report bugs"
     new_resource: "New resources"
@@ -239,9 +239,9 @@ en:
     local_record: "Local record"
     search_catalog_at: "Search catalog at %{library_name}"
     add_on: "Add-ons"
-    asc: "ascendent"
-    desc: "descendent"
-    error_occured: "An error occured."
+    asc: "ascendant"
+    desc: "descendant"
+    error_occurred: "An error occurred."
     did_you_mean: "Did you mean"
     calendar: "Calendar"
     related: "Related"
@@ -286,6 +286,8 @@ en:
     cannot_parse_yaml_header: "has an invalid YAML header. You must add a space after the header's colon."
     notice: Notice
     system_information: System information
+    nosolr_error: 'There is an error on connecting to the search server.'
+    nosolr_error_description: 'This error may be caused by a delay when the sever is still waiting for launching the search server. In that case, please wait for a while, and go back to this page later.'
   title:
     index: "index"
     show: "show"
@@ -315,11 +317,11 @@ en:
     from_file: "from file"
     from_isbn: "from ISBN"
     will_be_imported:
-      one: "Resource will be impored in a %{minute} minute."
-      other: "Resource will be impored in %{minute} minutes."
+      one: "Resource will be imported in a %{minute} minute."
+      other: "Resource will be imported in %{minute} minutes."
     auto_detect: "Auto detect"
     successfully_created: "%{model} was created successfully. When the task is completed, its status on the list will be updated to 'completed'."
-    following_column_were_ignored: "The follwing column(s) were ignored: %{column}"
+    following_column_were_ignored: "The following column(s) were ignored: %{column}"
     dummy: This row is treated as a dummy input.
   export:
     export_completed: Export completed.
@@ -347,7 +349,7 @@ en:
     set_auto_generated_password: "Set auto-generated password"
     history: "History"
     account_management: "Account management"
-    checkout_history_icalendar_url: "checkout historoy iCalendar URL"
+    checkout_history_icalendar_url: "checkout history iCalendar URL"
     reset_checkout_icalendar_url: "Reset checkout iCalendar URL"
     you_have_to_save_profile_to_activate_feed_url: "You have to save your profile to activate this url."
     you_have_to_save_profile_to_deactivate_feed_url: "You have to save your profile to deactivate this url."
@@ -373,7 +375,7 @@ en:
     you_should_specify_work: "You should specify a work in the series statement."
   state:
     pending: "Pending"
-    canceled: "Cancaled"
+    canceled: "Canceled"
     completed: "Completed"
     started: "Started"
     failed: "Failed"

data/config/locales/translation_ja.yml

@@ -271,6 +271,8 @@ ja:
     cannot_parse_yaml_header: "のYAMLヘッダを読み込めません。ヘッダのコロンの後には、半角スペースを含める必要があります。"
     notice: 注意
     system_information: システムの基本的な情報の表示
+    nosolr_error: '検索サーバに不具合があるようです'
+    nosolr_error_description: '検索サーバーの起動に時間がかかっている場合もこのエラーとなります。少し時間を置いてアクセスするとエラーが解消される場合もありますのでお試しください。'
   title:
     index: "一覧"
     show: "表示"

data/config/routes.rb

@@ -25,6 +25,11 @@ Rails.application.routes.draw do
     resources :accepts, :except => [:edit, :update]
   end
 
+  as :user do
+    get 'users/edit' => 'devise/registrations#edit', as: 'edit_user_registration'
+    put 'users' => 'devise/registrations#update', as: 'user_registration'
+  end
+
   root :to => "page#index"
 
   get '/page/about' => 'page#about'
@@ -33,7 +38,7 @@ Rails.application.routes.draw do
   get '/page/add_on' => 'page#add_on'
   get '/page/export' => 'page#export'
   get '/page/import' => 'page#import'
-  get '/page/msie_acceralator' => 'page#msie_acceralator'
+  get '/page/msie_accelerator' => 'page#msie_accelerator'
   get '/page/opensearch' => 'page#opensearch'
   get '/page/statistics' => 'page#statistics'
   get '/page/system_information' => 'page#system_information'

data/db/migrate/20140110122216_create_user_import_files.rb

@@ -6,7 +6,7 @@ class CreateUserImportFiles < ActiveRecord::Migration
       t.datetime :executed_at
       t.string :user_import_file_name
       t.string :user_import_content_type
-      t.string :user_import_file_size
+      t.integer :user_import_file_size
       t.datetime :user_import_updated_at
       t.string :user_import_fingerprint
       t.string :edit_mode

data/db/migrate/20150421023923_create_identities.rb

@@ -0,0 +1,15 @@
+class CreateIdentities < ActiveRecord::Migration
+  def change
+    create_table :identities do |t|
+      t.string :name
+      t.string :email
+      t.string :password_digest
+      t.integer :profile_id
+
+      t.timestamps null: false
+    end
+    add_index :identities, :name
+    add_index :identities, :email
+    add_index :identities, :profile_id
+  end
+end

data/lib/enju_leaf/controller.rb

@@ -10,7 +10,7 @@ module EnjuLeaf
     def set_error_template
       rescue_from CanCan::AccessDenied, with: :render_403
       #rescue_from ActiveRecord::RecordNotFound, with: :render_404
-      rescue_from Errno::ECONNREFUSED, with: :render_500
+      rescue_from Errno::ECONNREFUSED, with: :render_500_nosolr
       #rescue_from ActionView::MissingTemplate, with: :render_404_invalid_format
     end
   end

data/lib/enju_leaf/user.rb

@@ -49,8 +49,8 @@ module EnjuLeaf
             within: Devise::password_length
         end
 
-        validates_presence_of     :email, :email_confirmation, on: :create, if: proc{|user| !user.operator.try(:has_role?, 'Librarian')}
-        validates_confirmation_of :email, on: :create #, if: proc{|user| !user.operator.try(:has_role?, 'Librarian')}
+        #validates_presence_of     :email, :email_confirmation, on: :create, if: proc{|user| !user.operator.try(:has_role?, 'Librarian')}
+        #validates_confirmation_of :email, on: :create #, if: proc{|user| !user.operator.try(:has_role?, 'Librarian')}
 
         before_validation :set_lock_information
         before_destroy :check_role_before_destroy
@@ -63,7 +63,7 @@ module EnjuLeaf
         normalize_attributes :username
         normalize_attributes :email, with: :strip
 
-        attr_accessor :operator, :password_not_verified,
+        attr_accessor :password_not_verified,
           :update_own_account, :auto_generated_password,
           :locked, :current_password #, :agent_id
 
@@ -136,7 +136,9 @@ module EnjuLeaf
 
     module InstanceMethods
       def password_required?
-        !persisted? || !password.nil? || !password_confirmation.nil?
+        if Devise.mappings[:user].modules.include?(:database_authenticatable)
+          !persisted? || !password.nil? || !password_confirmation.nil?
+        end
       end
 
       def has_role?(role_in_question)
@@ -161,7 +163,7 @@ module EnjuLeaf
       end
 
       def set_confirmation
-        if operator and respond_to?(:confirm!)
+        if respond_to?(:confirm!)
           reload
           confirm!
         end
@@ -206,9 +208,7 @@ module EnjuLeaf
       end
 
       def send_confirmation_instructions
-        unless self.operator
-          Devise::Mailer.confirmation_instructions(self).deliver if self.email.present?
-        end
+        Devise::Mailer.confirmation_instructions(self).deliver if self.email.present?
       end
 
       def deletable_by?(current_user)

data/lib/enju_leaf/version.rb

@@ -1,3 +1,3 @@
 module EnjuLeaf
-  VERSION = "1.1.0.rc18"
+  VERSION = "1.1.0.rc19"
 end

data/lib/enju_leaf.rb

@@ -67,9 +67,7 @@ module EnjuLeaf
     end
 
     def render_500
-      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 file: "#{Rails.root}/public/500", layout: false, status: 500}
         format.mobile {render file: "#{Rails.root}/public/500", layout: false, status: 500}
@@ -79,6 +77,19 @@ module EnjuLeaf
       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)

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

@@ -3,10 +3,12 @@ class EnjuLeaf::QuickInstallGenerator < Rails::Generators::Base
 
   def quick_install
     environment = ENV['RAILS_ENV'] || 'development'
+    gsub_file 'config/schedule.rb', /^set :environment, :development$/,
+      "set :environment, :#{environment}"
     rake("enju_leaf_engine:install:migrations")
     rake("enju_biblio_engine:install:migrations")
     rake("enju_library_engine:install:migrations")
-    if !ENV['SKIP_CONFIG']
+    if !ENV['ENJU_SKIP_CONFIG']
       generate("enju_biblio:setup")
       generate("enju_library:setup")
       generate("enju_circulation:setup")
@@ -18,13 +20,15 @@ class EnjuLeaf::QuickInstallGenerator < Rails::Generators::Base
     rake("enju_subject:setup", env: environment)
     rake("assets:precompile", env: environment) if environment == 'production'
     rake("db:seed", env: environment)
-    if ENV['OS'] == 'Windows_NT'
-      rake("sunspot:solr:run", env: environment)
-    else
-      rake("sunspot:solr:start", env: environment)
-      sleep 5
-      rake("environment sunspot:reindex", env: environment)
-      rake("sunspot:solr:stop", env: environment)
+    if !ENV['ENJU_SKIP_SOLR']
+      if ENV['OS'] == 'Windows_NT'
+        rake("sunspot:solr:run", env: environment)
+      else
+        rake("sunspot:solr:start", env: environment)
+        sleep 5
+        rake("environment sunspot:reindex", env: environment)
+        rake("sunspot:solr:stop", env: environment)
+      end
     end
   end
 end

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

@@ -4,9 +4,10 @@ class EnjuLeaf::SetupGenerator < Rails::Generators::Base
 
   def copy_setup_files
     directory("db/fixtures", "db/fixtures/enju_leaf")
+    directory("solr", "example/solr")
     copy_file("Procfile", "Procfile")
-    copy_file("config/resque.yml", "config/resque.yml")
     copy_file("config/schedule.rb", "config/schedule.rb")
+    copy_file("config/initializers/resque.rb", "config/initializers/resque.rb")
     inject_into_file 'config/application.rb', after: /# config.i18n.default_locale = :de$\n/ do
       <<"EOS"
     config.i18n.available_locales = [:en, :ja]
@@ -32,6 +33,12 @@ EOS
     end
     generate("devise:install")
     generate("devise", "User")
+    gsub_file 'app/models/user.rb', /, :registerable,$/, ', #:registerable,'
+    gsub_file 'app/models/user.rb', /, :trackable, :validatable$/, <<EOS
+, :trackable, #:validatable, 
+      :lockable, :lock_strategy => :none, :unlock_strategy => :none
+  enju_leaf_user_model
+EOS
     generate("sunspot_rails:install")
     generate("kaminari:config")
     generate("simple_form:install")
@@ -48,19 +55,13 @@ EOS
         /\/\/= require turbolinks$/,
         ""
     end
-    gsub_file 'config/routes.rb', /devise_for :users$/, "devise_for :users, path: 'accounts'"
+    gsub_file 'config/routes.rb', /devise_for :users$/, "devise_for :users, skip: [:registration]"
     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.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]"
-    gsub_file 'app/models/user.rb', /, :registerable,$/, ', #:registerable,'
-    gsub_file 'app/models/user.rb', /, :trackable, :validatable$/, <<EOS
-, :trackable, #:validatable, 
-      :lockable, :lock_strategy => :none, :unlock_strategy => :none
-  enju_leaf_user_model
-EOS
 
     inject_into_class "app/controllers/application_controller.rb", ApplicationController do
       <<"EOS"
@@ -70,12 +71,13 @@ EOS
 
   mobylette_config do |config|
     config[:skip_xhr_requests] = false
-    config[:skip_user_agents] = ENV['ENJU_SKIP_MOBILE_AGENTS'].to_s.split.map{|s| s.to_sym}
+    config[:skip_user_agents] = ENV['ENJU_SKIP_MOBILE_AGENTS'].to_s.split(',').map{|a|
+      a.to_sym
+    }
   end
-
 EOS
     end
-    #inject_into_class "app/models/user.rb", User, "  enju_user_model\n"
+
     inject_into_file "app/helpers/application_helper.rb", after: /module ApplicationHelper$\n/ do
       <<"EOS"
   include EnjuLeaf::EnjuLeafHelper
@@ -107,8 +109,6 @@ EOS
     end
     remove_file "public/index.html"
     remove_file "app/views/layouts/application.html.erb"
-    gsub_file 'config/schedule.rb', /^set :environment, :development$/,
-      "set :environment, :#{environment}"
     gsub_file 'config/environments/production.rb',
       /config.serve_static_assets = false$/,
       "config.serve_static_assets = true"

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

@@ -0,0 +1,3 @@
+if defined?(Resque)
+  Resque.after_fork = Proc.new { ActiveRecord::Base.establish_connection }
+end

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

@@ -6,7 +6,7 @@ end
 email = 'admin@example.jp'
 password = 'adminpassword'
 
-# Don't edit!
+# Don't edit the following lines!
 
 Sunspot.session = Sunspot::Rails::StubSessionProxy.new(Sunspot.session)
 #unless solr = Sunspot.commit rescue nil
@@ -28,21 +28,18 @@ end
 system_user = User.new
 system_user.username = 'system'
 system_user.password = SecureRandom.urlsafe_base64(32)
-system_user.email = system_user.email_confirmation = 'root@library.example.jp'
+system_user.email = 'root@library.example.jp'
 system_user.role = Role.where(name: 'Administrator').first
 system_user.save!
 system_profile = new_profile
 system_profile.user = system_user
 system_profile.save!
-system_profile.index
 
 user = User.new
 user.username = username
 user.email = email
-user.email_confirmation = email
 user.password = password
 user.password_confirmation = password
-user.operator = user
 #user.confirm!
 user.role = Role.where(name: 'Administrator').first
 user.save!
@@ -50,6 +47,4 @@ profile = new_profile
 profile.user_number = '0'
 profile.user = user
 profile.save!
-profile.index
-Sunspot.commit
 puts 'Administrator account created.'

data/lib/generators/enju_leaf/setup/templates/solr/conf/schema.xml

@@ -15,10 +15,10 @@
  See the License for the specific language governing permissions and
  limitations under the License.
 -->
-<!--  
+<!--
  This is the Solr schema file. This file should be named "schema.xml" and
  should be in the conf directory under the solr home
- (i.e. ./solr/conf/schema.xml by default) 
+ (i.e. ./solr/conf/schema.xml by default)
  or located where the classloader for the Solr webapp can find it.
 
  This example schema is the recommended starting point for users.
@@ -60,15 +60,11 @@
     <fieldType name="rand" class="solr.RandomSortField" omitNorms="true"/>
     <!-- *** This fieldType is used by Sunspot! *** -->
     <fieldType name="text" class="solr.TextField" omitNorms="false">
-      <analyzer type="index" class="org.apache.lucene.analysis.cjk.CJKAnalyzer">
-        <tokenizer class="solr.StandardTokenizerFactory"/>
-        <filter class="solr.StandardFilterFactory"/>
-        <filter class="solr.LowerCaseFilterFactory"/>
-      </analyzer>
-      <analyzer type="query" class="org.apache.lucene.analysis.cjk.CJKAnalyzer">
+      <analyzer>
         <tokenizer class="solr.StandardTokenizerFactory"/>
         <filter class="solr.StandardFilterFactory"/>
         <filter class="solr.LowerCaseFilterFactory"/>
+        <filter class="solr.PorterStemFilterFactory"/>
       </analyzer>
     </fieldType>
     <!-- *** This fieldType is used by Sunspot! *** -->
@@ -88,8 +84,22 @@
     <!-- *** This fieldType is used by Sunspot! *** -->
     <fieldType name="tfloat" class="solr.TrieFloatField" omitNorms="true"/>
     <!-- *** This fieldType is used by Sunspot! *** -->
-    <fieldType name="tdate" class="solr.TrieDateField" omitNorms="true"/>
+    <fieldType name="tdate" class="solr.TrieDateField"
+               omitNorms="true"/>
 
+    <!-- Special field type for spell correction. Be careful about
+         adding filters here, as they apply *before* your values go in
+         the spellcheck. For example, the lowercase filter here means
+         all spelling suggestions will be lower case (without it,
+         though, you'd have duplicate suggestions for lower and proper
+         cased words). -->
+    <fieldType name="textSpell" class="solr.TextField" positionIncrementGap="100" omitNorms="true">
+      <analyzer>
+        <tokenizer class="solr.StandardTokenizerFactory"/>
+        <filter class="solr.StandardFilterFactory"/>
+        <filter class="solr.LowerCaseFilterFactory"/>
+      </analyzer>
+    </fieldType>
     <!-- A specialized field for geospatial search. If indexed, this fieldType must not be multivalued. -->
     <fieldType name="location" class="solr.LatLonType" subFieldSuffix="_coordinate"/>
   </types>
@@ -112,9 +122,9 @@
        given field.
        When using MoreLikeThis, fields used for similarity should be
        stored for best performance.
-     termPositions: Store position information with the term vector.  
+     termPositions: Store position information with the term vector.
        This will increase storage costs.
-     termOffsets: Store offset information with the term vector. This 
+     termOffsets: Store offset information with the term vector. This
        will increase storage costs.
      default: a value that should be used if no value is specified
        when adding a document.
@@ -240,7 +250,11 @@
     <dynamicField name="*_llm" stored="false" type="location" multiValued="true" indexed="true"/>
     <dynamicField name="*_lls" stored="true" type="location" multiValued="false" indexed="true"/>
     <dynamicField name="*_llms" stored="true" type="location" multiValued="true" indexed="true"/>
+    <field name="textSpell" stored="false" type="textSpell" multiValued="true" indexed="true"/>
+    <!-- required by Solr 4 -->
+    <field name="_version_" type="string" indexed="true" stored="true" multiValued="false" />
   </fields>
+
   <!-- Field to use to determine and enforce document uniqueness.
       Unless this field is marked with required="false", it will be a required field
    -->
@@ -251,5 +265,11 @@
   <solrQueryParser defaultOperator="AND"/>
   <!-- copyField commands copy one field to another at the time a document
         is added to the index.  It's used either to index the same field differently,
-        or to add multiple fields to the same field for easier/faster searching.  -->
+        or to add multiple fields to the same field for easier/faster
+        searching.  -->
+
+  <!-- Use copyField to copy the fields you want to run spell checking
+       on into one field. For example: -->
+  <copyField source="*_text"  dest="textSpell" />
+  <copyField source="*_s"  dest="textSpell" />
 </schema>