kindai 2.6.0 → 2.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b895015c470172f22ceb220245b023e35b810d5d
-  data.tar.gz: 874f045e55b6606d1d01609985ce25b9ead0c930
+  metadata.gz: 8cf9e500aa2a37a7d5f47beb679c48a7d453f34a
+  data.tar.gz: 3918213cea5033faddd958e39b3dbc6e438a5f0a
 SHA512:
-  metadata.gz: 9932aad701113ffad984ff3f33d1c4c14699196ae2dda95aca18541026fd282587deef167b6e47261bbead14c5729abe86e448cf2b8724a22460b3b1360edfad
-  data.tar.gz: 752f010a0c184ed229564149f9b7ee5a8144b6833684d681525d2704f0649cc771fbcc783334cedacca59997e61cb269fa90837e075144dc7b582758ac64c46c
+  metadata.gz: 17c2f6379ab404154c112fd9d134146641eb8b4b732ca54ad99156ad97df2842ae41706d8e0c26fd0ae710ebee84daed55a156f448b0331820b53400cf65466a
+  data.tar.gz: a88dd14f6ece1e8c8f2e581bc40dc885f7681d06be0c427f2a863eb148651666fc54e201bb12012e21f06c37b3e6c859b1081d6035ab630fbdb51a367820f1d6

data/VERSION

@@ -1 +1 @@
-2.6.0
+2.7.0

data/kindai.gemspec

@@ -2,16 +2,16 @@
 # DO NOT EDIT THIS FILE DIRECTLY
 # Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
-# stub: kindai 2.6.0 ruby lib
+# stub: kindai 2.7.0 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "kindai"
-  s.version = "2.6.0"
+  s.version = "2.7.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib"]
   s.authors = ["hitode909"]
-  s.date = "2015-10-19"
+  s.date = "2016-02-15"
   s.description = "kindai.rb is kindai digital library downloader."
   s.email = "hitode909@gmail.com"
   s.executables = ["kindai.rb"]
@@ -43,6 +43,7 @@ Gem::Specification.new do |s|
     "lib/kindai/util/database.rb",
     "publish.rb",
     "spec/book_downloader_spec.rb",
+    "spec/book_downloader_with_book_with_slash_spec.rb",
     "spec/book_spec.rb",
     "spec/searcher_spec.rb",
     "spec/spec_helper.rb",

data/lib/kindai/book.rb

@@ -29,10 +29,35 @@ module Kindai
     end
 
     def title
-      main = metadata_like 'title'
+      base = "#{metadata_like 'title'}#{volume_number}"
 
-      sub = metadata_like('volumeTranscription').to_i.to_s rescue nil
-      sub ? main + sub : main
+      if edition
+        base += "(#{edition})"
+      end
+
+      base
+    end
+
+    def volume_number
+      # 0036 とか
+      begin
+        return metadata_like('volumeTranscription').to_i
+      rescue
+      end
+
+      # 第36巻 とか
+      begin
+        return metadata_like('volume').scan(/\d+/).first.to_i
+      rescue
+      end
+
+      nil
+    end
+
+    def edition
+      return metadata_like('edition')
+    rescue
+      nil
     end
 
     def author
@@ -40,7 +65,7 @@ module Kindai
     rescue
       alt_author
     end
-    
+
     def alt_author
       metadata_like 'creator'
     rescue

data/lib/kindai/book_downloader.rb

@@ -22,8 +22,12 @@ module Kindai
       return true
     end
 
+    def safe_filename filename
+      filename.gsub(File::SEPARATOR, '_')
+    end
+
     def book_path
-      path = File.join(self.base_path, [@book.author, @book.title].compact.join(' - '))
+      path = File.join(self.base_path, safe_filename([@book.author, @book.title].compact.join(' - ')))
       File.expand_path path
     end
 

data/spec/book_downloader_with_book_with_slash_spec.rb

@@ -0,0 +1,24 @@
+# -*- coding: utf-8 -*-
+require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
+
+describe Kindai::BookDownloader, 'with book which contains slash in title' do
+  before do
+    @book = Kindai::Book.new_from_permalink('http://kindai.ndl.go.jp/info:ndljp/pid/1057420')
+    @downloader   = Kindai::BookDownloader.new_from_book(@book)
+  end
+
+  describe 'safe_filename' do
+    it 'convert path separator to _' do
+      @downloader.safe_filename('a/b').should == 'a_b'
+      @downloader.safe_filename('a/b/c/d').should == 'a_b_c_d'
+    end
+  end
+
+  it 'has base path' do
+    @downloader.base_path = "/path/to/library"
+    @downloader.book_path.should == "/path/to/library/BMW航空発動機会社 [著]三菱商事株式会社機械部 訳編 - BMW132Dc_1型発動機部品表"
+  end
+end
+
+
+

data/spec/book_spec.rb

@@ -14,6 +14,10 @@ describe Kindai::Book do
     @book.title.should == '正義の叫'
   end
 
+  it "doesn't have volume number" do
+    @book.volume_number.should be_nil
+  end
+
   it 'has total spread' do
     @book.total_spread.should == 20
   end
@@ -33,7 +37,46 @@ describe Kindai::Book, 'with series' do
     @book = Kindai::Book.new_from_permalink('http://kindai.da.ndl.go.jp/info:ndljp/pid/890078')
   end
 
+  it 'has volume number' do
+    @book.volume_number.should == 3
+  end
+
   it 'has title' do
     @book.title.should == '講談日露戦争記3'
   end
 end
+
+describe Kindai::Book, 'with volume' do
+  before do
+    @book = Kindai::Book.new_from_permalink('http://kindai.ndl.go.jp/info:ndljp/pid/941439')
+  end
+
+  it 'has volume number' do
+    @book.volume_number.should == 36
+  end
+
+  it 'has title' do
+    @book.title.should == '漢籍国字解全書 : 先哲遺著追補36'
+  end
+end
+
+describe Kindai::Book, 'with edition' do
+  before do
+    @book1 = Kindai::Book.new_from_permalink('http://kindai.ndl.go.jp/info:ndljp/pid/951217')
+    @book2 = Kindai::Book.new_from_permalink('http://kindai.ndl.go.jp/info:ndljp/pid/951218')
+    @book3 = Kindai::Book.new_from_permalink('http://kindai.ndl.go.jp/info:ndljp/pid/951219')
+  end
+
+  it 'has edition' do
+    @book1.edition.should == nil
+    @book2.edition.should == '補再版'
+    @book3.edition.should == '補3版'
+  end
+
+  it 'appends edition to title' do
+    @book1.title.should == '千山万岳'
+    @book2.title.should == '千山万岳(補再版)'
+    @book3.title.should == '千山万岳(補3版)'
+  end
+
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kindai
 version: !ruby/object:Gem::Version
-  version: 2.6.0
+  version: 2.7.0
 platform: ruby
 authors:
 - hitode909
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-19 00:00:00.000000000 Z
+date: 2016-02-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
@@ -140,6 +140,7 @@ files:
 - lib/kindai/util/database.rb
 - publish.rb
 - spec/book_downloader_spec.rb
+- spec/book_downloader_with_book_with_slash_spec.rb
 - spec/book_spec.rb
 - spec/searcher_spec.rb
 - spec/spec_helper.rb