grape_ape_rails 0.9.10 → 0.9.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b1240d678239c0a950d300e1156f6016e37c87ad
-  data.tar.gz: 883a54b7f9f0898db02a7143a4c032a72470e08d
+  metadata.gz: 5f2fcc70c094393af40e932cf984884bb1aa8cb8
+  data.tar.gz: 837f65908d60bd2924f23f51532cbf3b7ea371da
 SHA512:
-  metadata.gz: 5861891416f4090aaccc2eb37d4862d7f62ed5042eecdcb8ac4147be31ed93901bb0ad333152ff1790a8063ab9722c975c7b761fe33831fc74665a4336e002b3
-  data.tar.gz: 633a04ae35c65fdc5d00612444bc5d82c691acaae03971bce2afdd3a9ae0975c9bbaf3e4ad3bbda6ca601609cbfdf04b40789507e5339ff5c4c153c2f9a55641
+  metadata.gz: 2a93445e2f8ce21164b16b55db1a900c2ccabe335a8f96f8cbaba04275355b7f284d315017d5be7ff6884c7807c9b3c4174e189e13f342f5a2a313c2203cccd3
+  data.tar.gz: e8aa4a94221ff6b4f3030f9f726ffca2f46e17d66d5e50b44616e28ad7ae36d64c419cc05cf601ab26da3eafc629d90a38aad4f10fd29d88e3c3282c7d8f3233

data/lib/grape_ape_rails/handlers/formatters.rb

@@ -34,26 +34,34 @@ module Grape
     module GarActiveModelSerializers
       def self.call(resource, env)
         if serializer = Grape::Formatter::ActiveModelSerializers.fetch_serializer(resource, env)
-          single = serializer.try(:resource_singular) || serializer.instance_variable_get(:@resource_name).try(:singularize) || serializer.instance_variable_get(:@object).class.name.underscore
-          plural = serializer.try(:resource_plural) || serializer.instance_variable_get(:@resource_name) || single.pluralize
-
-          return %Q[{\"result\":#{MultiJson.dump(serializer)}}] if [serializer.object].flatten.size > 1
-
           serializer.root = false
-          out = serializer.object.try(:empty?) ? nil : MultiJson.dump(serializer)
-          if out.present? && out[0,1] == '[' && out[-1,1] == ']'
-            # was probably a single mongoid criteria object or some enumerable that serialized itself into a json array
-            out = out
-          else
-            # its a singular record, so we want to put it in an array
-            out = "[#{out}]"
-          end
-          %Q[{\"result\":{\"#{plural}\":#{out}}}]
+          %Q[{\"result\":{\"#{pluralized_resource(serializer, env)}\":#{dump_to_json_array_string(serializer)}}}]
         else
-          # Grape::Formatter::GarJsonSerializer.call serializer.object, env
           Grape::Formatter::GarJsonSerializer.call resource, env
         end
       end
+
+      private
+
+      def self.dump_to_json_array_string(serializer)
+        str = serializer.object.try(:empty?) ? nil : MultiJson.dump(serializer)
+        str = "[#{str}]" unless is_serialized_array_string?(str)
+        str
+      end
+
+      def self.is_serialized_array_string?(str)
+        str.present? && str[0,1] == '[' && str[-1,1] == ']'
+      end
+
+      def self.pluralized_resource(serializer, env)
+        single = serializer.try(:resource_singular) || serializer.instance_variable_get(:@resource_name).try(:singularize) || serializer.instance_variable_get(:@object).class.name.underscore
+        plural = serializer.try(:resource_plural) || serializer.instance_variable_get(:@resource_name) || single.pluralize
+        # allow the pluralized resource name to be overriden with a custom route setting
+        if env["rack.routing_args"][:route_info].route_settings[:custom] && env["rack.routing_args"][:route_info].route_settings[:custom][:resource_plural]
+          plural = env["rack.routing_args"][:route_info].route_settings[:custom][:resource_plural].to_s.downcase
+        end
+        plural
+      end
     end
 
     module GarRabl

data/lib/grape_ape_rails/version.rb

@@ -1,3 +1,3 @@
 module GrapeApeRails
-  VERSION = "0.9.10"
+  VERSION = "0.9.11"
 end

data/spec/dummy/app/controllers/api/v1/monkeys.rb

@@ -24,6 +24,12 @@ module API
           @monkey = Monkey.find(params[:id])
           @monkey
         end
+
+        desc "Get a single Monkey's bananas"
+        route_setting :custom, resource_plural: 'bananas'
+        get ':id/bananas' do
+          @bananas = Monkey.find(params[:id]).bananas
+        end
       end
     end
   end

data/spec/dummy/app/models/banana.rb

@@ -0,0 +1,4 @@
+class Banana < ActiveRecord::Base
+  validates_presence_of :size
+  belongs_to :monkey
+end

data/spec/dummy/app/models/banana_serializer.rb

@@ -0,0 +1,3 @@
+class BananaSerializer < ActiveModel::Serializer
+  attributes :monkey_id, :size
+end

data/spec/dummy/app/models/monkey.rb

@@ -1,3 +1,4 @@
 class Monkey < ActiveRecord::Base
   validates_presence_of :name, :color
+  has_many :bananas
 end

data/spec/dummy/db/migrate/20150514153831_create_bananas.rb

@@ -0,0 +1,8 @@
+class CreateBananas < ActiveRecord::Migration
+  def change
+    create_table :bananas do |t|
+      t.string :size
+      t.references :monkey
+    end
+  end
+end

data/spec/dummy/db/schema.rb

@@ -11,7 +11,12 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 20140804173544) do
+ActiveRecord::Schema.define(version: 20150514153831) do
+
+  create_table "bananas", force: true do |t|
+    t.string  "size"
+    t.integer "monkey_id"
+  end
 
   create_table "monkeys", force: true do |t|
     t.string   "name"

data/spec/requests/v1/monkeys_spec.rb

@@ -1,6 +1,19 @@
 require 'spec_helper'
 
 describe API::V1::Monkeys do
+  describe 'GET /monkeys/:id/bananas' do
+    let(:monkey) { FactoryGirl.create(:monkey_with_bananas) }
+    it 'succeeds' do
+      req :get, "/monkeys/#{monkey.id}/bananas"
+      expect(response.status).to eql 200
+    end
+    it 'returns the bananas in an array with key `bananas`' do
+      req :get, "/monkeys/#{monkey.id}/bananas"
+      expect(json_result.has_key?(:bananas)).to eql(true), "JSON expected to have key :bananas but it did not"
+      expect(json_result[:bananas].size).to eql(monkey.bananas.size)
+    end
+  end
+
   describe "GET /monkeys/:id" do
     let(:monkey) { FactoryGirl.create(:monkey) }
 

data/spec/spec_helper.rb

@@ -61,9 +61,23 @@ FactoryGirl.define do
     rads          150
   end
 
+  factory :banana do
+    size          "big"
+    monkey
+  end
+
   factory :monkey do
     name          "Frank the Monkey"
     color         "brown"
+
+    factory :monkey_with_bananas do
+      ignore do
+        bananas_count 5
+      end
+      after(:create) do |monkey, eval|
+        create_list(:banana, eval.bananas_count, monkey: monkey)
+      end
+    end
   end
 end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: grape_ape_rails
 version: !ruby/object:Gem::Version
-  version: 0.9.10
+  version: 0.9.11
 platform: ruby
 authors:
 - Matt E. Patterson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-05 00:00:00.000000000 Z
+date: 2015-05-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -407,6 +407,8 @@ files:
 - spec/dummy/app/helpers/application_helper.rb
 - spec/dummy/app/mailers/.keep
 - spec/dummy/app/models/.keep
+- spec/dummy/app/models/banana.rb
+- spec/dummy/app/models/banana_serializer.rb
 - spec/dummy/app/models/concerns/.keep
 - spec/dummy/app/models/monkey.rb
 - spec/dummy/app/models/monkey_serializer.rb
@@ -441,6 +443,7 @@ files:
 - spec/dummy/db/development.sqlite3
 - spec/dummy/db/migrate/20140714154355_create_widgets.rb
 - spec/dummy/db/migrate/20140804173544_create_monkeys.rb
+- spec/dummy/db/migrate/20150514153831_create_bananas.rb
 - spec/dummy/db/schema.rb
 - spec/dummy/db/test.sqlite3
 - spec/dummy/lib/assets/.keep
@@ -492,6 +495,8 @@ test_files:
 - spec/dummy/app/helpers/application_helper.rb
 - spec/dummy/app/mailers/.keep
 - spec/dummy/app/models/.keep
+- spec/dummy/app/models/banana.rb
+- spec/dummy/app/models/banana_serializer.rb
 - spec/dummy/app/models/concerns/.keep
 - spec/dummy/app/models/monkey.rb
 - spec/dummy/app/models/monkey_serializer.rb
@@ -526,6 +531,7 @@ test_files:
 - spec/dummy/db/development.sqlite3
 - spec/dummy/db/migrate/20140714154355_create_widgets.rb
 - spec/dummy/db/migrate/20140804173544_create_monkeys.rb
+- spec/dummy/db/migrate/20150514153831_create_bananas.rb
 - spec/dummy/db/schema.rb
 - spec/dummy/db/test.sqlite3
 - spec/dummy/lib/assets/.keep