field_mask_parser 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ceeb1f2018ddb48e63a37be9520164c55fdceec7ec9012648796994e71b21931
-  data.tar.gz: c89c2c36fc1de17edb857ad3f15f9cfe523ffa3c96bfb1a5880999340ac794d6
+  metadata.gz: 268dcafa5e3c30786903d78669b94b076f518b114c0ebb62a50c6a78b0873cb5
+  data.tar.gz: 58d51f75abcd111c40a349fbbff7955b02eb01f211453a9d4845dae2aac4e537
 SHA512:
-  metadata.gz: a18bb68410e57dfa63e7c066395f336754b512f47f21bf2326eb6b9ae9deaf0f9ca61c77ec4df9bd371d2e2127830269141f452c7b8544254183d4ce1da25dfd
-  data.tar.gz: ff3cd3f80ca759bd79ee890a1f836ea74a50a212ef65fd300b1d6196951f8d4297956843388567984db5ed5cea4c7c0a97a9c456f77504d841cc697fe64fd676
+  metadata.gz: 376e5ce91f5cd5fd92d1b87d4226e3220c004fed05960a289286aad6bd5c657fcae691e7dd965c86779ff5fbccc80e0e59b0994a8d850926c0b34c10fac1e71b
+  data.tar.gz: 9b2a71040e43de2ce5e8d95b4ea39e3b1c5450b82928e2bea1346c7443e37612dbf00288c4478998f95b70d6170952ae49447ffd722c95f4e62f4d5757c1de32

data/Gemfile.lock

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

data/lib/field_mask_parser/node.rb

@@ -1,14 +1,16 @@
 module FieldMaskParser
   class Node
-    attr_reader :name, :attrs, :assocs
+    attr_reader :name, :is_leaf, :attrs, :assocs
 
     # @param [Symbol | NilClass] name nil when being top-level node
+    # @param [bool] is_leaf
     # @param [<Symbol>] attrs
     # @param [Set<Node>] assocs
-    def initialize(name:)
-      @name   = name
-      @attrs  = []
-      @assocs = []
+    def initialize(name:, is_leaf:)
+      @name    = name
+      @is_leaf = is_leaf
+      @attrs   = []
+      @assocs  = []
     end
 
     # @param [Symbol] f
@@ -22,7 +24,12 @@ module FieldMaskParser
     end
 
     def to_h
-      { name: @name, attrs: @attrs, assocs: @assocs.map(&:to_h) }
+      {
+        name:    @name,
+        is_leaf: @is_leaf,
+        attrs:   @attrs,
+        assocs:  @assocs.map(&:to_h)
+      }
     end
   end
 end

data/lib/field_mask_parser/parser/deep_hash_builder.rb

@@ -0,0 +1,53 @@
+module FieldMaskParser
+  class Parser
+    # HashBuilder build nested hash from paths (string array).
+    # ex.
+    # param: ["id", "facebook_uid", "detail", "detail.id", "profile.name"]
+    # return: {
+    #   :id => <is_leaf: true, children: {}>,
+    #   :facebook_uid => <is_leaf: true, children: {}>,
+    #   :detail => <is_leaf: true, children: {
+    #     :id => <is_leaf: true, children: {}>
+    #   }>,
+    #   :profile => <is_leaf: false, children: {
+    #     :name => <is_leaf: true, children: {}>
+    #   }>
+    # }
+    class DeepHashBuilder
+      class << self
+        # @param [<String>] paths
+        # @return [{ Symbol => Hash }]
+        def build(paths)
+          h = {}
+          paths.each do |path|
+            deep_push!(h, path.split('.').map(&:strip).map(&:to_sym))
+          end
+          h
+        end
+
+      private
+
+        # @param [Hash] h
+        # @param [<String>] field_list
+        def deep_push!(h, field_list)
+          if field_list.size < 1
+            # Do nothing
+            return
+          end
+
+          f      = field_list.first
+          f_rest = field_list[1..-1]
+
+          if !h[f]
+            h[f] = DeepHashNode.new
+          end
+          if f_rest.size == 0
+            h[f].is_leaf = true
+          end
+
+          deep_push!(h[f].children, f_rest)
+        end
+      end
+    end
+  end
+end

data/lib/field_mask_parser/parser/deep_hash_node.rb

@@ -0,0 +1,25 @@
+module FieldMaskParser
+  class Parser
+    class DeepHashNode
+      attr_accessor :is_leaf
+      attr_reader :children
+
+      def initialize
+        @is_leaf  = false
+        @children = {}
+      end
+
+      # @param [Symbol] field
+      # @param [DeepHashNode] n
+      def push_child(field, n)
+        @children[field] = n
+      end
+
+      # @param [DeepHashNode] other
+      # @reutrn [bool]
+      def ==(other)
+        is_leaf == other.is_leaf && children == other.children
+      end
+    end
+  end
+end

data/lib/field_mask_parser/parser.rb

@@ -1,49 +1,18 @@
+require 'field_mask_parser/parser/deep_hash_builder'
+require 'field_mask_parser/parser/deep_hash_node'
+
 module FieldMaskParser
   class Parser
-    # HashBuilder build nested hash from paths (string array).
-    # ex.
-    # param: ["id", "facebook_uid", "detail.id", "detail.email"]
-    # return: {:id=>{}, :facebook_uid=>{}, :detail=>{:id=>{}, :email=>{}}}
-    class HashBuilder
-      class << self
-        # @param [<String>] paths
-        # @return [{ Symbol => Hash }]
-        def build(paths)
-          h = {}
-          paths.each do |path|
-            deep_push!(h, path.split('.').map(&:strip).map(&:to_sym))
-          end
-          h
-        end
-
-      private
-
-        # @param [Hash] h
-        # @param [<String>] field_list
-        def deep_push!(h, field_list)
-          if field_list.size < 1
-            # Do nothing
-            return
-          end
-          f = field_list.first
-          if !h[f]
-            h[f] = {}
-          end
-          deep_push!(h[f], field_list[1..-1])
-        end
-      end
-    end
-
     # @param [<String>] paths
     def initialize(paths:, root:, dispatcher: nil)
-      @attrs_or_assocs = HashBuilder.build(paths)
+      @attrs_or_assocs = DeepHashBuilder.build(paths)
       @root            = root
       @dispatcher      = dispatcher || Dispatcher::ActiveRecordDispatcher.new
     end
 
     # @reutrn [Node]
     def parse
-      r = Node.new(name: nil)
+      r = Node.new(name: nil, is_leaf: false)
       set_attrs_and_assocs!(r, @attrs_or_assocs, @root)
       r
     end
@@ -51,19 +20,20 @@ module FieldMaskParser
   private
 
     # @param [Node] node
-    # @param [Hash] attrs_or_assocs
+    # @param [{ Symbol => DeepHashNode }] attrs_or_assocs
     # @param [Class] klass inheriting ActiveRecord::Base
     def set_attrs_and_assocs!(node, attrs_or_assocs, klass)
-      attrs_or_assocs.each do |name, _attrs_or_assocs|
+      attrs_or_assocs.each do |name, dhn|
         case @dispatcher.dispatch(klass, name)
         when Dispatcher::Type::ATTRIBUTE
+          # NOTE: If dhn.is_leaf is false, it is invalid. But ignore it now.
           node.push_attr(name)
         when Dispatcher::Type::ASSOCIATION
-          n = Node.new(name: name)
+          n = Node.new(name: name, is_leaf: dhn.is_leaf)
           node.push_assoc(n)
-          if _attrs_or_assocs.size > 0
+          if dhn.children.size > 0
             _klass = get_assoc_klass(klass, name)
-            set_attrs_and_assocs!(n, _attrs_or_assocs, _klass)
+            set_attrs_and_assocs!(n, dhn.children, _klass)
           end
         when Dispatcher::Type::UNKNOWN
           # Ignore invalid field

data/lib/field_mask_parser/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: field_mask_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-08-28 00:00:00.000000000 Z
+date: 2018-08-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -104,6 +104,8 @@ files:
 - lib/field_mask_parser/dispatcher/type.rb
 - lib/field_mask_parser/node.rb
 - lib/field_mask_parser/parser.rb
+- lib/field_mask_parser/parser/deep_hash_builder.rb
+- lib/field_mask_parser/parser/deep_hash_node.rb
 - lib/field_mask_parser/version.rb
 homepage: https://github.com/south37/field_mask_parser
 licenses: