alba 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9dab0921e07fb607cfceb802a42fdb5f8cc20eb745522c46dc7b451b8a0cd14e
-  data.tar.gz: 6c6fcc0035ef543ee6d60bffa18ca83379d090e800950411d7316c21031784ad
+  metadata.gz: b4622052b8c6338ea135b98dd3376c8fdd51765b74fa51113edbfdc5afd17d58
+  data.tar.gz: eaddf9d21c440dc8385a5afa425b9c02b327e9537544c7772216898af48d6603
 SHA512:
-  metadata.gz: c97545976f850ba0191dcabf7f34b8daeebf54d2b82c9a37305f569cc7cadaa1b9f0f92dc42f81193e9fd56eae2e862d650b023c4bcd105739c18c0baaf35e13
-  data.tar.gz: 7423763628b13e5643193347379eefbcf2cc2d78266cafd147d8c86d3f755feca93dd3f2c9bca92e8ec008b1ec7d00c9ed7bf1590a2f26e83c99fa529a987de1
+  metadata.gz: cf931c28818461efff56c8e7b72a83157952bd464695e037ca3214a7aeb758c89b48b7ffe612016305c3087194a98c08b91944e4d993c0aa28ce6d5907208da6
+  data.tar.gz: f30ffac69df4a39fcbcabe838165cff348dbe01c1d8f8f8c48930d0c3898ac5b60574d80f891434f3a92438d4e079043288d9f5d1b425b867adbb6e371ee55f1

data/Gemfile.lock

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

data/lib/alba/many.rb

@@ -9,7 +9,7 @@ module Alba
     end
 
     def to_hash(target)
-      objects = target.__send__(@name)
+      objects = target.public_send(@name)
       @resource ||= resource_class
       objects.map { |o| @resource.new(o).to_hash }
     end

data/lib/alba/one.rb

@@ -9,7 +9,7 @@ module Alba
     end
 
     def to_hash(target)
-      object = target.__send__(@name)
+      object = target.public_send(@name)
       @resource ||= resource_class
       @resource.new(object).to_hash
     end

data/lib/alba/resource.rb

@@ -7,7 +7,7 @@ require 'alba/serializers/default_serializer'
 module Alba
   # This module represents what should be serialized
   module Resource
-    DSLS = [:_attributes, :_one, :_many, :_serializer].freeze
+    DSLS = [:_attributes, :_serializer].freeze
     def self.included(base)
       base.class_eval do
         # Initialize
@@ -29,42 +29,24 @@ module Alba
 
       def serialize(with: nil)
         serializer = case with
+                     when nil
+                       @_serializer || Alba::Serializers::DefaultSerializer
                      when ->(obj) { obj.is_a?(Class) && obj <= Alba::Serializer }
                        with
                      when Symbol
                        const_get(with.to_s.capitalize)
                      when String
                        const_get(with)
-                     when nil
-                       @_serializer || Alba::Serializers::DefaultSerializer
                      end
         serializer.new(serializable_hash).serialize
       end
 
       def serializable_hash
-        attrs.merge(ones).merge(manies)
-      end
-      alias to_hash serializable_hash
-
-      private
-
-      def attrs
         @_attributes.transform_values do |attribute|
           attribute.to_hash(@_resource)
-        end || {}
-      end
-
-      def ones
-        @_one.transform_values do |one|
-          one.to_hash(@_resource)
-        end || {}
-      end
-
-      def manies
-        @_many.transform_values do |many|
-          many.to_hash(@_resource)
-        end || {}
+        end
       end
+      alias to_hash serializable_hash
     end
 
     # Class methods
@@ -86,11 +68,11 @@ module Alba
       end
 
       def one(name, resource: nil, &block)
-        @_one[name.to_sym] = One.new(name: name, resource: resource, &block)
+        @_attributes[name.to_sym] = One.new(name: name, resource: resource, &block)
       end
 
       def many(name, resource: nil, &block)
-        @_many[name.to_sym] = Many.new(name: name, resource: resource, &block)
+        @_attributes[name.to_sym] = Many.new(name: name, resource: resource, &block)
       end
 
       def serializer(name)

data/lib/alba/version.rb

@@ -1,3 +1,3 @@
 module Alba
-  VERSION = '0.2.0'.freeze
+  VERSION = '0.3.0'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: alba
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - OKURA Masafumi
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2020-07-25 00:00:00.000000000 Z
+date: 2020-07-26 00:00:00.000000000 Z
 dependencies: []
 description: Fast and flexible JSON serializer
 email: