grape_ape_rails 0.9.2 → 0.9.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6552b0d6e8e9db0f064f1aa53fa3b3eca373704d
-  data.tar.gz: 41e4f1fb4dc2ae5394b28cfbdc816913990c146c
+  metadata.gz: c9319abecd74d853d55d236bda20394144d4344c
+  data.tar.gz: 6111be1dfa521795b482cac451ae1e8a4ffe6b96
 SHA512:
-  metadata.gz: 1af0c8581b5910fc399c548d371fcc2589956ed6e475332c44a435371aef8bfa756dbba283b9510f9d31eb178a489ab831d8f614e5ff8adbd1410fa9a3f75a28
-  data.tar.gz: 62269c9fc9200cd5b5255f0cec075c5d9a96def54174e09d8e1e2013a6179c70f67c00c62cc42077148f36ed167dbf4c891db83af274ca51b0ba08c3ba9e27c8
+  metadata.gz: 947b19eb36e0944719cf6b5e7c9e0a506f3ab38edb234153ffe2d4fa985c66a22d4c76ea97f6d5e0c76e2b5f24c795f895a5ea6c74f5b3bc5b8f6ae5f1dab2ba
+  data.tar.gz: a430845cf35a6f7568a6e49abc251047338029d77f20e93d070564adc4e052882235613da5d3ff62db39069609c181d51ab76192e3bc5636945effb7e04a5141

data/lib/grape_ape_rails/handlers/formatters.rb

@@ -34,23 +34,13 @@ module Grape
     module GarActiveModelSerializers
       def self.call(resource, env)
         if serializer = Grape::Formatter::ActiveModelSerializers.fetch_serializer(resource, env)
-          # single = serializer.try(:resource_singular) || serializer.object.class.name.underscore
-          # default_plural = default_plural = serializer.object.class.name.underscore.pluralize
-          # if serializer.object.is_a?(Array)
-            # single = serializer.object.first.class.name.underscore
-            # default_plural = serializer.object.first.class.name.underscore.pluralize
-          # end
-          # plural = serializer.try(:resource_plural) || default_plural
           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
-          hash = serializer.as_json(root: false)
-          output = if hash.is_a?(Hash) && hash[single].present?
-            hash[single].is_a?(Array) ? hash[single] : [hash[single]]
-          else
-            hash.is_a?(Array) ? hash : [hash]
-          end
-          template = MultiJson.dump({ result: { plural => "***" } })
-          template.gsub(%Q("***"), MultiJson.dump(output))
+
+          return %Q[{\"result\":#{MultiJson.dump(serializer)}}] if [serializer.object].flatten.size > 1
+
+          serializer.root = false
+          %Q[{\"result\":{\"#{plural}\":[#{MultiJson.dump(serializer)}]}}]
         else
           Grape::Formatter::GarJsonSerializer.call serializer.object, env
         end

data/lib/grape_ape_rails/version.rb

@@ -1,3 +1,3 @@
 module GrapeApeRails
-  VERSION = "0.9.2"
+  VERSION = "0.9.3"
 end

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

@@ -6,6 +6,12 @@ module API
       formatter :json, Grape::Formatter::GarActiveModelSerializers
 
       resource :monkeys do
+        desc "Get many monkeys"
+        get '/' do
+          @monkeys = Monkey.all
+          @monkeys
+        end
+
         desc "Get a single Monkey"
         get ':id' do
           @monkey = Monkey.find(params[:id])

data/spec/requests/v1/monkeys_spec.rb

@@ -12,11 +12,19 @@ describe API::V1::Monkeys do
       expect(response.status).to eql 401
     end
 
-    it "returns a monkey by id, using the ActiveModelSerializers" do
+    it "returns a single monkey by id, using the ActiveModelSerializers" do
       req :get, "/monkeys/#{monkey.id}"
       expect(response.status).to eql 200
       expect(json_result[:monkeys].size).to eql 1
       expect(json_result[:monkeys].first[:name]).to eql "Frank the Monkey"
     end
   end
+  describe "GET /monkeys" do
+    it "returns multiple monkeys, using the ActiveModelSerializers" do
+      3.times { FactoryGirl.create :monkey }
+      req :get, "/monkeys"
+      expect(response.status).to eql 200
+      expect(json_result[:monkeys].size).to eql 3
+    end
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: grape_ape_rails
 version: !ruby/object:Gem::Version
-  version: 0.9.2
+  version: 0.9.3
 platform: ruby
 authors:
 - Matt E. Patterson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-15 00:00:00.000000000 Z
+date: 2015-02-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport