jat 0.0.5 → 0.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 405a0677976675d336278af6aa940fe83ac4bdd4f9d69263fb4728f5cb1c8b3e
-  data.tar.gz: 9f7e0ef9238788984a50b677b68876d7301eae6e020df469ec7eba933566dbf0
+  metadata.gz: 18b7274ab643b613d2356e6f4704683d0ee17f6789fc3c01ba5c6435b09c0c84
+  data.tar.gz: 197d92680d9bbe8610eca370516fc2b7a36bb7a6dfadf0a2fc75ce5e3959af90
 SHA512:
-  metadata.gz: dd533f933d3504b8b549ac13f231ee70bfa7a8c00baafe88ab09a8973a6d278d8a727ddbd0e4e783abed34b0e8f22c3ccb314ced10699427de80877865a9ff0d
-  data.tar.gz: 323559cf6470e9c569f919356f2c0c0033b46e51ccb0b9c1b79b9e0d5d397d68b1322a2401788560f1ed5a474cbf19a81720f38ed78291e1c75326ec6f9a7a07
+  metadata.gz: f887b6f910f4677439e5842e4882eedb349e2bc6865e987b9dcec565dca83e20e13b2cf31eed117a332b1ae044c3194445f4241ba65c053c2b7adbba4ceb316d
+  data.tar.gz: 9562212be2cacf78f9e6e166ca25d7eddfd995d15d16470b1b39cdd0e0cec33d8ffe14b912b4331d51079a6b16b76dd45f4cb2b9d7f74b3ebbab7dbcca202cee

data/lib/jat/attribute.rb

@@ -64,7 +64,7 @@ class Jat
         current_block = params.fetch(:block).tap { |bl| check_block_valid(bl) if bl }
         current_block ||= keyword_block
 
-        @block = anonymized_block(current_block)
+        @block = current_block
       end
 
       def value(object, context)
@@ -78,16 +78,6 @@ 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?
 

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/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/{_activerecord_preloads → common/_activerecord_preloads}/_activerecord_preloads.rb

@@ -5,6 +5,10 @@ require_relative "./lib/preloader"
 class Jat
   module Plugins
     module ActiverecordPreloads
+      def self.plugin_name
+        :_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(ActiverecordPreloads.plugin_name, ActiverecordPreloads)
   end
 end

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

@@ -20,6 +20,16 @@ class Jat
         extend ClassMethods
       end
 
+      class Loader
+        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
+      end
+
       class ActiverecordObject
         module ClassMethods
           def fit?(object)
@@ -27,7 +37,7 @@ class Jat
           end
 
           def preload(object, preloads)
-            ActiveRecord::Associations::Preloader.new.preload(object, preloads)
+            Loader.call([object], preloads)
             object
           end
         end
@@ -44,7 +54,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 +74,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 → common/_lower_camel_case}/_lower_camel_case.rb

@@ -3,6 +3,10 @@
 class Jat
   module Plugins
     module LowerCamelCase
+      def self.plugin_name
+        :_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(LowerCamelCase.plugin_name, LowerCamelCase)
   end
 
   class LowerCamelCaseTransformation

data/lib/jat/plugins/{_preloads → common/_preloads}/_preloads.rb

@@ -7,6 +7,10 @@ require_relative "./lib/preloads_with_path"
 class Jat
   module Plugins
     module Preloads
+      def self.plugin_name
+        :_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(Preloads.plugin_name, Preloads)
   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/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
@@ -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
 
@@ -156,6 +157,14 @@ class Jat
               .tap(&:compact!)
               .tap { context.delete(:parent_object) }
           end
+
+          def type
+            @type ||= jat_class.get_type
+          end
+
+          def id
+            @id ||= jat_class.get_id.block.call(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 :_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,6 +3,10 @@
 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)
 
@@ -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_activerecord/json_api_activerecord.rb → json_api/plugins/json_api_preloads/json_api_preloads.rb}

@@ -4,19 +4,26 @@ require_relative "./lib/preloads"
 
 class Jat
   module Plugins
-    module JsonApiActiverecord
+    module JsonApiPreloads
+      def self.plugin_name
+        :json_api_preloads
+      end
+
       def self.before_load(jat_class, **opts)
-        return if jat_class.plugin_used?(:json_api)
-        raise Error, "Please load :json_api plugin first"
+        raise Error, "Please load :json_api plugin first" unless jat_class.plugin_used?(:json_api)
+
+        jat_class.plugin :_preloads, **opts
       end
 
       def self.load(jat_class, **_opts)
+        jat_class.extend(ClassMethods)
         jat_class.include(InstanceMethods)
       end
 
-      def self.after_load(jat_class, **opts)
-        jat_class.plugin :_preloads, **opts
-        jat_class.plugin :_activerecord_preloads, **opts
+      module ClassMethods
+        def preloads(context = {})
+          new(context).preloads
+        end
       end
 
       module InstanceMethods
@@ -26,6 +33,6 @@ class Jat
       end
     end
 
-    register_plugin(:json_api_activerecord, JsonApiActiverecord)
+    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/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

data/lib/jat/plugins/simple_api/plugins/simple_api_activerecord/simple_api_activerecord.rb

@@ -0,0 +1,23 @@
+# frozen_string_literal: true
+
+class Jat
+  module Plugins
+    module SimpleApiActiverecord
+      def self.plugin_name
+        :simple_api_activerecord
+      end
+
+      def self.before_load(jat_class, **_opts)
+        return if jat_class.plugin_used?(:simple_api)
+        raise Error, "Please load :simple_api plugin first"
+      end
+
+      def self.load(jat_class, **opts)
+        jat_class.plugin :simple_api_preloads, **opts
+        jat_class.plugin :_activerecord_preloads, **opts
+      end
+    end
+
+    register_plugin(SimpleApiActiverecord.plugin_name, SimpleApiActiverecord)
+  end
+end

data/lib/jat/plugins/{simple_api_lower_camel_case → simple_api/plugins/simple_api_lower_camel_case}/simple_api_lower_camel_case.rb

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

data/lib/jat/plugins/{simple_api_maps_cache → simple_api/plugins/simple_api_maps_cache}/simple_api_maps_cache.rb

@@ -3,6 +3,10 @@
 class Jat
   module Plugins
     module SimpleApiMapsCache
+      def self.plugin_name
+        :simple_api_maps_cache
+      end
+
       def self.before_load(jat_class, **_opts)
         return if jat_class.plugin_used?(:simple_api)
 
@@ -36,13 +40,11 @@ class Jat
         end
 
         def cache_key(exposed, fields)
-          key = "exposed:#{exposed}:"
-          key += "fields:#{fields}:" if fields
-          key
+          "exposed:#{exposed}:fields:#{fields}:"
         end
       end
     end
 
-    register_plugin(:simple_api_maps_cache, SimpleApiMapsCache)
+    register_plugin(SimpleApiMapsCache.plugin_name, SimpleApiMapsCache)
   end
 end

data/lib/jat/plugins/{simple_api_activerecord → simple_api/plugins/simple_api_preloads}/lib/preloads.rb

@@ -2,7 +2,7 @@
 
 class Jat
   module Plugins
-    module SimpleApiActiverecord
+    module SimpleApiPreloads
       class Preloads
         module ClassMethods
           def call(jat)

data/lib/jat/plugins/simple_api/plugins/simple_api_preloads/simple_api_preloads.rb

@@ -0,0 +1,38 @@
+# frozen_string_literal: true
+
+require_relative "./lib/preloads"
+
+class Jat
+  module Plugins
+    module SimpleApiPreloads
+      def self.plugin_name
+        :simple_api_preloads
+      end
+
+      def self.before_load(jat_class, **opts)
+        raise Error, "Please load :simple_api plugin first" unless jat_class.plugin_used?(:simple_api)
+
+        jat_class.plugin :_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(SimpleApiPreloads.plugin_name, SimpleApiPreloads)
+  end
+end

data/lib/jat/plugins/{simple_api_validate_params → simple_api/plugins/simple_api_validate_params}/simple_api_validate_params.rb

@@ -6,6 +6,10 @@ require_relative "./lib/validate_fields_param"
 class Jat
   module Plugins
     module SimpleApiValidateParams
