mather-rb 0.0.4 → 0.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b277dd23874f7390de7c11af6c5e79dcb92a423bb6f54e04310831b42e4deff3
-  data.tar.gz: 040a083645043d9624e6bda2bcc4d14bbce103e5bff38c7fc8ce1e627f03003a
+  metadata.gz: 83304e6d64ac58c74da248c86e088a5d1e8616dc804a8b5a32923d9f6a3414f3
+  data.tar.gz: e3aede09a1fec47cc1a32e549558b4ddaa40f4b5bf6861e4f445d676b93d8c38
 SHA512:
-  metadata.gz: f8007430fceaf0b6e87626e3fc7999eabd223e1e22f690e56b5aa89e93b548c97e3d8f46da560dc921d329a87f0fa2814471f0e773f4e52cbf40d371c0795dca
-  data.tar.gz: 91ca5f570333f8914666960dd32638027c172737d898c178b56972bec9cca9ca2ab7cf362a982b73f830c270969caa411363f9b827a88ba38679760ac28fd474
+  metadata.gz: 59fd8e801162dbfa11f4628c652d0375707267074f3842abc0a9fd5767ed1e4caeabd126fc13edb8e8b229a79488aebe5c40839aea24dc308d77d2af7a4f6f43
+  data.tar.gz: a39eea8deb22f51a0ea8f74aa30ac8ea4d880523b62082ed0ab3c51f93413a9e4ff8a76076226b93882eab3d9b1806068307a1854d118f8665dcb139add71f0a

data/{exe → cmd/mather-rb-server}/mather-rb-server

@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
 this_dir = File.expand_path(File.dirname(__FILE__))
-lib_dir = File.join(this_dir, '..', 'src', 'svc')
+lib_dir = File.join(this_dir, '..', '..', 'src', 'svc')
 $LOAD_PATH.unshift(lib_dir)
 
 require 'rubygems'
@@ -8,6 +8,8 @@ require 'bundler/setup'
 require 'grpc'
 require 'mather'
 require 'commander'
+require 'ougai'
+LOG = Ougai::Logger.new(STDOUT) if !defined?(LOG)
 
 class MatherServer
   include Commander::Methods
@@ -15,13 +17,12 @@ class MatherServer
   def run
     program :name, 'Mather Server (in Ruby)'
     program :version, '1.0.0'
-    program :description,
-            'A simple math gRPC microservice, for the purpose of learning and evaluating Ruby and gRPC.'
+    program :description, 'Simple Ruby gRPC microservice that does math.'
 
     command :start do |c|
       c.syntax = 'mather-rb-server start'
       c.description = 'Starts the server'
-      c.option '--port PORT', String, "Server's port (by default :30000)"
+      c.option '--port PORT', String, "Server's port (default \":30000\")"
 
       c.action do |args, options|
         port = options.port || ':30000'
@@ -30,7 +31,7 @@ class MatherServer
         s.add_http2_port("0.0.0.0#{port}", :this_port_is_insecure)
         s.handle(MatherService)
 
-        puts "Server started on port #{port}"
+        LOG.info "Server started on port #{port}"
         s.run_till_terminated_or_interrupted([1, 'int', 'SIGQUIT'])
       end
     end

data/src/lib/mather.rb

@@ -1,8 +1,10 @@
 class MatherLib
+  # add adds two numbers
   def add(first, second)
     return first + second
   end
 
+  # subtract subtracts two numbers
   def subtract(first, second)
     return second - first
   end

data/src/lib/mather_test.rb

@@ -0,0 +1,34 @@
+require 'minitest/autorun'
+require_relative 'mather'
+
+add_results = [
+  [0, 0, 0],
+  [0, 1, 1],
+  [1, 0, 1],
+  [1, 1, 2],
+  [-1, 1, 0],
+  [1, -1, 0],
+  [-1, -1, -2]
+]
+
+subtract_results = [
+  [0, 0, 0],
+  [1, 0, -1],
+  [0, 1, 1],
+  [-1, 0, 1],
+  [-1, -1, 0],
+  [1, -1, -2]
+]
+
+describe 'Mather' do
+  it 'Adds' do
+    matherLib = MatherLib.new
+    add_results.each { |r| _(matherLib.add(r[0], r[1])).must_equal(r[2]) }
+  end
+  it 'Subtracts' do
+    matherLib = MatherLib.new
+    subtract_results.each do |r|
+      _(matherLib.subtract(r[0], r[1])).must_equal(r[2])
+    end
+  end
+end

data/src/svc/mather.rb

@@ -1,5 +1,5 @@
 this_dir = File.expand_path(File.dirname(__FILE__))
