stark 0.5.0 → 0.6.0

data/History.txt

@@ -1,4 +1,14 @@
-=== 1.0.0 / 2012-08-20
+=== 0.6.0 / 2013-03-02
+
+* 5 bugfixes:
+
+  * Add oneway support and add throw on server side
+  * Add support for throws. Fixes #1
+  * Disable regenerating the parser on test run
+  * Fix code generation bug
+  * Fix running in travis
+
+=== 0.5.0 / 2012-08-20
 
 * 1 major enhancement
 

data/Rakefile

@@ -3,6 +3,7 @@
 require 'rubygems'
 require 'hoe'
 
+Hoe.plugin :travis
 Hoe.plugin :gemspec
 Hoe.plugin :git
 
@@ -16,6 +17,6 @@ task :parser do
   sh "kpeg -o lib/stark/raw_parser.rb -s -f lib/stark/thrift.kpeg"
 end
 
-task :test => :parser
+# task :test => :parser
 
 # vim: syntax=ruby

data/lib/stark/ast.rb

@@ -43,5 +43,11 @@ class Stark::Parser
         obj.process_enum self
       end
     end
+
+    class Exception
+      def accept(obj)
+        obj.process_exception self
+      end
+    end
   end
 end

data/lib/stark/client.rb

@@ -16,6 +16,29 @@ module Stark
       end
     end
 
+    def handle_throw(cls)
+      ip = @iprot
+
+      obj = cls::Struct.new
+
+      ip.read_struct_begin
+
+      while true
+        _, ftype, fid = ip.read_field_begin
+        break if ftype == ::Thrift::Types::STOP
+
+        obj.set_from_index ftype, fid, ip
+
+        ip.read_field_end
+      end
+
+      ip.read_struct_end
+
+      ip.read_message_end
+
+      raise cls.new(obj)
+    end
+
     def handle_unexpected(rtype)
       return if rtype == ::Thrift::Types::STOP
       @iprot.skip(rtype)

data/lib/stark/converters.rb

@@ -12,6 +12,10 @@ module Stark
       def read(ip)
         ip.read_i32
       end
+
+      def write(op, value)
+        op.write_i32 value
+      end
     end
 
     module STRING
@@ -24,6 +28,10 @@ module Stark
       def read(ip)
         ip.read_string
       end
+
+      def write(op, value)
+        op.write_string value
+      end
     end
   end
 end

data/lib/stark/field.rb

@@ -17,5 +17,11 @@ module Stark
     def read(ip)
       @converter.read ip
     end
+
+    def write(op, val)
+      op.write_field_begin @name, type, @index
+      @converter.write op, val
+      op.write_field_end
+    end
   end
 end

data/lib/stark/processor.rb

@@ -6,6 +6,8 @@ module Stark
 
     def process(iprot, oprot)
       name, type, seqid  = iprot.read_message_begin
+      fail unless type == Thrift::MessageTypes::CALL
+
       if respond_to?("process_#{name}")
         send("process_#{name}", seqid, iprot, oprot)
         true
@@ -21,6 +23,31 @@ module Stark
       end
     end
 
+    def check_raise_specific(name, seqid, op, c)
+      begin
+        yield
+      rescue c => e
+        op.write_message_begin name, ::Thrift::MessageTypes::REPLY, seqid
+        op.write_struct_begin 'result_struct'
+
+        op.write_field_begin 'result', ::Thrift::Types::STRUCT, 1
+        op.write_struct_begin c.class.name
+        e.struct.write_fields op
+        op.write_field_end
+        op.write_field_stop
+        op.write_struct_end
+
+        op.write_field_end
+        op.write_field_stop
+        op.write_struct_end
+
+        op.write_message_end
+        op.trans.flush
+
+        nil
+      end
+    end
+
     def hash_cast(obj)
       return obj if obj.kind_of? Hash
       return obj.to_h if obj.respond_to? :to_h

data/lib/stark/raw_parser.rb

@@ -428,14 +428,18 @@ class Stark::Parser
       attr_reader :options
     end
     class Function < Node
-      def initialize(name, return_type, arguments)
+      def initialize(name, return_type, arguments, throws, options)
         @name = name
         @return_type = return_type
         @arguments = arguments
+        @throws = throws
+        @options = options
       end
       attr_reader :name
       attr_reader :return_type
       attr_reader :arguments
+      attr_reader :throws
+      attr_reader :options
     end
     class Include < Node
       def initialize(path)
@@ -520,8 +524,8 @@ class Stark::Parser
   def field(index, type, name, value, options)
     AST::Field.new(index, type, name, value, options)
   end
-  def function(name, return_type, arguments)
-    AST::Function.new(name, return_type, arguments)
+  def function(name, return_type, arguments, throws, options)
+    AST::Function.new(name, return_type, arguments, throws, options)
   end
   def include(path)
     AST::Include.new(path)
@@ -3028,7 +3032,7 @@ class Stark::Parser
     return _tmp
   end
 
-  # Function = CaptureDocText OneWay? FunctionType:rt - tok_identifier:name osp "(" FieldList?:args ")" Throws? CommaOrSemicolonOptional {function(name, rt, args)}
+  # Function = CaptureDocText OneWay?:o FunctionType:rt - tok_identifier:name osp "(" FieldList?:args ")" Throws?:t CommaOrSemicolonOptional {function(name, rt, args, t, o)}
   def _Function
 
     _save = self.pos
@@ -3040,10 +3044,12 @@ class Stark::Parser
       end
       _save1 = self.pos
       _tmp = apply(:_OneWay)
+      @result = nil unless _tmp
       unless _tmp
         _tmp = true
         self.pos = _save1
       end
+      o = @result
       unless _tmp
         self.pos = _save
         break
@@ -3094,10 +3100,12 @@ class Stark::Parser
       end
       _save3 = self.pos
       _tmp = apply(:_Throws)
+      @result = nil unless _tmp
       unless _tmp
         _tmp = true
         self.pos = _save3
       end
+      t = @result
       unless _tmp
         self.pos = _save
         break
@@ -3107,7 +3115,7 @@ class Stark::Parser
         self.pos = _save
         break
       end
-      @result = begin; function(name, rt, args); end
+      @result = begin; function(name, rt, args, t, o); end
       _tmp = true
       unless _tmp
         self.pos = _save
@@ -3119,7 +3127,7 @@ class Stark::Parser
     return _tmp
   end
 
-  # OneWay = ("oneway" | "async") -
+  # OneWay = ("oneway" | "async") - { :oneway }
   def _OneWay
 
     _save = self.pos
@@ -3141,6 +3149,12 @@ class Stark::Parser
         break
       end
       _tmp = apply(:__hyphen_)
+      unless _tmp
+        self.pos = _save
+        break
+      end
+      @result = begin;  :oneway ; end
+      _tmp = true
       unless _tmp
         self.pos = _save
       end
@@ -3151,11 +3165,16 @@ class Stark::Parser
     return _tmp
   end
 
-  # Throws = "throws" - "(" FieldList ")"
+  # Throws = - "throws" - "(" FieldList ")"
   def _Throws
 
     _save = self.pos
     while true # sequence
+      _tmp = apply(:__hyphen_)
+      unless _tmp
+        self.pos = _save
+        break
+      end
       _tmp = match_string("throws")
       unless _tmp
         self.pos = _save
@@ -3995,9 +4014,9 @@ class Stark::Parser
   Rules[:_Service] = rule_info("Service", "\"service\" - tok_identifier:name - Extends? osp \"{\" obsp FunctionList?:funcs obsp \"}\" {service(name, funcs)}")
   Rules[:_Extends] = rule_info("Extends", "\"extends\" - tok_identifier")
   Rules[:_FunctionList] = rule_info("FunctionList", "(FunctionList:l Function:f { l + [f] } | Function:f { [f] })")
-  Rules[:_Function] = rule_info("Function", "CaptureDocText OneWay? FunctionType:rt - tok_identifier:name osp \"(\" FieldList?:args \")\" Throws? CommaOrSemicolonOptional {function(name, rt, args)}")
-  Rules[:_OneWay] = rule_info("OneWay", "(\"oneway\" | \"async\") -")
-  Rules[:_Throws] = rule_info("Throws", "\"throws\" - \"(\" FieldList \")\"")
+  Rules[:_Function] = rule_info("Function", "CaptureDocText OneWay?:o FunctionType:rt - tok_identifier:name osp \"(\" FieldList?:args \")\" Throws?:t CommaOrSemicolonOptional {function(name, rt, args, t, o)}")
+  Rules[:_OneWay] = rule_info("OneWay", "(\"oneway\" | \"async\") - { :oneway }")
+  Rules[:_Throws] = rule_info("Throws", "- \"throws\" - \"(\" FieldList \")\"")
   Rules[:_FieldList] = rule_info("FieldList", "(FieldList:l Field:f { l + [f] } | Field:f { [f] })")
   Rules[:_Field] = rule_info("Field", "CaptureDocText FieldIdentifier?:i osp FieldRequiredness?:req osp FieldType:t osp tok_identifier:n osp FieldValue?:val CommaOrSemicolonOptional {field(i,t,n,val,req)}")
   Rules[:_FieldIdentifier] = rule_info("FieldIdentifier", "tok_int_constant:n \":\" {n}")

data/lib/stark/ruby.rb

@@ -8,6 +8,7 @@ module Stark
       @indent = 0
       @structs = {}
       @enums = {}
+      @exceptions = {}
 
       @stream = stream
 
@@ -17,6 +18,7 @@ module Stark
       o "require 'stark/field'"
       o "require 'stark/converters'"
       o "require 'stark/processor'"
+      o "require 'stark/exception'"
     end
 
     def process_namespace(ns)
@@ -58,11 +60,53 @@ module Stark
 
       outdent
       o "}"
+
+      str.fields.each do |f|
+        o "def #{f.name}; @fields['#{f.name}']; end"
+      end
+
       outdent
       o "end"
 
     end
 
+    def process_exception(str)
+      @exceptions[str.name] = str
+
+      o "class #{str.name} < Stark::Exception"
+      indent
+
+      o "class Struct < Stark::Struct"
+      indent
+      o "Fields = {"
+      indent
+
+      str.fields.each do |f|
+        c = "Stark::Converters::#{f.type.upcase}"
+
+        o "#{f.index} => Stark::Field.new(#{f.index}, '#{f.name}', #{c}),"
+      end
+
+      o ":count => #{str.fields.size}"
+
+      outdent
+      o "}"
+
+      str.fields.each do |f|
+        o "def #{f.name}; @fields['#{f.name}']; end"
+      end
+
+      outdent
+      o "end"
+
+      str.fields.each do |f|
+        o "def #{f.name}; @struct.#{f.name}; end"
+      end
+
+      outdent
+      o "end"
+    end
+
     def o(str)
       @stream.print(" " * @indent)
       @stream.puts str
@@ -243,7 +287,23 @@ module Stark
         o "ip.read_struct_end"
         o "ip.read_message_end"
 
-        o "result = @handler.#{func.name}(*args)"
+        if t = func.throws
+          o "result = check_raise_specific('#{func.name}', seqid, op, #{t.first.type}) do"
+        o "  @handler.#{func.name}(*args)"
+        o "end"
+
+        o "return unless result"
+
+        else
+          o "result = @handler.#{func.name}(*args)"
+        end
+
+        if func.options == :oneway
+          o "return result"
+          outdent
+          o "end"
+          next
+        end
 
         o "op.write_message_begin '#{func.name}', ::Thrift::MessageTypes::REPLY, seqid"
         o "op.write_struct_begin '#{func.name}_result'"
@@ -313,10 +373,12 @@ module Stark
 
         o "    :args => {"
 
-        Array(func.arguments).each do |a|
-          o "      #{a.index} => #{wire_type(a.type)}"
+        mapped_args = Array(func.arguments).map do |a|
+          "#{a.index} => #{wire_type(a.type)}"
         end
 
+        o "      #{mapped_args.join(', ')}"
+
         o "    }"
         o "  }"
       end
@@ -374,25 +436,40 @@ module Stark
         o "op.write_message_end"
         o "op.trans.flush"
 
+        if func.options == :oneway
+          o "return"
+          outdent
+          o "end"
+          next
+        end
+
         o "ip = @iprot"
         o "_, mtype, _ = ip.read_message_begin"
+
         o "handle_exception mtype"
 
         o "ip.read_struct_begin"
+
+        o "_, rtype, rid = ip.read_field_begin"
+
+        if t = func.throws
+          o "if rid == 1"
+          o "  handle_throw #{t.first.type}"
+          o "end"
+        end
+
+        o "fail unless rid == 0"
+
         o "result = nil"
 
-        if func.return_type == "void"
-          o "_, rtype, _ = ip.read_field_begin"
-        else
+        if func.return_type != "void"
           if desc = @structs[func.return_type]
-            o "_, rtype, rid = ip.read_field_begin"
             o "if rtype != #{wire_type(func.return_type)}"
             o "  handle_unexpected rtype"
             o "else"
             o "  result = read_generic rtype, rid, #{desc.name}"
             o "end"
           elsif desc = @enums[func.return_type]
-            o "_, rtype, rid = ip.read_field_begin"
             o "if rtype != #{wire_type(func.return_type)}"
             o "  handle_unexpected rtype"
             o "else"
@@ -402,7 +479,6 @@ module Stark
           elsif func.return_type.kind_of? Stark::Parser::AST::Map
             ft = func.return_type
 
-            o "_, rtype, rid = ip.read_field_begin"
             o "if rtype != #{wire_type(func.return_type)}"
             o "  handle_unexpected rtype"
             o "else"
@@ -419,7 +495,6 @@ module Stark
             o "end"
           elsif func.return_type.kind_of? Stark::Parser::AST::List
             ft = func.return_type
-            o "_, rtype, rid = ip.read_field_begin"
             o "if rtype == ::Thrift::Types::LIST"
             o "  vt, size = ip.read_list_begin"
             o "  if vt == #{wire_type(ft.value)}"
@@ -432,7 +507,6 @@ module Stark
             o "  handle_unexpected rtype"
             o "end"
           else
-            o "_, rtype, _ = ip.read_field_begin"
             o "if rtype == #{type(func.return_type)}"
             o "  result = ip.#{read_func(func.return_type)}"
             o "else"

data/lib/stark/struct.rb

@@ -15,12 +15,11 @@ module Stark
       end
     end
 
-    def method_missing(meth, *args)
-      if val = @fields[meth.to_s]
-        return val
+    def write_fields(op)
+      self.class::Fields.each do |idx, field|
+        next if idx == :count
+        field.write op, @fields[field.name]
       end
-
-      super
     end
   end
 end

data/lib/stark/thrift.kpeg

@@ -4,7 +4,7 @@
 %% include = ast Include(path)
 %% struct = ast Struct(type, name, fields)
 %% field = ast Field(index, type, name, value, options)
-%% function = ast Function(name, return_type, arguments)
+%% function = ast Function(name, return_type, arguments, throws, options)
 %% service = ast Service(name, functions)
 %% comment = ast Comment(text)
 %% enum = ast Enum(name, values)
@@ -271,13 +271,13 @@ Extends = "extends" - tok_identifier
 FunctionList = FunctionList:l Function:f { l + [f] }
              | Function:f { [f] }
 
-Function = CaptureDocText OneWay? FunctionType:rt - tok_identifier:name
-           osp "(" FieldList?:args ")" Throws? CommaOrSemicolonOptional
-           ~function(name, rt, args)
+Function = CaptureDocText OneWay?:o FunctionType:rt - tok_identifier:name
+           osp "(" FieldList?:args ")" Throws?:t CommaOrSemicolonOptional
+           ~function(name, rt, args, t, o)
 
-OneWay = ("oneway" | "async") -
+OneWay = ("oneway" | "async") - { :oneway }
 
-Throws = "throws" - "(" FieldList ")"
+Throws = - "throws" - "(" FieldList ")"
 
 FieldList = FieldList:l Field:f { l + [f] }
           | Field:f { [f] }

data/lib/stark.rb

@@ -1,7 +1,7 @@
 require 'thrift'
 
 module Stark
-  VERSION = '0.5.0'
+  VERSION = '0.6.0'
 
   def self.pipe_transport
     cr, cw = IO.pipe

data/test/gen-rb/profile_types.rb

@@ -34,3 +34,19 @@ class UserProfile
   ::Thrift::Struct.generate_accessors self
 end
 
+class RockTooHard < ::Thrift::Exception
+  include ::Thrift::Struct, ::Thrift::Struct_Union
+  VOLUME = 1
+
+  FIELDS = {
+    VOLUME => {:type => ::Thrift::Types::I32, :name => 'volume'}
+  }
+
+  def struct_fields; FIELDS; end
+
+  def validate
+  end
+
+  ::Thrift::Struct.generate_accessors self
+end
+

data/test/gen-rb/user_storage.rb

@@ -127,6 +127,44 @@ module UserStorage
       raise ::Thrift::ApplicationException.new(::Thrift::ApplicationException::MISSING_RESULT, 'last_status failed: unknown result')
     end
 
+    def volume_up()
+      send_volume_up()
+      return recv_volume_up()
+    end
+
+    def send_volume_up()
+      send_message('volume_up', Volume_up_args)
+    end
+
+    def recv_volume_up()
+      result = receive_message(Volume_up_result)
+      return result.success unless result.success.nil?
+      raise result.exc unless result.exc.nil?
+      raise ::Thrift::ApplicationException.new(::Thrift::ApplicationException::MISSING_RESULT, 'volume_up failed: unknown result')
+    end
+
+    def make_bitcoins()
+      send_make_bitcoins()
+    end
+
+    def send_make_bitcoins()
+      send_message('make_bitcoins', Make_bitcoins_args)
+    end
+    def add(a, b)
+      send_add(a, b)
+      return recv_add()
+    end
+
+    def send_add(a, b)
+      send_message('add', Add_args, :a => a, :b => b)
+    end
+
+    def recv_add()
+      result = receive_message(Add_result)
+      return result.success unless result.success.nil?
+      raise ::Thrift::ApplicationException.new(::Thrift::ApplicationException::MISSING_RESULT, 'add failed: unknown result')
+    end
+
   end
 
   class Processor
@@ -188,6 +226,30 @@ module UserStorage
       write_result(result, oprot, 'last_status', seqid)
     end
 
+    def process_volume_up(seqid, iprot, oprot)
+      args = read_args(iprot, Volume_up_args)
+      result = Volume_up_result.new()
+      begin
+        result.success = @handler.volume_up()
+      rescue RockTooHard => exc
+        result.exc = exc
+      end
+      write_result(result, oprot, 'volume_up', seqid)
+    end
+
+    def process_make_bitcoins(seqid, iprot, oprot)
+      args = read_args(iprot, Make_bitcoins_args)
+      @handler.make_bitcoins()
+      return
+    end
+
+    def process_add(seqid, iprot, oprot)
+      args = read_args(iprot, Add_args)
+      result = Add_result.new()
+      result.success = @handler.add(args.a, args.b)
+      write_result(result, oprot, 'add', seqid)
+    end
+
   end
 
   # HELPER FUNCTIONS AND STRUCTURES
@@ -447,5 +509,102 @@ module UserStorage
     ::Thrift::Struct.generate_accessors self
   end
 
