kril 0.2.1 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 771729deb1ee390248c3ba8e3087da45db562714
-  data.tar.gz: 55741902dd6394973cf0a8556fe93c513862d924
+  metadata.gz: 76311c3631f04d8825304e54631a10d2f854cc0f
+  data.tar.gz: dd0fe954dabe659bb5ecac6c04aa269d2a7991c5
 SHA512:
-  metadata.gz: 8284333752e8f4707d59ae35ed070a0ed7862b4b3ba655f45370efdba3bc4389b273ffaf67d350d80531aab80d2fa29c3aacd88d5883bb3df83acfbfd61ccb56
-  data.tar.gz: 8311a73109b2b6a08a2b96aba76d48244388f5d79daa4a1ddb0f366ef477b70768d94edac7e149d56011183b5cd025e16bb2825b52cd9dd56cf303a201a1e65d
+  metadata.gz: 54cc317fe57dfb796a0f87f0f88f7440e472048a010f159199f6285263604413b3aa5de054425425d0ddb0c473adb8a5f7d7b85b6943b45a225aa545b73010da
+  data.tar.gz: 51c201f5a3175d716431459f459637bb296405986e931584958b93394d215f204cd29c15653102dbf0ed8264b701a0987db4fb42131e2649727b12886f737305

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    kril (0.2.1)
+    kril (0.2.2)
       avro_turf (~> 0.8.0)
       clamp (~> 1.2, >= 1.2.1)
       ruby-kafka (~> 0.5.3)
@@ -17,7 +17,12 @@ GEM
     clamp (1.2.1)
     diff-lcs (1.3)
     excon (0.61.0)
+    httparty (0.13.7)
+      json (~> 1.8)
+      multi_xml (>= 0.5.2)
+    json (1.8.6)
     multi_json (1.13.1)
+    multi_xml (0.6.0)
     rake (10.5.0)
     rspec (3.7.0)
       rspec-core (~> 3.7.0)
@@ -43,6 +48,7 @@ PLATFORMS
 
 DEPENDENCIES
   bundler (~> 1.16)
+  httparty (~> 0.13.7)
   kril!
   rake (~> 10.0)
   rspec (~> 3.7)

data/README.md

@@ -93,7 +93,8 @@ To see what schemas are saved in the repository:
 $ kril --list-schemas
 ```
 ```bash
-human, another_schema
+human
+another_schema
 ```
 ## Contributing
 

data/bin/kril

@@ -25,6 +25,7 @@ Clamp do
   option %w[-g --schema-registry], '', 'address of schema registry', default: 'http://localhost:8081'
   option %w[-p --schemas-path], '', 'directory of Avro schemas', default: File.join($gem_root, 'schemas').to_s do |path|
     raise ArgumentError, "Schema path: #{path} is not a directory" unless File.directory?(path)
+    path
   end
   option %w[-v --verbose], :flag, 'print logs, warnings' do
     $log.level = Logger::DEBUG
@@ -77,8 +78,8 @@ Clamp do
       print_error(e.message)
     end
     if list_schemas?
-      schemas = File.join($gem_root, 'schemas', '**', '*.avsc')
-      puts Dir.glob(schemas).map { |file| File.basename(file, '.avsc') }.join(', ')
+      schemas = File.join(schemas_path, '**', '*.avsc')
+      Dir.glob(schemas).map { |file| puts File.basename(file, '.avsc') }
     end
   end
 
@@ -86,15 +87,15 @@ Clamp do
 
   def produce_record(kafka, avro, store)
     producer = Kril::Producer.new(kafka: kafka, avro: avro)
-    names = schema_name(store)
+    name, namespace, fullname = schema_name(store)
     record_as_json = JSON.parse(record)
-    infered_topic = topic || names[:schema_name]
+    topic ||= fullname
     producer.send(record: record_as_json,
-                  schema_name: names[:schema_name],
-                  namespace: names[:namespace],
-                  topic: infered_topic,
+                  schema_name: name,
+                  namespace: namespace,
+                  topic: topic,
                   syncronous: synchronous?)
-    print_record(infered_topic, record_as_json)
+    print_record(topic, record_as_json)
   end
 
   def consume_records(kafka, avro)
@@ -110,7 +111,8 @@ Clamp do
 
   def schema_name(schema_store)
     handler = Kril::SchemaHandler.new(schema_store: schema_store, schemas_path: schemas_path)
-    handler.process(schema || topic)
+    schema_object = handler.process(schema || topic)
+    [schema_object.name, schema_object.namespace, schema_object.fullname]
   end
 
   def print_record(topic, record)

data/kril.gemspec

@@ -26,6 +26,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'clamp', '~> 1.2', '>= 1.2.1'
   spec.add_dependency 'ruby-kafka', '~> 0.5.3'
 
+  spec.add_development_dependency 'httparty', '~> 0.13.7'
   spec.add_development_dependency 'bundler', '~> 1.16'
   spec.add_development_dependency 'rake', '~> 10.0'
   spec.add_development_dependency 'rspec', '~> 3.7'

data/lib/kril/schema_extractor.rb

@@ -12,7 +12,7 @@ module Kril
     def self.extract(source_dir:, output_dir:)
       find_java_files(source_dir) do |file|
         schema = parse_avro_java_class(file)
-        write_avsc(schema, output_dir) if schema
+        SchemaHandler.new(schemas_path: output_dir).process(schema)
       end
       nil
     end
@@ -30,14 +30,6 @@ module Kril
       Dir.chdir(old_dir)
     end
 
-    def write_avsc(contents, directory)
-      FileUtils.mkdir_p(directory) unless File.directory?(directory)
-      path = File.join(directory, "#{contents['name']}.avsc")
-      File.open(path, 'w') do |file|
-        file.write(JSON.pretty_generate(contents))
-      end
-    end
-
     def dejavafy(java_string)
       java_string.split('","').join.gsub(/\\?\\"/, '"')
     end
@@ -45,7 +37,7 @@ module Kril
     def parse_avro_java_class(file)
       result = file.each_line do |line|
         extraction = line[/SCHEMA.*parse\("(.*)"\);/, 1]
-        break JSON.parse(dejavafy(extraction)) if extraction
+        break dejavafy(extraction) if extraction
       end
       result.is_a?(File) ? nil : result
     end

data/lib/kril/schema_handler.rb

@@ -15,28 +15,27 @@ module Kril
     # Handles input to reference or create schema.
     #
     # input_string - schema name, schema file, or schema contents [String]
-    # returns      - schema name, namespace [Hash]
+    # returns      - stored schema [Avro::Schema]
     def process(input_string)
-      if File.exist?(input_string)
-        copy_schema_to_store(input_string)
-      elsif schema?(input_string)
-        save_schema(input_string)
-      else
-        name, namespace = separate_fullname(input_string)
-        namespace = nil if namespace.empty?
-        schema = @schema_store.find(name, namespace)
-        {
-          schema_name: schema&.name,
-          namespace: schema&.namespace
-        }
-      end
+      name, namespace =
+        if File.exist?(input_string)
+          copy_schema_to_store(input_string)
+        elsif schema?(input_string)
+          save_schema(input_string)
+        else
+          separate_fullname(input_string)
+        end
+      @schema_store.find(name, namespace)
     end
 
     private
 
     def separate_fullname(fullname)
       arr = fullname.split('.')
-      [arr.pop, arr.join('.')]
+      name = arr.pop
+      namespace = arr.join('.')
+      namespace = nil if namespace.empty?
+      [name, namespace]
     end
 
     def schema?(input)
@@ -45,38 +44,25 @@ module Kril
       false
     end
 
+    def build_path(name, namespace)
+      base = namespace ? File.join(@schemas_path, namespace.split('.')) : @schemas_path
+      File.join(base, "#{name}.avsc")
+    end
+
     def save_schema(schema)
       schema = JSON.parse(schema)
-      schema_name = schema['name']
-      namespace = schema['namespace']
-      if namespace
-        path = File.join(@schemas_path, namespace.split('.'))
-        FileUtils.mkdir_p(path)
-      end
-      File.open(File.join(path || @schemas_path, "#{schema_name}.avsc"), 'w') do |file|
+      path = build_path(schema['name'], schema['namespace'])
+      FileUtils.mkdir_p(File.dirname(path))
+      File.open(path, 'w') do |file|
         file.write(JSON.pretty_generate(schema))
       end
-      {
-        schema_name: schema_name,
-        namespace: namespace
-      }
+      [schema['name'], schema['namespace']]
     end
 
     def copy_schema_to_store(path)
       schema = File.read(path)
       raise ArgumentError, "Not a valid schema: #{path}" unless schema?(schema)
-      json = JSON.parse(schema)
-      schema_name = json['name']
-      namespace = json['namespace']
-      if namespace
-        schema_path = File.join(@schemas_path, namespace.split('.'))
-        FileUtils.mkdir_p(schema_path)
-      end
-      FileUtils.copy_file(path, File.join(schema_path || @schemas_path, "#{schema_name}.avsc"))
-      {
-        schema_name: schema_name,
-        namespace: namespace
-      }
+      save_schema(schema)
     end
   end
 end

data/lib/kril/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Kril
-  VERSION = '0.2.1'
+  VERSION = '0.2.2'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kril
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors:
 - Chad Bowman
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-03-18 00:00:00.000000000 Z
+date: 2018-03-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: avro_turf
@@ -58,6 +58,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.5.3
+- !ruby/object:Gem::Dependency
+  name: httparty
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.13.7
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.13.7
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement