thrifty-bunny 0.0.5 → 0.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 06937b3533e577afe5518bc7a80addc2e51d741e
-  data.tar.gz: 599f3c74544bc090e0038abd9f55d3702fa2f0bf
+  metadata.gz: e9981672891ec16ef024800ac90c8db849bd095c
+  data.tar.gz: 4d9ba9f1bb935b9d19a2fa52436b6f046da012ac
 SHA512:
-  metadata.gz: 4d95984aa831e4d7024de6d8757515b67e0793680a7086e61d4e01a98e020f881124868950b762a6278807c6d8309aedc0df743953b906da609c317d23006061
-  data.tar.gz: f5a780e0e6efe7e45ef93c40c80059ef40a2631ef2687aa4cee17c0bad24a9934c3becc65c4da6d9f3f4054bd7c973fa6b69148f437401e5cc8987ec5bca2fc2
+  metadata.gz: a863b47d7fd30c08a8adbe5424f57105d3fe1cda3c961e1fb3bd3e02a7f38a3572e5ff8edb5f0dfc77bb2b6c1275c23ea5e86f1aea865a1030c7903a559851ac
+  data.tar.gz: 4d851551d98dc06c1abdb2bf70b93a2bc33ed5b9d2526f73aafaa90cbcd6605e2b27f169bbeb3bfd308cbeefd502a0616e54194bf2a1e5292d41c925e10e2efd

data/.gitignore

@@ -13,3 +13,4 @@
 *.o
 *.a
 mkmf.log
+gen-rb/

data/Gemfile

@@ -3,4 +3,4 @@ source 'https://rubygems.org'
 # Specify your gem's dependencies in thrifty-bunny.gemspec
 gemspec
 
-gem 'pre-commit'
+gem 'pry-byebug'

data/README.md

@@ -30,7 +30,7 @@ The gem provides a Thrift server that integrates with RabbitMQ. You would use th
 handler = MyHandler.new
 processor = MyProcessor.new(handler)
 service = ThriftyBunny::RpcServer.new(processor)
-service.serve
+service.serve(log_messages: true)
 ```
 
 Then you would utilize the included ```ClientTransport``` to connect your Thrift client to RabbitMQ:
@@ -56,7 +56,9 @@ Both the ```RpcServer``` and the ```ClientTransport``` accept a ```ThriftyBunny:
     queue         | rpc_queue    | Name of RabbitMQ queue for the RPC messages
     exchange      | rpc_exchange | Name of the RabbitMQ exchange for the RPC messages
 
+## Specs
 
+The specs can be run individually or via a `bundle exec rake spec`. The integration specs require RabbitMQ to be running on the localhost on port 5672. The integration specs will launch the example server, and then exercise the client calls, and the stop the example server.
 
 ## Examples
 

data/Rakefile

@@ -4,3 +4,15 @@ begin
   RSpec::Core::RakeTask.new(:spec)
 rescue LoadError # Don't die if rspec not available
 end