+      def self.plugin_name
+        :simple_api_validate_params
+      end
+
       def self.before_load(jat_class, **_opts)
         return if jat_class.plugin_used?(:simple_api)
         raise Error, "Please load :simple_api plugin first"
@@ -40,6 +44,6 @@ class Jat
       end
     end
 
-    register_plugin(:simple_api_validate_params, SimpleApiValidateParams)
+    register_plugin(SimpleApiValidateParams.plugin_name, SimpleApiValidateParams)
   end
 end

data/lib/jat/plugins/simple_api/simple_api.rb

@@ -8,7 +8,9 @@ require_relative "./lib/response_piece"
 class Jat
   module Plugins
     module SimpleApi
-      DEFAULT_META_KEY = :meta
+      def self.plugin_name
+        :simple_api
+      end
 
       def self.before_load(jat_class, **_opts)
         response_plugin = jat_class.config[:response_plugin_loaded]
@@ -22,11 +24,10 @@ class Jat
         jat_class.extend(ClassMethods)
       end
 
-      def self.after_load(jat_class, **opts)
-        jat_class.config[:response_plugin_loaded] = :simple_api
-        jat_class.plugin(:simple_api_activerecord, **opts) if opts[:activerecord]
+      def self.after_load(jat_class, **_opts)
+        jat_class.config[:response_plugin_loaded] = plugin_name
 
-        jat_class.meta_key(DEFAULT_META_KEY)
+        jat_class.meta_key(:meta)
 
         fields_parser_class = Class.new(FieldsParamParser)
         fields_parser_class.jat_class = jat_class
@@ -119,6 +120,6 @@ class Jat
       end
     end
 
-    register_plugin(:simple_api, SimpleApi)
+    register_plugin(SimpleApi.plugin_name, SimpleApi)
   end
 end

data/lib/jat/plugins/to_str/to_str.rb

@@ -3,6 +3,10 @@
 class Jat
   module Plugins
     module ToStr
+      def self.plugin_name
+        :to_str
+      end
+
       def self.load(jat_class, **_opts)
         jat_class.include(InstanceMethods)
         jat_class.extend(ClassMethods)
@@ -45,6 +49,6 @@ class Jat
       end
     end
 
-    register_plugin(:to_str, ToStr)
+    register_plugin(ToStr.plugin_name, ToStr)
   end
 end

data/lib/jat/plugins/validate_params/validate_params.rb

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

data/lib/jat/plugins.rb

@@ -18,7 +18,20 @@ class Jat
     # correctly.
     def self.find_plugin(name)
       return name if name.is_a?(Module)
-      require "jat/plugins/#{name}/#{name}" unless @plugins.key?(name)
+
+      begin
+        require "jat/plugins/#{name}/#{name}"
+      rescue LoadError
+        if name.start_with?("json_api")
+          require "jat/plugins/json_api/plugins/#{name}/#{name}"
+        elsif name.start_with?("simple_api")
+          require "jat/plugins/simple_api/plugins/#{name}/#{name}"
+        elsif name.start_with?("_")
+          require "jat/plugins/common/#{name}/#{name}"
+        else
+          raise
+        end
+      end
 
       @plugins[name] || raise(Error, "plugin #{name} did not register itself correctly in Jat::Plugins")
     end

data/lib/jat.rb

@@ -43,24 +43,29 @@ class Jat
 
       plugin = Plugins.find_plugin(name)
 
-      # Before load usually used to check plugin can be attached or to load additional plugins
+      # We split loading of plugin to three methods - before_load, load, after_load:
+      #
+      # - **before_load** usually used to check requirements and to load additional plugins
+      # - **load** usually used to include plugin modules
+      # - **after_load** usually used to add config options
       plugin.before_load(self, **opts) if plugin.respond_to?(:before_load)
-
-      # Usually used to include/extend plugin modules
       plugin.load(self, **opts) if plugin.respond_to?(:load)
-
-      # Store attached plugins, so we can check them later
-      config[:plugins] << plugin
-
-      # Set some config options for current plugin or load additional plugins
       plugin.after_load(self, **opts) if plugin.respond_to?(:after_load)
 
+      # Store attached plugins, so we can check it is loaded later
+      config[:plugins] << (plugin.respond_to?(:plugin_name) ? plugin.plugin_name : plugin)
+
       plugin
     end
 
-    def plugin_used?(name)
-      plugin = Plugins.find_plugin(name)
-      config[:plugins].include?(plugin)
+    def plugin_used?(plugin)
+      plugin_name =
+        case plugin
+        when Module then plugin.respond_to?(:plugin_name) ? plugin.plugin_name : plugin
+        else plugin
+        end
+
+      config[:plugins].include?(plugin_name)
     end
 
     def call

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

@@ -23,14 +23,6 @@ describe "Jat::Plugins::JsonApi" do
   end
 
   describe ".after_load" do
-    it "loads json_api_activerecord plugin if activerecord option provided" do
-      jat_class = Class.new(Jat)
-      jat_class.expects(:plugin).with(:json_api_activerecord, activerecord: true)
-
-      plugin.load(jat_class)
-      plugin.after_load(jat_class, activerecord: true)
-    end
-
     it "adds config variable with name of response plugin that was loaded" do
       jat_class = Class.new(Jat)
       jat_class.plugin(:json_api)

data/test/lib/jat/plugins/json_api_activerecord/json_api_activerecord_test.rb

@@ -13,26 +13,12 @@ describe "Jat::Plugins::JsonApiActiverecord" do
     assert_match(/json_api/, error.message)
   end
 
-  it "loads other plugins in after_load" do
+  it "loads other plugins" do
     jat_class = Class.new(Jat)
     jat_class.plugin :json_api
+    jat_class.plugin :json_api_activerecord
 
-    jat_class.expects(:plugin).with(:_preloads, foo: :bar)
-    jat_class.expects(:plugin).with(:_activerecord_preloads, foo: :bar)
-
-    @plugin.after_load(jat_class, foo: :bar)
-  end
-
-  describe "InstanceMethods" do
-    it "add .preloads method as a delegator to #{@plugin}::Preloads" do
-      jat_class = Class.new(Jat)
-      jat_class.plugin :json_api
-      jat_class.plugin @plugin
-      jat = jat_class.allocate
-
-      @plugin::Preloads.expects(:call).with(jat).returns("RES")
-
-      assert_equal "RES", jat.preloads
-    end
+    assert jat_class.plugin_used?(:json_api_preloads)
+    assert jat_class.plugin_used?(:_activerecord_preloads)
   end
 end

data/test/lib/jat/plugins/json_api_preloads/json_api_preloads_test.rb

@@ -0,0 +1,37 @@
+# frozen_string_literal: true
+
+require "test_helper"
+
+describe "Jat::Plugins::JsonApiPreloads" do
+  before do
+    @plugin = Jat::Plugins.find_plugin(:json_api_preloads)
+  end
+
+  it "checks json_api plugin loaded before" do
+    jat_class = Class.new(Jat)
+    error = assert_raises(Jat::Error) { jat_class.plugin @plugin }
+    assert_match(/json_api/, error.message)
+  end
+
+  it "loads other plugins" do
+    jat_class = Class.new(Jat)
+    jat_class.plugin :json_api
+
+    jat_class.expects(:plugin).with(:_preloads, foo: :bar)
+
+    @plugin.before_load(jat_class, foo: :bar)
+  end
+
+  describe "InstanceMethods" do
+    it "add .preloads method as a delegator to #{@plugin}::Preloads" do
+      jat_class = Class.new(Jat)
+      jat_class.plugin :json_api
+      jat_class.plugin @plugin
+      jat = jat_class.allocate
+
+      @plugin::Preloads.expects(:call).with(jat).returns("RES")
+
+      assert_equal "RES", jat.preloads
+    end
+  end
+end

data/test/lib/jat/plugins/{json_api_activerecord → json_api_preloads}/lib/preloads_test.rb

@@ -2,8 +2,13 @@
 
 require "test_helper"
 
-describe "Jat::Plugins::JsonApiActiverecord::Preloads" do
-  let(:base) { Class.new(Jat) { plugin :json_api, activerecord: true } }
+describe "Jat::Plugins::JsonApiPreloads::Preloads" do
+  let(:base) do
+    Class.new(Jat) do
+      plugin :json_api
+      plugin :json_api_preloads
+    end
+  end
 
   let(:user_serializer) { Class.new(base) { type(:user) } }
   let(:profile_serializer) { Class.new(base) { type(:profile) } }
@@ -13,7 +18,7 @@ describe "Jat::Plugins::JsonApiActiverecord::Preloads" do
   let(:jat_profile) { profile_serializer.allocate }
   let(:jat_email) { email_serializer.allocate }
 
-  let(:described_class) { Jat::Plugins::JsonApiActiverecord::Preloads }
+  let(:described_class) { Jat::Plugins::JsonApiPreloads::Preloads }
 
   def define_map(map)
     jat_user.expects(:map).returns(map)

data/test/lib/jat/plugins/simple_api/lib/response_test.rb

@@ -13,7 +13,7 @@ describe "Jat::Plugins::SimpleApi::Response" do
 
   it "returns correct structure with data" do
     str_serializer = Class.new(base_class) do
-      attribute(:id) { |_| "STRING" }
+      attribute(:id) { |obj| obj }
     end
 
     assert_equal({id: "STRING"}, str_serializer.to_h("STRING"))

data/test/lib/jat/plugins/simple_api/simple_api_test.rb

@@ -16,14 +16,6 @@ describe "Jat::Plugins::SimpleApi" do
   let(:plugin) { @plugin }
 
   describe ".after_load" do
-    it "loads simple_api_activerecord plugin if activerecord option provided" do
-      jat_class = Class.new(Jat)
-      jat_class.expects(:plugin).with(:simple_api_activerecord, activerecord: true)
-
-      plugin.load(jat_class)
-      plugin.after_load(jat_class, activerecord: true)
-    end
-
     it "adds default `:meta` meta_key config option" do
       jat_class = Class.new(Jat)
       assert_nil jat_class.config[:meta_key]

data/test/lib/jat/plugins/simple_api_activerecord/simple_api_activerecord_test.rb

@@ -13,26 +13,12 @@ describe "Jat::Plugins::SimpleApiActiverecord" do
     assert_match(/simple_api/, error.message)
   end
 
-  it "loads other plugins in after_load" do
+  it "loads other plugins" do
     jat_class = Class.new(Jat)
     jat_class.plugin :simple_api
+    jat_class.plugin :simple_api_activerecord
 
-    jat_class.expects(:plugin).with(:_preloads, foo: :bar)
-    jat_class.expects(:plugin).with(:_activerecord_preloads, foo: :bar)
-
-    @plugin.after_load(jat_class, foo: :bar)
-  end
-
-  describe "InstanceMethods" do
-    it "add .preloads method as a delegator to #{@plugin}::Preloads" do
-      jat_class = Class.new(Jat)
-      jat_class.plugin :simple_api
-      jat_class.plugin @plugin
-      jat = jat_class.allocate
-
-      @plugin::Preloads.expects(:call).with(jat).returns("RES")
-
-      assert_equal "RES", jat.preloads
-    end
+    assert jat_class.plugin_used?(:simple_api_preloads)
+    assert jat_class.plugin_used?(:_activerecord_preloads)
   end
 end

data/test/lib/jat/plugins/{simple_api_activerecord → simple_api_preloads}/lib/preloads_test.rb

@@ -2,8 +2,13 @@
 
 require "test_helper"
 
-describe "Jat::Plugins::SimpleApiActiverecord::Preloads" do
-  let(:base) { Class.new(Jat) { plugin :simple_api, activerecord: true } }
+describe "Jat::Plugins::SimpleApiPreloads::Preloads" do
+  let(:base) do
+    Class.new(Jat) do
+      plugin :simple_api
+      plugin :simple_api_preloads
+    end
+  end
 
   let(:user_serializer) { Class.new(base) }
   let(:profile_serializer) { Class.new(base) }
@@ -13,7 +18,7 @@ describe "Jat::Plugins::SimpleApiActiverecord::Preloads" do
   let(:jat_profile) { profile_serializer.new }
   let(:jat_email) { email_serializer.new }
 
