abc_jsonapi 0.2.3 → 0.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ef48038b2ba006ddb0fe1b53cb96e3623240b7357eb945de3c1ea3b461cfc5ae
-  data.tar.gz: e0011ed1501305346f0ca1291da2383f21ffa6665f0e7d30544939584c76dedd
+  metadata.gz: 3aa80495503b3e1e6f693eed1c642b7f54b606dea641241b00ae1e7c1ea3c50f
+  data.tar.gz: aa67228eead67971ecee44be3b99cd47e1f41c7dcf0f9bb2aba7cc0417e20704
 SHA512:
-  metadata.gz: 58e68cc41d35c51b09d6076c8d89151f0441df314acacc76bc1516c07073f0436b5e7f7adc30bd76823e7ec5dbd6810b84e495053c35754621e238525f14b339
-  data.tar.gz: 1e8d1c9564221c3c49cb559274734b73fe4a796af50918726c5abb75b20779fe54b111d89933a35a19cb667a7e02f3d06e4a6e4ffc4db8c475233428eab7ba68
+  metadata.gz: 59558326daa35240ef5128960eacb9c4db399e88c338a5216c1050810be7a058064513a815af728a93ac7bd3f80795a3670fd53a6954cb4bcaecc43a3172e13b
+  data.tar.gz: c0a418f41997226b926ab28ca00468c12b0817547c6e958cdd279730db7c0ad228c459be6139c482e1312ded0e5d5c9f6a8fdaaca473ecc17c896a16ca1370df

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    abc_jsonapi (0.2.3)
+    abc_jsonapi (0.2.4)
       activesupport (>= 5.2)
       i18n
 

data/lib/abc_jsonapi/included_resource.rb

@@ -12,13 +12,7 @@ module AbcJsonapi
     def serializable_hash
       includes.each do |include_path|
         include_chain = include_path.split('.')
-        if resource.is_a?(Enumerable)
-          resource.each do |single_res|
-            get_included_records(single_res, include_chain.dup)
-          end
-        else
-          get_included_records(resource, include_chain)
-        end
+        get_included_records(resource, include_chain.dup)
       end
       includes_result.flatten
     end
@@ -36,7 +30,7 @@ module AbcJsonapi
 
       # Get included resource
       if resource.is_a?(Enumerable)
-        resource = included_items_from_collection(resource, inc_resource_name)
+        resource = included_items_from_collection(resource, inc_resource_name, relationship.dig(:block))
       else
         resource = resource.public_send(inc_resource_name)
       end
@@ -54,12 +48,12 @@ module AbcJsonapi
       end
     end
 
-    def included_items_from_collection(collection, include_name)
+    def included_items_from_collection(collection, include_name, block = nil)
       # Run custom include strategy if block given. Otherwise run default method
-      if (block = relationship.dig(:block)).present?
-        block.call(resource)
+      if block.present?
+        block.call(collection)
       else
-        collection.map(&:include_name).flatten.uniq
+        collection.map{ |res| res.public_send(include_name) }.flatten.uniq
       end
     end
 

data/lib/abc_jsonapi/serializer.rb

@@ -13,13 +13,7 @@ module AbcJsonapi
 
     attr_reader :resource, :result_hash, :resource_type, :resource_attributes,
                 :relationships, :virtual_attributes, :includes, :meta
-
-    included do
-      @resource_attributes = []
-      @relationships = []
-      @virtual_attributes = []
-    end
-
+                
     def initialize(resource, options = {})
       @resource = resource
       @result_hash = { data: nil }
@@ -45,30 +39,35 @@ module AbcJsonapi
     end
 
     module ClassMethods
-      attr_reader :resource_attributes, :relationships, :virtual_attributes
 
       def attributes(*attributes)
         @resource_attributes = attributes
       end
 
       def has_one(relationship, &block)
-        @relationships << { type: :has_one, name: relationship, block: block }
+        relationships << { type: :has_one, name: relationship, block: block }
       end
 
       def has_many(relationship, &block)
-        @relationships << { type: :has_many, name: relationship, block: block }
+        relationships << { type: :has_many, name: relationship, block: block }
       end
 
       def belongs_to(relationship, &block)
-        @relationships << { type: :belongs_to, name: relationship, block: block }
+        relationships << { type: :belongs_to, name: relationship, block: block }
       end
 
       def resource_type(rtype = nil)
-        @resource_type ||= rtype || Helpers.pluralize_if_necessary(default_type)
+        resource_type ||= rtype || Helpers.pluralize_if_necessary(default_type)
       end
 
       def attribute(name, &block)
-        @virtual_attributes << { name: name, block: block }
+        virtual_attributes << { name: name, block: block }
+      end
+
+      [:resource_attributes, :relationships, :virtual_attributes].each do |var|
+        define_method(var) do
+          instance_variable_get("@#{var}") || instance_variable_set("@#{var}", [])
+        end
       end
 
       private

data/lib/abc_jsonapi/version.rb

@@ -1,3 +1,3 @@
 module AbcJsonapi
-  VERSION = "0.2.3"
+  VERSION = "0.2.4"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: abc_jsonapi
 version: !ruby/object:Gem::Version
-  version: 0.2.3
+  version: 0.2.4
 platform: ruby
 authors:
 - Zhmakin Evgeniy
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-10-18 00:00:00.000000000 Z
+date: 2019-10-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler