service_contract 0.0.6 → 0.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d38c280ba7b06845cf4c85d8520c57182697a22a
-  data.tar.gz: 847f9a80067c2dd0fcbd0794eef9ddc9718c9963
+  metadata.gz: ee4858e3b13b2a6f81dcec74ed7fe5bf0844bd1e
+  data.tar.gz: f96f3c732a2fb5ecab8268cfda2a2e86048d7431
 SHA512:
-  metadata.gz: 1783066a056427df7822e5c0f2786b8db8b325771ad5a46bcf9b7f75e2f768e6dd26405bb73c856e7888dd7116987675475e78f121f996265cc6c5d353ad7d70
-  data.tar.gz: 2200d948b56253ba75e8205b7c9584887228bd6609515b1d868056e89b997d7a7116c89e01b091ba71a69956f7fb47e21e1f47e5024a12f670a73e49e34933b8
+  metadata.gz: 823d6d06c37ad5dbb1c876e537f874910ffa0a8f98bfa5eb8a9090d9bcb4e94b9618158b51a21dfb2205e61317bd9caced1a7203ee74ee864443d504f72dedc7
+  data.tar.gz: 3f5e6cca2da6c3fefa541290d17a7877468b52fb9b28bcb51ce6300c9c4ed23aa3a2d745b0b0c7856c34ac097fa2aaa5bce58e7329ce24b89310eb18709e05d3

data/Rakefile

@@ -9,5 +9,6 @@ Rake::TestTask.new(:test) do |t|
   t.verbose = false
 end
 
+require 'service_contract/tasks'
 
-task default: :test
+task default: :test

data/lib/service_contract/abstract_parameter.rb

@@ -8,6 +8,10 @@ module ServiceContract
       raise :not_implemented
     end
 
+    def subtype
+      nil
+    end
+
     def default
       nil
     end

data/lib/service_contract/assertions.rb

@@ -13,11 +13,20 @@ module ServiceContract
         end
       else
         type.fields.each do |field|
-          assert data.has_key?(field.name), "expected #{type.name} to have attribute: #{field.name}"
-          value = data.fetch(field.name)
+          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
         end
       end
     end
@@ -25,7 +34,11 @@ module ServiceContract
     protected
 
     def classes_for_parameter(field)
-      classes = case field.type
+      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"

data/lib/service_contract/avro/parameter.rb

@@ -11,6 +11,17 @@ module ServiceContract
           definition.type.type_sym.to_s
       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
+      end
+
       def default
         definition.default
       end

data/lib/service_contract/version.rb

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

data/test/assertions_test.rb

@@ -0,0 +1,40 @@
+require 'test_helper'
+
+class AssertionsTest < Minitest::Test
+  include ServiceContract::Assertions
+
+  def test_data_matching
+    service = SampleService.find(1)
+    assert service, "expect to find a service by version"
+    assert_equal "1", service.version
+
+    assert_equal 2, service.protocols.length
+    protocol = service.protocol("location")
+    endpoint = protocol.endpoint("index")
+
+    data = [{
+      id: 1,
+      type: 'state',
+      county_name: nil,
+      state_name: 'Washington',
+      country_name: 'United States',
+      city_name: nil,
+      neighborhood_name: nil,
+      postal_code_name: nil,
+      latitude: 47.6097,
+      longitude: 122.3331,
+      population: 634_535,
+      foo: [
+        {
+          timestamp: 1410278741
+        }
+      ],
+      updated_at: {
+        timestamp: 1410278741
+      }
+    }]
+
+    assert_endpoint_response(data, endpoint)
+  end
+
+end

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

@@ -37,18 +37,6 @@
     }, {
       "name" : "postal_code_name",
       "type" : "string"
-    }, {
-      "name" : "to_location",
-      "type" : "string"
-    }, {
-      "name" : "to_short_location",
-      "type" : "string"
-    }, {
-      "name" : "to_long_location",
-      "type" : "string"
-    }, {
-      "name" : "to_location_with_region",
-      "type" : "string"
     }, {
       "name" : "latitude",
       "type" : "float"
@@ -58,6 +46,12 @@
     }, {
       "name" : "population",
       "type" : "int"
+    }, {
+      "name" : "foo",
+      "type" : {
+        "type" : "array",
+        "items" : "Timestamp"
+      }
     }, {
       "name" : "updated_at",
       "type" : "Timestamp"

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

@@ -17,13 +17,10 @@ protocol Location {
     string city_name;
     string neighborhood_name;
     string postal_code_name;
-    string to_location;
-    string to_short_location;
-    string to_long_location;
-    string to_location_with_region;
     float latitude;
     float longitude;
     int population;
+    array<Timestamp> foo;
     Timestamp updated_at;
   }
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: service_contract
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.7
 platform: ruby
 authors:
 - Jeff Ching
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-03 00:00:00.000000000 Z
+date: 2014-09-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: avro
@@ -104,6 +104,7 @@ files:
 - lib/service_contract/version.rb
 - service_contract.gemspec
 - src/avro-tools-1.7.7.jar
+- test/assertions_test.rb
 - test/sample/1/compiled/location.avpr
 - test/sample/1/compiled/sales_region.avpr
 - test/sample/1/source/location.avdl
@@ -135,6 +136,7 @@ signing_key:
 specification_version: 4
 summary: Abstract the definition of a service's interface contract
 test_files:
+- test/assertions_test.rb
 - test/sample/1/compiled/location.avpr
 - test/sample/1/compiled/sales_region.avpr
 - test/sample/1/source/location.avdl