avro-builder 0.9.0 → 0.10.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6ce24d8f81a853345491ca01f3f152bea7c322e6
-  data.tar.gz: 699ae7ae471b75260c8975e9762648c4dfaeed03
+  metadata.gz: 77208340502bdb2f785d8dfec4074ed2ad29c368
+  data.tar.gz: 8597a93d23ceabc2bb2df55fa3407eaa0afc1077
 SHA512:
-  metadata.gz: 0a45f164f8639364362fb34546c29ee79a6e352058c14e766958aee088a7e5ffd5bb56cdf9cc5e9986ba277407a45115e2a12bb8508a04aa36442080a7bee7d2
-  data.tar.gz: 373081fd2648cadfb035bde881e14c71cd69c30d1feb350cf6ff0a831851167cbb24279316520740609bb77cc9d59a1616796309aff2618bf27f5dc51d6ac166
+  metadata.gz: 739f0bb19f344589693a8afee826a23b61119941ee6f241a107773f151a97ef64654bf62cffee15429b5a1516622b6aa210eeb846cf166cfa67b6b1d7b4fdb0f
+  data.tar.gz: ee228210b7daaed7973b5c56980f30cea2166f3420cff62dfeaf21fd4ea0787617cbd6722b92bcc5774c71226e8a5a926f866ae4ecaeb66c839bc68203189df7

data/CHANGELOG.md

@@ -1,5 +1,12 @@
 # avro-builder changelog
 
+## v0.10.0
+- Include DSL file line numbers in stack traces.
+- Add optional `filename` keyword argument to `Avro::Builder.build` and
+  `.build_schema`. Filename can now be used instead of a DSL string to build
+  schemas. When a filename is used, the file location of any error is included
+  in the stack trace.
+
 ## v0.9.0
 - Add rake task to generate Avro JSON schema files for all DSL files under a
   configurable root directory.

data/lib/avro/builder.rb

@@ -6,13 +6,13 @@ module Avro
   module Builder
 
     # Accepts a string or block to eval to define a JSON schema
-    def self.build(str = nil, &block)
-      Avro::Builder::DSL.new(str, &block).to_json
+    def self.build(str = nil, filename: nil, &block)
+      Avro::Builder::DSL.new(str, filename: filename, &block).to_json
     end
 
     # Accepts a string or block to eval and returns an Avro::Schema
-    def self.build_schema(str = nil, &block)
-      Avro::Builder::DSL.new(str, &block).as_schema
+    def self.build_schema(str = nil, filename: nil, &block)
+      Avro::Builder::DSL.new(str, filename: filename, &block).as_schema
     end
 
     # Add paths that will be searched for definitions

data/lib/avro/builder/dsl.rb

@@ -27,8 +27,14 @@ module Avro
 
       # An instance of the DSL is initialized with a string or a block to
       # evaluate to define Avro schema objects.
-      def initialize(str = nil, &block)
-        str ? instance_eval(str) : instance_eval(&block)
+      def initialize(str = nil, filename: nil, &block)
+        if str
+          instance_eval(*[str, filename].compact)
+        elsif filename
+          instance_eval(File.read(filename), filename)
+        else
+          instance_eval(&block)
+        end
       end
 
       # Define an Avro schema record
@@ -95,7 +101,8 @@ module Avro
       end
 
       def eval_file(name)
-        instance_eval(read_file(name))
+        file_path = find_file(name)
+        instance_eval(File.read(file_path), file_path)
       end
     end
   end

data/lib/avro/builder/file_handler.rb

@@ -19,8 +19,6 @@ module Avro
         File.read(find_file(name))
       end
 
-      private
-
       def find_file(name)
         # Ensure that the file_name that is searched for begins with a slash (/)
         # and ends with a .rb extension. Additionally, if the name contains

data/lib/avro/builder/rake/avro_generate_task.rb

@@ -34,7 +34,7 @@ module Avro
               Dir["#{root}/**/*.rb"].each do |dsl_file|
                 puts "Generating Avro schema from #{dsl_file}"
                 output_file = dsl_file.sub('/dsl/', '/schema/').sub(/\.rb$/, '.avsc')
-                schema = Avro::Builder.build(File.read(dsl_file))
+                schema = Avro::Builder.build(filename: dsl_file)
                 FileUtils.mkdir_p(File.dirname(output_file))
                 File.write(output_file, schema.end_with?("\n") ? schema : schema << "\n")
               end

data/lib/avro/builder/version.rb

@@ -1,5 +1,5 @@
 module Avro
   module Builder
-    VERSION = '0.9.0'.freeze
+    VERSION = '0.10.0'.freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: avro-builder
 version: !ruby/object:Gem::Version
-  version: 0.9.0
+  version: 0.10.0
 platform: ruby
 authors:
 - Salsify Engineering
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-08-08 00:00:00.000000000 Z
+date: 2016-08-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: avro