review 2.0.0.beta1 → 2.0.0

data/lib/epubmaker/epubv2.rb

@@ -1,7 +1,7 @@
 # encoding: utf-8
 # = epubv2.rb -- EPUB version 2 producer.
 #
-# Copyright (c) 2010-2015 Kenshi Muto and Masayoshi Takahashi
+# Copyright (c) 2010-2016 Kenshi Muto and Masayoshi Takahashi
 #
 # This program is free software.
 # You can distribute or modify this program under the terms of
@@ -23,34 +23,24 @@ module EPUBMaker
 
     # Return opf file content.
     def opf
-      s = <<EOT
-<?xml version="1.0" encoding="UTF-8"?>
-<package version="2.0" xmlns="http://www.idpf.org/2007/opf" unique-identifier="BookId">
-  <metadata xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:opf="http://www.idpf.org/2007/opf">
-EOT
-
-      s << opf_metainfo
-      s << opf_coverimage
-
-      s << %Q[  </metadata>\n]
-
-      s << opf_manifest
-      s << opf_tocx
-      s << opf_guide
-
-      s << %Q[</package>\n]
-
-      s
+      @opf_metainfo = opf_metainfo
+      @opf_coverimage = opf_coverimage
+      @opf_manifest = opf_manifest
+      @opf_toc = opf_tocx
+
+      tmplfile = File.expand_path('./opf/epubv2.opf.erb', ReVIEW::Template::TEMPLATE_DIR)
+      tmpl = ReVIEW::Template.load(tmplfile)
+      return tmpl.result(binding)
     end
 
     def opf_metainfo
       s = ""
       %w[title language date type format source description relation coverage subject rights].each do |item|
-        next if @producer.params[item].nil?
-        if @producer.params[item].instance_of?(Array)
-          s << @producer.params[item].map {|i| %Q[    <dc:#{item}>#{CGI.escapeHTML(i.to_s)}</dc:#{item}>\n]}.join
+        next unless @producer.params[item]
+        if @producer.params[item].kind_of?(Array)
+          s << @producer.params.names_of(item).map {|i| %Q[    <dc:#{item}>#{CGI.escapeHTML(i)}</dc:#{item}>\n]}.join
         else
-          s << %Q[    <dc:#{item}>#{CGI.escapeHTML(@producer.params[item].to_s)}</dc:#{item}>\n]
+          s << %Q[    <dc:#{item}>#{CGI.escapeHTML(@producer.params.name_of(item))}</dc:#{item}>\n]
         end
       end
 
@@ -63,16 +53,16 @@ EOT
 
       # creator (should be array)
       %w[aut a-adp a-ann a-arr a-art a-asn a-aqt a-aft a-aui a-ant a-bkp a-clb a-cmm a-dsr a-edt a-ill a-lyr a-mdc a-mus a-nrt a-oth a-pht a-prt a-red a-rev a-spn a-ths a-trc a-trl].each do |role|
-        next if @producer.params[role].nil?
-        @producer.params[role].each do |v|
+        next unless @producer.params[role]
+        @producer.params.names_of(role).each do |v|
           s << %Q[    <dc:creator opf:role="#{role.sub('a-', '')}">#{CGI.escapeHTML(v)}</dc:creator>\n]
         end
       end
 
       # contributor (should be array)
       %w[adp ann arr art asn aqt aft aui ant bkp clb cmm dsr edt ill lyr mdc mus nrt oth pht prt red rev spn ths trc trl].each do |role|
-        next if @producer.params[role].nil?
-        @producer.params[role].each do |v|
+        next unless @producer.params[role]
+        @producer.params.names_of(role).each do |v|
           s << %Q[    <dc:contributor opf:role="#{role}">#{CGI.escapeHTML(v)}</dc:contributor>\n]
           if role == "prt"
             s << %Q[    <dc:publisher>#{v}</dc:publisher>\n]
@@ -115,45 +105,21 @@ EOT
 
       @producer.contents.each do |item|
         next if item.media !~ /xhtml\+xml/ # skip non XHTML
-        s << %Q[    <itemref idref="#{item.id}"/>\n] if item.notoc.nil?
+        s << %Q[    <itemref idref="#{item.id}"/>\n]
       end
       s << %Q[  </spine>\n]
       s
     end
 
-    def opf_guide
-      s = ""
-      s << %Q[  <guide>\n]
-      s << %Q[    <reference type="cover" title="#{@producer.res.v("covertitle")}" href="#{@producer.params["cover"]}"/>\n]
-      s << %Q[    <reference type="title-page" title="#{@producer.res.v("titlepagetitle")}" href="titlepage.#{@producer.params["htmlext"]}"/>\n] unless @producer.params["titlepage"].nil?
-      s << %Q[    <reference type="toc" title="#{@producer.res.v("toctitle")}" href="#{@producer.params["bookname"]}-toc.#{@producer.params["htmlext"]}"/>\n] unless @producer.params["mytoc"].nil?
-      s << %Q[    <reference type="colophon" title="#{@producer.res.v("colophontitle")}" href="colophon.#{@producer.params["htmlext"]}"/>\n] unless @producer.params["colophon"].nil?
-      s << %Q[  </guide>\n]
-      s
-    end
-
     # Return ncx content. +indentarray+ has prefix marks for each level.
     def ncx(indentarray)
-      s = <<EOT
-<?xml version="1.0" encoding="UTF-8"?>
-<ncx xmlns="http://www.daisy.org/z3986/2005/ncx/" version="2005-1">
-  <head>
-    <meta name="dtb:depth" content="1"/>
-    <meta name="dtb:totalPageCount" content="0"/>
-    <meta name="dtb:maxPageNumber" content="0"/>
-EOT
-      s << ncx_isbn
+      @ncx_isbn = ncx_isbn
+      @ncx_doctitle = ncx_doctitle
+      @ncx_navmap = ncx_navmap(indentarray)
 
-      s << <<EOT
-  </head>
-EOT
-      s << ncx_doctitle
-      s << ncx_navmap(indentarray)
-
-      s << <<EOT
-</ncx>
-EOT
-      s
+      tmplfile = File.expand_path('./ncx/epubv2.ncx.erb', ReVIEW::Template::TEMPLATE_DIR)
+      tmpl = ReVIEW::Template.load(tmplfile)
+      return tmpl.result(binding)
     end
 
     # Produce EPUB file +epubfile+.
@@ -169,24 +135,5 @@ EOT
       export_zip(tmpdir, epubfile)
     end
 
-    private
-
-    # Return common XHTML headder
-    def common_header
-      s =<<EOT
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xmlns:ops="http://www.idpf.org/2007/ops" xml:lang="#{@producer.params["language"]}">
-<head>
-  <meta http-equiv="Content-Type" content="text/html;charset=UTF-8"/>
-  <meta http-equiv="Content-Style-Type" content="text/css"/>
-  <meta name="generator" content="Re:VIEW"/>
-EOT
-
-      @producer.params["stylesheet"].each do |file|
-        s << %Q[  <link rel="stylesheet" type="text/css" href="#{file}"/>\n]
-      end
-      s
-    end
   end
 end

data/lib/epubmaker/epubv3.rb

@@ -1,7 +1,7 @@
 # encoding: utf-8
 # = epubv3.rb -- EPUB version 3 producer.
 #
-# Copyright (c) 2010-2015 Kenshi Muto
+# Copyright (c) 2010-2016 Kenshi Muto
 #
 # This program is free software.
 # You can distribute or modify this program under the terms of
@@ -18,37 +18,53 @@ module EPUBMaker
     # Construct object with parameter hash +params+ and message resource hash +res+.
     def initialize(producer)
       super
+      @opf_prefix = Hash.new
+      if @producer.params["opf_prefix"].present?
+        @producer.params["opf_prefix"].each do |k, v|
+          @opf_prefix[k] = v
+        end
+      end
     end
 
     # Return opf file content.
     def opf
-      s = <<EOT
-<?xml version="1.0" encoding="UTF-8"?>
-<package version="3.0" xmlns="http://www.idpf.org/2007/opf" unique-identifier="BookId" xml:lang="#{@producer.params["language"]}">
-  <metadata xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:opf="http://www.idpf.org/2007/opf">
-EOT
-
-      s << opf_metainfo
-
-      s << %Q[  </metadata>\n]
-
-      s << opf_manifest
-      s << opf_tocx
-      s << opf_guide # same as ePUB2
-
-      s << %Q[</package>\n]
+      @opf_metainfo = opf_metainfo
+      @opf_manifest = opf_manifest
+      @opf_toc = opf_tocx
+      @package_attrs = ""
+
+      if !@opf_prefix.empty?
+        prefixes_str = @opf_prefix.map{|k,v| %Q|#{k}: #{v}| }.join(" ")
+        @package_attrs << " prefix=\"#{prefixes_str}\""
+      end
 
-      s
+      tmplfile = File.expand_path('./opf/epubv3.opf.erb', ReVIEW::Template::TEMPLATE_DIR)
+      tmpl = ReVIEW::Template.load(tmplfile)
+      return tmpl.result(binding)
     end
 
     def opf_metainfo
       s = ""
       %w[title language date type format source description relation coverage subject rights].each do |item|
-        next if @producer.params[item].nil?
-        if @producer.params[item].instance_of?(Array)
-          @producer.params[item].each_with_index {|v, i|
-            s << %Q[    <dc:#{item} id="#{item}-#{i}">#{CGI.escapeHTML(v.to_s)}</dc:#{item}>\n]
-          }
+        next unless @producer.params[item]
+        if @producer.params[item].kind_of?(Array)
+          @producer.params[item].each_with_index do |v, i|
+            if v.kind_of?(Hash)
+              s << %Q[    <dc:#{item} id="#{item}-#{i}">#{CGI.escapeHTML(v["name"])}</dc:#{item}>\n]
+              v.each_pair do |name, val|
+                next if name == "name"
+                s << %Q[    <meta refines="##{item}-#{i}" property="#{name}">#{CGI.escapeHTML(val)}</meta>\n]
+              end
+            else
+              s << %Q[    <dc:#{item} id="#{item}-#{i}">#{CGI.escapeHTML(v.to_s)}</dc:#{item}>\n]
+            end
+          end
+        elsif @producer.params[item].kind_of?(Hash)
+          s << %Q[    <dc:#{item} id="#{item}">#{CGI.escapeHTML(@producer.params[item]["name"])}</dc:#{item}>\n]
+          @producer.params[item].each_pair do |name, val|
+            next if name == "name"
+            s << %Q[    <meta refines="##{item}" property="#{name}">#{CGI.escapeHTML(val)}</meta>\n]
+          end
         else
           s << %Q[    <dc:#{item} id="#{item}">#{CGI.escapeHTML(@producer.params[item].to_s)}</dc:#{item}>\n]
         end
@@ -65,9 +81,9 @@ EOT
 
       # creator (should be array)
       %w[a-adp a-ann a-arr a-art a-asn a-aqt a-aft a-aui a-ant a-bkp a-clb a-cmm a-csl a-dsr a-edt a-ill a-lyr a-mdc a-mus a-nrt a-oth a-pht a-prt a-red a-rev a-spn a-ths a-trc a-trl aut].each do |role|
-        next if @producer.params[role].nil?
+        next unless @producer.params[role]
         @producer.params[role].each_with_index do |v, i|
-          if v.instance_of?(Hash)
+          if v.kind_of?(Hash)
             s << %Q[    <dc:creator id="#{role}-#{i}">#{CGI.escapeHTML(v["name"])}</dc:creator>\n]
             s << %Q[    <meta refines="##{role}-#{i}" property="role" scheme="marc:relators">#{role.sub('a-', '')}</meta>\n]
             v.each_pair do |name, val|
@@ -83,9 +99,9 @@ EOT
 
       # contributor (should be array)
       %w[adp ann arr art asn aqt aft aui ant bkp clb cmm csl dsr edt ill lyr mdc mus nrt oth pbd pbl pht prt red rev spn ths trc trl].each do |role|
-        next if @producer.params[role].nil?
+        next unless @producer.params[role]
         @producer.params[role].each_with_index do |v, i|
-          if v.instance_of?(Hash)
+          if v.kind_of?(Hash)
             s << %Q[    <dc:contributor id="#{role}-#{i}">#{CGI.escapeHTML(v["name"])}</dc:contributor>\n]
             s << %Q[    <meta refines="##{role}-#{i}" property="role" scheme="marc:relators">#{role}</meta>\n]
             v.each_pair do |name, val|
@@ -98,7 +114,7 @@ EOT
           end
 
           if role == "prt" || role == "pbl"
-            if v.instance_of?(Hash)
+            if v.kind_of?(Hash)
               s << %Q[    <dc:publisher id="pub-#{role}-#{i}">#{CGI.escapeHTML(v["name"])}</dc:publisher>\n]
               s << %Q[    <meta refines="#pub-#{role}-#{i}" property="role" scheme="marc:relators">#{role}</meta>\n]
               v.each_pair do |name, val|
@@ -113,6 +129,13 @@ EOT
         end
       end
 
+      ## add custom <meta> element
+      if @producer.params["opf_meta"].present?
+        @producer.params["opf_meta"].each do |k, v|
+          s << %Q[    <meta property="#{k}">#{CGI.escapeHTML(v)}</meta>\n]
+        end
+      end
+
       s
     end
 
@@ -126,7 +149,7 @@ EOT
 
       if @producer.params["coverimage"]
         @producer.contents.each do |item|
-          if item.media =~ /\Aimage/ && File.basename(item.file) == @producer.params["coverimage"]
+          if item.media.start_with?('image') && File.basename(item.file) == @producer.params["coverimage"]
             s << %Q[    <item properties="cover-image" id="cover-#{item.id}" href="#{item.file}" media-type="#{item.media}"/>\n]
             item.id = nil
             break
@@ -155,51 +178,42 @@ EOT
       end
 
       s = ""
-      s << %Q[  <spine>\n]
+      if @producer.params["direction"]
+        s << %Q[  <spine page-progression-direction="#{@producer.params["direction"]}">\n]
+      else
+        s << %Q[  <spine>\n]
+      end
       s << %Q[    <itemref idref="#{@producer.params["bookname"]}" linear="#{cover_linear}"/>\n]
       s << %Q[    <itemref idref="#{@producer.params["bookname"]}-toc.#{@producer.params["htmlext"]}" />\n] if @producer.params["toc"]
 
       @producer.contents.each do |item|
         next if item.media !~ /xhtml\+xml/ # skip non XHTML
-        s << %Q[    <itemref idref="#{item.id}"/>\n] if item.notoc.nil?
+        s << %Q[    <itemref idref="#{item.id}"/>\n]
       end
       s << %Q[  </spine>\n]
 
       s
     end
 
-    def opf_guide
-      s = ""
-      s << %Q[  <guide>\n]
-      s << %Q[    <reference type="cover" title="#{@producer.res.v("covertitle")}" href="#{@producer.params["cover"]}"/>\n]
-      s << %Q[    <reference type="title-page" title="#{@producer.res.v("titlepagetitle")}" href="titlepage.#{@producer.params["htmlext"]}"/>\n] unless @producer.params["titlepage"].nil?
-      s << %Q[    <reference type="toc" title="#{@producer.res.v("toctitle")}" href="#{@producer.params["bookname"]}-toc.#{@producer.params["htmlext"]}"/>\n]
-      s << %Q[    <reference type="colophon" title="#{@producer.res.v("colophontitle")}" href="colophon.#{@producer.params["htmlext"]}"/>\n] unless @producer.params["colophon"].nil?
-      s << %Q[  </guide>\n]
-      s
-    end
-
     def ncx(indentarray)
-      s = common_header
-      s << <<EOT
-  <title>#{@producer.res.v("toctitle")}</title>
-</head>
-<body>
-  <nav xmlns:epub="http://www.idpf.org/2007/ops" epub:type="toc" id="toc">
-  <h1 class="toc-title">#{@producer.res.v("toctitle")}</h1>
-EOT
-
       if @producer.params["epubmaker"]["flattoc"].nil?
-        s << hierarchy_ncx("ol")
+        ncx_main = hierarchy_ncx("ol")
       else
-        s << flat_ncx("ol", @producer.params["epubmaker"]["flattocindent"])
+        ncx_main = flat_ncx("ol", @producer.params["epubmaker"]["flattocindent"])
       end
-      s << <<EOT
-  </nav>
-</body>
-</html>
+
+      @body = <<EOT
+  <nav xmlns:epub="http://www.idpf.org/2007/ops" epub:type="toc" id="toc">
+  <h1 class="toc-title">#{CGI.escapeHTML(@producer.res.v("toctitle"))}</h1>
+#{ncx_main}  </nav>
 EOT
-      s
+
+      @title = CGI.escapeHTML(@producer.res.v("toctitle"))
+      @language = @producer.params['language']
+      @stylesheets = @producer.params["stylesheet"]
+      tmplfile = File.expand_path('./html/layout-html5.html.erb', ReVIEW::Template::TEMPLATE_DIR)
+      tmpl = ReVIEW::Template.load(tmplfile)
+      return tmpl.result(binding)
     end
 
     # Produce EPUB file +epubfile+.
@@ -222,7 +236,7 @@ EOT
 
       if @producer.params["coverimage"]
         @producer.contents.each do |item|
-          if item.media =~ /\Aimage/ && item.file =~ /#{@producer.params["coverimage"]}\Z/
+          if item.media.start_with?('image') && item.file =~ /#{@producer.params["coverimage"]}\Z/
               s << <<EOT
             <item id="#{item.id}" href="#{item.file}" media-type="#{item.media}"/>
 EOT
@@ -237,20 +251,5 @@ EOT
       s
     end
 
-    def common_header
-      s =<<EOT
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html>
-<html xmlns="http://www.w3.org/1999/xhtml" xmlns:epub="http://www.idpf.org/2007/ops" xmlns:ops="http://www.idpf.org/2007/ops" xml:lang="#{@producer.params["language"]}">
-<head>
-  <meta charset="UTF-8" />
-  <meta name="generator" content="Re:VIEW" />
-EOT
-
-      @producer.params["stylesheet"].each do |file|
-        s << %Q[  <link rel="stylesheet" type="text/css" href="#{file}"/>\n]
-      end
-      s
-    end
   end
 end

data/lib/epubmaker/producer.rb

@@ -1,7 +1,7 @@
 # encoding: utf-8
 # = producer.rb -- EPUB producer.
 #
-# Copyright (c) 2010-2015 Kenshi Muto
+# Copyright (c) 2010-2016 Kenshi Muto
 #
 # This program is free software.
 # You can distribute or modify this program under the terms of
@@ -10,12 +10,14 @@
 
 require 'tmpdir'
 require 'fileutils'
-require 'yaml'
-require 'uuid'
+require 'review/yamlloader'
+require 'securerandom'
 require 'epubmaker/content'
 require 'epubmaker/epubv2'
 require 'epubmaker/epubv3'
 require 'review/i18n'
+require 'review/configure'
+require 'review/extentions/hash'
 
 module EPUBMaker
   # EPUBMaker produces EPUB file.
@@ -29,14 +31,16 @@ module EPUBMaker
 
     # Take YAML +file+ and return parameter hash.
     def Producer.load(file)
-      raise "Can't open #{yamlfile}." if file.nil? || !File.exist?(file)
-      return YAML.load_file(file)
+      raise "Can't open #{file}." if file.nil? || !File.exist?(file)
+      loader = ReVIEW::YAMLLoader.new
+      loader.load_file(file)
     end
 
     # Take YAML +file+ and update parameter hash.
     def load(file)
-      raise "Can't open #{yamlfile}." if file.nil? || !File.exist?(file)
-      merge_params(@params.merge(YAML.load_file(file)))
+      raise "Can't open #{file}." if file.nil? || !File.exist?(file)
+      loader = ReVIEW::YAMLLoader.new
+      merge_params(@params.deep_merge(loader.load_file(file)))
     end
 
     # Construct producer object.
@@ -44,19 +48,29 @@ module EPUBMaker
     # +version+ takes EPUB version (default is 2).
     def initialize(params=nil, version=nil)
       @contents = []
-      @params = {}
+      @params = ReVIEW::Configure.new
       @epub = nil
       @params["epubversion"] = version unless version.nil?
       @res = ReVIEW::I18n
 
-      unless params.nil?
+      if params
         merge_params(params)
       end
     end
 
+    def coverimage
+      return nil unless params["coverimage"]
+      @contents.each do |item|
+        if item.media.start_with?('image') && item.file =~ /#{params["coverimage"]}\Z/ # /
+          return item.file
+        end
+      end
+      return nil
+    end
+
     # Update parameters by merging from new parameter hash +params+.
     def merge_params(params)
-      @params = @params.merge(params)
+      @params.deep_merge!(params)
       complement
 
       unless @params["epubversion"].nil?
@@ -133,7 +147,7 @@ module EPUBMaker
       return nil unless File.exist?(path)
       allow_exts = @params["image_ext"] if allow_exts.nil?
       Dir.foreach(path) do |f|
-        next if f =~ /\A\./
+        next if f.start_with?('.')
         if f =~ /\.(#{allow_exts.join("|")})\Z/i
           path.chop! if path =~ /\/\Z/
           if base.nil?
@@ -180,23 +194,33 @@ module EPUBMaker
       end
     end
 
+    def isbn_hyphen
+      str = @params["isbn"].to_s
+
+      if str =~ /\A\d{10}\Z/
+        "#{str[0..0]}-#{str[1..5]}-#{str[6..8]}-#{str[9..9]}"
+      elsif str =~ /\A\d{13}\Z/
+        "#{str[0..2]}-#{str[3..3]}-#{str[4..8]}-#{str[9..11]}-#{str[12..12]}"
+      else
+        nil
+      end
+    end
+
     private
 
     # Complement parameters.
     def complement
       @params["htmlext"] = "html" if @params["htmlext"].nil?
-      defaults = {
-        "cover" => "#{@params["bookname"]}.#{@params["htmlext"]}",
-        "title" => @params["booktitle"],
+      defaults = ReVIEW::Configure.new.merge({
         "language" => "ja",
         "date" => Time.now.strftime("%Y-%m-%d"),
         "modified" => Time.now.strftime("%Y-%02m-%02dT%02H:%02M:%02SZ"),
-        "urnid" => "urn:uid:#{UUID.create}",
+        "urnid" => "urn:uid:#{SecureRandom.uuid}",
         "isbn" => nil,
         "toclevel" => 2,
         "stylesheet" => [],
-        "epubversion" => 2,
-        "htmlversion" => 4,
+        "epubversion" => 3,
+        "htmlversion" => 5,
         "secnolevel" => 2,
         "pre_secnolevel" => 0,
         "post_secnolevel" => 1,
@@ -206,6 +230,8 @@ module EPUBMaker
         "originaltitlefile" => nil,
         "profile" => nil,
         "colophon" => nil,
+        "colophon_order" => %w[aut csl trl dsr ill edt pbl prt pht],
+        "direction" => "ltr",
         "epubmaker" => {
           "flattoc" => nil,
           "flattocindent" => true,
@@ -224,21 +250,15 @@ module EPUBMaker
           "force_include_images" => [],
           "cover_linear" => nil,
         },
+        "externallink" => true,
         "imagedir" => "images",
         "fontdir" => "fonts",
         "image_ext" => %w(png gif jpg jpeg svg ttf woff otf),
         "font_ext" => %w(ttf woff otf),
-      }
+      })
 
-      defaults.each_pair do |k, v|
-        if k == "epubmaker" && !@params[k].nil?
-          v.each_pair do |k2, v2|
-            @params[k][k2] = v2 if @params[k][k2].nil?
-          end
-        else
-          @params[k] = v if @params[k].nil?
-        end
-      end
+      @params = defaults.deep_merge(@params)
+      @params["title"] = @params["booktitle"] unless @params["title"]
 
       deprecated_parameters = {
         "ncxindent" => "epubmaker:ncxindent",
@@ -268,14 +288,18 @@ module EPUBMaker
         end
       end
 
-      @params["htmlversion"] == 5 if @params["epubversion"] >= 3
+      @params["htmlversion"] = 5 if @params["epubversion"] >= 3
+
+      @params.maker = "epubmaker"
+      @params["cover"] = "#{@params["bookname"]}.#{@params["htmlext"]}" unless @params["cover"]
 
       %w[bookname title].each do |k|
-        raise "Key #{k} must have a value. Abort." if @params[k].nil?
+        raise "Key #{k} must have a value. Abort." unless @params[k]
       end
       # array
       %w[subject aut a-adp a-ann a-arr a-art a-asn a-aqt a-aft a-aui a-ant a-bkp a-clb a-cmm a-dsr a-edt a-ill a-lyr a-mdc a-mus a-nrt a-oth a-pht a-prt a-red a-rev a-spn a-ths a-trc a-trl adp ann arr art asn aut aqt aft aui ant bkp clb cmm dsr edt ill lyr mdc mus nrt oth pht pbl prt red rev spn ths trc trl stylesheet rights].each do |item|
-        @params[item] = [@params[item]] if !@params[item].nil? && @params[item].instance_of?(String)
+        next unless @params[item]
+        @params[item] = [@params[item]] if @params[item].kind_of?(String)
       end
       # optional
       # type, format, identifier, source, relation, coverpage, aut