jsonapi-resources 0.5.0 → 0.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f3abcdf22a7970e7b4e51d624771006f875e857f
-  data.tar.gz: 26703852c97b53b7a044f545a16256024d67522a
+  metadata.gz: d1860b6f54c5c18361eee885c58d9a44ca799223
+  data.tar.gz: 75520fb96150d1185d444c474f9b803e1efada5b
 SHA512:
-  metadata.gz: fa580d57a12f10e6bd3732ab0b4c6b3818b8daa81ce995110f810d05e71ef16ed4f56b934ccd518c731aca4d617621070fa61e86363acd7fdd72167ffd58fa8e
-  data.tar.gz: 96acb9c3f10654468c1639cd867e0658dc575318b3a452e463955ead6a64f885dbd5482a3b8a4dd803ae76b684560d839c67f507bd925b465f8f90811a43da41
+  metadata.gz: f335fd832a84998b16b4c10fb349c87fba4bfbc5e97166e3c7875c6d07ec46a6fe8453aba8d2297d12ab1a9c22ee28355695e009384a7bb3f2f41fd2ade7d8db
+  data.tar.gz: bf31f588b77dfa2c95d9ddcd6461ef984aa329c2c17641082662156b01a36c69aa6f51fcb2741f84886f0ccdee5c9d2f6108966cfd842db8bcae5509ebb44dd1

data/README.md

@@ -102,16 +102,16 @@ class AuthorResource < JSONAPI::Resource
 
   def fetchable_fields
     if (context.current_user.guest)
-      super(context) - [:email]
+      super - [:email]
     else
-      super(context)
+      super
     end
   end
 end
 ```
 
-Context flows through from the controller and can be used to control the attributes based on the current user (or other
-value).
+Context flows through from the controller to the resource and can be used to control the attributes based on the
+current user (or other value).
 
 ##### Creatable and Updatable Attributes
 
@@ -262,7 +262,7 @@ end
 
 The relationship methods (`relationship`, `has_one`, and `has_many`) support the following options:
 
- * `class_name` - a string specifying the underlying class for the related resource
+ * `class_name` - a string specifying the underlying class for the related resource. Defaults to the `class_name` property on the underlying model.
  * `foreign_key` - the method on the resource used to fetch the related resource. Defaults to `<resource_name>_id` for has_one and `<resource_name>_ids` for has_many relationships.
  * `acts_as_set` - allows the entire set of related records to be replaced in one operation. Defaults to false if not set.
  * `polymorphic` - set to true to identify relationships that are polymorphic.
@@ -270,7 +270,7 @@ The relationship methods (`relationship`, `has_one`, and `has_many`) support the
 
 `to_one` relationships support the additional option:
  * `foreign_key_on` - defaults to `:self`. To indicate that the foreign key is on the related resource specify `:related`.
- 
+
 Examples:
 
 ```ruby
@@ -338,7 +338,7 @@ class ContactResource < JSONAPI::Resource
 end
 ```
 
-Then a request could pass in a filter for example `http://example.com/contacts?filter[name_last]=Smith` and the system 
+Then a request could pass in a filter for example `http://example.com/contacts?filter[name_last]=Smith` and the system
 will find all people where the last name exactly matches Smith.
 
 ##### Default Filters
@@ -1276,12 +1276,13 @@ JSONAPI.configure do |config|
   # processing. If you want to use Rails' `rescue_from` macro to
   # catch this error and render a 403 status code, you should add
   # the `Pundit::NotAuthorizedError` to the `exception_class_whitelist`.
+  # Subclasses of the whitelisted classes will also be whitelisted.
   config.exception_class_whitelist = []
-  
+
   # Resource Linkage
   # Controls the serialization of resource linkage for non compound documents
-  # NOTE: always_include_has_many_linkage_data is not currently implemented
-  config.always_include_has_one_linkage_data = false  
+  # NOTE: always_include_to_many_linkage_data is not currently implemented
+  config.always_include_to_one_linkage_data = false
 end
 ```
 

data/lib/jsonapi/active_record_operations_processor.rb

@@ -29,7 +29,7 @@ class ActiveRecordOperationsProcessor < JSONAPI::OperationsProcessor
     raise e
 
   rescue => e
-    if JSONAPI.configuration.exception_class_whitelist.include?(e.class)
+    if JSONAPI.configuration.exception_class_whitelist.any? { |k| e.class.ancestors.include?(k) }
       raise e
     else
       internal_server_error = JSONAPI::Exceptions::InternalServerError.new(e)

data/lib/jsonapi/exceptions.rb

@@ -323,10 +323,11 @@ module JSONAPI
       end
 
       def pointer(attr_or_relationship_name)
+        formatted_attr_or_relationship_name = format_key(attr_or_relationship_name)
         if resource_relationships.include?(attr_or_relationship_name)
-          "/data/relationships/#{attr_or_relationship_name}"
+          "/data/relationships/#{formatted_attr_or_relationship_name}"
         else
-          "/data/attributes/#{attr_or_relationship_name}"
+          "/data/attributes/#{formatted_attr_or_relationship_name}"
         end
       end
     end

data/lib/jsonapi/operation.rb

@@ -17,12 +17,12 @@ module JSONAPI
     attr_reader :filters, :include_directives, :sort_criteria, :paginator
 
     def initialize(resource_klass, options = {})
+      super(resource_klass, options)
       @filters = options[:filters]
       @include_directives = options[:include_directives]
       @sort_criteria = options.fetch(:sort_criteria, [])
       @paginator = options[:paginator]
       @transactional = false
-      super(resource_klass, options)
     end
 
     def record_count
@@ -70,10 +70,10 @@ module JSONAPI
     attr_reader :id, :include_directives
 
     def initialize(resource_klass, options = {})
+      super(resource_klass, options)
       @id = options.fetch(:id)
       @include_directives = options[:include_directives]
       @transactional = false
-      super(resource_klass, options)
     end
 
     def apply
@@ -94,10 +94,10 @@ module JSONAPI
     attr_reader :parent_key, :relationship_type
 
     def initialize(resource_klass, options = {})
+      super(resource_klass, options)
       @parent_key = options.fetch(:parent_key)
       @relationship_type = options.fetch(:relationship_type)
       @transactional = false
-      super(resource_klass, options)
     end
 
     def apply
@@ -116,11 +116,11 @@ module JSONAPI
     attr_reader :source_klass, :source_id, :relationship_type
 
     def initialize(resource_klass, options = {})
+      super(resource_klass, options)
       @source_klass = options.fetch(:source_klass)
       @source_id = options.fetch(:source_id)
       @relationship_type = options.fetch(:relationship_type)
       @transactional = false
-      super(resource_klass, options)
     end
 
     def apply
@@ -139,6 +139,7 @@ module JSONAPI
     attr_reader :source_klass, :source_id, :relationship_type, :filters, :sort_criteria, :paginator
 
     def initialize(resource_klass, options = {})
+      super(resource_klass, options)
       @source_klass = options.fetch(:source_klass)
       @source_id = options.fetch(:source_id)
       @relationship_type = options.fetch(:relationship_type)
@@ -146,7 +147,6 @@ module JSONAPI
       @sort_criteria = options[:sort_criteria]
       @paginator = options[:paginator]
       @transactional = false
-      super(resource_klass, options)
     end
 
     def apply
@@ -168,8 +168,8 @@ module JSONAPI
     attr_reader :data
 
     def initialize(resource_klass, options = {})
-      @data = options.fetch(:data)
       super(resource_klass, options)
+      @data = options.fetch(:data)
     end
 
     def apply
@@ -186,8 +186,8 @@ module JSONAPI
   class RemoveResourceOperation < Operation
     attr_reader :resource_id
     def initialize(resource_klass, options = {})
-      @resource_id = options.fetch(:resource_id)
       super(resource_klass, options)
+      @resource_id = options.fetch(:resource_id)
     end
 
     def apply
@@ -205,9 +205,9 @@ module JSONAPI
     attr_reader :data, :resource_id
 
     def initialize(resource_klass, options = {})
+      super(resource_klass, options)
       @resource_id = options.fetch(:resource_id)
       @data = options.fetch(:data)
-      super(resource_klass, options)
     end
 
     def apply
@@ -222,10 +222,10 @@ module JSONAPI
     attr_reader :resource_id, :relationship_type, :key_value
 
     def initialize(resource_klass, options = {})
+      super(resource_klass, options)
       @resource_id = options.fetch(:resource_id)
       @key_value = options.fetch(:key_value)
       @relationship_type = options.fetch(:relationship_type).to_sym
-      super(resource_klass, options)
     end
 
     def apply
@@ -240,11 +240,11 @@ module JSONAPI
     attr_reader :resource_id, :relationship_type, :key_value, :key_type
 
     def initialize(resource_klass, options = {})
+      super(resource_klass, options)
       @resource_id = options.fetch(:resource_id)
       @key_value = options.fetch(:key_value)
       @key_type = options.fetch(:key_type)
       @relationship_type = options.fetch(:relationship_type).to_sym
-      super(resource_klass, options)
     end
 
     def apply
@@ -259,10 +259,10 @@ module JSONAPI
     attr_reader :resource_id, :relationship_type, :data
 
     def initialize(resource_klass, options)
+      super(resource_klass, options)
       @resource_id = options.fetch(:resource_id)
       @data = options.fetch(:data)
       @relationship_type = options.fetch(:relationship_type).to_sym
-      super(resource_klass, options)
     end
 
     def apply
@@ -277,10 +277,10 @@ module JSONAPI
     attr_reader :resource_id, :relationship_type, :data
 
     def initialize(resource_klass, options)
+      super(resource_klass, options)
       @resource_id = options.fetch(:resource_id)
       @data = options.fetch(:data)
       @relationship_type = options.fetch(:relationship_type).to_sym
-      super(resource_klass, options)
     end
 
     def apply
@@ -295,10 +295,10 @@ module JSONAPI
     attr_reader :resource_id, :relationship_type, :associated_key
 
     def initialize(resource_klass, options)
+      super(resource_klass, options)
       @resource_id = options.fetch(:resource_id)
       @associated_key = options.fetch(:associated_key)
       @relationship_type = options.fetch(:relationship_type).to_sym
-      super(resource_klass, options)
     end
 
     def apply
@@ -313,9 +313,9 @@ module JSONAPI
     attr_reader :resource_id, :relationship_type
 
     def initialize(resource_klass, options)
+      super(resource_klass, options)
       @resource_id = options.fetch(:resource_id)
       @relationship_type = options.fetch(:relationship_type).to_sym
-      super(resource_klass, options)
     end
 
     def apply

data/lib/jsonapi/operations_processor.rb

@@ -33,10 +33,8 @@ module JSONAPI
       # Use transactions if more than one operation and if one of the operations can be transactional
       # Even if transactional transactions won't be used unless the derived OperationsProcessor supports them.
       @transactional = false
-      if @operations.length > 1
-        @operations.each do |operation|
-          @transactional |= operation.transactional
-        end
+      @operations.each do |operation|
+        @transactional |= operation.transactional
       end
 
       run_callbacks :operations do

data/lib/jsonapi/request.rb

@@ -604,7 +604,7 @@ module JSONAPI
     end
 
     def parse_remove_operation(params)
-      keys = parse_key_array(params.permit(:id)[:id])
+      keys = parse_key_array(params.require(:id))
 
       keys.each do |key|
         @operations.push JSONAPI::RemoveResourceOperation.new(
@@ -613,8 +613,6 @@ module JSONAPI
           resource_id: key
         )
       end
-    rescue ActionController::UnpermittedParameters => e
-      @errors.concat(JSONAPI::Exceptions::ParametersNotAllowed.new(e.params).errors)
     rescue JSONAPI::Exceptions::Error => e
       @errors.concat(e.errors)
     end

data/lib/jsonapi/resource.rb

@@ -596,7 +596,7 @@ module JSONAPI
       end
 
       def _as_parent_key
-        @_as_parent_key ||= "#{_type.to_s.singularize}_#{_primary_key}"
+        @_as_parent_key ||= "#{_type.to_s.singularize}_id"
       end
 
       def _allowed_filters
@@ -621,7 +621,10 @@ module JSONAPI
       end
 
       def _model_class
-        @model ||= _model_name.to_s.safe_constantize
+        return @model if @model
+        @model = _model_name.to_s.safe_constantize
+        fail NameError, "model could not be found for #{self.name}" if @model.nil?
+        @model
       end
 
       def _allowed_filter?(filter)
@@ -670,6 +673,15 @@ module JSONAPI
 
         attrs.each do |attr|
           check_reserved_relationship_name(attr)
+
+          # Initialize from an ActiveRecord model's properties
+          if _model_class < ActiveRecord::Base
+            model_association = _model_class.reflect_on_association(attr)
+            if model_association
+              options[:class_name] ||= model_association.class_name
+            end
+          end
+
           @_relationships[attr] = relationship = klass.new(attr, options)
 
           associated_records_method_name = case relationship
@@ -741,7 +753,7 @@ module JSONAPI
 
               sort_criteria =  options.fetch(:sort_criteria, {})
               unless sort_criteria.nil? || sort_criteria.empty?
-                order_options = self.class.construct_order_options(sort_criteria)
+                order_options = relationship.resource_klass.construct_order_options(sort_criteria)
                 records = resource_klass.apply_sort(records, order_options)
               end
 

data/lib/jsonapi/resources/version.rb

@@ -1,5 +1,5 @@
 module JSONAPI
   module Resources
-    VERSION = '0.5.0'
+    VERSION = '0.5.1'
   end
 end

data/test/controllers/controller_test.rb

@@ -1427,13 +1427,6 @@ class PostsControllerTest < ActionController::TestCase
     assert_equal initial_count, Post.count
   end
 
-  def test_delete_extra_param
-    initial_count = Post.count
-    delete :destroy, {id: '4', asdfg: 'aaaa'}
-    assert_response :bad_request
-    assert_equal initial_count, Post.count
-  end
-
   def test_show_to_one_relationship
     get :show_relationship, {post_id: '1', relationship: 'author'}
     assert_response :success
@@ -2159,11 +2152,8 @@ class Api::V1::PostsControllerTest < ActionController::TestCase
 end
 
 class FactsControllerTest < ActionController::TestCase
-  def setup
-    JSONAPI.configuration.json_key_format = :camelized_key
-  end
-
   def test_type_formatting
+    JSONAPI.configuration.json_key_format = :camelized_key
     get :show, {id: '1'}
     assert_response :success
     assert json_response['data'].is_a?(Hash)
@@ -2177,6 +2167,40 @@ class FactsControllerTest < ActionController::TestCase
     assert_equal 'abc', json_response['data']['attributes']['photo']
     assert_equal false, json_response['data']['attributes']['cool']
   end
+
+  def test_create_with_invalid_data
+    JSONAPI.configuration.json_key_format = :dasherized_key
+    set_content_type_header!
+    post :create,
+         {
+           data: {
+             type: 'facts',
+             attributes: {
+               bio: '',
+               :"quality-rating" => '',
+               :"spouse-name" => '',
+               salary: 100000,
+               :"date-time-joined" => '',
+               birthday: '',
+               bedtime: '',
+               photo: 'abc',
+               cool: false
+             },
+             relationships: {
+             }
+           }
+         }
+
+    assert_response :unprocessable_entity
+
+    assert_equal "/data/attributes/spouse-name", json_response['errors'][0]['source']['pointer']
+    assert_equal "can't be blank", json_response['errors'][0]['detail']
+    assert_equal "spouse-name - can't be blank", json_response['errors'][0]['title']
+
+    assert_equal "/data/attributes/bio", json_response['errors'][1]['source']['pointer']
+    assert_equal "can't be blank", json_response['errors'][1]['detail']
+    assert_equal "bio - can't be blank", json_response['errors'][1]['title']
+  end
 end
 
 class Api::V2::BooksControllerTest < ActionController::TestCase
@@ -2634,3 +2658,64 @@ class Api::V1::PlanetsControllerTest < ActionController::TestCase
     assert_match /Save failed or was cancelled/, json_response['errors'][0]['detail']
   end
 end
+
+class Api::V1::MoonsControllerTest < ActionController::TestCase
+   def test_get_related_resource
+      get :get_related_resource, {crater_id: 'S56D', relationship: 'moon', source: "api/v1/craters"}
+      assert_response :success
+      assert_hash_equals json_response,
+                              {
+                                data: {
+                                  id: "1",
+                                  type: "moons",
+                                  links: {self: "http://test.host/moons/1"},
+                                  attributes: {name: "Titan", description: "Best known of the Saturn moons."},
+                                  relationships: {
+                                    planet: {links: {self: "http://test.host/moons/1/relationships/planet", related: "http://test.host/moons/1/planet"}},
+                                    craters: {links: {self: "http://test.host/moons/1/relationships/craters", related: "http://test.host/moons/1/craters"}}}
+                                  }
+                                }
+
+   end
+end
+
+class Api::V1::CratersControllerTest < ActionController::TestCase
+  def test_show_single
+    get :show, {id: 'S56D'}
+    assert_response :success
+    assert json_response['data'].is_a?(Hash)
+    assert_equal 'S56D', json_response['data']['attributes']['code']
+    assert_equal 'Very large crater', json_response['data']['attributes']['description']
+    assert_nil json_response['included']
+  end
+
+  def test_get_related_resources
+    get :get_related_resources, {moon_id: '1', relationship: 'craters', source: "api/v1/moons"}
+    assert_response :success
+    assert_hash_equals json_response,
+                      {
+                        data: [
+                          {id:"A4D3",
+                           type:"craters",
+                           links:{self: "http://test.host/craters/A4D3"},
+                           attributes:{code: "A4D3", description: "Small crater"},
+                           relationships:{moon: {links: {self: "http://test.host/craters/A4D3/relationships/moon", related: "http://test.host/craters/A4D3/moon"}}}
+                          },
+                          {id: "S56D",
+                           type: "craters",
+                           links:{self: "http://test.host/craters/S56D"},
+                           attributes:{code: "S56D", description: "Very large crater"},
+                           relationships:{moon: {links: {self: "http://test.host/craters/S56D/relationships/moon", related: "http://test.host/craters/S56D/moon"}}}
+                          }
+                        ]
+                      }
+  end
+
+  def test_show_relationship
+    get :show_relationship, {crater_id: 'S56D', relationship: 'moon'}
+
+    assert_response :success
+    assert_equal "moons", json_response['data']['type']
+    assert_equal "1", json_response['data']['id']
+  end
+end

data/test/fixtures/active_record.rb

@@ -92,6 +92,12 @@ ActiveRecord::Schema.define do
     t.integer :planet_id
   end
 
+  create_table :craters, id: false, force: true do |t|
+    t.string  :code
+    t.string  :description
+    t.integer :moon_id
+  end
+
   create_table :preferences, force: true do |t|
     t.integer :person_id
     t.boolean :advanced_mode, default: false
@@ -248,6 +254,21 @@ end
 class Section < ActiveRecord::Base
 end
 
+class HairCut < ActiveRecord::Base
+end
+
+class Property < ActiveRecord::Base
+end
+
+class Customer < ActiveRecord::Base
+end
+
+class BadlyNamedAttributes < ActiveRecord::Base
+end
+
+class Cat < ActiveRecord::Base
+end
+
 class IsoCurrency < ActiveRecord::Base
   self.primary_key = :code
   # has_many :expense_entries, foreign_key: 'currency_code'
@@ -281,6 +302,14 @@ end
 
 class Moon < ActiveRecord::Base
   belongs_to :planet
+
+  has_many :craters
+end
+
+class Crater < ActiveRecord::Base
+  self.primary_key = :code
+
+  belongs_to :moon
 end
 
 class Preferences < ActiveRecord::Base
@@ -289,6 +318,7 @@ class Preferences < ActiveRecord::Base
 end
 
 class Fact < ActiveRecord::Base
+  validates :spouse_name, :bio, presence: true
 end
 
 class Like < ActiveRecord::Base
@@ -360,7 +390,7 @@ class BreedData
   end
 end
 
-class CustomerOrder < ActiveRecord::Base
+class Customer < ActiveRecord::Base
   has_many :purchase_orders
 end
 
@@ -407,13 +437,6 @@ class Product < ActiveRecord::Base
   has_one :picture, as: :imageable
 end
 
-### PORO Data - don't do this in a production app
-$breed_data = BreedData.new
-$breed_data.add(Breed.new(0, 'persian'))
-$breed_data.add(Breed.new(1, 'siamese'))
-$breed_data.add(Breed.new(2, 'sphinx'))
-$breed_data.add(Breed.new(3, 'to_delete'))
-
 ### OperationsProcessor
 class CountingActiveRecordOperationsProcessor < ActiveRecordOperationsProcessor
   after_find_operation do
@@ -429,7 +452,7 @@ class ErrorRaisingOperationsProcessor < ActiveRecordOperationsProcessor
   def process_operation(operation)
     mock_operation = Minitest::Mock.new
     mock_operation.expect(:apply, true) do
-      raise PostsController::SpecialError
+      raise PostsController::SubSpecialError
     end
     super(mock_operation)
   end
@@ -445,6 +468,7 @@ end
 class PostsController < ActionController::Base
   include JSONAPI::ActsAsResourceController
   class SpecialError < StandardError; end
+  class SubSpecialError < PostsController::SpecialError; end
 
   # This is used to test that classes that are whitelisted are reraised by
   # the operations processor.
@@ -523,6 +547,9 @@ module Api
     class MoonsController < JSONAPI::ResourceController
     end
 
+    class CratersController < JSONAPI::ResourceController
+    end
+
     class LikesController < JSONAPI::ResourceController
     end
   end
@@ -860,13 +887,25 @@ class MoonResource < JSONAPI::Resource
   attribute :description
 
   has_one :planet
+  has_many :craters
+end
+
+class CraterResource < JSONAPI::Resource
+  attribute :code
+  attribute :description
+
+  has_one :moon
+
+  def self.verify_key(key, context = nil)
+    key && String(key)
+  end
 end
 
 class PreferencesResource < JSONAPI::Resource
   attribute :advanced_mode
 
-  has_one :author, foreign_key: :person_id, class_name: 'Person'
-  has_many :friends, class_name: 'Person'
+  has_one :author, foreign_key: :person_id
+  has_many :friends
 
   def self.find_by_key(key, options = {})
     new(Preferences.first)
@@ -930,7 +969,7 @@ module Api
       attribute :body
       attribute :subject
 
-      has_one :writer, foreign_key: 'author_id'
+      has_one :writer, foreign_key: 'author_id', class_name: 'Writer'
       has_one :section
       has_many :comments, acts_as_set: false
 
@@ -951,6 +990,7 @@ module Api
     PlanetResource = PlanetResource.dup
     PlanetTypeResource = PlanetTypeResource.dup
     MoonResource = MoonResource.dup
+    CraterResource = CraterResource.dup
     PreferencesResource = PreferencesResource.dup
     EmployeeResource = EmployeeResource.dup
     FriendResource = FriendResource.dup
@@ -1214,28 +1254,9 @@ class BadlyNamedAttributesResource < JSONAPI::Resource
 end
 warn 'end testing Name Collisions'
 
-### PORO DATA
-gas_giant = PlanetType.create(name: 'Gas Giant')
-planetoid = PlanetType.create(name: 'Planetoid')
-terrestrial = PlanetType.create(name: 'Terrestrial')
-sulfuric = PlanetType.create(name: 'Sulfuric')
-unknown = PlanetType.create(name: 'unknown')
-
-saturn = Planet.create(name: 'Satern',
-                       description: 'Saturn is the sixth planet from the Sun and the second largest planet in the Solar System, after Jupiter.',
-                       planet_type_id: planetoid.id)
-titan = Moon.create(name:'Titan', description: 'Best known of the Saturn moons.', planet_id: saturn.id)
-makemake = Planet.create(name: 'Makemake', description: 'A small planetoid in the Kuiperbelt.', planet_type_id: planetoid.id)
-uranus = Planet.create(name: 'Uranus', description: 'Insert adolescent jokes here.', planet_type_id: gas_giant.id)
-jupiter = Planet.create(name: 'Jupiter', description: 'A gas giant.', planet_type_id: gas_giant.id)
-betax = Planet.create(name: 'Beta X', description: 'Newly discovered Planet X', planet_type_id: unknown.id)
-betay = Planet.create(name: 'Beta X', description: 'Newly discovered Planet Y', planet_type_id: unknown.id)
-betaz = Planet.create(name: 'Beta X', description: 'Newly discovered Planet Z', planet_type_id: unknown.id)
-betaw = Planet.create(name: 'Beta W', description: 'Newly discovered Planet W')
-Category.create(name: 'Category A', status: 'active')
-Category.create(name: 'Category B', status: 'active')
-Category.create(name: 'Category C', status: 'active')
-Category.create(name: 'Category D', status: 'inactive')
-Category.create(name: 'Category E', status: 'inactive')
-Category.create(name: 'Category F', status: 'inactive')
-Category.create(name: 'Category G', status: 'inactive')
+### PORO Data - don't do this in a production app
+$breed_data = BreedData.new
+$breed_data.add(Breed.new(0, 'persian'))
+$breed_data.add(Breed.new(1, 'siamese'))
+$breed_data.add(Breed.new(2, 'sphinx'))
+$breed_data.add(Breed.new(3, 'to_delete'))

data/test/fixtures/categories.yml

@@ -0,0 +1,35 @@
+category_a:
+  id: 1
+  name: Category A
+  status: active
+
+category_b:
+  id: 2
+  name: Category B
+  status: active
+
+category_c:
+  id: 3
+  name: Category C
+  status: active
+
+category_d:
+  id: 4
+  name: Category D
+  status: inactive
+
+category_e:
+  id: 5
+  name: Category E
+  status: inactive
+
+category_f:
+  id: 6
+  name: Category F
+  status: inactive
+
+category_g:
+  id: 7
+  name: Category G
+  status: inactive
+

data/test/fixtures/craters.yml

@@ -0,0 +1,9 @@
+crater1:
+  code: S56D
+  description: Very large crater
+  moon_id: 1
+
+crater2:
+  code: A4D3
+  description: Small crater
+  moon_id: 1

data/test/fixtures/moons.yml

@@ -0,0 +1,6 @@
+titan:
+  id: 1
+  name: Titan
+  description: Best known of the Saturn moons.
+  planet_id: 1
+

data/test/fixtures/planet_types.yml

@@ -0,0 +1,19 @@
+gas_giant:
+  id: 1
+  name: Gas Giant
+
+planetoid:
+  id: 2
+  name: Planetoid
+
+terrestrial:
+  id: 3
+  name: Terrestrial
+
+sulfuric:
+  id: 4
+  name: Sulfuric
+
+unknown:
+  id: 5
+  name: unknown

data/test/fixtures/planets.yml

@@ -0,0 +1,47 @@
+saturn:
+  id: 1
+  name: Satern
+  description: Saturn is the sixth planet from the Sun and the second largest planet in the Solar System, after Jupiter.
+  planet_type_id: 2
+
+makemake:
+  id: 2
+  name: Makemake
+  description: A small planetoid in the Kuiperbelt.
+  planet_type_id: 2
+
+uranus:
+  id: 3
+  name: Uranus
+  description: Insert adolescent jokes here.
+  planet_type_id: 1
+
+jupiter:
+  id: 4
+  name: Jupiter
+  description: A gas giant.
+  planet_type_id: 1
+
+betax:
+  id: 5
+  name: Beta X
+  description: Newly discovered Planet X
+  planet_type_id: 5
+
+betay:
+  id: 6
+  name: Beta X
+  description: Newly discovered Planet Y
+  planet_type_id: 5
+
+betaz:
+  id: 7
+  name: Beta X
+  description: Newly discovered Planet Z
+  planet_type_id: 5
+
+betaw:
+  id: 8
+  name: Beta W
+  description: Newly discovered Planet W
+  planet_type_id:

data/test/test_helper.rb

@@ -110,6 +110,7 @@ TestApp.routes.draw do
   jsonapi_resources :planets
   jsonapi_resources :planet_types
   jsonapi_resources :moons
+  jsonapi_resources :craters
   jsonapi_resources :preferences
   jsonapi_resources :facts
   jsonapi_resources :categories
@@ -130,6 +131,7 @@ TestApp.routes.draw do
       jsonapi_resources :planets
       jsonapi_resources :planet_types
       jsonapi_resources :moons
+      jsonapi_resources :craters
       jsonapi_resources :preferences
       jsonapi_resources :likes
     end
@@ -224,6 +226,14 @@ class Minitest::Test
   include Helpers::Assertions
   include Helpers::ValueMatchers
   include Helpers::FunctionalHelpers
+  include ActiveRecord::TestFixtures
+
+  def run_in_transaction?
+    true
+  end
+
+  self.fixture_path = "#{Rails.root}/fixtures"
+  fixtures :all
 end
 
 class ActiveSupport::TestCase

data/test/unit/resource/resource_test.rb

@@ -8,6 +8,9 @@ class ArticleResource < JSONAPI::Resource
   end
 end
 
+class NoMatchResource < JSONAPI::Resource
+end
+
 class CatResource < JSONAPI::Resource
   attribute :id
   attribute :name
@@ -52,6 +55,14 @@ class ResourceTest < ActiveSupport::TestCase
     assert_equal(PostResource._model_class, Post)
   end
 
+  def test_nil_model_class
+    error = assert_raises(NameError) { NoMatchResource._model_class }
+    assert_equal(
+      error.message,
+      "model could not be found for NoMatchResource"
+    )
+  end
+
   def test_model_alternate
     assert_equal(ArticleResource._model_class, Post)
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jsonapi-resources
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.5.1
 platform: ruby
 authors:
 - Dan Gebhardt
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-16 00:00:00.000000000 Z
+date: 2015-07-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -170,8 +170,10 @@ files:
 - test/fixtures/author_details.yml
 - test/fixtures/book_comments.yml
 - test/fixtures/books.yml
+- test/fixtures/categories.yml
 - test/fixtures/comments.yml
 - test/fixtures/comments_tags.yml
+- test/fixtures/craters.yml
 - test/fixtures/customers.yml
 - test/fixtures/documents.yml
 - test/fixtures/expense_entries.yml
@@ -179,10 +181,13 @@ files:
 - test/fixtures/hair_cuts.yml
 - test/fixtures/iso_currencies.yml
 - test/fixtures/line_items.yml
+- test/fixtures/moons.yml
 - test/fixtures/numeros_telefone.yml
 - test/fixtures/order_flags.yml
 - test/fixtures/people.yml
 - test/fixtures/pictures.yml
+- test/fixtures/planet_types.yml
+- test/fixtures/planets.yml
 - test/fixtures/posts.yml
 - test/fixtures/posts_tags.yml
 - test/fixtures/preferences.yml
@@ -239,8 +244,10 @@ test_files:
 - test/fixtures/author_details.yml
 - test/fixtures/book_comments.yml
 - test/fixtures/books.yml
+- test/fixtures/categories.yml
 - test/fixtures/comments.yml
 - test/fixtures/comments_tags.yml
+- test/fixtures/craters.yml
 - test/fixtures/customers.yml
 - test/fixtures/documents.yml
 - test/fixtures/expense_entries.yml
@@ -248,10 +255,13 @@ test_files:
 - test/fixtures/hair_cuts.yml
 - test/fixtures/iso_currencies.yml
 - test/fixtures/line_items.yml
+- test/fixtures/moons.yml
 - test/fixtures/numeros_telefone.yml
 - test/fixtures/order_flags.yml
 - test/fixtures/people.yml
 - test/fixtures/pictures.yml
+- test/fixtures/planet_types.yml
+- test/fixtures/planets.yml
 - test/fixtures/posts.yml
 - test/fixtures/posts_tags.yml
 - test/fixtures/preferences.yml