Format once with stree to avoid large diffs

Author: mostlyobvious

Rakefile

@@ -3,4 +3,4 @@ require "rspec/core/rake_task"
 
 RSpec::Core::RakeTask.new(:spec)
 
-task :default => :spec
+task default: :spec

bin/benchmark.rb

@@ -1,12 +1,12 @@
-require 'securerandom'
-require 'benchmark'
-require 'msgpack'
-require 'yaml'
-require 'json'
-require 'protobuf_nested_struct'
+require "securerandom"
+require "benchmark"
+require "msgpack"
+require "yaml"
+require "json"
+require "protobuf_nested_struct"
 
 BIG_NUMBER = 100_000
-AVG_NUMBER =  10_000
+AVG_NUMBER = 10_000
 PRNS = ProtobufNestedStruct
 
 MessagePack.singleton_class.class_eval do
@@ -15,26 +15,10 @@
 end
 
 primitives = [
-{
-  value: nil,
-  description: "nil",
-  count: BIG_NUMBER,
-},
-{
-  value: 782,
-  description: "small int",
-  count: BIG_NUMBER,
-},
-{
-  value: "whoa, what's up",
-  description: "short string",
-  count: BIG_NUMBER,
-},
-{
-  value: 2.5,
-  description: "float",
-  count: BIG_NUMBER,
-},
+  { value: nil, description: "nil", count: BIG_NUMBER },
+  { value: 782, description: "small int", count: BIG_NUMBER },
+  { value: "whoa, what's up", description: "short string", count: BIG_NUMBER },
+  { value: 2.5, description: "float", count: BIG_NUMBER },
   {
     value: Date.new(2018, 11, 11),
     description: "date",
@@ -46,26 +30,29 @@
     description: "time",
     count: BIG_NUMBER,
     exclude: [MessagePack]
-  },
+  }
 ]
 
-arrays = primitives.map do |spec|
-  spec = spec.dup
-  spec[:value] = [spec[:value]]*BIG_NUMBER
-  spec[:description] = "array of #{spec[:description]}"
-  spec[:count] = 10
-  spec
-end
+arrays =
+  primitives.map do |spec|
+    spec = spec.dup
+    spec[:value] = [spec[:value]] * BIG_NUMBER
+    spec[:description] = "array of #{spec[:description]}"
+    spec[:count] = 10
+    spec
+  end
 
-hashes = primitives.map do |spec|
-  spec = spec.dup
-  spec[:value] = BIG_NUMBER.times.each.with_object({}) do |i, obj|
-    obj[SecureRandom.hex(5)] = spec[:value]
+hashes =
+  primitives.map do |spec|
+    spec = spec.dup
+    spec[:value] = BIG_NUMBER
+      .times
+      .each
+      .with_object({}) { |i, obj| obj[SecureRandom.hex(5)] = spec[:value] }
+    spec[:description] = "hash, values of #{spec[:description]}"
+    spec[:count] = 10
+    spec
   end
-  spec[:description] = "hash, values of #{spec[:description]}"
-  spec[:count] = 10
-  spec
-end
 
 tests = primitives + arrays + hashes
 
@@ -74,22 +61,26 @@
   count = job.fetch(:count)
 
   Benchmark.bm do |x|
-    [YAML, JSON, MessagePack, PRNS].reject{|x| job.fetch(:exclude, []).include?(x) }.each do |serializer|
-      x.report("#{serializer.name.rjust(20)}: #{job[:description].rjust(30)}   serialization") do
-        count.times { serializer.dump(value) }
+    [YAML, JSON, MessagePack, PRNS].reject do |x|
+        job.fetch(:exclude, []).include?(x)
+      end
+      .each do |serializer|
+        x.report(
+          "#{serializer.name.rjust(20)}: #{job[:description].rjust(30)}   serialization"
+        ) { count.times { serializer.dump(value) } }
       end
-    end
   end
 
   Benchmark.bm do |x|
-    [YAML, JSON, MessagePack, PRNS].reject{|x| job.fetch(:exclude, []).include?(x) }.each do |serializer|
-      serialized = serializer.dump(value)
+    [YAML, JSON, MessagePack, PRNS].reject do |x|
+        job.fetch(:exclude, []).include?(x)
+      end
+      .each do |serializer|
+        serialized = serializer.dump(value)
 
