ja2r 0.4.0 → 0.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1f7568684405d5bab705339641fe01bfbe4d47cad7582d5f8e18ac4c3550fa76
-  data.tar.gz: 2a14276b05862e05c70acc866a9ab7a8ebe03755e6c08e311e042466218872e2
+  metadata.gz: 6c57261c49614b634002798afb8e910871587b82430fe03fbcb07ede01e00da5
+  data.tar.gz: 6962fea0c94bd87ce6a2b567ebae944ca8b28b560fb4141b9471314dc7526e8a
 SHA512:
-  metadata.gz: 8b887325ba80130513d408d3249b0eb1e3441420d94339bece47c91432a07e41c0fda950023d0774dfa74abedd36fe811390db4a4e076ce5ff95795ffd16e9cf
-  data.tar.gz: aeb13188ee1fc4ae6779bc0297ea91eb457745b452d650ae832afb994d65b3d71f08bfffd950dcb86d4a8f81470ef357cce424b3cbb794f29c053d4d8b1570f5
+  metadata.gz: b67fb5528e863a0e9aff8d60b98d8b188d4d243df133df1b726e0fc8f38b65d9c558e1d082469a65285f9fb1be8bc932346b12c669637eecc63233e5b763c373
+  data.tar.gz: 8ec89d361eece21bb856f0849216f9b4a8bdf74a07ee79c5891cf3d499de47708e06860f7eaf116040693edd6aa3223f2113e045da18d6e6d805f7165b17f47a

data/lib/ja2r/element.rb

@@ -2,7 +2,7 @@ module JA2R
   class Element
     def initialize(origin_data)
       @origin_data = origin_data.with_indifferent_access
-      @relationships = origin_data['relationships'] ? convert_relationship(origin_data['relationships']) : {}
+      @relationships = origin_data['relationships'] ? convert_relationships(origin_data['relationships']) : {}
     end
 
     attr_reader :origin_data, :relationships
@@ -52,14 +52,14 @@ module JA2R
       super
     end
 
-    def convert_relationship(hash)
-      Hash[hash.map do |key, data|
-        if data['data'].is_a? Array
-          [key, data['data'].map { |d| KlassRegistry.instantiate(d) }]
-        else
-          [key, KlassRegistry.instantiate(data['data'])]
-        end
-      end].with_indifferent_access
+    def convert_relationships(hash)
+      hash.each_with_object(ActiveSupport::HashWithIndifferentAccess.new) do |(key, data), memo|
+        memo[key] = if data&.[]('data').is_a?(Array)
+                      data['data'].map { |d| KlassRegistry.instantiate(d) }
+                    elsif data&.[]('data').is_a?(Hash)
+                      KlassRegistry.instantiate(data&.[]('data'))
+                    end
+      end
     end
   end
 end

data/lib/ja2r/klass_registry.rb

@@ -3,6 +3,8 @@ module JA2R
     extend self
 
     def instantiate(hash)
+      return unless hash&.key? 'type'
+
       lookup(hash['type']).new(hash)
     end
 

data/lib/ja2r/parser.rb

@@ -19,9 +19,9 @@ module JA2R
     attr_reader :hash, :object_space
 
     def parse_data
-      if hash['data'].is_a?(Array)
+      if hash&.[]('data').is_a?(Array)
         parse_list
-      elsif hash['data'].is_a?(Hash)
+      elsif hash&.[]('data').is_a?(Hash)
         parse_single
       end
     end
@@ -57,7 +57,7 @@ module JA2R
             object_space.dig(e.type, e.id) || e
           end
         else
-          next unless (obj = object_space.dig(relationship.type, relationship.id))
+          next unless (obj = object_space.dig(relationship&.type, relationship&.id))
 
           element.relationships[key] = obj
         end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ja2r
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.4.1
 platform: ruby
 authors:
 - mkon
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-02-19 00:00:00.000000000 Z
+date: 2019-03-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport