enju_trunk_frbr 1.0.0 → 1.1.0

data/Rakefile

@@ -27,14 +27,6 @@ load 'rails/tasks/engine.rake'
 
 Bundler::GemHelper.install_tasks
 
-require 'rake/testtask'
-
-Rake::TestTask.new(:test) do |t|
-  t.libs << 'lib'
-  t.libs << 'test'
-  t.pattern = 'test/**/*_test.rb'
-  t.verbose = false
-end
-
-
-task :default => :test
+require 'rspec/core/rake_task'
+RSpec::Core::RakeTask.new(:spec)
+task :default => :spec

data/app/models/create_type.rb

@@ -0,0 +1,19 @@
+class CreateType < ActiveRecord::Base
+  attr_accessible :name, :display_name, :note, :position
+  include MasterModel
+  default_scope :order => 'create_types.position'
+end
+
+# == Schema Information
+#
+# Table name: create_types
+#
+#  id           :integer          not null, primary key
+#  name         :string(255)
+#  display_name :text
+#  note         :text
+#  position     :integer
+#  created_at   :datetime         not null
+#  updated_at   :datetime         not null
+#
+

data/app/models/exemplify.rb

@@ -7,7 +7,7 @@ class Exemplify < ActiveRecord::Base
   validates_uniqueness_of :item_id
   after_save :reindex
   after_destroy :reindex
-  after_create :create_lending_policy
+  after_create :create_lending_policy, :unless => proc{SystemConfiguration.isWebOPAC}
 
   acts_as_list :scope => :manifestation_id
 

data/app/models/item.rb

@@ -1,21 +1,46 @@
 # -*- encoding: utf-8 -*-
 class Item < ActiveRecord::Base
   scope :recent, where(['items.created_at >= ?', Time.zone.now.months_ago(1)])
-  has_one :exemplify
+  has_one :exemplify, :dependent => :destroy
   has_one :manifestation, :through => :exemplify
 
   validates :item_identifier, :allow_blank => true, :uniqueness => true, :format => {:with => /\A[0-9A-Za-z_]+\Z/}
   validates :url, :url => true, :allow_blank => true, :length => {:maximum => 255}
+  validate :check_acquired_at_string
   validates_date :acquired_at, :allow_blank => true
 
   normalize_attributes :item_identifier
 
+  before_save :set_acquired_at
   attr_accessor :library_id, :manifestation_id, :use_restriction_id
 
   def title
     manifestation.try(:original_title)
   end
 
+  def check_acquired_at_string
+    return if self.acquired_at_string.blank?
+    case self.acquired_at_string
+    when /^\d{4}(0[1-9]|1[0-2])(0[1-9]|[12]\d|3[01]$)|^\d{4}-(0?[1-9]|1[0-2])-(0?[1-9]|[12]\d|3[01])$/
+      dates = self.acquired_at_string =~ /^\d{8}$/ ? ["#{self.acquired_at_string[0..3]}", "#{self.acquired_at_string[4..5]}", "#{self.acquired_at_string[6..7]}"] : self.acquired_at_string.split('-')
+      date = Time.zone.parse(self.acquired_at_string) rescue nil
+      if date
+        dates[1] = "0#{dates[1]}" if dates[1].match(/^[1-9]$/)
+        dates[2] = "0#{dates[2]}" if dates[2].match(/^[1-9]$/)
+        if date.strftime("%m") == dates[1]
+          self.acquired_at_string = dates.join('-'); return
+        end
+      end
+    when /^\d{4}-(0?[1-9]|1[0-2])$/
+      dates = self.acquired_at_string.split('-')
+      dates[1] = "0#{dates[1]}" if dates[1].match(/^[1-9]$/)
+      self.acquired_at_string = dates.join('-'); return
+    when /^\d{4}$/
+      return
+    end
+    errors.add(:acquired_at_string)
+  end
+
   def select_acquired_at
     if self.acquired_at
       return self.acquired_at.strftime("%Y%m")
@@ -24,6 +49,26 @@ class Item < ActiveRecord::Base
     end
   end
 
+  def set_acquired_at
+    return if acquired_at_string.blank?
+    begin
+      date = Time.zone.parse("#{acquired_at_string}")
+    rescue ArgumentError
+      begin
+        date = Time.zone.parse("#{acquired_at_string}-01")
+        date = date.end_of_month
+      rescue ArgumentError
+        begin
+          date = Time.zone.parse("#{acquired_at_string}-12-01")
+          date = date.end_of_month
+        rescue ArgumentError
+          nil
+        end
+      end
+    end
+    self.acquired_at = date
+  end
+
   private
   def self.to_format(num)
     num.to_s.gsub(/(\d)(?=(\d{3})+(?!\d))/, '\1,')

data/app/models/manifestation.rb

@@ -1,3 +1,4 @@
+# encoding: utf-8
 class Manifestation < ActiveRecord::Base
   scope :periodical_master, where(:periodical_master => true)
   scope :periodical_children, where(:periodical_master => false)
@@ -13,7 +14,7 @@ class Manifestation < ActiveRecord::Base
   belongs_to :manifestation_relationship_type
 
   validates_presence_of :original_title
-  validates :isbn, :uniqueness => true, :allow_blank => true, :unless => proc{|manifestation| manifestation.series_statement}
+  validates :isbn, :uniqueness => true, :allow_blank => true, :unless => proc{ |manifestation| manifestation.series_statement }, :if => proc{ SystemConfiguration.get("manifestation.isbn_unique") }
   validates :nbn, :uniqueness => true, :allow_blank => true
   validates :identifier, :uniqueness => true, :allow_blank => true
   validates :access_address, :url => true, :allow_blank => true, :length => {:maximum => 255}
@@ -121,15 +122,16 @@ class Manifestation < ActiveRecord::Base
 
   def set_date_of_publication
     return if pub_date.blank?
+    date = pub_date.gsub(/(\.|\,|\/)/, '-')
     begin
-      date = Time.zone.parse("#{pub_date}")
+      date = Time.zone.parse("#{date}")
     rescue ArgumentError
       begin
-        date = Time.zone.parse("#{pub_date}-01")
+        date = Time.zone.parse("#{date}-01")
         date = date.end_of_month
       rescue ArgumentError
         begin
-          date = Time.zone.parse("#{pub_date}-12-01")
+          date = Time.zone.parse("#{date}-12-01")
           date = date.end_of_month
         rescue ArgumentError
           nil
@@ -140,7 +142,11 @@ class Manifestation < ActiveRecord::Base
   end
 
   def self.cached_numdocs
-    Rails.cache.fetch("manifestation_search_total"){Manifestation.search.total}
+    Rails.cache.fetch("manifestation_search_total"){ 
+      Manifestation.search do
+        with(:periodical_master, false)
+      end.total
+    }
   end
 
   def clear_cached_numdocs
@@ -153,8 +159,10 @@ class Manifestation < ActiveRecord::Base
 
   def number_of_pages
     if self.start_page and self.end_page
-      if self.start_page.to_s.match(/\D/).nil? and self.end_page.to_s.match(/\D/).nil?
-        page = self.end_page.to_i - self.start_page.to_i + 1
+      if self.start_page.present? and self.end_page.present?
+        if self.start_page.to_s.match(/\D/).nil? and self.end_page.to_s.match(/\D/).nil?
+          page = self.end_page.to_i - self.start_page.to_i + 1
+        end
       end
     end
   end
@@ -171,16 +179,28 @@ class Manifestation < ActiveRecord::Base
   end
 
   def set_new_serial_number
-    self.serial_number = self.serial_number_string.gsub(/\D/, "").to_i if self.serial_number_string rescue nil
+    if self.serial_number_string.blank? or self.serial_number_string.tr('０-９','0-9').match(/\D/)
+      self.serial_number = nil
+    else
+      self.serial_number = self.serial_number_string.tr('０-９','0-9').to_i
+    end
   end
 
   def set_volume_issue_number
-    self.volume_number = (self.volume_number_string.gsub(/\D/, "")).to_i if self.volume_number_string rescue nil
-    self.issue_number = self.issue_number_string.gsub(/\D/, "").to_i if self.issue_number_string rescue nil     
-
-    if self.volume_number && self.volume_number.to_s.length > 9
+    if self.volume_number_string.blank? or self.volume_number_string.tr('０-９','0-9').match(/\D/)
       self.volume_number = nil
