jsonapi-resources 0.5.9 → 0.6.0

data/test/unit/resource/resource_test.rb

@@ -25,27 +25,33 @@ class CatResource < JSONAPI::Resource
 end
 
 class PersonWithCustomRecordsForResource < PersonResource
-  def records_for(relationship_name, context)
+  def records_for(relationship_name)
     :records_for
   end
 end
 
 class PersonWithCustomRecordsForRelationshipsResource < PersonResource
-  def records_for_posts(options = {})
+  def records_for_posts
     :records_for_posts
   end
-  def record_for_preferences(options = {})
+
+  def record_for_preferences
     :record_for_preferences
   end
 end
 
 class PersonWithCustomRecordsForErrorResource < PersonResource
   class AuthorizationError < StandardError; end
-  def records_for(relationship_name, context)
+  def records_for(relationship_name)
     raise AuthorizationError
   end
 end
 
+module MyModule
+  class MyNamespacedResource < JSONAPI::Resource
+  end
+end
+
 class ResourceTest < ActiveSupport::TestCase
   def setup
     @post = Post.first
@@ -59,6 +65,10 @@ class ResourceTest < ActiveSupport::TestCase
     assert_equal(PostResource._model_class, Post)
   end
 
+  def test_module_path
+    assert_equal(MyModule::MyNamespacedResource.module_path, 'my_module/')
+  end
+
   def test_base_resource_abstract
     assert BaseResource._abstract
   end
@@ -69,8 +79,11 @@ class ResourceTest < ActiveSupport::TestCase
   end
 
   def test_nil_model_class
-    assert_output nil, "[MODEL NOT FOUND] Model could not be found for NoMatchResource. If this a base Resource declare it as abstract.\n" do
-      assert_nil NoMatchResource._model_class
+    # ToDo:Figure out why this test does not work on Rails 4.0
+    if Rails::VERSION::MAJOR >= 4 && Rails::VERSION::MINOR >= 1
+      assert_output nil, "[MODEL NOT FOUND] Model could not be found for NoMatchResource. If this a base Resource declare it as abstract.\n" do
+        assert_nil NoMatchResource._model_class
+      end
     end
   end
 
@@ -109,13 +122,13 @@ class ResourceTest < ActiveSupport::TestCase
     preferences = Preferences.first
     refute(preferences == nil)
     author.update! preferences: preferences
-    author_resource = PersonResource.new(author)
+    author_resource = PersonResource.new(author, nil)
     assert_equal(author_resource.preferences.model, preferences)
 
-    author_resource = PersonWithCustomRecordsForResource.new(author)
+    author_resource = PersonWithCustomRecordsForResource.new(author, nil)
     assert_equal(author_resource.preferences.model, :records_for)
 
-    author_resource = PersonWithCustomRecordsForErrorResource.new(author)
+    author_resource = PersonWithCustomRecordsForErrorResource.new(author, nil)
     assert_raises PersonWithCustomRecordsForErrorResource::AuthorizationError do
       author_resource.posts
     end
@@ -124,28 +137,28 @@ class ResourceTest < ActiveSupport::TestCase
   def test_records_for_meta_method_for_to_one
     author = Person.find(1)
     author.update! preferences: Preferences.first
-    author_resource = PersonWithCustomRecordsForRelationshipsResource.new(author)
+    author_resource = PersonWithCustomRecordsForRelationshipsResource.new(author, nil)
     assert_equal(author_resource.record_for_preferences, :record_for_preferences)
   end
 
   def test_records_for_meta_method_for_to_one_calling_records_for
     author = Person.find(1)
     author.update! preferences: Preferences.first
-    author_resource = PersonWithCustomRecordsForResource.new(author)
+    author_resource = PersonWithCustomRecordsForResource.new(author, nil)
     assert_equal(author_resource.record_for_preferences, :records_for)
   end
 
   def test_associated_records_meta_method_for_to_many
     author = Person.find(1)
     author.posts << Post.find(1)
-    author_resource = PersonWithCustomRecordsForRelationshipsResource.new(author)
+    author_resource = PersonWithCustomRecordsForRelationshipsResource.new(author, nil)
     assert_equal(author_resource.records_for_posts, :records_for_posts)
   end
 
   def test_associated_records_meta_method_for_to_many_calling_records_for
     author = Person.find(1)
     author.posts << Post.find(1)
-    author_resource = PersonWithCustomRecordsForResource.new(author)
+    author_resource = PersonWithCustomRecordsForResource.new(author, nil)
     assert_equal(author_resource.records_for_posts, :records_for)
   end
 
@@ -179,7 +192,7 @@ class ResourceTest < ActiveSupport::TestCase
   end
 
   def test_to_many_relationship_filters
-    post_resource = PostResource.new(Post.find(1))
+    post_resource = PostResource.new(Post.find(1), nil)
     comments = post_resource.comments
     assert_equal(2, comments.size)
 
