enju_leaf 1.1.0.rc9 → 1.1.0.rc10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8dd72d60431ce017b6e0338731f59395a3bd0e6d
-  data.tar.gz: 44a890255ac3e0d19eddd9ecea9e11ece3c94482
+  metadata.gz: abf8301bf438bd48a00db3b8c08ed8892bb827cb
+  data.tar.gz: ece67d49714be04367a3fbf8e5ed8c7e41686d0c
 SHA512:
-  metadata.gz: 337ff6f9b61732c1ab2154bb8710dd4cc3e48c303d8ab0291e5011a7519c35150e78609d42dbcf4ae30e903fff0f80f9275d243952232d4901994a44aaa94a18
-  data.tar.gz: 9698e2603a8815bd5e47ff35343776990c7125e6f18882a781acad7f2bfdd3a5d094ded545c54586f00c1ff9ded54f489e71c1d96bd81579dd85bacf7022b60d
+  metadata.gz: 5c854e5b0ee69714f5023aab0359aacf57ebb2fe2554ef61fc5d85209ff2aa9622859927b16c7cdb395912bfef36ae7f2f137c254a9c9fa59d5058e8f45660c4
+  data.tar.gz: ab3ed970a465ce237c9047752757589fb45fa9cd36bc45e77cf6874c7b9f6849e531397421196cd70f2ddcd4f6219919646f7ee580a6b7c2935ae886574d242b

data/app/models/user_import_file.rb

@@ -1,9 +1,10 @@
 class UserImportFile < ActiveRecord::Base
   attr_accessible :user_import, :edit_mode
+  include Statesman::Adapters::ActiveRecordModel
   include ImportFile
   default_scope {order('user_import_files.id DESC')}
-  scope :not_imported, -> {where(:state => 'pending')}
-  scope :stucked, -> {where('created_at < ? AND state = ?', 1.hour.ago, 'pending')}
+  scope :not_imported, -> {in_state(:pending)}
+  scope :stucked, -> {in_state(:pending).where('created_at < ? AND state = ?', 1.hour.ago)}
 
   if Setting.uploaded_file.storage == :s3
     has_attached_file :user_import, :storage => :s3,
@@ -24,28 +25,15 @@ class UserImportFile < ActiveRecord::Base
   belongs_to :user, :validate => true
   has_many :user_import_results
 
-  state_machine :initial => :pending do
-    event :sm_start do
-      transition [:pending, :started] => :started
-    end
-
-    event :sm_complete do
-      transition :started => :completed
-    end
+  has_many :user_import_file_transitions
 
-    event :sm_fail do
-      transition :started => :failed
-    end
-
-    before_transition any => :started do |user_import_file|
-      user_import_file.executed_at = Time.zone.now
-    end
-
-    before_transition any => :completed do |user_import_file|
-      user_import_file.error_message = nil
-    end
+  def state_machine
+    @state_machine ||= UserImportFileStateMachine.new(self, transition_class: UserImportFileTransition)
   end
 
+  delegate :can_transition_to?, :transition_to!, :transition_to, :current_state,
+    to: :state_machine
+
   def import_start
     case edit_mode
     when 'create'
@@ -60,14 +48,13 @@ class UserImportFile < ActiveRecord::Base
   end
 
   def import
-    sm_start!
-    reload
+    transition_to!(:started)
     num = {:user_imported => 0, :user_found => 0, :failed => 0}
     rows = open_import_file
     row_num = 2
 
     field = rows.first
-    if [field['username']].reject{|field| field.to_s.strip == ""}.empty?
+    if [field['username']].reject{|f| f.to_s.strip == ""}.empty?
       raise "username column is not found"
     end
 
@@ -85,10 +72,18 @@ class UserImportFile < ActiveRecord::Base
         num[:user_found] += 1
       else
         new_user = User.new
+        new_user.role = Role.where(:name => row['role']).first
+        if new_user.role
+          unless user.has_role?(new_user.role.name)
+            num[:failed] += 1
+            next
+          end
+        else
+          new_user.role = Role.find(2) # User
+        end
         new_user.operator = user
         new_user.username = username
         new_user.email = row['email'] if row['email'].present?
-        new_user.role = Role.where(:name => row['role']).first
         if row['user_group'].present?
           new_user.user_group = UserGroup.where(:name => row['user_group']).first
         end
