abc_jsonapi 0.3.0 → 0.4.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 44cf8738d4c32a565b70155cbc4db4b9311b6deb8eefec37d93303b3097e288a
-  data.tar.gz: c77da4b0262c50f1ed2e312591f4aea3d88b494a1628b1f5e40f02cae8c42244
+  metadata.gz: 47608d89a5b953b5248762f9fbd6fec69c39822626c3c8c7099007a335a1dc43
+  data.tar.gz: 9affbf330a11e3823899ad8001e602d606894726fd9ff640520cb223e4ef8adc
 SHA512:
-  metadata.gz: c51515e94d0bdbe536b9ae61b96f493b1263a5144cc922de56c71c80667ea2c937a3b7e7647d5be392639cf6b5c5cca9a786f432a3ed68f3c0c49fb046a61d20
-  data.tar.gz: 908a9104627de99ed4d99654bd11d2fba9a2d806e16c2c896de2dc90b5773a5e7539458bdb28fd1cd9ba328280c8fc78046fc7ccec97895ebdb6a5ef3d73a445
+  metadata.gz: e36d1787f14f8d0f2aed441ff9d5a17f189f9ae6d5107b1ac08c6ae6ba4c21ca30081e41ab953544f2010bdb4ead33a1d8fba67992fee71c41ba19a238dee461
+  data.tar.gz: 6be35fcac6f2b64382f34f9006b14ad92a03bb62bb4e7b9b40cab06a4c4548ccad7381038991d082b29ec3e6733350871d238a62827f3a74e812723b68f79246

data/.ruby-version

@@ -0,0 +1 @@
+2.6.5

data/Gemfile.lock

@@ -1,32 +1,32 @@
 PATH
   remote: .
   specs:
-    abc_jsonapi (0.3.0)
+    abc_jsonapi (0.4.3)
       activesupport (>= 5.2)
       i18n
 
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (6.0.0)
+    activesupport (6.0.3.2)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 0.7, < 2)
       minitest (~> 5.1)
       tzinfo (~> 1.1)
-      zeitwerk (~> 2.1, >= 2.1.8)
+      zeitwerk (~> 2.2, >= 2.2.2)
     byebug (11.0.1)
     coderay (1.1.2)
-    concurrent-ruby (1.1.5)
+    concurrent-ruby (1.1.6)
     diff-lcs (1.3)
-    i18n (1.7.0)
+    i18n (1.8.3)
       concurrent-ruby (~> 1.0)
     method_source (0.9.2)
-    minitest (5.13.0)
+    minitest (5.14.1)
     pg (1.1.4)
     pry (0.12.2)
       coderay (~> 1.1.0)
       method_source (~> 0.9.0)
-    rake (10.5.0)
+    rake (13.0.1)
     rspec (3.8.0)
       rspec-core (~> 3.8.0)
       rspec-expectations (~> 3.8.0)
@@ -42,9 +42,9 @@ GEM
     rspec-support (3.8.2)
     sequel (5.21.0)
     thread_safe (0.3.6)
-    tzinfo (1.2.5)
+    tzinfo (1.2.7)
       thread_safe (~> 0.1)
-    zeitwerk (2.2.0)
+    zeitwerk (2.3.0)
 
 PLATFORMS
   ruby
@@ -55,9 +55,9 @@ DEPENDENCIES
   byebug
   pg
   pry
-  rake (~> 10.0)
+  rake (~> 13.0)
   rspec (~> 3.0)
   sequel
 
 BUNDLED WITH
-   2.0.1
+   2.1.2

data/README.md

@@ -35,7 +35,7 @@ Or install it yourself as:
 
 Syntax is very similar to Active Model Serializer.
 
-The serializer is able to work with any ruby ​​objects. Not only ActiveRecord. The idea is to use duck typing for getting object attributes, relationships and all other data.
+The serializer is able to work with any ruby ​​objects. Not only ActiveRecord. It calls objects methods to get all the data.
 
 #### Model Example
 

data/abc_jsonapi.gemspec

@@ -23,7 +23,7 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   spec.add_development_dependency "bundler", "~> 2.0"
-  spec.add_development_dependency "rake", "~> 10.0"
+  spec.add_development_dependency "rake", "~> 13.0"
   spec.add_development_dependency "rspec", "~> 3.0"
   spec.add_development_dependency "pry"
   spec.add_development_dependency "sequel"

data/lib/abc_jsonapi/included_resource.rb

@@ -18,7 +18,7 @@ module AbcJsonapi
     end
 
     def get_included_records(resource, include_chain)
-      return if resource.nil? || include_chain.empty?
+      return if resource.blank? || include_chain.empty?
 
       # Get first include name of include_chain and delete it from include_chain
       inc_resource_name = include_chain.shift
@@ -26,15 +26,15 @@ module AbcJsonapi
       # Check if include name is exist in relationships array. Take it or return nil
       resource_class_name = resource.is_a?(Enumerable) ? resource[0].class.name : resource.class.name
       relationship = serializer(resource_class_name).relationships.find { |h| h[:name] == inc_resource_name.to_sym }
-      return if relationship.nil?
+      return if relationship.blank?
 
       # Get included resource
       if resource.is_a?(Enumerable)
-        resource = included_items_from_collection(resource, inc_resource_name, relationship.dig(:block))
+        resource = resource.map{ |res| res.public_send(inc_resource_name) }.flatten.reject(&:blank?).uniq{ |item| item.id }
       else
         resource = resource.public_send(inc_resource_name)
       end
-      return if resource.nil?
+      return if resource.blank?
       
       @includes_result << serializer(inc_resource_name).new(resource).serializable_hash[:data]
       
@@ -48,15 +48,6 @@ module AbcJsonapi
       end
     end
 
-    def included_items_from_collection(collection, include_name, block = nil)
-      # Run custom include strategy if block given. Otherwise run default method
-      if block.present?
-        block.call(collection)
-      else
-        collection.map{ |res| res.public_send(include_name) }.flatten.reject(&:nil?).uniq{ |item| item.id }
-      end
-    end
-
     def serializer(included_resource_name)
       (serializer_namespace + included_resource_name.to_s.classify + 'Serializer').constantize
     end

data/lib/abc_jsonapi/model.rb

@@ -48,7 +48,8 @@ module AbcJsonapi
         rel_model = AbcJsonapi::Relationship.new(
           model: model,
           relationship: relationship[:name],
-          type: relationship[:type]
+          type: relationship[:type],
+          block: relationship[:block]
         )
         result[relationship[:name].to_sym] = rel_model.serializable_hash
       end

data/lib/abc_jsonapi/relationship.rb

@@ -1,11 +1,12 @@
 module AbcJsonapi
   class Relationship
-    attr_reader :model, :relationship, :type
+    attr_reader :model, :relationship, :type, :block
 
-    def initialize(model:, relationship:, type:)
+    def initialize(model:, relationship:, type:, block:)
       @model = model
       @relationship = relationship
       @type = type
+      @block = block
     end
 
     def serializable_hash
@@ -31,7 +32,8 @@ module AbcJsonapi
     end
 
     def serialize_has_many
-      data = model.public_send(relationship).map do |relation|
+      rels = block.present? ? block.call(model) : model.public_send(relationship)
+      data = rels.map do |relation|
         {
           id: relation.id.to_s,
           type: Helpers.pluralize_if_necessary(relationship.to_s).to_sym

data/lib/abc_jsonapi/serializer.rb

@@ -25,8 +25,6 @@ module AbcJsonapi
     end
 
     def serializable_hash
-      return nil if resource.blank?
-
       result_hash[:meta] = meta if meta.present?
       result_hash[:data] = data_hash
       result_hash[:included] = included_hash if @includes.present?

data/lib/abc_jsonapi/version.rb

@@ -1,3 +1,3 @@
 module AbcJsonapi
-  VERSION = "0.3.0"
+  VERSION = "0.4.3"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: abc_jsonapi
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.3
 platform: ruby
 authors:
 - Zhmakin Evgeniy
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-10-31 00:00:00.000000000 Z
+date: 2020-06-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '13.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '13.0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -144,6 +144,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
+- ".ruby-version"
 - Gemfile
 - Gemfile.lock
 - LICENSE
@@ -180,7 +181,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.6
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Json API serializer gem