field_mask_parser 0.3.2 → 0.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1ffc85276d16c72328a2e3f875c9b4f4ec11a6b8bee4976c6aebf5d77e266c44
-  data.tar.gz: 04357c1acce3b82c820cf2d4855301cea0670c84bc266bf5a49c54745a900812
+  metadata.gz: 38f5a42c2c54bca7181d9d4ca27e9169b20c4aa360f15630de3892fb178e8af0
+  data.tar.gz: 05cb2a3625d5bf88bbd0dd4302c116c224b535fc5df1ec122300e1ea280e41d3
 SHA512:
-  metadata.gz: 3345941f970b56f855e68b46ad25824f02c099c75a92fe9458b627124cccea6747b79d7ec22e80a61c0a7aa8b7da9a94046b8caf8137f978e68892aa20072f4b
-  data.tar.gz: 965aa5fdc3f14ffee21c1beeef5036183423de9682a5cc0265c0b589d53d8cbd4479316ed68a338c691f4c490d72c2fcfabdc2e21a8620e2c33c749c0ad64143
+  metadata.gz: 3ddb7a8153f7e06543c05d222f53e28c202560a05055004c39f4d5dda9f75b6d15cf824ee5cad136a7309268af9bb291bbe11c4191ccaee45266daed2918d25f
+  data.tar.gz: 6a89cf3c0d1ffe95aedcf0e2625aafb48922f9bb4cca8d5208283efec89afac92b6ed1d21ca0dbf0093b3e38cfbb4389c4949030b02bf70784e5f16552c09b1c

data/.travis.yml

@@ -1,5 +1,8 @@
 sudo: false
 language: ruby
 rvm:
-  - 2.5.1
-before_install: gem install bundler -v 1.16.2
+- 2.5.1
+before_install:
+- gem install bundler -v 1.16.2
+script:
+- bundle exec rspec

data/Gemfile.lock

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

data/README.md

@@ -62,15 +62,17 @@ end
   :is_leaf=>false,
   :klass=>User,
   :attrs=>[:id],
-  :assocs=>[
+  :has_ones=>[
     {
       :name=>:profile,
       :is_leaf=>false,
       :klass=>Profile,
       :attrs=>[:name],
-      :assocs=>[]
+      :has_ones=>[],
+      :has_manies=>[]
     }
-  ]
+  ],
+  :has_manies=>[]
 }
 ```
 

data/lib/field_mask_parser/dispatcher/active_record_dispatcher.rb

@@ -7,8 +7,15 @@ module FieldMaskParser
       def dispatch(klass, name)
         if klass.attribute_names.include?(name.to_s)
           Type::ATTRIBUTE
-        elsif klass.reflect_on_association(name)
-          Type::ASSOCIATION
+        elsif (assoc = klass.reflect_on_association(name))
+          case assoc
+          when ActiveRecord::Reflection::HasOneReflection
+            Type::HAS_ONE
+          when ActiveRecord::Reflection::HasManyReflection
+            Type::HAS_MANY
+          else
+            raise "invalid association!"
+          end
         else
           Type::UNKNOWN
         end

data/lib/field_mask_parser/dispatcher/type.rb

@@ -6,9 +6,10 @@ module FieldMaskParser
         @type = type
       end
 
-      ATTRIBUTE   = self.new("Dispatcher::Type::ATTRIBUTE")
-      ASSOCIATION = self.new("Dispatcher::Type::ASSOCIATION")
-      UNKNOWN     = self.new("Dispatcher::Type::UNKNOWN")
+      ATTRIBUTE = self.new("Dispatcher::Type::ATTRIBUTE")
+      HAS_ONE   = self.new("Dispatcher::Type::HAS_ONE")
+      HAS_MANY  = self.new("Dispatcher::Type::HAS_MANY")
+      UNKNOWN   = self.new("Dispatcher::Type::UNKNOWN")
     end
   end
 end

data/lib/field_mask_parser/node.rb

@@ -1,18 +1,17 @@
 module FieldMaskParser
   class Node
-    attr_reader :name, :is_leaf, :klass, :attrs, :assocs
+    attr_reader :name, :is_leaf, :klass, :attrs, :has_ones, :has_manies
 
     # @param [Symbol | NilClass] name nil when being top-level node
     # @param [bool] is_leaf
-    # @param [<Symbol>] attrs
-    # @param [Set<Node>] assocs
     # @param [ActiveRecord::Base] klass
     def initialize(name:, is_leaf:, klass:)
-      @name    = name
-      @is_leaf = is_leaf
-      @klass   = klass
-      @attrs   = []
-      @assocs  = []
+      @name       = name
+      @is_leaf    = is_leaf
+      @klass      = klass
+      @attrs      = []
+      @has_ones   = []
+      @has_manies = []
     end
 
     # @param [Symbol] f
@@ -21,17 +20,27 @@ module FieldMaskParser
     end
 
     # @param [Node] n
-    def push_assoc(n)
-      @assocs.push(n)
+    def push_has_one(n)
+      @has_ones.push(n)
+    end
+
+    # @param [Node] n
+    def push_has_many(n)
+      @has_manies.push(n)
+    end
+
+    def assocs
+      has_ones + has_manies
     end
 
     def to_h
       {
-        name:    @name,
-        is_leaf: @is_leaf,
-        klass:   @klass,
-        attrs:   @attrs,
-        assocs:  @assocs.map(&:to_h)
+        name:       @name,
+        is_leaf:    @is_leaf,
+        klass:      @klass,
+        attrs:      @attrs,
+        has_ones:   @has_ones.map(&:to_h),
+        has_manies: @has_manies.map(&:to_h),
       }
     end
   end

data/lib/field_mask_parser/parser.rb

@@ -24,14 +24,20 @@ module FieldMaskParser
     # @param [Class] klass inheriting ActiveRecord::Base
     def set_attrs_and_assocs!(node, attrs_or_assocs, klass)
       attrs_or_assocs.each do |name, dhn|
-        case @dispatcher.dispatch(klass, name)
+        type = @dispatcher.dispatch(klass, name)
+
+        case type
         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
+        when Dispatcher::Type::HAS_ONE, Dispatcher::Type::HAS_MANY
           _klass = get_assoc_klass(klass, name)
           n = Node.new(name: name, is_leaf: dhn.is_leaf, klass: _klass)
-          node.push_assoc(n)
+          if type == Dispatcher::Type::HAS_ONE
+            node.push_has_one(n)
+          else  # Dispatcher::Type::HAS_MANY
+            node.push_has_many(n)
+          end
           if dhn.children.size > 0
             set_attrs_and_assocs!(n, dhn.children, _klass)
           end

data/lib/field_mask_parser/version.rb

@@ -1,3 +1,3 @@
 module FieldMaskParser
-  VERSION = "0.3.2"
+  VERSION = "0.4.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: field_mask_parser
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 0.4.1
 platform: ruby
 authors:
 - Nao Minami
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-10-19 00:00:00.000000000 Z
+date: 2018-12-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler