avro_turf 0.0.1 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9673b4898c8bc5f75fbbdd90b2f4ac3f235c8a07
-  data.tar.gz: 21bb1f430e089ba31e488cd813e5343c961a2325
+  metadata.gz: 221a8cec2332df0667003b732bbec51a9e181596
+  data.tar.gz: 6be83bca9496d4e901984c156ec62b2f2110d0ce
 SHA512:
-  metadata.gz: 377dcdbd55e9789edc4a38f8324fe0ac2a52f34f06cfdc291a499e67bc4ab6fa9069a5f7fa3a2ff4e057625a5236694832f4c55fd8491bea8558b476c641170e
-  data.tar.gz: 6644b4bcb1cb6b9bf4d3e1030f814897fff44a7b134ad038987b3c52e9f469686055d3416b1b4c144d69010ef3a2576d73625d45e6f366dc3030591c531accc7
+  metadata.gz: 398d8a49c7997faac0fd77a1c47875346c3a5e4b2227280020888abaf5aafdcbf8621560f62b1b7af15638a529517b79845180a50244a498aee2e53bec30ce6d
+  data.tar.gz: 51eceeb5904ffc58ea3770b1743507682c476e76db3aba158348bb134680b5f1df4ca3e3018581946a2964eb74c1acc1d269e17245ee132c9c166ad9c4945bb6

data/circle.yml

@@ -0,0 +1,3 @@
+machine:
+  ruby:
+    version: 2.2.0

data/lib/avro_turf.rb

@@ -2,6 +2,9 @@ require 'avro_turf/version'
 require 'avro'
 
 class AvroTurf
+  class Error < StandardError; end
+  class SchemaError < Error; end
+
   def initialize(schemas_path:)
     @schemas_path = schemas_path
   end
@@ -48,18 +51,26 @@ class AvroTurf
   #               when referencing custom types.
   #
   # Returns an Avro::Schema.
-  def resolve_schema(schema_name, names = {})
-    schema_path = File.join(@schemas_path, schema_name + ".avsc")
-    Avro::Schema.real_parse(JSON.parse(File.read(schema_path)), names)
+  def resolve_schema(fullname, names = {})
+    *namespace, schema_name = fullname.split(".")
+    schema_path = File.join(@schemas_path, *namespace, schema_name + ".avsc")
+    schema_json = JSON.parse(File.read(schema_path))
+    schema = Avro::Schema.real_parse(schema_json, names)
+
+    if schema.respond_to?(:fullname) && schema.fullname != fullname
+      raise SchemaError, "expected schema `#{schema_path}' to define type `#{fullname}'"
+    end
+
+    schema
   rescue ::Avro::SchemaParseError => e
     # This is a hack in order to figure out exactly which type was missing. The
     # Avro gem ought to provide this data directly.
-    if e.to_s =~ /"(\w+)" is not a schema we know about/
+    if e.to_s =~ /"([\w\.]+)" is not a schema we know about/
       resolve_schema($1, names)
 
       # Re-resolve the original schema now that the dependency has been resolved.
-      names.delete(schema_name)
-      resolve_schema(schema_name, names)
+      names.delete(fullname)
+      resolve_schema(fullname, names)
     else
       raise
     end

data/lib/avro_turf/version.rb

@@ -1,3 +1,3 @@
 class AvroTurf
-  VERSION = "0.0.1"
+  VERSION = "0.1.0"
 end

data/spec/avro_spec.rb

@@ -10,7 +10,7 @@ describe AvroTurf do
   end
 
   it "encodes and decodes data using a named schema" do
-    schema = <<-AVSC
+    define_schema "person.avsc", <<-AVSC
       {
         "name": "person",
         "type": "record",
@@ -40,12 +40,6 @@ describe AvroTurf do
       }
     AVSC
 
-    FileUtils.mkdir_p("spec/schemas")
-
-    File.open("spec/schemas/person.avsc", "w") do |f|
-      f.write(schema)
-    end
-
     data = {
       "full_name" => "John Doe",
       "address" => {
@@ -60,43 +54,39 @@ describe AvroTurf do
   end
 
   it "resolves named types" do
-    File.open("spec/schemas/person.avsc", "w") do |f|
-      f.write <<-AVSC
-        {
-          "name": "person",
-          "type": "record",
-          "fields": [
-            {
-              "type": "string",
-              "name": "full_name"
-            },
-            {
-              "name": "address",
-              "type": "address"
-            }
-          ]
-        }
-      AVSC
-    end
+    define_schema "person.avsc", <<-AVSC
+      {
+        "name": "person",
+        "type": "record",
+        "fields": [
+          {
+            "type": "string",
+            "name": "full_name"
+          },
+          {
+            "name": "address",
+            "type": "address"
+          }
+        ]
+      }
+    AVSC
 
-    File.open("spec/schemas/address.avsc", "w") do |f|
-      f.write <<-AVSC
-        {
-          "type": "record",
-          "name": "address",
-          "fields": [
-            {
-              "type": "string",
-              "name": "street"
-            },
-            {
-              "type": "string",
-              "name": "city"
-            }
-          ]
-        }
-      AVSC
-    end
+    define_schema "address.avsc", <<-AVSC
+      {
+        "type": "record",
+        "name": "address",
+        "fields": [
+          {
+            "type": "string",
+            "name": "street"
+          },
+          {
+            "type": "string",
+            "name": "city"
+          }
+        ]
+      }
+    AVSC
 
     data = {
       "full_name" => "John Doe",
@@ -112,17 +102,97 @@ describe AvroTurf do
   end
 
   it "allows decoding without specifying a reader schema" do
-    File.open("spec/schemas/message.avsc", "w") do |f|
-      f.write <<-AVSC
-        {
-          "name": "message",
-          "type": "string"
-        }
-      AVSC
-    end
+    define_schema "message.avsc", <<-AVSC
+      {
+        "name": "message",
+        "type": "string"
+      }
+    AVSC
 
     encoded_data = avro.encode("hello, world", schema_name: "message")
 
     expect(avro.decode(encoded_data)).to eq "hello, world"
   end
+
+  it "allows using namespaces in schemas" do
+    FileUtils.mkdir_p("spec/schemas/test/people")
+
+    define_schema "test/people/person.avsc", <<-AVSC
+      {
+        "name": "person",
+        "namespace": "test.people",
+        "type": "record",
+        "fields": [
+          {
+            "type": "string",
+            "name": "full_name"
+          },
+          {
+            "name": "address",
+            "type": "test.people.address"
+          }
+        ]
+      }
+    AVSC
+
+    define_schema "test/people/address.avsc", <<-AVSC
+      {
+        "name": "address",
+        "namespace": "test.people",
+        "type": "record",
+        "fields": [
+          {
+            "type": "string",
+            "name": "street"
+          },
+          {
+            "type": "string",
+            "name": "city"
+          }
+        ]
+      }
+    AVSC
+
+    data = {
+      "full_name" => "John Doe",
+      "address" => {
+        "street" => "Market st. 989",
+        "city" => "San Francisco"
+      }
+    }
+
+    encoded_data = avro.encode(data, schema_name: "test.people.person")
+
+    expect(avro.decode(encoded_data, schema_name: "test.people.person")).to eq(data)
+  end
+
+  it "raises AvroTurf::SchemaError if the schema's namespace doesn't match the file location" do
+    FileUtils.mkdir_p("spec/schemas/test/people")
+
+    define_schema "test/people/person.avsc", <<-AVSC
+      {
+        "name": "person",
+        "namespace": "yoyoyo.nanana",
+        "type": "record",
+        "fields": [
+          {
+            "type": "string",
+            "name": "full_name"
+          }
+        ]
+      }
+    AVSC
+
+    data = { "full_name" => "John Doe" }
+
+    expect {
+      avro.encode(data, schema_name: "test.people.person")
+    }.to raise_error(AvroTurf::SchemaError, "expected schema `spec/schemas/test/people/person.avsc' to define type `test.people.person'")
+  end
+
+  def define_schema(path, content)
+    File.open(File.join("spec/schemas", path), "w") do |f|
+      f.write(content)
+    end
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: avro_turf
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.1.0
 platform: ruby
 authors:
 - Daniel Schierbeck
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-04 00:00:00.000000000 Z
+date: 2015-03-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: avro
@@ -94,6 +94,7 @@ files:
 - README.md
 - Rakefile
 - avro_turf.gemspec
+- circle.yml
 - lib/avro_turf.rb
 - lib/avro_turf/version.rb
 - spec/avro_spec.rb