im_onix 1.1.1 → 1.2.2

data/lib/onix/collateral_detail.rb

@@ -1,18 +1,14 @@
-module ONIX
-  class TextContent < SubsetDSL
-    element "TextType", :subset, :shortcut => :type
-    element "ContentAudience", :subset
-    element "Text", :text
-    element "TextAuthor", :text
-    element "SourceTitle", :text
-
-    scope :description, lambda { human_code_match(:text_type, "Description") }
-    scope :short_description, lambda { human_code_match(:text_type, "ShortDescriptionannotation") }
-  end
+require 'onix/text_content'
+require 'onix/supporting_resource'
+require 'onix/cited_content'
+require 'onix/prize'
 
+module ONIX
   class CollateralDetail < SubsetDSL
-    elements "TextContent", :subset
-    elements "SupportingResource", :subset
+    elements "TextContent", :subset, :cardinality => 0..n
+    elements "CitedContent", :subset, :cardinality => 0..n
+    elements "SupportingResource", :subset, :cardinality => 0..n
+    elements "Prize", :subset, :cardinality => 0..n
 
     # @!group High level
 

data/lib/onix/collection.rb

@@ -1,9 +1,16 @@
+require 'onix/collection_sequence'
+
 module ONIX
   class Collection < SubsetDSL
-    element "CollectionType", :subset, :shortcut => :type
-    elements "CollectionIdentifier", :subset, :shortcut => :identifiers
-    elements "TitleDetail", :subset
-    elements "CollectionSequence", :subset, :shortcut => :sequences
+    element "CollectionType", :subset, :shortcut => :type, :cardinality => 1
+    element "SourceName", :text, :cardinality => 0..1
+    elements "CollectionIdentifier", :subset, :shortcut => :identifiers, :cardinality => 0..n
+    elements "CollectionSequence", :subset, :shortcut => :sequences, :cardinality => 0..n
+    elements "TitleDetail", :subset, :cardinality => 0..n
+    elements "Contributor", :subset, :cardinality => 0..n
+    elements "ContributorStatement", :text, :cardinality => 0..n
+    elements "ContributorStatement", :text, :cardinality => 0..n
+    element "NoContributor", :bool, :cardinality => 0..1
 
     scope :publisher, lambda { human_code_match(:collection_type, "PublisherCollection") }
 

data/lib/onix/collection_sequence.rb

@@ -1,7 +1,7 @@
 module ONIX
   class CollectionSequence < SubsetDSL
-    element "CollectionSequenceType", :subset, :shortcut => :type
-    element "CollectionSequenceTypeName", :string, :shortcut => :type_name
-    element "CollectionSequenceNumber", :string, :shortcut => :number
+    element "CollectionSequenceType", :subset, :shortcut => :type, :cardinality => 1
+    element "CollectionSequenceTypeName", :string, :shortcut => :type_name, :cardinality => 0..1
+    element "CollectionSequenceNumber", :string, :shortcut => :number, :cardinality => 1
   end
 end

data/lib/onix/comparison_product_price.rb

@@ -0,0 +1,17 @@
+require 'onix/code'
+require 'onix/identifier'
+
+module ONIX
+  class ComparisonProductPrice < SubsetDSL
+    elements "ProductIdentifier", :subset, :cardinality => 1..n
+    element "PriceType", :subset, :shortcut => :type, :cardinality => 0..1
+    element "PriceAmount", :float,
+            {
+              :shortcut => :amount,
+              :parse_lambda => lambda { |v| (v * 100).round },
+              :serialize_lambda => lambda { |v| v / 100.0 },
+              :cardinality => 1
+            }
+    element "CurrencyCode", :text, :shortcut => :currency, :cardinality => 0..1
+  end
+end

data/lib/onix/complexity.rb

@@ -0,0 +1,6 @@
+module ONIX
+  class Complexity < SubsetDSL
+    element "ComplexitySchemeIdentifier", :subset, :cardinality => 1
+    element "ComplexityCode", :text, :cardinality => 1
+  end
+end

data/lib/onix/content_detail.rb

@@ -0,0 +1,7 @@
+require 'onix/content_item'
+
+module ONIX
+  class ContentDetail < SubsetDSL
+    elements "ContentItem", :subset, :cardinality => 0..n
+  end
+end

