stark 0.6.1 → 0.7.0

data/test/legacy_profile/user_storage.rb

@@ -165,6 +165,93 @@ module UserStorage
       raise ::Thrift::ApplicationException.new(::Thrift::ApplicationException::MISSING_RESULT, 'add failed: unknown result')
     end
 
+    def user_status()
+      send_user_status()
+      return recv_user_status()
+    end
+
+    def send_user_status()
+      send_message('user_status', User_status_args)
+    end
+
+    def recv_user_status()
+      result = receive_message(User_status_result)
+      return result.success unless result.success.nil?
+      raise ::Thrift::ApplicationException.new(::Thrift::ApplicationException::MISSING_RESULT, 'user_status failed: unknown result')
+    end
+
+    def set_user_status(stat)
+      send_set_user_status(stat)
+      recv_set_user_status()
+    end
+
+    def send_set_user_status(stat)
+      send_message('set_user_status', Set_user_status_args, :stat => stat)
+    end
+
+    def recv_set_user_status()
+      result = receive_message(Set_user_status_result)
+      return
+    end
+
+    def user_relationship()
+      send_user_relationship()
+      return recv_user_relationship()
+    end
+
+    def send_user_relationship()
+      send_message('user_relationship', User_relationship_args)
+    end
+
+    def recv_user_relationship()
+      result = receive_message(User_relationship_result)
+      return result.success unless result.success.nil?
+      raise ::Thrift::ApplicationException.new(::Thrift::ApplicationException::MISSING_RESULT, 'user_relationship failed: unknown result')
+    end
+
+    def set_user_relationship(rel)
+      send_set_user_relationship(rel)
+      recv_set_user_relationship()
+    end
+
+    def send_set_user_relationship(rel)
+      send_message('set_user_relationship', Set_user_relationship_args, :rel => rel)
+    end
+
+    def recv_set_user_relationship()
+      result = receive_message(Set_user_relationship_result)
+      return
+    end
+
+    def user_friends()
+      send_user_friends()
+      return recv_user_friends()
+    end
+
+    def send_user_friends()
+      send_message('user_friends', User_friends_args)
+    end
+
+    def recv_user_friends()
+      result = receive_message(User_friends_result)
+      return result.success unless result.success.nil?
+      raise ::Thrift::ApplicationException.new(::Thrift::ApplicationException::MISSING_RESULT, 'user_friends failed: unknown result')
+    end
+
+    def set_user_friends(fr)
+      send_set_user_friends(fr)
+      recv_set_user_friends()
+    end
+
+    def send_set_user_friends(fr)
+      send_message('set_user_friends', Set_user_friends_args, :fr => fr)
+    end
+
+    def recv_set_user_friends()
+      result = receive_message(Set_user_friends_result)
+      return
+    end
+
   end
 
   class Processor
@@ -250,6 +337,48 @@ module UserStorage
       write_result(result, oprot, 'add', seqid)
     end
 
+    def process_user_status(seqid, iprot, oprot)
+      args = read_args(iprot, User_status_args)
+      result = User_status_result.new()
+      result.success = @handler.user_status()
+      write_result(result, oprot, 'user_status', seqid)
+    end
+
+    def process_set_user_status(seqid, iprot, oprot)
+      args = read_args(iprot, Set_user_status_args)
+      result = Set_user_status_result.new()
+      @handler.set_user_status(args.stat)
+      write_result(result, oprot, 'set_user_status', seqid)
+    end
+
+    def process_user_relationship(seqid, iprot, oprot)
+      args = read_args(iprot, User_relationship_args)
+      result = User_relationship_result.new()
+      result.success = @handler.user_relationship()
+      write_result(result, oprot, 'user_relationship', seqid)
+    end
+
+    def process_set_user_relationship(seqid, iprot, oprot)
+      args = read_args(iprot, Set_user_relationship_args)
+      result = Set_user_relationship_result.new()
+      @handler.set_user_relationship(args.rel)
+      write_result(result, oprot, 'set_user_relationship', seqid)
+    end
+
+    def process_user_friends(seqid, iprot, oprot)
+      args = read_args(iprot, User_friends_args)
+      result = User_friends_result.new()
+      result.success = @handler.user_friends()
+      write_result(result, oprot, 'user_friends', seqid)
+    end
+
+    def process_set_user_friends(seqid, iprot, oprot)
+      args = read_args(iprot, Set_user_friends_args)
+      result = Set_user_friends_result.new()
+      @handler.set_user_friends(args.fr)
+      write_result(result, oprot, 'set_user_friends', seqid)
+    end
+
   end
 
   # HELPER FUNCTIONS AND STRUCTURES
@@ -606,5 +735,191 @@ module UserStorage
     ::Thrift::Struct.generate_accessors self
   end
 
+  class User_status_args
+    include ::Thrift::Struct, ::Thrift::Struct_Union
+
+    FIELDS = {
+
+    }
+
+    def struct_fields; FIELDS; end
+
+    def validate
+    end
+
+    ::Thrift::Struct.generate_accessors self
+  end
+
+  class User_status_result
+    include ::Thrift::Struct, ::Thrift::Struct_Union
+    SUCCESS = 0
+
+    FIELDS = {
+      SUCCESS => {:type => ::Thrift::Types::STRUCT, :name => 'success', :class => UserStatus}
+    }
+
+    def struct_fields; FIELDS; end
+
+    def validate
+    end
+
+    ::Thrift::Struct.generate_accessors self
+  end
+
+  class Set_user_status_args
+    include ::Thrift::Struct, ::Thrift::Struct_Union
+    STAT = 1
+
+    FIELDS = {
+      STAT => {:type => ::Thrift::Types::STRUCT, :name => 'stat', :class => UserStatus}
+    }
+
+    def struct_fields; FIELDS; end
+
+    def validate
+    end
+
+    ::Thrift::Struct.generate_accessors self
+  end
+
+  class Set_user_status_result
+    include ::Thrift::Struct, ::Thrift::Struct_Union
+
+    FIELDS = {
+
+    }
+
+    def struct_fields; FIELDS; end
+
+    def validate
+    end
+
+    ::Thrift::Struct.generate_accessors self
+  end
+
+  class User_relationship_args
+    include ::Thrift::Struct, ::Thrift::Struct_Union
+
+    FIELDS = {
+
+    }
+
+    def struct_fields; FIELDS; end
+
+    def validate
+    end
+
+    ::Thrift::Struct.generate_accessors self
+  end
+
+  class User_relationship_result
+    include ::Thrift::Struct, ::Thrift::Struct_Union
+    SUCCESS = 0
+
+    FIELDS = {
+      SUCCESS => {:type => ::Thrift::Types::STRUCT, :name => 'success', :class => UserRelationship}
+    }
+
+    def struct_fields; FIELDS; end
+
+    def validate
+    end
+
+    ::Thrift::Struct.generate_accessors self
+  end
+
+  class Set_user_relationship_args
+    include ::Thrift::Struct, ::Thrift::Struct_Union
+    REL = 1
+
+    FIELDS = {
+      REL => {:type => ::Thrift::Types::STRUCT, :name => 'rel', :class => UserRelationship}
+    }
+
+    def struct_fields; FIELDS; end
+
+    def validate
+    end
+
+    ::Thrift::Struct.generate_accessors self
+  end
+
+  class Set_user_relationship_result
+    include ::Thrift::Struct, ::Thrift::Struct_Union
+
+    FIELDS = {
+
+    }
+
+    def struct_fields; FIELDS; end
+
+    def validate
+    end
+
+    ::Thrift::Struct.generate_accessors self
+  end
+
+  class User_friends_args
+    include ::Thrift::Struct, ::Thrift::Struct_Union
+
+    FIELDS = {
+
+    }
+
+    def struct_fields; FIELDS; end
+
+    def validate
+    end
+
+    ::Thrift::Struct.generate_accessors self
+  end
+
+  class User_friends_result
+    include ::Thrift::Struct, ::Thrift::Struct_Union
+    SUCCESS = 0
+
+    FIELDS = {
+      SUCCESS => {:type => ::Thrift::Types::STRUCT, :name => 'success', :class => UserFriends}
+    }
+
+    def struct_fields; FIELDS; end
+
+    def validate
+    end
+
+    ::Thrift::Struct.generate_accessors self
+  end
+
+  class Set_user_friends_args
+    include ::Thrift::Struct, ::Thrift::Struct_Union
+    FR = 1
+
+    FIELDS = {
+      FR => {:type => ::Thrift::Types::STRUCT, :name => 'fr', :class => UserFriends}
+    }
+
+    def struct_fields; FIELDS; end
+
+    def validate
+    end
+
+    ::Thrift::Struct.generate_accessors self
+  end
+
+  class Set_user_friends_result
+    include ::Thrift::Struct, ::Thrift::Struct_Union
+
+    FIELDS = {
+
+    }
+
+    def struct_fields; FIELDS; end
+
+    def validate
+    end
+
+    ::Thrift::Struct.generate_accessors self
+  end
+
 end
 

data/test/profile.thrift

@@ -4,6 +4,24 @@ struct UserProfile {
   3: string blurb
 }
 
+enum MaritalStatus {
+  SINGLE
+  MARRIED
+  DIVORCED
+  UPSIDEDOWN
+  ITS_COMPLICATED
+}
+
+struct UserStatus {
+  1: UserProfile profile,
+  2: bool active
+}
+
+struct UserRelationship {
+  1: i32 user,
+  2: MaritalStatus status
+}
+
 enum Status {
   ON
   OFF
@@ -11,6 +29,11 @@ enum Status {
   ALIVE
 }
 
+struct UserFriends {
+  1: i32 user,
+  2: list<i32> friends
+}
+
 exception RockTooHard {
   1: i32 volume
 }
@@ -26,6 +49,12 @@ service UserStorage {
   Status last_status(),
   i32 volume_up() throws (1: RockTooHard exc),
   oneway void make_bitcoins(),
-  i32 add(1: i32 a, 2: i32 b)
+  i32 add(1: i32 a, 2: i32 b),
+  UserStatus user_status(),
+  void set_user_status(1: UserStatus stat),
+  UserRelationship user_relationship(),
+  void set_user_relationship(1: UserRelationship rel)
+  UserFriends user_friends(),
+  void set_user_friends(1: UserFriends fr)
 }
 

data/test/test_client.rb

@@ -35,9 +35,11 @@ class TestClient < Test::Unit::TestCase
       @last_list = nil
       @last_status = nil
       @n = n
+      @user_status = nil
+      @user_relationship = nil
     end
 
-    attr_accessor :last_map, :last_list, :last_status
+    attr_accessor :last_map, :last_list, :last_status, :user_status
 
     def store(obj)
       @users[obj.uid] = obj
@@ -70,6 +72,20 @@ class TestClient < Test::Unit::TestCase
     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 test_store_and_retrieve
@@ -236,4 +252,118 @@ class TestClient < Test::Unit::TestCase
 
     st.join
   end
+
+  def test_read_struct_in_a_struct
+    st = Thread.new do
+      @server.process @server_p, @server_p
+    end
+
+    prof = UserProfile.new 'uid' => 0, 'name' => 'root', 'blurb' => 'god'
+    stat = UserStatus.new 'profile' => prof, 'active' => true
+
+    @handler.user_status = stat
+
+    status = @client.user_status
+
+    assert_equal true, status.active
+    
+    prof = status.profile
+
+    assert_equal 0, prof.uid
+    assert_equal "root", prof.name
+    assert_equal "god", prof.blurb
+
+    st.join
+  end
+
+  def test_write_struct_in_a_struct
+    st = Thread.new do
+      @server.process @server_p, @server_p
+    end
+
+    prof = @n::UserProfile.new 'uid' => 0, 'name' => 'root', 'blurb' => 'god'
+    stat = @n::UserStatus.new 'profile' => prof, 'active' => true
+
+    @client.set_user_status stat
+
+    status = @handler.user_status
+
+    assert_equal true, status.active
+    
+    prof = status.profile
+
+    assert_equal 0, prof.uid
+    assert_equal "root", prof.name
+    assert_equal "god", prof.blurb
+
+    st.join
+  end
+
+  def test_read_enum_in_struct
+    st = Thread.new do
+      @server.process @server_p, @server_p
+    end
+
+    stat = UserRelationship.new 'user' => 0, 'status' => 4
+
+    @handler.user_relationship = stat
+
+    rel = @client.user_relationship
+
+    assert_equal 0, rel.user
+    assert_equal :ITS_COMPLICATED, rel.status
+
+    st.join
+  end
+
+  def test_write_enum_in_struct
+    st = Thread.new do
+      @server.process @server_p, @server_p
+    end
+
+    stat = @n::UserRelationship.new 'user' => 0, 'status' => :ITS_COMPLICATED
+
+    @client.set_user_relationship stat
+
+    rel = @handler.user_relationship
+
+    assert_equal 0, rel.user
+    assert_equal 4, rel.status
+
+    st.join
+  end
+
+  def test_read_list_in_struct
+    st = Thread.new do
+      @server.process @server_p, @server_p
+    end
+
+    stat = UserFriends.new 'user' => 0, 'friends' => [4,8,47]
+
+    @handler.user_friends = stat
+
+    rel = @client.user_friends
+
+    assert_equal 0, rel.user
+    assert_equal [4,8,47], rel.friends
+
+    st.join
+  end
+
+  def test_write_list_in_struct
+    st = Thread.new do
+      @server.process @server_p, @server_p
+    end
+
+    stat = @n::UserFriends.new 'user' => 0, 'friends' => [4,8,47]
+
+    @client.set_user_friends stat
+
+    rel = @handler.user_friends
+
+    assert_equal 0, rel.user
+    assert_equal [4,8,47], rel.friends
+
+    st.join
+  end
 end

data/test/test_parser.rb

@@ -138,6 +138,70 @@ service Foo {
     assert_field o.functions[0].throws.first, 1, "i32", "code"
   end
 
+  def test_include
+    o = parse <<-EOM
+include "test/blah.thrift"
+
+    EOM
+
+    assert_equal "test/blah.thrift", o.first.path
+  end
+
+  def test_include_expanded
+    o = parse <<-EOM
+include "test/blah.thrift"
+
+    EOM
+
+    o = Stark::Parser.expand o
+
+    assert_equal "Blah", o.first.name
+    assert_equal ["FOO", "BAR", "BAZ"], o.first.values
+  end
+
+  def test_include_to_include
+    o = parse <<-EOM
+include "test/include_blah.thrift"
+
+    EOM
+
+    o = Stark::Parser.expand o
+
+    assert_equal "Blah", o.first.name
+    assert_equal ["FOO", "BAR", "BAZ"], o.first.values
+  end
+
+  def test_ast
+    parser = Stark::Parser.new <<-EOM
+include "test/include_blah.thrift"
+EOM
+
+    o = parser.ast
+
+    assert_equal "Blah", o.first.name
+    assert_equal ["FOO", "BAR", "BAZ"], o.first.values
+  end
+
+  def test_s_ast
+    o = Stark::Parser.ast <<-EOM
+include "test/include_blah.thrift"
+EOM
+
+    assert_equal "Blah", o.first.name
+    assert_equal ["FOO", "BAR", "BAZ"], o.first.values
+  end
+
+  def test_namespace
+    o = parse <<-EOM
+namespace rb Blah
+    EOM
+
+    ns = o.first
+
+    assert_equal "rb", ns.lang
+    assert_equal "Blah", ns.namespace
+  end
+
   def test_spec
     data = File.read "test/ThriftSpec.thrift"
 

data/test/test_ruby.rb

@@ -0,0 +1,27 @@
+require 'test/unit'
+require 'stark'
+require 'stark/ruby'
+
+class TestRuby < Test::Unit::TestCase
+  def test_namespace
+    ast = Stark::Parser.ast <<-EOM
+namespace rb Blah
+enum Status {
+  DEAD
+  ALIVE
+}
+  EOM
+
+    stream = StringIO.new
+    ruby = Stark::Ruby.new stream
+
+    ruby.run ast
+
+    ns = Module.new
+
+    ns.module_eval stream.string
+
+    assert ns::Blah
+    assert ns::Blah::Enum_Status
+  end
+end