alba 0.11.1 → 0.12.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9aae01860e12e1e5fd71f066e8772fb3a80b4aec6e99cf9dd55ad8652896ea24
-  data.tar.gz: c9930853dcaaa5ea2ff28e954c3b0d7e2ba559efc64b82e7da6b0c28968f55ed
+  metadata.gz: ee2f8d482fedb98083c2acab37b425c7ecedb429ab7bae7698b4eea7949635d9
+  data.tar.gz: 1a44f23d425072253ba6743e18c6da9d8fa81de448b58720848c4e9667b12bfb
 SHA512:
-  metadata.gz: 7882b0950c339f87fc75b19e79bcdc2481a296331e9be47a646db997fa4db5639af31c49d529063d099cd5df405357d245397af23b0038c568e32feb86bd5718
-  data.tar.gz: 2bc8c03f0ca5049a23b7dd5c2f6582051f98296a0ba9e0a436e08e9a426a53896e7ac94af276cc3a82e5a0a253f30d381db5384e483c77918ff3d5ef9165a1b7
+  metadata.gz: 9bf421fcd99f06cb56499ee31c88dda019e004c58a1880c03326f2a1ce395f7dc4b64be7cee012169c7039530194e85a312b3c53d964b1aaf5288cdf8cb78ae4
+  data.tar.gz: 02f20dd839f72f9d2c1859b48470595fff263939f41421e240d74452677edae2dc0569078823984144f630cbc2e6000b6ac3bd0d4161a9ef65bd95dbf311294f

data/.rubocop.yml

@@ -6,6 +6,7 @@ inherit_gem:
 require:
   - rubocop-minitest
   - rubocop-performance
+  - rubocop-rake
 
 AllCops:
   Exclude:

data/Gemfile

@@ -6,10 +6,11 @@ gemspec
 gem 'activesupport', require: false # For backend
 gem 'coveralls', require: false # For test coverage
 gem 'minitest', '~> 5.14' # For test
-gem 'oj', '~> 3.10', platform: :ruby, require: false # For backend
+gem 'oj', '~> 3.11', platform: :ruby, require: false # For backend
 gem 'rake', '~> 13.0' # For test and automation
 gem 'rubocop', '>= 0.79.0', require: false # For lint
-gem 'rubocop-minitest', '~> 0.10.1', require: false # For lint
-gem 'rubocop-performance', '~> 1.7.1', require: false # For lint
+gem 'rubocop-minitest', '~> 0.10.3', require: false # For lint
+gem 'rubocop-performance', '~> 1.9.2', require: false # For lint
+gem 'rubocop-rake', '>= 0.5.1', require: false # For lint
 gem 'rubocop-sensible', '~> 0.3.0', require: false # For lint
 gem 'yard', require: false

data/Gemfile.lock

@@ -1,19 +1,19 @@
 PATH
   remote: .
   specs:
-    alba (0.11.1)
+    alba (0.12.0)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (6.0.3.2)
+    activesupport (6.1.1)
       concurrent-ruby (~> 1.0, >= 1.0.2)
-      i18n (>= 0.7, < 2)
-      minitest (~> 5.1)
-      tzinfo (~> 1.1)
-      zeitwerk (~> 2.2, >= 2.2.2)
+      i18n (>= 1.6, < 2)
+      minitest (>= 5.1)
+      tzinfo (~> 2.0)
+      zeitwerk (~> 2.3)
     ast (2.4.1)
-    concurrent-ruby (1.1.6)
+    concurrent-ruby (1.1.7)
     coveralls (0.8.23)
       json (>= 1.8, < 3)
       simplecov (~> 0.16.1)
@@ -21,36 +21,39 @@ GEM
       thor (>= 0.19.4, < 2.0)
       tins (~> 1.6)
     docile (1.3.2)
-    i18n (1.8.5)
+    i18n (1.8.7)
       concurrent-ruby (~> 1.0)
     json (2.3.1)
-    minitest (5.14.2)
-    oj (3.10.13)
-    parallel (1.19.2)
-    parser (2.7.1.4)
+    minitest (5.14.3)
+    oj (3.11.0)
+    parallel (1.20.1)
+    parser (3.0.0.0)
       ast (~> 2.4.1)
     rainbow (3.0.0)
-    rake (13.0.1)
-    regexp_parser (1.7.1)
+    rake (13.0.3)
+    regexp_parser (2.0.3)
     rexml (3.2.4)
-    rubocop (0.90.0)
+    rubocop (1.8.1)
       parallel (~> 1.10)
-      parser (>= 2.7.1.1)
+      parser (>= 3.0.0.0)
       rainbow (>= 2.2.2, < 4.0)
-      regexp_parser (>= 1.7)
+      regexp_parser (>= 1.8, < 3.0)
       rexml
-      rubocop-ast (>= 0.3.0, < 1.0)
+      rubocop-ast (>= 1.2.0, < 2.0)
       ruby-progressbar (~> 1.7)
-      unicode-display_width (>= 1.4.0, < 2.0)
-    rubocop-ast (0.3.0)
-      parser (>= 2.7.1.4)
-    rubocop-minitest (0.10.1)
-      rubocop (>= 0.87)
-    rubocop-performance (1.7.1)
-      rubocop (>= 0.82.0)
+      unicode-display_width (>= 1.4.0, < 3.0)
+    rubocop-ast (1.4.0)
+      parser (>= 2.7.1.5)
+    rubocop-minitest (0.10.3)
+      rubocop (>= 0.87, < 2.0)
+    rubocop-performance (1.9.2)
+      rubocop (>= 0.90.0, < 2.0)
+      rubocop-ast (>= 0.4.0)
+    rubocop-rake (0.5.1)
+      rubocop
     rubocop-sensible (0.3.0)
       rubocop (>= 0.60.0)
-    ruby-progressbar (1.10.1)
+    ruby-progressbar (1.11.0)
     simplecov (0.16.1)
       docile (~> 1.1)
       json (>= 1.8, < 3)
@@ -60,14 +63,13 @@ GEM
     term-ansicolor (1.7.1)
       tins (~> 1.0)
     thor (1.0.1)
-    thread_safe (0.3.6)
     tins (1.25.0)
       sync
-    tzinfo (1.2.7)
-      thread_safe (~> 0.1)
-    unicode-display_width (1.7.0)
-    yard (0.9.25)
-    zeitwerk (2.4.0)
+    tzinfo (2.0.4)
+      concurrent-ruby (~> 1.0)
+    unicode-display_width (2.0.0)
+    yard (0.9.26)
+    zeitwerk (2.4.2)
 
 PLATFORMS
   ruby
@@ -77,13 +79,14 @@ DEPENDENCIES
   alba!
   coveralls
   minitest (~> 5.14)
-  oj (~> 3.10)
+  oj (~> 3.11)
   rake (~> 13.0)
   rubocop (>= 0.79.0)
-  rubocop-minitest (~> 0.10.1)
-  rubocop-performance (~> 1.7.1)
+  rubocop-minitest (~> 0.10.3)
+  rubocop-performance (~> 1.9.2)
+  rubocop-rake (>= 0.5.1)
   rubocop-sensible (~> 0.3.0)
   yard
 
 BUNDLED WITH
-   2.1.4
+   2.2.6

data/lib/alba.rb

@@ -6,6 +6,7 @@ require_relative 'alba/resource'
 module Alba
   # Base class for Errors
   class Error < StandardError; end
+
   # Error class for backend which is not supported
   class UnsupportedBackend < Error; end
 
@@ -78,9 +79,9 @@ module Alba
 
     def resource_class
       @resource_class ||= begin
-                             klass = Class.new
-                             klass.include(Alba::Resource)
-                           end
+        klass = Class.new
+        klass.include(Alba::Resource)
+      end
     end
   end
 

data/lib/alba/resource.rb

@@ -141,6 +141,7 @@ module Alba
       def one(name, condition = nil, resource: nil, key: nil, &block)
         @_attributes[key&.to_sym || name.to_sym] = One.new(name: name, condition: condition, resource: resource, &block)
       end
+      alias has_one one
 
       # Set Many association
       #
@@ -153,6 +154,7 @@ module Alba
       def many(name, condition = nil, resource: nil, key: nil, &block)
         @_attributes[key&.to_sym || name.to_sym] = Many.new(name: name, condition: condition, resource: resource, &block)
       end
+      alias has_many many
 
       # Set serializer for the resource
       #

data/lib/alba/serializer.rb

@@ -23,7 +23,9 @@ module Alba
         @hash = resource.serializable_hash
         @hash = {key.to_sym => @hash} if key
         # @hash is either Hash or Array
-        @hash.is_a?(Hash) ? @hash.merge!(metadata.to_h) : @hash << metadata
+        unless metadata.empty?
+          @hash.is_a?(Hash) ? @hash.merge!(metadata.to_h) : @hash << metadata
+        end
       end
 
       # Use real encoder to actually serialize to JSON

data/lib/alba/version.rb

@@ -1,3 +1,3 @@
 module Alba
-  VERSION = '0.11.1'.freeze
+  VERSION = '0.12.0'.freeze
 end

data/sider.yml

@@ -7,6 +7,7 @@ linter:
       - "rubocop-minitest"
       - "rubocop-performance"
       - "rubocop-sensible"
+      - "rubocop-rake"
     safe: false
 
 #   # https://help.sider.review/tools/ruby/reek

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: alba
 version: !ruby/object:Gem::Version
-  version: 0.11.1
+  version: 0.12.0
 platform: ruby
 authors:
 - OKURA Masafumi
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2020-09-02 00:00:00.000000000 Z
+date: 2021-01-20 00:00:00.000000000 Z
 dependencies: []
 description: Alba is designed to be a simple, easy to use and fast alternative to
   existing JSON serializers. Its performance is better than almost all gems which
@@ -62,7 +62,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.4
+rubygems_version: 3.0.3
 signing_key:
 specification_version: 4
 summary: Alba is the fastest JSON serializer for Ruby.