enju_leaf 1.1.0.rc7 → 1.1.0.rc8

data/config/locales/translation_en.yml

@@ -4,11 +4,9 @@ en:
       user: User
       role: Role
       user_group: User group
-      attachment_file: Attachment file
       user_has_role: User and roles
-      session: Login
-      work: Work
-      expression: Expression
+      user_import_file: User import file
+      user_import_result: User import result
 
     attributes:
       user:
@@ -61,6 +59,19 @@ en:
         number_of_day_to_notify_due_date: Number of day to notify due date
         number_of_day_to_notify_overdue: Number of day to notify overdue
         number_of_time_to_notify_overdue: Number of time to notify overdue
+      user_import_file:
+        user_import_file_name: Filename
+        user_import_content_type: Content type
+        user_import_file_size: Size
+        user_import_fingerprint: File hash
+        note: Note
+        executed_at: Executed at
+        user_import_updated_at: Updated at
+        state: State
+        edit_mode: Edit mode
+        error_message: Error message
+      user_import_result:
+        body: Body
 
   page:
     user_title: "Welcome %{login_name}"
@@ -160,7 +171,7 @@ en:
     new_resource: "New resources"
     checkout_history: "Checkout history"
     recommendation: "Recommendation"
-    add_manually: "Add manually"
+    add_resource_manually: "Add a resource manually"
     import: "Import"
     import_from_file: "Import from TSV file"
     import_from_network: "Import from networks"
@@ -249,7 +260,7 @@ en:
     not_logged_in: "Not logged in"
     add_child: "Add a child"
     electronic_resource_management: "Electronic resource management"
-    continue: "Continue?"
+    system: System
   title:
     index: "index"
     show: "show"

data/config/locales/translation_ja.yml

@@ -5,6 +5,8 @@ ja:
       role: 権限
       user_group: 利用者グループ
       user_has_role: 利用者と権限
+      user_import_file: 利用者のインポート用ファイル
+      user_import_result: 利用者インポートの結果
 
     attributes:
       user:
@@ -57,6 +59,19 @@ ja:
         number_of_day_to_notify_due_date: 貸出期限の何日前に督促を送るか
         number_of_day_to_notify_overdue: 貸出期限の何日後に督促を送るか
         number_of_time_to_notify_overdue: 貸出期限が切れた後に何回督促を送るか
+      user_import_file:
+        user_import_file_name: ファイル名
+        user_import_content_type: Content-Type
+        user_import_file_size: ファイルサイズ
+        user_import_fingerprint: ファイルのハッシュ
+        note: 注記
+        executed_at: 実行時刻
+        user_import_updated_at: 更新時刻
+        state: 状態
+        edit_mode: 編集モード
+        error_message: エラーメッセージ
+      user_import_result:
+        body: 本文
 
   page:
     user_title: "ようこそ %{login_name} さん"
@@ -145,7 +160,7 @@ ja:
     new_resource: "新着資料"
     checkout_history: "貸出履歴"
     recommendation: "おすすめの資料"
-    add_manually: "手動で登録する"
+    add_resource_manually: "手動で資料を登録する"
     import_from_file: "TSVファイルからのインポート"
     import_from_network: "ネットワークからインポート"
     no_record_found: "資料が見つかりませんでした。"
@@ -229,6 +244,7 @@ ja:
     not_logged_in: "ログインしていません"
     add_child: "子を追加"
     electronic_resource_management: 電子リソース管理
+    system: システム
   title:
     index: "一覧"
     show: "表示"

data/config/routes.rb

@@ -1,4 +1,12 @@
 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 :user_import_results
+
+  resources :user_import_files
+
   resource :my_account
 
   #resources :users do

data/db/migrate/20140110122216_create_user_import_files.rb

@@ -0,0 +1,19 @@
+class CreateUserImportFiles < ActiveRecord::Migration
+  def change
+    create_table :user_import_files do |t|
+      t.integer :user_id
+      t.text :note
+      t.datetime :executed_at
+      t.string :state
+      t.string :user_import_file_name
+      t.string :user_import_content_type
+      t.string :user_import_file_size
+      t.datetime :user_import_updated_at
+      t.string :user_import_fingerprint
+      t.string :edit_mode
+      t.text :error_message
+
+      t.timestamps
+    end
+  end
+end

data/db/migrate/20140110131010_create_user_import_results.rb

@@ -0,0 +1,11 @@
+class CreateUserImportResults < ActiveRecord::Migration
+  def change
+    create_table :user_import_results do |t|
+      t.integer :user_import_file_id
+      t.integer :user_id
+      t.text :body
+
+      t.timestamps
+    end
+  end
+end

data/db/migrate/20140122054321_create_profiles.rb

@@ -0,0 +1,21 @@
+class CreateProfiles < ActiveRecord::Migration
+  def change
+    create_table :profiles do |t|
+      t.integer :user_id
+      t.integer :user_group_id
+      t.integer :library_id
+      t.string :locale
+      t.string :user_number
+      t.text :full_name
+      t.text :note
+      t.text :keyword_list
+      t.integer :required_role_id
+      t.string :state
+
+      t.timestamps
+    end
+
+    add_index :profiles, :user_id
+    add_index :profiles, :user_number
+  end
+end

data/lib/enju_leaf/engine.rb

@@ -9,6 +9,7 @@ require 'sitemap_generator'
 require 'redis-rails'
 require 'jquery-rails'
 require 'jquery-ui-rails'
+require 'resque_scheduler/server'
 
 module EnjuLeaf
   class Engine < ::Rails::Engine

data/lib/enju_leaf/user.rb

@@ -65,7 +65,8 @@ module EnjuLeaf
         extend FriendlyId
         friendly_id :username
         #has_paper_trail
-        normalize_attributes :username, :user_number #, :email
+        normalize_attributes :username, :user_number
+        normalize_attributes :email, :with => :strip
 
         searchable do
           text :username, :email, :note, :user_number
@@ -188,8 +189,10 @@ module EnjuLeaf
       end
 
       def set_expired_at
-        if self.user_group.valid_period_for_new_user > 0
-          self.expired_at = self.user_group.valid_period_for_new_user.days.from_now.end_of_day
+        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
 

data/lib/enju_leaf/version.rb

@@ -1,3 +1,3 @@
 module EnjuLeaf
-  VERSION = "1.1.0.rc7"
+  VERSION = "1.1.0.rc8"
 end

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

@@ -4,6 +4,7 @@ class EnjuLeaf::SetupGenerator < Rails::Generators::Base
 
   def copy_setup_files
     directory("db/fixtures", "db/fixtures/enju_leaf")
+    copy_file("Procfile", "Procfile")
     copy_file("config/application.yml", "config/application.yml")
     copy_file("config/resque.yml", "config/resque.yml")
     copy_file("config/schedule.rb", "config/schedule.rb")
@@ -12,7 +13,8 @@ class EnjuLeaf::SetupGenerator < Rails::Generators::Base
     gsub_file 'config/application.rb', /# config.time_zone = 'Central Time \(US & Canada\)'$/,
       "config.time_zone = 'Tokyo'"
     gsub_file 'config/schedule.rb', /\/path\/to\/enju_leaf/, Rails.root.to_s
-    append_to_file("Rakefile", "require 'resque/tasks'")
+    append_to_file("Rakefile", "require 'resque/tasks'\n")
+    append_to_file("Rakefile", "require 'resque_scheduler/tasks'")
     append_to_file("db/seeds.rb", File.open(File.expand_path('../templates', __FILE__) + '/db/seeds.rb').read)
     append_to_file 'config/initializers/inflections.rb',  <<EOS
 ActiveSupport::Inflector.inflections do |inflect|

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

@@ -0,0 +1,3 @@
+solr: bundle exec rake sunspot:solr:run
+resque: bundle exec rake environment resque:work QUEUE=*
+web: bundle exec rails s

data/lib/generators/enju_leaf/setup/templates/config/application.yml

@@ -14,7 +14,7 @@ defaults: &defaults
   amazon:
     aws_hostname: ecs.amazonaws.jp
     hostname: www.amazon.co.jp
-    access_key: REPLACE_WITH_YOUR_AMAZON_ACCESS_KEY
+    access_key_id: REPLACE_WITH_YOUR_AMAZON_ACCESS_KEY
     secret_access_key: REPLACE_WITH_YOUR_AMAZON_SECRET_ACCESS_KEY
 
 # :google, :amazon

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

@@ -24,8 +24,7 @@ set :environment, :development
 set :output, "#{path}/log/cron_log.log"
 
 every 1.hour do
-  rake "enju:import:start"
-  rake "enju:import:expire"
+  rake "enju_biblio:import"
 end
 
 every 1.day, :at => '0:00 am' do

