avro-builder 0.3.1 → 0.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7ad527314da93e91b53852dc9ca99d58170db02b
-  data.tar.gz: 2c21f0fc2eb009ce181288ee367ff898016a2e5c
+  metadata.gz: 12f5d129e7cec1851302f1f7e12213dfef883b95
+  data.tar.gz: 215c3ed97b5a9cf92f10358a79b0e4f857839f38
 SHA512:
-  metadata.gz: 84d0a142b89fdc3bb831350708a92d39ca96f78233bdae4e62873d1f897d23329a16da60efa3fca3b9643772698e03ff5a0d9eb0ff4f592f68508eac3b35c8bb
-  data.tar.gz: be8d9e8135b2cd68b90820545de07028f68500c7592d8e09b08a2acf9c333a73c22be42e0df2baccb54fb2fa6076732cbe7acad3d25d4274684491d874e879e5
+  metadata.gz: 049df2685c267dae090617f14208ac986b32040b4dd514a8f5eb86ecfe9e749d685ae9a84c561d23e4421bde15cf6615da0473589fe78bb98d26290eedd51fa6
+  data.tar.gz: b918ca818611bf1762d980a8a7eae900788b83f280d38d6a98bd7090fb5ae4b6585d4bc51a045c16b74820ba7ee4822e15f4f07e0c36dc0e7b5269d9f3aa2332

data/CHANGELOG.md

@@ -1,5 +1,12 @@
 # avro-builder changelog
 
+## v0.3.2
+- Fix a bug that allowed the partial matching of filenames.
+- Fix a bug that prevented namespace from being specified as an option on
+  records.
+- Fix a bug that prevented loading references qualified by namespace.
+- Do not attempt to import schema files for builtin types.
+
 ## v0.3.1
 - A `null` default should automatically be added for optional fields to match
   the `:null` first member of the union.

data/lib/avro/builder/dsl.rb

@@ -39,26 +39,16 @@ module Avro
       ## DSL methods for Types
 
       def enum(name, *symbols, **options, &block)
-        type(name, :enum, { symbols: symbols }.merge(options), &block)
+        create_named_type(name, :enum, { symbols: symbols }.merge(options), &block)
       end
 
       def fixed(name, size = nil, options = {}, &block)
         size_option = size.is_a?(Hash) ? size : { size: size }
-        type(name, :fixed, size_option.merge(options), &block)
-      end
-
-      def type(name, type_name, options = {}, &block)
-        build_type(type_name,
-                   builder: self,
-                   internal: { name: name, namespace: namespace },
-                   options: options,
-                   &block).tap do |type|
-          add_schema_object(type)
-        end
+        create_named_type(name, :fixed, size_option.merge(options), &block)
       end
 
       # Lookup an Avro schema object by name, possibly fully qualified by namespace.
-      def lookup(key, required: true)
+      def lookup_named_type(key)
         key_str = key.to_s
         object = schema_objects[key_str]
 
@@ -67,11 +57,8 @@ module Avro
           object = schema_objects[key_str]
         end
 
-        raise "Schema object #{key} not found" if required && !object
+        raise "Schema object #{key} not found" unless object
         object
-      rescue
-        raise if required
-        nil
       end
 
       # Return the last schema object processed as a Hash representing
@@ -111,9 +98,19 @@ module Avro
         schema_objects[object.fullname] = object if object.namespace
       end
 
+      def create_named_type(name, type_name, options = {}, &block)
+        create_and_configure_builtin_type(type_name,
+                                          builder: self,
+                                          internal: { name: name, namespace: namespace },
+                                          options: options,
+                                          &block).tap do |type|
+          add_schema_object(type)
+        end
+      end
+
       def build_record(name, options, &block)
         Avro::Builder::Types::RecordType
-          .new(name, options.merge(namespace: namespace)).tap do |record|
+          .new(name, { namespace: namespace }.merge(options)).tap do |record|
             record.builder = builder
             record.instance_eval(&block)
           end

data/lib/avro/builder/field.rb

@@ -30,8 +30,14 @@ module Avro
           send(key, value) if has_dsl_attribute?(key)
         end
 
-        @type = builder.lookup(type_name, required: false) ||
-          build_type(type_name, field: self, internal: internal, options: options)
+        @type = if builtin_type?(type_name)
+                  create_and_configure_builtin_type(type_name,
+                                                    field: self,
+                                                    internal: internal,
+                                                    options: options)
+                else
+                  builder.lookup_named_type(type_name)
+                end
 
         # DSL calls must be evaluated after the type has been constructed
         instance_eval(&block) if block_given?

data/lib/avro/builder/file_handler.rb

@@ -22,14 +22,18 @@ module Avro
       private
 
       def find_file(name)
-        file_name = "#{name.to_s.sub(/\.rb$/, '')}.rb"
+        # Ensure that the file_name that is searched for begins with a slash (/)
+        # and ends with a .rb extension. Additionally, if the name contains
+        # a namespace then ensure that periods (.) are replaced by forward
+        # slashes. E.g. for 'test.example' search for '/test/example.rb'.
+        file_name = "/#{name.to_s.gsub('.', '/').sub(/^\//, '').sub(/\.rb$/, '')}.rb"
         matches = self.class.load_paths.flat_map do |load_path|
           Dir["#{load_path}/**/*.rb"].select do |file_path|
             file_path.end_with?(file_name)
           end
         end
         raise "Multiple matches: #{matches}" if matches.size > 1
-        raise "File not found #{name}" if matches.empty?
+        raise "File not found #{file_name}" if matches.empty?
 
         matches.first
       end

data/lib/avro/builder/type_factory.rb

@@ -4,23 +4,33 @@ module Avro
     # This concern is used by classes that create new Type instances.
     module TypeFactory
 
+      COMPLEX_TYPES = Set.new(%w(array enum fixed map record union).map(&:freeze)).freeze
+      BUILTIN_TYPES = Avro::Schema::PRIMITIVE_TYPES.union(COMPLEX_TYPES).freeze
+
       private
 
       # Return a new Type instance
-      def create_type(type_name)
+      def create_builtin_type(type_name)
+        name = type_name.to_s.downcase
         case
-        when Avro::Schema::PRIMITIVE_TYPES_SYM.include?(type_name.to_sym)
-          Avro::Builder::Types::Type.new(type_name)
+        when Avro::Schema::PRIMITIVE_TYPES.include?(name)
+          Avro::Builder::Types::Type.new(name)
+        when COMPLEX_TYPES.include?(name)
+          Avro::Builder::Types.const_get("#{name.capitalize}Type").new
         else
-          type_class_name = "#{type_name.to_s.capitalize}Type"
-          Avro::Builder::Types.const_get(type_class_name).new
+          raise "Invalid builtin type: #{type_name}"
         end
       end
 
       # Return a new Type instance, including propagating internal state
       # and setting attributes via the DSL
-      def build_type(type_name, field: nil, builder: nil, internal: {}, options: {}, &block)
-        create_type(type_name).tap do |type|
+      def create_and_configure_builtin_type(type_name,
+                                            field: nil,
+                                            builder: nil,
+                                            internal: {},
+                                            options: {},
+                                            &block)
+        create_builtin_type(type_name).tap do |type|
           type.field = field
           type.builder = builder
           type.configure_options(internal.merge(options))
@@ -28,6 +38,9 @@ module Avro
         end
       end
 
+      def builtin_type?(type_name)
+        BUILTIN_TYPES.include?(type_name.to_s)
+      end
     end
   end
 end

data/lib/avro/builder/types.rb

@@ -1,5 +1,5 @@
 require 'avro/builder/types/type'
-require 'avro/builder/types/specific_type'
+require 'avro/builder/types/complex_type'
 require 'avro/builder/types/configurable_type'
 require 'avro/builder/types/type_referencer'
 require 'avro/builder/types/named_type'

data/lib/avro/builder/types/array_type.rb

@@ -2,13 +2,13 @@ module Avro
   module Builder
     module Types
       class ArrayType < Type
-        include Avro::Builder::Types::SpecificType
+        include Avro::Builder::Types::ComplexType
         include Avro::Builder::Types::ConfigurableType
         include Avro::Builder::Types::TypeReferencer
 
         dsl_attribute :items do |items_type = nil|
           if items_type
-            @items = find_or_create_type(items_type)
+            @items = create_builtin_or_lookup_named_type(items_type)
           else
             @items
           end

data/lib/avro/builder/types/{specific_type.rb → complex_type.rb}

@@ -2,9 +2,9 @@ module Avro
   module Builder
     module Types
 
-      # This module provides common functionality for Types with a specific
-      # type name vs the generic Type class.
-      module SpecificType
+      # This module provides common functionality for non-primitive types
+      # that do not require a name to be created.
+      module ComplexType
 
         def self.included(base)
           base.extend ClassMethods

data/lib/avro/builder/types/map_type.rb

@@ -2,13 +2,13 @@ module Avro
   module Builder
     module Types
       class MapType < Type
-        include Avro::Builder::Types::SpecificType
+        include Avro::Builder::Types::ComplexType
         include Avro::Builder::Types::ConfigurableType
         include Avro::Builder::Types::TypeReferencer
 
         dsl_attribute :values do |value_type = nil|
           if value_type
-            @values = find_or_create_type(value_type)
+            @values = create_builtin_or_lookup_named_type(value_type)
           else
             @values
           end

data/lib/avro/builder/types/named_type.rb

@@ -8,7 +8,7 @@ module Avro
       # This is an abstract class that represents a type that can be defined
       # with a name, outside a record.
       class NamedType < Type
-        include Avro::Builder::Types::SpecificType
+        include Avro::Builder::Types::ComplexType
         include Avro::Builder::Namespaceable
         include Avro::Builder::Types::ConfigurableType
 

data/lib/avro/builder/types/record_type.rb

@@ -43,7 +43,7 @@ module Avro
         # Adds fields from the record with the specified name to the current
         # record.
         def extends(name)
-          fields.merge!(builder.lookup(name).duplicated_fields)
+          fields.merge!(builder.lookup_named_type(name).duplicated_fields)
         end
 
         def to_h(reference_state = SchemaSerializerReferenceState.new)

data/lib/avro/builder/types/type_referencer.rb

@@ -12,8 +12,12 @@ module Avro
           (!field.nil? && field.builder) || super
         end
 
-        def find_or_create_type(type_name)
-          builder.lookup(type_name, required: false) || create_type(type_name)
+        def create_builtin_or_lookup_named_type(type_name)
+          if builtin_type?(type_name)
+            create_builtin_type(type_name)
+          else
+            builder.lookup_named_type(type_name)
+          end
         end
       end
     end

data/lib/avro/builder/types/union_type.rb

@@ -2,13 +2,15 @@ module Avro
   module Builder
     module Types
       class UnionType < Type
-        include Avro::Builder::Types::SpecificType
+        include Avro::Builder::Types::ComplexType
         include Avro::Builder::Types::ConfigurableType
         include Avro::Builder::Types::TypeReferencer
 
+        NULL_TYPE = 'null'.freeze
+
         dsl_attribute :types do |*types|
           if !types.empty?
-            @types = types.flatten.map { |type| find_or_create_type(type) }
+            @types = types.flatten.map { |type| create_builtin_or_lookup_named_type(type) }
           else
             @types
           end
@@ -22,7 +24,7 @@ module Avro
         # serialized will be an array of types. If the array includes
         # :null then it is moved to the beginning of the array.
         def self.union_with_null(serialized)
-          serialized.reject { |type| type == :null }.unshift(:null)
+          serialized.reject { |type| type.to_s == NULL_TYPE }.unshift(:null)
         end
       end
     end

data/lib/avro/builder/version.rb

@@ -1,5 +1,5 @@
 module Avro
   module Builder
-    VERSION = "0.3.1"
+    VERSION = "0.3.2"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: avro-builder
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.3.2
 platform: ruby
 authors:
 - Salsify Engineering
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-03-24 00:00:00.000000000 Z
+date: 2016-04-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: avro
@@ -121,13 +121,13 @@ files:
 - lib/avro/builder/type_factory.rb
 - lib/avro/builder/types.rb
 - lib/avro/builder/types/array_type.rb
+- lib/avro/builder/types/complex_type.rb
 - lib/avro/builder/types/configurable_type.rb
 - lib/avro/builder/types/enum_type.rb
 - lib/avro/builder/types/fixed_type.rb
 - lib/avro/builder/types/map_type.rb
 - lib/avro/builder/types/named_type.rb
 - lib/avro/builder/types/record_type.rb
-- lib/avro/builder/types/specific_type.rb
 - lib/avro/builder/types/type.rb
 - lib/avro/builder/types/type_referencer.rb
 - lib/avro/builder/types/union_type.rb