enju_biblio 0.1.0.pre52 → 0.1.0.pre53

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ac5fd7859acc6d4189d01e5c4aae69ff34bb0aa7
-  data.tar.gz: db016f3244cbc2702285df0efee525b248069ed8
+  metadata.gz: fe609d882b6ac9b45013f9093f98515fc656675f
+  data.tar.gz: fa0c10fc22ef968d9b8477cd325710365708c28f
 SHA512:
-  metadata.gz: 19b3f7ee6baa681fef3227f9da8a4a70d8b5e783e89696e37b33378a47648efa04c1d4b26e74b0f3399b22c34280d224cb3b9cfc8224986913a83f80dcf34915
-  data.tar.gz: 4dd636602cd8bf8fb449fe9e249f51eac85acc68ef0c083adce2ed14a0caab562f0c2572956b8f0d1af5a092432b65ffa03c3ab212b24172fb53b56d60bd00a2
+  metadata.gz: b24b4f20952199d0d36277e2fc889916cbb0c6ef2441756a484175980a51a9748c7490181007f3db4b288e096471512e90f97f3413cd99b0e8b4b1054b41e150
+  data.tar.gz: b7fe8414bbce9e0f0663ffd8935f614974e636b74163bae915230e4ad9596addba96a39ebdb592c0140dd9051863323d06812542fd13d26090ce1a2d5f7c0800

data/app/controllers/agent_import_files_controller.rb

@@ -57,6 +57,9 @@ class AgentImportFilesController < ApplicationController
 
     respond_to do |format|
       if @agent_import_file.save
+        if @agent_import_file.mode == 'import'
+          Resque.enqueue(AgentImportFileQueue, @agent_import_file.id)
+        end
         format.html { redirect_to @agent_import_file, :notice => t('controller.successfully_created', :model => t('activerecord.models.agent_import_file')) }
         format.json { render :json => @agent_import_file, :status => :created, :location => @agent_import_file }
       else
@@ -71,6 +74,9 @@ class AgentImportFilesController < ApplicationController
   def update
     respond_to do |format|
       if @agent_import_file.update_attributes(params[:agent_import_file])
+        if @agent_import_file.mode == 'import'
+          Resque.enqueue(AgentImportFileQueue, @agent_import_file.id)
+        end
         format.html { redirect_to @agent_import_file, :notice => t('controller.successfully_updated', :model => t('activerecord.models.agent_import_file')) }
         format.json { head :no_content }
       else

data/app/controllers/agent_import_results_controller.rb

@@ -1,5 +1,5 @@
 class AgentImportResultsController < InheritedResources::Base
-  respond_to :html, :json, :csv
+  respond_to :html, :json, :tsv
   load_and_authorize_resource
   has_scope :file_id
   actions :index, :show, :destroy

data/app/controllers/manifestations_controller.rb

@@ -552,6 +552,10 @@ class ManifestationsController < ApplicationController
     #  query = "#{query} subject_sm:#{options[:subject]}"
     #end
 
+    if options[:title].present?
+      query = "#{query} title_text:#{options[:title]}"
+    end
+
     if options[:tag].present?
       query = "#{query} tag_sm:#{options[:tag]}"
     end
@@ -568,6 +572,10 @@ class ManifestationsController < ApplicationController
       query = "#{query} isbn_sm:#{options[:isbn].gsub('-', '')}"
     end
 
+    if options[:isbn_id].present?
+      query = "#{query} isbn_sm:#{options[:isbn_id].gsub('-', '')}"
+    end
+
     if options[:issn].present?
       query = "#{query} issn_sm:#{options[:issn].gsub('-', '')}"
     end

data/app/controllers/resource_export_files_controller.rb

@@ -0,0 +1,100 @@
+class ResourceExportFilesController < ApplicationController
+  load_and_authorize_resource
+
+  # GET /resource_export_files
+  # GET /resource_export_files.json
+  def index
+    @resource_export_files = ResourceExportFile.order('id DESC').page(params[:page])
+
+    respond_to do |format|
+      format.html # index.html.erb
+      format.json { render :json => @resource_export_files }
+    end
+  end
+
+  # GET /resource_export_files/1
+  # GET /resource_export_files/1.json
+  def show
+    if @resource_export_file.resource_export.path
+      unless Setting.uploaded_file.storage == :s3
+        file = @resource_export_file.resource_export.path
+      end
+    end
+
+    respond_to do |format|
+      format.html # show.html.erb
+      format.json { render :json => @resource_export_file }
+      format.download {
+        if Setting.uploaded_file.storage == :s3
+          redirect_to @resource_export_file.resource_export.expiring_url(10)
+        else
+          send_file file, :filename => @resource_export_file.resource_export_file_name, :type => 'application/octet-stream'
+        end
+      }
+    end
+  end
+
+  # GET /resource_export_files/new
+  # GET /resource_export_files/new.json
+  def new
+    @resource_export_file = ResourceExportFile.new
+    @resource_export_file.user = current_user
+
+    respond_to do |format|
+      format.html # new.html.erb
+      format.json { render :json => @resource_export_file }
+    end
+  end
+
+  # GET /resource_export_files/1/edit
+  def edit
+  end
+
+  # POST /resource_export_files
+  # POST /resource_export_files.json
+  def create
+    @resource_export_file = ResourceExportFile.new(params[:resource_export_file])
+    @resource_export_file.user = current_user
+
+    respond_to do |format|
+      if @resource_export_file.save
+        if @resource_export_file.mode == 'export'
+          Resque.enqueue(ResourceExportFileQueue, @resource_export_file.id)
+        end
+        format.html { redirect_to @resource_export_file, :notice => t('controller.successfully_created', :model => t('activerecord.models.resource_export_file')) }
+        format.json { render :json => @resource_export_file, :status => :created, :location => @resource_export_file }
+      else
+        format.html { render :action => "new" }
+        format.json { render :json => @resource_export_file.errors, :status => :unprocessable_entity }
+      end
+    end
+  end
+
+  # PUT /resource_export_files/1
+  # PUT /resource_export_files/1.json
+  def update
+    respond_to do |format|
+      if @resource_export_file.update_attributes(params[:resource_export_file])
+        if @resource_export_file.mode == 'export'
+          ResourceExportFileQueue.perform(@resource_export_file.id)
+        end
+        format.html { redirect_to @resource_export_file, :notice => t('controller.successfully_updated', :model => t('activerecord.models.resource_export_file')) }
+        format.json { head :no_content }
+      else
+        format.html { render :action => "edit" }
+        format.json { render :json => @resource_export_file.errors, :status => :unprocessable_entity }
+      end
+    end
+  end
+
+  # DELETE /resource_export_files/1
+  # DELETE /resource_export_files/1.json
+  def destroy
+    @resource_export_file.destroy
+
+    respond_to do |format|
+      format.html { redirect_to resource_export_files_url }
+      format.json { head :no_content }
+    end
+  end
+end

data/app/controllers/resource_import_files_controller.rb

@@ -57,6 +57,9 @@ class ResourceImportFilesController < ApplicationController
 
     respond_to do |format|
       if @resource_import_file.save
+        if @resource_import_file.mode == 'import'
+          Resque.enqueue(ResourceImportFileQueue, @resource_import_file.id)
+        end
         format.html { redirect_to @resource_import_file, :notice => t('controller.successfully_created', :model => t('activerecord.models.resource_import_file')) }
         format.json { render :json => @resource_import_file, :status => :created, :location => @resource_import_file }
       else
@@ -71,6 +74,9 @@ class ResourceImportFilesController < ApplicationController
   def update
     respond_to do |format|
       if @resource_import_file.update_attributes(params[:resource_import_file])
+        if @resource_import_file.mode == 'import'
+          Resque.enqueue(ResourceImportFileQueue, @resource_import_file.id)
+        end
         format.html { redirect_to @resource_import_file, :notice => t('controller.successfully_updated', :model => t('activerecord.models.resource_import_file')) }
         format.json { head :no_content }
       else

data/app/controllers/resource_import_results_controller.rb

@@ -1,5 +1,5 @@
 class ResourceImportResultsController < InheritedResources::Base
-  respond_to :html, :json, :csv
+  respond_to :html, :json, :tsv
   load_and_authorize_resource
   has_scope :file_id
   actions :index, :show, :destroy
@@ -7,7 +7,7 @@ class ResourceImportResultsController < InheritedResources::Base
   def index
     @resource_import_file = ResourceImportFile.where(:id => params[:resource_import_file_id]).first
     if @resource_import_file
-      if params[:format] == 'csv'
+      if params[:format] == 'tsv'
         @resource_import_results = @resource_import_file.resource_import_results
       else
         @resource_import_results = @resource_import_file.resource_import_results.page(params[:page])

data/app/models/agent.rb

@@ -292,7 +292,6 @@ end
 #  note                                :text
 #  required_role_id                    :integer          default(1), not null
 #  required_score                      :integer          default(0), not null
-#  state                               :string(255)
 #  email                               :text
 #  url                                 :text
 #  full_name_alternative_transcription :text
@@ -300,4 +299,3 @@ end
 #  death_date                          :string(255)
 #  agent_identifier                    :string(255)
 #
-

data/app/models/agent_import_file.rb

@@ -1,12 +1,13 @@
 class AgentImportFile < ActiveRecord::Base
-  attr_accessible :agent_import, :edit_mode
+  include Statesman::Adapters::ActiveRecordModel
   include ImportFile
-  default_scope :order => 'agent_import_files.id DESC'
-  scope :not_imported, where(:state => 'pending')
-  scope :stucked, where('created_at < ? AND state = ?', 1.hour.ago, 'pending')
+  attr_accessible :agent_import, :edit_mode, :user_encoding, :mode
+  default_scope {order('agent_import_files.id DESC')}
+  scope :not_imported, -> {in_state(:pending)}
+  scope :stucked, -> {in_state(:pending).where('created_at < ?', 1.hour.ago)}
 
   if Setting.uploaded_file.storage == :s3
-    has_attached_file :agent_import, :storage => :s3, :s3_credentials => "#{Rails.root.to_s}/config/s3.yml",
+    has_attached_file :agent_import, :storage => :s3, :s3_credentials => "#{Setting.amazon}",
       :s3_permissions => :private
   else
     has_attached_file :agent_import,
@@ -23,30 +24,19 @@ class AgentImportFile < ActiveRecord::Base
   belongs_to :user, :validate => true
   has_many :agent_import_results
 
-  state_machine :initial => :pending do
-    event :sm_start do
-      transition [:pending, :started] => :started
-    end
+  has_many :agent_import_file_transitions
 
-    event :sm_complete do
-      transition :started => :completed
-    end
+  enju_import_file_model
+  attr_accessor :mode
 
-    event :sm_fail do
-      transition :started => :failed
-    end
-
-    before_transition any => :started do |agent_import_file|
-      agent_import_file.executed_at = Time.zone.now
-    end
-
-    before_transition any => :completed do |agent_import_file|
-      agent_import_file.error_message = nil
-    end
+  def state_machine
+    AgentImportFileStateMachine.new(self, transition_class: AgentImportFileTransition)
   end
 
+  delegate :can_transition_to?, :transition_to!, :transition_to, :current_state,
+    to: :state_machine
+
   def import_start
-    sm_start!
     case edit_mode
     when 'create'
       import
@@ -60,9 +50,9 @@ class AgentImportFile < ActiveRecord::Base
   end
 
   def import
-    self.reload
+    transition_to!(:started)
     num = {:agent_imported => 0, :user_imported => 0, :failed => 0}
-    row_num = 2
+    row_num = 1
     rows = open_import_file
     field = rows.first
     if [field['first_name'], field['last_name'], field['full_name']].reject{|field| field.to_s.strip == ""}.empty?
@@ -71,6 +61,7 @@ class AgentImportFile < ActiveRecord::Base
     #rows.shift
 
     rows.each do |row|
+      row_num += 1
       next if row['dummy'].to_s.strip.present?
       import_result = AgentImportResult.create!(:agent_import_file_id => self.id, :body => row.fields.join("\t"))
 
@@ -100,15 +91,14 @@ class AgentImportFile < ActiveRecord::Base
       #end
 
       import_result.save!
-      row_num += 1
     end
     Sunspot.commit
     rows.close
-    sm_complete!
+    transition_to!(:completed)
     return num
   rescue => e
     self.error_message = "line #{row_num}: #{e.message}"
-    sm_fail!
+    transition_to!(:failed)
     raise e
   end
 
@@ -121,11 +111,12 @@ class AgentImportFile < ActiveRecord::Base
   end
 
   def modify
-    sm_start!
+    transition_to!(:started)
     rows = open_import_file
-    row_num = 2
+    row_num = 1
 
     rows.each do |row|
+      row_num += 1
       next if row['dummy'].to_s.strip.present?
       #user = User.where(:user_number => row['user_number'].to_s.strip).first
       #if user.try(:agent)
@@ -148,38 +139,43 @@ class AgentImportFile < ActiveRecord::Base
         agent.address_2 = row['address_2'] if row['address_2'].to_s.strip.present?
         agent.save!
       end
-      row_num += 1
     end
-    sm_complete!
+    transition_to!(:completed)
   rescue => e
     self.error_message = "line #{row_num}: #{e.message}"
-    sm_fail!
+    transition_to!(:failed)
     raise e
   end
 
   def remove
-    sm_start!
+    transition_to!(:started)
     rows = open_import_file
-    row_num = 2
+    row_num = 1
 
     rows.each do |row|
+      row_num += 1
       next if row['dummy'].to_s.strip.present?
       agent = Agent.where(:id => row['id'].to_s.strip).first
       if agent
+        agent.picture_files.destroy_all
+        agent.reload
         agent.destroy
       end
-      row_num += 1
     end
-    sm_complete!
+    transition_to!(:completed)
   rescue => e
     self.error_message = "line #{row_num}: #{e.message}"
-    sm_fail!
+    transition_to!(:failed)
     raise e
   end
 
   private
+  def self.transition_class
+    AgentImportFileTransition
+  end
+
   def open_import_file
-    tempfile = Tempfile.new('agent_import_file')
+    tempfile = Tempfile.new(self.class.name.underscore)
     if Setting.uploaded_file.storage == :s3
       uploaded_file_path = agent_import.expiring_url(10)
     else
@@ -187,16 +183,7 @@ class AgentImportFile < ActiveRecord::Base
     end
     open(uploaded_file_path){|f|
       f.each{|line|
-        if defined?(CharlockHolmes::EncodingDetector)
-          begin
-            string = line.encode('UTF-8', CharlockHolmes::EncodingDetector.detect(line)[:encoding], universal_newline: true)
-          rescue StandardError
-            string = NKF.nkf('-w -Lu', line)
-          end
-        else
-          string = NKF.nkf('-w -Lu', line)
-        end
-        tempfile.puts(string)
+        tempfile.puts(convert_encoding(line))
       }
     }
     tempfile.close
@@ -286,7 +273,6 @@ end
 #  user_id                   :integer
 #  note                      :text
 #  executed_at               :datetime
-#  state                     :string(255)
 #  agent_import_file_name    :string(255)
 #  agent_import_content_type :string(255)
 #  agent_import_file_size    :integer
@@ -296,5 +282,5 @@ end
 #  agent_import_fingerprint  :string(255)
 #  error_message             :text
 #  edit_mode                 :string(255)
+#  user_encoding             :string(255)
 #
-

data/app/models/agent_import_file_state_machine.rb

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

data/app/models/agent_import_file_transition.rb

@@ -0,0 +1,20 @@
+class AgentImportFileTransition < ActiveRecord::Base
+  include Statesman::Adapters::ActiveRecordTransition
+
+  
+  belongs_to :agent_import_file, inverse_of: :agent_import_file_transitions
+  attr_accessible :to_state, :sort_key, :metadata
+end
+
+# == Schema Information
+#
+# Table name: agent_import_file_transitions
+#
+#  id                   :integer          not null, primary key
+#  to_state             :string(255)
+#  metadata             :text             default("{}")
+#  sort_key             :integer
+#  agent_import_file_id :integer
+#  created_at           :datetime         not null
+#  updated_at           :datetime         not null
+#