data/spec/controllers/user_import_files_controller_spec.rb

@@ -0,0 +1,294 @@
+require 'spec_helper'
+
+describe UserImportFilesController do
+  fixtures :all
+
+  describe "GET index" do
+    describe "When logged in as Administrator" do
+      login_admin
+
+      it "assigns all user_import_files as @user_import_files" do
+        get :index
+        assigns(:user_import_files).should eq(UserImportFile.page(1))
+      end
+    end
+
+    describe "When logged in as Librarian" do
+      login_librarian
+
+      it "assigns all user_import_files as @user_import_files" do
+        get :index
+        assigns(:user_import_files).should eq(UserImportFile.page(1))
+      end
+    end
+
+    describe "When logged in as User" do
+      login_user
+
+      it "assigns empty as @user_import_files" do
+        get :index
+        assigns(:user_import_files).should be_empty
+        response.should be_forbidden
+      end
+    end
+
+    describe "When not logged in" do
+      it "assigns empty as @user_import_files" do
+        get :index
+        assigns(:user_import_files).should be_empty
+        response.should redirect_to(new_user_session_url)
+      end
+    end
+  end
+
+  describe "GET show" do
+    describe "When logged in as Administrator" do
+      login_admin
+
+      it "assigns the requested user_import_file as @user_import_file" do
+        get :show, :id => user_import_files(:two).id
+        assigns(:user_import_file).should eq(user_import_files(:two))
+        response.should be_success
+      end
+    end
+
+    describe "When logged in as Librarian" do
+      login_librarian
+
+      it "assigns the requested user_import_file as @user_import_file" do
+        get :show, :id => user_import_files(:two).id
+        assigns(:user_import_file).should eq(user_import_files(:two))
+        response.should be_success
+      end
+    end
+
+    describe "When logged in as User" do
+      login_user
+
+      it "assigns the requested user_import_file as @user_import_file" do
+        get :show, :id => user_import_files(:two).id
+        assigns(:user_import_file).should eq(user_import_files(:two))
+        response.should be_forbidden
+      end
+    end
+
+    describe "When not logged in" do
+      it "assigns the requested user_import_file as @user_import_file" do
+        get :show, :id => user_import_files(:two).id
+        assigns(:user_import_file).should eq(user_import_files(:two))
+        response.should redirect_to(new_user_session_url)
+      end
+    end
+  end
+
+  describe "GET new" do
+    describe "When logged in as Administrator" do
+      login_admin
+
+      it "assigns the requested user_import_file as @user_import_file" do
+        get :new
+        assigns(:user_import_file).should_not be_valid
+        response.should be_success
+      end
+    end
+
+    describe "When logged in as Librarian" do
+      login_librarian
+
+      it "should not assign the requested user_import_file as @user_import_file" do
+        get :new
+        assigns(:user_import_file).should_not be_valid
+        response.should be_success
+      end
+    end
+
+    describe "When logged in as User" do
+      login_user
+
+      it "should not assign the requested user_import_file as @user_import_file" do
+        get :new
+        assigns(:user_import_file).should_not be_valid
+        response.should be_forbidden
+      end
+    end
+
+    describe "When not logged in" do
+      it "should not assign the requested user_import_file as @user_import_file" do
+        get :new
+        assigns(:user_import_file).should_not be_valid
+        response.should redirect_to(new_user_session_url)
+      end
+    end
+  end
+
+  describe "POST create" do
+    describe "When logged in as Librarian" do
+      before(:each) do
+        @user = FactoryGirl.create(:librarian)
+        sign_in @user
+      end
+
+      it "should create agent_import_file" do
+        post :create, :user_import_file => {:user_import => fixture_file_upload("/../../examples/user_import_file_sample.tsv", 'text/csv') }
+        assigns(:user_import_file).should be_valid
+        assigns(:user_import_file).user.username.should eq @user.username
+        response.should redirect_to user_import_file_url(assigns(:user_import_file))
+      end
+    end
+
+    describe "When logged in as User" do
+      before(:each) do
+        @user = FactoryGirl.create(:user)
+        sign_in @user
+      end
+
+      it "should be forbidden" do
+        post :create, :user_import_file => {:user_import => fixture_file_upload("/../../examples/user_import_file_sample.tsv", 'text/csv') }
+        assigns(:user_import_file).user.should be_nil
+        response.should be_forbidden
+      end
+    end
+
+    describe "When not logged in" do
+      it "should be redirected to new session url" do
+        post :create, :user_import_file => {:user_import => fixture_file_upload("/../../examples/user_import_file_sample.tsv", 'text/csv') }
+        assigns(:user_import_file).user.should be_nil
+        response.should redirect_to new_user_session_url
+      end
+    end
+  end
+
+  describe "GET edit" do
+    describe "When logged in as Administrator" do
+      login_admin
+
+      it "assigns the requested user_import_file as @user_import_file" do
+        user_import_file = user_import_files(:one)
+        get :edit, :id => user_import_file.id
+        assigns(:user_import_file).should eq(user_import_file)
+      end
+    end
+
+    describe "When logged in as Librarian" do
+      login_librarian
+
+      it "assigns the requested user_import_file as @user_import_file" do
+        user_import_file = user_import_files(:one)
+        get :edit, :id => user_import_file.id
+        assigns(:user_import_file).should eq(user_import_file)
+      end
+    end
+
+    describe "When logged in as User" do
+      login_user
+
+      it "assigns the requested user_import_file as @user_import_file" do
+        user_import_file = user_import_files(:one)
+        get :edit, :id => user_import_file.id
+        response.should be_forbidden
+      end
+    end
+
+    describe "When not logged in" do
+      it "should not assign the requested user_import_file as @user_import_file" do
+        user_import_file = user_import_files(:one)
+        get :edit, :id => user_import_file.id
+        response.should redirect_to(new_user_session_url)
+      end
+    end
+  end
+
+  describe "PUT update" do
+    describe "When logged in as Administrator" do
+      login_admin
+
+      it "should update user_import_file" do
+        post :create, :user_import_file => {:user_import => fixture_file_upload("/../../examples/user_import_file_sample.tsv", 'text/csv') }
+        put :update, :id => assigns(:user_import_file).id, :user_import_file => { :note => 'test' }
+        response.should redirect_to user_import_file_url(assigns(:user_import_file))
+      end
+    end
+
+    describe "When logged in as Librarian" do
+      login_librarian
+
+      it "should update user_import_file" do
+        post :create, :user_import_file => {:user_import => fixture_file_upload("/../../examples/user_import_file_sample.tsv", 'text/csv') }
+        put :update, :id => assigns(:user_import_file).id, :user_import_file => { :note => 'test' }
+        response.should redirect_to user_import_file_url(assigns(:user_import_file))
+      end
+    end
+
+    describe "When logged in as User" do
+      login_user
+
+      it "should not update user_import_file" do
+        put :update, :id => user_import_files(:two).id, :user_import_file => { }
+        response.should be_forbidden
+      end
+    end
+
+    describe "When not logged in" do
+      it "should not update user_import_file" do
+        put :update, :id => user_import_files(:two).id, :user_import_file => { }
+        response.should redirect_to new_user_session_url
+      end
+    end
+  end
+
+  describe "DELETE destroy" do
+    before(:each) do
+      @user_import_file = user_import_files(:one)
+    end
+
+    describe "When logged in as Administrator" do
+      login_admin
+
+      it "destroys the requested user_import_file" do
+        delete :destroy, :id => @user_import_file.id
+      end
+
+      it "redirects to the user_import_files list" do
+        delete :destroy, :id => @user_import_file.id
+        response.should redirect_to(user_import_files_url)
+      end
+    end
+
+    describe "When logged in as Librarian" do
+      login_librarian
+
+      it "destroys the requested user_import_file" do
+        delete :destroy, :id => @user_import_file.id
+      end
+
+      it "redirects to the user_import_files list" do
+        delete :destroy, :id => @user_import_file.id
+        response.should redirect_to(user_import_files_url)
+      end
+    end
+
+    describe "When logged in as User" do
+      login_user
+
+      it "destroys the requested user_import_file" do
+        delete :destroy, :id => @user_import_file.id
+      end
+
+      it "should be forbidden" do
+        delete :destroy, :id => @user_import_file.id
+        response.should be_forbidden
+      end
+    end
+
+    describe "When not logged in" do
+      it "destroys the requested user_import_file" do
+        delete :destroy, :id => @user_import_file.id
+      end
+
+      it "should be forbidden" do
+        delete :destroy, :id => @user_import_file.id
+        response.should redirect_to(new_user_session_url)
+      end
+    end
+  end
+end