ddex 0.0.9 → 0.0.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3d0dd9e71e077ab5f968d649091b9ef8dfed3024ea3ca3393ea1f010fc622285
-  data.tar.gz: 6f3df8009266c1879503bc5678d228068b195764ac0075cd890e9e61adf40641
+  metadata.gz: 565c3680449c31b958b74485d5d224c49d86ecd78a3ef2321c0ad973a9e45dcb
+  data.tar.gz: 6479b38c4d334b940682be3788131ddcc295fc3522a9a52c960bab109467e3aa
 SHA512:
-  metadata.gz: 7d6d190de025c4d53254a889eedd1a43f1f54f6de15d785f2452f9300ccea16749116cc95976b418a8191a3afa0fd9e5f0243e655b9df09718cb1a71d9755119
-  data.tar.gz: 8848ac8988e964ca89c52f1131e351312bdddbc753393df3c2d11ed88816f76c5c0f23bfa0bc167ec4ad53c13e8ceb5cb2e3b14217e40b2666b2d9a04e0d4047
+  metadata.gz: 17ee2748624cb79d3aac20b522b37c751d3510d2ddab4c71e1e7eae33ca9f2c89757340a6aa3b4b9944e971e4b198cba220372c36d91f107912082fc5b51d932
+  data.tar.gz: 4981963a5545997690d8bf313d9883308b4d41afea5013b1f5c0a713cc007644453f5f321c44a1428f2d889f3c64183b837c0bf85ceec7f28f417da1838b1423

data/README.rdoc

@@ -1,6 +1,6 @@
 = DDEX
 
-{<img src="https://secure.travis-ci.org/sshaw/ddex.svg"/>}[http://travis-ci.org/sshaw/ddex]
+{<img src="https://github.com/sshaw/ddex/workflows/CI/badge.svg"/>}[https://github.com/sshaw/ddex/actions/workflows/ci.yml]
 
 {DDEX}[http://ddex.net] metadata serialization for Ruby
 

data/lib/ddex/element.rb

@@ -25,7 +25,7 @@ module DDEX
     #
     # === Arguments
     #
-    # [attributes (Hash)] Values to set on the instance's attributes, a nested +Hash+ <b>will not</b> result in instantiation of child objects.
+    # [attributes (Hash)] Values to set on the instance's attributes, a nested +Hash+ will result in instantiation of child objects.
     #
     # === Errors
     #
@@ -40,8 +40,21 @@ module DDEX
         method = "#{name}="
         next unless attr = roxml_attributes[name] and respond_to?(method)
 
-        value = Array(value) if !attr.sought_type.instance_of?(Symbol) && attr.array? # If it's not a ROXML directive && ...
-        send(method, value)
+        if !attr.sought_type.instance_of?(Symbol) && attr.array? # If it's not a ROXML directive && ...
+          value = Array(value)
+        end
+
+        if !value.is_a?(DDEX::Element) && attr.sought_type.is_a?(Class) && attr.sought_type.ancestors.include?(DDEX::Element)
+          value = if attr.array? && value.is_a?(Array)
+            value.map { |v| v.is_a?(DDEX::Element) ? v : attr.sought_type.new(v) }
+          elsif !value.is_a?(Hash)
+            attr.sought_type.new(name => value)
+          else
+            attr.sought_type.new(value)
+          end
+        end
+
+        public_send(method, value)
       end
     end
 

data/lib/ddex/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module DDEX
-  VERSION = "0.0.9"
+  VERSION = "0.0.10"
 end

data/spec/element_spec.rb

@@ -45,7 +45,7 @@ describe DDEX::Element do
     end
   end
 
-  describe "#new" do
+  describe "#initialize" do
     it "sets the instance's attributes" do
       nested = parent_attr
       nested[:child] = Child.new(child_attr)
@@ -58,6 +58,22 @@ describe DDEX::Element do
       expect(parent.child).to eq nested[:child]
       expect(parent.children).to eq nested[:children]
     end
+
+    it "instantiates the object tree from a nested attribute hash" do
+      attributes = parent_attr.merge(:child => child_attr, :children => [ child_attr ])
+      parent = Parent.new(attributes)
+
+      expect(parent.name).to eq "sshaw"
+      expect(parent.numbers).to eq [1,2,3]
+
+      expect(parent.child).to_not be_nil
+      expect(parent.child.name).to eq "fofinha"
+      expect(parent.child.numbers).to eq [4,5,6]
+
+      expect(parent.children.size).to eq 1
+      expect(parent.children[0].name).to eq "fofinha"
+      expect(parent.children[0].numbers).to eq [4,5,6]
+    end
   end
 
   describe "#to_hash" do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ddex
 version: !ruby/object:Gem::Version
-  version: 0.0.9
+  version: 0.0.10
 platform: ruby
 authors:
 - Skye Shaw
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-03-30 00:00:00.000000000 Z
+date: 2022-12-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
@@ -4047,62 +4047,62 @@ signing_key:
 specification_version: 4
 summary: DDEX metadata serialization
 test_files:
-- spec/element_spec.rb
-- spec/ern/341_spec.rb~
+- spec/spec_helper.rb
 - spec/ern/34_spec.rb~
-- spec/ern/36_spec.rb~
 - spec/ern/v36_spec.rb~
-- spec/ern/versions_spec.rb
+- spec/ern/341_spec.rb~
+- spec/ern/36_spec.rb~
 - spec/ern/versions_spec.rb~
+- spec/ern/versions_spec.rb
+- spec/element_spec.rb
+- spec/support/ddex_element.rb
 - spec/ern_spec.rb
-- spec/ern_spec.rb~
-- spec/fixtures/ern/312/instance1.xml
-- spec/fixtures/ern/33/instance1.xml
+- spec/fixtures/ern36.xml~
+- spec/fixtures/ern/35/instance1.xml
 - spec/fixtures/ern/34/instance1.xml
+- spec/fixtures/ern/33/instance1.xml
+- spec/fixtures/ern/37D2/instance1.xml
+- spec/fixtures/ern/37D2/instance1.xml~
 - spec/fixtures/ern/341/instance1.xml
-- spec/fixtures/ern/35/instance1.xml
-- spec/fixtures/ern/351/instance1.xml
-- spec/fixtures/ern/36/instance1.xml
-- spec/fixtures/ern/37/instance1.xml
-- spec/fixtures/ern/37/instance2.xml
+- spec/fixtures/ern/383/instance1.xml
+- spec/fixtures/ern/42/6 Ringtone.xml
+- spec/fixtures/ern/42/4 SimpleAudioSingle.xml
+- spec/fixtures/ern/42/1 Audio.xml~
+- spec/fixtures/ern/42/5 SimpleVideoSingle.xml
+- spec/fixtures/ern/42/5 SimpleVideoSingle.xml~
+- spec/fixtures/ern/42/7 LongformMusicalWorkVideo.xml
+- spec/fixtures/ern/42/2 Video.xml
+- spec/fixtures/ern/42/6 Ringtone.xml~
+- spec/fixtures/ern/42/8 DjMix.xml
+- spec/fixtures/ern/42/1 Audio.xml
+- spec/fixtures/ern/42/4 SimpleAudioSingle.xml~
+- spec/fixtures/ern/42/3 MixedMedia.xml
+- spec/fixtures/ern/312/instance1.xml
 - spec/fixtures/ern/371/instance1.xml
 - spec/fixtures/ern/371/instance1.xml~
-- spec/fixtures/ern/37D2/instance1.xml
-- spec/fixtures/ern/37D2/instance1.xml~
 - spec/fixtures/ern/38/instance1.xml
-- spec/fixtures/ern/381/instance1.xml
-- spec/fixtures/ern/383/instance1.xml
-- spec/fixtures/ern/41/instance1.xml
-- spec/fixtures/ern/411/1 Audio.xml
-- spec/fixtures/ern/411/1 Audio.xml~
-- spec/fixtures/ern/411/2 Video.xml
-- spec/fixtures/ern/411/2 Video.xml~
-- spec/fixtures/ern/411/3 MixedMedia.xml
-- spec/fixtures/ern/411/3 MixedMedia.xml~
+- spec/fixtures/ern/36/instance1.xml
+- spec/fixtures/ern/37/instance2.xml
+- spec/fixtures/ern/37/instance1.xml
+- spec/fixtures/ern/351/instance1.xml
+- spec/fixtures/ern/411/6 Ringtone.xml
 - spec/fixtures/ern/411/4 SimpleAudioSingle.xml
-- spec/fixtures/ern/411/4 SimpleAudioSingle.xml~
+- spec/fixtures/ern/411/8 DjMix.xml~
+- spec/fixtures/ern/411/1 Audio.xml~
 - spec/fixtures/ern/411/5 SimpleVideoSingle.xml
 - spec/fixtures/ern/411/5 SimpleVideoSingle.xml~
-- spec/fixtures/ern/411/6 Ringtone.xml
-- spec/fixtures/ern/411/6 Ringtone.xml~
 - spec/fixtures/ern/411/7 LongformMusicalWorkVideo.xml
 - spec/fixtures/ern/411/7 LongformMusicalWorkVideo.xml~
-- spec/fixtures/ern/411/8 DjMix.xml
-- spec/fixtures/ern/411/8 DjMix.xml~
 - spec/fixtures/ern/411/x.xml~
-- spec/fixtures/ern/42/1 Audio.xml
-- spec/fixtures/ern/42/1 Audio.xml~
-- spec/fixtures/ern/42/2 Video.xml
-- spec/fixtures/ern/42/3 MixedMedia.xml
-- spec/fixtures/ern/42/4 SimpleAudioSingle.xml
-- spec/fixtures/ern/42/4 SimpleAudioSingle.xml~
-- spec/fixtures/ern/42/5 SimpleVideoSingle.xml
-- spec/fixtures/ern/42/5 SimpleVideoSingle.xml~
-- spec/fixtures/ern/42/6 Ringtone.xml
-- spec/fixtures/ern/42/6 Ringtone.xml~
-- spec/fixtures/ern/42/7 LongformMusicalWorkVideo.xml
-- spec/fixtures/ern/42/8 DjMix.xml
+- spec/fixtures/ern/411/2 Video.xml
+- spec/fixtures/ern/411/6 Ringtone.xml~
+- spec/fixtures/ern/411/8 DjMix.xml
+- spec/fixtures/ern/411/1 Audio.xml
+- spec/fixtures/ern/411/2 Video.xml~
+- spec/fixtures/ern/411/4 SimpleAudioSingle.xml~
+- spec/fixtures/ern/411/3 MixedMedia.xml~
+- spec/fixtures/ern/411/3 MixedMedia.xml
+- spec/fixtures/ern/41/instance1.xml
+- spec/fixtures/ern/381/instance1.xml
 - spec/fixtures/ern36.xml
-- spec/fixtures/ern36.xml~
-- spec/spec_helper.rb
-- spec/support/ddex_element.rb
+- spec/ern_spec.rb~