pb_json_parser 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5ed2211bc248280019756fcfd8f74c8f5abe7d472ef5eaa5e38b72c35e96a633
-  data.tar.gz: 3609f021a03be07a3bac89c0ca1a1ddd77c1aa4748ff8ef81a605fbe2983afe7
+  metadata.gz: 5b93dfc26dda0ff4068e3fc7b3d95c3cd1aff7eb74ff624ca891b8372546d488
+  data.tar.gz: 03a8b5f40491616094293620e4660de4dfd98939029a93944987443cdaebe96d
 SHA512:
-  metadata.gz: 8ade920f219c29475036b0f60bc88cac02da438e9ddbd5ca95d8d4a14c830bb50ed9b9789365be5a692804274a967279e11d71430ecda5c0607a9e283fd7df77
-  data.tar.gz: 8a7b8d36cdf82c1fa895e3f44deba5d693f20ec07921a7144bb19aefe508c1a90ee9f85f50fa7373c299313f54a2cfe7616e26cc586e37848318192a7dec2a37
+  metadata.gz: f15b0f9e178f081426f6d6d907fa17612ffed8e4485710b3220b4ea03353f3bbe3632cea3ee142bef2ff18feff4c719a340a76573c6fa6af97302d4fe084c160
+  data.tar.gz: 1e7b6f889c3fdb3787e9b0ede998ebed0834b26f9f00ff6e2ecd16dbc5fc2fa1bd0304b0363ebca85f886c1d5ae22d0306ee2d11407472d67b0ef4a67897f929

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    pb_json_parser (0.1.0)
+    pb_json_parser (0.2.0)
 
 GEM
   remote: https://rubygems.org/

data/README.md

@@ -62,8 +62,8 @@ Finally you can parse the json by `PbJsonParser`.
 ```ruby
 [6] pry(main)> PbJsonParser.parse(json: File.read('./protos/resources.proto.json'), filename: 'resources.proto').map(&:to_h)
 => [
- {:name=>"User", :fields=>["id"], :assocs=>[{:name=>"profile", :type=>"has_one", :class_name=>"Profile"}]},
- {:name=>"Profile", :fields=>["id", "birthday"], :assocs=>[]}
+ {:name=>"User", :fields=>[{:name=>"id", :type=>"int32"}], :assocs=>[{:name=>"profile", :kind=>"has_one", :class_name=>"Profile"}]},
+ {:name=>"Profile", :fields=>[{:name=>"id", :type=>"int32"}, {:name=>"birthday", :type=>".google.protobuf.Timestamp"}], :assocs=>[]}
 ]
 ```
 

data/lib/pb_json_parser/ast/association.rb

@@ -1,19 +1,19 @@
 module PbJsonParser
   module AST
     class Association
-      Type = {
+      Kind = {
         has_one:  "has_one".freeze,
         has_many: "has_many".freeze,
       }.freeze
 
-      attr_reader :name, :type, :class_name
+      attr_reader :name, :kind, :class_name
 
       # @param [String] name
-      # @param [String] type
+      # @param [String] kind
       # @param [String] class_name
-      def initialize(name:, type:, class_name:)
+      def initialize(name:, kind:, class_name:)
         @name       = name
-        @type       = type
+        @kind       = kind
         @class_name = class_name
         validate!
       end
@@ -21,7 +21,7 @@ module PbJsonParser
       def to_h
         {
           name:       @name,
-          type:       @type,
+          kind:       @kind,
           class_name: @class_name,
         }
       end
@@ -29,8 +29,8 @@ module PbJsonParser
     private
 
       def validate!
-        if !Type.values.include?(@type)
-          raise "Invalid type: #{@type}"
+        if !Kind.values.include?(@kind)
+          raise "Invalid kind: #{@kind}"
         end
       end
     end

data/lib/pb_json_parser/ast/field.rb

@@ -1,11 +1,20 @@
 module PbJsonParser
   module AST
     class Field
-      attr_reader :name
+      attr_reader :name, :type
 
       # @param [String] name
-      def initialize(name:)
+      # @param [String] type
+      def initialize(name:, type:)
         @name = name
+        @type = type
+      end
+
+      def to_h
+        {
+          name: @name,
+          type: @type,
+        }
       end
     end
   end

data/lib/pb_json_parser/ast/message.rb

@@ -23,7 +23,7 @@ module PbJsonParser
       def to_h
         {
           name:   @name,
-          fields: @fields.map(&:name),
+          fields: @fields.map(&:to_h),
           assocs: @assocs.map(&:to_h),
         }
       end

data/lib/pb_json_parser/parser.rb

@@ -41,10 +41,12 @@ module PbJsonParser
           if is_assoc?(f)
             m.push_assoc(parse_assoc(f))
           else
-            m.push_field(AST::Field.new(name: f["name"]))
+            m.push_field(parse_field(f, type: f["type_name"]))
           end
+        when 14  # type: TYPE_ENUM
+          m.push_field(parse_field(f, type: f["type_name"]))
         else
-          m.push_field(AST::Field.new(name: f["name"]))
+          m.push_field(parse_field(f, type: to_type(f["type"])))
         end
       end
 
@@ -56,15 +58,15 @@ module PbJsonParser
     def parse_assoc(field)
       case field["label"]
       when 3  # label: LABEL_REPEATED
-        type = AST::Association::Type[:has_many]
+        kind = AST::Association::Kind[:has_many]
       else
-        type = AST::Association::Type[:has_one]
+        kind = AST::Association::Kind[:has_one]
       end
       class_name = field_message_type(field)
 
       assoc = AST::Association.new(
         name:       field["name"],
-        type:       type,
+        kind:       kind,
         class_name: class_name,
       )
     end
@@ -87,6 +89,46 @@ module PbJsonParser
       field["type_name"][(@package.size + 2)..-1]
     end
 
+    # @param [{ String => Any }] field
+    # @param [String] type
+    # @return [AST::Field]
+    def parse_field(field, type:)
+      AST::Field.new(name: field["name"], type: type)
+    end
+
+    # @param [Integer] type
+    # @return [String]
+    def to_type(type)
+      case type
+      when 1
+        'double'
+      when 2
+        'float'
+      when 3
+        'int64'
+      when 4
+        'uint64'
+      when 5
+        'int32'
+      when 8
+        'bool'
+      when 9
+        'string'
+      when 12
+        'bytes'
+      when 13
+        'uint32'
+      when 17
+        'sint32'
+      when 18
+        'sint64'
+      else
+        # TODO(south37) Handle other scalar value types
+        # cf. https://developers.google.com/protocol-buffers/docs/proto#scalar
+        "type[#{type}]"
+      end
+    end
+
     # @param [String] json
     # @return [Hash]
     def read_data(json, filename)

data/lib/pb_json_parser/version.rb

@@ -1,3 +1,3 @@
 module PbJsonParser
-  VERSION = "0.1.0"
+  VERSION = "0.2.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pb_json_parser
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - Nao Minami
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-09-11 00:00:00.000000000 Z
+date: 2018-10-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler