alba 0.5.0 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 89b4df7ce18a63e20cee9e87bd2855ef9c4735c4f6e4e1ef55433c5ba0a2fbd0
-  data.tar.gz: 63fa94fa17cdf3f5bfeef5f2e7b0d6efeec1fd06ad8d5386fb389fea3db0343a
+  metadata.gz: efa21967c65ad6880f19fbb2ec2fd795ed1b71f477084056068b23984df60834
+  data.tar.gz: 556f95a3ad12a7fdc591f8b7e336a7bc2d6c4b99710198f9bdc4e36b1389e0d2
 SHA512:
-  metadata.gz: 063d913715faa3917df5658d798ceb1619b9a2aef1dc0875c92c1592b3d3f9025bec60a364ebe0d54fb0769e18ba78f5786caa288159d304dfeca7ab00149d2b
-  data.tar.gz: 66aed62d355cd6fd8527ad4da27c53c9c42bf98606586a562b84dc377e6041125653d9669cf77c14427b4a1796b6c7abd7e6b2861323bac51fde28bfe05a7e7a
+  metadata.gz: 9f2bc512373e64a1ecda15c5797a5e9a1944f9fdc2a81f34f4af063d54c288fa53710bba9645fdbdec922b2642491bf0983830b7b806c3e6706099d48ed31c29
+  data.tar.gz: 99c355f1ad8d2c26786b79d3f7889ac00b08444f72352a14f300eb25049efbe81792242d48c0c9bf760e5bce3e93d61f408a99ac38a93a252ca55954c0880162

data/Gemfile

@@ -5,6 +5,7 @@ gemspec
 
 gem 'coveralls', require: false
 gem 'minitest', '~> 5.0'
+gem 'oj', '~> 3.10'
 gem 'rake', '~> 13.0'
 gem 'rubocop', '>= 0.79.0', require: false
 gem 'rubocop-performance', '~> 1.7.1', require: false

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    alba (0.5.0)
+    alba (0.6.0)
 
 GEM
   remote: https://rubygems.org/
@@ -16,6 +16,7 @@ GEM
     docile (1.3.2)
     json (2.3.1)
     minitest (5.14.1)
+    oj (3.10.8)
     parallel (1.19.2)
     parser (2.7.1.4)
       ast (~> 2.4.1)
@@ -59,6 +60,7 @@ DEPENDENCIES
   alba!
   coveralls
   minitest (~> 5.0)
+  oj (~> 3.10)
   rake (~> 13.0)
   rubocop (>= 0.79.0)
   rubocop-performance (~> 1.7.1)

data/lib/alba.rb

@@ -10,6 +10,7 @@ module Alba
 
   class << self
     attr_reader :backend
+    attr_accessor :default_serializer
 
     def backend=(backend)
       @backend = backend&.to_sym
@@ -20,6 +21,7 @@ module Alba
 
       resource_class.class_eval(&block)
       resource = resource_class.new(object)
+      with ||= @default_serializer
       resource.serialize(with: with)
     end
 

data/lib/alba/resource.rb

@@ -7,12 +7,17 @@ require 'alba/serializers/default_serializer'
 module Alba
   # This module represents what should be serialized
   module Resource
-    DSLS = [:_attributes, :_serializer].freeze
+    DSLS = [:_attributes, :_serializer, :_key].freeze
     def self.included(base)
       base.class_eval do
         # Initialize
         DSLS.each do |name|
-          initial = name == :_serializer ? nil : {}
+          initial = case name
+                    when :_attributes
+                      {}
+                    when :_serializer, :_name
+                      nil
+                    end
           instance_variable_set("@#{name}", initial) unless instance_variable_defined?("@#{name}")
         end
       end
@@ -38,16 +43,21 @@ module Alba
                      else
                        raise ArgumentError, 'Unexpected type for with, possible types are Class or Proc'
                      end
-        serializer.new(serializable_hash).serialize
+        serializer.new(self).serialize
       end
 
-      def serializable_hash
-        @_attributes.transform_values do |attribute|
+      def serializable_hash(with_key: true)
+        serializable_hash = @_attributes.transform_values do |attribute|
           attribute.to_hash(@_resource)
         end
+        with_key && @_key ? {@_key => serializable_hash} : serializable_hash
       end
       alias to_hash serializable_hash
 
+      def key
+        @_key || self.class.name.delete_suffix('Resource').downcase.gsub(/:{2}/, '_').to_sym
+      end
+
       private
 
       def inline_extended_serializer(with)
@@ -86,6 +96,10 @@ module Alba
       def serializer(name)
         @_serializer = name <= Alba::Serializer ? name : nil
       end
+
+      def key(key)
+        @_key = key.to_sym
+      end
     end
   end
 end

data/lib/alba/serializer.rb

@@ -1,6 +1,5 @@
 module Alba
   # This module represents how a resource should be serialized.
-  #
   module Serializer
     def self.included(base)
       base.include InstanceMethods
@@ -10,22 +9,27 @@ module Alba
     # Instance methods
     module InstanceMethods
       def initialize(resource)
-        @_resource = resource
         @_opts = self.class._opts || {}
-        key = @_opts[:key]
-        @_resource = {key.to_sym => @_resource} if key
+        key = case @_opts[:key]
+              when true
+                resource.key
+              else
+                @_opts[:key]
+              end
+        @hash = resource.serializable_hash(with_key: false)
+        @hash = {key.to_sym => @hash} if key
       end
 
       def serialize
         fallback = lambda do
           require 'json'
-          JSON.dump(@_resource)
+          JSON.dump(@hash)
         end
         case Alba.backend
         when :oj
           begin
             require 'oj'
-            -> { Oj.dump(@_resource, mode: :strict) }
+            -> { Oj.dump(@hash, mode: :strict) }
           rescue LoadError
             fallback
           end

data/lib/alba/version.rb

@@ -1,3 +1,3 @@
 module Alba
-  VERSION = '0.5.0'.freeze
+  VERSION = '0.6.0'.freeze
 end

metadata

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