active_serialize 2.3.0 → 2.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA256:
-  metadata.gz: c849c25a25fa9fefa132e1087b7aad46a7282d2a8257a3bb8fc58cf1b82752ab
-  data.tar.gz: dbc355538fcb2d836b6c3efcc6fe6a46ce6b21645255ab5d60124153ad587c38
+SHA1:
+  metadata.gz: 3d9b2859163166929c779368b00c17271635964c
+  data.tar.gz: 6ecb6dc7d235f89b2e95eaf382c84b72cc6dfc0e
 SHA512:
-  metadata.gz: 53931320e6446ada93e5c4dcfae310f8844a3ade90f754a337e11e6c74395c92d93affcceb0a398f325974ebf31b01d4c864b23190d02e04ff99e61f79368a93
-  data.tar.gz: afd509fc0026f7a00a31cbcf9f22d11b4e004f633092f1f535041b4fd9eed6094070c09d0fb3d1ab366891c430e98ecc9d47bfdcdf8987738e13fadfcbaaeb1e
+  metadata.gz: 192b5263921799f1a0acaa837a006b780a9939572d67d8cf3cec783b549358bc122276776668f988f3cf8e5f1b186c8e21358608b85ff24ea6a0a8a551f321ed
+  data.tar.gz: 8036dd8ceb1d21917b6e282c27fc512cce92e3717774d032e04eca05da97d206e2ad91eade924a250f7957d9224c90c93ef4126d2953ffcbc9b55c373642c9b5

data/lib/active_serialize.rb

@@ -5,21 +5,24 @@ require 'active_record'
 require 'active_serialize/version'
 require 'active_serialize/key_formatter'
 require 'active_serialize/class_methods'
+require 'active_serialize/relation'
 
 module ActiveSerialize
   extend ActiveSupport::Concern
   cattr_accessor :configs, default: { default: { rmv: [ ], add: [ ], key_format: nil } }
 
   class_methods do
-    def active_serialize rmv: [ ], add: [ ], recursive: [ ], **configs
+    def active_serialize rmv: [ ], add: [ ], recursive: [ ], pluck: [ ], **configs
       extend   ClassMethods
       include  ToH
+      ::ActiveRecord::Relation.include Relation
       delegate :active_serialize_keys, :_active_serialize, to: self
 
       _active_serialize.merge!(configs)
       active_serialize_rmv *Array(rmv)
       active_serialize_add *Array(add)
-      active_serialize_add *Array(recursive), recursive: true
+      active_serialize_add *Array(recursive), to: :recursive
+      active_serialize_add *Array(pluck), to: :pluck
     end
 
     def active_serialize_default **args
@@ -28,13 +31,14 @@ module ActiveSerialize
   end
 
   module ToH
-    def to_h(*groups, rmv: [ ], add: [ ], merge: { })
-      tran_key = ->(key) { _active_serialize[:map][key] || key }
-      recursion = _active_serialize[:recursive].map { |key| [ tran_key.(key), public_send(key)&.to_ha ] }.to_h
+    def to_h(*groups, rmv: [ ], add: [ ], recursive: [ ], plucked: { }, merge: { })
+      tran_key  = ->(key) { (_active_serialize[:map][key] || key).to_s }
+      recursion = (_active_serialize[:recursive] + recursive).map { |k| [ k, public_send(k)&.to_ha ] }.to_h
+
       KeyFormatter.(_active_serialize[:key_format],
           active_serialize_keys(*groups, rmv: rmv, add: add)
-              .map { |key| [ tran_key.(key), public_send(key) ] }.to_h
-              .merge(merge).merge(recursion).deep_stringify_keys!
+              .map{ |key| [ tran_key.(key), public_send(key) ] }.to_h
+              .merge(plucked.merge(recursion).merge(merge).transform_keys(&tran_key))
       )
     end
 

data/lib/active_serialize/class_methods.rb

@@ -3,21 +3,25 @@
 module ActiveSerialize
   module ClassMethods
     def _active_serialize
-      ActiveSerialize.configs[name] ||= { **ActiveSerialize.configs[:default].deep_dup, final: nil, groups: { }, recursive: [ ], map: { } }
+      ActiveSerialize.configs[name] ||= {
+          **ActiveSerialize.configs[:default].deep_dup,
+          final: nil, groups: { }, recursive: [ ], map: { }, pluck: [ ]
+      }
     end
 
-    def to_ha(**args)
-      all.to_a.map { |record| record.to_h(**args) }
+    def to_ha(*args)
+      all.to_ha(*args)
     end
 
     def active_serialize_rmv *attrs
       _active_serialize[:rmv].concat attrs.map(&:to_sym)
     end
 
-    def active_serialize_add *attrs, named: nil, recursive: false, group: nil
+    # to: `recursive` or `pluck`
+    def active_serialize_add *attrs, named: nil, to: nil, group: nil
       active_serialize_map attrs[0] => named if named
       return _active_serialize[:groups][group] = attrs.map(&:to_sym) if group
-      _active_serialize[recursive ? :recursive : :add].concat attrs.map(&:to_sym)
+      _active_serialize[to || :add].concat attrs.map(&:to_sym)
     end
 
     def active_serialize_map **settings

data/lib/active_serialize/relation.rb

@@ -0,0 +1,26 @@
+# frozen_string_literal: true
+
+module ActiveSerialize
+  module Relation
+    def to_ha(pluck: [ ], plucked: nil, **args)
+      plucked ||=
+          if pluck.is_a?(Proc)
+            instance_eval(&pluck)
+          else
+            (_active_serialize[:pluck] + pluck).map { |key| [ key, instance_eval(&method(key)) ] }.to_h
+          end
+
+      if plucked.present?
+        each_with_index.map do |record, i|
+          record.to_h(plucked: plucked.each_key.map { |k| [ k, plucked[k][i] ] }.to_h, **args)
+        end
+      else
+        map { |record| record.to_h(**args) }
+      end
+    end
+
+    def with_ha(*args)
+      return to_ha(*args), self
+    end
+  end
+end

data/lib/active_serialize/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module ActiveSerialize
-  VERSION = '2.3.0'
+  VERSION = '2.4.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: active_serialize
 version: !ruby/object:Gem::Version
-  version: 2.3.0
+  version: 2.4.0
 platform: ruby
 authors:
 - zhandao
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-02-10 00:00:00.000000000 Z
+date: 2019-03-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -185,6 +185,7 @@ files:
 - lib/active_serialize.rb
 - lib/active_serialize/class_methods.rb
 - lib/active_serialize/key_formatter.rb
+- lib/active_serialize/relation.rb
 - lib/active_serialize/version.rb
 homepage: https://github.com/ikkiuchi/active_serialize
 licenses:
@@ -206,7 +207,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.3
+rubygems_version: 2.6.12
 signing_key: 
 specification_version: 4
 summary: Provide a very simple way to transform ActiveRecord data into Hash output.