jat 0.0.6 → 0.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 18b7274ab643b613d2356e6f4704683d0ee17f6789fc3c01ba5c6435b09c0c84
-  data.tar.gz: 197d92680d9bbe8610eca370516fc2b7a36bb7a6dfadf0a2fc75ce5e3959af90
+  metadata.gz: e4b14981546d524f665e1d268857bd8b2caafec9af07157a1f57fd2ca8f9c83c
+  data.tar.gz: 1335c436d0e4ae1f70fb70a9ef5757610e09ce3b5a03b87ba356d31625af0ab3
 SHA512:
-  metadata.gz: f887b6f910f4677439e5842e4882eedb349e2bc6865e987b9dcec565dca83e20e13b2cf31eed117a332b1ae044c3194445f4241ba65c053c2b7adbba4ceb316d
-  data.tar.gz: 9562212be2cacf78f9e6e166ca25d7eddfd995d15d16470b1b39cdd0e0cec33d8ffe14b912b4331d51079a6b16b76dd45f4cb2b9d7f74b3ebbab7dbcca202cee
+  metadata.gz: fcaccbe3cb5e5a27cd5700e3677886fb9966ef8ce2775bf2be6638578489747b8a488acbd3f6f7f55752323c40bc92410af1d079dfeefe2d4b41d4f768fbfbfb
+  data.tar.gz: 23a2cbda699f9e8f2a9588dc8cfb4350bbd1a1994603577bd3649a356148ad88d2bd754529bb63905aba59a993cc747c2e5ad762038fb571d5d83b1ecc6d40b4

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/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

@@ -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)
@@ -123,14 +123,14 @@ 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
 
@@ -141,7 +141,7 @@ class Jat
             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
@@ -153,7 +153,7 @@ class Jat
             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,7 +163,7 @@ class Jat
           end
 
           def id
-            @id ||= jat_class.get_id.block.call(object, context)
+            @id ||= jat_class.get_id.value(object, context)
           end
         end
 

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

@@ -95,7 +95,7 @@ class Jat
             meta.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)
@@ -109,10 +109,6 @@ class Jat
           def context_metadata
             context[:meta]&.transform_keys(&:to_sym) || FROZEN_EMPTY_HASH
           end
-
-          def attribute_value(attribute)
-            attribute.block.call(object, context)
-          end
         end
 
         extend ClassMethods

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

@@ -37,7 +37,7 @@ class Jat
 
             map.each do |key, inner_map|
               attribute = jat_class.attributes.fetch(key)
-              value = attribute_value(attribute)
+              value = attribute.value(object, context)
 
               result[key] =
                 if attribute.relation?
@@ -56,10 +56,6 @@ class Jat
 
           private
 
-          def attribute_value(attribute)
-            attribute.block.call(object, context)
-          end
-
           def inner_piece(attribute, value, inner_map)
             serializer = attribute.serializer.call
             serializer::ResponsePiece.to_h(value, context, inner_map)

data/lib/jat/plugins/types/types.rb

@@ -0,0 +1,54 @@
+# frozen_string_literal: true
+
+class Jat
+  module Plugins
+    module Types
+      def self.plugin_name
+        :types
+      end
+
+      def self.load(jat_class, **_opts)
+        jat_class::Attribute.include(InstanceMethods)
+      end
+
+      def self.after_load(jat_class, **_opts)
+        jat_class.config[:types] = {
+          array: ->(value) { Array(value) },
+          bool: ->(value) { !!value },
+          float: ->(value) { Float(value) },
+          hash: ->(value) { Hash(value) },
+          int: ->(value) { Integer(value) },
+          str: ->(value) { String(value) }
+        }
+      end
+
+      module InstanceMethods
+        def block
+          return @block if instance_variable_defined?(:@block)
+
+          original_block = super
+          type = opts[:type]
+          return original_block unless type
+
+          @block = typed_block(type, original_block)
+        end
+
+        private
+
+        def typed_block(type, original_block)
+          proc do |object, context|
+            value = original_block.call(object, context)
+
+            # Type conversion
+            case type
+            when Symbol then self.class.jat_class.config.fetch(:types).fetch(type).call(value)
+            else type.call(value)
+            end
+          end
+        end
+      end
+    end
+
+    register_plugin(Types.plugin_name, Types)
+  end
+end

data/test/lib/jat/plugins/types/types_test.rb

@@ -0,0 +1,79 @@
+# frozen_string_literal: true
+
+require "test_helper"
+
+describe "Jat::Plugins::Types" do
+  let(:struct) { Struct.new(:attr) }
+  let(:obj) { struct.new(nil) }
+
+  let(:jat_class) do
+    new_class = Class.new(Jat)
+    new_class.plugin(:types)
+    new_class
+  end
+
+  def attr_value(original_value)
+    obj = struct.new(original_value)
+    jat_class.attributes[:attr].value(obj, nil)
+  end
+
+  it "has predefined :int type" do
+    jat_class.attribute(:attr, type: :int)
+
+    assert_equal(0, attr_value("0"))
+    assert_equal(8, attr_value("010")) # octal system
+    assert_equal(10, attr_value("0xa")) # hexadecimal system
+  end
+
+  it "has predefined :bool type" do
+    jat_class.attribute(:attr, type: :bool)
+
+    assert_equal(false, attr_value(nil))
+    assert_equal(false, attr_value(false))
+    assert_equal(true, attr_value(1))
+  end
+
+  it "has predefined :float type" do
+    jat_class.attribute(:attr, type: :float)
+
+    assert_same(0.0, attr_value("0"))
+    assert_same(0.001, attr_value("1e-3"))
+    assert_same(1.234, attr_value("1.234"))
+  end
+
+  it "has predefined :array type" do
+    jat_class.attribute(:attr, type: :array)
+
+    assert_equal([1], attr_value(1))
+    assert_equal([1], attr_value([1]))
+  end
+
+  it "has predefined :hash type" do
+    jat_class.attribute(:attr, type: :hash)
+
+    assert_equal({}, attr_value([]))
+    assert_equal({}, attr_value({}))
+    assert_equal({key: :value}, attr_value(key: :value))
+  end
+
+  it "has predefined :str type" do
+    jat_class.attribute(:attr, type: :str)
+
+    assert_equal("", attr_value(nil))
+    assert_equal("123", attr_value(123))
+  end
+
+  it "allows to use callable method as type" do
+    jat_class.attribute(:attr, type: ->(obj) { obj ? :yes : :no })
+
+    assert_equal(:no, attr_value(nil))
+    assert_equal(:yes, attr_value(1))
+  end
+
+  it "allows to configure custom type" do
+    jat_class.config[:types][:year] = ->(obj) { obj.strftime("%Y") }
+    jat_class.attribute(:attr, type: :year)
+
+    assert_equal("2020", attr_value(Time.new(2020, 10, 10)))
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jat
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.7
 platform: ruby
 authors:
 - Andrey Glushkov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-01-06 00:00:00.000000000 Z
+date: 2022-01-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest
@@ -86,14 +86,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '6.0'
+        version: '7.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '6.0'
+        version: '7.0'
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
@@ -166,6 +166,7 @@ files:
 - 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/to_str/to_str.rb
+- lib/jat/plugins/types/types.rb
 - lib/jat/plugins/validate_params/validate_params.rb
 - lib/jat/utils/enum_deep_dup.rb
 - lib/jat/utils/enum_deep_freeze.rb
@@ -200,6 +201,7 @@ files:
 - 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/plugins/types/types_test.rb
 - test/lib/jat/utils/enum_deep_dup_test.rb
 - test/lib/jat/utils/enum_deep_freeze_test.rb
 - test/lib/jat_test.rb
@@ -265,6 +267,7 @@ test_files:
 - 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/plugins/types/types_test.rb
 - test/lib/jat/utils/enum_deep_dup_test.rb
 - test/lib/jat/utils/enum_deep_freeze_test.rb
 - test/lib/jat_test.rb