thrifty-bunny 0.0.6 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e9981672891ec16ef024800ac90c8db849bd095c
-  data.tar.gz: 4d9ba9f1bb935b9d19a2fa52436b6f046da012ac
+  metadata.gz: 4e3d89688b528994464eb6bb36f9df5b307cadb2
+  data.tar.gz: ccc99ab3da111fef05d6b278bf9c291ef3d5bbae
 SHA512:
-  metadata.gz: a863b47d7fd30c08a8adbe5424f57105d3fe1cda3c961e1fb3bd3e02a7f38a3572e5ff8edb5f0dfc77bb2b6c1275c23ea5e86f1aea865a1030c7903a559851ac
-  data.tar.gz: 4d851551d98dc06c1abdb2bf70b93a2bc33ed5b9d2526f73aafaa90cbcd6605e2b27f169bbeb3bfd308cbeefd502a0616e54194bf2a1e5292d41c925e10e2efd
+  metadata.gz: c372c9bfe06f693c940f6f5990f308a2ef8a31cd6d5bb33033d58c55641396f47b2e4e78c71f7b365ee1f8486023eac65f4032b1a59c2c42e7b555f821d7e9e7
+  data.tar.gz: 245f15e874aac20a98aa549820b7a7d77431a14f0fbb0a59b797a2c75bcd39f72e7693e3e2614092b20b4e97827a1533504b4fd4550500e9b45da7f876e16c93

data/.pryrc

@@ -0,0 +1,6 @@
+#~/.pryrc  
+
+$:.unshift "examples/calculator"
+$:.unshift "lib/"
+
+require 'pry'

data/Rakefile

@@ -12,7 +12,7 @@ namespace :generate do
     outdir = 'examples/calculator'
     file = "#{outdir}/calculator_service.thrift"
     %x[thrift -gen rb --out #{outdir} #{file}]
-    puts "Ruby files generated for #{file} to #{outdir}"
+    puts "Ruby files generated for #{file} to #{outdir}. Now go write the handler!"
   end
 
 end

data/examples/calculator/calculator_server.rb

@@ -19,19 +19,40 @@ module Calculator
 
     def ping
     end
+
+    def dwarves
+      %w(sneezy dopey doc)
+    end
+
+    def my_pets
+      [ 
+        Pet.new(kind: 'cat', name: 'Winston'), 
+        Pet.new(kind: 'dog', name: 'Eve')
+      ]
+    end
+
+    def age(age_min, age_max)
+      age_max - age_min
+    end
+
+    def snooze(sleep_time)
+      sleep sleep_time
+    end
+
   end
 
   class Server
     attr_reader :service
 
     def initialize(options={})
+      config = ThriftyBunny::Config.new(options)
       handler = Handler.new
       processor = CalculatorService::Processor.new(handler)
-      @service = ThriftyBunny::RpcServer.new(processor)
+      @service = ThriftyBunny::RpcServer.new(processor, config)
     end
 
     def serve
-      service.serve(log_messages: false, prefetch: 2)
+      service.serve(prefetch: 2)
     end
   end
 

data/examples/calculator/calculator_service.rb

@@ -1,5 +1,5 @@
 #
-# Autogenerated by Thrift Compiler (0.9.1)
+# Autogenerated by Thrift Compiler (0.9.2)
 #
 # DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
 #
@@ -71,6 +71,65 @@ module CalculatorService
       return
     end
 
+    def dwarves()
+      send_dwarves()
+      return recv_dwarves()
+    end
+
+    def send_dwarves()
+      send_message('dwarves', Dwarves_args)
+    end
+
+    def recv_dwarves()
+      result = receive_message(Dwarves_result)
+      return result.success unless result.success.nil?
+      raise ::Thrift::ApplicationException.new(::Thrift::ApplicationException::MISSING_RESULT, 'dwarves failed: unknown result')
+    end
+
+    def my_pets()
+      send_my_pets()
+      return recv_my_pets()
+    end
+
+    def send_my_pets()
+      send_message('my_pets', My_pets_args)
+    end
+
+    def recv_my_pets()
+      result = receive_message(My_pets_result)
+      return result.success unless result.success.nil?
+      raise ::Thrift::ApplicationException.new(::Thrift::ApplicationException::MISSING_RESULT, 'my_pets failed: unknown result')
+    end
+
+    def age(age_min, age_max)
+      send_age(age_min, age_max)
+      return recv_age()
+    end
+
+    def send_age(age_min, age_max)
+      send_message('age', Age_args, :age_min => age_min, :age_max => age_max)
+    end
+
+    def recv_age()
+      result = receive_message(Age_result)
+      return result.success unless result.success.nil?
+      raise ::Thrift::ApplicationException.new(::Thrift::ApplicationException::MISSING_RESULT, 'age failed: unknown result')
+    end
+
+    def snooze(sleep_time)
+      send_snooze(sleep_time)
+      recv_snooze()
+    end
+
+    def send_snooze(sleep_time)
+      send_message('snooze', Snooze_args, :sleep_time => sleep_time)
+    end
+
+    def recv_snooze()
+      result = receive_message(Snooze_result)
+      return
+    end
+
   end
 
   class Processor
@@ -108,6 +167,34 @@ module CalculatorService
       write_result(result, oprot, 'ping', seqid)
     end
 
+    def process_dwarves(seqid, iprot, oprot)
+      args = read_args(iprot, Dwarves_args)
+      result = Dwarves_result.new()
+      result.success = @handler.dwarves()
+      write_result(result, oprot, 'dwarves', seqid)
+    end
+
+    def process_my_pets(seqid, iprot, oprot)
+      args = read_args(iprot, My_pets_args)
+      result = My_pets_result.new()
+      result.success = @handler.my_pets()
+      write_result(result, oprot, 'my_pets', seqid)
+    end
+
+    def process_age(seqid, iprot, oprot)
+      args = read_args(iprot, Age_args)
+      result = Age_result.new()
+      result.success = @handler.age(args.age_min, args.age_max)
+      write_result(result, oprot, 'age', seqid)
+    end
+
+    def process_snooze(seqid, iprot, oprot)
+      args = read_args(iprot, Snooze_args)
+      result = Snooze_result.new()
+      @handler.snooze(args.sleep_time)
+      write_result(result, oprot, 'snooze', seqid)
+    end
+
   end
 
   # HELPER FUNCTIONS AND STRUCTURES
@@ -244,5 +331,132 @@ module CalculatorService
     ::Thrift::Struct.generate_accessors self
   end
 
+  class Dwarves_args
+    include ::Thrift::Struct, ::Thrift::Struct_Union
+
+    FIELDS = {
+
+    }
+
+    def struct_fields; FIELDS; end
+
+    def validate
+    end
+
+    ::Thrift::Struct.generate_accessors self
+  end
+
+  class Dwarves_result
+    include ::Thrift::Struct, ::Thrift::Struct_Union
+    SUCCESS = 0
+
+    FIELDS = {
+      SUCCESS => {:type => ::Thrift::Types::LIST, :name => 'success', :element => {:type => ::Thrift::Types::STRING}}
+    }
+
+    def struct_fields; FIELDS; end
+
+    def validate
+    end
+
+    ::Thrift::Struct.generate_accessors self
+  end
+
+  class My_pets_args
+    include ::Thrift::Struct, ::Thrift::Struct_Union
+
+    FIELDS = {
+
+    }
+
+    def struct_fields; FIELDS; end
+
+    def validate
+    end
+
+    ::Thrift::Struct.generate_accessors self
+  end
+
+  class My_pets_result
+    include ::Thrift::Struct, ::Thrift::Struct_Union
+    SUCCESS = 0
+
+    FIELDS = {
+      SUCCESS => {:type => ::Thrift::Types::SET, :name => 'success', :element => {:type => ::Thrift::Types::STRUCT, :class => ::Pet}}
+    }
+
+    def struct_fields; FIELDS; end
+
+    def validate
+    end
+
+    ::Thrift::Struct.generate_accessors self
+  end
+
+  class Age_args
+    include ::Thrift::Struct, ::Thrift::Struct_Union
+    AGE_MIN = 1
+    AGE_MAX = 2
+
+    FIELDS = {
+      AGE_MIN => {:type => ::Thrift::Types::I32, :name => 'age_min'},
+      AGE_MAX => {:type => ::Thrift::Types::I32, :name => 'age_max'}
+    }
+
+    def struct_fields; FIELDS; end
+
+    def validate
+    end
+
+    ::Thrift::Struct.generate_accessors self
+  end
+
+  class Age_result
+    include ::Thrift::Struct, ::Thrift::Struct_Union
+    SUCCESS = 0
+
+    FIELDS = {
+      SUCCESS => {:type => ::Thrift::Types::I32, :name => 'success'}
+    }
+
+    def struct_fields; FIELDS; end
+
+    def validate
+    end
+
+    ::Thrift::Struct.generate_accessors self
+  end
+
+  class Snooze_args
+    include ::Thrift::Struct, ::Thrift::Struct_Union
+    SLEEP_TIME = -1
+
+    FIELDS = {
+      SLEEP_TIME => {:type => ::Thrift::Types::I32, :name => 'sleep_time'}
+    }
+
+    def struct_fields; FIELDS; end
+
+    def validate
+    end
+
+    ::Thrift::Struct.generate_accessors self
+  end
+
+  class Snooze_result
+    include ::Thrift::Struct, ::Thrift::Struct_Union
+
+    FIELDS = {
+
+    }
+
+    def struct_fields; FIELDS; end
+
+    def validate
+    end
+
+    ::Thrift::Struct.generate_accessors self
+  end
+
 end
 

data/examples/calculator/calculator_service.thrift

@@ -2,9 +2,18 @@ exception DivideByZeroException {
   1: string message
 }
 
+struct Pet {
+  1: string kind,
+  2: string name
+}
+
 service CalculatorService {
   string say_hello(1: string name),
   i32 add(1: i32 value1, 2: i32 value2),
   double divide(1: i32 dividend, 2: i32 divisor) throws (1: DivideByZeroException ex),
-  void ping()
+  void ping(),
+  list<string> dwarves(),
+  set<Pet> my_pets(),
+  i32 age(1: i32 age_min, 2: i32 age_max),
+  void snooze(i32 sleep_time)
 }

data/examples/calculator/calculator_service_constants.rb

@@ -1,5 +1,5 @@
 #
-# Autogenerated by Thrift Compiler (0.9.1)
+# Autogenerated by Thrift Compiler (0.9.2)
 #
 # DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
 #

data/examples/calculator/calculator_service_types.rb

@@ -1,5 +1,5 @@
 #
-# Autogenerated by Thrift Compiler (0.9.1)
+# Autogenerated by Thrift Compiler (0.9.2)
 #
 # DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
 #
@@ -27,3 +27,21 @@ class DivideByZeroException < ::Thrift::Exception
   ::Thrift::Struct.generate_accessors self
 end
 
+class Pet
+  include ::Thrift::Struct, ::Thrift::Struct_Union
+  KIND = 1
+  NAME = 2
+
+  FIELDS = {
+    KIND => {:type => ::Thrift::Types::STRING, :name => 'kind'},
+    NAME => {:type => ::Thrift::Types::STRING, :name => 'name'}
+  }
+
+  def struct_fields; FIELDS; end
+
+  def validate
+  end
+
+  ::Thrift::Struct.generate_accessors self
+end
+

data/examples/calculator/server.start

@@ -1,5 +1,7 @@
 #!/usr/bin/env ruby
 require 'thrifty_bunny'
+
+$:.unshift File.dirname(__FILE__)
 require_relative 'calculator_server'
 
 server = Calculator::Server.new

data/lib/thrifty_bunny/client_transport.rb

@@ -30,6 +30,12 @@ module ThriftyBunny
       @reply_queue               = @ch.queue('', exclusive: true)
       @is_opened                 = true
 
+      @timeout = config.timeout
+      @log = config.log
+    end
+
+    def log?
+      @log
     end
 
     def close
@@ -56,8 +62,6 @@ module ThriftyBunny
 
       operation = options[:operation] || ""
       blocking = options.has_key?(:blocking) ? options[:blocking] : true
-      msg_timeout = options[:msg_timeout] || 10
-      log_messages = options.has_key?(:log_messages) ? options[:log_messages] : true
 
       correlation_id = self.generate_uuid
 
@@ -69,12 +73,12 @@ module ThriftyBunny
       }
 
       #Publish the message
-      print_log "Publishing message reply-to: #{@reply_queue.name} - headers: #{headers}", correlation_id if log_messages
+      print_log "Publishing message reply-to: #{@reply_queue.name} - headers: #{headers}", correlation_id if log?
       start_time = Time.now
       @service_exchange.publish(@outbuf,
                                 :routing_key    => @service_queue_name,
                                 :correlation_id => correlation_id,
-                                :expiration     => msg_timeout,
+                                :expiration     => @timeout,
                                 :reply_to       => @reply_queue.name,
                                 :headers        => headers)
 
@@ -84,10 +88,10 @@ module ThriftyBunny
         @response = ""
         begin
           #Adding 1sec to timeout to account for clock differences
-          Timeout.timeout(msg_timeout + 1, ResponseTimeout) do
+          Timeout.timeout(@timeout + 1, ResponseTimeout) do
             @reply_queue.subscribe(:block => true) do |delivery_info, properties, payload|
 
-              if log_messages
+              if log?
                 response_time = Time.now - start_time
                 print_log "---- Response Message received in #{response_time}sec for #{@reply_queue.name}", correlation_id
                 print_log "HEADERS: #{properties}", correlation_id
@@ -104,7 +108,7 @@ module ThriftyBunny
         rescue ResponseTimeout => ex
           #Trying to work around weirdness being seen in a multi threaded workflow environment
           if @response == ""
-            msg = "A timeout has occurred (#{msg_timeout}sec) trying to call #{@service_queue_name}.#{operation}"
+            msg = "A timeout has occurred (#{@timeout}sec) trying to call #{@service_queue_name}.#{operation}"
             print_log msg, correlation_id
             raise ex, msg
           else

data/lib/thrifty_bunny/config.rb

@@ -2,7 +2,8 @@ require 'bunny'
 
 module ThriftyBunny
   class Config
-    attr_reader :host, :port, :vhost, :user, :password, :ssl, :queue, :exchange
+    attr_reader :host, :port, :vhost, :user, :password, :ssl, :queue, :exchange,
+                :timeout, :log
 
     def initialize(options={})
       @host = options[:host] || '127.0.0.1'
@@ -15,6 +16,9 @@ module ThriftyBunny
 
       @queue = options[:queue] || 'rpc_queue'
       @exchange = options[:exchange] || 'rpc_exchange'
+
+      @timeout = options[:timeout] || 30 # seconds
+      @log = options[:log].nil? ? true : options[:log]
     end
 
     def bunny_config
@@ -25,4 +29,4 @@ module ThriftyBunny
     end
 
   end
-end
+end

data/lib/thrifty_bunny/rpc_server.rb

@@ -21,6 +21,12 @@ module ThriftyBunny
       @protocol_factory = options[:protocol_factory] || Thrift::BinaryProtocolFactory
       @exchange = config.exchange
 
+      @timeout = config.timeout
+      @log = config.log
+    end
+
+    def log?
+      @log
     end
 
     def close
@@ -35,9 +41,7 @@ module ThriftyBunny
     end
 
     def serve(options={})
-      log_messages = options[:log_messages] || false
       max_messages = options[:max_messages].nil? ? 10 : options[:max_messages]
-      response_timeout = options[:response_timeout] || 10
 
       #Create a channel to the service queue
       @request_channel = @conn.create_channel(nil, max_messages )
@@ -47,7 +51,7 @@ module ThriftyBunny
 
       @request_queue.subscribe(:block => true) do |delivery_info, properties, payload|
 
-        if log_messages
+        if log?
           Thread.current["correlation_id"] = properties.correlation_id
           print_log "---- Message received ----"
           print_log "HEADERS: #{properties}"
@@ -59,12 +63,13 @@ module ThriftyBunny
         response_exchange = response_channel.default_exchange
 
         response_required = properties.headers.has_key?('response_required') ? properties.headers['response_required'] : true
-        process_timeout = response_timeout.to_i > properties.expiration.to_i ? response_timeout.to_i : properties.expiration.to_i
+        process_timeout = @timeout > properties.expiration.to_i ? @timeout : properties.expiration.to_i
+        puts "!!!!!!!!!!! process_timeout: #{process_timeout}"
 
         #Binary content will imply thrift based message payload
         if properties.content_type == 'application/octet-stream'
 
-          print_log "Request to process #{@queue_name}.#{properties.headers['operation']} in #{process_timeout}sec" if log_messages
+          print_log "Request to process #{@queue_name}.#{properties.headers['operation']} in #{process_timeout}sec" if log?
 
           input = StringIO.new payload
           out = StringIO.new
@@ -82,7 +87,7 @@ module ThriftyBunny
             if out.length > 0
               out.rewind
 
-              print_log "Time to process request: #{processing_time}sec  Response length: #{out.length}"   if log_messages
+              print_log "Time to process request: #{processing_time}sec  Response length: #{out.length}" if log?
 
               if response_required
                 response_exchange.publish(out.read(out.length),

data/lib/thrifty_bunny/version.rb

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

data/spec/integration/client_spec.rb

@@ -9,7 +9,7 @@ describe 'client calls service to' do
     @pid = fork do
       Signal.trap("HUP") { puts "Stopping server as planned."; exit }
       puts "Starting server as planned."
-      server = Calculator::Server.new
+      server = Calculator::Server.new(timeout: 5)
       server.serve
     end
   end
@@ -23,7 +23,8 @@ describe 'client calls service to' do
   end
 
   def start_client
-    @transport = ThriftyBunny::ClientTransport.new
+    config = ThriftyBunny::Config.new(timeout: 10)
+    @transport = ThriftyBunny::ClientTransport.new(config)
     protocol = Thrift::BinaryProtocol.new(@transport)
     @client = CalculatorService::Client.new(protocol)
   end
@@ -58,4 +59,17 @@ describe 'client calls service to' do
     }.to raise_error(DivideByZeroException)
   end
 
+  it 'successfully calculates age' do
+    res = @client.age(10, 65)
+    puts res
+    expect(res).to eq(55)
+  end
+
+  it 'receives a response timeout' do
+    # snooze for one second longer than timeout
+    expect {
+      @client.snooze(11)
+    }.to raise_error(ThriftyBunny::ResponseTimeout)
+  end
+
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: thrifty-bunny
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.1.0
 platform: ruby
 authors:
 - Bill Siggelkow
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-31 00:00:00.000000000 Z
+date: 2015-05-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -130,6 +130,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
+- ".pryrc"
 - Gemfile
 - LICENSE.txt
 - README.md