From 415134062bb9cc91d6d89c189d077d22617659d3 Mon Sep 17 00:00:00 2001
From: Tim Emiola <temiola@google.com>
Date: Wed, 23 Sep 2015 15:27:08 -0700
Subject: Ensure the route_guide sample is up-to-date

- should work using the beta api package
- ensure any generated code is consistent with the proto definition
---
 examples/ruby/lib/route_guide.rb                | 30 ++++++++++++-------------
 examples/ruby/lib/route_guide_services.rb       |  6 ++---
 examples/ruby/route_guide/route_guide_client.rb |  2 +-
 examples/ruby/route_guide/route_guide_server.rb |  6 ++---
 4 files changed, 22 insertions(+), 22 deletions(-)

(limited to 'examples/ruby')

diff --git a/examples/ruby/lib/route_guide.rb b/examples/ruby/lib/route_guide.rb
index 98bac8395c..424395c4f5 100644
--- a/examples/ruby/lib/route_guide.rb
+++ b/examples/ruby/lib/route_guide.rb
@@ -4,23 +4,23 @@
 require 'google/protobuf'
 
 Google::Protobuf::DescriptorPool.generated_pool.build do
-  add_message "examples.Point" do
+  add_message "routeguide.Point" do
     optional :latitude, :int32, 1
     optional :longitude, :int32, 2
   end
-  add_message "examples.Rectangle" do
-    optional :lo, :message, 1, "examples.Point"
-    optional :hi, :message, 2, "examples.Point"
+  add_message "routeguide.Rectangle" do
+    optional :lo, :message, 1, "routeguide.Point"
+    optional :hi, :message, 2, "routeguide.Point"
   end
-  add_message "examples.Feature" do
+  add_message "routeguide.Feature" do
     optional :name, :string, 1
-    optional :location, :message, 2, "examples.Point"
+    optional :location, :message, 2, "routeguide.Point"
   end
-  add_message "examples.RouteNote" do
-    optional :location, :message, 1, "examples.Point"
+  add_message "routeguide.RouteNote" do
+    optional :location, :message, 1, "routeguide.Point"
     optional :message, :string, 2
   end
-  add_message "examples.RouteSummary" do
+  add_message "routeguide.RouteSummary" do
     optional :point_count, :int32, 1
     optional :feature_count, :int32, 2
     optional :distance, :int32, 3
@@ -28,10 +28,10 @@ Google::Protobuf::DescriptorPool.generated_pool.build do
   end
 end
 
-module Examples
-  Point = Google::Protobuf::DescriptorPool.generated_pool.lookup("examples.Point").msgclass
-  Rectangle = Google::Protobuf::DescriptorPool.generated_pool.lookup("examples.Rectangle").msgclass
-  Feature = Google::Protobuf::DescriptorPool.generated_pool.lookup("examples.Feature").msgclass
-  RouteNote = Google::Protobuf::DescriptorPool.generated_pool.lookup("examples.RouteNote").msgclass
-  RouteSummary = Google::Protobuf::DescriptorPool.generated_pool.lookup("examples.RouteSummary").msgclass
+module Routeguide
+  Point = Google::Protobuf::DescriptorPool.generated_pool.lookup("routeguide.Point").msgclass
+  Rectangle = Google::Protobuf::DescriptorPool.generated_pool.lookup("routeguide.Rectangle").msgclass
+  Feature = Google::Protobuf::DescriptorPool.generated_pool.lookup("routeguide.Feature").msgclass
+  RouteNote = Google::Protobuf::DescriptorPool.generated_pool.lookup("routeguide.RouteNote").msgclass
+  RouteSummary = Google::Protobuf::DescriptorPool.generated_pool.lookup("routeguide.RouteSummary").msgclass
 end
diff --git a/examples/ruby/lib/route_guide_services.rb b/examples/ruby/lib/route_guide_services.rb
index 6e07653c42..082daef754 100644
--- a/examples/ruby/lib/route_guide_services.rb
+++ b/examples/ruby/lib/route_guide_services.rb
@@ -1,10 +1,10 @@
 # Generated by the protocol buffer compiler.  DO NOT EDIT!
-# Source: route_guide.proto for package 'examples'
+# Source: route_guide.proto for package 'routeguide'
 
 require 'grpc'
 require 'route_guide'
 
-module Examples
+module Routeguide
   module RouteGuide
 
     # TODO: add proto service documentation here
@@ -14,7 +14,7 @@ module Examples
 
       self.marshal_class_method = :encode
       self.unmarshal_class_method = :decode
-      self.service_name = 'examples.RouteGuide'
+      self.service_name = 'routeguide.RouteGuide'
 
       rpc :GetFeature, Point, Feature
       rpc :ListFeatures, Rectangle, stream(Feature)
diff --git a/examples/ruby/route_guide/route_guide_client.rb b/examples/ruby/route_guide/route_guide_client.rb
index 181623a68a..baef0e502b 100755
--- a/examples/ruby/route_guide/route_guide_client.rb
+++ b/examples/ruby/route_guide/route_guide_client.rb
@@ -40,7 +40,7 @@ $LOAD_PATH.unshift(lib_dir) unless $LOAD_PATH.include?(lib_dir)
 require 'grpc'
 require 'route_guide_services'
 
-include Examples
+include Routeguide
 
 GET_FEATURE_POINTS = [
   Point.new(latitude:  409_146_138, longitude: -746_188_906),
diff --git a/examples/ruby/route_guide/route_guide_server.rb b/examples/ruby/route_guide/route_guide_server.rb
index 2b2b8084ef..bebe49b3be 100755
--- a/examples/ruby/route_guide/route_guide_server.rb
+++ b/examples/ruby/route_guide/route_guide_server.rb
@@ -42,7 +42,7 @@ require 'grpc'
 require 'multi_json'
 require 'route_guide_services'
 
-include Examples
+include Routeguide
 COORD_FACTOR = 1e7
 RADIUS = 637_100
 
@@ -202,10 +202,10 @@ def main
   feature_db = Hash[raw_data.map { |x| [x['location'], x['name']] }]
   port = '0.0.0.0:50051'
   s = GRPC::RpcServer.new
-  s.add_http2_port(port)
+  s.add_http2_port(port, :this_port_is_insecure)
   GRPC.logger.info("... running insecurely on #{port}")
   s.handle(ServerImpl.new(feature_db))
-  s.run
+  s.run_till_terminated
 end
 
 main
-- 
cgit v1.2.3