thrift-validator 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d1e1282790eab6d2034f8f05da9d4512102c59be
-  data.tar.gz: 50535756f602fcf6c60b4f2ef47222fc28e75e6d
+  metadata.gz: 3f917d062bb6cba06853a570d6e390e66ddc210d
+  data.tar.gz: 5e41fa2667cea5cc6e360fa3a593de38cf19faf1
 SHA512:
-  metadata.gz: f59768669a591b41eeb0c1802252ba2256f53800c18242cf21196496c9dc13b08535a52098ed7b9302a2499f97971dddd93e9a2146bf5380e6aa78c73a28c124
-  data.tar.gz: 96421ce8b108eb57fee36cfa5e1e18b0dd318c2081573110c796320438b0c3612054fd7a38d2066caa4236cb1c7deb66e9588731d5fedc45507c7724d68a91dc
+  metadata.gz: bbbf1149166c7616571275d48b3f78be4470c69662426f63cb046eea30e3134722430fdc2f3fe2069fb711103cc4a7c264b966fb373ee6f90b90a614b4c87cd9
+  data.tar.gz: 3d1c69299e2b8a9432b37a6e6d2e807f4227353c77d501abaafa9cc133cc2546b0b7cfe9026b99f24a48cc663af2fb28d961a5d433c105de81e91f9fb357d834

data/Makefile

@@ -7,3 +7,7 @@ $(THRIFT): test.thrift
 .PHONY: test
 test: $(THRIFT)
 	bundle exec rake test
+
+.PHONY:
+release:
+	bundle exec rake release

data/lib/thrift/validator/version.rb

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

data/lib/thrift/validator.rb

@@ -12,19 +12,19 @@ module Thrift
         when Types::STRUCT
           validate source.send(name)
         when Types::LIST, Types::SET
-          Array(source.send(name)).each do |item|
-            validate item
+          if recurse? field.fetch(:element)
+            Array(source.send(name)).each do |item|
+              validate item
+            end
           end
         when Types::MAP
-          key_field = field.fetch(:key)
-          if key_field[:class] && key_field[:class] < ::Thrift::Struct
+          if recurse? field.fetch(:key)
             Hash(source.send(name)).each_key do |key_value|
               validate key_value
             end
           end
 
-          value_field = field.fetch(:value)
-          if value_field[:class] && value_field[:class] < ::Thrift::Struct
+          if recurse? field.fetch(:value)
             Hash(source.send(name)).each_value do |value_value|
               validate value_value
             end
@@ -32,5 +32,9 @@ module Thrift
         end
       end
     end
+
+    def recurse?(field)
+      field[:class] && field[:class] < ::Thrift::Struct
+    end
   end
 end

data/test/acceptance_test.rb

@@ -46,6 +46,12 @@ class AcceptanceTest < MiniTest::Unit::TestCase
     assert_valid struct
   end
 
+  def test_passes_with_primitives_list
+    struct = StringListExample.new
+    struct.required_list = [ 'foo' ]
+    assert_valid struct
+  end
+
   def test_fails_if_a_nested_set_item_is_invalid
     struct = SetExample.new
     struct.required_set = Set.new([ SimpleStruct.new ])
@@ -66,6 +72,12 @@ class AcceptanceTest < MiniTest::Unit::TestCase
     assert_valid struct
   end
 
+  def test_passes_with_primitives_set
+    struct = StringSetExample.new
+    struct.required_set = Set.new([ 'foo' ])
+    assert_valid struct
+  end
+
   def test_fails_if_nested_map_key_is_invalid
     struct = MapKeyExample.new
     struct.required_map = { SimpleStruct.new => 'foo' }

data/test.thrift

@@ -13,6 +13,14 @@ struct ListExample {
   2: optional list<SimpleStruct> optional_list
 }
 
+struct StringListExample {
+  1: required list<string> required_list
+}
+
+struct StringSetExample {
+  1: required set<string> required_set
+}
+
 struct SetExample {
   1: required set<SimpleStruct> required_set
   2: optional set<SimpleStruct> optional_set

data/vendor/gen-rb/test_types.rb

@@ -63,6 +63,40 @@ class ListExample
   ::Thrift::Struct.generate_accessors self
 end
 
+class StringListExample
+  include ::Thrift::Struct, ::Thrift::Struct_Union
+  REQUIRED_LIST = 1
+
+  FIELDS = {
+    REQUIRED_LIST => {:type => ::Thrift::Types::LIST, :name => 'required_list', :element => {:type => ::Thrift::Types::STRING}}
+  }
+
+  def struct_fields; FIELDS; end
+
+  def validate
+    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::UNKNOWN, 'Required field required_list is unset!') unless @required_list
+  end
+
+  ::Thrift::Struct.generate_accessors self
+end
+
+class StringSetExample
+  include ::Thrift::Struct, ::Thrift::Struct_Union
+  REQUIRED_SET = 1
+
+  FIELDS = {
+    REQUIRED_SET => {:type => ::Thrift::Types::SET, :name => 'required_set', :element => {:type => ::Thrift::Types::STRING}}
+  }
+
+  def struct_fields; FIELDS; end
+
+  def validate
+    raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::UNKNOWN, 'Required field required_set is unset!') unless @required_set
+  end
+
+  ::Thrift::Struct.generate_accessors self
+end
+
 class SetExample
   include ::Thrift::Struct, ::Thrift::Struct_Union
   REQUIRED_SET = 1

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: thrift-validator
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - ahawkins
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-14 00:00:00.000000000 Z
+date: 2015-01-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thrift