tucana 0.0.41 → 0.0.42

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 47aabadf94fec0756d3a3a4081f068ad8d56c7ec3a1a855f2023e5d7ae4534d7
-  data.tar.gz: a3ec619671214d7640bbac464d1c07ae056344e0afdeac83deaf0299937f82fe
+  metadata.gz: add586d464b13411b6d92c081e32e4fdd378c70507025c0c36bdfc749f05fee1
+  data.tar.gz: 484c0a0e5dc2b84491666d48f30d65dbd095f7777cd501bfe084f06389b49ef8
 SHA512:
-  metadata.gz: 0dbc4056100694b6f8f680d23c83a3c9ad2a9a1c998dda86f5db4685219593cb2a63f7f38e8243d36f8097971bac63f409cfe0b5a155215498a1064be793240c
-  data.tar.gz: 8d793afa5c5a52bcd725a66e1bf6e0e63916e2f2f22953e234e25a62c9de242f3aa154767ca1e967f65fbe97881d91db969ba2ed7cf0ac9b86c2753c6cefe154
+  metadata.gz: 0b58936817c15d06f6b583fac36a3f98d440482c5024c9bf0ba6ccd117ff3736694410b995fa0f64193e1afdee2a33604a9ad9108b3109cbe1139f6c9f1f8d08
+  data.tar.gz: 985702518c6936fa15c18cd00db66694fa2491c31f3b318b77f8cdc2538929ddcea200edef78053eb2ac29ed03338ad944699e806e15cf47cf6630adde6e04f0

data/lib/tucana/shared/shared.data_type.rb

@@ -177,11 +177,13 @@ module Tucana
 
     DataTypeIdentifier.class_eval do
       def to_h
-        {
-          data_type_identifier: self.data_type_identifier,
-          generic_type: self.generic_type ? self.generic_type.to_h : nil,
-          generic_key: self.generic_key,
-        }
+        if !self.data_type_identifier.empty?
+          return { data_type_identifier: self.data_type_identifier }
+        elsif !self.generic_type.nil?
+          return { generic_type: self.generic_type.to_h }
+        elsif !self.generic_key.nil?
+          return { generic_key: self.generic_key }
+        end
       end
 
       def from_hash(config)
@@ -210,18 +212,18 @@ module Tucana
     GenericType.class_eval do
       def to_h
         {
-          data_type_identifier: self.data_type_identifier.to_h,
-          generic_mapper: self.generic_mapper ? self.generic_mapper.to_h : nil,
+          data_type_identifier: self.data_type_identifier,
+          generic_mappers: self.generic_mappers.map(&:to_h),
         }
       end
 
       def from_hash(config)
         if config.key?(:data_type_identifier)
-          self.data_type_identifier = DataTypeIdentifier.from_hash(config.fetch(:data_type_identifier))
+          self.data_type_identifier = config.fetch(:data_type_identifier)
         end
 
-        if config.key?(:generic_mapper)
-          self.generic_mapper = GenericMapper.from_hash(config.fetch(:generic_mapper))
+        if config.key?(:generic_mappers)
+          self.generic_mappers = config.fetch(:generic_mappers).map { |mapper_config| GenericMapper.from_hash(mapper_config) }
         end
 
         self
@@ -235,24 +237,17 @@ module Tucana
     GenericMapper.class_eval do
       def to_h
         {
-          data_type_identifier: self.data_type_identifier.to_h,
-          generic_key: self.generic_key,
-          source: self.source,
+          target: self.target,
+          source: self.source.to_h,
+          generic_combinations: self.generic_combinations.map(&:to_h),
         }
       end
 
       def from_hash(config)
-        if config.keys.intersection([:data_type_identifier, :generic_key]).count > 1
-          raise UnexpectedType, "Cannot have more than one type"
-        end
-
-        if config.key?(:data_type_identifier)
-          self.data_type_identifier = DataTypeIdentifier.from_hash(config.fetch(:data_type_identifier))
-        elsif config.key?(:generic_key)
-          self.generic_key = config.fetch(:generic_key)
-        end
-
-        self.source = config[:source]
+        self.target = config[:target]
+        self.source = DataTypeIdentifier.from_hash(config.fetch(:source))
+        self.generic_combinations = config.fetch(:generic_combinations, [])
+        self
       end
 
       def self.from_hash(config)

data/lib/tucana/version.rb

@@ -4,5 +4,5 @@
 # to update the version, run "bundle exec rake release:version[NEW_VERSION]".
 
 module Tucana
-  VERSION = "0.0.41"
+  VERSION = "0.0.42"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tucana
 version: !ruby/object:Gem::Version
-  version: 0.0.41
+  version: 0.0.42
 platform: ruby
 authors:
 - Niklas van Schrick