-      x.report("#{serializer.name.rjust(20)}: #{job[:description].rjust(30)} deserialization") do
-        count.times { serializer.load(serialized) }
+        x.report(
+          "#{serializer.name.rjust(20)}: #{job[:description].rjust(30)} deserialization"
+        ) { count.times { serializer.load(serialized) } }
       end
-    end
   end
-
 end
-

lib/google/type/date_pb.rb

@@ -1,9 +1,9 @@
-require 'date'
-require 'google/protobuf'
-require 'google/protobuf/well_known_types'
+require "date"
+require "google/protobuf"
+require "google/protobuf/well_known_types"
 
-require 'protobuf_nested_struct/version'
-require 'protobuf_nested_struct/struct_pb'
+require "protobuf_nested_struct/version"
+require "protobuf_nested_struct/struct_pb"
 
 module ProtobufNestedStruct
   class Value
@@ -20,54 +20,56 @@ def self.load(string)
 
     def from_ruby(obj)
       case obj
-        when nil
-          self.null_value = 0
-        when Integer
-          self.int_value = obj
-        when Float
-          self.double_value = obj
-        when String
-          self.string_value = obj
-        when TrueClass, FalseClass
-          self.bool_value = obj
-        when Date
-          self.date_value = Google::Type::Date.new(day: obj.day, month: obj.month, year: obj.year)
-        when Time
-          self.timestamp_value = Google::Protobuf::Timestamp.new.tap{|gpt| gpt.from_time(obj) }
-        when Hash
-          self.string_map_value = HashMapStringValue.new.tap{|ps| ps.from_ruby(obj) }
-        when Array
-          self.list_value = ListValue.new.tap{|ps| ps.from_ruby(obj) }
-        else
-          raise ArgumentError, "not allowed: #{obj.inspect}"
+      when nil
+        self.null_value = 0
+      when Integer
+        self.int_value = obj
+      when Float
+        self.double_value = obj
+      when String
+        self.string_value = obj
+      when TrueClass, FalseClass
+        self.bool_value = obj
+      when Date
+        self.date_value =
+          Google::Type::Date.new(day: obj.day, month: obj.month, year: obj.year)
+      when Time
+        self.timestamp_value =
+          Google::Protobuf::Timestamp.new.tap { |gpt| gpt.from_time(obj) }
+      when Hash
+        self.string_map_value =
+          HashMapStringValue.new.tap { |ps| ps.from_ruby(obj) }
+      when Array
+        self.list_value = ListValue.new.tap { |ps| ps.from_ruby(obj) }
+      else
+        raise ArgumentError, "not allowed: #{obj.inspect}"
       end
     end
 
     def to_ruby
       case kind
-        when :null_value
-          nil
-        when :int_value
-          int_value
-        when :double_value
-          double_value
-        when :string_value
-          string_value
-        when :bool_value
-          bool_value
-        when :date_value
-          Date.new(date_value.year, date_value.month, date_value.day)
-        when :timestamp_value
-          timestamp_value.to_time
-        when :string_map_value
-          string_map_value.to_ruby
-        when :list_value
-          list_value.to_ruby
-        else
-          raise ArgumentError
+      when :null_value
+        nil
+      when :int_value
+        int_value
+      when :double_value
+        double_value
+      when :string_value
+        string_value
+      when :bool_value
+        bool_value
+      when :date_value
+        Date.new(date_value.year, date_value.month, date_value.day)
+      when :timestamp_value
+        timestamp_value.to_time
+      when :string_map_value
+        string_map_value.to_ruby
+      when :list_value
+        list_value.to_ruby
+      else
+        raise ArgumentError
       end
     end
-
   end
 
   class HashMapStringValue
@@ -112,13 +114,11 @@ def self.load(string)
     def from_ruby(obj)
       Array === obj or raise ArgumentError
       values.clear
-      obj.each do |value|
-        values << Value.new.tap{|v| v.from_ruby(value) }
-      end
+      obj.each { |value| values << Value.new.tap { |v| v.from_ruby(value) } }
     end
 
     def to_ruby
-      values.map{|v| v.to_ruby }
+      values.map { |v| v.to_ruby }
     end
   end
 
@@ -129,4 +129,4 @@ def self.dump(obj)
   def self.load(string)
     Value.load(string)
   end
-end
+end