jat 0.0.3 → 0.0.5

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

@@ -14,7 +14,7 @@ describe "Jat::Plugins::JsonApi::Response" do
   it "returns correct structure with data" do
     str_serializer = Class.new(base_class) do
       type "str"
-      attribute(:id) { |_| "STRING" }
+      id { |_| "STRING" }
     end
 
     assert_equal({data: {type: :str, id: "STRING"}}, str_serializer.to_h("STRING"))
@@ -23,7 +23,7 @@ describe "Jat::Plugins::JsonApi::Response" do
   it "returns correct structure with array data" do
     str_serializer = Class.new(base_class) do
       type "str"
-      attribute(:id) { |obj| obj }
+      id { |obj| obj }
     end
 
     assert_equal(
@@ -35,7 +35,7 @@ describe "Jat::Plugins::JsonApi::Response" do
   it "returns correct structure with data with attributes" do
     str_serializer = Class.new(base_class) do
       type "str"
-      attribute(:id) { |obj| obj[0] }
+      id { |obj| obj[0] }
       attribute :length
     end
 
@@ -48,12 +48,12 @@ describe "Jat::Plugins::JsonApi::Response" do
   it "returns correct structure with has-one relationship" do
     int_serializer = Class.new(base_class) do
       type "int"
-      attribute(:id) { |obj| obj }
+      id { |obj| obj }
     end
 
     str_serializer = Class.new(base_class) do
       type "str"
-      attribute(:id) { |obj| obj[0] }
+      id { |obj| obj[0] }
       relationship :length, serializer: int_serializer, exposed: true
     end
 
@@ -76,12 +76,12 @@ 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"
-      attribute(:id) { |obj| obj }
+      id { |obj| obj }
     end
 
     str_serializer = Class.new(base_class) do
       type "str"
-      attribute(:id) { |obj| obj[0] }
+      id { |obj| obj[0] }
       relationship :length, serializer: int_serializer # relationships are not exposed by default
     end
 
@@ -91,7 +91,7 @@ describe "Jat::Plugins::JsonApi::Response" do
   it "returns correct structure with empty has-one relationship" do
     str_serializer = Class.new(base_class) do
       type "str"
-      attribute(:id) { |obj| obj[0] }
+      id { |obj| obj[0] }
       relationship(:length, serializer: self, exposed: true) { |_obj| nil }
     end
 
@@ -109,13 +109,13 @@ describe "Jat::Plugins::JsonApi::Response" do
   it "returns correct structure with has-one relationship with attributes" do
     int_serializer = Class.new(base_class) do
       type "int"
-      attribute(:id) { |obj| obj }
+      id { |obj| obj }
       attribute(:next) { |obj| obj + 1 }
     end
 
     str_serializer = Class.new(base_class) do
       type "str"
-      attribute(:id) { |obj| obj[0] }
+      id { |obj| obj[0] }
       relationship :length, serializer: int_serializer, exposed: true
     end
 
@@ -142,7 +142,7 @@ describe "Jat::Plugins::JsonApi::Response" do
 
     str_serializer = Class.new(base_class) do
       type "str"
-      attribute(:id) { |_obj| "id" }
+      id { |_obj| "id" }
       relationship :chars, serializer: chr_serializer, many: true, exposed: true
     end
 
@@ -160,12 +160,12 @@ describe "Jat::Plugins::JsonApi::Response" do
   it "returns correct structure with has-many relationship" do
     chr_serializer = Class.new(base_class) do
       type "chr"
-      attribute(:id) { |obj| obj }
+      id { |obj| obj }
     end
 
     str_serializer = Class.new(base_class) do
       type "str"
-      attribute(:id) { |obj| obj[0] }
+      id { |obj| obj[0] }
       relationship :chars, serializer: chr_serializer, many: true, exposed: true
     end
 
@@ -188,13 +188,13 @@ describe "Jat::Plugins::JsonApi::Response" do
   it "returns correct structure with has-many relationship with attributes" do
     chr_serializer = Class.new(base_class) do
       type "chr"
-      attribute(:id) { |obj| obj }
+      id { |obj| obj }
       attribute :next
     end
 
     str_serializer = Class.new(base_class) do
       type "str"
-      attribute(:id) { |obj| obj[0] }
+      id { |obj| obj[0] }
       relationship :chars, serializer: chr_serializer, many: true, exposed: true
     end
 
@@ -218,12 +218,12 @@ describe "Jat::Plugins::JsonApi::Response" do
   it "accepts includes param" do
     chr_serializer = Class.new(base_class) do
       type "chr"
-      attribute(:id) { |obj| obj }
+      id { |obj| obj }
     end
 
     str_serializer = Class.new(base_class) do
       type "str"
-      attribute(:id) { |obj| obj[0] }
+      id { |obj| obj[0] }
       relationship :chars, serializer: chr_serializer, many: true, exposed: false
     end
 
@@ -239,19 +239,19 @@ describe "Jat::Plugins::JsonApi::Response" do
           {type: :chr, id: "a"}, {type: :chr, id: "b"}
         ]
       },
-      str_serializer.to_h("ab", params: {include: "chars"})
+      str_serializer.to_h("ab", include: "chars")
     )
   end
 
   it "accepts sparse_fieldset" do
     chr_serializer = Class.new(base_class) do
       type "chr"
-      attribute(:id) { |obj| obj }
+      id { |obj| obj }
     end
 
     str_serializer = Class.new(base_class) do
       type "str"
-      attribute(:id) { |obj| obj[0] }
+      id { |obj| obj[0] }
       relationship :chars, serializer: chr_serializer, many: true, exposed: false
     end
 
@@ -267,7 +267,7 @@ describe "Jat::Plugins::JsonApi::Response" do
           {type: :chr, id: "a"}, {type: :chr, id: "b"}
         ]
       },
-      str_serializer.to_h("ab", params: {fields: {str: "chars"}})
+      str_serializer.to_h("ab", fields: {str: "chars"})
     )
   end
 
@@ -275,7 +275,7 @@ describe "Jat::Plugins::JsonApi::Response" do
     let(:serializer) do
       Class.new(base_class) do
         type :foo
-        attribute(:id) { |obj| obj }
+        id { |obj| obj }
       end
     end
 
@@ -311,7 +311,7 @@ describe "Jat::Plugins::JsonApi::Response" do
     let(:serializer) do
       Class.new(base_class) do
         type :foo
-        attribute(:id) { |obj| obj }
+        id { |obj| obj }
       end
     end
 
@@ -347,7 +347,7 @@ describe "Jat::Plugins::JsonApi::Response" do
     let(:serializer) do
       Class.new(base_class) do
         type :foo
-        attribute(:id) { |obj| obj }
+        id { |obj| obj }
       end
     end
 
@@ -374,21 +374,21 @@ describe "Jat::Plugins::JsonApi::Response" do
     let(:bar_serializer) do
       Class.new(base_class) do
         type :bar
-        attribute(:id) { |obj| obj }
+        id { |obj| obj }
       end
     end
 
     let(:foo_serializer) do
       Class.new(base_class) do
         type :foo
-        attribute(:id) { |obj| obj }
+        id { |obj| obj }
       end
     end
 
     it "adds relationship meta defined in serializer" do
       foo_serializer.relationship(:bar, serializer: -> { bar_serializer }, exposed: true) { "bar" }
       bar_serializer.relationship_meta(:version) { "1.2.3" }
-      bar_serializer.relationship_meta(:uid) { |parent, obj, context| [parent, obj, context[:time]] }
+      bar_serializer.relationship_meta(:uid) { |obj, context| [context[:parent_object], obj, context[:time]] }
       bar_serializer.relationship_meta(:null) {}
 
       response = foo_serializer.to_h("foo", time: "12:00")
@@ -401,7 +401,7 @@ describe "Jat::Plugins::JsonApi::Response" do
     let(:serializer) do
       Class.new(base_class) do
         type :foo
-        attribute(:id) { |obj| obj }
+        id { |obj| obj }
       end
     end
 
@@ -437,7 +437,7 @@ describe "Jat::Plugins::JsonApi::Response" do
     let(:serializer) do
       Class.new(base_class) do
         type :foo
-        attribute(:id) { |obj| obj }
+        id { |obj| obj }
       end
     end
 
@@ -464,21 +464,21 @@ describe "Jat::Plugins::JsonApi::Response" do
     let(:bar_serializer) do
       Class.new(base_class) do
         type :bar
-        attribute(:id) { |obj| obj }
+        id { |obj| obj }
       end
     end
 
     let(:foo_serializer) do
       Class.new(base_class) do
         type :foo
-        attribute(:id) { |obj| obj }
+        id { |obj| obj }
       end
     end
 
     it "adds relationship link defined in serializer" do
       foo_serializer.relationship(:bar, serializer: -> { bar_serializer }, exposed: true) { "bar" }
       bar_serializer.relationship_link(:self) { "/self" }
-      bar_serializer.relationship_link(:related) { |parent_obj| "/#{parent_obj}/self" }
+      bar_serializer.relationship_link(:related) { |_obj, ctx| "/#{ctx[:parent_object]}/self" }
       bar_serializer.relationship_link(:null) {}
 
       response = foo_serializer.to_h("foo")

data/test/lib/jat/plugins/{_json_api_activerecord/_json_api_activerecord_test.rb → json_api_activerecord/json_api_activerecord_test.rb}

@@ -4,26 +4,35 @@ require "test_helper"
 
 describe "Jat::Plugins::JsonApiActiverecord" do
   before do
-    @plugin = Jat::Plugins.load_plugin(:_json_api_activerecord)
+    @plugin = Jat::Plugins.find_plugin(:json_api_activerecord)
+  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 in after_load" do
     jat_class = Class.new(Jat)
+    jat_class.plugin :json_api
+
     jat_class.expects(:plugin).with(:_preloads, foo: :bar)
     jat_class.expects(:plugin).with(:_activerecord_preloads, foo: :bar)
 
-    Jat::Plugins.after_load(@plugin, jat_class, foo: :bar)
+    @plugin.after_load(jat_class, foo: :bar)
   end
 
-  describe "ClassMethods" do
-    it "add .jat_preloads method as a delegator to #{@plugin}::Preloads" do
+  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_class.jat_preloads(jat)
+      assert_equal "RES", jat.preloads
     end
   end
 end

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

@@ -16,7 +16,7 @@ describe "Jat::Plugins::JsonApiActiverecord::Preloads" do
   let(:described_class) { Jat::Plugins::JsonApiActiverecord::Preloads }
 
   def define_map(map)
-    jat_user.traversal_map.expects(:current).returns(map)
+    jat_user.expects(:map).returns(map)
   end
 
   it "returns empty hash when no attributes requested" do
@@ -129,7 +129,7 @@ describe "Jat::Plugins::JsonApiActiverecord::Preloads" do
     assert_equal({company: {profile: {}, confirmed_email: {}, unconfirmed_email: {}}}, result)
   end
 
-  it "raises error if with 2 serializers have recursive preloads" do
+  it "does not raise error if 2 serializers with recursive preloads specified" do
     user_serializer.relationship :profile, serializer: profile_serializer, preload: :profile
     profile_serializer.relationship :user, serializer: user_serializer, preload: :user
 
@@ -138,11 +138,11 @@ describe "Jat::Plugins::JsonApiActiverecord::Preloads" do
       profile: {attributes: [], relationships: %i[user]}
     )
 
-    error = assert_raises(Jat::Error) { described_class.call(jat_user) }
-    assert_match(/recursive preloads/, error.message)
+    expected_result = {profile: {user: {}}}
+    assert_equal(expected_result, described_class.call(jat_user))
   end
 
-  it "raises error if 3 serializers recursive preloads" do
+  it "does not raise error if 3 serializers with recursive preloads specified" do
     user_serializer.relationship :profile, serializer: profile_serializer, preload: :profile
     profile_serializer.relationship :email, serializer: email_serializer, preload: :email
     email_serializer.relationship :user, serializer: user_serializer, preload: :user
@@ -153,8 +153,8 @@ describe "Jat::Plugins::JsonApiActiverecord::Preloads" do
       email: {attributes: [], relationships: %i[user]}
     )
 
-    error = assert_raises(Jat::Error) { described_class.call(jat_user) }
-    assert_match(/recursive preloads/, error.message)
+    expected_result = {profile: {email: {user: {}}}}
+    assert_equal(expected_result, described_class.call(jat_user))
   end
 
   it "does not raises error if 2 serializers preloads same preloads" do
@@ -168,7 +168,8 @@ describe "Jat::Plugins::JsonApiActiverecord::Preloads" do
       email: {attributes: [], relationships: %i[]}
     )
 
-    described_class.call(jat_user) # should not raise
+    expected_result = {profile: {email: {}}, email: {}}
+    assert_equal(expected_result, described_class.call(jat_user))
   end
 
   it "merges preloads the same way regardless of order of preloads" do
@@ -179,8 +180,8 @@ describe "Jat::Plugins::JsonApiActiverecord::Preloads" do
     jat_a1 = a.allocate
     jat_a2 = a.allocate
 
-    jat_a1.traversal_map.expects(:current).returns(a: {attributes: %i[a1 a2], relationships: %i[]})
-    jat_a2.traversal_map.expects(:current).returns(a: {attributes: %i[a2 a1], relationships: %i[]})
+    jat_a1.expects(:map).returns(a: {attributes: %i[a1 a2], relationships: %i[]})
+    jat_a2.expects(:map).returns(a: {attributes: %i[a2 a1], relationships: %i[]})
 
     result1 = described_class.call(jat_a1)
     result2 = described_class.call(jat_a2)

data/test/lib/jat/plugins/json_api_camel_lower/json_api_camel_lower_test.rb

@@ -0,0 +1,79 @@
+# frozen_string_literal: true
+
+require "test_helper"
+
+describe "Jat::Plugins::JsonApiLowerCamelCase" do
+  let(:jat_class) do
+    new_class = Class.new(Jat)
+    new_class.plugin(:json_api)
+    new_class.plugin(:json_api_lower_camel_case)
+    new_class
+  end
+
+  before do
+    jat_class.type :foo
+    jat_class.id { |object| object }
+  end
+
+  it "returns attributes in lowerCamelCase case" do
+    jat_class.attribute(:foo_bar) { 1 }
+
+    assert_equal({fooBar: 1}, jat_class.to_h(true).dig(:data, :attributes))
+  end
+
+  it "accepts `fields` in lowerCamelCase format" do
+    jat_class.attribute(:foo_bar, exposed: false) { 1 }
+
+    response = jat_class.to_h(true, fields: {foo: "fooBar"})
+    assert_equal({fooBar: 1}, response.dig(:data, :attributes))
+  end
+
+  it "accepts `include` in lowerCamelCase format" do
+    new_serializer = Class.new(Jat)
+    new_serializer.plugin(:json_api)
+    new_serializer.type :new
+    new_serializer.id { |object| object }
+
+    jat_class.relationship(:foo_bar, serializer: new_serializer) { 1 }
+
+    response = jat_class.to_h(true, include: "fooBar")
+    response_relationships = response.dig(:data, :relationships).keys
+    assert_includes(response_relationships, :fooBar)
+  end
+
+  it "returns document meta keys in lowerCamelCase format" do
+    jat_class.document_meta(:user_agent) { "Firefox" }
+
+    response = jat_class.to_h(nil)
+    assert_equal({meta: {userAgent: "Firefox"}}, response)
+  end
+
+  it "returns document jsonapi keys in lowerCamelCase format" do
+    jat_class.jsonapi(:user_agent) { "Firefox" }
+
+    response = jat_class.to_h(nil)
+    assert_equal({jsonapi: {userAgent: "Firefox"}}, response)
+  end
+
+  it "returns document links keys in lowerCamelCase format" do
+    jat_class.document_link(:user_agent) { "Firefox" }
+
+    response = jat_class.to_h(nil)
+    assert_equal({links: {userAgent: "Firefox"}}, response)
+  end
+
+  it "returns context meta keys in lowerCamelCase format" do
+    response = jat_class.to_h(nil, meta: {user_agent: "Chrome"})
+    assert_equal({meta: {userAgent: "Chrome"}}, response)
+  end
+
+  it "returns context jsonapi keys in lowerCamelCase format" do
+    response = jat_class.to_h(nil, jsonapi: {user_agent: "Chrome"})
+    assert_equal({jsonapi: {userAgent: "Chrome"}}, response)
+  end
+
+  it "returns context links keys in lowerCamelCase format" do
+    response = jat_class.to_h(nil, links: {user_agent: "Chrome"})
+    assert_equal({links: {userAgent: "Chrome"}}, response)
+  end
+end

data/test/lib/jat/plugins/json_api_maps_cache/json_api_maps_cache_test.rb

@@ -0,0 +1,107 @@
+# frozen_string_literal: true
+
+require "test_helper"
+
+describe "Jat::Plugins::JsonApiMapsCache" do
+  before do
+    @plugin = Jat::Plugins.find_plugin(:json_api_maps_cache)
+  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 "adds config variable how many maps to store per serializer" do
+    jat_class = Class.new(Jat)
+
+    @plugin.after_load(jat_class)
+    assert_equal(100, jat_class.config[:cached_maps_count]) # default 100
+
+    @plugin.after_load(jat_class, cached_maps_count: 10) # change value via opts
+    assert_equal(10, jat_class.config[:cached_maps_count])
+  end
+
+  describe "Test maps responses" do
+    let(:jat_class) do
+      Class.new(Jat) do
+        plugin(:json_api)
+        plugin(:json_api_maps_cache)
+
+        type :foo
+
+        attribute(:attr1)
+        attribute(:attr2)
+
+        relationship(:rel1, serializer: self)
+        relationship(:rel2, serializer: self)
+      end
+    end
+
+    it "returns same maps when requested with same params" do
+      full_map1 = jat_class::Map.call(exposed: :all)
+      full_map2 = jat_class::Map.call(exposed: :all)
+
+      exposed_map1 = jat_class::Map.call(exposed: :default)
+      exposed_map2 = jat_class::Map.call(exposed: :default)
+
+      current_map1 = jat_class::Map.call(include: "rel2", fields: {foo: "attr1,rel1"})
+      current_map2 = jat_class::Map.call(include: "rel2", fields: {foo: "attr1,rel1"})
+
+      assert_same(full_map1, full_map2)
+      assert_same(exposed_map1, exposed_map2)
+      assert_same(current_map1, current_map2)
+
+      # check different maps are not same
+
+      # should not match, include is not same
+      current_map3 = jat_class::Map.call(include: "rel1", fields: {foo: "attr1,rel1"})
+      # should not match, fields are not same
+      current_map4 = jat_class::Map.call(include: "rel2", fields: {foo: "attr1,rel2"})
+
+      assert !current_map1.equal?(current_map3)
+      assert !current_map1.equal?(current_map4)
+      assert !current_map3.equal?(current_map4)
+    end
+
+    it "stores different maps keys" do
+      # key 1
+      jat_class::Map.call(exposed: :all)
+      jat_class::Map.call(exposed: :all)
+
+      # key 2
+      jat_class::Map.call(exposed: :default)
+      jat_class::Map.call(exposed: :default)
+
+      # key 3
+      jat_class::Map.call(include: "rel2", fields: {foo: "attr1,rel1"})
+      jat_class::Map.call(include: "rel2", fields: {foo: "attr1,rel1"})
+
+      # key 4
+      jat_class::Map.call(include: "rel1", fields: {foo: "attr1,rel1"})
+
+      # key 5
+      jat_class::Map.call(include: "rel2", fields: {foo: "attr1,rel2"})
+
+      assert_equal 5, jat_class::Map.maps_cache.keys.count
+    end
+
+    it "clears old results when there are too many cache keys" do
+      jat_class.config[:cached_maps_count] = 1
+
+      full_map1 = jat_class::Map.call(exposed: :all)
+      full_map2 = jat_class::Map.call(exposed: :all)
+
+      # ensure maps refer to same object
+      assert_same(full_map1, full_map2)
+
+      # replace single possible cache key with another `exposed` map
+      jat_class::Map.call(exposed: :default)
+
+      # calculate full map again, it should not match
+      full_map3 = jat_class::Map.call(exposed: :all)
+      assert !full_map1.equal?(full_map3)
+    end
+  end
+end

data/test/lib/jat/plugins/json_api_validate_params/json_api_validate_params_test.rb

@@ -0,0 +1,84 @@
+# frozen_string_literal: true
+
+require "test_helper"
+
+describe "Jat::Plugins::JsonApiValidateParams" do
+  before do
+    @plugin = Jat::Plugins.find_plugin(:json_api_validate_params)
+  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
+
+  let(:serializer) do
+    jat_class = Class.new(Jat)
+    jat_class.plugin :json_api
+    jat_class.plugin @plugin
+
+    jat_class.type "foo"
+    jat_class.attribute :foo_bar
+    jat_class.relationship :foo_bazz, serializer: jat_class
+    jat_class
+  end
+
+  let(:serializer_lower_camel_case) do
+    jat_class = Class.new(Jat)
+    jat_class.plugin :json_api
+    jat_class.plugin :json_api_lower_camel_case
+    jat_class.plugin @plugin
+
+    jat_class.type "foo"
+    jat_class.attribute :foo_bar
+    jat_class.relationship :foo_bazz, serializer: jat_class
+    jat_class
+  end
+
+  it "validates fields types" do
+    jat = serializer.new(fields: {bar: "any"})
+    error = assert_raises(Jat::JsonApiParamsError) { jat.validate }
+
+    expected_message = "Response does not have resources with type 'bar'. Existing types are: 'foo'"
+    assert_equal(expected_message, error.message)
+  end
+
+  it "validates attributes" do
+    jat = serializer.new(fields: {foo: "foo_bar,foo_baz"})
+    error = assert_raises(Jat::JsonApiParamsError) { jat.validate }
+
+    expected_message = "No attribute 'foo_baz' in resource type 'foo'. Existing attributes are: 'foo_bar', 'foo_bazz'"
+    assert_equal(expected_message, error.message)
+  end
+
+  it "validates attributes correctly when lower_camel_case plugin loaded" do
+    jat = serializer_lower_camel_case.new(fields: {foo: "fooBar,fooBaz"})
+    error = assert_raises(Jat::JsonApiParamsError) { jat.validate }
+
+    expected_message = "No attribute 'fooBaz' in resource type 'foo'. Existing attributes are: 'fooBar', 'fooBazz'"
+    assert_equal(expected_message, error.message)
+  end
+
+  it "validates includes" do
+    jat = serializer.new(include: "extra")
+    error = assert_raises(Jat::JsonApiParamsError) { jat.validate }
+    expected_message = "Type 'foo' has no included 'extra' relationship. Existing relationships are: 'foo_bazz'"
+    assert_equal(expected_message, error.message)
+  end
+
+  it "validates includes when parameter named as existing attribute (not relationship)" do
+    jat = serializer.new(include: "foo_bar")
+    error = assert_raises(Jat::JsonApiParamsError) { jat.validate }
+    expected_message = "Type 'foo' has no included 'foo_bar' relationship. Existing relationships are: 'foo_bazz'"
+    assert_equal(expected_message, error.message)
+  end
+
+  it "validates includes correctly when lower_camel_case plugin loaded" do
+    jat = serializer_lower_camel_case.new(include: "extra")
+    error = assert_raises(Jat::JsonApiParamsError) { jat.validate }
+
+    expected_message = "Type 'foo' has no included 'extra' relationship. Existing relationships are: 'fooBazz'"
+    assert_equal(expected_message, error.message)
+  end
+end

data/test/lib/jat/plugins/simple_api/lib/{params/parse_test.rb → fields_param_parser_test.rb}

@@ -2,13 +2,19 @@
 
 require "test_helper"
 
-describe "Jat::Plugins::SimpleApi::Params::Parse" do
+describe "Jat::Plugins::SimpleApi::FieldsParamParser" do
   before do
-    Jat::Plugins.load_plugin :simple_api
+    Jat::Plugins.find_plugin :simple_api
+  end
+
+  let(:jat_class) do
+    ser = Class.new(Jat)
+    ser.plugin :simple_api
+    ser
   end
 
   def parse(str)
-    Jat::Plugins::SimpleApi::Params::Parse.new(str).parse
+    jat_class::FieldsParamParser.parse(str)
   end
 
   it "returns empty hash when nil provided" do
@@ -24,7 +30,7 @@ describe "Jat::Plugins::SimpleApi::Params::Parse" do
   end
 
   it "parses multiple fields" do
-    assert_equal({id: {}, name: {}}, parse("id,name"))
+    assert_equal({id: {}, name: {}}, parse("id, name"))
   end
 
   it "parses single resource with single field" do