data/lib/onix/content_item.rb

@@ -0,0 +1,32 @@
+require 'onix/text_item'
+require 'onix/contributor'
+require 'onix/language'
+require 'onix/subject'
+require 'onix/title_detail'
+require 'onix/text_content'
+require 'onix/cited_content'
+require 'onix/supporting_resource'
+require 'onix/related_work'
+require 'onix/related_product'
+
+module ONIX
+  class ContentItem < SubsetDSL
+    element "LevelSequenceNumber", :integer, :cardinality => 0..1
+    element "TextItem", :subset, :cardinality => 0..1
+    # element "AVItem", :subset, :cardinality => 0..1
+    element "ComponentTypeName", :text, :cardinality => 0..1
+    element "ComponentNumber", :text, :cardinality => 0..1
+    elements "TitleDetail", :subset, :cardinality => 0..n
+    elements "Contributor", :subset, :cardinality => 0..n
+    elements "ContributorStatement", :text, :cardinality => 0..n
+    element "NoContributor", :bool, :cardinality => 0..1
+    elements "Language", :subset, :cardinality => 0..n
+    elements "Subject", :subset, :cardinality => 0..n
+    # elements "NameAsSubject", :subset, :cardinality => 0..n
+    elements "TextContent", :subset, :cardinality => 0..n
+    elements "CitedContent", :subset, :cardinality => 0..n
+    elements "SupportingResource", :subset, :cardinality => 0..n
+    elements "RelatedWork", :subset, :cardinality => 0..n
+    elements "RelatedProduct", :subset, :cardinality => 0..n
+  end
+end

data/lib/onix/contributor.rb

@@ -1,49 +1,70 @@
 require 'onix/subset'
 require 'onix/website'
+require 'onix/professional_affiliation'
+require 'onix/contributor_place'
 
 module ONIX
   class Contributor < SubsetDSL
-    element "SequenceNumber", :integer
-    element "ContributorRole", :subset, :shortcut => :role
-    elements "NameIdentifier", :subset, :shortcut => :identifiers
-    element "PersonName", :text
-    element "PersonNameInverted", :text
-    element "NamesBeforeKey", :text, :shortcut => :name_before_key
-    element "KeyNames", :text
-    element "CorporateName", :text
-    element "CorporateNameInverted", :text
-    element "BiographicalNote", :text
-    elements "Website", :subset
-    element "ContributorPlace", :subset, :shortcut => :place
-    elements "ContributorDate", :subset, :shortcut => :dates
+    element "SequenceNumber", :integer, :cardinality => 0..1
+    element "ContributorRole", :subset, :shortcut => :role, :cardinality => 1..n
+    elements "FromLanguage", :subset, :klass => "LanguageCode", :cardinality => 0..n
+    elements "ToLanguage", :subset, :klass => "LanguageCode", :cardinality => 0..n
+    # element "NameType", :subset, :cardinality => 0..1
+    elements "NameIdentifier", :subset, :shortcut => :identifiers, :cardinality => 0..n
+    element "PersonName", :text, :cardinality => 0..1
+    element "PersonNameInverted", :text, :cardinality => 0..1
+    element "TitlesBeforeNames", :text, :cardinality => 0..1
+    element "NamesBeforeKey", :text, :shortcut => :name_before_key, :cardinality => 0..1
+    element "PrefixToKey", :text, :cardinality => 0..1
+    element "KeyNames", :text, :cardinality => 0..1
+    element "NamesAfterKey", :text, :cardinality => 0..1
+    element "SuffixToKey", :text, :cardinality => 0..1
+    element "LettersAfterNames", :text, :cardinality => 0..1
+    element "TitlesAfterNames", :text, :cardinality => 0..1
+    # element "Gender", :subset, :cardinality => 0..1
+    element "CorporateName", :text, :cardinality => 0..1
+    element "CorporateNameInverted", :text, :cardinality => 0..1
+    # element "UnnamedPersons", :subset, :cardinality => 0..1
+    # elements "AlternativeName", :subset, :cardinality => 0..n
+    elements "ContributorDate", :subset, :shortcut => :dates, :cardinality => 0..n
+    elements "ProfessionalAffiliation", :subset, :cardinality => 0..n
+    elements "Prize", :subset, :cardinality => 0..n
+    elements "BiographicalNote", :text, :shortcut => :biographies, :cardinality => 0..n
+    elements "Website", :subset, :cardinality => 0..n
+    elements "ContributorDescription", :text, :cardinality => 0..n
+    elements "ContributorPlace", :subset, :shortcut => :places, :cardinality => 0..n
 
     # @!group High level
     # flatten person name (firstname lastname)
     # @return [String]
     def name
-      return @person_name if @person_name
+      return person_name if person_name
 
-      if @key_names
-        if @names_before_key
-          return "#{@names_before_key} #{@key_names}"
+      if key_names
+        if names_before_key
+          return "#{names_before_key} #{key_names}"
         else
-          return @key_names
+          return key_names
         end
       end
 
-      @corporate_name
+      corporate_name
     end
 
     # inverted flatten person name
     # @return [String]
     def inverted_name
-      @person_name_inverted || @corporate_name_inverted
+      person_name_inverted || corporate_name_inverted
     end
 
     # biography string with HTML
     # @return [String]
     def biography
-      @biographical_note
+      self.biographies.first
+    end
+
+    def place
+      self.places.first
     end
 
     # raw biography string without HTML
@@ -72,17 +93,4 @@ module ONIX
 
     # @!endgroup
   end
-
-  class ContributorPlace < SubsetDSL
-    element "ContributorPlaceRelator", :subset
-    element "CountryCode", :subset
-
-    def relator
-      @contributor_place_relator
-    end
-
-    def country_code
-      @country_code.code
-    end
-  end
 end

data/lib/onix/contributor_place.rb

@@ -0,0 +1,12 @@
+module ONIX
+  class ContributorPlace < SubsetDSL
+    element "ContributorPlaceRelator", :subset, :shortcut => :relator, :cardinality => 1
+    element "CountryCode", :subset, :cardinality => 0..1
+    element "RegionCode", :subset, :cardinality => 0..1
+    elements "LocationName", :text, :cardinality => 0..n
+
+    def country_code
+      @country_code.code
+    end
+  end
+end

data/lib/onix/copyright_statement.rb

@@ -0,0 +1,7 @@
+module ONIX
+  class CopyrightStatement < SubsetDSL
+    element "CopyrightType", :subset, :cardinality => 0..1
+    elements "CopyrightYear", :text, :cardinality => 0..n
+    # elements "CopyrightOwner", :subset, :cardinality => 0..n
+  end
+end

data/lib/onix/date.rb

@@ -1,52 +1,39 @@
 module ONIX
   module DateHelper
-    attr_accessor :date_format, :date
-
-    def parse_date(n)
-      @date_format = DateFormat.from_code("00")
-      date_txt = nil
-      @date = nil
-      n.elements.each do |t|
-        case t
-        when tag_match("DateFormat")
-          @date_format = DateFormat.parse(t)
-        when tag_match("Date")
-          date_txt = t.text
-        end
+    attr_accessor :date_format, :date, :datetime
 
-        if t["dateformat"]
-          @date_format = DateFormat.from_code(t["dateformat"])
+    def parse_date
+      if @date_format
+        @deprecated_date_format = true
+      else
+        if @date.is_a?(TextWithAttributes)
+          @date_format = @date.attributes["dateformat"]
         end
       end
 
-      code_format = format_from_code(@date_format.code)
+      @datetime = strpdate!(@date, @date_format)
+      @date = @datetime ? @datetime.to_date : nil
+    end
+
+    def strpdate!(date_txt, date_format)
+      date_format ||= DateFormat.from_code("00")
+      code_format = format_from_code(date_format.code)
       text_format = format_from_string(date_txt)
 
       format = code_format
 
       if code_format != text_format
-        #        puts "EEE date #{n.text} (#{text_format}) do not match code #{@format.code} (#{code_format})"
+        puts "WARN incorrect date format #{text_format} != #{code_format}"
         format = text_format
       end
 
       begin
-        if format
-          case @date_format.code
-          when "00"
-            @date = Date.strptime(date_txt, format)
-          when "01"
-            @date = Date.strptime(date_txt, format)
-          when "05"
-            @date = Date.strptime(date_txt, format)
-          when "14"
-            @date = Time.strptime(date_txt, format)
-          else
-            @date = nil
-          end
-        end
-      rescue
+        datetime = Time.strptime(date_txt, format) if format && %w[00 01 02 05 13 14].include?(date_format.code)
+      rescue => e
         # invalid date
       end
+
+      datetime
     end
 
     def format_from_code(code)
@@ -55,8 +42,12 @@ module ONIX
         "%Y%m%d"
       when "01"
         "%Y%m"
+      when "02"
+        "%Y%%W"
       when "05"
         "%Y"
+      when "13"
+        "%Y%m%dT%H%M%S"
       when "14"
         "%Y%m%dT%H%M%S%z"
       else
@@ -82,30 +73,77 @@ module ONIX
     end
 
     def time
-      @date.to_time
+      @datetime
+    end
+  end
+
+  # support for datestamp attribute and SentDateTime
+  class DateStamp
+    attr_accessor :format, :datetime
+
+    def initialize(dt = nil, fmt = "%Y%m%d")
+      @datetime = dt
+      @format = fmt unless @datetime.is_a?(String)
+    end
+
+    def supported_formats
+      ["%Y%m%dT%H%M%S%z", "%Y%m%dT%H%M%S", "%Y%m%dT%H%M%z", "%Y%m%dT%H%M", "%Y%m%d"]
+    end
+
+    def parse(tm)
+      @format = nil
+      found_format = nil
+      supported_formats.each do |supported_format|
+        begin
+          @datetime = Time.strptime(tm, supported_format)
+          found_format = supported_format
+          break
+        rescue
+        end
+      end
+      @format = found_format
+      @datetime = tm unless @format
+    end
+
+    def self.from_code(code)
+      ds = self.new
+      ds.parse(code)
+      ds
+    end
+
+    def human
+      @datetime
+    end
+
+    def code
+      @format ? @datetime.strftime(@format) : @datetime
     end
   end
 
   class BaseDate < SubsetDSL
     include DateHelper
+    element "DateFormat", :subset
+    element "Date", :text
+    attr_accessor :deprecated_date_format
+
+    def initialize
+      super
+      @deprecated_date_format = false
+    end
 
     def parse(n)
       super
-      parse_date(n)
+      parse_date
     end
   end
 
   class MarketDate < BaseDate
-    element "Date", :ignore
-    element "DateFormat", :ignore
     element "MarketDateRole", :subset, :shortcut => :role
 
     scope :availability, lambda { human_code_match(:market_date_role, ["PublicationDate", "EmbargoDate"]) }
   end
 
   class PriceDate < BaseDate
-    element "Date", :ignore
-    element "DateFormat", :ignore
     element "PriceDateRole", :subset, :shortcut => :role
 
     scope :from_date, lambda { human_code_match(:price_date_role, "FromDate") }
@@ -113,35 +151,27 @@ module ONIX
   end
 
   class SupplyDate < BaseDate
-    element "Date", :ignore
-    element "DateFormat", :ignore
     element "SupplyDateRole", :subset, :shortcut => :role
 
     scope :availability, lambda { human_code_match(:supply_date_role, ["ExpectedAvailabilityDate", "EmbargoDate"]) }
   end
 
   class PublishingDate < BaseDate
-    element "Date", :ignore
-    element "DateFormat", :ignore
     element "PublishingDateRole", :subset, :shortcut => :role
 
     scope :publication, lambda { human_code_match(:publishing_date_role, ["PublicationDate", "PublicationDateOfPrintCounterpart"]) }
-    scope :embargo, lambda { human_code_match(:publishing_date_role, "EmbargoDate") }
+    scope :embargo, lambda { human_code_match(:publishing_date_role, "SalesEmbargoDate") }
     scope :preorder_embargo, lambda { human_code_match(:publishing_date_role, "PreorderEmbargoDate") }
     scope :public_announcement, lambda { human_code_match(:publishing_date_role, "PublicAnnouncementDate") }
   end
 
   class ContentDate < BaseDate
-    element "Date", :ignore
-    element "DateFormat", :ignore
     element "ContentDateRole", :subset, :shortcut => :role
 
     scope :last_updated, lambda { human_code_match(:content_date_role, "LastUpdated") }
   end
 
   class ContributorDate < BaseDate
-    element "Date", :ignore
-    element "DateFormat", :ignore
     element "ContributorDateRole", :subset, :shortcut => :role
   end
 end