enju_leaf 1.1.0.rc9 → 1.1.0.rc10

data/lib/enju_leaf/calculate_stat.rb

@@ -0,0 +1,30 @@
+module CalculateStat
+
+  def self.included(base)
+    base.extend ClassMethods
+    base.send :include, InstanceMethods
+    base.class_eval do
+      validates_presence_of :start_date, :end_date
+      validate :check_date
+    end
+  end
+
+  module ClassMethods
+    def calculate_stat
+      self.not_calculated.each do |stat|
+        stat.calculate_count!
+      end
+    end
+  end
+
+  module InstanceMethods
+    def check_date
+      if self.start_date and self.end_date
+        if self.start_date >= self.end_date
+          errors.add(:start_date)
+          errors.add(:end_date)
+        end
+      end
+    end
+  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 'statesman'
 require 'resque/scheduler/server'
 
 module EnjuLeaf

data/lib/enju_leaf/expire_editable_fragment.rb

@@ -0,0 +1,30 @@
+module ExpireEditableFragment
+  def expire_editable_fragment(record, fragments = [])
+    fragments.uniq!
+    if record.is_a?(Manifestation)
+      if fragments.empty?
+        fragments = %w[manifestation_html show_detail_user_html show_detail_librarian_html pickup_html title_html title_mobile index_sru list_identifiers_oai list_records_oai]
+      end
+      expire_manifestation_cache(record, fragments)
+    else
+      I18n.available_locales.each do |locale|
+        Role.all_cache.each do |role|
+          fragments.each do |fragment|
+            expire_fragment(":#{record.class.to_s.downcase}" => record.id, :fragment => fragment, :role => role.name, :locale => locale)
+          end
+        end
+      end
+    end
+  end
+
+  private
+  def expire_manifestation_cache(manifestation, fragments = [])
+    I18n.available_locales.each do |locale|
+      Role.all_cache.each do |role|
+        fragments.uniq.each do |fragment|
+          expire_fragment(:manifestation => manifestation.id, :fragment => fragment, :role => role.name, :locale => locale)
+        end
+      end
+    end
+  end
+end

data/lib/enju_leaf/expire_fragment_cache.rb

@@ -0,0 +1,17 @@
+class ExpireFragmentCache
+  def self.expire_fragment_cache(record, fragments = [])
+    if record.is_a?(Manifestation)
+      if fragments.empty?
+        fragments = %w[manifestation_html show_detail_user_html show_detail_librarian_html pickup_html title_html title_mobile index_sru]
+      end
+    end
+
+    I18n.available_locales.each do |locale|
+      Role.all_cache.each do |role|
+        fragments.each do |fragment|
+          Rails.cache.delete(":#{record.class.to_s.downcase}" => record.id, :fragment => fragment, :role => role.name, :locale => locale)
+        end
+      end
+    end
+  end
+end

data/lib/enju_leaf/import_file.rb

@@ -0,0 +1,13 @@
+module ImportFile
+  def self.included(base)
+    base.extend ClassMethods
+  end
+
+  module ClassMethods
+    def expire
+      self.stucked.find_each do |file|
+        file.destroy
+      end
+    end
+  end
+end

data/lib/enju_leaf/localized_name.rb

@@ -0,0 +1,15 @@
+module LocalizedName
+  def localize(locale = I18n.locale)
+    string = YAML.load(self)
+    if string.is_a?(Hash) and string[locale.to_s]
+      return string[locale.to_s]
+    end
+    self
+  rescue NoMethodError
+    self
+  end
+end
+
+class String
+  include LocalizedName
+end

data/lib/enju_leaf/master_model.rb

@@ -0,0 +1,21 @@
+module MasterModel
+  def self.included(base)
+    #base.extend ClassMethods
+    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
+      normalize_attributes :name
+    end
+  end
+
+  module InstanceMethods
+    def set_display_name
+      self.display_name = "#{I18n.locale}: #{self.name}" if self.display_name.blank?
+    end
+  end
+end

data/lib/enju_leaf/url_validator.rb

@@ -0,0 +1,10 @@
+class UrlValidator < ActiveModel::EachValidator
+  def validate_each(record, attribute, value)
+    url = ::Addressable::URI.parse(value)
+    if url
+      unless ['http', 'https'].include?(url.scheme)
+        record.errors.add(attribute.to_sym)
+      end
+    end
+  end
+end

data/lib/enju_leaf/user.rb

@@ -123,7 +123,7 @@ module EnjuLeaf
 
       def set_role_and_agent
         self.required_role = Role.where(:name => 'Librarian').first
-        self.locale = I18n.default_locale.to_s
+        self.locale = I18n.default_locale.to_s unless locale
         #unless self.agent
         #  self.agent = Agent.create(:full_name => self.username) if self.username
         #end

data/lib/enju_leaf/version.rb

@@ -1,3 +1,3 @@
 module EnjuLeaf
-  VERSION = "1.1.0.rc9"
+  VERSION = "1.1.0.rc10"
 end

data/spec/dummy/config/initializers/statesman.rb

@@ -0,0 +1,3 @@
+Statesman.configure do
+  storage_adapter(Statesman::Adapters::ActiveRecord)
+end

