citero 1.0.0.alpha3 → 1.0.0.alpha5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9e54a3640492296be572723e10beace6fb58c5a5
-  data.tar.gz: c75278bd837dc993e10fd3e520484b05a57e956e
+  metadata.gz: 2ad3b53896c3eb9cd5781a598794877bf63cc7a1
+  data.tar.gz: 2c8952c07311e3a8665fd273acb049129a0d9f17
 SHA512:
-  metadata.gz: 256b138ced12783a53893969c08b8993d1cb7d39f1d2ba277f9e64e2747f5dd87b66e6cf673183cd115bf2ac21b67f3a354e84f7e48d5b48436497ebf0b3bbde
-  data.tar.gz: 29faa241c33c6afbe2a0b2d49d990214592b5ce2f29a01ca2a0e1b53a49b9c9997b999380b1e945634c3182046a8a54ebefed0a7eaa22a6e5465d79f21be5b34
+  metadata.gz: e4eed240b48f8210f9d1cb177058d98d0104cc7396bf0bec0f30f71fe8e90a32e0eafd5df7e3986c1a357349da2bee56b8b6dacf92cea2e4fbf547750b44bf9c
+  data.tar.gz: 90819b5af6ae0dac5f001965da5a541b1d3491b05d2d9a88fa183186d97aa2a1c74230c766ae376c4439ce0ecdadbe4c7ea7417d1ec9edfa406964cb2507490d

data/lib/citero.rb

@@ -6,7 +6,7 @@ module Citero
   require_relative 'citero/utils'
 
   def self.from_formats
-    [:csf, :openurl, :pnx]
+    [:csf, :openurl, :pnx, :pnx_json]
   end
 
   def self.to_formats
@@ -38,6 +38,8 @@ module Citero
         from = Citero::Inputs::OpenUrl.new(@input)
       when :pnx
         from = Citero::Inputs::Pnx.new(@input)
+      when :pnx_json
+        from = Citero::Inputs::PnxJson.new(@input)
       else
         raise ArgumentError
     end
@@ -57,6 +59,8 @@ module Citero
         from = Citero::Inputs::OpenUrl.new(@input)
       when :pnx
         from = Citero::Inputs::Pnx.new(@input)
+      when :pnx_json
+        from = Citero::Inputs::PnxJson.new(@input)
       else
         raise ArgumentError
     end

data/lib/citero/inputs.rb

@@ -3,5 +3,6 @@ module Citero
     require_relative 'inputs/readers'
     require_relative 'inputs/pnx'
     require_relative 'inputs/openurl'
+    require_relative 'inputs/pnx_json'
   end
 end

data/lib/citero/inputs/pnx_json.rb

@@ -0,0 +1,153 @@
+module Citero
+  module Inputs
+    class PnxJson
+
+      attr_reader :csf
+
+      def initialize(raw_data)
+        @json = raw_data
+        construct_csf
+        @csf
+      end
+
+      private
+
+      def to_csf
+        return @csf unless @csf.nil?
+        @csf = CSF.new
+        @hash = {}
+        add_item_type
+        parse_and_add_creators
+        parse_and_add_publisher
+        add_pages
+        add_isbn
+        add_issn
+        add_eissn
+        add_all_other_fields
+        add_imported_from
+        @csf.load_from_hash(@hash)
+      end
+
+      private
+
+      def item_type_conversion_hash
+        @item_type_conversion_hash ||= {
+          "audio"   =>    "audioRecording",
+          "video"   =>    "videoRecording",
+          "article" =>    "journalArticle",
+          "books"   =>    "book",
+        }
+      end
+
+      def item_type_conversion_array
+        @item_type_conversion_array ||= [
+          "book",
+          "report",
+          "webpage",
+          "journal",
+          "map",
+          "thesis"
+        ]
+      end
+
+      def qualified_method_names
+        @qualified_method_names ||= {
+          "title" => "title",
+          "publicationDate" => "publicationDate",
+          "journalTitle" => "journalTitle",
+          "date" => "date",
+          "language" => "languageId",
+          "edition" => "edition",
+          "tags" => "tags",
+          "callNumber" => "callNumber",
+          "pnxRecordId" => "pnxRecordId",
+          "description" => "description",
+          "notes" => "notes"
+        }
+      end
+
+      def get_item_type(raw_item_type)
+        raw_item_type.downcase!
+        return raw_item_type if item_type_conversion_array.include?(raw_item_type)
+        return item_type_conversion_hash[raw_item_type] if item_type_conversion_hash.include?(raw_item_type)
+        return 'document'
+      end
+
+      def add_item_type
+        type =  @json["type"] || @json["@TYPE"] || 'document'
+        @hash["itemType"] = get_item_type(type)
+      end
+
+
+      def parse_and_add_creators
+        contributors = []
+        creator = [@json["creator"]].compact
+
+        creators = @json["creator"]
+        creators = @json["contributor"] if creator.empty?
+        contributors = @json["contributor"] unless creator.empty?
+
+        creators = @json["addau"] if (creator.empty? && [@json["contributor"]].compact.empty?)
+
+        add_creators(creators, "author")
+        add_creators(contributors, "contributor")
+      end
+
+      def add_creators(creators,creator_type)
+        if (creators && !creators.empty?)
+          creators.each do |name|
+            @hash[creator_type] = [@hash[creator_type], name.strip].flatten.compact
+          end
+        end
+      end
+
+      def parse_and_add_publisher
+        return if [@json["publisher"]].compact.empty?
+        @json["publisher"].each do |json_pub|
+          if json_pub.include? " : "
+            pub_place, publisher = json_pub.split(" : ",2).map(&:strip)
+            add_publisher_and_place(publisher, pub_place)
+          else
+            add_publisher_and_place(json_pub)
+          end
+        end
+      end
+
+      def add_publisher_and_place(publisher = nil, place = nil)
+        @hash['publisher'] = publisher if publisher
+        @hash['place'] = place if place
+      end
+
+      def add_pages
+        return unless @json["pages"]
+        raw_pages = @json["pages"].gsub(/[\(\)\[\]]/, "").gsub(/\D/, " ").strip()
+        @hash['numPages'] = raw_pages.split(" ").first unless raw_pages.empty?
+      end
+
+      def add_isbn
+        isbn = [@json['isbn'], @json['isbn10'], @json['isbn13']].flatten.compact.uniq
+        @hash['isbn']  = [@hash['isbn'], isbn].flatten.compact unless isbn.empty?
+      end
+
+      def add_eissn
+        eissn = @json['eissn'] || []
+        @hash['eissn']  = [@hash['eissn'], eissn].flatten.compact unless eissn.empty?
+      end
+
+      def add_issn
+        issn = @json['issn'] || []
+        @hash['issn']  = [@hash['issn'], issn].flatten.compact unless issn.empty?
+      end
+
+      def add_all_other_fields
+        qualified_method_names.each do |standard_form, method_name|
+          @hash[standard_form] = @json[method_name] unless [@json[method_name]].compact.empty?
+        end
+      end
+
+      def add_imported_from
+        @hash['importedFrom'] = "PNX_JSON"
+      end
+    end
+  end
+end

