bright_serializer 0.2.3 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 77aa6c33f823a9f96b4d8a73fac9f7a87cf7892431d6e0f3cd1186b9da9fdf6b
-  data.tar.gz: b9820f01f3cf1d5d86588741b0f7af93521c4b55c5dc7352940b3cb1bebdc3e7
+  metadata.gz: 14d3fd3a7bdf72b5aa371e64a7e7b9d493b808734a8b00d775acaf86d1e3b559
+  data.tar.gz: cddb984181ac63722748a9196f6f5b9cee6c4102afe8da78ab03ba14732e68b0
 SHA512:
-  metadata.gz: 2093dc003212c566476fb83ebb95cc0e9951e5652d0e4a0e1ee667a110581c09cf48ea6170948d3636792f70fa7c10be8acc5f1ff068d567c51fee81fa87235b
-  data.tar.gz: f1163513f3b3d2085f13165fd9f9f29712a9f2cab7486c8041daa7fb04d6719dc102df7fea428451c14eb7ff8677c7bde0c62f8ba4d64f0cef0262e7604387bd
+  metadata.gz: b66d065bce918b1ae112a5338188f314f7c419549ee25b385eb343f436a3d1a623397986f76a642c276109048d40f4b7957623b28ff421addcbe1336218dceec
+  data.tar.gz: '08a8226f13ad37cef36113bdeb373b4ba76b7b44881726feccfcbcacdeddc5651b58e5fcd0709c358cbdf3fc54922844b9d561cfbfe1cd62f32d232c171cc611'

data/.rubocop.yml

@@ -33,4 +33,7 @@ Metrics/CyclomaticComplexity:
   Enabled: false
 
 Metrics/AbcSize:
-  Enabled: false
+  Enabled: false
+
+RSpec/NestedGroups:
+  Enabled: false

data/CHANGELOG.md

@@ -2,7 +2,20 @@
 
 ## master (unreleased)
 
-* Your contribution
+## 0.3.0 (2022-05-26)
+
+* Allow to evaluate entity values with a callable lambda. ([#88](https://github.com/petalmd/bright_serializer/pull/88))
+* Fix `FrozenError (can't modify frozen Array)` when parsing entity. ([#83](https://github.com/petalmd/bright_serializer/pull/83))
+* Added the support to use instance methods from a serializer class in the library ([#85](https://github.com/petalmd/bright_serializer/pull/85))
+* Use real coveralls_reborn gem
+
+## 0.2.5 (2021-03-08)
+
+* When serializing an Hash, check present of the key before trying string ([#57](https://github.com/petalmd/bright_serializer/pull/57))
+
+## 0.2.4 (2021-02-19)
+
+* Try symbol and string keys when the object to serialize is an Hash ([#54](https://github.com/petalmd/bright_serializer/pull/54))
 
 ## 0.2.3 (2021-01-04)
 
@@ -25,7 +38,7 @@
 * Define entity in serializer for grape_swagger ([#9](https://github.com/petalmd/bright_serializer/pull/9))
 
 ## 0.1.1 (2020-07-13)
- 
+
 * Add description in gemspec file
 * Add content in CHANGELOG.md
 

data/Gemfile

@@ -10,6 +10,7 @@ gemspec
 gem 'oj', require: false
 
 group :test do
+  gem 'coveralls_reborn', require: false
   gem 'faker'
   gem 'rubocop'
   gem 'rubocop-performance'

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    bright_serializer (0.2.3)
+    bright_serializer (0.3.0)
       oj (~> 3)
 
 GEM
@@ -9,12 +9,18 @@ GEM
   specs:
     ast (2.4.1)
     concurrent-ruby (1.1.7)
+    coveralls_reborn (0.22.0)
+      simplecov (>= 0.18.1, < 0.22.0)
+      term-ansicolor (~> 1.6)
+      thor (>= 0.20.3, < 2.0)
+      tins (~> 1.16)
     diff-lcs (1.4.4)
+    docile (1.4.0)
     faker (2.15.1)
       i18n (>= 1.6, < 2)
     i18n (1.8.5)
       concurrent-ruby (~> 1.0)
-    oj (3.10.18)
+    oj (3.11.1)
     parallel (1.20.1)
     parser (3.0.0.0)
       ast (~> 2.4.1)
@@ -53,6 +59,18 @@ GEM
       rubocop (~> 0.87)
       rubocop-ast (>= 0.7.1)
     ruby-progressbar (1.11.0)
+    simplecov (0.21.2)
+      docile (~> 1.1)
+      simplecov-html (~> 0.11)
+      simplecov_json_formatter (~> 0.1)
+    simplecov-html (0.12.3)
+    simplecov_json_formatter (0.1.3)
+    sync (0.5.0)
+    term-ansicolor (1.7.1)
+      tins (~> 1.0)
+    thor (1.1.0)
+    tins (1.29.1)
+      sync
     unicode-display_width (1.7.0)
 
 PLATFORMS
@@ -61,6 +79,7 @@ PLATFORMS
 DEPENDENCIES
   bright_serializer!
   bundler (~> 2)
+  coveralls_reborn
   faker
   oj
   rake (~> 13.0)

data/README.md

@@ -1,5 +1,6 @@
 [![Actions Status](https://github.com/petalmd/bright_serializer/workflows/Build/badge.svg)](https://github.com/petalmd/bright_serializer/actions?query=workflow%3ABuild)
 [![Gem Version](https://badge.fury.io/rb/bright_serializer.svg)](https://badge.fury.io/rb/bright_serializer)
+[![Coverage Status](https://coveralls.io/repos/github/petalmd/bright_serializer/badge.svg?branch=master)](https://coveralls.io/github/petalmd/bright_serializer?branch=master)
 
 # BrightSerializer
 
@@ -31,12 +32,12 @@ Create a class and include `BrightSerializer::Serializer`
 class AccountSerializer
   include BrightSerializer::Serializer
   attributes :id, :first_name, :last_name
-  
+
   # With a block
   attribute :name do |object|
     "#{object.first_name} #{object.last_name}"
   end
-  
+
   # With a block shorter
   attribute :created_at, &:to_s
 end
@@ -53,7 +54,7 @@ You can pass params to your serializer. For example to have more context with th
 class AccountSerializer
   include BrightSerializer::Serializer
   attributes :id, :first_name, :last_name
-  
+
   attribute :friend do |object, params|
     object.is_friend_with? params[:current_user]
   end
@@ -65,14 +66,14 @@ AccountSerializer.new(Account.first, params: { current_user: current_user }).to_
 
 ### Conditional Attributes
 
-Attribute can be remove from serialization by passing a `proc` to the option `if`. If the proc return `true` the attibute 
- will be serialize. `object` and `params` or accessible. 
+Attribute can be remove from serialization by passing a `proc` to the option `if`. If the proc return `true` the attibute
+ will be serialize. `object` and `params` or accessible.
 
 ```ruby
 class AccountSerializer
   include BrightSerializer::Serializer
   attributes :id, :first_name, :last_name
-  
+
   attribute :email, if: -> { |object, params| params[:current_user].is_admin? }
 end
 ```
@@ -118,7 +119,7 @@ end
 class AccountSerializer
   include BrightSerializer::Serializer
   attributes :id, :first_name, :last_name
-  
+
   attribute :friends do |object|
     FriendSerializer.new(object.friends)
   end
@@ -128,7 +129,7 @@ end
 ### Entity
 
 You can define the entity of your serializer to generate documentation with the option `entity`.
-The feature was build to work with [grape-swagger](https://github.com/ruby-grape/grape-swagger). 
+The feature was build to work with [grape-swagger](https://github.com/ruby-grape/grape-swagger).
 For more information about defining a model entity see the [Swagger documentation](https://swagger.io/specification/v2/?sbsearch=array%20response#schema-object).
 
 ```ruby
@@ -138,12 +139,37 @@ class AccountSerializer
   attribute :name
 
   attribute :friends,
-    entity: { 
+    entity: {
       type: :array, items: { ref: 'FriendSerializer' }, description: 'The list the account friends.'
      } do |object|
     FriendSerializer.new(object.friends)
   end
 end
+
+```
+Callable values are supported.
+
+```ruby
+{ entity: { type: :string, enum: -> { SomeModel::ENUMVALUES } } }
+```
+
+### Instance
+
+If you have defined instance methods inside your serializer you can access them inside block attribute.
+
+```ruby
+class AccountSerializer
+  include BrightSerializer::Serializer
+  attributes :id, :name
+
+  attribute :print do |object|
+    print_account(object)
+  end
+
+  def print_account(object)
+    "Account: #{object.name}"
+  end
+end
 ```
 
 ## Development

data/lib/bright_serializer/attribute.rb

@@ -14,14 +14,18 @@ module BrightSerializer
       @entity = entity ? Entity::Base.new(entity) : nil
     end
 
-    def serialize(object, params)
+    def serialize(serializer_instance, object, params)
       return unless object
 
       value =
         if @block
-          @block.arity.abs == 1 ? object.instance_eval(&@block) : object.instance_exec(object, params, &@block)
+          if @block.arity.abs == 1
+            serializer_instance.instance_exec(object, &@block)
+          else
+            serializer_instance.instance_exec(object, params, &@block)
+          end
         elsif object.is_a?(Hash)
-          object[key]
+          object.key?(key) ? object[key] : object[key.to_s]
         else
           object.send(key)
         end

data/lib/bright_serializer/entity/base.rb

@@ -14,8 +14,9 @@ module BrightSerializer
       end
 
       def to_h
-        Inflector.deep_transform_keys_in_object!(@definition) { |k| Inflector.camel_lower k.to_s }
+        @definition = Inflector.deep_transform_keys_in_object(@definition) { |k| Inflector.camel_lower k.to_s }
         parse_ref!
+        evaluate_callable!
         @definition
       end
 
@@ -28,6 +29,12 @@ module BrightSerializer
         object['$ref'] = relation
       end
 
+      def evaluate_callable!
+        @definition = Inflector.deep_transform_values_in_object(@definition) do |value|
+          value.respond_to?(:call) ? value.call : value
+        end
+      end
+
       def nested_hash(obj, key)
         if obj.respond_to?(:key?) && obj.key?(key)
           obj

data/lib/bright_serializer/inflector.rb

@@ -60,20 +60,30 @@ class Inflector
       end
     end
 
-    # File active_support/core_ext/hash/keys.rb, line 156
-    def deep_transform_keys_in_object!(object, &block)
+    # File active_support/core_ext/hash/keys.rb, line 116
+    def deep_transform_keys_in_object(object, &block)
       case object
       when Hash
-        object.keys.each do |key| # rubocop:disable Style/HashEachMethods
-          value = object.delete(key)
-          object[yield(key)] = deep_transform_keys_in_object!(value, &block)
+        object.each_with_object({}) do |(key, value), result|
+          result[yield(key)] = deep_transform_keys_in_object(value, &block)
         end
-        object
       when Array
-        object.map! { |e| deep_transform_keys_in_object!(e, &block) }
+        object.map { |e| deep_transform_keys_in_object(e, &block) }
       else
         object
       end
     end
+
+    # File active_support/core_ext/hash/deep_transform_values.rb, line 25
+    def deep_transform_values_in_object(object, &block)
+      case object
+      when Hash
+        object.transform_values { |value| deep_transform_values_in_object(value, &block) }
+      when Array
+        object.map { |e| deep_transform_values_in_object(e, &block) }
+      else
+        yield(object)
+      end
+    end
   end
 end

data/lib/bright_serializer/serializer.rb

@@ -28,7 +28,7 @@ module BrightSerializer
         next if @fields.any? && !@fields.include?(attribute.key)
         next unless attribute.condition?(object, @params)
 
-        result[attribute.transformed_key] = attribute.serialize(object, @params)
+        result[attribute.transformed_key] = attribute.serialize(self, object, @params)
       end
     end
 

data/lib/bright_serializer/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module BrightSerializer
-  VERSION = '0.2.3'
+  VERSION = '0.3.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bright_serializer
 version: !ruby/object:Gem::Version
-  version: 0.2.3
+  version: 0.3.0
 platform: ruby
 authors:
 - Jean-Francis Bastien
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-01-05 00:00:00.000000000 Z
+date: 2022-05-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: oj