data/spec/dummy/db/migrate/20130421093852_add_periodical_to_manifestation.rb

@@ -0,0 +1,5 @@
+class AddPeriodicalToManifestation < ActiveRecord::Migration
+  def change
+    add_column :manifestations, :periodical, :boolean
+  end
+end

data/spec/dummy/db/migrate/20130429020822_add_root_manifestation_id_to_series_statement.rb

@@ -0,0 +1,6 @@
+class AddRootManifestationIdToSeriesStatement < ActiveRecord::Migration
+  def change
+    add_column :series_statements, :root_manifestation_id, :integer
+    add_index :series_statements, :root_manifestation_id
+  end
+end

data/spec/dummy/db/migrate/20130506175303_create_identifier_types.rb

@@ -0,0 +1,12 @@
+class CreateIdentifierTypes < ActiveRecord::Migration
+  def change
+    create_table :identifier_types do |t|
+      t.string :name
+      t.text :display_name
+      t.text :note
+      t.integer :position
+
+      t.timestamps
+    end
+  end
+end

data/spec/dummy/db/migrate/20130506175834_create_identifiers.rb

@@ -0,0 +1,15 @@
+class CreateIdentifiers < ActiveRecord::Migration
+  def change
+    create_table :identifiers do |t|
+      t.string :body, :null => false
+      t.integer :identifier_type_id, :null => false
+      t.integer :manifestation_id
+      t.boolean :primary
+      t.integer :position
+
+      t.timestamps
+    end
+    add_index :identifiers, [:body, :identifier_type_id]
+    add_index :identifiers, :manifestation_id
+  end
+end

data/spec/dummy/db/schema.rb

@@ -11,7 +11,7 @@
 #
 # It's strongly recommended to check this file into your version control system.
 
-ActiveRecord::Schema.define(:version => 20140110131010) do
+ActiveRecord::Schema.define(:version => 20140610123439) do
 
   create_table "accepts", :force => true do |t|
     t.integer  "basket_id"
@@ -278,6 +278,28 @@ ActiveRecord::Schema.define(:version => 20140110131010) do
     t.datetime "updated_at",   :null => false
   end
 
+  create_table "identifier_types", :force => true do |t|
+    t.string   "name"
+    t.text     "display_name"
+    t.text     "note"
+    t.integer  "position"
+    t.datetime "created_at",   :null => false
+    t.datetime "updated_at",   :null => false
+  end
+
+  create_table "identifiers", :force => true do |t|
+    t.string   "body",               :null => false
+    t.integer  "identifier_type_id", :null => false
+    t.integer  "manifestation_id"
+    t.boolean  "primary"
+    t.integer  "position"
+    t.datetime "created_at",         :null => false
+    t.datetime "updated_at",         :null => false
+  end
+
+  add_index "identifiers", ["body", "identifier_type_id"], :name => "index_identifiers_on_body_and_identifier_type_id"
+  add_index "identifiers", ["manifestation_id"], :name => "index_identifiers_on_manifestation_id"
+
   create_table "import_requests", :force => true do |t|
     t.string   "isbn"
     t.string   "state"
@@ -474,6 +496,7 @@ ActiveRecord::Schema.define(:version => 20140110131010) do
     t.integer  "month_of_publication"
     t.boolean  "fulltext_content"
     t.string   "doi"
+    t.boolean  "periodical"
   end
 
   add_index "manifestations", ["access_address"], :name => "index_manifestations_on_access_address"
@@ -546,6 +569,24 @@ ActiveRecord::Schema.define(:version => 20140110131010) do
   add_index "produces", ["agent_id"], :name => "index_produces_on_agent_id"
   add_index "produces", ["manifestation_id"], :name => "index_produces_on_manifestation_id"
 
+  create_table "profiles", :force => true 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.datetime "created_at",       :null => false
+    t.datetime "updated_at",       :null => false
+  end
+
+  add_index "profiles", ["user_id"], :name => "index_profiles_on_user_id"
+  add_index "profiles", ["user_number"], :name => "index_profiles_on_user_number"
+
   create_table "realize_types", :force => true do |t|
     t.string   "name"
     t.text     "display_name"
@@ -696,9 +737,11 @@ ActiveRecord::Schema.define(:version => 20140110131010) do
     t.integer  "manifestation_id"
     t.text     "note"
     t.text     "title_subseries_transcription"
+    t.integer  "root_manifestation_id"
   end
 
   add_index "series_statements", ["manifestation_id"], :name => "index_series_statements_on_manifestation_id"
+  add_index "series_statements", ["root_manifestation_id"], :name => "index_series_statements_on_root_manifestation_id"
   add_index "series_statements", ["series_statement_identifier"], :name => "index_series_statements_on_series_statement_identifier"
 
   create_table "shelves", :force => true do |t|
@@ -767,6 +810,18 @@ ActiveRecord::Schema.define(:version => 20140110131010) do
   add_index "user_has_roles", ["role_id"], :name => "index_user_has_roles_on_role_id"
   add_index "user_has_roles", ["user_id"], :name => "index_user_has_roles_on_user_id"
 
+  create_table "user_import_file_transitions", :force => true do |t|
+    t.string   "to_state"
+    t.text     "metadata",            :default => "{}"
+    t.integer  "sort_key"
+    t.integer  "user_import_file_id"
+    t.datetime "created_at",                            :null => false
+    t.datetime "updated_at",                            :null => false
+  end
+
+  add_index "user_import_file_transitions", ["sort_key", "user_import_file_id"], :name => "index_user_import_file_transitions_on_sort_key_and_file_id", :unique => true
+  add_index "user_import_file_transitions", ["user_import_file_id"], :name => "index_user_import_file_transitions_on_user_import_file_id"
+
   create_table "user_import_files", :force => true do |t|
     t.integer  "user_id"
     t.text     "note"
@@ -821,7 +876,7 @@ ActiveRecord::Schema.define(:version => 20140110131010) do
     t.datetime "confirmed_at"
   end
 
-  add_index "users", ["email"], :name => "index_users_on_email", :unique => true
+  add_index "users", ["email"], :name => "index_users_on_email"
   add_index "users", ["reset_password_token"], :name => "index_users_on_reset_password_token", :unique => true
   add_index "users", ["unlock_token"], :name => "index_users_on_unlock_token", :unique => true
   add_index "users", ["user_group_id"], :name => "index_users_on_user_group_id"

data/spec/dummy/private/system/user_import_files/user_imports/980/190/963/original/user_import_file_sample.tsv

@@ -1,5 +1,7 @@
-username	email	user_number	role	user_group	expired_at	password	note	dummy
-user001	user001@example.jp	001001	Administrator	user			test	
-user002		001002	User	faculty	2013-12-01			
-user003	user003@example.jp	001003	Librarian	user		4NsxXPLy	テストユーザ	
-user004		001004		user				t
+username	email	user_number	role	user_group	expired_at	password	library	locale	note	dummy
+user001	user001@example.jp	001001	Administrator	user					test	
+user002		001002	User	faculty	2013-12-01			en		
+user003	user003@example.jp	001003	Librarian	user		4NsxXPLy	kamata	ja	テストユーザ	
+user004		001004		user						t
+user005		001005		faculty	2014-12-01		hoge	fuga		
+user006									usernameのみ	

data/spec/models/user_import_file_spec.rb

@@ -14,29 +14,56 @@ describe UserImportFile do
     it "should be imported" do
       old_users_count = User.count
       old_import_results_count = UserImportResult.count
-      @file.state.should eq 'pending'
-      @file.import_start.should eq({:user_imported => 3, :user_found => 0, :failed => 0})
-      User.order('id DESC')[1].username.should eq 'user002'
-      User.order('id DESC')[2].username.should eq 'user001'
-      User.count.should eq old_users_count + 3
+      @file.current_state.should eq 'pending'
+      @file.import_start.should eq({:user_imported => 5, :user_found => 0, :failed => 0})
+      User.order('id DESC')[1].username.should eq 'user005'
+      User.order('id DESC')[2].username.should eq 'user003'
+      User.count.should eq old_users_count + 5
 
       user002 = User.where(:username => 'user002').first
       user002.user_number.should eq '001002'
       user002.user_group.name.should eq 'faculty'
       user002.expired_at.to_i.should eq Time.zone.parse('2013-12-01').end_of_day.to_i
       user002.valid_password?('4NsxXPLy')
+      user002.user_number.should eq '001002'
+      user002.library.name.should eq 'web'
+      user002.locale.should eq 'en'
 
       user003 = User.where(:username => 'user003').first
-      user002.user_number.should eq '001002'
       user003.note.should eq 'テストユーザ'
       user003.role.name.should eq 'Librarian'
       user003.user_number.should eq '001003'
+      user003.library.name.should eq 'kamata'
+      user003.locale.should eq 'ja'
       User.where(:username => 'user000').first.should be_nil
-      UserImportResult.count.should eq old_import_results_count + 4
+      UserImportResult.count.should eq old_import_results_count + 6
+
+      user005 = User.where(username: 'user005').first
+      user005.role.name.should eq 'User'
+      user005.library.name.should eq 'web'
+      user005.locale.should eq 'en'
+      user005.user_number.should eq '001005'
+      user005.user_group.name.should eq 'faculty'
+
+      user006 = User.where(username: 'user006').first
+      user006.role.name.should eq 'User'
+      user006.library.name.should eq 'web'
+      user006.locale.should eq 'en'
+      user006.user_number.should be_nil
+      user006.user_group.name.should eq 'not_specified'
 
       @file.user_import_fingerprint.should be_true
       @file.executed_at.should be_true
     end
+
+    it "should not import users that have higher roles than current user's role" do
+      old_users_count = User.count
+      old_import_results_count = UserImportResult.count
+      @file.user = User.where(username: 'librarian1').first
+      @file.import_start.should eq({:user_imported => 4, :user_found => 0, :failed => 1})
+      User.order('id DESC')[1].username.should eq 'user005'
+      User.count.should eq old_users_count + 4
+    end
   end
 
   describe "when its mode is 'update'" do