data/lib/citero/outputs/openurl.rb

@@ -51,7 +51,7 @@ module Citero
       end
 
       def output_isbn
-        openurl_param('rft_id=info:isbn:', @csf['isbn'], false) + openurl_param('isbn', @csf['isbn'])
+        openurl_param('rft_id=urn:isbn:', @csf['isbn'], false) + openurl_param('isbn', @csf['isbn'])
       end
 
       def output_type
@@ -65,11 +65,28 @@ module Citero
       end
 
       def output_date
-        openurl_param('date', @csf['date'])
+        output = ""
+        output = openurl_param('date', @csf['issueDate']) if @csf['itemType'].eql?("patent")
+        output += openurl_param('date', @csf['date'])
+      end
+
+      def output_series
+        openurl_param('series', @csf['series'])
+      end
+      
+      def output_journalAbbreviation
+        openurl_param('stitle', @csf['journalAbbreviation'])
+      end
+      
+      def output_degree
+        openurl_param('degree', @csf['type'])
       end
 
       def output_title
-        openurl_param('title', @csf['title'])
+        openurl_key = 'title'
+        openurl_key = 'atitle' if ["journalArticle", "bookSection", "conferencePaper"].include?(@csf['itemType'])
+        openurl_key = 'btitle' if @csf['itemType'].eql?('book')
+        openurl_param(openurl_key, @csf['title'])
       end
 
       def output_author
@@ -77,7 +94,10 @@ module Citero
       end
 
       def output_bookTitle
-        openurl_param('btitle', @csf['bookTitle'])
+        output = ""
+        output = openurl_param('btitle', @csf['proceedingsTitle'])  if @csf['itemType'].eql?('bookSection')
+        output = openurl_param('btitle', @csf['publicationsTitle']) if @csf['itemType'].eql?('conferencePaper')
+        output += openurl_param('btitle', @csf['bookTitle'])
       end
 
       def output_publicationTitle
@@ -97,7 +117,11 @@ module Citero
       end
 
       def output_volume
-        openurl_param('volume', @csf['volume'])
+        output = ""
+        if @csf['itemType'].eql? "journalArticle"
+          output = openurl_param('volume', @csf['volume']) + openurl_param('volume', @csf['title'])
+        end
+        output += openurl_param('volume', @csf['volume'])
       end
 
       def output_reportNumber
@@ -113,7 +137,9 @@ module Citero
       end
 
       def output_publisher
-        openurl_param('publisher', @csf['publisher'])
+        output = ""
+        output = openurl_param('inst', @csf['publisher']) if @csf['itemType'].eql? "thesis"
+        output += openurl_param('publisher', @csf['publisher'])
       end
 
       def output_place
@@ -192,7 +218,10 @@ module Citero
           :output_numPages,
           :output_isbn,
           :output_issn,
-          :output_tags
+          :output_tags,
+          :output_series,
+          :output_journalAbbreviation,
+          :output_degree
         ]
       end
     end

data/lib/citero/version.rb

@@ -1,3 +1,3 @@
 module Citero
-  VERSION = "1.0.0.alpha3"
+  VERSION = "1.0.0.alpha5"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: citero
 version: !ruby/object:Gem::Version
-  version: 1.0.0.alpha3
+  version: 1.0.0.alpha5
 platform: ruby
 authors:
 - hab278
@@ -122,6 +122,7 @@ files:
 - lib/citero/inputs.rb
 - lib/citero/inputs/openurl.rb
 - lib/citero/inputs/pnx.rb
+- lib/citero/inputs/pnx_json.rb
 - lib/citero/inputs/readers.rb
 - lib/citero/inputs/readers/pnx_reader.rb
 - lib/citero/outputs.rb