+  class Volume_up_args
+    include ::Thrift::Struct, ::Thrift::Struct_Union
+
+    FIELDS = {
+
+    }
+
+    def struct_fields; FIELDS; end
+
+    def validate
+    end
+
+    ::Thrift::Struct.generate_accessors self
+  end
+
+  class Volume_up_result
+    include ::Thrift::Struct, ::Thrift::Struct_Union
+    SUCCESS = 0
+    EXC = 1
+
+    FIELDS = {
+      SUCCESS => {:type => ::Thrift::Types::I32, :name => 'success'},
+      EXC => {:type => ::Thrift::Types::STRUCT, :name => 'exc', :class => RockTooHard}
+    }
+
+    def struct_fields; FIELDS; end
+
+    def validate
+    end
+
+    ::Thrift::Struct.generate_accessors self
+  end
+
+  class Make_bitcoins_args
+    include ::Thrift::Struct, ::Thrift::Struct_Union
+
+    FIELDS = {
+
+    }
+
+    def struct_fields; FIELDS; end
+
+    def validate
+    end
+
+    ::Thrift::Struct.generate_accessors self
+  end
+
+  class Make_bitcoins_result
+    include ::Thrift::Struct, ::Thrift::Struct_Union
+
+    FIELDS = {
+
+    }
+
+    def struct_fields; FIELDS; end
+
+    def validate
+    end
+
+    ::Thrift::Struct.generate_accessors self
+  end
+
+  class Add_args
+    include ::Thrift::Struct, ::Thrift::Struct_Union
+    A = 1
+    B = 2
+
+    FIELDS = {
+      A => {:type => ::Thrift::Types::I32, :name => 'a'},
+      B => {:type => ::Thrift::Types::I32, :name => 'b'}
+    }
+
+    def struct_fields; FIELDS; end
+
+    def validate
+    end
+
+    ::Thrift::Struct.generate_accessors self
+  end
+
+  class Add_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
+
 end
 

data/test/legacy_profile/profile_types.rb

@@ -34,3 +34,19 @@ class UserProfile
   ::Thrift::Struct.generate_accessors self
 end
 
+class RockTooHard < ::Thrift::Exception
+  include ::Thrift::Struct, ::Thrift::Struct_Union
+  VOLUME = 1
+
+  FIELDS = {
+    VOLUME => {:type => ::Thrift::Types::I32, :name => 'volume'}
+  }
+
+  def struct_fields; FIELDS; end
+
+  def validate
+  end
+
+  ::Thrift::Struct.generate_accessors self
+end
+

data/test/legacy_profile/user_storage.rb

@@ -127,6 +127,44 @@ module UserStorage
       raise ::Thrift::ApplicationException.new(::Thrift::ApplicationException::MISSING_RESULT, 'last_status failed: unknown result')
     end
 
+    def volume_up()
+      send_volume_up()
+      return recv_volume_up()
+    end
+
+    def send_volume_up()
+      send_message('volume_up', Volume_up_args)
+    end
+
+    def recv_volume_up()
+      result = receive_message(Volume_up_result)
+      return result.success unless result.success.nil?
+      raise result.exc unless result.exc.nil?
+      raise ::Thrift::ApplicationException.new(::Thrift::ApplicationException::MISSING_RESULT, 'volume_up failed: unknown result')
+    end
+
+    def make_bitcoins()
+      send_make_bitcoins()
+    end
+
+    def send_make_bitcoins()
+      send_message('make_bitcoins', Make_bitcoins_args)
+    end
+    def add(a, b)
+      send_add(a, b)
+      return recv_add()
+    end
+
+    def send_add(a, b)
+      send_message('add', Add_args, :a => a, :b => b)
+    end
+
+    def recv_add()
+      result = receive_message(Add_result)
+      return result.success unless result.success.nil?
+      raise ::Thrift::ApplicationException.new(::Thrift::ApplicationException::MISSING_RESULT, 'add failed: unknown result')
+    end
+
   end
 
   class Processor
@@ -188,6 +226,30 @@ module UserStorage
       write_result(result, oprot, 'last_status', seqid)
     end
 
+    def process_volume_up(seqid, iprot, oprot)
+      args = read_args(iprot, Volume_up_args)
+      result = Volume_up_result.new()
+      begin
+        result.success = @handler.volume_up()
+      rescue RockTooHard => exc
+        result.exc = exc
+      end
+      write_result(result, oprot, 'volume_up', seqid)
+    end
+
+    def process_make_bitcoins(seqid, iprot, oprot)
+      args = read_args(iprot, Make_bitcoins_args)
+      @handler.make_bitcoins()
+      return
+    end
+
+    def process_add(seqid, iprot, oprot)
+      args = read_args(iprot, Add_args)
+      result = Add_result.new()
+      result.success = @handler.add(args.a, args.b)
+      write_result(result, oprot, 'add', seqid)
+    end
+
   end
 
   # HELPER FUNCTIONS AND STRUCTURES
@@ -447,5 +509,102 @@ module UserStorage
     ::Thrift::Struct.generate_accessors self
   end
 
+  class Volume_up_args
+    include ::Thrift::Struct, ::Thrift::Struct_Union
+
+    FIELDS = {
+
+    }
+
+    def struct_fields; FIELDS; end
+
+    def validate
+    end
+
+    ::Thrift::Struct.generate_accessors self
+  end
+
+  class Volume_up_result
+    include ::Thrift::Struct, ::Thrift::Struct_Union
+    SUCCESS = 0
+    EXC = 1
+
+    FIELDS = {
+      SUCCESS => {:type => ::Thrift::Types::I32, :name => 'success'},
+      EXC => {:type => ::Thrift::Types::STRUCT, :name => 'exc', :class => RockTooHard}
+    }
+
+    def struct_fields; FIELDS; end
+
+    def validate
+    end
+
+    ::Thrift::Struct.generate_accessors self
+  end
+
+  class Make_bitcoins_args
+    include ::Thrift::Struct, ::Thrift::Struct_Union
+
+    FIELDS = {
+
+    }
+
+    def struct_fields; FIELDS; end
+
+    def validate
+    end
+
+    ::Thrift::Struct.generate_accessors self
+  end
+
+  class Make_bitcoins_result
+    include ::Thrift::Struct, ::Thrift::Struct_Union
+
+    FIELDS = {
+
+    }
+
+    def struct_fields; FIELDS; end
+
+    def validate
+    end
+
+    ::Thrift::Struct.generate_accessors self
+  end
+
+  class Add_args
+    include ::Thrift::Struct, ::Thrift::Struct_Union
+    A = 1
+    B = 2
+
+    FIELDS = {
+      A => {:type => ::Thrift::Types::I32, :name => 'a'},
+      B => {:type => ::Thrift::Types::I32, :name => 'b'}
+    }
+
+    def struct_fields; FIELDS; end
+
+    def validate
+    end
+
+    ::Thrift::Struct.generate_accessors self
+  end
+
+  class Add_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
+
 end
 

data/test/profile.thrift

@@ -11,6 +11,10 @@ enum Status {
   ALIVE
 }
 