-  let(:described_class) { Jat::Plugins::SimpleApiActiverecord::Preloads }
+  let(:described_class) { Jat::Plugins::SimpleApiPreloads::Preloads }
 
   def define_map(map)
     user_serializer::Map.expects(:call).returns(map)

data/test/lib/jat/plugins/simple_api_preloads/simple_api_preloads_test.rb

@@ -0,0 +1,37 @@
+# frozen_string_literal: true
+
+require "test_helper"
+
+describe "Jat::Plugins::SimpleApiPreloads" do
+  before do
+    @plugin = Jat::Plugins.find_plugin(:simple_api_preloads)
+  end
+
+  it "checks simple_api plugin loaded before" do
+    jat_class = Class.new(Jat)
+    error = assert_raises(Jat::Error) { jat_class.plugin @plugin }
+    assert_match(/simple_api/, error.message)
+  end
+
+  it "loads other plugins in before_load" do
+    jat_class = Class.new(Jat)
+    jat_class.plugin :simple_api
+
+    jat_class.expects(:plugin).with(:_preloads, foo: :bar)
+
+    @plugin.before_load(jat_class, foo: :bar)
+  end
+
+  describe "InstanceMethods" do
+    it "add .preloads method as a delegator to #{@plugin}::Preloads" do
+      jat_class = Class.new(Jat)
+      jat_class.plugin :simple_api
+      jat_class.plugin @plugin
+      jat = jat_class.allocate
+
+      @plugin::Preloads.expects(:call).with(jat).returns("RES")
+
+      assert_equal "RES", jat.preloads
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jat
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
 platform: ruby
 authors:
 - Andrey Glushkov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-11-01 00:00:00.000000000 Z
+date: 2022-01-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest
@@ -120,13 +120,14 @@ files:
 - lib/jat/attribute.rb
 - lib/jat/config.rb
 - lib/jat/plugins.rb
-- lib/jat/plugins/_activerecord_preloads/_activerecord_preloads.rb
-- lib/jat/plugins/_activerecord_preloads/lib/preloader.rb
-- lib/jat/plugins/_lower_camel_case/_lower_camel_case.rb
-- lib/jat/plugins/_preloads/_preloads.rb
-- lib/jat/plugins/_preloads/lib/format_user_preloads.rb
-- lib/jat/plugins/_preloads/lib/preloads_with_path.rb
+- lib/jat/plugins/activerecord/activerecord.rb
 - lib/jat/plugins/cache/cache.rb
+- lib/jat/plugins/common/_activerecord_preloads/_activerecord_preloads.rb
+- lib/jat/plugins/common/_activerecord_preloads/lib/preloader.rb
+- lib/jat/plugins/common/_lower_camel_case/_lower_camel_case.rb
+- lib/jat/plugins/common/_preloads/_preloads.rb
+- lib/jat/plugins/common/_preloads/lib/format_user_preloads.rb
+- lib/jat/plugins/common/_preloads/lib/preloads_with_path.rb
 - lib/jat/plugins/json_api/json_api.rb
 - lib/jat/plugins/json_api/lib/fields_param_parser.rb
 - lib/jat/plugins/json_api/lib/include_param_parser.rb
@@ -139,27 +140,33 @@ files:
 - lib/jat/plugins/json_api/lib/params/include/validate.rb
 - lib/jat/plugins/json_api/lib/response.rb
 - lib/jat/plugins/json_api/lib/response_piece.rb
-- lib/jat/plugins/json_api_activerecord/json_api_activerecord.rb
-- lib/jat/plugins/json_api_activerecord/lib/preloads.rb
-- lib/jat/plugins/json_api_lower_camel_case/json_api_lower_camel_case.rb
-- lib/jat/plugins/json_api_maps_cache/json_api_maps_cache.rb
-- lib/jat/plugins/json_api_validate_params/json_api_validate_params.rb
-- lib/jat/plugins/json_api_validate_params/lib/params_error.rb
-- lib/jat/plugins/json_api_validate_params/lib/validate_fields_param.rb
-- lib/jat/plugins/json_api_validate_params/lib/validate_include_param.rb
+- lib/jat/plugins/json_api/plugins/json_api_activerecord/json_api_activerecord.rb
+- lib/jat/plugins/json_api/plugins/json_api_lower_camel_case/json_api_lower_camel_case.rb
+- lib/jat/plugins/json_api/plugins/json_api_maps_cache/json_api_maps_cache.rb
+- lib/jat/plugins/json_api/plugins/json_api_preloads/json_api_preloads.rb
+- lib/jat/plugins/json_api/plugins/json_api_preloads/lib/preloads.rb
+- lib/jat/plugins/json_api/plugins/json_api_validate_params/json_api_validate_params.rb
+- lib/jat/plugins/json_api/plugins/json_api_validate_params/lib/params_error.rb
+- lib/jat/plugins/json_api/plugins/json_api_validate_params/lib/validate_fields_param.rb
+- lib/jat/plugins/json_api/plugins/json_api_validate_params/lib/validate_include_param.rb
+- lib/jat/plugins/lower_camel_case/lower_camel_case.rb
+- lib/jat/plugins/maps_cache/maps_cache.rb
+- lib/jat/plugins/preloads/preloads.rb
 - lib/jat/plugins/simple_api/lib/fields_param_parser.rb
 - lib/jat/plugins/simple_api/lib/map.rb
 - lib/jat/plugins/simple_api/lib/response.rb
 - lib/jat/plugins/simple_api/lib/response_piece.rb
+- lib/jat/plugins/simple_api/plugins/simple_api_activerecord/simple_api_activerecord.rb
+- lib/jat/plugins/simple_api/plugins/simple_api_lower_camel_case/simple_api_lower_camel_case.rb
+- lib/jat/plugins/simple_api/plugins/simple_api_maps_cache/simple_api_maps_cache.rb
+- lib/jat/plugins/simple_api/plugins/simple_api_preloads/lib/preloads.rb
+- lib/jat/plugins/simple_api/plugins/simple_api_preloads/simple_api_preloads.rb
+- lib/jat/plugins/simple_api/plugins/simple_api_validate_params/lib/fields_error.rb
+- lib/jat/plugins/simple_api/plugins/simple_api_validate_params/lib/validate_fields_param.rb
+- lib/jat/plugins/simple_api/plugins/simple_api_validate_params/simple_api_validate_params.rb
 - lib/jat/plugins/simple_api/simple_api.rb
-- lib/jat/plugins/simple_api_activerecord/lib/preloads.rb
-- lib/jat/plugins/simple_api_activerecord/simple_api_activerecord.rb
-- lib/jat/plugins/simple_api_lower_camel_case/simple_api_lower_camel_case.rb
-- lib/jat/plugins/simple_api_maps_cache/simple_api_maps_cache.rb
-- lib/jat/plugins/simple_api_validate_params/lib/fields_error.rb
-- lib/jat/plugins/simple_api_validate_params/lib/validate_fields_param.rb
-- lib/jat/plugins/simple_api_validate_params/simple_api_validate_params.rb
 - lib/jat/plugins/to_str/to_str.rb
+- lib/jat/plugins/validate_params/validate_params.rb
 - lib/jat/utils/enum_deep_dup.rb
 - lib/jat/utils/enum_deep_freeze.rb
 - test/lib/jat/attribute_test.rb
@@ -177,18 +184,20 @@ files:
 - test/lib/jat/plugins/json_api/lib/map_test.rb
 - test/lib/jat/plugins/json_api/lib/response_test.rb
 - test/lib/jat/plugins/json_api_activerecord/json_api_activerecord_test.rb
-- test/lib/jat/plugins/json_api_activerecord/lib/preloads_test.rb
 - test/lib/jat/plugins/json_api_camel_lower/json_api_camel_lower_test.rb
 - test/lib/jat/plugins/json_api_maps_cache/json_api_maps_cache_test.rb
+- test/lib/jat/plugins/json_api_preloads/json_api_preloads_test.rb
+- test/lib/jat/plugins/json_api_preloads/lib/preloads_test.rb
 - test/lib/jat/plugins/json_api_validate_params/json_api_validate_params_test.rb
 - test/lib/jat/plugins/simple_api/lib/fields_param_parser_test.rb
 - test/lib/jat/plugins/simple_api/lib/map_test.rb
 - test/lib/jat/plugins/simple_api/lib/response_test.rb
 - test/lib/jat/plugins/simple_api/simple_api_test.rb
-- test/lib/jat/plugins/simple_api_activerecord/lib/preloads_test.rb
 - test/lib/jat/plugins/simple_api_activerecord/simple_api_activerecord_test.rb
 - test/lib/jat/plugins/simple_api_camel_lower/simple_api_camel_lower_test.rb
 - test/lib/jat/plugins/simple_api_maps_cache/simple_api_maps_cache_test.rb
+- test/lib/jat/plugins/simple_api_preloads/lib/preloads_test.rb
+- test/lib/jat/plugins/simple_api_preloads/simple_api_preloads_test.rb
 - test/lib/jat/plugins/simple_api_validate_params/simple_api_validate_params_test.rb
 - test/lib/jat/plugins/to_str/to_str_test.rb
 - test/lib/jat/utils/enum_deep_dup_test.rb
@@ -240,18 +249,20 @@ test_files:
 - test/lib/jat/plugins/json_api/lib/map_test.rb
 - test/lib/jat/plugins/json_api/lib/response_test.rb
 - test/lib/jat/plugins/json_api_activerecord/json_api_activerecord_test.rb
-- test/lib/jat/plugins/json_api_activerecord/lib/preloads_test.rb
 - test/lib/jat/plugins/json_api_camel_lower/json_api_camel_lower_test.rb
 - test/lib/jat/plugins/json_api_maps_cache/json_api_maps_cache_test.rb
+- test/lib/jat/plugins/json_api_preloads/json_api_preloads_test.rb
+- test/lib/jat/plugins/json_api_preloads/lib/preloads_test.rb
 - test/lib/jat/plugins/json_api_validate_params/json_api_validate_params_test.rb
 - test/lib/jat/plugins/simple_api/lib/fields_param_parser_test.rb
 - test/lib/jat/plugins/simple_api/lib/map_test.rb
 - test/lib/jat/plugins/simple_api/lib/response_test.rb
 - test/lib/jat/plugins/simple_api/simple_api_test.rb
-- test/lib/jat/plugins/simple_api_activerecord/lib/preloads_test.rb
 - test/lib/jat/plugins/simple_api_activerecord/simple_api_activerecord_test.rb
 - test/lib/jat/plugins/simple_api_camel_lower/simple_api_camel_lower_test.rb
 - test/lib/jat/plugins/simple_api_maps_cache/simple_api_maps_cache_test.rb
+- test/lib/jat/plugins/simple_api_preloads/lib/preloads_test.rb
+- test/lib/jat/plugins/simple_api_preloads/simple_api_preloads_test.rb
 - test/lib/jat/plugins/simple_api_validate_params/simple_api_validate_params_test.rb
 - test/lib/jat/plugins/to_str/to_str_test.rb
 - test/lib/jat/utils/enum_deep_dup_test.rb

data/lib/jat/plugins/simple_api_activerecord/simple_api_activerecord.rb

@@ -1,31 +0,0 @@
-# frozen_string_literal: true
-
-require_relative "./lib/preloads"
-
-class Jat
-  module Plugins
-    module SimpleApiActiverecord
-      def self.before_load(jat_class, **_opts)
-        return if jat_class.plugin_used?(:simple_api)
-        raise Error, "Please load :simple_api plugin first"
-      end
-
-      def self.load(jat_class, **_opts)
-        jat_class.include(InstanceMethods)
-      end
-
-      def self.after_load(jat_class, **opts)
-        jat_class.plugin :_preloads, **opts
-        jat_class.plugin :_activerecord_preloads, **opts
-      end
-
-      module InstanceMethods
-        def preloads
-          @preloads ||= Preloads.call(self)
-        end
-      end
-    end
-
-    register_plugin(:simple_api_activerecord, SimpleApiActiverecord)
-  end
-end