@@ -207,7 +220,7 @@ class ResourceTest < ActiveSupport::TestCase
   end
 
   def test_to_many_relationship_sorts
-    post_resource = PostResource.new(Post.find(1))
+    post_resource = PostResource.new(Post.find(1), nil)
     comment_ids = post_resource.comments.map{|c| c.model.id }
     assert_equal [1,2], comment_ids
 
@@ -220,7 +233,7 @@ class ResourceTest < ActiveSupport::TestCase
       end
     end
 
-    sorted_comment_ids = post_resource.comments(sort_criteria: [{ field: 'id', direction: 'desc'}]).map{|c| c.model.id }
+    sorted_comment_ids = post_resource.comments(sort_criteria: [{ field: 'id', direction: :desc}]).map{|c| c.model.id }
     assert_equal [2,1], sorted_comment_ids
 
   ensure
@@ -235,7 +248,7 @@ class ResourceTest < ActiveSupport::TestCase
   end
 
   def test_to_many_relationship_pagination
-    post_resource = PostResource.new(Post.find(1))
+    post_resource = PostResource.new(Post.find(1), nil)
     comments = post_resource.comments
     assert_equal 2, comments.size
 

data/test/unit/serializer/link_builder_test.rb

@@ -41,7 +41,7 @@ class LinkBuilderTest < ActionDispatch::IntegrationTest
     }
 
     builder = JSONAPI::LinkBuilder.new(config)
-    source  = primary_resource_klass.new(@steve)
+    source  = primary_resource_klass.new(@steve, nil)
     expected_link = "#{ @base_url }/api/v1/people/#{ source.id }"
 
     assert_equal expected_link, builder.self_link(source)
@@ -57,7 +57,7 @@ class LinkBuilderTest < ActionDispatch::IntegrationTest
     }
 
     builder = JSONAPI::LinkBuilder.new(config)
-    source  = primary_resource_klass.new(@steve)
+    source  = primary_resource_klass.new(@steve, nil)
     expected_link = "#{ @base_url }/boomshaka/api/v1/people/#{ source.id }"
 
     assert_equal expected_link, builder.self_link(source)
@@ -73,7 +73,7 @@ class LinkBuilderTest < ActionDispatch::IntegrationTest
     }
 
     builder = JSONAPI::LinkBuilder.new(config)
-    source  = primary_resource_klass.new(@steve)
+    source  = primary_resource_klass.new(@steve, nil)
     expected_link = "#{ @base_url }/boomshaka/admin_api/v1/people/#{ source.id }"
 
     assert_equal expected_link, builder.self_link(source)
@@ -113,7 +113,7 @@ class LinkBuilderTest < ActionDispatch::IntegrationTest
     }
 
     builder       = JSONAPI::LinkBuilder.new(config)
-    source        = Api::V1::PersonResource.new(@steve)
+    source        = Api::V1::PersonResource.new(@steve, nil)
     relationship  = JSONAPI::Relationship::ToMany.new("posts", {})
     expected_link = "#{ @base_url }/api/v1/people/#{ @steve.id }/relationships/posts"
 
@@ -129,7 +129,7 @@ class LinkBuilderTest < ActionDispatch::IntegrationTest
     }
 
     builder       = JSONAPI::LinkBuilder.new(config)
-    source        = MyEngine::Api::V1::PersonResource.new(@steve)
+    source        = MyEngine::Api::V1::PersonResource.new(@steve, nil)
     relationship  = JSONAPI::Relationship::ToMany.new("posts", {})
     expected_link = "#{ @base_url }/boomshaka/api/v1/people/#{ @steve.id }/relationships/posts"
 
@@ -145,7 +145,7 @@ class LinkBuilderTest < ActionDispatch::IntegrationTest
     }
 
     builder       = JSONAPI::LinkBuilder.new(config)
-    source        = Api::V1::PersonResource.new(@steve)
+    source        = Api::V1::PersonResource.new(@steve, nil)
     relationship  = JSONAPI::Relationship::ToMany.new("posts", {})
     expected_link = "#{ @base_url }/api/v1/people/#{ @steve.id }/posts"
 
@@ -161,7 +161,7 @@ class LinkBuilderTest < ActionDispatch::IntegrationTest
     }
 
     builder       = JSONAPI::LinkBuilder.new(config)
-    source        = MyEngine::Api::V1::PersonResource.new(@steve)
+    source        = MyEngine::Api::V1::PersonResource.new(@steve, nil)
     relationship  = JSONAPI::Relationship::ToMany.new("posts", {})
     expected_link = "#{ @base_url }/boomshaka/api/v1/people/#{ @steve.id }/posts"
 
@@ -177,7 +177,7 @@ class LinkBuilderTest < ActionDispatch::IntegrationTest
     }
 
     builder       = JSONAPI::LinkBuilder.new(config)
-    source        = Api::V1::PersonResource.new(@steve)
+    source        = Api::V1::PersonResource.new(@steve, nil)
     relationship  = JSONAPI::Relationship::ToMany.new("posts", {})
     expected_link = "#{ @base_url }/api/v1/people/#{ @steve.id }/posts?page%5Blimit%5D=12&page%5Boffset%5D=0"
     query         = { page: { offset: 0, limit: 12 } }

data/test/unit/serializer/polymorphic_serializer_test.rb

@@ -27,7 +27,7 @@ class PolymorphismTest < ActionDispatch::IntegrationTest
     serialized_data = JSONAPI::ResourceSerializer.new(
       PersonResource,
       include: %w(vehicles)
-    ).serialize_to_hash(PersonResource.new(@person))
+    ).serialize_to_hash(PersonResource.new(@person, nil))
 
     assert_hash_equals(
       {
@@ -132,7 +132,7 @@ class PolymorphismTest < ActionDispatch::IntegrationTest
     serialized_data = JSONAPI::ResourceSerializer.new(
       PictureResource,
       include: %w(imageable)
-    ).serialize_to_hash(@pictures.map { |p| PictureResource.new p })
+    ).serialize_to_hash(@pictures.map { |p| PictureResource.new p, nil })
 
     assert_hash_equals(
       {

data/test/unit/serializer/serializer_test.rb

@@ -23,7 +23,7 @@ class SerializerTest < ActionDispatch::IntegrationTest
 
     serialized = JSONAPI::ResourceSerializer.new(
       PostResource,
-      base_url: 'http://example.com').serialize_to_hash(PostResource.new(@post)
+      base_url: 'http://example.com').serialize_to_hash(PostResource.new(@post, nil)
     )
 
     assert_hash_equals(
@@ -118,7 +118,7 @@ class SerializerTest < ActionDispatch::IntegrationTest
       },
       JSONAPI::ResourceSerializer.new(Api::V1::PostResource,
                                       base_url: 'http://example.com').serialize_to_hash(
-        Api::V1::PostResource.new(@post))
+        Api::V1::PostResource.new(@post, nil))
     )
   end
 
@@ -146,7 +146,7 @@ class SerializerTest < ActionDispatch::IntegrationTest
         }
       },
       JSONAPI::ResourceSerializer.new(PostResource,
-                                      fields: {posts: [:id, :title, :author]}).serialize_to_hash(PostResource.new(@post))
+                                      fields: {posts: [:id, :title, :author]}).serialize_to_hash(PostResource.new(@post, nil))
     )
   end
 
@@ -154,7 +154,7 @@ class SerializerTest < ActionDispatch::IntegrationTest
     serialized = JSONAPI::ResourceSerializer.new(
       PostResource,
       include: ['author']
-    ).serialize_to_hash(PostResource.new(@post))
+    ).serialize_to_hash(PostResource.new(@post, nil))
 
     assert_hash_equals(
       {
@@ -256,7 +256,7 @@ class SerializerTest < ActionDispatch::IntegrationTest
       PostResource,
       include: ['author'],
       key_formatter: UnderscoredKeyFormatter
-    ).serialize_to_hash(PostResource.new(@post))
+    ).serialize_to_hash(PostResource.new(@post, nil))
 
     assert_hash_equals(
       {
@@ -525,7 +525,7 @@ class SerializerTest < ActionDispatch::IntegrationTest
           ]
       },
       JSONAPI::ResourceSerializer.new(PostResource,
-                                      include: ['comments', 'comments.tags']).serialize_to_hash(PostResource.new(@post))
+                                      include: ['comments', 'comments.tags']).serialize_to_hash(PostResource.new(@post, nil))
     )
   end
 
@@ -533,7 +533,7 @@ class SerializerTest < ActionDispatch::IntegrationTest
     serialized = JSONAPI::ResourceSerializer.new(
       PersonResource,
       include: ['comments']
-    ).serialize_to_hash(PersonResource.new(@fred))
+    ).serialize_to_hash(PersonResource.new(@fred, nil))
 
     assert_hash_equals(
       {
@@ -656,7 +656,7 @@ class SerializerTest < ActionDispatch::IntegrationTest
 
     posts = []
     Post.find(1, 2).each do |post|
-      posts.push PostResource.new(post)
+      posts.push PostResource.new(post, nil)
     end
 
     JSONAPI.configuration.always_include_to_one_linkage_data = true
@@ -972,7 +972,7 @@ class SerializerTest < ActionDispatch::IntegrationTest
 
     posts = []
     Post.find(1, 2).each do |post|
-      posts.push PostResource.new(post)
+      posts.push PostResource.new(post, nil)
     end
 
     assert_hash_equals(
@@ -1247,7 +1247,7 @@ class SerializerTest < ActionDispatch::IntegrationTest
 
     posts = []
     Post.find(1, 2).each do |post|
-      posts.push PostResource.new(post)
+      posts.push PostResource.new(post, nil)
     end
 
     assert_hash_equals(
@@ -1476,13 +1476,13 @@ class SerializerTest < ActionDispatch::IntegrationTest
       JSONAPI::ResourceSerializer.new(ExpenseEntryResource,
                                       include: ['iso_currency', 'employee'],
                                       fields: {people: [:id, :name, :email, :date_joined]}).serialize_to_hash(
-        ExpenseEntryResource.new(@expense_entry))
+        ExpenseEntryResource.new(@expense_entry, nil))
     )
   end
 
   def test_serializer_empty_links_null_and_array
     planet_hash = JSONAPI::ResourceSerializer.new(PlanetResource).serialize_to_hash(
-      PlanetResource.new(Planet.find(8)))
+      PlanetResource.new(Planet.find(8), nil))
 
     assert_hash_equals(
       {
@@ -1523,7 +1523,7 @@ class SerializerTest < ActionDispatch::IntegrationTest
   def test_serializer_include_with_empty_links_null_and_array
     planets = []
     Planet.find(7, 8).each do |planet|
-      planets.push PlanetResource.new(planet)
+      planets.push PlanetResource.new(planet, nil)
     end
 
     planet_hash = JSONAPI::ResourceSerializer.new(PlanetResource,
@@ -1619,7 +1619,7 @@ class SerializerTest < ActionDispatch::IntegrationTest
     original_config = JSONAPI.configuration.dup
     JSONAPI.configuration.json_key_format = :underscored_key
 
-    preferences = PreferencesResource.new(Preferences.find(1))
+    preferences = PreferencesResource.new(Preferences.find(1), nil)
 
     assert_hash_equals(
       {
@@ -1658,7 +1658,7 @@ class SerializerTest < ActionDispatch::IntegrationTest
     original_config = JSONAPI.configuration.dup
     JSONAPI.configuration.json_key_format = :underscored_key
 
-    facts = FactResource.new(Fact.find(1))
+    facts = FactResource.new(Fact.find(1), nil)
 
     assert_hash_equals(
       {
@@ -1691,7 +1691,7 @@ class SerializerTest < ActionDispatch::IntegrationTest
     serialized = JSONAPI::ResourceSerializer.new(
       Api::V5::AuthorResource,
       include: ['author_detail']
-    ).serialize_to_hash(Api::V5::AuthorResource.new(Person.find(1)))
+    ).serialize_to_hash(Api::V5::AuthorResource.new(Person.find(1), nil))
 
     assert_hash_equals(
       {

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jsonapi-resources
 version: !ruby/object:Gem::Version
-  version: 0.5.9
+  version: 0.6.0
 platform: ruby
 authors:
 - Dan Gebhardt
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-03 00:00:00.000000000 Z
+date: 2015-10-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -67,20 +67,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: minitest-reporters
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
@@ -176,6 +162,7 @@ files:
 - test/fixtures/categories.yml
 - test/fixtures/comments.yml
 - test/fixtures/comments_tags.yml
+- test/fixtures/companies.yml
 - test/fixtures/craters.yml
 - test/fixtures/customers.yml
 - test/fixtures/documents.yml
@@ -205,6 +192,7 @@ files:
 - test/helpers/value_matchers_test.rb
 - test/integration/requests/request_test.rb
 - test/integration/routes/routes_test.rb
+- test/integration/sti_fields_test.rb
 - test/lib/generators/jsonapi/resource_generator_test.rb
 - test/test_helper.rb
 - test/unit/jsonapi_request/jsonapi_request_test.rb
@@ -237,7 +225,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.4.6
 signing_key: 
 specification_version: 4
 summary: Easily support JSON API in Rails.
@@ -251,6 +239,7 @@ test_files:
 - test/fixtures/categories.yml
 - test/fixtures/comments.yml
 - test/fixtures/comments_tags.yml
+- test/fixtures/companies.yml
 - test/fixtures/craters.yml
 - test/fixtures/customers.yml
 - test/fixtures/documents.yml
@@ -280,6 +269,7 @@ test_files:
 - test/helpers/value_matchers_test.rb
 - test/integration/requests/request_test.rb
 - test/integration/routes/routes_test.rb
+- test/integration/sti_fields_test.rb
 - test/lib/generators/jsonapi/resource_generator_test.rb
 - test/test_helper.rb
 - test/unit/jsonapi_request/jsonapi_request_test.rb
@@ -292,4 +282,3 @@ test_files:
 - test/unit/serializer/polymorphic_serializer_test.rb
 - test/unit/serializer/response_document_test.rb
 - test/unit/serializer/serializer_test.rb
-has_rdoc: