sist02 0.3.1 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2d64c931b843408724f21c5a8928d4ca5b551a9d
-  data.tar.gz: dad112aaad585dc30a2d26d48399b98fd8b70bd0
+  metadata.gz: ac92de232990d6691dde4e19ab925239359835bd
+  data.tar.gz: 8760f071ea9644fe57dbc0c0ef2940f7e508e6c1
 SHA512:
-  metadata.gz: 6ea6887bce7b60cc062bff943707559e798815d6d98bea021ea87150741bb0350d44178559560f514168e7599c98ccd706637641f78ddc562ebb2fb92e85f04a
-  data.tar.gz: 98fcd00179efae037e27bd0a1da54824c700e8b90988666c360cf82ba684a20066125d694bf5c4b7c68a9fd3318513c8279ee7ec44264c3786ba7fd19b744e24
+  metadata.gz: 54e874f84116f29dd2b4c9d902945ffe1580a31ca27f5eb5509db5312d18ac06d698d0704150c1f8bded3cd4e5f6f3d2162a8fef167ee3fe253e014b7492c9a6
+  data.tar.gz: 71f968862b162704338ab319c712bfe0e2c345a60dc44df7bcc9769848ff4a3d3e7747158e6aa2a2577457cabba1ac4ac4743fbd1177550a32d4f0481f592df2

data/Gemfile

@@ -1,4 +1,5 @@
 source 'https://rubygems.org'
 
 # Specify your gem's dependencies in sist02.gemspec
+gem 'rspec'
 gemspec

data/README.md

@@ -47,7 +47,7 @@ p Sist02::CiNii.book_ref(ncid)
 
 # 博士論文
 naid = "500000587337"
-p Sist02::CiNii.thesis_ref(naid)
+p Sist02::CiNii.dissertations_ref(naid)
 => "今井, 福司. 日本占領期におけるアメリカ学校図書館の導入 : 日米の学校教育実践における学校図書館の位置づけ. 東京大学, 2013, 博士論文."
 
 ```

data/lib/sist02/cinii.rb

@@ -4,73 +4,79 @@ require 'date'
 
 module Sist02
   module CiNii
+    # enable required program to call following functions
     module_function
-    def article_ref(naid)
+    
+    def article_ref naid
+
       begin
-        html = open("http://ci.nii.ac.jp/naid/#{naid}.json").read
-        json = JSON.parser.new(html)
-        hash = json.parse["@graph"][0]
-        title =  hash["dc:title"][0]["@value"]
-        creator_raw = hash["dc:creator"]
-        creator = ''
-        creator_raw.each do |item|
-          creator += "#{item[0]["@value"]}, "
-        end
-        creator = creator.gsub(/\,\s$/, '')
-        publication_name = hash["prism:publicationName"][0]["@value"]
-        year = hash["dc:date"].match(/\d{4}/)
-        volume = hash["prism:volume"]
-        number = hash["prism:number"]
-        start_p = hash["prism:startingPage"]
-        end_p = hash["prism:endingPage"]
-        result = "#{creator}. #{title}. #{publication_name}. #{year}, vol. #{volume}, no. #{number}, p. #{start_p}-#{end_p}."
+
+        url = "http://ci.nii.ac.jp/naid/#{naid}.json"
+        content = get_content url
+        common_info = get_common_info content
+        volume = content["prism:volume"]
+        number = content["prism:number"]
+        start_p = content["prism:startingPage"]
+        end_p = content["prism:endingPage"]
+        result = "#{common_info["maker"]}. #{common_info["title"]}. #{common_info["publicationName"]}. #{common_info["year"]}, vol. #{volume}, no. #{number}, p. #{start_p}-#{end_p}."
       rescue => e
         result = e
       end
       return result
     end
 
-    def book_ref(ncid)
+    def book_ref ncid
       begin
-        html = open("http://ci.nii.ac.jp/ncid/#{ncid}.json").read
-        json = JSON.parser.new(html)
-        hash = json.parse["@graph"][0]
-        title = hash["dc:title"][0]["@value"]
-        publisher = hash["dc:publisher"][0]
-        year = hash["dc:date"].match(/\d{4}/)
-        edition = hash["prism:edition"]
-        author_ary = Array.new
-        hash["foaf:maker"].each do |item|
-          author_ary << item["foaf:name"][0]["@value"].gsub(/(\s|　|,)+/, '')
-        end
-        author = author_ary.join(", ")
-
+        url = "http://ci.nii.ac.jp/ncid/#{ncid}.json"
+        content = get_content url
+        common_info = get_common_info content
+        edition = content["prism:edition"]
         ris = open("http://ci.nii.ac.jp/ncid/#{ncid}.ris").read
-        pages = ris.match(/EP  - ([a-z]*, )?\d+p/).to_s.gsub(/EP  - /, '')
-        pages = "ページ数不明" if pages == ''
-        result = "#{author}. #{title}. #{edition}, #{publisher}, #{year}, #{pages}." unless edition == nil
-        result = "#{author}. #{title}. #{publisher}, #{year}, #{pages}." if edition == nil # for bibliographic information that doesn't have edition display
+        edition = ris.match(/ET\s{2}-\s(.*)\r/) ? ris.match(/ET\s{2}-\s(.*)\r/)[1] : nil
+        publisher = ris.match(/PB\s{2}-\s(.*)\r/) ? ris.match(/PB\s{2}-\s(.*)\r/)[1] : nil
+        page = ris.match(/EP\s{2}-\s.*?(\d*?p)/) ? ris.match(/EP\s{2}-\s.*?(\d*?p)/)[1] : 'ページ数不明'
+        result = "#{common_info["maker"]}. #{common_info["title"]}. #{edition}, #{publisher}, #{common_info["year"]}, #{page}." if edition
+        result = "#{common_info["maker"]}. #{common_info["title"]}. #{publisher}, #{common_info["year"]}, #{page}." unless edition
       rescue => e
           result = e
       end
       return result
     end
 
-    def thesis_ref(naid)
+    def dissertations_ref naid
+      
       begin
-        html = open("http://ci.nii.ac.jp/naid/#{naid}.json").read
-        json = JSON.parser.new(html)
-        hash = json.parse["@graph"][0]
-        author = hash["dc:creator"][0][0]["@value"]
-        title = hash["dc:title"][0]["@value"]
-        publisher = hash["dc:publisher"][0]["@value"]
-        year = hash["dc:date"].match(/\d{4}/)
-        result = "#{author}. #{title}. #{publisher}, #{year}, 博士論文."
+
+        url = "http://ci.nii.ac.jp/naid/#{naid}.json"
+        content = get_content url
+        common_info = get_common_info content
+        result = "#{common_info["maker"]}. #{common_info["title"]}. #{common_info["publisher"]}, #{common_info["year"]}, 博士論文."
       rescue => e
         result = e
       end
       return result
     end
 
+    def get_content url
+      html = open(url).read
+      json = JSON.parser.new(html)
+      json.parse["@graph"][0]
+    end
+    
+
+    def get_common_info content
+      common_info = {}
+      common_info["title"] = content["dc:title"][0]["@value"]
+      common_info["publisher"] = content["dc:publisher"][0]["@value"]
+      common_info["publicationName"] = content["prism:publicationName"][0]["@value"] if content["prism:publicationName"]
+      common_info["year"] = content["dc:date"].match(/\d{4}/)
+      author_ary = Array.new
+      content["foaf:maker"].each do |item|
+        author_ary << item["foaf:name"][0]["@value"].gsub(/(\s|　|,)+/, '')
+      end
+      common_info["maker"] = author_ary.join(", ")
+      return common_info
+    end
+
   end
 end

data/lib/sist02/version.rb

@@ -1,3 +1,3 @@
 module Sist02
-  VERSION = "0.3.1"
+  VERSION = "0.4.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sist02
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.4.0
 platform: ruby
 authors:
 - Makoto Hiramatsu
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-06-10 00:00:00.000000000 Z
+date: 2015-06-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler