emery 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8dc449ad3ba135140479a6711b016e63bfc30f9fd6dcf6dba8ff78ee71208a6a
-  data.tar.gz: 9c2f86bde90521cfa5adb78eda8ceef5504c2fbcf44de558cf2450c550cea96e
+  metadata.gz: e7526be75b8c44c624947657c22214dd7715170e1bbdb8b46a8369a6ca66d4fc
+  data.tar.gz: 5483955dd2c563ca2c6c04662aea8bc1f9b4a5e34817b9d60a046afa32ca5a04
 SHA512:
-  metadata.gz: e9695fe9eeed44ad9d3bc33e1dc92ae4de5a31e024c7fa9ba1fa34dbd3df554cf5cd73e9634dbaec1246ca80b8ac536fd1020b129ef26d9973512c34ca77b920
-  data.tar.gz: 8f7b8961c1c39cf2a354163725bd1fc761e620627ebbb73cb1dd91c7d5746bdc6fd937ccc17fa2bf70ef7af826dd0eb60f09102a4b27ab7f6cf1343633686ecf
+  metadata.gz: e1e408199c42d0c877c1ca9be978f698357449ac9f4c909c6157ec190bfb83f19434184e68bf7ab6cf96b93007e6658f1eae1f744c57a97d8fae0231eed03a76
+  data.tar.gz: 80f702c3cd1bd7edd8359a03576519db0002efcedd3db144ef1c3e94192ccd6fb129dd0ac8a25177f9d9dd96f016f3cf84c4237e69fe5d2e15c12f2790530456

data/lib/emery/jsoner.rb

@@ -76,6 +76,31 @@ module Emery
       end
     end
 
+    T::UnionType.class_eval do
+      def jsoner_deserialize(json_value)
+        if !json_value.is_a?(Hash)
+          raise JsonerError.new("JSON value type #{json_value.class} is not Hash")
+        end
+        if json_value.keys.length != 1
+          raise JsonerError.new("JSON value #{json_value} should have only one key to represent union type, found #{json_value.keys.length}")
+        end
+        case_key = json_value.keys[0]
+        if not cases.key? case_key.to_sym
+          raise JsonerError.new("JSON key '#{case_key}' does not match any case in union type #{self}")
+        end
+        type = cases[case_key.to_sym]
+        case_json_value = json_value[case_key]
+        return Jsoner.deserialize(type, case_json_value)
+      end
+      def jsoner_serialize(value)
+        T.check(self, value)
+        type = types.find {|t| T.instance_of?(t, value) }
+        case_key = cases.key(type)
+        result = { case_key => Jsoner.serialize(type, value) }
+        result
+      end
+    end
+
     T::Nilable.class_eval do
       def jsoner_deserialize(json_value)
         if json_value != nil

data/lib/emery/type.rb

@@ -42,20 +42,27 @@ module Emery
         "Any[#{types.map { |t| t.to_s}.join(', ')}]"
       end
       def check(value)
-        types.each do |type|
-          begin
-            T.check(type, value)
-            return
-          rescue TypeError
-          end
+        type = types.find {|t| T.instance_of?(t, value) }
+        if type == nil
+          raise TypeError.new("Value '#{value.inspect.to_s}' type is #{value.class} - any of #{@types.map { |t| t.to_s}.join(', ')} required")
         end
-        raise TypeError.new("Value '#{value.inspect.to_s}' type is #{value.class} - any of #{@types.map { |t| t.to_s}.join(', ')} required")
       end
       def ==(other)
         T.instance_of?(AnyType, other) and (self.types - other.types).empty?
       end
     end
 
+    class UnionType < AnyType
+      attr_reader :cases
+      def initialize(cases)
+        @cases = cases
+        super(*cases.values)
+      end
+      def to_s
+        "Union[#{cases.map { |k, t| "#{k}: #{t}"}.join(', ')}]"
+      end
+    end
+
     class ArrayType
       attr_reader :item_type
       def initialize(item_type)
@@ -159,6 +166,10 @@ module Emery
       AnyType.new(*typdefs)
     end
 
+    def T.union(*cases)
+      UnionType.new(*cases)
+    end
+
     def T.check_var(var_name, type, value)
       begin
         check(type, value)

data/test/jsoner_test.rb

@@ -216,13 +216,13 @@ module Emery
   end
 
   class AnyDeserialization < Test::Unit::TestCase
-    def test_deserialize_any
+    def test_deserialize
       data = Jsoner.from_json(T.any(String, Integer), '"the string"')
       T.check(T.any(String, Integer), data)
       assert_equal "the string", data, "Should parse any type"
     end
 
-    def test_deserialize_any_fail
+    def test_deserialize_fail
       assert_raise JsonerError do
         Jsoner.from_json(T.any(Integer, Float), '"the string"')
       end
@@ -230,10 +230,31 @@ module Emery
   end
 
   class AnySerialization < Test::Unit::TestCase
-    def test_serialize_any
+    def test_serialize
       data = Jsoner.to_json(T.any(String, Integer), "the string")
       T.check(T.any(String, Integer), data)
       assert_equal '"the string"', data, "Should serialize any type"
     end
   end
+
+  class UnionDeserialization < Test::Unit::TestCase
+    def test_deserialize
+      data = Jsoner.from_json(T.union(str: String, int: Integer), '{"str":"the string"}')
+      T.check(T.union(str: String, int: Integer), data)
+      assert_equal "the string", data, "Should parse union type"
+    end
+
+    def test_deserialize_any_fail
+      assert_raise JsonerError do
+        Jsoner.from_json(T.union(str: String, int: Integer), '{"bool":true}')
+      end
+    end
+  end
+
+  class UnionSerialization < Test::Unit::TestCase
+    def test_serialize
+      data = Jsoner.to_json(T.union(str: String, int: Integer), "the string")
+      assert_equal '{"str":"the string"}', data, "Should serialize union type with wrapping object"
+    end
+  end
 end

data/test/type_test.rb

@@ -70,6 +70,28 @@ module Emery
     end
   end
 
+  class TypeToString < Test::Unit::TestCase
+    def test_nilable
+      assert_equal "Nilable[Integer]", T.nilable(Integer).to_s
+    end
+
+    def test_array
+      assert_equal "Array[Integer]", T.array(Integer).to_s
+    end
+
+    def test_hash
+      assert_equal "Hash[String, Integer]", T.hash(String, Integer).to_s
+    end
+
+    def test_any
+      assert_equal "Any[String, Integer]", T.any(String, Integer).to_s
+    end
+
+    def test_union
+      assert_equal "Union[str: String, int: Integer]", T.union(str: String, int: Integer).to_s
+    end
+  end
+
   class TypeCheck < Test::Unit::TestCase
     def test_nil
       assert_equal nil, T.check(NilClass, nil)
@@ -182,4 +204,17 @@ module Emery
       end
     end
   end
+
+  class TypeCheckUnion < Test::Unit::TestCase
+    def test_success
+      assert_equal(123, T.check(T.union(str: String, int: Integer), 123))
+    end
+
+    def test_fail
+      assert_raise TypeError do
+        T.check(T.union(str: String, int: Integer), true)
+      end
+    end
+  end
+
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: emery
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Vladimir Sapronov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-03-25 00:00:00.000000000 Z
+date: 2020-03-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json