userializer 0.1.5 → 0.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 97fa2e63cfd59d981e9a7f8eac172e31830d53ad572aaab8683e62fa26410d27
-  data.tar.gz: 1a6c4b3947dcbe65c7b915ef3f5538e68f0b35805860cd5eb2fe03d01e9b7299
+  metadata.gz: 2ff7b3083a1f53deccff3139fc8625c9ac17a313f07fd2f0b98ca912a8ef6d46
+  data.tar.gz: cf90d14d354b5dbcbd6bb1e9021860583b57adf2ff10bc599a8aa15e3c33531d
 SHA512:
-  metadata.gz: 1f58f0270860f307e07c2d80a8ee620e338e75db06316e1fedd0f7f916c1cafa96122363b5ff7c775cdc2376483718ca07aa84264a284546d4f9bc72c1e373ab
-  data.tar.gz: '0539527fde035a912a6c97dc1e25d83a49e2a1ada7a30ee9df93f890e7e9d5b76e7b120f88704a2b37f2b9dbaa9c170c4229aeb33f602bb4d4a104c9b4419e7c'
+  metadata.gz: 140ffbbe09cd46455c97fcc5e9d36b6adb9f7cca28b21b0c4231f316d887125fd131b0e8046e49c3bea1c1a6719ba3e99c8bb143d5e2d127a5e7ef6843e659c2
+  data.tar.gz: fc5b3c983c81bedd8807c38a41a0bf323ad5597eaacbfa4c64a618744c092bf9e252f6129dc88fb0c5c2c5f1715bee6271b6e8cbf21f86eb0d8889ca53624aed

data/.circleci/config.yml

@@ -0,0 +1,18 @@
+version: 2
+jobs:
+  run_tests:
+    docker:
+      - image: circleci/ruby:2.4.1
+
+    working_directory: ~/userializer
+
+    steps:
+      - checkout
+      - run: bundle install --path=vendor/bundle
+      - run: bundle exec rspec --color --require spec_helper --format progress spec
+
+workflows:
+  version: 2
+  test:
+    jobs:
+      - run_tests

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    userializer (0.1.5)
+    userializer (0.1.6)
       activesupport
       oj
 
@@ -47,4 +47,4 @@ DEPENDENCIES
   userializer!
 
 BUNDLED WITH
-   1.16.1
+   1.16.2

data/lib/userializer/has_many.rb

@@ -15,17 +15,24 @@ module USerializer
     def merge_attributes(res, ser, opts)
       return unless @conditional_block.call(ser.object, opts)
 
-      res[@id_key] = (ser.send(@key) || []).compact.map do |obj|
+      res[@id_key] = (entities(ser) || []).compact.map do |obj|
         obj.nil? ? nil : obj.send(@embed_key)
       end.compact
     end
 
     def merge_root(res, ser, opts)
-      objs = ser.send(@key) || []
+      objs = entities(ser) || []
 
       return if objs.empty? || !@conditional_block.call(ser.object, opts)
 
       ArraySerializer.new(objs, @opts).merge_root(res, opts)
     end
+
+    def entities(ser)
+      obj = ser.send(@key) || []
+      return obj unless @opts[:scope]
+
+      obj.send(@opts[:scope])
+    end
   end
 end

data/lib/userializer/version.rb

@@ -1,3 +1,3 @@
 module USerializer
-  VERSION = "0.1.5"
+  VERSION = "0.1.6"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: userializer
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.1.6
 platform: ruby
 authors:
 - Alexis Montagne
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-06-17 00:00:00.000000000 Z
+date: 2019-07-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -87,6 +87,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".circleci/config.yml"
 - ".gitignore"
 - ".rspec"
 - ".travis.yml"
@@ -123,7 +124,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.3
+rubygems_version: 3.0.0.beta3
 signing_key: 
 specification_version: 4
 summary: Write a short summary, because RubyGems requires one.