@@ -97,13 +92,21 @@ class UserImportFile < ActiveRecord::Base
           new_user.expired_at = Time.zone.parse(row['expired_at']).end_of_day
         end
         new_user.note = row['note']
+
+        if I18n.available_locales.include?(row['locale'].to_s.to_sym)
+          new_user.locale = row['locale']
+        end
+
+        library = Library.where(:name => row['library'].to_s.strip).first || Library.web
+        new_user.library = library
+
         if row['password'].present?
           new_user.password = row['password']
         else
           new_user.set_auto_generated_password
         end
 
-        if new_user.save!
+        if new_user.save
           num[:user_imported] += 1
           import_result.user = new_user
           import_result.save!
@@ -114,22 +117,22 @@ class UserImportFile < ActiveRecord::Base
     end
 
     rows.close
-    sm_complete!
+    transition_to!(:completed)
     Sunspot.commit
     num
   rescue => e
     self.error_message = "line #{row_num}: #{e.message}"
-    sm_fail!
+    transition_to!(:failed)
     raise e
   end
 
   def modify
-    sm_start!
-    sm_complete!
+    transition_to!(:started)
+    transition_to!(:completed)
   end
 
   def remove
-    sm_start!
+    transition_to!(:started)
     reload
     rows = open_import_file
 
@@ -143,10 +146,14 @@ class UserImportFile < ActiveRecord::Base
       user = User.where(:username => username).first
       user.destroy if user
     end
-    sm_complete!
+    transition_to!(:completed)
   end
 
   private
+  def self.transition_class
+    UserImportFileTransition
+  end
+
   def open_import_file
     tempfile = Tempfile.new('user_import_file')
     if Setting.uploaded_file.storage == :s3

data/app/models/user_import_file_state_machine.rb

@@ -0,0 +1,19 @@
+class UserImportFileStateMachine
+  include Statesman::Machine
+
+  state :pending, initial: true
+  state :started
+  state :completed
+  state :failed
+
+  transition from: :pending, to: :started
+  transition from: :started, to: [:completed, :failed]
+
+  before_transition(from: :pending, to: :started) do |user_import_file|
+    user_import_file.executed_at = Time.zone.now
+  end
+
+  before_transition(from: :started, to: :completed) do |user_import_file|
+    user_import_file.error_message = nil
+  end
+end

data/app/models/user_import_file_transition.rb

@@ -0,0 +1,7 @@
+class UserImportFileTransition < ActiveRecord::Base
+  include Statesman::Adapters::ActiveRecordTransition
+
+  
+  belongs_to :user_import_file, inverse_of: :user_import_file_transitions
+  attr_accessible :to_state, :sort_key, :metadata
+end

data/app/views/page/_menu.html.erb

@@ -108,9 +108,7 @@
             <li><%= link_to t('user.management'), users_path -%></li>
             <li><%= link_to t('page.agent_management'), agents_path -%></li>
             <li><%= link_to t('page.import'), page_import_path -%></li>
-           <!--
-            <li><%= link_to t('page.export'), 'page/export' -%></li>
-            -->
+            <li><%= link_to t('page.export'), page_export_path -%></li>
             <% if defined?(EnjuPurchaseRequest) %>
               <li><%= link_to t('activerecord.models.order_list'), order_lists_path -%></li>
             <% end %>

data/app/views/page/configuration.html.erb

@@ -11,8 +11,11 @@
           </ul>
         </li>
         <li><%= link_to t('activerecord.models.user_group'), user_groups_path -%></li>
-        <li><%= link_to t('activerecord.models.user'), users_path -%></li>
-        <li><%= link_to t('activerecord.models.user_import_file'), user_import_files_path -%></li>
+        <li><%= link_to t('activerecord.models.user'), users_path -%>
+          <ul>
+            <li><%= link_to t('activerecord.models.user_import_file'), user_import_files_path -%></li>
+          </ul>
+        </li>
         <% if defined?(EnjuCirculation) %>
           <li><%= link_to t('activerecord.models.checkout_type'), checkout_types_path -%>
             <ul>
@@ -45,9 +48,10 @@
     <div class="config_box">
       <ul>
         <li><%= link_to t('activerecord.models.manifestation'), manifestations_path -%>
-        <ul>
-          <li><%= link_to t('item.all_item'), items_path %></li>
-        </ul>
+          <ul>
+            <li><%= link_to t('item.all_item'), items_path %></li>
+            <li><%= link_to t('activerecord.models.resource_import_file'), resource_import_files_path -%></li>
+          </ul>
         </li>
         <li><%= link_to t('activerecord.models.identifier_type'), identifier_types_path -%>
         <% if defined?(EnjuBookmark) %>
@@ -60,8 +64,10 @@
           <li><%= link_to t('activerecord.models.purchase_request'), purchase_requests_path -%></li>
           <li><%= link_to t('activerecord.models.order_list'), order_lists_path -%></li>
         <% end %>
+        <!--
         <li><%= link_to t('activerecord.models.subscription'), subscriptions_path -%></li>
-        <!-- <li><%= link_to t('activerecord.models.donate'), donates_path -%></li> -->
+        <li><%= link_to t('activerecord.models.donate'), donates_path -%></li>
+        -->
         <% if defined?(EnjuInventory) %>
           <li><%= link_to t('activerecord.models.inventory'), inventory_files_path -%></li>
         <% end %>
@@ -104,10 +110,10 @@
         <li><%= link_to t('activerecord.models.language'), languages_path -%></li>
         <li><%= link_to t('activerecord.models.country'), countries_path -%></li>
         <li><%= link_to t('activerecord.models.frequency'), frequencies_path -%></li>
+        <!--
         <li><%= link_to t('activerecord.models.agent_relationship_type'), agent_relationship_types_path -%></li>
         <li><%= link_to t('activerecord.models.manifestation_relationship_type'), manifestation_relationship_types_path -%></li>
         <li><%= link_to t('activerecord.models.license'), licenses_path -%></li>
-        <!--
         <li><%= link_to t('activerecord.models.create_type'), create_types_path -%></li>
         <li><%= link_to t('activerecord.models.realize_type'), realize_types_path -%></li>
         <li><%= link_to t('activerecord.models.produce_type'), produce_types_path -%></li>

data/app/views/page/export.html.erb

@@ -3,6 +3,7 @@
 <div id="content_list">
 
 <ul>
+  <!--
   <li>
     <%= t('activerecord.models.agent') -%>
     (<%= link_to 'CSV', agents_path(:format => :csv) -%>)
@@ -21,6 +22,10 @@
     <%= t('activerecord.models.item') -%>
     (<%= link_to 'CSV', items_path(:format => :csv) -%>)
   </li>
+  -->
+  <li>
+    <%= link_to t('activerecord.models.resource_export_file'), new_resource_export_file_path -%>
+  </li>
 </ul>
 </div>
 </div>

data/app/views/user_groups/index.html.erb

@@ -5,6 +5,7 @@
 <table class="table table-striped index">
   <tr>
     <th id="position"></th>
+    <th><%= t('activerecord.attributes.user_group.name') -%></th>
     <th><%= t('activerecord.attributes.user_group.display_name') -%></th>
     <th><%= t('activerecord.attributes.user_group.note') -%></th>
     <th></th>
@@ -17,6 +18,7 @@
         <%= move_position(user_group) -%>
       <%- end -%>
     </td>
+    <td><%= link_to user_group.name, user_group -%></td>
     <td><%= link_to user_group.display_name.localize, user_group -%></td>
     <td><%= user_group.note -%></td>
     <td>

data/app/views/user_import_results/index.html.erb

@@ -40,10 +40,10 @@
     <li>
     <% if @user_import_file %>
       <%= link_to((image_tag 'icons/page_white_excel.png', :size => '16x16', :alt => 'TSV', :class => 'icon'), user_import_file_user_import_results_path(@user_import_file, :format => :csv, :locale => @locale.to_s)) -%>
-      (<%= link_to 'CSV', user_import_file_user_import_results_path(:format => :csv, :locale => @locale.to_s) -%>)
+      (<%= link_to 'TSV', user_import_file_user_import_results_path(:format => :csv, :locale => @locale.to_s) -%>)
     <% else %>
       <%= link_to((image_tag 'icons/page_white_excel.png', :size => '16x16', :alt => 'CSV', :class => 'icon'), user_import_results_path(:format => :csv, :locale => @locale.to_s)) -%>
-      (<%= link_to 'CSV', user_import_results_path(:format => :csv, :locale => @locale.to_s) -%>)
+      (<%= link_to 'TSV', user_import_results_path(:format => :csv, :locale => @locale.to_s) -%>)
     <% end %>
     </li>
   </ul>

data/app/views/users/_form.html.erb

@@ -1,14 +1,5 @@
 <%= form_for(@user) do |f| %>
-  <% if @user.errors.any? %>
-  <div id="errorExplanation">
-    <h2><%= pluralize(@user.errors.count, "error") %> prohibited this user from being saved:</h2>
-    <ul>
-    <% @user.errors.full_messages.each do |msg| %>
-      <li><%= msg %></li>
-    <% end %>
-    </ul>
-  </div>
-  <% end %>
+  <%= f.error_notification -%>
 
   <div class="field">
     <%= f.label :username %><br />

data/app/views/users/new.html.erb

@@ -28,7 +28,7 @@
 
   <div class="field">
     <%= f.label :user_group_id -%>
-    <%= f.select(:user_group_id, @user_groups.collect{|u| [u.name, u.id]}) -%>
+    <%= f.select(:user_group_id, @user_groups.collect{|u| [u.display_name.localize, u.id]}) -%>
   </div>
 
   <%- if current_user.has_role?('Librarian') -%>

data/config/initializers/statesman.rb

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

data/config/locales/translation_en.yml

@@ -37,7 +37,7 @@ en:
         state: State
         agent: Agent
         library: Library
-        user_group: User group
+        user_group_id: User group
         full_name: Full name
         password: Password
         current_password: Current password

data/config/locales/translation_ja.yml

@@ -37,7 +37,7 @@ ja:
         state: 状態
         agent: 人物・団体
         library: 所属館
-        user_group: ユーザグループ
+        user_group_id: 利用者グループ
         full_name: 氏名
         password: パスワード
         current_password: 現在のパスワード
@@ -318,7 +318,7 @@ ja:
     no_number: "番号なし"
     add_lending_policy: "貸出規則の追加"
     edit_exemplification: "書誌の付け替え"
-    accepted_at: "受入時刻"
+    accepted_at: "検収時刻"
   agent:
     library_group_agent: "%{library_group_name} の人物・団体"
     work_agent: "%{work_title} の著作者"

data/db/migrate/20140524074813_create_user_import_file_transitions.rb

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

data/db/migrate/20140610123439_drop_email_unique_constraint_enju_leaf_rc10.rb

@@ -0,0 +1,11 @@
+class DropEmailUniqueConstraintEnjuLeafRc10 < ActiveRecord::Migration
+  def up
+    remove_index :users, :email
+    add_index :users, :email
+  end
+
+  def down
+    remove_index :users, :email
+    add_index :users, :email, unique: true
+  end
+end

data/lib/enju_leaf.rb

@@ -3,6 +3,15 @@ require "enju_leaf/version"
 require "enju_leaf/controller"
 require "enju_leaf/user"
 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/localized_name"
+require "enju_leaf/master_model"
+require "enju_leaf/url_validator"
 
 require 'csv'
 #require 'mathn'

data/lib/enju_leaf/bookmark_url.rb

@@ -0,0 +1,45 @@
+module BookmarkUrl
+  def my_host?
+    url = ::Addressable::URI.parse(self)
+    unless url.host
+      raise ::Addressable::URI::InvalidURIError
+    end
+    config_url = ::Addressable::URI.parse(LibraryGroup.site_config.url)
+    if url.host == config_url.host and url.port == config_url.port and ['http', 'https'].include?(url.scheme)
+      true
+    else
+      false
+    end
+  end
+
+  def bookmarkable?
+    if self.my_host?
+      url = ::Addressable::URI.parse(self)
+      path = url.path.split("/").reverse
+      if path[1] == "manifestations" and Manifestation.where(:id => path[0]).first
+        true
+      else
+        false
+      end
+    else
+      true
+    end
+  rescue ::Addressable::URI::InvalidURIError
+    false
+  end
+
+  def bookmarkable_id
+    if self.my_host?
+      path = ::Addressable::URI.parse(self).path.split("/").reverse
+      unless path[1] == "manifestations"
+        nil
+      else
+        path[0]
+      end
+    end
+  end
+end
+
+class String
+  include BookmarkUrl
+end