normalizr_ruby 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1ea8f30ecfd30fc530cea831dbb691d2e73cc28b
-  data.tar.gz: 44532b0fe53c3aeb53b0a6e6220bb79838c32ae8
+  metadata.gz: 95de21e33d5f39694c35f6b4b7f2093522ecb1a2
+  data.tar.gz: c93846067ce9d15c17f7dca3bf869638cee991b0
 SHA512:
-  metadata.gz: 786a73bc1a511a3df9141a8a40ddd21b5126b7341d2e11de19fbc8bd3d84a169f7d598bbc8dc27902a9123ca0fc87f22879a0d88e103ba26e3f7867da9a84fec
-  data.tar.gz: 0035319b088c36d218b17fdb3cad644663cd787f1fdd51e5dd4d252334b2869737a6074d6aefbe011a34ac7ae88160eecbd190b3f24c3884178857251a388fc2
+  metadata.gz: 429c8be4c5264a7462b42ebb95b63a5124d0317bdc9f5731b67736c7048cd417fd87d5864943c83e1ed893b2cf2a845c888f8d1ce12be123525c3b95e9df5f21
+  data.tar.gz: 65a392bdd66dcf4197ea9fa319edfbe6eb8db4a78faa5dcafddb296bd20f1eaeb6409633621164f169692600bf7f39dc958d0d0e8753154ed34fc269ec16a94d

data/lib/normalizr_ruby/converter.rb

@@ -2,17 +2,6 @@ module NormalizrRuby
   class Converter
     class SchemaNotFound < StandardError; end
 
-    def self.get_schema_class(resource)
-      resource_class = resource.class
-      resource_class = resource_class.base_class if resource_class.respond_to?(:base_class)
-      resource_class_name = resource_class.name
-      schema_class = "#{resource_class_name}Schema".safe_constantize
-      if schema_class.nil?
-        raise SchemaNotFound, "#{resource_class_name} is not found."
-      end
-      schema_class
-    end
-
     def initialize(context)
       @context = context
       @entities = {}
@@ -29,20 +18,42 @@ module NormalizrRuby
       resource
     end
 
+    private
+
+    def not_found(klass)
+      raise SchemaNotFound, "#{klass.name}Schema is not found."
+    end
+
+    def schema_class(resource)
+      klass = resource.class
+      klass = klass.base_class if klass.respond_to?(:base_class)
+      schema_klass = "#{klass.name}Schema".safe_constantize
+      not_found(klass) if schema_klass.nil?
+      schema_klass
+    end
+
+    def init_schema(resource, options)
+      schema_klass = options[:schema].presence || schema_class(resource)
+      schema_klass.new(resource, @context, options.except(:schema))
+    end
+
     def walk(resource, options)
       result = nil
       if resource.respond_to?(:map)
         result = resource.map {|r| walk(r, options)}
       else
-        schema_class = options[:schema].presence || self.class.get_schema_class(resource)
-        schema = schema_class.new(resource, @context, options.except(:schema))
-        result = schema.object.id
-        entity_key = schema.object.class.base_class.name.pluralize.to_sym
+        schema = init_schema(resource, options)
         hash = schema.attributes
-        schema.associations.each do |association, assoc_options|
-          association_result = walk(schema.object.send(association), assoc_options)
-          hash[association] = association_result
+        schema.associations.each do |assoc, assoc_options|
+          assoc_resource = schema.association_resource(assoc)
+          assoc_result = nil
+          unless assoc_resource.nil?
+            assoc_result = walk(assoc_resource, assoc_options)
+          end
+          hash[assoc] = assoc_result
         end
+        result = schema.object.id
+        entity_key = schema.entity_key
         @entities[entity_key] ||= {}
         @entities[entity_key][result] = hash
       end

data/lib/normalizr_ruby/schema.rb

@@ -45,5 +45,17 @@ module NormalizrRuby
       end
       hash
     end
+
+    def entity_key
+      object.class
+            .base_class
+            .name
+            .pluralize
+            .to_sym
+    end
+
+    def association_resource(association_key)
+      object.send(association_key)
+    end
   end
 end

data/lib/normalizr_ruby/version.rb

@@ -1,3 +1,3 @@
 module NormalizrRuby
-  VERSION = "0.1.2"
+  VERSION = "0.1.3"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: normalizr_ruby
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - shinya takahashi
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-08-29 00:00:00.000000000 Z
+date: 2016-10-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport