jat 0.0.8 → 0.0.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c266d5784440b62adbb20bb09902f0134ad5e6a06245974f9b15a0557733528d
-  data.tar.gz: 989344e5918b193a2db72a863337c7209aa34ee9e1b28b7bf68f8bd9a9749b9d
+  metadata.gz: 0b59dbef3044d5b23c7b8178e23f931458b3acb5ced78b3750c5f1d7bb8ea01e
+  data.tar.gz: 7ebf0b1ec19a10872b8e659bd3ab9cd45a5859ace34f87c65070a83af713a2fd
 SHA512:
-  metadata.gz: eba6f92cd51c734ef0583447b2300971fd4707e0e79cece169858d6551e75fba688ce6155dae9317184d423b519e1398d8f583b643174cf4d4450700d73bf3c9
-  data.tar.gz: bf14496368b37ec614f0f79b76c217df8c60a8401a54d48e30925fad6c7501fdba7533758b9b5bde24035b645aae2c204b9fc05740282a4ff23ce5e80968e529
+  metadata.gz: e7e4b943c4b6452937d2c025f47bc1e3e4484151748139682ad03724fa3bc5138f02c23400426ceb3fb6c948112dd91015c1beddfd4da2ee3a1cd3187e0a5d5c
+  data.tar.gz: de404f4d77ca9b68a50834b4e435f303f1ace3f66bb976ffa154e4159b01888fa27301795192c967a7cc3b2577c35a10012135521f7e91e9037833d7098f7816

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/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/simple_api/lib/fields_param_parser.rb

@@ -18,7 +18,7 @@ class Jat
           def parse(fields)
             return FROZEN_EMPTY_HASH unless fields
 
-            new(fields).parse
+            new.parse(fields)
           end
         end
 
@@ -27,65 +27,49 @@ 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
 

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

@@ -74,11 +74,10 @@ class Jat
           private
 
           def expose?(attribute, fields)
-            case exposed
-            when :all then true
-            when :none then manually_exposed?(attribute, fields)
-            else attribute.exposed? || manually_exposed?(attribute, fields)
-            end
+            return true if exposed == :all
+            return manually_exposed?(attribute, fields) if exposed == :none
+
+            attribute.exposed? || manually_exposed?(attribute, fields)
           end
 
           def manually_exposed?(attribute, fields)

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

@@ -38,7 +38,7 @@ class Jat
       end
 
       module FieldsParamParserMethods
-        def parse
+        def parse(*)
           super.tap { |result| ValidateFieldsParam.call(self.class.jat_class, result) }
         end
       end

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

@@ -40,9 +40,10 @@ class Jat
             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)
+            if type.is_a?(Symbol)
+              self.class.jat_class.config.fetch(:types).fetch(type).call(value)
+            else
+              type.call(value)
             end
           end
         end

data/lib/jat/plugins.rb

@@ -25,11 +25,12 @@ class Jat
         begin
           require_plugin(name)
         rescue PluginLoadError
-          if name.start_with?("json_api")
+          name_str = name.to_s
+          if name_str.start_with?("json_api")
             require_plugin(name, "/json_api/plugins")
-          elsif name.start_with?("simple_api")
+          elsif name_str.start_with?("simple_api")
             require_plugin(name, "/simple_api/plugins")
-          elsif name.start_with?("base")
+          elsif name_str.start_with?("base")
             require_plugin(name, "/base")
           else
             raise

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

@@ -3,8 +3,6 @@
 require "test_helper"
 
 describe "Jat::Plugins::JsonApi::Params::Include" do
-  before { Jat::Plugins.find_plugin(:json_api) }
-
   let(:base_class) { Class.new(Jat) { plugin :json_api } }
   let(:a_serializer) { Class.new(base_class) }
   let(:b_serializer) { Class.new(base_class) }

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

@@ -76,7 +76,6 @@ describe "Jat::Plugins::JsonApi::Response" do
   it "does not return has-one relationship when not exposed" do
     int_serializer = Class.new(base_class) do
       type "int"
-      id { |obj| obj }
     end
 
     str_serializer = Class.new(base_class) do

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

@@ -15,9 +15,6 @@ describe "Jat::Plugins::JsonApiPreloads::Preloads" do
   let(:email_serializer) { Class.new(base) { type(:email) } }
 
   let(:jat_user) { user_serializer.allocate }
-  let(:jat_profile) { profile_serializer.allocate }
-  let(:jat_email) { email_serializer.allocate }
-
   let(:described_class) { Jat::Plugins::JsonApiPreloads::Preloads }
 
   def define_map(map)

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

@@ -50,6 +50,10 @@ describe "Jat::Plugins::SimpleApi::FieldsParamParser" do
       assert_equal({users: {id: {}}}, parse("(users(id))"))
     end
 
+    it "parses fields started with extra close PAREN" do
+      assert_equal({users: {}}, parse(")users)"))
+    end
+
     it "parses single resource with multiple fields" do
       assert_equal({users: {id: {}, name: {}}}, parse("users(id,name)"))
     end

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

@@ -132,13 +132,11 @@ describe "Jat::Plugins::SimpleApi::Response" do
   end
 
   it "does not return has-one relationship when not exposed" do
-    int_serializer = Class.new(base_class) do
-      attribute(:id) { |obj| obj }
-    end
+    nested_serializer = Class.new(base_class)
 
     str_serializer = Class.new(base_class) do
       attribute(:id) { |obj| obj[0] }
-      attribute :length, serializer: int_serializer, exposed: false
+      attribute :length, serializer: nested_serializer, exposed: false
     end
 
     assert_equal({id: "S"}, str_serializer.to_h("STRING"))
@@ -243,12 +241,12 @@ describe "Jat::Plugins::SimpleApi::Response" do
     # All fields are not exposed in this serializers,
     # We will show only attributes provided in `fields` param
     chr_serializer = Class.new(base_class) do
-      attribute(:id, exposed: false) { |obj| obj }
+      attribute(:id, exposed: false)
       attribute :next, exposed: false
     end
 
     str_serializer = Class.new(base_class) do
-      attribute(:id, exposed: false) { |obj| obj }
+      attribute(:id, exposed: false)
       attribute :chars, serializer: chr_serializer, many: true, exposed: false
     end
 
@@ -308,14 +306,14 @@ describe "Jat::Plugins::SimpleApi::Response" do
     it "does not overwrite manually added meta" do
       str_serializer = Class.new(base_class) do
         root(:root)
-        meta(:version) { "1.2.3" }
+        meta(:length)
 
         attribute(:id) { |obj| obj }
       end
 
       assert_equal(
-        {root: {id: "1"}, meta: {version: "2.0.0"}},
-        str_serializer.to_h("1", meta: {version: "2.0.0"})
+        {root: {id: "1"}, meta: {length: "33"}},
+        str_serializer.to_h("1", meta: {length: "33"})
       )
     end
 

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

@@ -10,15 +10,10 @@ describe "Jat::Plugins::SimpleApiPreloads::Preloads" do
     end
   end
 
+  let(:described_class) { Jat::Plugins::SimpleApiPreloads::Preloads }
   let(:user_serializer) { Class.new(base) }
   let(:profile_serializer) { Class.new(base) }
-  let(:email_serializer) { Class.new(base) }
-
   let(:jat_user) { user_serializer.new }
-  let(:jat_profile) { profile_serializer.new }
-  let(:jat_email) { email_serializer.new }
-
-  let(:described_class) { Jat::Plugins::SimpleApiPreloads::Preloads }
 
   def define_map(map)
     user_serializer::Map.expects(:call).returns(map)

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

@@ -4,7 +4,6 @@ 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)

data/test/test_helper.rb

@@ -4,7 +4,8 @@
 # ARGV is not populated when running `ruby -Itest {file}`
 # ARGV is not populated when running test by `m` gem - `m {file}`
 # ARGV is not populated when running tests by `m` gem with line number - `m {file}:{line_number}`
-if ARGV.any?
+# jruby and truffleruby have bad simplecov support
+if RUBY_ENGINE == "ruby" && ARGV.any?
   require "simplecov"
   SimpleCov.start
 end
@@ -12,6 +13,5 @@ end
 require "bundler/setup"
 require "minitest/autorun"
 require "mocha/minitest"
-require "pry-byebug"
 
 require_relative "../lib/jat"

metadata

@@ -1,113 +1,99 @@
 --- !ruby/object:Gem::Specification
 name: jat
 version: !ruby/object:Gem::Version
-  version: 0.0.8
+  version: 0.0.9
 platform: ruby
 authors:
 - Andrey Glushkov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-01-09 00:00:00.000000000 Z
+date: 2022-01-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '5.14'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '5.14'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: mocha
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.12'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.12'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '13.0'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '13.0'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0.21'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0.21'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: standard
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '7.0'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '7.0'
-- !ruby/object:Gem::Dependency
-  name: sqlite3
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.4'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.4'
+        version: '0'
 description: |
   JAT serializer allows you to generate a JSON response based on the fields requested by the client.
   Besides, it helps to preload relations to avoid N+1 when used with activerecord.
@@ -239,7 +225,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.22
+rubygems_version: 3.3.3
 signing_key: 
 specification_version: 4
 summary: JSON API TOOLKIT