+exception RockTooHard {
+  1: i32 volume
+}
+
 service UserStorage {
   void store(1: UserProfile xuser),
   UserProfile retrieve(1: i32 xuid),
@@ -19,6 +23,9 @@ service UserStorage {
   void set_list(1: list<string> l),
   list<string> last_list(),
   void set_status(1: Status s),
-  Status last_status()
+  Status last_status(),
+  i32 volume_up() throws (1: RockTooHard exc),
+  oneway void make_bitcoins(),
+  i32 add(1: i32 a, 2: i32 b)
 }
 

data/test/test_client.rb

@@ -19,7 +19,7 @@ class TestClient < Test::Unit::TestCase
     Stark.materialize "test/profile.thrift", @n
 
     @client = @n::UserStorage::Client.new @client_p, @client_p
-    @handler = Handler.new
+    @handler = Handler.new(@n)
     @server = UserStorage::Processor.new @handler
   end
 
@@ -29,11 +29,12 @@ class TestClient < Test::Unit::TestCase
   end
 
   class Handler
-    def initialize
+    def initialize(n)
       @users = {}
       @last_map = nil
       @last_list = nil
       @last_status = nil
+      @n = n
     end
 
     attr_accessor :last_map, :last_list, :last_status
@@ -57,6 +58,18 @@ class TestClient < Test::Unit::TestCase
     def set_status(s)
       @last_status = s
     end
+
+    def volume_up
+      raise RockTooHard.new(:volume => 11)
+    end
+
+    def make_bitcoins
+      sleep 2
+    end
+
+    def add(a,b)
+      a + b
+    end
   end
 
   def test_store_and_retrieve
@@ -181,4 +194,46 @@ class TestClient < Test::Unit::TestCase
 
     st.join
   end
+
+  def test_throw
+    st = Thread.new do
+      @server.process @server_p, @server_p
+    end
+
+    e = assert_raises @n::RockTooHard do
+      @client.volume_up
+    end
+
+    st.join
+
+    assert_equal 11, e.volume
+  end
+
+  # Thread.abort_on_exception = true
+
+  def test_oneway
+    st = Thread.new do
+      @server.process @server_p, @server_p
+    end
+
+    t = Time.now
+
+    Timeout.timeout 3 do
+      assert_equal nil, @client.make_bitcoins
+    end
+
+    assert Time.now - t < 0.1
+
+    st.join
+  end
+
+  def test_2args
+    st = Thread.new do
+      @server.process @server_p, @server_p
+    end
+
+    assert_equal 7, @client.add(3, 4)
+
+    st.join
+  end
 end

data/test/test_parser.rb

@@ -10,6 +10,8 @@ class TestParser < Test::Unit::TestCase
     end
 
     assert tg.result
+
+    return tg.result
   end
 
   def test_ccomment
@@ -121,6 +123,21 @@ struct Foo {
     end
   end
 
+  def test_throws
+    o = parse <<-EOM
+service Foo {
+  i32 foo() throws (1: i32 code)
+}
+    EOM
+
+    o = o.first
+
+    assert_equal "Foo", o.name
+
+    assert_func o.functions[0], "i32", "foo", nil
+    assert_field o.functions[0].throws.first, 1, "i32", "code"
+  end
+
   def test_spec
     data = File.read "test/ThriftSpec.thrift"
 

data/test/test_server.rb

@@ -17,7 +17,7 @@ class TestServer < Test::Unit::TestCase
     Stark.materialize "test/profile.thrift", @n
 
     @client = @n::UserStorage::Client.new @client_p, @client_p
-    @handler = Handler.new
+    @handler = Handler.new @n
     @server = @n::UserStorage::Processor.new @handler
   end
 
@@ -27,11 +27,12 @@ class TestServer < Test::Unit::TestCase
   end
 
   class Handler
-    def initialize
+    def initialize(n)
       @users = {}
       @last_map = nil
       @last_list = nil
       @last_status = nil
+      @n = n
     end
 
     attr_accessor :last_map, :last_list, :last_status
@@ -55,6 +56,14 @@ class TestServer < Test::Unit::TestCase
     def set_status(s)
       @last_status = s
     end
+
+    def volume_up
+      raise @n::RockTooHard.new('volume' => 11)
+    end
+
+    def make_bitcoins
+      sleep 2
+    end
   end
 
   def test_store_and_retrieve
@@ -172,4 +181,35 @@ class TestServer < Test::Unit::TestCase
     st.join
   end
 
+  def test_throw
+    st = Thread.new do
+      @server.process @server_p, @server_p
+    end
+
+    e = assert_raises @n::RockTooHard do
+      @client.volume_up
+    end
+
+    st.join
+
+    assert_equal 11, e.volume
+  end
+
+  # Thread.abort_on_exception = true
+
+  def test_oneway
+    st = Thread.new do
+      @server.process @server_p, @server_p
+    end
+
+    t = Time.now
+
+    Timeout.timeout 3 do
+      assert_equal nil, @client.make_bitcoins
+    end
+
+    assert Time.now - t < 0.1
+
+    st.join
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: stark
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.6.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-28 00:00:00.000000000 Z
+date: 2013-03-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thrift