thrift-validator 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3f917d062bb6cba06853a570d6e390e66ddc210d
-  data.tar.gz: 5e41fa2667cea5cc6e360fa3a593de38cf19faf1
+  metadata.gz: 7d2072d19fcac9ac4d9e44efc3d1a9b360fde931
+  data.tar.gz: 861205ed86104587b4a8fe319f5771c95f9733a4
 SHA512:
-  metadata.gz: bbbf1149166c7616571275d48b3f78be4470c69662426f63cb046eea30e3134722430fdc2f3fe2069fb711103cc4a7c264b966fb373ee6f90b90a614b4c87cd9
-  data.tar.gz: 3d1c69299e2b8a9432b37a6e6d2e807f4227353c77d501abaafa9cc133cc2546b0b7cfe9026b99f24a48cc663af2fb28d961a5d433c105de81e91f9fb357d834
+  metadata.gz: b038a575a75faeb0b986f76ce8dfb265d8a31bcdc45d80cd51fed0ff459708096b2ecae3b0ec8cec266b70d441bfff634c4ab141087ff37ade1cae552386f583
+  data.tar.gz: 05ee95200e54ff7a6a027a58d160b2fecc15b341e80f0480a9cae6856f1278b9b1383ea25ed922df99ce6c708a74e3cf31f1ffc8ea134e1925888d80685534e0

data/lib/thrift/validator.rb

@@ -10,7 +10,11 @@ module Thrift
         type, name = field.fetch(:type), field.fetch(:name)
         case type
         when Types::STRUCT
-          validate source.send(name)
+          next if source.kind_of?(Union) && source.get_set_field.to_s != name
+
+          if source.send(name)
+            validate source.send(name)
+          end
         when Types::LIST, Types::SET
           if recurse? field.fetch(:element)
             Array(source.send(name)).each do |item|

data/lib/thrift/validator/version.rb

@@ -1,5 +1,5 @@
 module Thrift
   class Validator
-    VERSION = "0.1.1"
+    VERSION = "0.1.2"
   end
 end

data/test.thrift

@@ -35,3 +35,8 @@ struct MapValueExample {
   1: required map<string, SimpleStruct> required_map
   2: optional map<string, SimpleStruct> optional_map
 }
+
+union UnionExample {
+  1: SimpleStruct primary
+  2: string alternate
+}

data/test/acceptance_test.rb

@@ -26,6 +26,12 @@ class AcceptanceTest < MiniTest::Unit::TestCase
     assert_valid struct
   end
 
+  def test_passes_if_nested_optional_struct_is_omitted
+    struct = NestedExample.new
+    struct.required_struct = SimpleStruct.new required_string: 'foo'
+    assert_valid struct
+  end
+
   def test_fails_if_a_nested_list_item_is_invalid
     struct = ListExample.new
     struct.required_list = [ SimpleStruct.new ]
@@ -118,6 +124,31 @@ class AcceptanceTest < MiniTest::Unit::TestCase
     assert_valid struct
   end
 
+  def test_fails_if_no_union_fields_set
+    union = UnionExample.new
+    assert_raises(StandardError) do
+      Thrift::Validator.new.validate(union)
+    end
+  end
+
+  def test_fails_if_union_set_field_is_invalid
+    union = UnionExample.new
+    union.primary = SimpleStruct.new
+    refute_valid union
+  end
+
+  def test_passes_if_union_set_field_is_valid
+    union = UnionExample.new
+    union.primary = SimpleStruct.new required_string: 'foo'
+    assert_valid union
+  end
+
+  def test_passes_if_unions_alternate_value_is_provided
+    union = UnionExample.new
+    union.alternate = 'foo'
+    assert_valid union
+  end
+
   private
 
   def refute_valid(struct)

data/vendor/gen-rb/test_types.rb

@@ -154,3 +154,32 @@ class MapValueExample
   ::Thrift::Struct.generate_accessors self
 end
 
+class UnionExample < ::Thrift::Union
+  include ::Thrift::Struct_Union
+  class << self
+    def primary(val)
+      UnionExample.new(:primary, val)
+    end
+
+    def alternate(val)
+      UnionExample.new(:alternate, val)
+    end
+  end
+
+  PRIMARY = 1
+  ALTERNATE = 2
+
+  FIELDS = {
+    PRIMARY => {:type => ::Thrift::Types::STRUCT, :name => 'primary', :class => ::SimpleStruct},
+    ALTERNATE => {:type => ::Thrift::Types::STRING, :name => 'alternate'}
+  }
+
+  def struct_fields; FIELDS; end
+
+  def validate
+    raise(StandardError, 'Union fields are not set.') if get_set_field.nil? || get_value.nil?
+  end
+
+  ::Thrift::Union.generate_accessors self
+end
+

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: thrift-validator
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - ahawkins