jsonapi-resources 0.6.2 → 0.7.0

data/test/test_helper.rb

@@ -116,6 +116,7 @@ end
 JSONAPI.configuration.route_format = :underscored_route
 TestApp.routes.draw do
   jsonapi_resources :people
+  jsonapi_resources :special_people
   jsonapi_resources :comments
   jsonapi_resources :firms
   jsonapi_resources :tags
@@ -142,6 +143,9 @@ TestApp.routes.draw do
   jsonapi_resources :boats
   jsonapi_resources :flat_posts
 
+  jsonapi_resources :books
+  jsonapi_resources :authors
+
   namespace :api do
     namespace :v1 do
       jsonapi_resources :people
@@ -225,6 +229,9 @@ TestApp.routes.draw do
       jsonapi_resources :customers
       jsonapi_resources :purchase_orders
       jsonapi_resources :line_items
+      jsonapi_resources :categories
+
+      jsonapi_resources :clients
     end
 
     namespace :v8 do

data/test/unit/resource/resource_test.rb

@@ -63,6 +63,20 @@ end
 
 module MyModule
   class MyNamespacedResource < JSONAPI::Resource
+    model_name "Person"
+    has_many :related
+  end
+
+  class RelatedResource < JSONAPI::Resource
+    model_name "Comment"
+  end
+end
+
+module MyAPI
+  class MyNamespacedResource < MyModule::MyNamespacedResource
+  end
+
+  class RelatedResource < MyModule::RelatedResource
   end
 end
 
@@ -72,7 +86,11 @@ class ResourceTest < ActiveSupport::TestCase
   end
 
   def test_model_name
-    assert_equal(PostResource._model_name, 'Post')
+    assert_equal("Post", PostResource._model_name)
+  end
+
+  def test_model_name_of_subclassed_non_abstract_resource
+    assert_equal("Firm", FirmResource._model_name)
   end
 
   def test_model
@@ -83,6 +101,47 @@ class ResourceTest < ActiveSupport::TestCase
     assert_equal(MyModule::MyNamespacedResource.module_path, 'my_module/')
   end
 
+  def test_resource_for_root_resource
+    assert_raises NameError do
+      JSONAPI::Resource.resource_for('related')
+    end
+  end
+
+  def test_resource_for_with_namespaced_paths
+    assert_equal(JSONAPI::Resource.resource_for('my_module/related'), MyModule::RelatedResource)
+    assert_equal(PostResource.resource_for('my_module/related'), MyModule::RelatedResource)
+    assert_equal(MyModule::MyNamespacedResource.resource_for('my_module/related'), MyModule::RelatedResource)
+  end
+
+  def test_resource_for_resource_does_not_exist_at_root
+    assert_raises NameError do
+      ArticleResource.resource_for('related')
+    end
+    assert_raises NameError do
+      JSONAPI::Resource.resource_for('related')
+    end
+  end
+
+  def test_resource_for_namespaced_resource
+    assert_equal(MyModule::MyNamespacedResource.resource_for('related'), MyModule::RelatedResource)
+  end
+
+  def test_relationship_parent_point_to_correct_resource
+    assert_equal MyModule::MyNamespacedResource, MyModule::MyNamespacedResource._relationships[:related].parent_resource
+  end
+
+  def test_relationship_parent_option_point_to_correct_resource
+    assert_equal MyModule::MyNamespacedResource, MyModule::MyNamespacedResource._relationships[:related].options[:parent_resource]
+  end
+
+  def test_derived_resources_relationships_parent_point_to_correct_resource
+    assert_equal MyAPI::MyNamespacedResource, MyAPI::MyNamespacedResource._relationships[:related].parent_resource
+  end
+
+  def test_derived_resources_relationships_parent_options_point_to_correct_resource
+    assert_equal MyAPI::MyNamespacedResource, MyAPI::MyNamespacedResource._relationships[:related].options[:parent_resource]
+  end
+
   def test_base_resource_abstract
     assert BaseResource._abstract
   end
@@ -240,7 +299,7 @@ class ResourceTest < ActiveSupport::TestCase
 
     # define apply_filters method on post resource to not respect filters
     PostResource.instance_eval do
-      def apply_sort(records, criteria)
+      def apply_sort(records, criteria, context = {})
         # :nocov:
         records
         # :nocov:
@@ -253,7 +312,7 @@ class ResourceTest < ActiveSupport::TestCase
   ensure
     # reset method to original implementation
     PostResource.instance_eval do
-      def apply_sort(records, criteria)
+      def apply_sort(records, criteria, context = {})
         # :nocov:
         super
         # :nocov:
@@ -471,4 +530,11 @@ class ResourceTest < ActiveSupport::TestCase
     end
     assert_equal(err.error_messages[:base], ['Boom! Error added in after_save callback.'])
   end
+
+  def test_resource_for_model_use_hint
+    special_person = Person.create!(name: 'Special', date_joined: Date.today, special: true)
+    special_resource = SpecialPersonResource.new(special_person, nil)
+    resource_model = SpecialPersonResource.records({}).first # simulate a find
+    assert_equal(SpecialPersonResource, SpecialPersonResource.resource_for_model(resource_model))
+  end
 end

data/test/unit/serializer/serializer_test.rb

@@ -1742,7 +1742,7 @@ class SerializerTest < ActionDispatch::IntegrationTest
       def meta(options)
         {
           fixed: 'Hardcoded value',
-          computed: "#{self.class._type.to_s}: #{options[:serializer].url_generator.self_link(self)}"
+          computed: "#{self.class._type.to_s}: #{options[:serializer].link_builder.self_link(self)}"
         }
       end
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jsonapi-resources
 version: !ruby/object:Gem::Version
-  version: 0.6.2
+  version: 0.7.0
 platform: ruby
 authors:
 - Dan Gebhardt
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-18 00:00:00.000000000 Z
+date: 2015-12-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -157,6 +157,7 @@ files:
 - test/controllers/controller_test.rb
 - test/fixtures/active_record.rb
 - test/fixtures/author_details.yml
+- test/fixtures/book_authors.yml
 - test/fixtures/book_comments.yml
 - test/fixtures/books.yml
 - test/fixtures/categories.yml
@@ -238,6 +239,7 @@ test_files:
 - test/controllers/controller_test.rb
 - test/fixtures/active_record.rb
 - test/fixtures/author_details.yml
+- test/fixtures/book_authors.yml
 - test/fixtures/book_comments.yml
 - test/fixtures/books.yml
 - test/fixtures/categories.yml