thrift-validator 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7d2072d19fcac9ac4d9e44efc3d1a9b360fde931
-  data.tar.gz: 861205ed86104587b4a8fe319f5771c95f9733a4
+  metadata.gz: c4e1c8126e551341a317cadd64f4808072bf943b
+  data.tar.gz: 477cce1e6c427a3a9464c95f2d00430baf236e24
 SHA512:
-  metadata.gz: b038a575a75faeb0b986f76ce8dfb265d8a31bcdc45d80cd51fed0ff459708096b2ecae3b0ec8cec266b70d441bfff634c4ab141087ff37ade1cae552386f583
-  data.tar.gz: 05ee95200e54ff7a6a027a58d160b2fecc15b341e80f0480a9cae6856f1278b9b1383ea25ed922df99ce6c708a74e3cf31f1ffc8ea134e1925888d80685534e0
+  metadata.gz: 4053c7fad656046a406d9d81681a106c30d53506abc9071a7fad2195dda4398fb92ce64aacafbe0a7b7c00675b86982e5575812d6f95e8e30cb8fe4e927cfe35
+  data.tar.gz: b776e8638590c4a59b297e9730d9bcc41f153f1741efa4919688d240998644347246929f8851cff8c4ef7d20dedf786f15d474af6f577b4d24b842ccfced5e8b

data/lib/thrift/validator.rb

@@ -4,7 +4,12 @@ require 'thrift'
 module Thrift
   class Validator
     def validate(source)
-      source.validate
+      begin
+        source.validate
+      rescue Thrift::ProtocolException => ex
+        message = "#{source.class.name}: #{ex}"
+        raise Thrift::ProtocolException.new(ex.type, message)
+      end
 
       source.struct_fields.each_pair do |_, field|
         type, name = field.fetch(:type), field.fetch(:name)

data/lib/thrift/validator/version.rb

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

data/test/exceptions_test.rb

@@ -0,0 +1,25 @@
+require_relative 'test_helper'
+
+class ExceptionsTest < MiniTest::Unit::TestCase
+  def test_exception_message_contains_class_name
+    # The error is in NestedExample - required_struct is unset
+    struct = NestedExample.new required_struct: nil
+
+    ex = assert_raises Thrift::ProtocolException do
+      Thrift::Validator.new.validate(struct)
+    end
+    assert_match /NestedExample/, ex.message
+  end
+
+  def test_exception_message_contains_nested_class_name
+    # Here NestedExample is valid, but the error is one level down
+    # in SimpleStruct (its required_string is unset)
+    struct = NestedExample.new
+    struct.required_struct = SimpleStruct.new required_string: nil
+
+    ex = assert_raises Thrift::ProtocolException do
+      Thrift::Validator.new.validate(struct)
+    end
+    assert_match /SimpleStruct/, ex.message
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: thrift-validator
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - ahawkins
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-22 00:00:00.000000000 Z
+date: 2015-01-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thrift
@@ -70,6 +70,7 @@ files:
 - lib/thrift/validator/version.rb
 - test.thrift
 - test/acceptance_test.rb
+- test/exceptions_test.rb
 - test/test_helper.rb
 - thrift-validator.gemspec
 - vendor/gen-rb/test_constants.rb
@@ -100,4 +101,5 @@ specification_version: 4
 summary: Recursive thrift struct validator
 test_files:
 - test/acceptance_test.rb
+- test/exceptions_test.rb
 - test/test_helper.rb