Merge pull request cerebris#54 from cerebris/ResourceNotFoundErrorMessage

Resource not found error message

Author: dgeb

.travis.yml

@@ -1,4 +1,5 @@
 language: ruby
 rvm:
+  - 1.9.3
   - 2.0.0
-  - 2.1.1
+  - 2.1

lib/jsonapi/request.rb

@@ -20,7 +20,7 @@ def initialize(params = nil, options = {})
     end
 
     def setup(params)
-      @resource_klass ||= self.class.resource_for(params[:controller]) if params[:controller]
+      @resource_klass ||= self.class.resource_for(params[:controller].split('/').last) if params[:controller]
 
       unless params.nil?
         case params[:action]
@@ -76,10 +76,14 @@ def parse_fields(params)
       fields.each do |type, values|
         underscored_type = unformat_key(type)
         fields[type] = []
-        type_resource = self.class.resource_for(underscored_type)
-        if type_resource.nil? || !(@resource_klass._type == underscored_type ||
-                                   @resource_klass._has_association?(underscored_type))
+        begin
+          type_resource = self.class.resource_for(underscored_type)
+        rescue NameError
           @errors.concat(JSONAPI::Exceptions::InvalidResource.new(type).errors)
+        end
+          if type_resource.nil? || !(@resource_klass._type == underscored_type ||
+                                     @resource_klass._has_association?(underscored_type))
+            @errors.concat(JSONAPI::Exceptions::InvalidResource.new(type).errors)
         else
           unless values.nil?
             valid_fields = type_resource.fields.collect {|key| format_key(key)}

lib/jsonapi/resource_for.rb

@@ -11,15 +11,19 @@ def resource_for(type)
           resource_name = JSONAPI::Resource._resource_name_from_type(type)
           Object.const_get resource_name if resource_name
         rescue NameError
-          nil
+          raise NameError, "JSONAPI: Could not find resource '#{type}'. (Class #{resource_name} not found)"
         end
       else
         def resource_for(type)
           resource_name = JSONAPI::Resource._resource_name_from_type(type)
-          resource_name.safe_constantize if resource_name
+          resource = resource_name.safe_constantize if resource_name
+          if resource.nil?
+            raise NameError, "JSONAPI: Could not find resource '#{type}'. (Class #{resource_name} not found)"
+          end
+          resource
         end
       end
       # :nocov:
     end
   end
-end
+end

test/fixtures/active_record.rb

@@ -528,7 +528,7 @@ class PreferencesResource < JSONAPI::Resource
   has_one :author, foreign_key: :person_id
   has_many :friends
 
-  def self.find_by_key(key, context: nil)
+  def self.find_by_key(key, options = {})
     new(Preferences.first)
   end
 end