service_contract 0.0.7 → 0.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ee4858e3b13b2a6f81dcec74ed7fe5bf0844bd1e
-  data.tar.gz: f96f3c732a2fb5ecab8268cfda2a2e86048d7431
+  metadata.gz: 0a89e3a05c63f0cd654e67c928d715402fa1c944
+  data.tar.gz: 6080110653f611f5cfbe03ec81612f52b60f60a9
 SHA512:
-  metadata.gz: 823d6d06c37ad5dbb1c876e537f874910ffa0a8f98bfa5eb8a9090d9bcb4e94b9618158b51a21dfb2205e61317bd9caced1a7203ee74ee864443d504f72dedc7
-  data.tar.gz: 3f5e6cca2da6c3fefa541290d17a7877468b52fb9b28bcb51ce6300c9c4ed23aa3a2d745b0b0c7856c34ac097fa2aaa5bce58e7329ce24b89310eb18709e05d3
+  metadata.gz: 548643b68055c8241f3c8d7746b1c08255d935c5f33584961b58e81598635449d4858aabf2fffed729da10a437e726aa34323a0098d4c957e60db1d4896bfb0c
+  data.tar.gz: f03f58fa109ceb830b2dd3eb8f79db36058471d07c48b27cce7b8db954348518a6fa2c9e93f3763efd682ad477bc5c11af4fb2154eb6e8041b8b118e382ce02a

data/lib/service_contract/abstract_type.rb

@@ -11,5 +11,17 @@ module ServiceContract
     def fields
       []
     end
+
+    def array?
+      false
+    end
+
+    def complex?
+      false
+    end
+
+    def valid_ruby_types
+      [Object]
+    end
   end
 end

data/lib/service_contract/assertions.rb

@@ -6,52 +6,31 @@ module ServiceContract
     end
 
     def assert_data_matches_type(data, type, allow_nil = true)
-      if type.is_a?(ServiceContract::Avro::ArrayType)
-        assert data.is_a?(Array), "expected response to be an Array"
+      if type.array?
+        assert data.is_a?(Array), "expected #{type.name} to be an Array"
         data.each do |datum|
-          assert_data_matches_type(datum, type.subtype)
+          assert_data_matches_type(datum, type.subtype, allow_nil)
         end
-      else
+      elsif type.complex?
+
+        # type should have fields
         type.fields.each do |field|
+
+          # ensure the field is present
           value = data.fetch(field.name) do
             data.fetch(field.name.to_sym) do
               assert false, "expected #{type.name} to have attribute: #{field.name}"
             end
           end
 
-          expected_classes = classes_for_parameter(field)
-          assert (allow_nil && value.nil?) || expected_classes.any?{|klass| value.is_a?(klass)}, "expected #{type.name}.#{field.name} to be a #{expected_classes.join(", ")}"
-
-          if field.type == "array"
-            value.each do |val|
-              assert_data_matches_type(val, field.subtype)
-            end
-          end
+          # check the data type
+          assert_data_matches_type(value, field.type, allow_nil)
         end
+      else
+        # type is a scalar
+        assert (allow_nil && data.nil?) || type.valid_ruby_types.any?{|klass| data.is_a?(klass)}, "foo"
       end
     end
 
-    protected
-
-    def classes_for_parameter(field)
-      type = field.type
-      type = type.type_sym.to_s if type.respond_to?(:type_sym)
-      classes = case type
-      when "array"
-        Array
-      when "int"
-        Fixnum
-      when "string"
-        String
-      when "float"
-        Float
-      when "boolean"
-        [TrueClass, FalseClass]
-      else # a complex type
-        Hash
-      end
-      Array(classes)
-    end
-
   end
 end

data/lib/service_contract/avro/endpoint.rb

@@ -55,7 +55,7 @@ module ServiceContract
       # seems kinda hacky
       def member?
         first_field_type = request.fields.first.type
-        first_field_type.is_a?(::Avro::Schema::RecordSchema) &&
+        first_field_type.complex? &&
           first_field_type.name == protocol.main_type
       end
     end

data/lib/service_contract/avro/parameter.rb

@@ -6,20 +6,13 @@ module ServiceContract
       end
 
       def type
-        definition.type.type_sym == :record ?
-          definition.type.name :
-          definition.type.type_sym.to_s
+        Type.build(definition.type)
       end
 
       def subtype
-        item = definition.type.is_a?(::Avro::Schema::ArraySchema) ?
-                definition.type.items :
-                nil
-        return nil unless item
-
-        item.is_a?(::Avro::Schema::PrimitiveSchema) ?
-          item.type_sym.to_s :
-          item
+        definition.array? ?
+          definition.type.items :
+          nil
       end
 
       def default

data/lib/service_contract/avro/type.rb

@@ -2,7 +2,11 @@ module ServiceContract
   module Avro
     class Type < AbstractType
       def name
-        definition.name
+        array? ? 
+          "Array(#{subtype.name})" :
+          complex? ?
+            definition.name :
+            definition.type.to_s
       end
 
       def fields
@@ -15,17 +19,48 @@ module ServiceContract
         name
       end
 
+      def subtype
+        return nil unless definition.respond_to?(:items)
+        Type.build(definition.items)
+      end
+
+      def array?
+        type_string == "array"
+      end
+
       def self.build(definition)
-        definition.is_a?(::Avro::Schema::ArraySchema) ? 
-          ArrayType.new(definition) :
-          Type.new(definition)
+        Type.new(definition)
+      end
+
+      def complex?
+        type_string == "record"
+      end
+
+      def valid_ruby_types
+        case type_string
+        when "array"
+          [Array]
+        when "int"
+          [Fixnum]
+        when "string"
+          [String]
+        when "float"
+          [Float]
+        when "boolean"
+          [TrueClass, FalseClass]
+        else # a complex type
+          [Hash]
+        end
       end
 
       protected
 
-      def record?
-        definition.type.type_sym == :record
+      def type_string
+        type = definition.type
+        type = type.type_sym.to_s if type.respond_to?(:type_sym)
+        type
       end
+
     end
   end
 end

data/lib/service_contract/avro.rb

@@ -2,7 +2,6 @@ require 'avro'
 
 module ServiceContract
   module Avro
-    autoload :ArrayType, 'service_contract/avro/array_type'
     autoload :Documentation, 'service_contract/avro/documentation'
     autoload :Endpoint, 'service_contract/avro/endpoint'
     autoload :Errors, 'service_contract/avro/errors'

data/lib/service_contract/version.rb

@@ -1,3 +1,3 @@
 module ServiceContract
-  VERSION = "0.0.7"
+  VERSION = "0.0.8"
 end

data/test/assertions_test.rb

@@ -29,6 +29,10 @@ class AssertionsTest < Minitest::Test
           timestamp: 1410278741
         }
       ],
+      numbers: [
+        1,
+        2
+      ],
       updated_at: {
         timestamp: 1410278741
       }

data/test/sample/1/compiled/location.avpr

@@ -52,6 +52,12 @@
         "type" : "array",
         "items" : "Timestamp"
       }
+    }, {
+      "name" : "numbers",
+      "type" : {
+        "type" : "array",
+        "items" : "int"
+      }
     }, {
       "name" : "updated_at",
       "type" : "Timestamp"

data/test/sample/1/source/location.avdl

@@ -21,6 +21,7 @@ protocol Location {
     float longitude;
     int population;
     array<Timestamp> foo;
+    array<int> numbers;
     Timestamp updated_at;
   }
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: service_contract
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 0.0.8
 platform: ruby
 authors:
 - Jeff Ching
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-09 00:00:00.000000000 Z
+date: 2014-09-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: avro
@@ -88,7 +88,6 @@ files:
 - lib/service_contract/abstract_type.rb
 - lib/service_contract/assertions.rb
 - lib/service_contract/avro.rb
-- lib/service_contract/avro/array_type.rb
 - lib/service_contract/avro/documentation.rb
 - lib/service_contract/avro/endpoint.rb
 - lib/service_contract/avro/errors.rb

data/lib/service_contract/avro/array_type.rb

@@ -1,17 +0,0 @@
-module ServiceContract
-  module Avro
-    class ArrayType < Type
-      def name
-        "Array"
-      end
-
-      def subtype
-        Type.build(definition.items)
-      end
-
-      def to_s
-        "Array(#{subtype.to_s})"
-      end
-    end
-  end
-end