jat 0.0.5 → 0.0.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 405a0677976675d336278af6aa940fe83ac4bdd4f9d69263fb4728f5cb1c8b3e
-  data.tar.gz: 9f7e0ef9238788984a50b677b68876d7301eae6e020df469ec7eba933566dbf0
+  metadata.gz: 0b59dbef3044d5b23c7b8178e23f931458b3acb5ced78b3750c5f1d7bb8ea01e
+  data.tar.gz: 7ebf0b1ec19a10872b8e659bd3ab9cd45a5859ace34f87c65070a83af713a2fd
 SHA512:
-  metadata.gz: dd533f933d3504b8b549ac13f231ee70bfa7a8c00baafe88ab09a8973a6d278d8a727ddbd0e4e783abed34b0e8f22c3ccb314ced10699427de80877865a9ff0d
-  data.tar.gz: 323559cf6470e9c569f919356f2c0c0033b46e51ccb0b9c1b79b9e0d5d397d68b1322a2401788560f1ed5a474cbf19a81720f38ed78291e1c75326ec6f9a7a07
+  metadata.gz: e7e4b943c4b6452937d2c025f47bc1e3e4484151748139682ad03724fa3bc5138f02c23400426ceb3fb6c948112dd91015c1beddfd4da2ee3a1cd3187e0a5d5c
+  data.tar.gz: de404f4d77ca9b68a50834b4e435f303f1ace3f66bb976ffa154e4159b01888fa27301795192c967a7cc3b2577c35a10012135521f7e91e9037833d7098f7816

data/lib/jat/attribute.rb

@@ -9,6 +9,8 @@ class Jat
       attr_reader :params, :opts
 
       def initialize(name:, opts: {}, block: nil)
+        check_block_valid(block)
+
         @opts = EnumDeepDup.call(opts)
         @params = EnumDeepFreeze.call(name: name, opts: @opts, block: block)
       end
@@ -61,10 +63,10 @@ class Jat
       def block
         return @block if instance_variable_defined?(:@block)
 
-        current_block = params.fetch(:block).tap { |bl| check_block_valid(bl) if bl }
+        current_block = params.fetch(:block)
         current_block ||= keyword_block
 
-        @block = anonymized_block(current_block)
+        @block = current_block
       end
 
       def value(object, context)
@@ -78,24 +80,11 @@ class Jat
         proc { |object| object.public_send(key_method_name) }
       end
 
-      def anonymized_block(block)
-        Class.new do
-          private
-
-          define_method(:_doe) do |object, context|
-            block.call(object, context)
-          end
-        end.new.method(:_doe)
-      end
-
       def check_block_valid(block)
-        raise Error, "Block must be a Proc (not lambda)" if block.lambda?
+        return unless block
 
         params = block.parameters
         raise Error, "Block can have 0-2 parameters" if params.count > 2
-
-        valid_params_types = params.all? { |param| param[0] == :opt }
-        raise Error, "Block parameters must be optional and no keyword parameters" unless valid_params_types
       end
     end
 

data/lib/jat/config.rb

@@ -1,23 +1,20 @@
 # frozen_string_literal: true
 
+require "forwardable"
 require_relative "utils/enum_deep_dup"
 
 class Jat
   class Config
     module InstanceMethods
+      extend Forwardable
+
       attr_reader :opts
 
       def initialize(opts = {})
         @opts = EnumDeepDup.call(opts)
       end
 
-      def []=(key, value)
-        opts[key] = value
-      end
-
-      def [](key)
-        opts[key]
-      end
+      def_delegators :@opts, :[], :[]=, :fetch
     end
 
     module ClassMethods

data/lib/jat/plugins/activerecord/activerecord.rb

@@ -0,0 +1,23 @@
+# frozen_string_literal: true
+
+class Jat
+  module Plugins
+    module Activerecord
+      def self.plugin_name
+        :activerecord
+      end
+
+      def self.load(jat_class, **opts)
+        if jat_class.plugin_used?(:json_api)
+          jat_class.plugin :json_api_activerecord, **opts
+        elsif jat_class.plugin_used?(:simple_api)
+          jat_class.plugin :simple_api_activerecord, **opts
+        else
+          raise Error, "Please load :json_api or :simple_api plugin first"
+        end
+      end
+    end
+
+    register_plugin(Activerecord.plugin_name, Activerecord)
+  end
+end

data/lib/jat/plugins/{_activerecord_preloads/_activerecord_preloads.rb → base/base_activerecord_preloads/base_activerecord_preloads.rb}

@@ -4,7 +4,11 @@ require_relative "./lib/preloader"
 
 class Jat
   module Plugins
-    module ActiverecordPreloads
+    module BaseActiverecordPreloads
+      def self.plugin_name
+        :base_activerecord_preloads
+      end
+
       def self.load(jat_class, **_opts)
         jat_class.include(InstanceMethods)
       end
@@ -20,6 +24,7 @@ class Jat
         def add_preloads(obj)
           return obj if obj.nil? || (obj.is_a?(Array) && obj.empty?)
 
+          # preloads() method comes from simple_api_activerecord or json_api_activerecord plugin
           preloads = preloads()
           return obj if preloads.empty?
 
@@ -28,6 +33,6 @@ class Jat
       end
     end
 
-    register_plugin(:_activerecord_preloads, ActiverecordPreloads)
+    register_plugin(BaseActiverecordPreloads.plugin_name, BaseActiverecordPreloads)
   end
 end

data/lib/jat/plugins/{_activerecord_preloads → base/base_activerecord_preloads}/lib/preloader.rb

@@ -2,7 +2,7 @@
 
 class Jat
   module Plugins
-    module ActiverecordPreloads
+    module BaseActiverecordPreloads
       class Preloader
         module ClassMethods
           def preload(object, preloads)
@@ -20,6 +20,18 @@ class Jat
         extend ClassMethods
       end
 
+      class Loader
+        # :nocov: We can check only one version of activerecord
+        def self.call(records, associations)
+          if ActiveRecord::VERSION::MAJOR >= 7
+            ActiveRecord::Associations::Preloader.new(records: records, associations: associations).call
+          else
+            ActiveRecord::Associations::Preloader.new.preload(records, associations)
+          end
+        end
+        # :nocov:
+      end
+
       class ActiverecordObject
         module ClassMethods
           def fit?(object)
@@ -27,7 +39,7 @@ class Jat
           end
 
           def preload(object, preloads)
-            ActiveRecord::Associations::Preloader.new.preload(object, preloads)
+            Loader.call([object], preloads)
             object
           end
         end
@@ -44,7 +56,7 @@ class Jat
           def preload(objects, preloads)
             if objects.loaded?
               array_objects = objects.to_a
-              ActiverecordArray.preload(array_objects, preloads)
+              Loader.call(array_objects, preloads)
               objects
             else
               objects.preload(preloads).load
@@ -64,7 +76,7 @@ class Jat
           end
 
           def preload(objects, preloads)
-            ActiveRecord::Associations::Preloader.new.preload(objects, preloads)
+            Loader.call(objects, preloads)
             objects
           end
 

data/lib/jat/plugins/{_lower_camel_case/_lower_camel_case.rb → base/base_lower_camel_case/base_lower_camel_case.rb}

@@ -2,7 +2,11 @@
 
 class Jat
   module Plugins
-    module LowerCamelCase
+    module BaseLowerCamelCase
+      def self.plugin_name
+        :base_lower_camel_case
+      end
+
       def self.load(jat_class, **_opts)
         jat_class::Attribute.include(AttributeInstanceMethods)
       end
@@ -14,7 +18,7 @@ class Jat
       end
     end
 
-    register_plugin(:_lower_camel_case, LowerCamelCase)
+    register_plugin(BaseLowerCamelCase.plugin_name, BaseLowerCamelCase)
   end
 
   class LowerCamelCaseTransformation

data/lib/jat/plugins/{_preloads/_preloads.rb → base/base_preloads/base_preloads.rb}

@@ -6,7 +6,11 @@ require_relative "./lib/preloads_with_path"
 # This plugin adds attribute methods #preloads, #preloads_path
 class Jat
   module Plugins
-    module Preloads
+    module BasePreloads
+      def self.plugin_name
+        :base_preloads
+      end
+
       def self.load(jat_class, **_opts)
         jat_class::Attribute.include(AttributeMethods)
       end
@@ -54,6 +58,6 @@ class Jat
       end
     end
 
-    register_plugin(:_preloads, Preloads)
+    register_plugin(BasePreloads.plugin_name, BasePreloads)
   end
 end

data/lib/jat/plugins/{_preloads → base/base_preloads}/lib/format_user_preloads.rb

@@ -2,7 +2,7 @@
 
 class Jat
   module Plugins
-    module Preloads
+    module BasePreloads
       class FormatUserPreloads
         METHODS = {
           Array => :array_to_hash,

data/lib/jat/plugins/{_preloads → base/base_preloads}/lib/preloads_with_path.rb

@@ -2,7 +2,7 @@
 
 class Jat
   module Plugins
-    module Preloads
+    module BasePreloads
       class PreloadsWithPath
         module ClassMethods
           BANG = "!"

data/lib/jat/plugins/cache/cache.rb

@@ -3,6 +3,10 @@
 class Jat
   module Plugins
     module Cache
+      def self.plugin_name
+        :cache
+      end
+
       def self.before_load(jat_class, **opts)
         jat_class.plugin :to_str, **opts
       end
@@ -38,6 +42,6 @@ class Jat
       end
     end
 
-    register_plugin(:cache, Cache)
+    register_plugin(Cache.plugin_name, Cache)
   end
 end

data/lib/jat/plugins/json_api/json_api.rb

@@ -10,6 +10,10 @@ require_relative "./lib/response_piece"
 class Jat
   module Plugins
     module JsonApi
+      def self.plugin_name
+        :json_api
+      end
+
       def self.before_load(jat_class, **_opts)
         response_plugin = jat_class.config[:response_plugin_loaded]
         return unless response_plugin
@@ -23,6 +27,8 @@ class Jat
       end
 
       def self.after_load(jat_class, **opts)
+        jat_class.config[:response_plugin_loaded] = plugin_name
+
         fields_parser_class = Class.new(FieldsParamParser)
         fields_parser_class.jat_class = jat_class
         jat_class.const_set(:FieldsParamParser, fields_parser_class)
@@ -43,8 +49,6 @@ class Jat
         response_piece_class.jat_class = jat_class
         jat_class.const_set(:ResponsePiece, response_piece_class)
 
-        jat_class.config[:response_plugin_loaded] = :json_api
-        jat_class.plugin(:json_api_activerecord, **opts) if opts[:activerecord]
         jat_class.id
       end
 
@@ -242,6 +246,6 @@ class Jat
       end
     end
 
-    register_plugin(:json_api, JsonApi)
+    register_plugin(JsonApi.plugin_name, JsonApi)
   end
 end

data/lib/jat/plugins/json_api/lib/map.rb

@@ -103,11 +103,10 @@ class Jat
           end
 
           def attribute_exposed?(attribute)
-            case exposed
-            when :all then true
-            when :none then false
-            else attribute.exposed?
-            end
+            return true if exposed == :all
+            return false if exposed == :none
+
+            attribute.exposed?
           end
         end
 

data/lib/jat/plugins/json_api/lib/response.rb

@@ -87,7 +87,7 @@ class Jat
             attributes.each do |name, attribute|
               next if data.key?(name)
 
-              value = attribute_value(attribute)
+              value = attribute.value(object, context)
 
               unless value.nil?
                 data = data.dup if data.equal?(FROZEN_EMPTY_HASH)
@@ -98,10 +98,6 @@ class Jat
             data
           end
 
-          def attribute_value(attribute)
-            attribute.block.call(object, context)
-          end
-
           def context_jsonapi
             context_attr_transform(:jsonapi)
           end

data/lib/jat/plugins/json_api/lib/response_piece.rb

@@ -49,7 +49,7 @@ class Jat
           end
 
           def uid
-            {type: jat_class.get_type, id: jat_class.get_id.block.call(object, context)}
+            {type: type, id: id}
           end
 
           private
@@ -60,7 +60,7 @@ class Jat
 
             attributes_names.each_with_object({}) do |name, attrs|
               attribute = jat_class.attributes[name]
-              attrs[name] = attribute.block.call(object, context)
+              attrs[name] = attribute.value(object, context)
             end
           end
 
@@ -70,7 +70,7 @@ class Jat
 
             relationships_names.each_with_object({}) do |name, rels|
               rel_attribute = jat_class.attributes[name]
-              rel_object = rel_attribute.block.call(object, context)
+              rel_object = rel_attribute.value(object, context)
 
               rel_serializer = rel_attribute.serializer.call
               rel_links = get_relationship_links(rel_serializer, rel_object)
@@ -105,7 +105,8 @@ class Jat
           def add_relationship_data(rel_serializer, rel_object)
             rel_response_data = rel_serializer::ResponsePiece.new(rel_object, context, map, includes)
             rel_uid = rel_response_data.uid
-            includes[rel_uid] ||= rel_response_data.to_h
+            simple_uid = "#{rel_uid[:id]}-#{rel_uid[:type]}"
+            includes[simple_uid] ||= rel_response_data.to_h
             rel_uid
           end
 
@@ -122,40 +123,48 @@ class Jat
           def get_links
             jat_class
               .object_links
-              .transform_values { |attr| attr.block.call(object, context) }
+              .transform_values { |attr| attr.value(object, context) }
               .tap(&:compact!)
           end
 
           def get_meta
             jat_class
               .added_object_meta
-              .transform_values { |attr| attr.block.call(object, context) }
+              .transform_values { |attr| attr.value(object, context) }
               .tap(&:compact!)
           end
 
           def get_relationship_links(rel_serializer, rel_object)
             links = rel_serializer.relationship_links
-            return FROZEN_EMPTY_HASH unless links
+            return FROZEN_EMPTY_HASH if links.empty?
 
             context[:parent_object] = object
 
             links
-              .transform_values { |attr| attr.block.call(rel_object, context) }
+              .transform_values { |attr| attr.value(rel_object, context) }
               .tap(&:compact!)
               .tap { context.delete(:parent_object) }
           end
 
           def get_relationship_meta(rel_serializer, rel_object)
             meta = rel_serializer.added_relationship_meta
-            return FROZEN_EMPTY_HASH unless meta
+            return FROZEN_EMPTY_HASH if meta.empty?
 
             context[:parent_object] = object
 
             meta
-              .transform_values { |attr| attr.block.call(rel_object, context) }
+              .transform_values { |attr| attr.value(rel_object, context) }
               .tap(&:compact!)
               .tap { context.delete(:parent_object) }
           end
+
+          def type
+            @type ||= jat_class.get_type
+          end
+
+          def id
+            @id ||= jat_class.get_id.value(object, context)
+          end
         end
 
         extend ClassMethods

data/lib/jat/plugins/json_api/plugins/json_api_activerecord/json_api_activerecord.rb

@@ -0,0 +1,23 @@
+# frozen_string_literal: true
+
+class Jat
+  module Plugins
+    module JsonApiActiverecord
+      def self.plugin_name
+        :json_api_activerecord
+      end
+
+      def self.before_load(jat_class, **_opts)
+        return if jat_class.plugin_used?(:json_api)
+        raise Error, "Please load :json_api plugin first"
+      end
+
+      def self.load(jat_class, **opts)
+        jat_class.plugin :json_api_preloads, **opts
+        jat_class.plugin :base_activerecord_preloads, **opts
+      end
+    end
+
+    register_plugin(JsonApiActiverecord.plugin_name, JsonApiActiverecord)
+  end
+end

data/lib/jat/plugins/{json_api_lower_camel_case → json_api/plugins/json_api_lower_camel_case}/json_api_lower_camel_case.rb

@@ -3,10 +3,14 @@
 class Jat
   module Plugins
     module JsonApiLowerCamelCase
+      def self.plugin_name
+        :json_api_lower_camel_case
+      end
+
       def self.before_load(jat_class, **_opts)
         raise Error, "Please load :json_api plugin first" unless jat_class.plugin_used?(:json_api)
 
-        jat_class.plugin :_lower_camel_case
+        jat_class.plugin :base_lower_camel_case
       end
 
       def self.load(jat_class, **_opts)
@@ -25,6 +29,6 @@ class Jat
       end
     end
 
-    register_plugin(:json_api_lower_camel_case, JsonApiLowerCamelCase)
+    register_plugin(JsonApiLowerCamelCase.plugin_name, JsonApiLowerCamelCase)
   end
 end

data/lib/jat/plugins/{json_api_maps_cache → json_api/plugins/json_api_maps_cache}/json_api_maps_cache.rb

@@ -3,6 +3,10 @@
 class Jat
   module Plugins
     module JsonApiMapsCache
+      def self.plugin_name
+        :json_api_maps_cache
+      end
+
       def self.before_load(jat_class, **opts)
         return if jat_class.plugin_used?(:json_api)
         raise Error, "Please load :json_api plugin first"
@@ -49,6 +53,6 @@ class Jat
       end
     end
 
-    register_plugin(:json_api_maps_cache, JsonApiMapsCache)
+    register_plugin(JsonApiMapsCache.plugin_name, JsonApiMapsCache)
   end
 end

data/lib/jat/plugins/json_api/plugins/json_api_preloads/json_api_preloads.rb

@@ -0,0 +1,38 @@
+# frozen_string_literal: true
+
+require_relative "./lib/preloads"
+
+class Jat
+  module Plugins
+    module JsonApiPreloads
+      def self.plugin_name
+        :json_api_preloads
+      end
+
+      def self.before_load(jat_class, **opts)
+        raise Error, "Please load :json_api plugin first" unless jat_class.plugin_used?(:json_api)
+
+        jat_class.plugin :base_preloads, **opts
+      end
+
+      def self.load(jat_class, **_opts)
+        jat_class.extend(ClassMethods)
+        jat_class.include(InstanceMethods)
+      end
+
+      module ClassMethods
+        def preloads(context = {})
+          new(context).preloads
+        end
+      end
+
+      module InstanceMethods
+        def preloads
+          @preloads ||= Preloads.call(self)
+        end
+      end
+    end
+
+    register_plugin(JsonApiPreloads.plugin_name, JsonApiPreloads)
+  end
+end

data/lib/jat/plugins/{json_api_activerecord → json_api/plugins/json_api_preloads}/lib/preloads.rb

@@ -4,7 +4,7 @@ require "set"
 
 class Jat
   module Plugins
-    module JsonApiActiverecord
+    module JsonApiPreloads
       class Preloads
         class << self
           def call(jat)

data/lib/jat/plugins/{json_api_validate_params → json_api/plugins/json_api_validate_params}/json_api_validate_params.rb

@@ -7,6 +7,10 @@ require_relative "./lib/validate_include_param"
 class Jat
   module Plugins
     module JsonApiValidateParams
+      def self.plugin_name
+        :json_api_validate_params
+      end
+
       def self.before_load(jat_class, **_opts)
         return if jat_class.plugin_used?(:json_api)
         raise Error, "Please load :json_api plugin first"
@@ -52,6 +56,6 @@ class Jat
       end
     end
 
-    register_plugin(:json_api_validate_params, JsonApiValidateParams)
+    register_plugin(JsonApiValidateParams.plugin_name, JsonApiValidateParams)
   end
 end

data/lib/jat/plugins/{json_api_validate_params → json_api/plugins/json_api_validate_params}/lib/validate_include_param.rb

@@ -22,9 +22,7 @@ class Jat
             allowed_relationships = jat_class.attributes.each_value.select(&:relation?).map!(&:name)
             allowed_relationships = "'#{allowed_relationships.join("', '")}'"
 
-            raise JsonApiParamsError,
-              "Type '#{type}' has no included '#{name}' relationship. " \
-              "Existing relationships are: #{allowed_relationships}"
+            raise JsonApiParamsError, "Type '#{type}' has no included '#{name}' relationship. Existing relationships are: #{allowed_relationships}"
           end
         end
       end

data/lib/jat/plugins/lower_camel_case/lower_camel_case.rb

@@ -0,0 +1,23 @@
+# frozen_string_literal: true
+
+class Jat
+  module Plugins
+    module LowerCamelCase
+      def self.plugin_name
+        :lower_camel_case
+      end
+
+      def self.load(jat_class, **opts)
+        if jat_class.plugin_used?(:json_api)
+          jat_class.plugin :json_api_lower_camel_case, **opts
+        elsif jat_class.plugin_used?(:simple_api)
+          jat_class.plugin :simple_api_lower_camel_case, **opts
+        else
+          raise Error, "Please load :json_api or :simple_api plugin first"
+        end
+      end
+    end
+
+    register_plugin(LowerCamelCase.plugin_name, LowerCamelCase)
+  end
+end

data/lib/jat/plugins/maps_cache/maps_cache.rb

@@ -0,0 +1,23 @@
+# frozen_string_literal: true
+
+class Jat
+  module Plugins
+    module MapsCache
+      def self.plugin_name
+        :maps_cache
+      end
+
+      def self.load(jat_class, **opts)
+        if jat_class.plugin_used?(:json_api)
+          jat_class.plugin :json_api_maps_cache, **opts
+        elsif jat_class.plugin_used?(:simple_api)
+          jat_class.plugin :simple_api_maps_cache, **opts
+        else
+          raise Error, "Please load :json_api or :simple_api plugin first"
+        end
+      end
+    end
+
+    register_plugin(MapsCache.plugin_name, MapsCache)
+  end
+end

data/lib/jat/plugins/preloads/preloads.rb

@@ -0,0 +1,23 @@
+# frozen_string_literal: true
+
+class Jat
+  module Plugins
+    module Preloads
+      def self.plugin_name
+        :preloads
+      end
+
+      def self.load(jat_class, **opts)
+        if jat_class.plugin_used?(:json_api)
+          jat_class.plugin :json_api_preloads, **opts
+        elsif jat_class.plugin_used?(:simple_api)
+          jat_class.plugin :simple_api_preloads, **opts
+        else
+          raise Error, "Please load :json_api or :simple_api plugin first"
+        end
+      end
+    end
+
+    register_plugin(Preloads.plugin_name, Preloads)
+  end
+end