Renamed get_resources to find_by_keys

moved logic to handle single resources to controller
brought context up to current options useage

Author: lgebhardt

lib/jsonapi/resource.rb

@@ -261,19 +261,16 @@ def find_by_key(key, options = {})
         self.new(model, context)
       end
 
-      def get_resources(keys, context = nil)
-        if keys.length > 1
-          _models = _model_class.where({_primary_key => keys})
-
-          unless _models.length == keys.length
-            key = (keys - _models.pluck(:id).map(&:to_s)).first
-            raise JSONAPI::Exceptions::RecordNotFound.new(key)
-          end
+      def find_by_keys(keys, options = {})
+        context = options[:context]
+        _models = _model_class.where({_primary_key => keys})
 
-          _models.map { |model| self.new(model, context) }
-        else
-          self.find_by_key(keys[0], context)
+        unless _models.length == keys.length
+          key = (keys - _models.pluck(:id).map(&:to_s)).first
+          raise JSONAPI::Exceptions::RecordNotFound.new(key)
         end
+
+        _models.map { |model| self.new(model, context) }
       end
 
       def verify_filters(filters, context = nil)

lib/jsonapi/resource_controller.rb

@@ -29,7 +29,12 @@ def index
 
     def show
       keys = parse_key_array(params[resource_klass._primary_key])
-      resources = resource_klass.get_resources(keys, context)
+
+      resources = if keys.length > 1
+                    resource_klass.find_by_keys(keys, context: context)
+                  else
+                    resource_klass.find_by_key(keys[0], context: context)
+                  end
 
       render json: JSONAPI::ResourceSerializer.new.serialize_to_hash(
           resources,

test/fixtures/active_record.rb

@@ -433,12 +433,8 @@ def self.find_by_key(id, options = {})
     BreedResource.new($breed_data.breeds[id.to_i], options[:context])
   end
 
-  def self.get_resources(keys, options = {})
-    if keys.length > 1
-      keys.map { |key| self.find_by_key(key, options) }
-    else
-      self.find_by_key(keys[0], options)
-    end
+  def self.find_by_keys(keys, options = {})
+    keys.map { |key| self.find_by_key(key, options) }
   end
 end