Refactoring - changing to new hash notation

Author: TeWu

lib/krpc/encoder.rb

@@ -21,28 +21,32 @@ def encode(obj, type)
           encode_value(remote_oid, TypeStore["uint64"])
         elsif type.is_a?(Types::ListType)
           ruby_type = TypeStore["KRPC.List"].ruby_type
-          items = obj.map{|x| encode(TypeStore.coerce_to(x, type.value_type), type.value_type)}.to_a
-          msg = ruby_type.new(:items => items)
+          msg = ruby_type.new(
+            items: obj.map{|x| encode(TypeStore.coerce_to(x, type.value_type), type.value_type)}.to_a
+          )
           ruby_type.encode(msg)
         elsif type.is_a?(Types::DictionaryType)
           ruby_type = TypeStore["KRPC.Dictionary"].ruby_type
           entry_type = TypeStore["KRPC.DictionaryEntry"].ruby_type
           entries = obj.map do |k,v|
-            key = encode(TypeStore.coerce_to(k, type.key_type), type.key_type)
-            value = encode(TypeStore.coerce_to(v, type.value_type), type.value_type)
-            entry_type.new(:key => key, :value => value)
+            entry_type.new(
+              key: encode(TypeStore.coerce_to(k, type.key_type), type.key_type),
+              value: encode(TypeStore.coerce_to(v, type.value_type), type.value_type)
+            )
           end
-          msg = ruby_type.new(:entries => entries)
+          msg = ruby_type.new(entries: entries)
           ruby_type.encode(msg)
         elsif type.is_a?(Types::SetType)
           ruby_type = TypeStore["KRPC.Set"].ruby_type
-          items = obj.map{|x| encode( TypeStore.coerce_to(x, type.value_type), type.value_type )}.to_a
-          msg = ruby_type.new(:items => items)
+          msg = ruby_type.new(
+            items: obj.map{|x| encode( TypeStore.coerce_to(x, type.value_type), type.value_type )}.to_a
+          )
           ruby_type.encode(msg)
         elsif type.is_a?(Types::TupleType)
           ruby_type = TypeStore["KRPC.Tuple"].ruby_type
-          items = obj.zip(type.value_types).map{|x,t| encode( TypeStore.coerce_to(x, t), t )}.to_a
-          msg = ruby_type.new(:items => items)
+          msg = ruby_type.new(
+            items: obj.zip(type.value_types).map{|x,t| encode( TypeStore.coerce_to(x, t), t )}.to_a
+          )
           ruby_type.encode(msg)
         else raise(RuntimeError, "Cannot encode object #{obj} of type #{type}")
         end

spec/krpc/encoding_spec.rb

@@ -126,7 +126,7 @@ def check_equal (value, data, type)
   end
 
   it "encodes message" do
-    msg = KRPC::PB::Request.new(:service => "ServiceName", :procedure => "ProcedureName")
+    msg = KRPC::PB::Request.new(service: "ServiceName", procedure: "ProcedureName")
     data = "0a0b536572766963654e616d65120d50726f6365647572654e616d65"
     check_equal(msg, data, TypeStore["KRPC.Request"])
   end