alba 1.6.0 → 2.0.1

data/lib/alba.rb

@@ -7,9 +7,9 @@ require_relative 'alba/deprecation'
 # Core module
 module Alba
   class << self
-    attr_reader :backend, :encoder, :inferring, :_on_error, :_on_nil, :transforming_root_key
+    attr_reader :backend, :encoder, :inferring
 
-    # Accessor for inflector, a module responsible for incflecting strings
+    # Accessor for inflector, a module responsible for inflecting strings
     attr_accessor :inflector
 
     # Set the backend, which actually serializes object into JSON
@@ -38,17 +38,15 @@ module Alba
     # Serialize the object with inline definitions
     #
     # @param object [Object] the object to be serialized
-    # @param key [Symbol, nil, true] DEPRECATED, use root_key instead
     # @param root_key [Symbol, nil, true]
     # @param block [Block] resource block
     # @return [String] serialized JSON string
     # @raise [ArgumentError] if block is absent or `with` argument's type is wrong
-    def serialize(object, key: nil, root_key: nil, &block)
-      Alba::Deprecation.warn '`key` option to `serialize` method is deprecated, use `root_key` instead.' if key
+    def serialize(object, root_key: nil, &block)
       klass = block ? resource_class(&block) : infer_resource_class(object.class.name)
 
       resource = klass.new(object)
-      resource.serialize(root_key: root_key || key)
+      resource.serialize(root_key: root_key)
     end
 
     # Enable inference for key and resource name
@@ -56,11 +54,7 @@ module Alba
     # @param with [Symbol, Class, Module] inflector
     #   When it's a Symbol, it sets inflector with given name
     #   When it's a Class or a Module, it sets given object to inflector
-    def enable_inference!(with: :default)
-      if with == :default
-        Alba::Deprecation.warn 'Calling `enable_inference!` without `with` keyword argument is deprecated. Pass `:active_support` to keep current behavior.'
-      end
-
+    def enable_inference!(with:)
       @inflector = inflector_from(with)
       @inferring = true
     end
@@ -70,54 +64,12 @@ module Alba
       @inferring = false
     end
 
-    # Set error handler
-    #
-    # @param [Symbol] handler
-    # @param [Block]
-    # @raise [ArgumentError] if both handler and block params exist
-    # @raise [ArgumentError] if both handler and block params don't exist
-    # @deprecated Use `Resource.on_error` instead
-    # @return [void]
-    def on_error(handler = nil, &block)
-      Alba::Deprecation.warn '`Alba.on_error` is deprecated, use `on_error` on resource class instead.'
-      raise ArgumentError, 'You cannot specify error handler with both Symbol and block' if handler && block
-      raise ArgumentError, 'You must specify error handler with either Symbol or block' unless handler || block
-
-      @_on_error = handler || block
-    end
-
-    # Set nil handler
-    #
-    # @param block [Block]
-    # @return [void]
-    # @deprecated Use `Resource.on_nil` instead
-    def on_nil(&block)
-      Alba::Deprecation.warn '`Alba.on_nil` is deprecated, use `on_nil` on resource class instead.'
-      @_on_nil = block
-    end
-
-    # Enable root key transformation
-    #
-    # @deprecated Use `Resource.transform_keys` with `root` option instead
-    def enable_root_key_transformation!
-      Alba::Deprecation.warn '`Alba.enable_root_key_transformation!` is deprecated, use `transform_keys` on resource class instead.'
-      @transforming_root_key = true
-    end
-
-    # Disable root key transformation
-    #
-    # @deprecated Use `Resource.transform_keys` with `root` option instead
-    def disable_root_key_transformation!
-      Alba::Deprecation.warn '`Alba.disable_root_key_transformation!` is deprecated, use `transform_keys` on resource class instead.'
-      @transforming_root_key = false
-    end
-
     # @param block [Block] resource body
     # @return [Class<Alba::Resource>] resource class
     def resource_class(&block)
       klass = Class.new
       klass.include(Alba::Resource)
-      klass.class_eval(&block)
+      klass.class_eval(&block) if block
       klass
     end
 
@@ -137,7 +89,6 @@ module Alba
       @encoder = default_encoder
       @_on_error = :raise
       @_on_nil = nil
-      @transforming_root_key = false # TODO: This will be true since 2.0
     end
 
     private
@@ -159,6 +110,7 @@ module Alba
       @encoder = case @backend
                  when :oj, :oj_strict then try_oj
                  when :oj_rails then try_oj(mode: :rails)
+                 when :oj_default then try_oj(mode: :default)
                  when :active_support then try_active_support
                  when nil, :default, :json then default_encoder
                  else
@@ -168,7 +120,12 @@ module Alba
 
     def try_oj(mode: :strict)
       require 'oj'
-      ->(hash) { Oj.dump(hash, mode: mode) }
+      case mode
+      when :default
+        ->(hash) { Oj.dump(hash) }
+      else
+        ->(hash) { Oj.dump(hash, mode: mode) }
+      end
     rescue LoadError
       Kernel.warn '`Oj` is not installed, falling back to default JSON encoder.'
       default_encoder
@@ -184,7 +141,7 @@ module Alba
 
     def default_encoder
       lambda do |hash|
-        JSON.dump(hash)
+        JSON.generate(hash)
       end
     end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: alba
 version: !ruby/object:Gem::Version
-  version: 1.6.0
+  version: 2.0.1
 platform: ruby
 authors:
 - OKURA Masafumi
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-03-15 00:00:00.000000000 Z
+date: 2022-11-02 00:00:00.000000000 Z
 dependencies: []
 description: Alba is the fastest JSON serializer for Ruby. It focuses on performance,
   flexibility and usability.
@@ -18,6 +18,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".codeclimate.yml"
 - ".github/ISSUE_TEMPLATE/bug_report.md"
 - ".github/ISSUE_TEMPLATE/feature_request.md"
 - ".github/dependabot.yml"
@@ -29,12 +30,15 @@ files:
 - ".yardopts"
 - CHANGELOG.md
 - CODE_OF_CONDUCT.md
+- CONTRIBUTING.md
 - Gemfile
+- HACKING.md
 - LICENSE.txt
 - README.md
 - Rakefile
 - SECURITY.md
 - alba.gemspec
+- benchmark/README.md
 - benchmark/collection.rb
 - benchmark/single_resource.rb
 - bin/console
@@ -42,19 +46,25 @@ files:
 - codecov.yml
 - docs/migrate_from_active_model_serializers.md
 - docs/migrate_from_jbuilder.md
-- gemfiles/all.gemfile
+- docs/rails.md
 - gemfiles/without_active_support.gemfile
 - gemfiles/without_oj.gemfile
 - lib/alba.rb
 - lib/alba/association.rb
+- lib/alba/conditional_attribute.rb
+- lib/alba/constants.rb
 - lib/alba/default_inflector.rb
 - lib/alba/deprecation.rb
 - lib/alba/errors.rb
+- lib/alba/layout.rb
+- lib/alba/nested_attribute.rb
 - lib/alba/resource.rb
 - lib/alba/typed_attribute.rb
 - lib/alba/version.rb
+- logo/alba-card.png
+- logo/alba-sign.png
+- logo/alba-typography.png
 - script/perf_check.rb
-- sider.yml
 homepage: https://github.com/okuramasafumi/alba
 licenses:
 - MIT
@@ -72,14 +82,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.5.0
+      version: 2.6.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.5
+rubygems_version: 3.3.21
 signing_key:
 specification_version: 4
 summary: Alba is the fastest JSON serializer for Ruby.

data/gemfiles/all.gemfile

@@ -1,20 +0,0 @@
-source 'https://rubygems.org'
-
-gem 'activesupport', require: false # For backend
-gem 'dry-inflector', require: false # For inflector
-gem 'ffaker', require: false # For testing
-gem 'minitest', '~> 5.14' # For test
-gem 'rake', '~> 13.0' # For test and automation
-gem 'rubocop', '>= 0.79.0', require: false # For lint
-gem 'rubocop-minitest', '~> 0.11.0', require: false # For lint
-gem 'rubocop-performance', '~> 1.10.1', 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 'simplecov', '~> 0.21.0', require: false # For test coverage
-gem 'simplecov-cobertura', require: false # For test coverage
-gem 'yard', require: false # For documentation
-
-platforms :ruby do
-  gem 'oj', '~> 3.11', require: false # For backend
-  gem 'ruby-prof', require: false # For performance profiling
-end

data/sider.yml

@@ -1,60 +0,0 @@
-linter:
-# # https://help.sider.review/getting-started/custom-configuration
-
-#   # https://help.sider.review/tools/ruby/rubocop
-  rubocop:
-    gems:
-      - "rubocop-minitest"
-      - "rubocop-performance"
-      - "rubocop-sensible"
-      - "rubocop-rake"
-    safe: false
-
-#   # https://help.sider.review/tools/ruby/reek
-#   reek:
-#     gems:
-#       - name: "reek"
-#         version: "5.2.0"
-#     target:
-#       - lib/
-#       - test/
-#     config: config/.reek.yml
-
-#   # https://help.sider.review/tools/ruby/querly
-#   querly:
-#     gems:
-#       - "slim"
-
-#   # https://help.sider.review/tools/others/misspell
-#   misspell:
-#     exclude:
-#       - vendor
-#       - "**/*.min.js"
-#       - exclude_file.rb
-#     targets:
-#       - target_directory
-#       - another_target_directory/foo.rb
-#       - bar.rb
-#     locale: UK
-#     ignore: center,behavior
-
-#   # https://help.sider.review/tools/shellscript/shellcheck
-#   shellcheck:
-#     target: "src/**/*.{sh,bash}"
-#     include: "SC2104,SC2105"
-#     exclude: "SC1000,SC1118"
-#     enable: "all"
-#     shell: "bash"
-#     severity: "error"
-#     norc: true
-
-# # https://help.sider.review/getting-started/custom-configuration#ignore
-ignore:
-  - 'test/**/*'
-
-# # https://help.sider.review/getting-started/custom-configuration#branchesexclude
-# branches:
-#   exclude:
-#     - master
-#     - development
-#     - /^release-.*$/