enju_leaf 1.1.0.rc12 → 1.1.0.rc13

data/db/migrate/20140709113905_create_user_export_file_transitions.rb

@@ -0,0 +1,14 @@
+class CreateUserExportFileTransitions < ActiveRecord::Migration
+  def change
+    create_table :user_export_file_transitions do |t|
+      t.string :to_state
+      t.text :metadata, default: "{}"
+      t.integer :sort_key
+      t.integer :user_export_file_id
+      t.timestamps
+    end
+
+    add_index :user_export_file_transitions, :user_export_file_id, name: "index_user_export_file_transitions_on_file_id"
+    add_index :user_export_file_transitions, [:sort_key, :user_export_file_id], unique: true, name: "index_user_export_file_transitions_on_sort_key_and_file_id"
+  end
+end

data/db/migrate/20140720170714_add_default_library_id_to_user_import_file.rb

@@ -0,0 +1,5 @@
+class AddDefaultLibraryIdToUserImportFile < ActiveRecord::Migration
+  def change
+    add_column :user_import_files, :default_library_id, :integer
+  end
+end

data/db/migrate/20140720170735_add_default_user_group_id_to_user_import_file.rb

@@ -0,0 +1,5 @@
+class AddDefaultUserGroupIdToUserImportFile < ActiveRecord::Migration
+  def change
+    add_column :user_import_files, :default_user_group_id, :integer
+  end
+end

data/db/migrate/20140811031145_add_expired_at_to_profile.rb

@@ -0,0 +1,5 @@
+class AddExpiredAtToProfile < ActiveRecord::Migration
+  def change
+    add_column :profiles, :expired_at, :datetime
+  end
+end

data/lib/enju_leaf/calculate_stat.rb

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

data/lib/enju_leaf/controller.rb

@@ -11,7 +11,7 @@ module EnjuLeaf
       rescue_from CanCan::AccessDenied, :with => :render_403
       #rescue_from ActiveRecord::RecordNotFound, :with => :render_404
       rescue_from Errno::ECONNREFUSED, :with => :render_500
-      rescue_from ActionView::MissingTemplate, :with => :render_404_invalid_format
+      #rescue_from ActionView::MissingTemplate, :with => :render_404_invalid_format
     end
   end
 

data/lib/enju_leaf/export_file.rb

@@ -0,0 +1,26 @@
+module ExportFile
+  def self.included(base)
+    base.extend ClassMethods
+  end
+
+  module ClassMethods
+    def enju_export_file_model
+      include InstanceMethods
+      belongs_to :user
+      validates :user, presence: true
+      attr_accessible :mode
+      attr_accessor :mode
+    end
+  end
+
+  module InstanceMethods
+    def send_message
+      sender = User.find(1)
+      message_template = MessageTemplate.localized_template('export_completed', user.profile.locale)
+      request = MessageRequest.new
+      request.assign_attributes({:sender => sender, :receiver => user, :message_template => message_template}, as: :admin)
+      request.save_message_body
+      request.transition_to!(:sent)
+    end
+  end
+end

data/lib/enju_leaf/import_file.rb

@@ -49,6 +49,15 @@ module ImportFile
       end
     end
 
+    def send_message
+      sender = User.find(1)
+      message_template = MessageTemplate.localized_template('import_completed', user.profile.locale)
+      request = MessageRequest.new
+      request.assign_attributes({:sender => sender, :receiver => user, :message_template => message_template}, as: :admin)
+      request.save_message_body
+      request.transition_to!(:sent)
+    end
+
     private
     def nkf_encode(line)
       case user_encoding
@@ -65,5 +74,21 @@ module ImportFile
       end
       string = NKF.nkf("#{output_encoding} -Lu", line)
     end
+
+    def create_import_temp_file(attachment)
+      tempfile = Tempfile.new(self.class.name.underscore)
+      if Setting.uploaded_file.storage == :s3
+        uploaded_file_path = attachment.expiring_url(10)
+      else
+        uploaded_file_path = attachment.path
+      end
+      open(uploaded_file_path){|f|
+        f.each{|line|
+          tempfile.puts(convert_encoding(line))
+        }
+      }
+      tempfile.close
+      tempfile
+    end
   end
 end

data/lib/enju_leaf/master_model.rb

@@ -4,18 +4,27 @@ module MasterModel
     base.send :include, InstanceMethods
     base.class_eval do
       acts_as_list
-      validates_uniqueness_of :name, :case_sensitive => false,
-        :message => I18n.t('Only lowercase letters and numbers are allowed.')
-      validates :name, :presence => true, :format => {:with => /\A[0-9A-Za-z][0-9A-Za-z_\-\s]*[0-9a-z]\Z/}
-      validates :display_name, :presence => true
-      before_validation :set_display_name, :on => :create
+      validates_uniqueness_of :name, case_sensitive: false
+      validates :name, presence: true
+      validate :name do
+        valid_format?
+      end
+      validates :display_name, presence: true
+      before_validation :set_display_name, on: :create
       normalize_attributes :name
     end
   end
 
   module InstanceMethods
     def set_display_name
-      self.display_name = "#{I18n.locale}: #{self.name}" if self.display_name.blank?
+      self.display_name = "#{I18n.locale}: #{name}" if display_name.blank?
+    end
+
+    private
+    def valid_format?
+      unless name =~ /\A[A-Za-z][0-9A-Za-z_\s]*[0-9a-z]\Z/
+        errors.add(:name, I18n.t('page.only_lowercase_letters_and_numbers_are_allowed'))
+      end
     end
   end
 end

data/lib/enju_leaf/url_validator.rb

@@ -1,10 +1,12 @@
 class UrlValidator < ActiveModel::EachValidator
   def validate_each(record, attribute, value)
-    url = ::Addressable::URI.parse(value)
-    if url
+    if value =~ /\Ahttps?:\/\/[^\n]+\z/i
+      url = ::Addressable::URI.parse(value)
       unless ['http', 'https'].include?(url.scheme)
         record.errors.add(attribute.to_sym)
       end
+    else
+      record.errors.add(attribute.to_sym)
     end
   end
 end

data/lib/enju_leaf/user.rb

@@ -10,35 +10,35 @@ module EnjuLeaf
 
         # Setup accessible (or protected) attributes for your model
         attr_accessible :email, :password, :password_confirmation, :current_password,
-          :remember_me, :email_confirmation, :library_id, :locale,
-          :keyword_list, :auto_generated_password
+          :remember_me, :email_confirmation,
+          :auto_generated_password,
+          :profile_attributes
         attr_accessible :email, :password, :password_confirmation, :username,
-          :current_password, :user_number, :remember_me,
-          :email_confirmation, :note, :user_group_id, :library_id, :locale,
-          :expired_at, :locked, :required_role_id, :role_id,
-          :keyword_list, :user_has_role_attributes, :auto_generated_password,
+          :current_password, :remember_me,
+          :email_confirmation,
+          :expired_at, :locked, :role_id,
+          :user_has_role_attributes, :auto_generated_password,
+          :profile_attributes,
           :as => :admin
 
         scope :administrators, where('roles.name = ?', 'Administrator').includes(:role)
         scope :librarians, where('roles.name = ? OR roles.name = ?', 'Administrator', 'Librarian').includes(:role)
         scope :suspended, where('locked_at IS NOT NULL')
-        #has_one :agent, :dependent => :destroy
+        has_one :profile, :dependent => :destroy
         if defined?(EnjuBiblio)
           has_many :import_requests
           has_many :picture_files, :as => :picture_attachable, :dependent => :destroy
         end
         has_one :user_has_role, :dependent => :destroy
         has_one :role, :through => :user_has_role
-        belongs_to :library, :validate => true
         belongs_to :user_group
-        belongs_to :required_role, :class_name => 'Role', :foreign_key => 'required_role_id' #, :validate => true
-        has_many :export_files if defined?(EnjuExport)
-        #has_one :agent_import_result
+        belongs_to :library
+        belongs_to :required_role, class_name: 'Role', foreign_key: 'required_role_id'
         accepts_nested_attributes_for :user_has_role
+        accepts_nested_attributes_for :profile
 
-        validates :username, :presence => true, :uniqueness => true, :format => {:with => /\A[0-9A-Za-z][0-9A-Za-z_\-]*[0-9A-Za-z]\Z/}, :allow_blank => true
-        validates_uniqueness_of :email, :allow_blank => true
-        validates :email, :format => Devise::email_regexp, :allow_blank => true
+        validates :username, :presence => true, :uniqueness => true, :format => {:with => /\A[0-9A-Za-z][0-9A-Za-z_\-]*[0-9A-Za-z]\Z/}
+        validates :email, :format => Devise::email_regexp, :allow_blank => true, :uniqueness => true
         validates_date :expired_at, :allow_blank => true
 
         with_options :if => :password_required? do |v|
@@ -49,47 +49,20 @@ module EnjuLeaf
         end
 
         validates_presence_of     :email, :email_confirmation, :on => :create, :if => proc{|user| !user.operator.try(:has_role?, 'Librarian')}
-        validates_associated :user_group, :library #, :agent
-        validates_presence_of :user_group, :library, :locale #, :user_number
-        validates :user_number, :uniqueness => true, :format => {:with => /\A[0-9A-Za-z_]+\Z/}, :allow_blank => true
-        validates_confirmation_of :email, :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_role_and_agent, :on => :create
         before_validation :set_lock_information
         before_destroy :check_role_before_destroy
         before_save :check_expiration
-        before_create :set_expired_at
-        after_destroy :remove_from_index
         after_create :set_confirmation
 
         extend FriendlyId
         friendly_id :username
         #has_paper_trail
-        normalize_attributes :username, :user_number
+        normalize_attributes :username
         normalize_attributes :email, :with => :strip
 
-        searchable do
-          text :username, :email, :note, :user_number
-          text :name do
-            #agent.name if agent
-          end
-          string :username
-          string :email
-          string :user_number
-          integer :required_role_id
-          time :created_at
-          time :updated_at
-          boolean :active do
-            active_for_authentication?
-          end
-          time :confirmed_at
-        end
-
-        attr_accessor :first_name, :middle_name, :last_name, :full_name,
-          :first_name_transcription, :middle_name_transcription,
-          :last_name_transcription, :full_name_transcription,
-          :zip_code, :address, :telephone_number, :fax_number, :address_note,
-          :operator, :password_not_verified,
+        attr_accessor :operator, :password_not_verified,
           :update_own_account, :auto_generated_password,
           :locked, :current_password #, :agent_id
 
@@ -100,6 +73,63 @@ module EnjuLeaf
             user.lock_access! if user.expired? and user.active_for_authentication?
           end
         end
+
+        def export(options = {format: :txt})
+          header = %w(
+            username
+            email
+            user_number
+            role
+            user_group
+            library
+            locale
+            created_at
+            updated_at
+            expired_at
+            keyword_list
+            note
+            checkout_icalendar_token
+            save_checkout_history
+            save_search_history
+            share_bookmarks
+          ).join("\t")
+          users = User.all.map{|u|
+            lines = []
+            lines << u.username
+            lines << u.email
+            lines << u.profile.user_number
+            lines << u.role.name
+            lines << u.profile.user_group.try(:name)
+            lines << u.profile.library.try(:name)
+            lines << u.profile.locale
+            lines << u.created_at
+            lines << u.updated_at
+            lines << u.expired_at
+            lines << u.profile.keyword_list.try(:split).try(:join, "//")
+            lines << u.profile.note
+            if defined?(EnjuCirculation)
+              lines << u.profile.try(:checkout_icalendar_token)
+              lines << u.profile.try(:save_checkout_history)
+            else
+              lines << nil
+            end
+            if defined?(EnjuSearchLog)
+              lines << u.try(:save_search_history)
+            else
+              lines << nil
+            end
+            if defined?(EnjuBookmark)
+              lines << u.try(:share_bookmarks)
+            else
+              lines << nil
+            end
+          }
+          if options[:format] == :txt
+            users.map{|u| u.join("\t")}.unshift(header).join("\r\n")
+          else
+            users
+          end
+        end
       end
     end
 
@@ -121,14 +151,6 @@ module EnjuLeaf
         end
       end
 
-      def set_role_and_agent
-        self.required_role = Role.where(:name => 'Librarian').first
-        self.locale = I18n.default_locale.to_s unless locale
-        #unless self.agent
-        #  self.agent = Agent.create(:full_name => self.username) if self.username
-        #end
-      end
-
       def set_lock_information
         if locked == '1' and self.active_for_authentication?
           lock_access!
@@ -188,14 +210,6 @@ module EnjuLeaf
         end
       end
 
-      def set_expired_at
-        if expired_at.blank?
-          if user_group.valid_period_for_new_user > 0
-            self.expired_at = user_group.valid_period_for_new_user.days.from_now.end_of_day
-          end
-        end
-      end
-
       def deletable_by(current_user)
         if defined?(EnjuCirculation)
           # 未返却の資料のあるユーザを削除しようとした
@@ -228,14 +242,6 @@ module EnjuLeaf
           false
         end
       end
-
-      def patron
-        LocalPatron.new({:username => username})
-      end
-
-      def full_name
-        username
-      end
     end
   end
 end

data/lib/enju_leaf/version.rb

@@ -1,3 +1,3 @@
 module EnjuLeaf
-  VERSION = "1.1.0.rc12"
+  VERSION = "1.1.0.rc13"
 end

data/lib/enju_leaf.rb

@@ -6,9 +6,8 @@ require "enju_leaf/helper"
 require "enju_leaf/calculate_stat"
 require "enju_leaf/bookmark_url"
 require "enju_leaf/calculate_stat"
-require "enju_leaf/expire_editable_fragment"
-require "enju_leaf/expire_fragment_cache"
 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"
@@ -36,17 +35,17 @@ module EnjuLeaf
       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.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"}' }
         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.xml {render template: 'page/403', status: 403}
+          format.json { render text: '{"error": "forbidden"}' }
         end
       end
     end
@@ -54,16 +53,16 @@ module EnjuLeaf
     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.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"}' }
       end
     end
 
     def render_404_invalid_format
       return if performed?
-      render :file => "#{Rails.root}/public/404", :formats => [:html]
+      render file: "#{Rails.root}/public/404", formats: [:html]
     end
 
     def render_500
@@ -71,10 +70,10 @@ 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.xml {render :template => 'page/500', :status => 500}
-        format.json { render :text => '{"error": "server_error"}' }
+        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.xml {render template: 'page/500', status: 500}
+        format.json { render text: '{"error": "server_error"}' }
       end
     end
 
@@ -85,7 +84,7 @@ module EnjuLeaf
         end
       end
       if user_signed_in?
-        locale = params[:locale] || session[:locale] || current_user.locale.try(:to_sym)
+        locale = params[:locale] || session[:locale] || current_user.profile.try(:locale).try(:to_sym)
       else
         locale = params[:locale] || session[:locale]
       end
@@ -99,16 +98,16 @@ module EnjuLeaf
     end
 
     def default_url_options(options={})
-      {:locale => nil}
+      {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
+          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})
+        @available_languages = Language.where(iso_639_1: I18n.available_locales.map{|l| l.to_s})
       end
     end
 
@@ -125,7 +124,7 @@ module EnjuLeaf
     end
 
     def get_user
-      @user = User.where(:username => params[:user_id]).first if params[:user_id]
+      @user = User.where(username: params[:user_id]).first if params[:user_id]
       #authorize! :show, @user if @user
     end
 
@@ -183,7 +182,7 @@ module EnjuLeaf
         language = params[:language]
         if defined?(EnjuSubject)
           subject = params[:subject]
-          subject_by_term = Subject.where(:term => params[:subject]).first
+          subject_by_term = Subject.where(term: params[:subject]).first
           @subject_by_term = subject_by_term
         end
 
@@ -284,7 +283,7 @@ module EnjuLeaf
       if ['higher', 'lower'].include?(direction)
         resource.send("move_#{direction}")
         if redirect
-          redirect_to url_for(:controller => resource.class.to_s.pluralize.underscore)
+          redirect_to url_for(controller: resource.class.to_s.pluralize.underscore)
           return
         end
       end

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

@@ -29,7 +29,8 @@ class EnjuLeaf::QuickInstallGenerator < Rails::Generators::Base
       rake("sunspot:solr:run", :env => environment)
     else
       rake("sunspot:solr:start", :env => environment)
-      rake("enju_leaf:create_initial_index", :env => environment)
+      sleep 5
+      rake("environment sunspot:reindex", :env => environment)
       rake("sunspot:solr:stop", :env => environment)
     end
   end

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

@@ -8,6 +8,12 @@ class EnjuLeaf::SetupGenerator < Rails::Generators::Base
     copy_file("config/application.yml", "config/application.yml")
     copy_file("config/resque.yml", "config/resque.yml")
     copy_file("config/schedule.rb", "config/schedule.rb")
+    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
+EOS
+    end
     gsub_file 'config/application.rb', /# config.i18n.default_locale = :de$/,
       "config.i18n.default_locale = :ja"
     gsub_file 'config/application.rb', /# config.time_zone = 'Central Time \(US & Canada\)'$/,

data/lib/generators/enju_leaf/setup/templates/db/fixtures/user_groups.yml

@@ -1,6 +1,6 @@
 --- 
 user_group_00001: 
-  name: "First group"  
+  name: "first_group"
   display_name: "First group"
   id: 1
   note: ""

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

@@ -16,7 +16,7 @@ Sunspot.session = Sunspot::Rails::StubSessionProxy.new(Sunspot.session)
 system_user = User.new
 system_user.username = 'system'
 system_user.password = SecureRandom.urlsafe_base64(32)
-system_user.email = system_user.email_confirmation = LibraryGroup.first.email
+system_user.email = system_user.email_confirmation = 'root@library.example.jp'
 system_user.save!
 system_user.role = Role.where(:name => 'Administrator').first
 system_user.index
@@ -27,9 +27,10 @@ user.email = email
 user.email_confirmation = email
 user.password = password
 user.password_confirmation = password
-user.library = Library.real.first
-user.locale = I18n.default_locale.to_s
-user.user_number = '0'
+user.profile = Profile.new
+user.profile.library = Library.real.first
+user.profile.locale = I18n.default_locale.to_s
+user.profile.user_number = '0'
 user.operator = user
 user.save!
 #user.confirm!

data/lib/tasks/enju_leaf_tasks.rake

@@ -1,4 +1,6 @@
 require 'active_record/fixtures'
+require 'tasks/profile'
+
 namespace :enju_leaf do
   desc "create initial records for enju_leaf"
   task :setup => :environment do
@@ -12,17 +14,24 @@ namespace :enju_leaf do
     puts 'initial fixture files loaded.'
   end
 
-  desc "create initial index"
-  task :create_initial_index => :environment do
-    Library.reindex
-    Shelf.reindex
-    User.reindex
-
-    puts 'indexing completed.'
-  end
-
   desc "import users from a TSV file"
   task :user_import => :environment do
     UserImportFile.import
   end
+
+  desc "upgrade enju_leaf"
+  task :upgrade => :environment do
+    version = EnjuLeaf::VERSION.split('.')
+    if version[0..2] == ["1", "1" ,"0"]
+      if version[3] == 'rc13'
+        Rake::Task['enju_biblio:upgrade'].invoke
+        Rake::Task['enju_circulation:upgrade'].invoke
+        Rake::Task['enju_message:upgrade'].invoke
+        Profile.transaction do
+          update_profile
+        end
+      end
+    end
+    puts 'enju_leaf: The upgrade completed successfully.'
+  end
 end

data/lib/tasks/profile.rb

@@ -0,0 +1,15 @@
+def update_profile
+  User.find_each do |user|
+    next if user.profile
+    profile = Profile.new
+    profile.user = user
+    profile.user_group = user.user_group
+    profile.library = user.library
+    profile.required_role = user.required_role
+    profile.user_number = user.user_number
+    profile.keyword_list = user.keyword_list
+    profile.locale = user.locale
+    profile.note = user.note
+    profile.save
+  end
+end