enju_resource_merge 0.0.4 → 0.0.5

data/app/controllers/series_statement_merges_controller.rb

@@ -31,8 +31,10 @@ class SeriesStatementMergesController < ApplicationController
   # GET /series_statement_merges/new
   # GET /series_statement_merges/new.json
   def new
-    @series_statement_merge = SeriesStatementMerge.new
-    @series_statement_merge.series_statement = @series_statement
+    @series_statement_merge = SeriesStatementMerge.new(
+      :series_statement => @series_statement,
+      :series_statement_merge_list => @series_statement_merge_list
+    )
 
     respond_to do |format|
       format.html # new.html.erb
@@ -86,9 +88,4 @@ class SeriesStatementMergesController < ApplicationController
       format.json { head :ok }
     end
   end
-
-  private
-  def get_series_statement_merge_list
-    @series_statement_merge_list = SeriesStatementMerge_list.find(params[:series_statement_merge_list_id]) if params[:series_statement_merge_list_id]
-  end
 end

data/app/models/series_statement_merge_list.rb

@@ -8,8 +8,14 @@ class SeriesStatementMergeList < ActiveRecord::Base
   end
 
   def merge_series_statements(selected_series_statement)
-    self.series_statements.each do |series_statement|
-      series_statement.destroy unless series_statement == selected_series_statement
+    series_statements.each do |series_statement|
+      unless series_statement == selected_series_statement
+        series_statement.manifestations.each do |manifestation|
+          manifestation.series_statement = selected_series_statement
+          manifestation.save!
+        end
+        series_statement.destroy
+      end
     end
   end
 end

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

@@ -7,7 +7,7 @@
   <div class="field">
     <%= f.label t('activerecord.models.series_statement') -%><br />
     <%- if @series_statement -%>
-      <%= link_to @series_statement.full_name, @series_statement -%>
+      <%= link_to @series_statement.original_title, @series_statement -%>
       <%= f.hidden_field :series_statement_id -%>
     <%- else -%>
       <%= f.text_field :series_statement_id -%>

data/lib/enju_resource_merge/engine.rb

@@ -5,6 +5,7 @@ require 'attribute_normalizer'
 require 'will_paginate'
 require 'sunspot_rails'
 require 'dynamic_form'
+require 'acts_as_list'
 
 module EnjuResourceMerge
   class Engine < Rails::Engine

data/lib/enju_resource_merge/version.rb

@@ -1,3 +1,3 @@
 module EnjuResourceMerge
-  VERSION = "0.0.4"
+  VERSION = "0.0.5"
 end

data/spec/controllers/series_statement_merges_controller_spec.rb

@@ -4,10 +4,6 @@ describe SeriesStatementMergesController do
   fixtures :all
 
   describe "GET index" do
-    before(:each) do
-      FactoryGirl.create(:series_statement_merge)
-    end
-
     describe "When logged in as Administrator" do
       login_admin
 

data/spec/dummy/app/controllers/application_controller.rb

@@ -69,6 +69,10 @@ class ApplicationController < ActionController::Base
   def get_patron_merge_list
     @patron_merge_list = PatronMergeList.find(params[:patron_merge_list_id]) if params[:patron_merge_list_id]
   end
+
+  def get_series_statement_merge_list
+    @series_statement_merge_list = SeriesStatementMergeList.find(params[:series_statement_merge_list_id]) if params[:series_statement_merge_list_id]
+  end
 end
 
 class InvalidLocaleError < StandardError

data/spec/dummy/app/models/manifestation.rb

@@ -1,55 +1,14 @@
 class Manifestation < ActiveRecord::Base
   scope :periodical_master, where(:periodical => false)
   scope :periodical_children, where(:periodical => true)
-  has_many :creates, :dependent => :destroy, :foreign_key => 'work_id'
-  has_many :creators, :through => :creates, :source => :patron
-  has_many :realizes, :dependent => :destroy, :foreign_key => 'expression_id'
-  has_many :contributors, :through => :realizes, :source => :patron
-  has_many :produces, :dependent => :destroy, :foreign_key => 'manifestation_id'
-  has_many :publishers, :through => :produces, :source => :patron
-  has_many :exemplifies, :foreign_key => 'manifestation_id'
-  has_many :items, :through => :exemplifies #, :foreign_key => 'manifestation_id'
-  has_many :children, :foreign_key => 'parent_id', :class_name => 'ManifestationRelationship', :dependent => :destroy
-  has_many :parents, :foreign_key => 'child_id', :class_name => 'ManifestationRelationship', :dependent => :destroy
-  has_many :derived_manifestations, :through => :children, :source => :child
-  has_many :original_manifestations, :through => :parents, :source => :parent
-  if defined?(EnjuBookmark)
-    has_many :bookmarks, :include => :tags, :dependent => :destroy, :foreign_key => :manifestation_id
-    has_many :users, :through => :bookmarks
-  end
-  if defined?(EnjuCirculation)
-    has_many :reserves, :foreign_key => :manifestation_id
-  end
-  has_many :picture_files, :as => :picture_attachable, :dependent => :destroy
-  belongs_to :language
-  belongs_to :carrier_type
-  belongs_to :content_type
   has_one :series_has_manifestation, :dependent => :destroy
   has_one :series_statement, :through => :series_has_manifestation
-  belongs_to :manifestation_relationship_type
-  belongs_to :frequency
   belongs_to :required_role, :class_name => 'Role', :foreign_key => 'required_role_id', :validate => true
-  has_one :resource_import_result
 
-  validates_presence_of :original_title, :carrier_type, :language
-  validates_associated :carrier_type, :language
-  validates :start_page, :numericality => true, :allow_blank => true
-  validates :end_page, :numericality => true, :allow_blank => true
+  validates_presence_of :original_title
   validates :isbn, :uniqueness => true, :allow_blank => true, :unless => proc{|manifestation| manifestation.series_statement}
   validates :nbn, :uniqueness => true, :allow_blank => true
-  validates :identifier, :uniqueness => true, :allow_blank => true
-  validates :pub_date, :format => {:with => /^\d+(-\d{0,2}){0,2}$/}, :allow_blank => true
-  validates :access_address, :url => true, :allow_blank => true, :length => {:maximum => 255}
-  validate :check_isbn, :check_issn, :check_lccn, :unless => :during_import
-  validates :issue_number, :numericality => {:greater_than => 0}, :allow_blank => true
-  validates :volume_number, :numericality => {:greater_than => 0}, :allow_blank => true
-  validates :serial_number, :numericality => {:greater_than => 0}, :allow_blank => true
-  validates :edition, :numericality => {:greater_than => 0}, :allow_blank => true
-  before_validation :set_wrong_isbn, :check_issn, :check_lccn, :if => :during_import
-  before_validation :convert_isbn, :if => :isbn_changed?
-  before_create :set_digest
-  after_create :clear_cached_numdocs
-  before_save :set_date_of_publication
+  validates :manifestation_identifier, :uniqueness => true, :allow_blank => true
   before_save :set_periodical
   after_save :index_series_statement
   after_destroy :index_series_statement
@@ -60,40 +19,6 @@ class Manifestation < ActiveRecord::Base
     10
   end
 
-  def check_isbn
-    if isbn.present?
-      unless ISBN_Tools.is_valid?(isbn)
-        errors.add(:isbn)
-      end
-    end
-  end
-
-  def check_issn
-    self.issn = ISBN_Tools.cleanup(issn)
-    if issn.present?
-      unless StdNum::ISSN.valid?(issn)
-        errors.add(:issn)
-      end
-    end
-  end
-
-  def check_lccn
-    if lccn.present?
-      unless StdNum::LCCN.valid?(issn)
-        errors.add(:issn)
-      end
-    end
-  end
-
-  def set_wrong_isbn
-    if isbn.present?
-      unless ISBN_Tools.is_valid?(isbn)
-        self.wrong_isbn
-        self.isbn = nil
-      end
-    end
-  end
-
   def convert_isbn
     num = ISBN_Tools.cleanup(isbn) if isbn
     if num
@@ -106,72 +31,10 @@ class Manifestation < ActiveRecord::Base
     end
   end
 