+    else
+      self.volume_number = self.volume_number_string.tr('０-９','0-9').to_i 
+    end
+
+    if self.issue_number_string.blank? or self.issue_number_string.tr('０-９','0-9').match(/\D/)
+      self.issue_number = nil
+    else
+      self.issue_number = self.issue_number_string.tr('０-９','0-9').to_i
     end
+    #if self.volume_number && self.volume_number.to_s.length > 9
+    #  self.volume_number = nil
+    #end
   end
 
   def title

data/app/models/produce_type.rb

@@ -0,0 +1,19 @@
+class ProduceType < ActiveRecord::Base
+  attr_accessible :name, :display_name, :note, :position
+  include MasterModel
+  default_scope :order => 'produce_types.position'
+end
+
+# == Schema Information
+#
+# Table name: produce_types
+#
+#  id           :integer          not null, primary key
+#  name         :string(255)
+#  display_name :text
+#  note         :text
+#  position     :integer
+#  created_at   :datetime         not null
+#  updated_at   :datetime         not null
+#
+

data/app/models/realize_type.rb

@@ -0,0 +1,19 @@
+class RealizeType < ActiveRecord::Base
+  attr_accessible :name, :display_name, :note, :position
+  include MasterModel
+  default_scope :order => 'realize_types.position'
+end
+
+# == Schema Information
+#
+# Table name: realize_types
+#
+#  id           :integer          not null, primary key
+#  name         :string(255)
+#  display_name :text
+#  note         :text
+#  position     :integer
+#  created_at   :datetime         not null
+#  updated_at   :datetime         not null
+#
+

data/lib/enju_trunk_frbr/engine.rb

@@ -1,5 +1,12 @@
+require 'validates_timeliness'
+require 'kaminari'
+
 module EnjuTrunkFrbr
   class Engine < ::Rails::Engine
     isolate_namespace EnjuTrunkFrbr
+    config.generators do |g|
+      g.test_framework :rspec
+      g.integration_tool :rspec
+    end
   end
 end

data/lib/enju_trunk_frbr/version.rb

@@ -1,3 +1,3 @@
 module EnjuTrunkFrbr
-  VERSION = "1.0.0"
+  VERSION = "1.1.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: enju_trunk_frbr
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-24 00:00:00.000000000 Z
+date: 2013-07-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -50,7 +50,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -58,7 +58,39 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: '2.0'
+- !ruby/object:Gem::Dependency
+  name: enju_core
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: validates_timeliness
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
@@ -116,22 +148,25 @@ extra_rdoc_files: []
 files:
 - app/assets/stylesheets/enju_trunk_frbr/application.css
 - app/assets/javascripts/enju_trunk_frbr/application.js
-- app/controllers/enju_trunk_frbr/application_controller.rb
 - app/helpers/enju_trunk_frbr/application_helper.rb
+- app/controllers/enju_trunk_frbr/application_controller.rb
 - app/views/layouts/enju_trunk_frbr/application.html.erb
-- app/models/exemplify.rb
+- app/models/create_type.rb
+- app/models/produce_type.rb
+- app/models/produce.rb
 - app/models/manifestation.rb
+- app/models/exemplify.rb
 - app/models/realize.rb
-- app/models/manifestation_relationship_type.rb
 - app/models/create.rb
-- app/models/manifestation_relationship.rb
-- app/models/produce.rb
+- app/models/realize_type.rb
 - app/models/item.rb
+- app/models/manifestation_relationship.rb
+- app/models/manifestation_relationship_type.rb
 - config/routes.rb
 - lib/tasks/enju_trunk_frbr_tasks.rake
-- lib/enju_trunk_frbr.rb
-- lib/enju_trunk_frbr/engine.rb
 - lib/enju_trunk_frbr/version.rb
+- lib/enju_trunk_frbr/engine.rb
+- lib/enju_trunk_frbr.rb
 - MIT-LICENSE
 - Rakefile
 - README.rdoc
@@ -149,7 +184,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -4230465122048120083
+      hash: 3283277806184863409
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -158,7 +193,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -4230465122048120083
+      hash: 3283277806184863409
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23