-proto_dir = File.join(this_dir, 'proto')
+proto_dir = File.join(this_dir, '..', 'proto', 'generated')
 lib_dir = File.join(this_dir, '..', 'lib')
 $LOAD_PATH.unshift(proto_dir)
 $LOAD_PATH.unshift(lib_dir)
@@ -7,45 +7,49 @@ $LOAD_PATH.unshift(lib_dir)
 require 'mather_services_pb'
 require 'grpc'
 require 'mather'
+require 'ougai'
+LOG = Ougai::Logger.new(STDOUT) if !defined?(LOG)
 
 class MatherService < Mather::Math::Service
+  # add adds two numbers
   def add(req, _)
+    # Validate input
     if req.First == 0
-      raise GRPC::BadStatus.new(
-              GRPC::Core::StatusCodes::INVALID_ARGUMENT,
-              'Could not add, `First` has not been provided'
-            )
+      msg = 'Could not add, `First` has not been provided'
+      LOG.error msg
+      raise GRPC::BadStatus.new(GRPC::Core::StatusCodes::INVALID_ARGUMENT, msg)
     end
-
     if req.Second == 0
-      raise GRPC::BadStatus.new(
-              GRPC::Core::StatusCodes::INVALID_ARGUMENT,
-              'Could not add, `Second` has not been provided'
-            )
+      msg = 'Could not add, `Second` has not been provided'
+      LOG.error msg
+      raise GRPC::BadStatus.new(GRPC::Core::StatusCodes::INVALID_ARGUMENT, msg)
     end
 
-    puts "Adding #{req.First} to #{req.Second}"
+    # Log progress
+    LOG.info "Adding #{req.First} to #{req.Second}"
 
+    # Return added numbers
     Mather::MathAddReply.new(Result: MatherLib.new.add(req.First, req.Second))
   end
 
+  # subtract subtracts two numbers
   def subtract(req, _)
+    # Validate input
     if req.First == 0
-      raise GRPC::BadStatus.new(
-              GRPC::Core::StatusCodes::INVALID_ARGUMENT,
-              'Could not add, `First` has not been provided'
-            )
+      msg = 'Could not subtract, `First` has not been provided'
+      LOG.error msg
+      raise GRPC::BadStatus.new(GRPC::Core::StatusCodes::INVALID_ARGUMENT, msg)
     end
-
     if req.Second == 0
-      raise GRPC::BadStatus.new(
-              GRPC::Core::StatusCodes::INVALID_ARGUMENT,
-              'Could not add, `Second` has not been provided'
-            )
+      msg = 'Could not subtract, `Second` has not been provided'
+      LOG.error msg
+      raise GRPC::BadStatus.new(GRPC::Core::StatusCodes::INVALID_ARGUMENT, msg)
     end
 
-    puts "Subtracting #{req.First} from #{req.Second}"
+    # Log progress
+    LOG.info "Subtracting #{req.First} from #{req.Second}"
 
+    # Return subtracted numbers
     Mather::MathSubtractReply.new(
       Result: MatherLib.new.subtract(req.First, req.Second)
     )

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mather-rb
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.7
 platform: ruby
 authors:
 - Felix Pojtinger
 autorequire: 
-bindir: exe
+bindir: cmd/mather-rb-server
 cert_chain: []
-date: 2019-11-09 00:00:00.000000000 Z
+date: 2019-11-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: grpc
@@ -52,6 +52,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2.0'
+- !ruby/object:Gem::Dependency
+  name: ougai
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.8'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.8'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -66,6 +80,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '10.0'
+- !ruby/object:Gem::Dependency
+  name: rerun
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.13.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.13.0
 - !ruby/object:Gem::Dependency
   name: grpc-tools
   requirement: !ruby/object:Gem::Requirement
@@ -108,6 +136,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
+- !ruby/object:Gem::Dependency
+  name: minitest
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '5.13'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '5.13'
 description: 
 email:
 - felix@pojtinger.com
@@ -116,12 +158,13 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- exe/mather-rb-server
+- cmd/mather-rb-server/mather-rb-server
 - src/lib/mather.rb
+- src/lib/mather_test.rb
+- src/proto/generated/mather_pb.rb
+- src/proto/generated/mather_services_pb.rb
+- src/proto/mather.proto
 - src/svc/mather.rb
-- src/svc/proto/mather.proto
-- src/svc/proto/mather_pb.rb
-- src/svc/proto/mather_services_pb.rb
 homepage: https://pojntfx.github.io/mather-rb/
 licenses:
 - AGPL-3.0
@@ -148,5 +191,5 @@ rubyforge_project:
 rubygems_version: 2.7.8
 signing_key: 
 specification_version: 4
-summary: Simple gRPC microservice that does math.
+summary: Simple Ruby gRPC microservice that does math.
 test_files: []