-  def set_date_of_publication
-    return if pub_date.blank?
-    begin
-      date = Time.zone.parse("#{pub_date}")
-    rescue ArgumentError
-      begin
-        date = Time.zone.parse("#{pub_date}-01")
-      rescue ArgumentError
-        begin
-          date = Time.zone.parse("#{pub_date}-01-01")
-        rescue ArgumentError
-          nil
-        end
-      end
-    end
-    self.date_of_publication = date
-  end
-
   def parent_of_series
     original_manifestations
   end
 
-  def serial?
-    if new_record?
-      if SeriesStatement.where(:id => series_statement_id).first.try(:periodical)
-        return true
-      end
-    else
-      if series_statement.try(:periodical)
-        return true
-      elsif periodical
-        return true unless series_statement.root_manifestation == self
-      end
-    end
-    false
-  end
-
-  def number_of_pages
-    if self.start_page and self.end_page
-      page = self.end_page.to_i - self.start_page.to_i + 1
-    end
-  end
-
-  def titles
-    title = []
-    title << original_title.to_s.strip
-    title << title_transcription.to_s.strip
-    title << title_alternative.to_s.strip
-    title << series_statement.titles if series_statement
-    #title << original_title.wakati
-    #title << title_transcription.wakati rescue nil
-    #title << title_alternative.wakati rescue nil
-    title.flatten
-  end
-
-  def url
-    #access_address
-    "#{LibraryGroup.site_config.url}#{self.class.to_s.tableize}/#{self.id}"
-  end
-
-  def available_checkout_types(user)
-    if user
-      user.user_group.user_group_has_checkout_types.available_for_carrier_type(self.carrier_type)
-    end
-  end
-
   def set_serial_information
     return nil unless serial?
     if new_record?
@@ -208,74 +71,6 @@ class Manifestation < ActiveRecord::Base
     self
   end
 
-  def creator
-    creators.collect(&:name).flatten
-  end
-
-  def contributor
-    contributors.collect(&:name).flatten
-  end
-
-  def publisher
-    publishers.collect(&:name).flatten
-  end
-
-  def title
-    titles
-  end
-
-  def hyphenated_isbn
-    ISBN_Tools.hyphenate(isbn)
-  end
-
-  # TODO: よりよい推薦方法
-  def self.pickup(keyword = nil)
-    return nil if self.cached_numdocs < 5
-    manifestation = nil
-    # TODO: ヒット件数が0件のキーワードがあるときに指摘する
-    response = Manifestation.search(:include => [:creators, :contributors, :publishers, :subjects, :items]) do
-      fulltext keyword if keyword
-      order_by(:random)
-      paginate :page => 1, :per_page => 1
-    end
-    manifestation = response.results.first
-  end
-
-  def set_digest(options = {:type => 'sha1'})
-    if attachment.queued_for_write[:original]
-      if File.exists?(attachment.queued_for_write[:original])
-        self.file_hash = Digest::SHA1.hexdigest(File.open(attachment.queued_for_write[:original].path, 'rb').read)
-      end
-    end
-  end
-
-  def extract_text
-    extractor = ExtractContent::Extractor.new
-    text = Tempfile::new("text")
-    case self.attachment_content_type
-    when "application/pdf"
-      system("pdftotext -q -enc UTF-8 -raw #{attachment(:path)} #{text.path}")
-      self.fulltext = text.read
-    when "application/msword"
-      system("antiword #{attachment(:path)} 2> /dev/null > #{text.path}")
-      self.fulltext = text.read
-    when "application/vnd.ms-excel"
-      system("xlhtml #{attachment(:path)} 2> /dev/null > #{text.path}")
-      self.fulltext = extractor.analyse(text.read)
-    when "application/vnd.ms-powerpoint"
-      system("ppthtml #{attachment(:path)} 2> /dev/null > #{text.path}")
-      self.fulltext = extractor.analyse(text.read)
-    when "text/html"
-      # TODO: 日本語以外
-      system("w3m -dump #{attachment(:path)} 2> /dev/null | nkf -w > #{text.path}")
-      self.fulltext = extractor.analyse(text.read)
-    end
-
-    #self.indexed_at = Time.zone.now
-    save(:validate => false)
-    text.close
-  end
-
   def created(patron)
     creates.where(:patron_id => patron.id).first
   end
@@ -288,33 +83,10 @@ class Manifestation < ActiveRecord::Base
     produces.where(:patron_id => patron.id).first
   end
 
-  def sort_title
-    NKF.nkf('-w --katakana', title_transcription) if title_transcription
-  end
-
-  def web_item
-    items.where(:shelf_id => Shelf.web.id).first
-  end
-
-  def self.find_by_isbn(isbn)
-    if ISBN_Tools.is_valid?(isbn)
-      ISBN_Tools.cleanup!(isbn)
-      if isbn.size == 10
-        Manifestation.where(:isbn => ISBN_Tools.isbn10_to_isbn13(isbn)).first || Manifestation.where(:isbn => isbn).first
-      else
-        Manifestation.where(:isbn => isbn).first || Manifestation.where(:isbn => ISBN_Tools.isbn13_to_isbn10(isbn)).first
-      end
-    end
-  end
-
   def index_series_statement
     series_statement.try(:index)
   end
 
-  def acquired_at
-    items.order(:acquired_at).first.try(:acquired_at)
-  end
-
   def set_periodical
     unless series_statement
       series_statement = SeriesStatement.where(:id => series_statement_id).first

data/spec/fixtures/series_statements.yml

@@ -10,6 +10,11 @@ two:
   original_title: title2
   position: 2
 
+three:
+  id: 3
+  original_title: title3
+  position: 3
+
 
 
 # == Schema Information

data/spec/models/series_statement_merge_list_spec.rb

@@ -1,11 +1,12 @@
 require 'spec_helper'
 
 describe SeriesStatementMergeList do
-  fixtures :series_statements
+  fixtures :all
 
   it "should merge series_statment" do
-    series_statement_merge_list = FactoryGirl.create(:series_statement_merge_list)
-    series_statement_merge_list.merge_series_statements(SeriesStatement.all).should be_true
+    series_statement_merge_list = series_statement_merge_lists(:series_statement_merge_list_00001)
+    series_statement_merge_list.merge_series_statements(SeriesStatement.find(1)).should be_true
+    Manifestation.find(2).series_statement.id.should eq 1
   end
 end
 

data/spec/spec_helper.rb

@@ -27,6 +27,18 @@ RSpec.configure do |config|
   config.use_transactional_fixtures = true
 
   config.extend ControllerMacros, :type => :controller
+
+  $original_sunspot_session = Sunspot.session
+
+  config.before do
+    Sunspot.session = Sunspot::Rails::StubSessionProxy.new($original_sunspot_session)
+  end
+
+  config.before :each, :solr => true do
+    Sunspot::Rails::Tester.start_original_sunspot_session
+    Sunspot.session = $original_sunspot_session
+    #Sunspot.remove_all!
+  end
 end
 
 FactoryGirl.definition_file_paths << "#{::Rails.root}/../../spec/factories"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: enju_resource_merge
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-02-24 00:00:00.000000000 Z
+date: 2012-02-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &70287241142000 !ruby/object:Gem::Requirement
+  requirement: &70339189830760 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: '3.1'
   type: :runtime
   prerelease: false
-  version_requirements: *70287241142000
+  version_requirements: *70339189830760
 - !ruby/object:Gem::Dependency
   name: will_paginate
-  requirement: &70287241141500 !ruby/object:Gem::Requirement
+  requirement: &70339189830260 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,21 @@ dependencies:
         version: '3.0'
   type: :runtime
   prerelease: false
-  version_requirements: *70287241141500
+  version_requirements: *70339189830260
+- !ruby/object:Gem::Dependency
+  name: acts_as_list
+  requirement: &70339189829800 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.1.5
+  type: :runtime
+  prerelease: false
+  version_requirements: *70339189829800
 - !ruby/object:Gem::Dependency
   name: devise
-  requirement: &70287241141100 !ruby/object:Gem::Requirement
+  requirement: &70339189829420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +54,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70287241141100
+  version_requirements: *70339189829420
 - !ruby/object:Gem::Dependency
   name: cancan
-  requirement: &70287241140640 !ruby/object:Gem::Requirement
+  requirement: &70339189828960 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +65,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70287241140640
+  version_requirements: *70339189828960
 - !ruby/object:Gem::Dependency
   name: inherited_resources
-  requirement: &70287241140220 !ruby/object:Gem::Requirement
+  requirement: &70339189828540 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +76,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70287241140220
+  version_requirements: *70339189828540
 - !ruby/object:Gem::Dependency
   name: attribute_normalizer
-  requirement: &70287241139720 !ruby/object:Gem::Requirement
+  requirement: &70339189828040 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -76,10 +87,10 @@ dependencies:
         version: '1.1'
   type: :runtime
   prerelease: false
-  version_requirements: *70287241139720
+  version_requirements: *70339189828040
 - !ruby/object:Gem::Dependency
   name: sunspot_rails
-  requirement: &70287241139300 !ruby/object:Gem::Requirement
+  requirement: &70339189827620 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +98,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70287241139300
+  version_requirements: *70339189827620
 - !ruby/object:Gem::Dependency
   name: sunspot_solr
-  requirement: &70287241138840 !ruby/object:Gem::Requirement
+  requirement: &70339189827160 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,10 +109,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70287241138840
+  version_requirements: *70339189827160
 - !ruby/object:Gem::Dependency
   name: dynamic_form
-  requirement: &70287241138420 !ruby/object:Gem::Requirement
+  requirement: &70339189826740 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -109,21 +120,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70287241138420
-- !ruby/object:Gem::Dependency
-  name: acts_as_list
-  requirement: &70287241137920 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 0.1.5
-  type: :runtime
-  prerelease: false
-  version_requirements: *70287241137920
+  version_requirements: *70339189826740
 - !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: &70287241137500 !ruby/object:Gem::Requirement
+  requirement: &70339189826320 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -131,10 +131,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70287241137500
+  version_requirements: *70339189826320
 - !ruby/object:Gem::Dependency
   name: rspec-rails
-  requirement: &70287241137040 !ruby/object:Gem::Requirement
+  requirement: &70339189825900 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -142,10 +142,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70287241137040
+  version_requirements: *70339189825900
 - !ruby/object:Gem::Dependency
   name: factory_girl_rails
-  requirement: &70287241136540 !ruby/object:Gem::Requirement
+  requirement: &70339189841780 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -153,7 +153,18 @@ dependencies:
         version: '1.7'
   type: :development
   prerelease: false
-  version_requirements: *70287241136540
+  version_requirements: *70339189841780
+- !ruby/object:Gem::Dependency
+  name: sunspot-rails-tester
+  requirement: &70339189841360 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: *70339189841360
 description: Merge resource records for Next-L Enju
 email:
 - tanabe@mwr.mediacom.keio.ac.jp
@@ -248,6 +259,7 @@ files:
 - spec/dummy/config/locales/en.yml
 - spec/dummy/config/routes.rb
 - spec/dummy/config.ru
+- spec/dummy/db/development.sqlite3
 - spec/dummy/db/migrate/001_create_patrons.rb
 - spec/dummy/db/migrate/005_create_manifestations.rb
 - spec/dummy/db/migrate/006_create_items.rb
@@ -271,7 +283,6 @@ files:
 - spec/dummy/db/schema.rb
 - spec/dummy/db/test.sqlite3
 - spec/dummy/lib/url_validator.rb
-- spec/dummy/log/test.log
 - spec/dummy/public/404.html
 - spec/dummy/public/422.html
 - spec/dummy/public/500.html
@@ -387,6 +398,7 @@ test_files:
 - spec/dummy/config/locales/en.yml
 - spec/dummy/config/routes.rb
 - spec/dummy/config.ru
+- spec/dummy/db/development.sqlite3
 - spec/dummy/db/migrate/001_create_patrons.rb
 - spec/dummy/db/migrate/005_create_manifestations.rb
 - spec/dummy/db/migrate/006_create_items.rb
@@ -410,7 +422,6 @@ test_files:
 - spec/dummy/db/schema.rb
 - spec/dummy/db/test.sqlite3
 - spec/dummy/lib/url_validator.rb
-- spec/dummy/log/test.log
 - spec/dummy/public/404.html
 - spec/dummy/public/422.html
 - spec/dummy/public/500.html