stark 0.7.0 → 0.8.0

data/test/test_coerce_strings.rb

@@ -0,0 +1,187 @@
+require 'test/unit'
+
+require 'stark'
+require 'thrift'
+
+require 'test/test_helper'
+
+class TestCoerceStrings1 < Test::Unit::TestCase
+  IDL = "test/ThriftSpec.thrift"
+  SERVICE = "SpecNamespace::NonblockingService"
+  include TestHelper
+
+  class Handler
+    def sleep_value
+      @sleep
+    end
+
+    def sleep(sec)
+      @sleep = sec
+    end
+  end
+
+  def setup
+    @handler = Handler.new
+    setup_server @handler
+  end
+
+  def test_coerce_string_to_double
+
+    send_to_server do
+      name = "sleep"
+      @client_p.write_message_begin name, Thrift::MessageTypes::CALL, 0
+      @client_p.write_struct_begin "#{name}_args"
+      @client_p.write_field_begin "seconds", Thrift::Types::STRING, 1
+      @client_p.write_string "1.5"
+      @client_p.write_field_end
+      @client_p.write_field_stop
+      @client_p.write_struct_end
+      @client_p.write_message_end
+      @client_p.trans.flush
+
+      @client_p.read_message_begin
+      @client_p.skip Thrift::Types::STRUCT
+      @client_p.read_message_end
+    end
+
+    assert_equal 1.5, @handler.sleep_value
+  end
+end
+
+class TestCoerceStrings2 < Test::Unit::TestCase
+  IDL = "test/profile.thrift"
+  SERVICE = "UserStorage"
+  include TestHelper
+
+  def setup
+    setup_server
+  end
+
+  def test_coerce_string_to_int
+
+    send_to_server do
+      name = "add"
+      @client_p.write_message_begin name, Thrift::MessageTypes::CALL, 0
+      @client_p.write_struct_begin "#{name}_args"
+      @client_p.write_field_begin "a", Thrift::Types::STRING, 1
+      @client_p.write_string "1"
+      @client_p.write_field_end
+      @client_p.write_field_begin "b", Thrift::Types::STRING, 2
+      @client_p.write_string "1"
+      @client_p.write_field_end
+      @client_p.write_field_stop
+      @client_p.write_struct_end
+      @client_p.write_message_end
+      @client_p.trans.flush
+
+      @client_p.read_message_begin
+      @client_p.read_struct_begin
+      _, _, fid = @client_p.read_field_begin
+      assert_equal 0, fid
+      assert_equal 2, @client_p.read_i32
+      @client_p.read_field_end
+      _, type, _ = @client_p.read_field_begin
+      assert_equal type, Thrift::Types::STOP
+      @client_p.read_struct_end
+      @client_p.read_message_end
+    end
+  end
+
+  def test_coerce_number_list_to_string_list
+    send_to_server do
+      name = "set_list"
+      @client_p.write_message_begin name, Thrift::MessageTypes::CALL, 0
+      @client_p.write_struct_begin "#{name}_args"
+      @client_p.write_field_begin "l", Thrift::Types::LIST, 1
+      @client_p.write_list_begin ::Thrift::Types::I32, 3
+      @client_p.write_i32 1
+      @client_p.write_i32 2
+      @client_p.write_i32 3
+      @client_p.write_list_end
+      @client_p.write_field_end
+      @client_p.write_field_stop
+      @client_p.write_struct_end
+      @client_p.write_message_end
+      @client_p.trans.flush
+    end
+
+    assert_equal ["1", "2", "3"], @handler.last_list
+  end
+
+  def test_coerce_strings_on_write_parameter
+    @handler.store @n::UserProfile.new(:uid => 123, :name => "Gob")
+
+    profile = send_to_server do
+      @client.retrieve "123"
+    end
+
+    assert profile
+    assert_equal "Gob", profile.name
+  end
+
+  def test_coerce_strings_on_write_struct_field
+    send_to_server do
+      @client.set_user_friends @n::UserFriends.new(:user => "123")
+    end
+
+    assert @handler.user_friends
+    assert_equal 123, @handler.user_friends.user
+  end
+
+  def test_coercion_fails_on_write_with_incompatible_types
+    assert_raises TypeError do
+      @client.store "user_profile"
+    end
+  end
+
+  class BadTypesHandler
+    def initialize(n)
+      @n = n
+    end
+
+    def retrieve(uid)
+      @n::UserProfile.new(:uid => "123", :name => 123)
+    end
+
+    def volume_up
+      "11"
+    end
+  end
+
+  def test_coerce_strings_on_processor_write_struct_field
+    set_handler BadTypesHandler.new(@n)
+
+    profile = send_to_server do
+      @client.retrieve 123
+    end
+
+    assert profile
+    assert_equal "123", profile.name
+  end
+
+  def test_coerce_strings_on_processor_write_return_value
+    set_handler BadTypesHandler.new(@n)
+
+    vol = send_to_server do
+      @client.volume_up
+    end
+
+    assert vol
+    assert_equal 11, vol
+  end
+
+  def test_coercion_fails_on_processor_write_with_incompatible_types
+    set_handler Object.new.tap {|h|
+      def h.retrieve(uid)
+        "user_profile"
+      end
+    }
+
+    assert_raises Thrift::ApplicationException do
+      send_to_server do
+        @client.retrieve 123
+      end
+    end
+  end
+
+end

data/test/test_helper.rb

@@ -0,0 +1,113 @@
+module TestHelper
+  def setup_shared
+    @client_t, @server_t = Stark.pipe_transport
+    @client_p = Thrift::BinaryProtocol.new @client_t
+    @server_p = Thrift::BinaryProtocol.new @server_t
+
+    @n = Module.new
+    Stark.materialize self.class::IDL, @n
+    @s = @n.module_eval self.class::SERVICE
+    @prev_logger = Stark.logger
+    @log_stream = StringIO.new
+    Stark.logger = Logger.new @log_stream
+  end
+
+  def setup_client
+    setup_shared
+    @client = @n::UserStorage::Client.new @client_p, @client_p
+    @handler = Handler.new(Object)
+    @server = UserStorage::Processor.new @handler
+  end
+
+  def setup_server(handler = nil)
+    setup_shared
+    @client = @s::Client.new @client_p, @client_p
+    set_handler handler
+  end
+
+  def set_handler(handler = nil)
+    @handler = handler || Handler.new(@n)
+    @server = @s::Processor.new @handler
+  end
+
+  def teardown
+    print @log_stream.string unless passed?
+    Stark.logger = @prev_logger
+    @client_t.close
+    @server_t.close
+  end
+
+  class Handler
+    def initialize(n)
+      @users = {}
+      @last_map = nil
+      @last_list = nil
+      @last_status = nil
+      @n = n
+      @user_status = nil
+      @user_relationship = nil
+      @user_friends = nil
+    end
+
+    attr_accessor :last_map, :last_list, :last_status, :user_status
+
+    def store(obj)
+      @users[obj.uid] = obj
+    end
+
+    def retrieve(id)
+      @users[id]
+    end
+
+    def set_map(m)
+      @last_map = m
+    end
+
+    def set_list(l)
+      @last_list = l
+    end
+
+    def set_status(s)
+      @last_status = s
+    end
+
+    def volume_up
+      raise @n::RockTooHard.new(:volume => 11)
+    end
+
+    def make_bitcoins
+      sleep 2
+    end
+
+    def add(a,b)
+      a + b
+    end
+
+    def set_user_status(s)
+      @user_status = s
+    end
+
+    attr_accessor :user_relationship
+    def set_user_relationship(rel)
+      @user_relationship = rel
+    end
+
+    attr_accessor :user_friends
+    def set_user_friends(fr)
+      @user_friends = fr
+    end
+  end
+
+  def send_to_server
+    st = Thread.new do
+      @server.process @server_p, @server_p
+    end
+    yield
+  rescue => e
+    st = nil
+    raise e
+  ensure
+    st.value if st
+  end
+
+end

data/test/test_marshal.rb

@@ -0,0 +1,131 @@
+require 'test/unit'
+
+require 'stark'
+require 'thrift'
+
+require 'test/test_helper'
+
+class TestMarshal < Test::Unit::TestCase
+  IDL = "test/types.thrift"
+  SERVICE = "Types"
+  include TestHelper
+
+  class Handler
+    def initialize(n, at = nil, err = nil)
+      @n = n
+      @at = at || @n::AllTypes.new
+      @err = err
+    end
+
+    def get_all_types
+      @at
+    end
+
+    def set_all_types(at)
+      @at = at
+    end
+
+    def raise_error
+      raise @err if @err
+    end
+
+    def set_error(err)
+      @err = err
+    end
+  end
+
+  def create_all_types(fields)
+    @n::AllTypes.new(fields).tap do |af|
+      enum = fields.keys.first.to_s.sub(/^an?_/, '')
+      af.field = enum.to_sym
+    end
+  end
+
+  def setup
+    setup_server
+    set_handler Handler.new(@n)
+  end
+
+  def test_returning_struct
+    send_to_server do
+      assert @client.get_all_types.field.nil?
+    end
+  end
+
+  def test_returning_a_list_of_structs
+    l = [@n::Element.new(:id => 1, :name => "one"), @n::Element.new(:id => 2, :name => "two")]
+    @handler.set_all_types create_all_types(:a_list_of_structs => l)
+
+    at = send_to_server do
+      @client.get_all_types
+    end
+
+    assert_equal :list_of_structs, at.field
+    assert_equal 2, at.a_list_of_structs.size
+    el = at.a_list_of_structs[0]
+    assert_equal 1, el.id
+    assert_equal "one", el.name
+    el = at.a_list_of_structs[1]
+    assert_equal 2, el.id
+    assert_equal "two", el.name
+  end
+
+  def test_returning_a_map
+    ascii = Hash[*(0...128).map{|n| [n, n.chr]}.flatten]
+    @handler.set_all_types create_all_types(:a_map => ascii)
+
+    at = send_to_server do
+      @client.get_all_types
+    end
+
+    assert_equal :map, at.field
+    assert_equal ascii, at.a_map
+  end
+
+  def test_returning_a_set
+    primes = begin
+               require 'prime'
+               Prime::instance.each(256).to_a
+             rescue LoadError
+               require 'mathn'
+               p = Prime.new
+               [].tap {|arr| 256.times { arr << p.next } }
+             end
+    @handler.set_all_types create_all_types(:a_set => primes + primes)
+
+    at = send_to_server do
+      @client.get_all_types
+    end
+
+    assert_equal :set, at.field
+    assert_equal Set.new(primes), at.a_set
+  end
+
+  def test_raise_no_error
+    send_to_server do
+      assert @client.raise_error.nil?
+    end
+  end
+
+  def test_raise_first_error
+    err = @n::AnException.new :message => "An error occurred", :backtrace => caller
+    @handler.set_error err
+    exception = send_to_server do
+      assert_raises @n::AnException do
+        @client.raise_error
+      end
+    end
+
+    assert_equal err.message, exception.message
+    assert_equal err.backtrace, exception.backtrace
+  end
+
+  def test_raise_second_error
+    @handler.set_error @n::AnotherException.new
+    send_to_server do
+      assert_raises @n::AnotherException do
+        @client.raise_error
+      end
+    end
+  end
+end

data/test/test_parser.rb

@@ -56,6 +56,17 @@ struct Foo {
     EOM
   end
 
+  def test_list_with_struct
+    parse <<-EOM
+struct Foo {
+  1: i32 uid
+}
+struct Bar {
+  1: list<Foo> foos
+}
+    EOM
+  end
+
   include Stark::Parser::AST
 
   def comment(text)
@@ -355,5 +366,55 @@ namespace rb Blah
     assert_field fs[0], 1, "My_union", "fun_union"
     assert_field fs[1], 2, "i32", "integer32"
     assert_field fs[2], 3, "string", "some_characters"
+
+    s = ary.shift
+    assert_equal "StructWithEnumMap", s.name
+
+    s = ary.shift
+    # comment
+
+    s = ary.shift
+    assert_equal "NestedListInList", s.name
+
+    s = ary.shift
+    assert_equal "NestedListInSet", s.name
+
+    s = ary.shift
+    assert_equal "NestedListInMapKey", s.name
+
+    s = ary.shift
+    assert_equal "NestedListInMapValue", s.name
+
+    s = ary.shift # comment
+    s = ary.shift
+    assert_equal "NestedSetInList", s.name
+
+    s = ary.shift
+    assert_equal "NestedSetInSet", s.name
+
+    s = ary.shift
+    assert_equal "NestedSetInMapKey", s.name
+
+    s = ary.shift
+    assert_equal "NestedSetInMapValue", s.name
+
+    s = ary.shift # comment
+    s = ary.shift
+    assert_equal "NestedMapInList", s.name
+
+    s = ary.shift
+    assert_equal "NestedMapInSet", s.name
+
+    s = ary.shift
+    assert_equal "NestedMapInMapKey", s.name
+
+    s = ary.shift
+    assert_equal "NestedMapInMapValue", s.name
+
+    s = ary.shift
+    assert_equal "HelloService", s.name
+    fs = s.functions
+
+    assert_func fs[0], list("Hello"), "all", nil
   end
 end