ddex 0.0.6 → 0.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8ee6e4444850b57a563df58898f20194c3397304
-  data.tar.gz: 4d7a25eb0d5a1e59eb8c42bcfaf994f64a8f2d06
+  metadata.gz: 102aa60db3589a4f1306181f86b266ff6e85943e
+  data.tar.gz: 7e960f3dabbaa997c7b87cf8233cff520e215536
 SHA512:
-  metadata.gz: ac8fe3c14a891dd6af4e7670f11af719f0294229cef495aeee92797c558d7c4015aa5bc16a34ebfd0f23b6b1ea3e18584c2c0936ee5d72af4f4b66f8a7d79ae3
-  data.tar.gz: 1076cb6fb21cb0628f915b379c1b2fb624ee7a3d76e2bfb5a775553405339781d4376dbb75b53cfe5b28d1de48710455d174978757cabd51bdb0de163bc195e5
+  metadata.gz: 5f9a1c4b9a218be6488744766113ff4b554d9f9d1a451c1df1fddc41d7816d7b15852d28931141497ec8e05ee8f6290fc1015f634dd0b8734704662558dbfd7c
+  data.tar.gz: 03d5cf0e79d2ea126f3bde773f18395156275f8a9269f242484efe00fd2648951bec453847fc9bc0bab3fc922cee208607c3fa66f686392982024d30c71a3e13

data/README.rdoc

@@ -114,10 +114,21 @@ element of the same name (<code>PriceInformation/PriceType</code>).
 
 === Specification Version Detection
 
-The specification version is determined by the <code>MessageSchemaVersionId</code>, which can be:
+An attempt is made to detect the version. How this is done varies by spec and version. See below for details.
 
-1. Detected based on the root element's value i.e., <code>/node()/@MessageSchemaVersionId</code> (the root element varies by specification)
-2. Explicitly given to DDEX.read via the <code>:version</code> option
+The version can always be explicitly given to <code>DDEX.read</code> via the <code>:version</code> option.
+
+==== ERN >= 4
+
+Version is determined by the DDEX XML namespace associated with the doc.
+
+For example, given a namespace of: <code>http://ddex.net/xml/ern/41</code> we'll try to match the end, either
+<code>"ern/41"</code> or <code>"ern/41/"</code>. The values used to match the come from
+<code>DDEX::ERN.config[V][:message_schema_version_id]</code> where <code>V</code> is a version string, e.g., <code>"V41"</code>.
+
+==== ERN < 4
+
+The version is detected based on the root element's value i.e., <code>/node()/@MessageSchemaVersionId</code>.
 
 By default the <code>MessageSchemaVersionId</code> is assumed to be in <code>SPEC/VERSION</code> or <code>VERSION</code> format
 (any leading, trailing, or duplicate slashes will be stripped), as this seems to be the convention used by most instance docs -though the DDEX specifications
@@ -130,9 +141,6 @@ that vary from this format, and explicitly setting the version is not practical,
 
 Note that the version key must match the version's module name.
 
-Feel free to {open an issue}[https://github.com/sshaw/ddex/issues] if you feel this arrangement is problematic or should
-be modified to accommodate something else.
-
 === Validation
 
 Not yet!
@@ -195,7 +203,7 @@ See CONTRIBUTING.md
 === See Also
 
 * {grid-number}[https://github.com/ScreenStaring/grid-number] - Class for managing Global Release Identifiers
-* {iTunes Store Transporter: GUI}[http://transportergui.com] - GUI and workflow automation for the iTunes Store’s Transporter (`iTMSTransporter`)
+* {iTunes Store Transporter: GUI}[http://transportergui.com] - GUI and workflow automation for the iTunes Store’s Transporter (+iTMSTransporter+)
 
 === Author
 
@@ -203,7 +211,7 @@ Skye Shaw  [skye.shaw {AT} gmail.com]
 
 === License
 
-Copyright (c) 2013 Skye Shaw. Released under the {MIT License}[www.opensource.org/licenses/MIT].
+Copyright (c) 2013-2020 Skye Shaw. Released under the {MIT License}[www.opensource.org/licenses/MIT].
 
 ---
 

data/lib/ddex/element.rb

@@ -89,7 +89,9 @@ module DDEX
       eql?(other)
     end
 
-    # TODO: hash()
+    def hash
+      to_hash.hash
+    end
 
     private
     def roxml_attributes

data/lib/ddex/ern.rb

@@ -16,11 +16,18 @@ module DDEX
     autoload :V38,  "ddex/ern/v38"
     autoload :V381,  "ddex/ern/v381"
     autoload :V382,  "ddex/ern/v382"
+    autoload :V41,  "ddex/ern/v41"
 
     ROOT_ELEMENT = "NewReleaseMessage".freeze
     VERSION_ATTR = "MessageSchemaVersionId".freeze
 
     DEFAULT_CONFIG  = {
+      "V41" => {
+        :schema => "http://service.ddex.net/xml/ern/41/release-notification.xsd",
+        :version => "4.1",
+        :message_schema_version_id => "ern/41"
+      },
+
       "V382" => {
         :schema => "http://ddex.net/xml/ern/382/release-notification.xsd",
         :version => "3.8.2",
@@ -103,100 +110,118 @@ module DDEX
     mattr_reader :config
     @@config = DEFAULT_CONFIG
 
-    def self.supported_versions
-      config.values.map { |cfg| cfg[:version].dup }.sort
-    end
+    class << self
+      def supported_versions
+        config.values.map { |cfg| cfg[:version].dup }.sort
+      end
 
-    def self.supports?(version)
-      version = version.downcase.strip
-      config.any? { |name,cfg| name == version || cfg[:version] == version || cfg[:message_schema_version_id] == version }
-    end
+      def supports?(version)
+        version = version.downcase.strip
+        config.any? { |name,cfg| name == version || cfg[:version] == version || cfg[:message_schema_version_id] == version }
+      end
 
-    # options[:validate] ???
-    def self.read(xml, options = nil)
-      options ||= {}
-      raise ArgumentError, "options must be a Hash" unless options.is_a?(Hash)
-
-      doc   = parse(xml, options)
-      ver   = options[:version] || doc.root[VERSION_ATTR]
-      klass = load_version(ver)
-
-      begin
-        klass.from_xml(doc)
-      rescue NoMethodError => e         # Yes, fo real... this is from ROXML
-        raise unless e.name == :root    # It's legit
-        raise XMLLoadError, "XML is not well-formed"
-      # This is a subclass of Exception(!) so we must name it
-      rescue ROXML::RequiredElementMissing => e
-        raise XMLLoadError, "missing required element: #{e}"
+      # options[:validate] ???
+      def read(xml, options = nil)
+        options ||= {}
+        raise ArgumentError, "options must be a Hash" unless options.is_a?(Hash)
+
+        doc   = parse(xml, options)
+        ver   = options[:version] || find_version(doc)
+        klass = load_version(ver)
+
+        begin
+          klass.from_xml(doc)
+        rescue NoMethodError => e         # Yes, fo real... this is from ROXML
+          raise unless e.name == :root    # It's legit
+          raise XMLLoadError, "XML is not well-formed"
+        # This is a subclass of Exception(!) so we must name it
+        rescue ROXML::RequiredElementMissing => e
+          raise XMLLoadError, "missing required element: #{e}"
+        end
       end
-    end
 
-    def self.write(object, options = nil)
-      raise ArgumentError, "not a DDEX object" unless object.is_a?(DDEX::Element)
+      def write(object, options = nil)
+        raise ArgumentError, "not a DDEX object" unless object.is_a?(DDEX::Element)
+
+        options ||= {}
+        raise ArgumentError, "options must be a Hash" unless options.is_a?(Hash)
 
-      options ||= {}
-      raise ArgumentError, "options must be a Hash" unless options.is_a?(Hash)
+        xmlopts = options.reject { |k, _| k == :schema }
 
-      xmlopts = options.reject { |k, _| k == :schema }
+        node = object.to_xml
+        return node.to_xml(xmlopts) unless object.class.name.demodulize == ROOT_ELEMENT
 
-      node = object.to_xml
-      return node.to_xml(xmlopts) unless object.respond_to?(:message_schema_version_id) # Is it the root element?
+        schema = schema_location(object, options[:schema])
+        if schema
+          node.add_namespace_definition(XML_SCHEMA_INSTANCE_PREFIX, XML_SCHEMA_INSTANCE_NS)
+          node[XML_SCHEMA_INSTANCE_ATTR] = schema
+        end
 
-      schema = schema_location(object, options[:schema])
-      if schema
-        node.add_namespace_definition(XML_SCHEMA_INSTANCE_PREFIX, XML_SCHEMA_INSTANCE_NS)
-        node[XML_SCHEMA_INSTANCE_ATTR] = schema
+        doc = Nokogiri::XML::Document.new
+        doc.root = node
+        doc.to_xml(xmlopts)
       end
 
-      doc = Nokogiri::XML::Document.new
-      doc.root = node
-      doc.to_xml(xmlopts)
-    end
+      private
+
+      def schema_location(object, schema)
+        # extract version from namespace e.g., DDEX::ERN::V36::NewReleaseMessage
+        ver = object.class.name.split("::")[-2]
+        return unless schema or config.include?(ver)
 
-    private
-    def self.schema_location(object, schema)
-      # extract version from namespace e.g., DDEX::ERN::V36::NewReleaseMessage
-      ver = object.class.name.split("::")[-2]
-      return unless schema or config.include?(ver)
-
-      # Check if it's "NS schema"
-      if schema && schema.strip.include?(" ")
-        schema
-      else
-        sprintf "%s %s", object.class.ns[1], schema || config[ver][:schema]
+        # Check if it's "NS schema"
+        if schema && schema.strip.include?(" ")
+          schema
+        else
+          sprintf "%s %s", object.class.ns[1], schema || config[ver][:schema]
+        end
       end
-    end
 
-    def self.parse(xml, options)
-      xml = File.read(xml) if xml.is_a?(String) and xml !~ /\A\s*<[?\w]/
-      Nokogiri::XML(xml, nil, options[:encoding]) { |cfg| cfg.strict }
-    # ArgumentError means there was a problem with types, expected an int, got a str
-    rescue IOError, SystemCallError, ArgumentError => e
-      raise XMLLoadError, "cannot load XML: #{e}"
-    rescue Nokogiri::XML::SyntaxError => e
-      raise XMLLoadError, "XML parsing error: #{e}"
-    end
+      def find_version(doc)
+        return doc.root[VERSION_ATTR] if doc.root[VERSION_ATTR]
 
-    def self.raise_unknown_version(version)
-      message = "ERN version %s" % (version ? "'#{version}'" : "attribute missing")
-      raise UnknownVersionError, message
-    end
+        # Versions >= 4 don't have VERSION_ATTR so we resort to looking at namespaces.
+        # For example, given: http://ddex.net/xml/ern/41
+        # We'll try to match the end: "ern/41" or "ern/41/"
+        names = doc.collect_namespaces.values
+        version = config.values.find do |cfg|
+          names.any? { |name| name =~ %r|#{ Regexp.quote(cfg[:message_schema_version_id]) }/?\z|i }
+        end
 
-    def self.load_version(version)
-      raise_unknown_version(version) if version.nil?
+        return unless version
+        version[:message_schema_version_id]
+      end
 
-      # Some normalization
-      v = version.strip.gsub(%r{//+}, "/").gsub(%r{\A/|/\Z}, "")
-      klass, _ = config.find do |name, cfg|
-        cfg[:message_schema_version_id] == v || cfg[:version] == v
+      def parse(xml, options)
+        xml = File.read(xml) if xml.is_a?(String) and xml !~ /\A\s*<[?\w]/
+        Nokogiri::XML(xml, nil, options[:encoding]) { |cfg| cfg.strict }
+      # ArgumentError means there was a problem with types, expected an int, got a str
+      rescue IOError, SystemCallError, ArgumentError => e
+        raise XMLLoadError, "cannot load XML: #{e}"
+      rescue Nokogiri::XML::SyntaxError => e
+        raise XMLLoadError, "XML parsing error: #{e}"
       end
-      raise_unknown_version(version) unless klass
 
-      # >= 2.0 allows for one call
-      DDEX::ERN.const_get(klass).const_get(ROOT_ELEMENT)
-    rescue LoadError, NameError => e
-      raise_unknown_version(version)
+      def raise_unknown_version(version)
+        message = "ERN version %s" % (version ? "'#{version}' is unsupported" : "attribute missing")
+        raise UnknownVersionError, message
+      end
+
+      def load_version(version)
+        raise_unknown_version(version) if version.nil?
+
+        # Some normalization
+        v = version.strip.gsub(%r{//+}, "/").gsub(%r{\A/|/\Z}, "")
+        klass, _ = config.find do |name, cfg|
+          cfg[:message_schema_version_id] == v || cfg[:version] == v
+        end
+        raise_unknown_version(version) unless klass
+
+        # >= 2.0 allows for one call
+        DDEX::ERN.const_get(klass).const_get(ROOT_ELEMENT)
+      rescue LoadError, NameError => e
+        raise_unknown_version(version)
+      end
     end
   end
 end

data/lib/ddex/ern/v41.rb

@@ -0,0 +1,11 @@
+#
+# Do not edit. Automatically generated by `rake generate:main`.
+#
+module DDEX
+  module ERN
+    module V41
+      extend DDEX
+      require_standard("ern", "41")
+    end
+  end
+end

data/lib/ddex/ern/v41/additional_title.rb

@@ -0,0 +1,49 @@
+#
+# Auto-generated by jaxb2ruby v0.0.1 on 2020-07-27 20:26:15 -0400
+# https://github.com/sshaw/jaxb2ruby
+#
+#
+# DO NOT MODIFY
+# Automatically generated by jaxb2ruby v0.0.1 (https://github.com/sshaw/jaxb2ruby)
+#
+
+require "roxml"
+require "ddex/element"
+
+require "ddex/ern/v41/display_sub_title"
+
+module DDEX module ERN module V41  # :nodoc: all
+
+class DDEX::ERN::V41::AdditionalTitle < Element
+  include ROXML
+
+
+  xml_name "AdditionalTitle"
+
+      xml_accessor :title_text, :from => "TitleText", :required => true
+      xml_accessor :sub_titles, :as => [DDEX::ERN::V41::DisplaySubTitle], :from => "SubTitle", :required => false
+
+
+  
+      xml_accessor :language_and_script_code, :from => "@LanguageAndScriptCode", :required => false
+    
+  
+      xml_accessor :applicable_territory_code, :from => "@ApplicableTerritoryCode", :required => false
+    
+  
+      xml_accessor :title_type, :from => "@TitleType", :required => false
+    
+  
+      xml_accessor :namespace, :from => "@Namespace", :required => false
+    
+  
+      xml_accessor :user_defined_value, :from => "@UserDefinedValue", :required => false
+    
+  
+      xml_accessor :default?, :from => "@IsDefault", :required => false
+    
+  
+
+end
+
+end end end

data/lib/ddex/ern/v41/administrating_record_company_role.rb

@@ -0,0 +1,35 @@
+#
+# Auto-generated by jaxb2ruby v0.0.1 on 2020-07-27 20:26:15 -0400
+# https://github.com/sshaw/jaxb2ruby
+#
+#
+# DO NOT MODIFY
+# Automatically generated by jaxb2ruby v0.0.1 (https://github.com/sshaw/jaxb2ruby)
+#
+
+require "roxml"
+require "ddex/element"
+
+
+module DDEX module ERN module V41  # :nodoc: all
+
+class DDEX::ERN::V41::AdministratingRecordCompanyRole < Element
+  include ROXML
+
+
+  xml_name "AdministratingRecordCompanyRole"
+
+
+    xml_accessor :value, :from => ".", :required => false
+
+  
+      xml_accessor :namespace, :from => "@Namespace", :required => false
+    
+  
+      xml_accessor :user_defined_value, :from => "@UserDefinedValue", :required => false
+    
+  
+
+end
+
+end end end

data/lib/ddex/ern/v41/administrating_record_company_with_reference.rb

@@ -0,0 +1,31 @@
+#
+# Auto-generated by jaxb2ruby v0.0.1 on 2020-07-27 20:26:15 -0400
+# https://github.com/sshaw/jaxb2ruby
+#
+#
+# DO NOT MODIFY
+# Automatically generated by jaxb2ruby v0.0.1 (https://github.com/sshaw/jaxb2ruby)
+#
+
+require "roxml"
+require "ddex/element"
+
+require "ddex/ern/v41/administrating_record_company_role"
+
+module DDEX module ERN module V41  # :nodoc: all
+
+class DDEX::ERN::V41::AdministratingRecordCompanyWithReference < Element
+  include ROXML
+
+
+  xml_name "AdministratingRecordCompanyWithReference"
+
+      xml_accessor :record_company_party_reference, :from => "RecordCompanyPartyReference", :required => true
+      xml_accessor :role, :as => DDEX::ERN::V41::AdministratingRecordCompanyRole, :from => "Role", :required => true
+
+
+  
+
+end
+
+end end end

data/lib/ddex/ern/v41/affiliation.rb

@@ -0,0 +1,39 @@
+#
+# Auto-generated by jaxb2ruby v0.0.1 on 2020-07-27 20:26:15 -0400
+# https://github.com/sshaw/jaxb2ruby
+#
+#
+# DO NOT MODIFY
+# Automatically generated by jaxb2ruby v0.0.1 (https://github.com/sshaw/jaxb2ruby)
+#
+
+require "roxml"
+require "ddex/element"
+
+require "ddex/ern/v41/current_territory_code"
+require "ddex/ern/v41/simple_rights_type"
+require "ddex/ern/v41/validity_period"
+
+module DDEX module ERN module V41  # :nodoc: all
+
+class DDEX::ERN::V41::Affiliation < Element
+  include ROXML
+
+
+  xml_name "Affiliation"
+
+      xml_accessor :party_affiliate_reference, :from => "PartyAffiliateReference", :required => false
+      xml_accessor :company_name, :from => "CompanyName", :required => false
+      xml_accessor :type, :from => "Type", :required => true
+      xml_accessor :excluded_territory_codes, :as => [DDEX::ERN::V41::CurrentTerritoryCode], :from => "ExcludedTerritoryCode", :required => false
+      xml_accessor :territory_codes, :as => [DDEX::ERN::V41::CurrentTerritoryCode], :from => "TerritoryCode", :required => false
+      xml_accessor :validity_period, :as => DDEX::ERN::V41::ValidityPeriod, :from => "ValidityPeriod", :required => false
+      xml_accessor :rights_types, :as => [DDEX::ERN::V41::SimpleRightsType], :from => "RightsType", :required => false
+      xml_accessor :percentage_of_rights_assignment, :as => Float, :from => "PercentageOfRightsAssignment", :required => false
+
+
+  
+
+end
+
+end end end