+
+namespace :generate do
+
+  desc 'Generate ruby example from Thrift file'
+  task :example do
+    outdir = 'examples/calculator'
+    file = "#{outdir}/calculator_service.thrift"
+    %x[thrift -gen rb --out #{outdir} #{file}]
+    puts "Ruby files generated for #{file} to #{outdir}"
+  end
+
+end

data/examples/calculator/calculator_server.rb

@@ -5,13 +5,15 @@ module Calculator
 
   class Handler
     def say_hello(name)
-      puts "Saying hello to #{name}"
       "Hello, #{name} from Thrift!"
     end
+
     def add(value1, value2)
       value1 + value2
     end
+
     def divide(dividend, divisor)
+      raise DivideByZeroException.new("Oops -- you tried to divide by zero; does not work in this universe.") if divisor == 0
       dividend.to_f /  divisor.to_f
     end
 

data/examples/calculator/calculator_service.rb

@@ -5,6 +5,7 @@
 #
 
 require 'thrift'
+require 'calculator_service_types'
 
 module CalculatorService
   class Client
@@ -52,6 +53,7 @@ module CalculatorService
     def recv_divide()
       result = receive_message(Divide_result)
       return result.success unless result.success.nil?
+      raise result.ex unless result.ex.nil?
       raise ::Thrift::ApplicationException.new(::Thrift::ApplicationException::MISSING_RESULT, 'divide failed: unknown result')
     end
 
@@ -91,7 +93,11 @@ module CalculatorService
     def process_divide(seqid, iprot, oprot)
       args = read_args(iprot, Divide_args)
       result = Divide_result.new()
-      result.success = @handler.divide(args.dividend, args.divisor)
+      begin
+        result.success = @handler.divide(args.dividend, args.divisor)
+      rescue ::DivideByZeroException => ex
+        result.ex = ex
+      end
       write_result(result, oprot, 'divide', seqid)
     end
 
@@ -193,9 +199,11 @@ module CalculatorService
   class Divide_result
     include ::Thrift::Struct, ::Thrift::Struct_Union
     SUCCESS = 0
+    EX = 1
 
     FIELDS = {
-      SUCCESS => {:type => ::Thrift::Types::DOUBLE, :name => 'success'}
+      SUCCESS => {:type => ::Thrift::Types::DOUBLE, :name => 'success'},
+      EX => {:type => ::Thrift::Types::STRUCT, :name => 'ex', :class => ::DivideByZeroException}
     }
 
     def struct_fields; FIELDS; end

data/examples/calculator/calculator_service.thrift

@@ -1,6 +1,10 @@
+exception DivideByZeroException {
+  1: string message
+}
+
 service CalculatorService {
   string say_hello(1: string name),
   i32 add(1: i32 value1, 2: i32 value2),
-  double divide(1: i32 dividend, 2: i32 divisor),
+  double divide(1: i32 dividend, 2: i32 divisor) throws (1: DivideByZeroException ex),
   void ping()
 }

data/examples/calculator/calculator_service_constants.rb

@@ -0,0 +1,9 @@
+#
+# Autogenerated by Thrift Compiler (0.9.1)
+#
+# DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
+#
+
+require 'thrift'
+require 'calculator_service_types'
+

data/examples/calculator/calculator_service_types.rb

@@ -0,0 +1,29 @@
+#
+# Autogenerated by Thrift Compiler (0.9.1)
+#
+# DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
+#
+
+require 'thrift'
+
+class DivideByZeroException < ::Thrift::Exception
+  include ::Thrift::Struct, ::Thrift::Struct_Union
+  def initialize(message=nil)
+    super()
+    self.message = message
+  end
+
+  MESSAGE = 1
+
+  FIELDS = {
+    MESSAGE => {:type => ::Thrift::Types::STRING, :name => 'message'}
+  }
+
+  def struct_fields; FIELDS; end
+
+  def validate
+  end
+
+  ::Thrift::Struct.generate_accessors self
+end
+

data/lib/thrifty_bunny/version.rb

@@ -1,3 +1,3 @@
 module ThriftyBunny
-  VERSION = "0.0.5"
+  VERSION = "0.0.6"
 end

data/spec/integration/client_spec.rb

@@ -2,27 +2,60 @@ require 'spec_helper'
 require 'calculator_service'
 require 'calculator_server'
 
-describe 'client calls service' do
+describe 'client calls service to' do
 
   # Run the server in a forked sub-process
   def launch_server
-    pid = fork do
-      puts "Starting server ..."
+    @pid = fork do
+      Signal.trap("HUP") { puts "Stopping server as planned."; exit }
+      puts "Starting server as planned."
       server = Calculator::Server.new
       server.serve
     end
   end
 
-  before(:each) do
+  before(:all) do
     launch_server
-    transport = ThriftyBunny::ClientTransport.new
-    protocol = Thrift::BinaryProtocol.new(transport)
+  end
+
+  after(:all) do
+    Process.kill("HUP", @pid)
+  end
+
+  def start_client
+    @transport = ThriftyBunny::ClientTransport.new
+    protocol = Thrift::BinaryProtocol.new(@transport)
     @client = CalculatorService::Client.new(protocol)
   end
 
-  it 'works' do
+  before do
+    start_client
+  end
+
+  after do
+    @transport.close
+  end
+
+  it 'request ping' do
+    expect {
+      @client.ping
+    }.to_not raise_error
+  end
+
+  it 'say hello' do
     res = @client.say_hello('Bob')
     expect(res).to eq("Hello, Bob from Thrift!")
   end
 
+  it 'successfully divide 10 by 5' do
+    res = @client.divide(10, 5)
+    expect(res).to eq(2.0)
+  end
+
+  it 'throw a divide by zero exception' do
+    expect {
+      res = @client.divide(10, 0)
+    }.to raise_error(DivideByZeroException)
+  end
+
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: thrifty-bunny
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
 platform: ruby
 authors:
 - Bill Siggelkow
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-18 00:00:00.000000000 Z
+date: 2015-01-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -137,6 +137,8 @@ files:
 - examples/calculator/calculator_server.rb
 - examples/calculator/calculator_service.rb
 - examples/calculator/calculator_service.thrift
+- examples/calculator/calculator_service_constants.rb
+- examples/calculator/calculator_service_types.rb
 - examples/calculator/client.start
 - examples/calculator/server.start
 - lib/thrifty_bunny.rb