thrift-amqp 0.0.5 → 0.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8d14bcafe0df88ac5a2ea265a68a070721b8b531
-  data.tar.gz: 9f7d8a3e80b72a75df0205e2371bdbdca66fa11d
+  metadata.gz: 9685f8ce1ba29a7a558f03320150bd5ebd0fdc2b
+  data.tar.gz: eda997fc1353715d1a659ca05e02e3bc8061ca6c
 SHA512:
-  metadata.gz: a7d06fecfa0209a2e2d4fd5b08f417030635d489ff98c701190698bcb5e31f832d917423a557a8136c403bdab69946fb9760dff184338c7132ff5afad22c0d4f
-  data.tar.gz: b2f67470b1d9defaeefae2081f4369350c739f38860be7ef5110822ee7449429d41517f63edd29d3c479d5e9ae9cc1b4172cf4aa6b825610e75d757813ea05a4
+  metadata.gz: dcd92d6254706a1533185f2b4db1bcf5721e854330a19b4b31c24ce7ef929152c12029f6ebc4390a17a31d49071417cc7d3eba8d53a460ea1dacb0c2b5c02657
+  data.tar.gz: a1fe29ef097e8e0b867eaec863c788380e1ba43ba0d2c320538647d6673bfcea3e3473cfc7d58e79a3d0fa50b8f7ebd968ea04638578a7bc9f18026a8005fa68

data/.rspec

@@ -0,0 +1,2 @@
+--color
+--require spec_helper

data/lib/thrift/amqp/client.rb

@@ -3,13 +3,13 @@ require 'thrift'
 require 'bunny'
 require 'stringio'
 require 'timeout'
-require 'uuidtools'
+require 'securerandom'
 
 module Thrift
   class AMQPClientTransport < BaseTransport
     def initialize(amqp_uri, exchange_name, routing_key)
       @outbuf = Bytes.empty_byte_buffer
-      @inbuf = Bytes.empty_byte_buffer
+      @inbuf = StringIO.new
       @conn = Bunny.new(amqp_uri)
       @queue = Queue.new
 
@@ -20,11 +20,14 @@ module Thrift
       unless @channel
         @conn.start
         @channel = @conn.create_channel
+        @service_exchange = @channel.exchange(@exchange_name)
         @reply_queue = @channel.queue("", auto_delete: true, exclusive: true)
 
-        @reply_queue.subscribe(block: false, ack: true) do |delivery_info, properties, payload|
+        @reply_queue.subscribe(block: false, manual_ack: true) do |delivery_info, properties, payload|
+          @inbuf.write payload
+          @inbuf.rewind
           @queue << true
-          @inbuf << payload
+          @channel.acknowledge(delivery_info.delivery_tag, false)
         end
       end
     end
@@ -42,8 +45,8 @@ module Thrift
     end
 
     def read(sz)
-      buf = @queue.pop
-      @inbuf.read sz
+      @queue.pop if @inbuf.eof?
+      @inbuf.read(sz)
     end
 
     def write(buf)
@@ -58,14 +61,13 @@ module Thrift
         reply_to: @reply_queue.name
       )
 
-
       @outbuf = Bytes.empty_byte_buffer
     end
 
-    prtected
+    protected
 
     def generate_uuid
-      UUIDTools::UUID.timestamp_create.to_s
+       SecureRandom.hex(13)
     end
   end
 end

data/lib/thrift/amqp/server.rb

@@ -19,6 +19,29 @@ module Thrift
       @prefetch = opts[:prefetch]
     end
 
+    def handle(delivery_info, properties, payload)
+      input = StringIO.new payload
+      out = StringIO.new
+      transport = IOStreamTransport.new input, out
+      protocol = @iprot_factory.get_protocol transport
+
+      begin
+        @processor.process protocol, protocol
+
+        if out.length > 0
+          out.rewind
+          @channel.default_exchange.publish(
+            out.read(out.length),
+            routing_key: properties.reply_to
+          )
+        end
+      rescue => e
+        LOGGER.error("Processor failure #{e}")
+      end
+
+      @channel.acknowledge(delivery_info.delivery_tag, false)
+    end
+
     def serve
       @conn = Bunny.new(@amqp_uri)
 
@@ -32,20 +55,12 @@ module Thrift
       @channel.prefetch @prefetch
 
       loop do
-        LOGGER.error("Fetching message from #{@queue_name}")
+        LOGGER.info("Fetching message from #{@queue_name}")
         queue.subscribe(
           manual_ack: true,
           block: true
-        ) do |delivery_info, _properties, payload|
-          trans = MemoryBufferTransport.new(payload)
-          iprot = @iprot_factory.get_protocol(trans)
-
-          begin
-            @processor.process(iprot, nil)
-          rescue => e
-            LOGGER.error("Processor failure #{e}")
-          end
-          @channel.acknowledge(delivery_info.delivery_tag, false)
+        ) do |delivery_info, properties, payload|
+          handle delivery_info, properties, payload
         end
       end
     rescue Bunny::TCPConnectionFailedForAllHosts, Bunny::ConnectionClosedError

data/lib/thrift/amqp/version.rb

@@ -1,5 +1,5 @@
 module Thrift
   module AMQP
-      VERSION = "0.0.5"
+      VERSION = "0.0.6"
   end
 end

data/spec/integration/client_spec.rb

@@ -0,0 +1,34 @@
+require 'spec_helper'
+
+
+describe 'Client' do
+  before(:all) do
+    @pid = fork do
+      run_server
+    end
+  end
+
+  after(:all) do
+    Process.kill "TERM", @pid
+  end
+
+  let!(:client) { client, @trans = build_client; client }
+
+  before(:each) do
+    @trans.open
+  end
+
+  after(:each) do
+    @trans.close
+  end
+
+  it do
+    client.bar(1, 2)
+    sleep 0.5
+    expect(File.read('/tmp/test-rspec')).to eq("3")
+  end
+
+  it do
+    expect(client.foo(1, 2)).to eq(3)
+  end
+end

data/spec/spec_helper.rb

@@ -0,0 +1,96 @@
+$: << 'spec/support/gen-rb'
+$: << 'spec/support/handlers'
+
+require 'test'
+require 'thrift_helpers'
+# This file was generated by the `rspec --init` command. Conventionally, all
+# specs live under a `spec` directory, which RSpec adds to the `$LOAD_PATH`.
+# The generated `.rspec` file contains `--require spec_helper` which will cause
+# this file to always be loaded, without a need to explicitly require it in any
+# files.
+#
+# Given that it is always loaded, you are encouraged to keep this file as
+# light-weight as possible. Requiring heavyweight dependencies from this file
+# will add to the boot time of your test suite on EVERY test run, even for an
+# individual file that may not need all of that loaded. Instead, consider making
+# a separate helper file that requires the additional dependencies and performs
+# the additional setup, and require it from the spec files that actually need
+# it.
+#
+# The `.rspec` file also contains a few flags that are not defaults but that
+# users commonly want.
+#
+# See http://rubydoc.info/gems/rspec-core/RSpec/Core/Configuration
+RSpec.configure do |config|
+  # rspec-expectations config goes here. You can use an alternate
+  # assertion/expectation library such as wrong or the stdlib/minitest
+  # assertions if you prefer.
+  config.expect_with :rspec do |expectations|
+    # This option will default to `true` in RSpec 4. It makes the `description`
+    # and `failure_message` of custom matchers include text for helper methods
+    # defined using `chain`, e.g.:
+    #     be_bigger_than(2).and_smaller_than(4).description
+    #     # => "be bigger than 2 and smaller than 4"
+    # ...rather than:
+    #     # => "be bigger than 2"
+    expectations.include_chain_clauses_in_custom_matcher_descriptions = true
+  end
+
+  # rspec-mocks config goes here. You can use an alternate test double
+  # library (such as bogus or mocha) by changing the `mock_with` option here.
+  config.mock_with :rspec do |mocks|
+    # Prevents you from mocking or stubbing a method that does not exist on
+    # a real object. This is generally recommended, and will default to
+    # `true` in RSpec 4.
+    mocks.verify_partial_doubles = true
+  end
+
+# The settings below are suggested to provide a good initial experience
+# with RSpec, but feel free to customize to your heart's content.
+=begin
+  # These two settings work together to allow you to limit a spec run
+  # to individual examples or groups you care about by tagging them with
+  # `:focus` metadata. When nothing is tagged with `:focus`, all examples
+  # get run.
+  config.filter_run :focus
+  config.run_all_when_everything_filtered = true
+
+  # Limits the available syntax to the non-monkey patched syntax that is
+  # recommended. For more details, see:
+  #   - http://myronmars.to/n/dev-blog/2012/06/rspecs-new-expectation-syntax
+  #   - http://teaisaweso.me/blog/2013/05/27/rspecs-new-message-expectation-syntax/
+  #   - http://myronmars.to/n/dev-blog/2014/05/notable-changes-in-rspec-3#new__config_option_to_disable_rspeccore_monkey_patching
+  config.disable_monkey_patching!
+
+  # This setting enables warnings. It's recommended, but in some cases may
+  # be too noisy due to issues in dependencies.
+  config.warnings = true
+
+  # Many RSpec users commonly either run the entire suite or an individual
+  # file, and it's useful to allow more verbose output when running an
+  # individual spec file.
+  if config.files_to_run.one?
+    # Use the documentation formatter for detailed output,
+    # unless a formatter has already been configured
+    # (e.g. via a command-line flag).
+    config.default_formatter = 'doc'
+  end
+
+  # Print the 10 slowest examples and example groups at the
+  # end of the spec run, to help surface which specs are running
+  # particularly slow.
+  config.profile_examples = 10
+
+  # Run specs in random order to surface order dependencies. If you find an
+  # order dependency and want to debug it, you can fix the order by providing
+  # the seed, which is printed after each run.
+  #     --seed 1234
+  config.order = :random
+
+  # Seed global randomization in this process using the `--seed` CLI option.
+  # Setting this allows you to use `--seed` to deterministically reproduce
+  # test failures related to randomization by passing the same `--seed` value
+  # as the one that triggered the failure.
+  Kernel.srand config.seed
+=end
+end

data/spec/support/gen-rb/test.rb

@@ -0,0 +1,126 @@
+#
+# Autogenerated by Thrift Compiler (1.0.0-upfluence)
+#
+# DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
+#
+
+require 'thrift'
+require 'test_types'
+
+module Test
+  class Client
+    include ::Thrift::Client
+
+    def foo(t1, t2)
+      send_foo(t1, t2)
+      return recv_foo()
+    end
+
+    def send_foo(t1, t2)
+      send_message('foo', Foo_args, :t1 => t1, :t2 => t2)
+    end
+
+    def recv_foo()
+      result = receive_message(Foo_result)
+      return result.success unless result.success.nil?
+      raise ::Thrift::ApplicationException.new(::Thrift::ApplicationException::MISSING_RESULT, 'foo failed: unknown result')
+    end
+
+    def bar(t1, t2)
+      send_bar(t1, t2)
+    end
+
+    def send_bar(t1, t2)
+      send_oneway_message('bar', Bar_args, :t1 => t1, :t2 => t2)
+    end
+  end
+
+  class Processor
+    include ::Thrift::Processor
+
+    def process_foo(seqid, iprot, oprot)
+      args = read_args(iprot, Foo_args)
+      result = Foo_result.new()
+      result.success = @handler.foo(args.t1, args.t2)
+      write_result(result, oprot, 'foo', seqid)
+    end
+
+    def process_bar(seqid, iprot, oprot)
+      args = read_args(iprot, Bar_args)
+      @handler.bar(args.t1, args.t2)
+      return
+    end
+
+  end
+
+  # HELPER FUNCTIONS AND STRUCTURES
+
+  class Foo_args
+    include ::Thrift::Struct, ::Thrift::Struct_Union
+    T1 = 1
+    T2 = 2
+
+    FIELDS = {
+      T1 => {:type => ::Thrift::Types::I16, :name => 't1'},
+      T2 => {:type => ::Thrift::Types::I16, :name => 't2'}
+    }
+
+    def struct_fields; FIELDS; end
+
+    def validate
+    end
+
+    ::Thrift::Struct.generate_accessors self
+  end
+
+  class Foo_result
+    include ::Thrift::Struct, ::Thrift::Struct_Union
+    SUCCESS = 0
+
+    FIELDS = {
+      SUCCESS => {:type => ::Thrift::Types::I16, :name => 'success'}
+    }
+
+    def struct_fields; FIELDS; end
+
+    def validate
+    end
+
+    ::Thrift::Struct.generate_accessors self
+  end
+
+  class Bar_args
+    include ::Thrift::Struct, ::Thrift::Struct_Union
+    T1 = 1
+    T2 = 2
+
+    FIELDS = {
+      T1 => {:type => ::Thrift::Types::I16, :name => 't1'},
+      T2 => {:type => ::Thrift::Types::I16, :name => 't2'}
+    }
+
+    def struct_fields; FIELDS; end
+
+    def validate
+    end
+
+    ::Thrift::Struct.generate_accessors self
+  end
+
+  class Bar_result
+    include ::Thrift::Struct, ::Thrift::Struct_Union
+
+    FIELDS = {
+
+    }
+
+    def struct_fields; FIELDS; end
+
+    def validate
+    end
+
+    ::Thrift::Struct.generate_accessors self
+  end
+
+end
+

data/spec/support/gen-rb/test_constants.rb

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

data/spec/support/gen-rb/test_types.rb

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

data/spec/support/handlers/test_handler.rb

@@ -0,0 +1,12 @@
+class TestHandler
+  def foo(x, y)
+    x + y
+  end
+
+  def bar(x, y)
+    f = File.open('/tmp/test-rspec', 'w')
+    f << x + y
+    f.flush
+    f.close
+  end
+end

data/spec/support/handlers/thrift_helpers.rb

@@ -0,0 +1,29 @@
+require 'thrift'
+require 'thrift/amqp/server'
+require 'thrift/amqp/client'
+require 'test'
+require 'test_handler'
+
+def run_server
+  processor = Test::Processor.new(TestHandler.new)
+  prot_factory = Thrift::JsonProtocolFactory.new
+
+  Thrift::AMQPServer.new(
+    processor, prot_factory, nil,
+    amqp_uri: ENV['RABBITMQ_URL'] || 'amqp://guest:guest@127.0.0.1:5672/%2f',
+    routing_key: 'test',
+    exchange_name: 'test',
+    queue_name: 'test', prefetch: ENV['PREFETCH'] || 1
+  ).serve
+end
+
+def build_client
+  trans = Thrift::AMQPClientTransport.new(
+    ENV['RABBITMQ_URL'] || 'amqp://guest:guest@127.0.0.1:5672/%2f',
+    'test', 'test'
+  )
+
+  prot = Thrift::JsonProtocol.new(trans)
+
+  [Test::Client.new(prot), trans]
+end

data/spec/support/test.thrift

@@ -0,0 +1,4 @@
+service Test {
+  i16 foo(1:i16 t1, 2:i16 t2),
+  oneway void bar(1:i16 t1, 2:i16 t2),
+}

data/thrift-amqp.gemspec

@@ -1,4 +1,3 @@
-# coding: utf-8
 lib = File.expand_path('../lib', __FILE__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'thrift/amqp/version'
@@ -20,7 +19,7 @@ Gem::Specification.new do |spec|
 
   spec.add_development_dependency "bundler", "~> 1.6"
   spec.add_development_dependency "rake"
+  spec.add_development_dependency "rspec"
   spec.add_dependency "bunny"
   spec.add_dependency "thrift"
-  spec.add_dependency "uuidtools"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: thrift-amqp
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
 platform: ruby
 authors:
 - Alexis Montagne
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-09 00:00:00.000000000 Z
+date: 2015-07-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -39,13 +39,13 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: bunny
+  name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  type: :runtime
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
@@ -53,7 +53,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: thrift
+  name: bunny
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -67,7 +67,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: uuidtools
+  name: thrift
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -89,6 +89,7 @@ extra_rdoc_files: []
 files:
 - ".DS_Store"
 - ".gitignore"
+- ".rspec"
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -97,6 +98,14 @@ files:
 - lib/thrift/amqp/client.rb
 - lib/thrift/amqp/server.rb
 - lib/thrift/amqp/version.rb
+- spec/integration/client_spec.rb
+- spec/spec_helper.rb
+- spec/support/gen-rb/test.rb
+- spec/support/gen-rb/test_constants.rb
+- spec/support/gen-rb/test_types.rb
+- spec/support/handlers/test_handler.rb
+- spec/support/handlers/thrift_helpers.rb
+- spec/support/test.thrift
 - thrift-amqp.gemspec
 homepage: ''
 licenses:
@@ -122,4 +131,12 @@ rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Thrift transport layer over AMQP
-test_files: []
+test_files:
+- spec/integration/client_spec.rb
+- spec/spec_helper.rb
+- spec/support/gen-rb/test.rb
+- spec/support/gen-rb/test_constants.rb
+- spec/support/gen-rb/test_types.rb
+- spec/support/handlers/test_handler.rb
+- spec/support/handlers/thrift_helpers.rb
+- spec/support/test.thrift