protobuf_nested_struct 1.0.0 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: bae6c6d57359ec2a06c717c132da705bec0f569e
-  data.tar.gz: 0d11b7bc9dc5ef4a4a10808c33bfc56ba7405e91
+SHA256:
+  metadata.gz: 0bad03d31b55acab52ef71a547b313174cca03257d0bbd878143e9042ed28192
+  data.tar.gz: 6f91acdb024228400f5cebd586853e0f31d9ca93b18e77b5301529006559506e
 SHA512:
-  metadata.gz: 9d506d70254b800a612076f2f5bfd12b12980bd58f479963fe51315e321b1e6e31177a372fe358ea291339900b85f8147f5dc76d46eb75e5bcf9141b9f4eabaf
-  data.tar.gz: 817930eb2167b5d9f37c1e205b59292cc18b199383ecd0006aa1135ac064b56db27229fec5c33ca8264931ed86b813cf0ae3bc18b1301d8279a4e6327a54f7fb
+  metadata.gz: 3ff811c9bf9f8f5208f6f65e86de32222228840f375ae61fa15ca9d251592f89912d553d13049ec4378630f0610df858b805a5996ff34a83271b27e7ca8c912a
+  data.tar.gz: 4d93809489f1ae48ecb292c3111766fc314ffbfb13b29ccc89e31721b0f5f1ce0fc64bd9ed88c7a2928a2cd4a56233e5880b94adfdae9693df708e122b7c1915

data/README.md

@@ -47,6 +47,13 @@ expect(copy).to eql(obj)
 
 where `obj` can be an instance of one of the supported types.
 
+## Protobuf schema definition
+
+You can use it to generate code for serialization and deserialization in any programming language supported
+by Protobuf.
+
+* https://github.com/arkency/protobuf-nested-struct/blob/master/lib/protobuf_nested_struct/struct.proto
+
 ## Development
 
 * `bundle install`

data/lib/google/type/date_pb.rb

@@ -1,18 +1,38 @@
+# frozen_string_literal: true
 # Generated by the protocol buffer compiler.  DO NOT EDIT!
-# source: date.proto
+# source: google/type/date.proto
 
 require 'google/protobuf'
 
-Google::Protobuf::DescriptorPool.generated_pool.build do
-  add_message "google.type.Date" do
-    optional :year, :int32, 1
-    optional :month, :int32, 2
-    optional :day, :int32, 3
+
+descriptor_data = "\n\x16google/type/date.proto\x12\x0bgoogle.type\"0\n\x04\x44\x61te\x12\x0c\n\x04year\x18\x01 \x01(\x05\x12\r\n\x05month\x18\x02 \x01(\x05\x12\x0b\n\x03\x64\x61y\x18\x03 \x01(\x05\x42]\n\x0f\x63om.google.typeB\tDateProtoP\x01Z4google.golang.org/genproto/googleapis/type/date;date\xf8\x01\x01\xa2\x02\x03GTPb\x06proto3"
+
+pool = Google::Protobuf::DescriptorPool.generated_pool
+
+begin
+  pool.add_serialized_file(descriptor_data)
+rescue TypeError
+  # Compatibility code: will be removed in the next major version.
+  require 'google/protobuf/descriptor_pb'
+  parsed = Google::Protobuf::FileDescriptorProto.decode(descriptor_data)
+  parsed.clear_dependency
+  serialized = parsed.class.encode(parsed)
+  file = pool.add_serialized_file(serialized)
+  warn "Warning: Protobuf detected an import path issue while loading generated file #{__FILE__}"
+  imports = [
+  ]
+  imports.each do |type_name, expected_filename|
+    import_file = pool.lookup(type_name).file_descriptor
+    if import_file.name != expected_filename
+      warn "- #{file.name} imports #{expected_filename}, but that import was loaded as #{import_file.name}"
+    end
   end
+  warn "Each proto file must use a consistent fully-qualified name."
+  warn "This will become an error in the next major version."
 end
 
 module Google
   module Type
-    Date = Google::Protobuf::DescriptorPool.generated_pool.lookup("google.type.Date").msgclass
+    Date = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("google.type.Date").msgclass
   end
 end

data/lib/protobuf_nested_struct/struct_pb.rb

@@ -1,38 +1,44 @@
+# frozen_string_literal: true
 # Generated by the protocol buffer compiler.  DO NOT EDIT!
-# source: struct.proto
+# source: protobuf_nested_struct/struct.proto
 
 require 'google/protobuf'
 
 require 'google/protobuf/timestamp_pb'
 require 'google/type/date_pb'
-Google::Protobuf::DescriptorPool.generated_pool.build do
-  add_message "protobuf_nested_struct.HashMapStringValue" do
-    map :fields, :string, :message, 1, "protobuf_nested_struct.Value"
-  end
-  add_message "protobuf_nested_struct.Value" do
-    oneof :kind do
-      optional :null_value, :enum, 1, "protobuf_nested_struct.NullValue"
-      optional :double_value, :double, 2
-      optional :int_value, :int64, 3
-      optional :string_value, :string, 4
-      optional :bool_value, :bool, 5
-      optional :date_value, :message, 6, "google.type.Date"
-      optional :timestamp_value, :message, 7, "google.protobuf.Timestamp"
-      optional :string_map_value, :message, 20, "protobuf_nested_struct.HashMapStringValue"
-      optional :list_value, :message, 21, "protobuf_nested_struct.ListValue"
+
+
+descriptor_data = "\n#protobuf_nested_struct/struct.proto\x12\x16protobuf_nested_struct\x1a\x1fgoogle/protobuf/timestamp.proto\x1a\x16google/type/date.proto\"\xaa\x01\n\x12HashMapStringValue\x12\x46\n\x06\x66ields\x18\x01 \x03(\x0b\x32\x36.protobuf_nested_struct.HashMapStringValue.FieldsEntry\x1aL\n\x0b\x46ieldsEntry\x12\x0b\n\x03key\x18\x01 \x01(\t\x12,\n\x05value\x18\x02 \x01(\x0b\x32\x1d.protobuf_nested_struct.Value:\x02\x38\x01\"\x84\x03\n\x05Value\x12\x37\n\nnull_value\x18\x01 \x01(\x0e\x32!.protobuf_nested_struct.NullValueH\x00\x12\x16\n\x0c\x64ouble_value\x18\x02 \x01(\x01H\x00\x12\x13\n\tint_value\x18\x03 \x01(\x03H\x00\x12\x16\n\x0cstring_value\x18\x04 \x01(\tH\x00\x12\x14\n\nbool_value\x18\x05 \x01(\x08H\x00\x12\'\n\ndate_value\x18\x06 \x01(\x0b\x32\x11.google.type.DateH\x00\x12\x35\n\x0ftimestamp_value\x18\x07 \x01(\x0b\x32\x1a.google.protobuf.TimestampH\x00\x12\x46\n\x10string_map_value\x18\x14 \x01(\x0b\x32*.protobuf_nested_struct.HashMapStringValueH\x00\x12\x37\n\nlist_value\x18\x15 \x01(\x0b\x32!.protobuf_nested_struct.ListValueH\x00\x42\x06\n\x04kind\":\n\tListValue\x12-\n\x06values\x18\x01 \x03(\x0b\x32\x1d.protobuf_nested_struct.Value*\x1b\n\tNullValue\x12\x0e\n\nNULL_VALUE\x10\x00\x62\x06proto3"
+
+pool = Google::Protobuf::DescriptorPool.generated_pool
+
+begin
+  pool.add_serialized_file(descriptor_data)
+rescue TypeError
+  # Compatibility code: will be removed in the next major version.
+  require 'google/protobuf/descriptor_pb'
+  parsed = Google::Protobuf::FileDescriptorProto.decode(descriptor_data)
+  parsed.clear_dependency
+  serialized = parsed.class.encode(parsed)
+  file = pool.add_serialized_file(serialized)
+  warn "Warning: Protobuf detected an import path issue while loading generated file #{__FILE__}"
+  imports = [
+    ["google.type.Date", "google/type/date.proto"],
+    ["google.protobuf.Timestamp", "google/protobuf/timestamp.proto"],
+  ]
+  imports.each do |type_name, expected_filename|
+    import_file = pool.lookup(type_name).file_descriptor
+    if import_file.name != expected_filename
+      warn "- #{file.name} imports #{expected_filename}, but that import was loaded as #{import_file.name}"
     end
   end
-  add_message "protobuf_nested_struct.ListValue" do
-    repeated :values, :message, 1, "protobuf_nested_struct.Value"
-  end
-  add_enum "protobuf_nested_struct.NullValue" do
-    value :NULL_VALUE, 0
-  end
+  warn "Each proto file must use a consistent fully-qualified name."
+  warn "This will become an error in the next major version."
 end
 
 module ProtobufNestedStruct
-  HashMapStringValue = Google::Protobuf::DescriptorPool.generated_pool.lookup("protobuf_nested_struct.HashMapStringValue").msgclass
-  Value = Google::Protobuf::DescriptorPool.generated_pool.lookup("protobuf_nested_struct.Value").msgclass
-  ListValue = Google::Protobuf::DescriptorPool.generated_pool.lookup("protobuf_nested_struct.ListValue").msgclass
-  NullValue = Google::Protobuf::DescriptorPool.generated_pool.lookup("protobuf_nested_struct.NullValue").enummodule
+  HashMapStringValue = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("protobuf_nested_struct.HashMapStringValue").msgclass
+  Value = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("protobuf_nested_struct.Value").msgclass
+  ListValue = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("protobuf_nested_struct.ListValue").msgclass
+  NullValue = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("protobuf_nested_struct.NullValue").enummodule
 end

data/lib/protobuf_nested_struct/version.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module ProtobufNestedStruct
-  VERSION = "1.0.0"
+  VERSION = "1.2.0"
 end

data/lib/protobuf_nested_struct.rb

@@ -1,65 +1,91 @@
-require 'date'
-require 'google/protobuf'
-require 'google/protobuf/well_known_types'
+# frozen_string_literal: true
 
-require 'protobuf_nested_struct/version'
-require 'protobuf_nested_struct/struct_pb'
+require "date"
+require "google/protobuf"
+require "google/protobuf/well_known_types"
+
+require "protobuf_nested_struct/version"
+require "protobuf_nested_struct/struct_pb"
 
 module ProtobufNestedStruct
   class Value
+    def self.dump(obj)
+      v = new
+      v.from_ruby(obj)
+      encode(v)
+    end
+
+    def self.load(string)
+      v = decode(string)
+      v.to_ruby
+    end
+
     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
+    def self.dump(obj)
+      v = new
+      v.from_ruby(obj)
+      encode(v)
+    end
+
+    def self.load(string)
+      v = decode(string)
+      v.to_ruby
+    end
+
     def from_ruby(obj)
       Hash === obj or raise ArgumentError
       obj.each do |key, value|
@@ -76,27 +102,33 @@ module ProtobufNestedStruct
   end
 
   class ListValue
+    def self.dump(obj)
+      v = new
+      v.from_ruby(obj)
+      encode(v)
+    end
+
+    def self.load(string)
+      v = decode(string)
+      v.to_ruby
+    end
+
     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
 
   def self.dump(obj)
-    v = Value.new
-    v.from_ruby(obj)
-    Value.encode(v)
+    Value.dump(obj)
   end
 
   def self.load(string)
-    v = Value.decode(string)
-    v.to_ruby
+    Value.load(string)
   end
-end
+end

metadata

@@ -1,15 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: protobuf_nested_struct
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.2.0
 platform: ruby
 authors:
 - Robert Pankowecki
 - Arkency
-autorequire: 
-bindir: exe
+bindir: bin
 cert_chain: []
-date: 2018-04-19 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: google-protobuf
@@ -17,115 +16,45 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: bundler
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.16'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.16'
-- !ruby/object:Gem::Dependency
-  name: rake
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '10.0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '10.0'
-- !ruby/object:Gem::Dependency
-  name: rspec
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
+        version: 3.25.7
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '3.0'
-  type: :development
+        version: '4'
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.0'
-- !ruby/object:Gem::Dependency
-  name: pry
-  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
+        version: 3.25.7
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: mutant-rspec
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-description: Serialize primitives and deep structures (array, hash) to protobuf
+        version: '4'
+description: 'Serialize primitives and deep structures (array, hash) to protobuf
+
+  '
 email:
 - dev@arkency.com
 executables: []
 extensions: []
-extra_rdoc_files: []
+extra_rdoc_files:
+- README.md
 files:
-- ".circleci/config.yml"
-- ".gitignore"
-- ".rspec"
-- ".travis.yml"
-- Gemfile
 - README.md
-- Rakefile
-- bin/console
-- bin/setup
 - lib/google/type/date.proto
 - lib/google/type/date_pb.rb
 - lib/protobuf_nested_struct.rb
 - lib/protobuf_nested_struct/struct.proto
 - lib/protobuf_nested_struct/struct_pb.rb
 - lib/protobuf_nested_struct/version.rb
-- protobuf_nested_struct.gemspec
 homepage: https://github.com/arkency/protobuf-nested-struct
-licenses: []
+licenses:
+- MIT
 metadata:
-  homepage_uri: https://github.com/arkency/protobuf-nested-struct
   changelog_uri: https://github.com/arkency/protobuf-nested-struct/releases
   source_code_uri: https://github.com/arkency/protobuf-nested-struct
   bug_tracker_uri: https://github.com/arkency/protobuf-nested-struct/issues
-post_install_message: 
+  rubygems_mfa_required: 'true'
 rdoc_options: []
 require_paths:
 - lib
@@ -133,16 +62,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: '2.7'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.13
-signing_key: 
+rubygems_version: 3.6.7
 specification_version: 4
 summary: Serialize primitives and deep structures (array, hash) to protobuf
 test_files: []

data/.circleci/config.yml

@@ -1,12 +0,0 @@
-version: 2
-jobs:
-  build:
-    macos:
-      xcode: "9.3.0"
-    steps:
-      - checkout
-      - run:
-          name: install+mutate
-          command: bundle install && bundle exec mutant --include lib --require protobuf_nested_struct --use rspec ProtobufNestedStruct*
-          environment:
-            ARCHFLAGS: "-arch x86_64"

data/.gitignore

@@ -1,12 +0,0 @@
-/.bundle/
-/.yardoc
-/_yardoc/
-/coverage/
-/doc/
-/pkg/
-/spec/reports/
-/tmp/
-
-# rspec failure tracking
-.rspec_status
-Gemfile.lock

data/.rspec

@@ -1,3 +0,0 @@
---format documentation
---color
---require spec_helper

data/.travis.yml

@@ -1,7 +0,0 @@
-sudo: false
-language: ruby
-rvm:
-  - 2.5.1
-  - 2.4.3
-  - 2.3.7
-before_install: gem install bundler -v 1.16.1

data/Gemfile

@@ -1,6 +0,0 @@
-source "https://rubygems.org"
-
-git_source(:github) {|repo_name| "https://github.com/#{repo_name}" }
-
-# Specify your gem's dependencies in protobuf-nested-struct.gemspec
-gemspec

data/Rakefile

@@ -1,6 +0,0 @@
-require "bundler/gem_tasks"
-require "rspec/core/rake_task"
-
-RSpec::Core::RakeTask.new(:spec)
-
-task :default => :spec

data/bin/console

@@ -1,14 +0,0 @@
-#!/usr/bin/env ruby
-
-require "bundler/setup"
-require "protobuf_nested_struct"
-
-# You can add fixtures and/or initialization code here to make experimenting
-# with your gem easier. You can also use a different console, if you like.
-
-# (If you use this, don't forget to add pry to your Gemfile!)
-# require "pry"
-# Pry.start
-
-require "irb"
-IRB.start(__FILE__)

data/bin/setup

@@ -1,8 +0,0 @@
-#!/usr/bin/env bash
-set -euo pipefail
-IFS=$'\n\t'
-set -vx
-
-bundle install
-
-# Do any other automated setup that you need to do here

data/protobuf_nested_struct.gemspec

@@ -1,35 +0,0 @@
-
-lib = File.expand_path("../lib", __FILE__)
-$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
-require "protobuf_nested_struct/version"
-
-Gem::Specification.new do |spec|
-  spec.name          = "protobuf_nested_struct"
-  spec.version       = ProtobufNestedStruct::VERSION
-  spec.authors       = ["Robert Pankowecki", "Arkency"]
-  spec.email         = ["dev@arkency.com"]
-
-  spec.summary       = %q{Serialize primitives and deep structures (array, hash) to protobuf}
-  spec.description   = %q{Serialize primitives and deep structures (array, hash) to protobuf}
-  spec.homepage      = "https://github.com/arkency/protobuf-nested-struct"
-  spec.metadata      = {
-    "homepage_uri"    => "https://github.com/arkency/protobuf-nested-struct",
-    "changelog_uri"   => "https://github.com/arkency/protobuf-nested-struct/releases",
-    "source_code_uri" => "https://github.com/arkency/protobuf-nested-struct",
-    "bug_tracker_uri" => "https://github.com/arkency/protobuf-nested-struct/issues",
-  }
-
-  spec.files         = `git ls-files -z`.split("\x0").reject do |f|
-    f.match(%r{^(test|spec|features)/})
-  end
-  spec.bindir        = "exe"
-  spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
-  spec.require_paths = ["lib"]
-  spec.add_dependency "google-protobuf"
-
-  spec.add_development_dependency "bundler", "~> 1.16"
-  spec.add_development_dependency "rake", "~> 10.0"
-  spec.add_development_dependency "rspec", "~> 3.0"
-  spec.add_development_dependency "pry"
-  spec.add_development_dependency "mutant-rspec"
-end