jat 0.0.6 → 0.0.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 18b7274ab643b613d2356e6f4704683d0ee17f6789fc3c01ba5c6435b09c0c84
-  data.tar.gz: 197d92680d9bbe8610eca370516fc2b7a36bb7a6dfadf0a2fc75ce5e3959af90
+  metadata.gz: d7b5ab9fe35df564d6282bd57f3008293bbc38e72c7dbf0ade8ef27734aafb10
+  data.tar.gz: c2bd6717c5555e862bdaafab2bdd16f510d7535be1922e0327253fee7d8cb248
 SHA512:
-  metadata.gz: f887b6f910f4677439e5842e4882eedb349e2bc6865e987b9dcec565dca83e20e13b2cf31eed117a332b1ae044c3194445f4241ba65c053c2b7adbba4ceb316d
-  data.tar.gz: 9562212be2cacf78f9e6e166ca25d7eddfd995d15d16470b1b39cdd0e0cec33d8ffe14b912b4331d51079a6b16b76dd45f4cb2b9d7f74b3ebbab7dbcca202cee
+  metadata.gz: 2979f947fc8b2052632549e92990ef0f9039c582915cd405d97954f2a7aa6d7c6bf88627aea7e708f8417107a89e2ea089dfd3f0005425147cca297eb138e3f0
+  data.tar.gz: f90de936bc75392e315c4e8c5e8bf3e191aacaca84dd7b0a3dd924d93976e753bccf31425cc9b8588c406dbde0a0690cf0f13788d1e7ffb5871dfdcb553152a0

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,7 +63,7 @@ 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 = current_block
@@ -79,29 +81,14 @@ class Jat
       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
-
-    module ClassMethods
-      # Returns the Jat class that this Attribute class is namespaced under.
-      attr_accessor :jat_class
-
-      # Since Attribute is anonymously subclassed when Jat is subclassed,
-      # and then assigned to a constant of the Jat subclass, make inspect
-      # reflect the likely name for the class.
-      def inspect
-        "#{jat_class.inspect}::Attribute"
       end
     end
 
-    extend ClassMethods
+    extend Jat::JatClass
     include InstanceMethods
   end
 end

data/lib/jat/config.rb

@@ -1,38 +1,23 @@
 # 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
-    end
-
-    module ClassMethods
-      # Returns the Jat class that this config class is namespaced under.
-      attr_accessor :jat_class
-
-      # Since Config is anonymously subclassed when Jat is subclassed,
-      # and then assigned to a constant of the Jat subclass, make inspect
-      # reflect the likely name for the class.
-      def inspect
-        "#{jat_class.inspect}::Config"
-      end
+      def_delegators :@opts, :[], :[]=, :fetch
     end
 
     include InstanceMethods
-    extend ClassMethods
+    extend Jat::JatClass
   end
 end

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

@@ -4,9 +4,9 @@ require_relative "./lib/preloader"
 
 class Jat
   module Plugins
-    module ActiverecordPreloads
+    module BaseActiverecordPreloads
       def self.plugin_name
-        :_activerecord_preloads
+        :base_activerecord_preloads
       end
 
       def self.load(jat_class, **_opts)
@@ -33,6 +33,6 @@ class Jat
       end
     end
 
-    register_plugin(ActiverecordPreloads.plugin_name, ActiverecordPreloads)
+    register_plugin(BaseActiverecordPreloads.plugin_name, BaseActiverecordPreloads)
   end
 end

data/lib/jat/plugins/{common/_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)
@@ -21,6 +21,7 @@ class Jat
       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
@@ -28,6 +29,7 @@ class Jat
             ActiveRecord::Associations::Preloader.new.preload(records, associations)
           end
         end
+        # :nocov:
       end
 
       class ActiverecordObject

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

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

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

@@ -6,9 +6,9 @@ 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
-        :_preloads
+        :base_preloads
       end
 
       def self.load(jat_class, **_opts)
@@ -58,6 +58,6 @@ class Jat
       end
     end
 
-    register_plugin(Preloads.plugin_name, Preloads)
+    register_plugin(BasePreloads.plugin_name, BasePreloads)
   end
 end

data/lib/jat/plugins/{common/_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/{common/_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/json_api/lib/fields_param_parser.rb

@@ -7,16 +7,6 @@ class Jat
         module ClassMethods
           COMMA = ","
 
-          # Returns the Jat class that this FieldsParamParser class is namespaced under.
-          attr_accessor :jat_class
-
-          # Since FieldsParamParser is anonymously subclassed when Jat is subclassed,
-          # and then assigned to a constant of the Jat subclass, make inspect
-          # reflect the likely name for the class.
-          def inspect
-            "#{jat_class.inspect}::FieldsParamParser"
-          end
-
           def parse(fields)
             return FROZEN_EMPTY_HASH unless fields
 
@@ -33,6 +23,7 @@ class Jat
           end
         end
 
+        extend Jat::JatClass
         extend ClassMethods
       end
     end

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

@@ -8,16 +8,6 @@ class Jat
           COMMA = ","
           DOT = "."
 
-          # Returns the Jat class that this IncludeParamParser class is namespaced under.
-          attr_accessor :jat_class
-
-          # Since IncludeParamParser is anonymously subclassed when Jat is subclassed,
-          # and then assigned to a constant of the Jat subclass, make inspect
-          # reflect the likely name for the class.
-          def inspect
-            "#{jat_class.inspect}::IncludeParamParser"
-          end
-
           def parse(includes_string_param)
             return {} unless includes_string_param
 
@@ -77,6 +67,7 @@ class Jat
           end
         end
 
+        extend Jat::JatClass
         extend ClassMethods
       end
     end

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

@@ -5,16 +5,6 @@ class Jat
     module JsonApi
       class Map
         module ClassMethods
-          # Returns the Jat class that this Map class is namespaced under.
-          attr_accessor :jat_class
-
-          # Since Map is anonymously subclassed when Jat is subclassed,
-          # and then assigned to a constant of the Jat subclass, make inspect
-          # reflect the likely name for the class.
-          def inspect
-            "#{jat_class.inspect}::Map"
-          end
-
           # Returns structure like
           # {
           #   type1 => {
@@ -103,14 +93,14 @@ 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
 
+        extend Jat::JatClass
         extend ClassMethods
         include InstanceMethods
       end

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

@@ -6,16 +6,6 @@ class Jat
     module JsonApi
       class Response
         module ClassMethods
-          # Returns the Jat class that this Response class is namespaced under.
-          attr_accessor :jat_class
-
-          # Since Response is anonymously subclassed when Jat is subclassed,
-          # and then assigned to a constant of the Jat subclass, make inspect
-          # reflect the likely name for the class.
-          def inspect
-            "#{jat_class.inspect}::Response"
-          end
-
           def call(object, context)
             new(object, context).to_h
           end
@@ -87,7 +77,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 +88,6 @@ class Jat
             data
           end
 
-          def attribute_value(attribute)
-            attribute.block.call(object, context)
-          end
-
           def context_jsonapi
             context_attr_transform(:jsonapi)
           end
@@ -119,6 +105,7 @@ class Jat
           end
         end
 
+        extend Jat::JatClass
         extend ClassMethods
         include InstanceMethods
       end

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

@@ -5,16 +5,6 @@ class Jat
     module JsonApi
       class ResponsePiece
         module ClassMethods
-          # Returns the Jat class that this ResponsePiece class is namespaced under.
-          attr_accessor :jat_class
-
-          # Since ResponsePiece is anonymously subclassed when Jat is subclassed,
-          # and then assigned to a constant of the Jat subclass, make inspect
-          # reflect the likely name for the class.
-          def inspect
-            "#{jat_class.inspect}::ResponsePiece"
-          end
-
           def call(object, context, map, includes)
             new(object, context, map, includes).to_h
           end
@@ -60,7 +50,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 +60,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)
@@ -123,37 +113,37 @@ 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
@@ -163,10 +153,11 @@ class Jat
           end
 
           def id
-            @id ||= jat_class.get_id.block.call(object, context)
+            @id ||= jat_class.get_id.value(object, context)
           end
         end
 
+        extend Jat::JatClass
         extend ClassMethods
         include InstanceMethods
       end

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

@@ -14,7 +14,7 @@ class Jat
 
       def self.load(jat_class, **opts)
         jat_class.plugin :json_api_preloads, **opts
-        jat_class.plugin :_activerecord_preloads, **opts
+        jat_class.plugin :base_activerecord_preloads, **opts
       end
     end
 

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

@@ -10,7 +10,7 @@ class Jat
       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)

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

@@ -12,7 +12,7 @@ class Jat
       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 :_preloads, **opts
+        jat_class.plugin :base_preloads, **opts
       end
 
       def self.load(jat_class, **_opts)

data/lib/jat/plugins/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/presenter/presenter.rb

@@ -0,0 +1,79 @@
+# frozen_string_literal: true
+
+require "delegate"
+require "forwardable"
+
+class Jat
+  module Plugins
+    module Presenter
+      def self.plugin_name
+        :presenter
+      end
+
+      def self.before_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
+
+      def self.load(jat_class, **_opts)
+        jat_class.extend(ClassMethods)
+        jat_class::ResponsePiece.include(ResponsePieceInstanceMethods)
+      end
+
+      def self.after_load(jat_class, **_opts)
+        presenter_class = Class.new(Presenter)
+        presenter_class.jat_class = jat_class
+        jat_class.const_set(:Presenter, presenter_class)
+      end
+
+      class Presenter < SimpleDelegator
+        module InstanceMethods
+          # Delegates all missing methods to current object.
+          # We create real methods after first missing method.
+          # rubocop:disable Style/MissingRespondToMissing (base SimpleDelegator class has this method)
+          def method_missing(name, *args, &block)
+            super(name, *args, &block).tap do
+              self.class.def_delegator :__getobj__, name
+            end
+          end
+          # rubocop:enable Style/MissingRespondToMissing
+        end
+
+        extend Forwardable
+        extend Jat::JatClass
+        include InstanceMethods
+      end
+
+      module ClassMethods
+        def inherited(subclass)
+          presenter_class = Class.new(self::Presenter)
+          presenter_class.jat_class = subclass
+          subclass.const_set(:Presenter, presenter_class)
+
+          super
+        end
+
+        def attribute(name, **opts, &block)
+          # Define attr_accessor in presenter automatically
+          super.tap do |attribute|
+            self::Presenter.def_delegator(:__getobj__, attribute.key) unless attribute.params[:block]
+          end
+        end
+      end
+
+      module ResponsePieceInstanceMethods
+        def initialize(*)
+          super
+          @object = jat_class::Presenter.new(object)
+        end
+      end
+    end
+
+    register_plugin(Presenter.plugin_name, Presenter)
+  end
+end

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

@@ -5,20 +5,10 @@ class Jat
     module SimpleApi
       class FieldsParamParser
         module ClassMethods
-          # Returns the Jat class that this FieldsParamParser class is namespaced under.
-          attr_accessor :jat_class
-
-          # Since FieldsParamParser is anonymously subclassed when Jat is subclassed,
-          # and then assigned to a constant of the Jat subclass, make inspect
-          # reflect the likely name for the class.
-          def inspect
-            "#{jat_class.inspect}::FieldsParamParser"
-          end
-
           def parse(fields)
             return FROZEN_EMPTY_HASH unless fields
 
-            new(fields).parse
+            new.parse(fields)
           end
         end
 
@@ -27,68 +17,53 @@ class Jat
           OPEN_BRACKET = "("
           CLOSE_BRACKET = ")"
 
-          def initialize(fields)
-            @fields = fields
-          end
-
           # user => { user: {} }
           # user(id) => { user: { id: {} } }
           # user(id,name) => { user: { id: {}, name: {} } }
           # user,comments => { user: {}, comments: {} }
           # user(comments(text)) => { user: { comments: { text: {} } } }
-          def parse
-            current_attr = nil
+          def parse(fields)
+            res = {}
+            attribute = +""
+            path_stack = nil
 
             fields.each_char do |char|
               case char
               when COMMA
-                next unless current_attr
-
-                add_attribute(current_attr)
-                current_attr = nil
+                add_attribute(res, path_stack, attribute, FROZEN_EMPTY_HASH)
               when CLOSE_BRACKET
-                if current_attr
-                  add_attribute(current_attr)
-                  current_attr = nil
-                end
-
-                route.pop
+                add_attribute(res, path_stack, attribute, FROZEN_EMPTY_HASH)
+                path_stack&.pop
               when OPEN_BRACKET
-                next unless current_attr
-
-                attribute_name = add_attribute(current_attr, {})
-                route << attribute_name
-                current_attr = nil
+                name = add_attribute(res, path_stack, attribute, {})
+                (path_stack ||= []).push(name) if name
               else
-                current_attr = current_attr ? current_attr.insert(-1, char) : char
+                attribute.insert(-1, char)
               end
             end
 
-            add_attribute(current_attr) if current_attr
+            add_attribute(res, path_stack, attribute, FROZEN_EMPTY_HASH)
 
             res
           end
 
           private
 
-          attr_reader :fields
+          def add_attribute(res, path_stack, attribute, nested_attributes = FROZEN_EMPTY_HASH)
+            attribute.strip!
+            return if attribute.empty?
 
-          def add_attribute(current_attr, nested_attrs = FROZEN_EMPTY_HASH)
-            current_resource = route.empty? ? res : res.dig(*route)
-            attribute_name = current_attr.strip.to_sym
-            current_resource[attribute_name] = nested_attrs
-            attribute_name
-          end
+            name = attribute.to_sym
+            attribute.clear
 
-          def res
-            @res ||= {}
-          end
+            current_attrs = !path_stack || path_stack.empty? ? res : res.dig(*path_stack)
+            current_attrs[name] = nested_attributes
 
-          def route
-            @route ||= []
+            name
           end
         end
 
+        extend Jat::JatClass
         extend ClassMethods
         include InstanceMethods
       end