sinatra-avro 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 74b847c334a0acd04d84f5fbfc19277f53181316
-  data.tar.gz: a79f2ef7e84dd9a5b8a13f1b4c66c2f367ce938f
+  metadata.gz: 3b819f5b483ef91d1140c55c8ea1e8fe1842a4b9
+  data.tar.gz: 6ae1f76a6160b0257c8aaee8fa983928e261b78b
 SHA512:
-  metadata.gz: 7301c468c09573e7facef164a6afa85b2d57f3b8e9b5f8597025ea97964b990d2e5ae32900b232e1b3122def74ce2f98d9161418a08df92b84fb9f65890c4fb9
-  data.tar.gz: 5b22aa2c57860ad511c8af6da1d113666729ab9b9755a34352edcd1ee6e9eff7e852c815ff8bff939af243b041c1e65dd1fb6cdeaf578bd1141ec62ba55fcb0a
+  metadata.gz: 370801053a3d24f21eb3956404ff12ce57ca81068a61a8710444d85764861da5095ba203f0f4aa6a6bb7c6e98c5374bf7c3f462ec467ed368fa410b933e9967c
+  data.tar.gz: 419fafcfb3879dfb51a7801dae5d5c436ab42fd09702b081da420156efec2f0b0edf295beacbcd020acd572f323e04f17dd6577e816e98ced545a6c66c2a543b

data/lib/sinatra/avro.rb

@@ -1,40 +1,24 @@
 require 'sinatra/avro/version'
 require 'sinatra/base'
-require 'avro'
+require 'avro_turf'
 
 module Sinatra
   module Avro
     MIME_TYPE = "avro/binary".freeze
 
     def avro(object, options = {})
-      schema_json = fetch_avro_schema(options)
-
       # Set the Content-Type response header.
       content_type MIME_TYPE
 
-      avro_encode(object, schema_json)
-    end
-
-    def avro_encode(object, schema_json)
-      schema = ::Avro::Schema.parse(schema_json)
-      writer = ::Avro::IO::DatumWriter.new(schema)
-      io = StringIO.new
-
-      dw = ::Avro::DataFile::Writer.new(io, writer, schema)
-      dw << object.to_h
-      dw.close
-
-      io.string
-    end
-
-    def fetch_avro_schema(options = {})
-      options[:schema] || load_avro_schema(options.fetch(:schema_name))
+      avro_encode(object, options)
     end
 
-    def load_avro_schema(schema_name)
-      schema_path = File.join(settings.avro_schema_dir, schema_name + ".avsc")
+    private
 
-      File.read(schema_path)
+    def avro_encode(object, options)
+      schema_name = options.fetch(:schema_name) { raise "Please specify a schema name" }
+      @avro ||= AvroTurf.new(schemas_path: settings.avro_schema_dir)
+      @avro.encode(object, schema_name: schema_name)
     end
   end
 

data/lib/sinatra/avro/version.rb

@@ -1,5 +1,5 @@
 module Sinatra
   module Avro
-    VERSION = "0.0.1"
+    VERSION = "0.0.2"
   end
 end

data/sinatra-avro.gemspec

@@ -17,7 +17,7 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
-  spec.add_dependency "avro"
+  spec.add_dependency "avro_turf"
   spec.add_dependency "sinatra"
 
   spec.add_development_dependency "bundler", "~> 1.7"

data/spec/avro_spec.rb

@@ -4,28 +4,7 @@ require 'json'
 describe Sinatra::Avro do
   include Sinatra::TestHelpers
 
-  SCHEMA = {
-    type: "record",
-    name: "person",
-    fields: [
-      { name: "name", type: "string" },
-      { name: "age", type: "long" },
-    ]
-  }.to_json
-
-
-  it "allows serializing responses with Avro" do
-    mock_app do
-      get '/' do
-        data = { "name" => "Jane", "age" => 42 }
-        avro data, schema: SCHEMA
-      end
-    end
-
-    expect(decoded_data).to eq("name" => "Jane", "age" => 42)
-  end
-
-  it "allows loading the schema from disk automatically" do
+  before do
     mock_app do
       set :avro_schema_dir, "spec/"
       get '/' do
@@ -33,24 +12,19 @@ describe Sinatra::Avro do
         avro data, schema_name: "person"
       end
     end
+  end
 
-    expect(decoded_data).to eq("name" => "Jane", "age" => 42)
+  it "allows serializing data using Avro" do
+    avro = get('/').body
+    expect(avro_decode(avro)).to eq("name" => "Jane", "age" => 42)
   end
 
   it "sets the Content-Type header to avro/binary" do
-    mock_app do
-      get '/' do
-        data = { "name" => "Jane", "age" => 42 }
-        avro data, schema: SCHEMA
-      end
-    end
-
     response = get('/')
     expect(response["Content-Type"]).to eq "avro/binary"
   end
 
-  def decoded_data
-    avro = get('/').body
+  def avro_decode(avro)
     reader = Avro::DataFile::Reader.new(StringIO.new(avro), Avro::IO::DatumReader.new)
     data = reader.first
   end

metadata

@@ -1,17 +1,17 @@
 --- !ruby/object:Gem::Specification
 name: sinatra-avro
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Daniel Schierbeck
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-28 00:00:00.000000000 Z
+date: 2015-03-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: avro
+  name: avro_turf
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="