active_model_serializers 0.8.2 → 0.8.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ee11c77cee4b5f85a7a31b2ae7fded2ae12dcab1
-  data.tar.gz: a8a8c430d80820d373fa123dc22199418e7150ee
+  metadata.gz: 94274a9d3a573ae8f656719aef33825cabb68673
+  data.tar.gz: b1d614a90149ec109b67e963464c232d0b5ed3f1
 SHA512:
-  metadata.gz: 3b468f9db91455e90e6f61f12c6168224f59c151e58f51ac54a2a09791daa0160119470154325b0983b7c73f2a4e614c6ac5d29a40e9914ddbdbabba35bd3574
-  data.tar.gz: 74dff8c032533a17b4e917ff8eaa57a35e19a789f0081294918b6f87619eab7abdc043ff1be9aec2bdaac8ebd38c92d7dfcef7adbc81da8a5e1518ce8b168c3c
+  metadata.gz: cc3140d1676014d8ce4aa0add253d247c55652a689cb83e7f7f7a71a81ae8d7c601fc5e2d261d415e243857a479a15156d0a84a67beb1c72475ef51c063cdfca
+  data.tar.gz: cfc92ac9bb7dfca07cebdd32ef4a120aa5784cc7f1a6bfc8a65900b553be736b174b6bbf22fb7ebd55e8295ea1d118373245396e3c0ac883e954ab27e925bca2

data/active_model_serializers.gemspec

@@ -20,4 +20,5 @@ Gem::Specification.new do |gem|
   gem.add_dependency 'activemodel', '>= 3.0'
   gem.add_development_dependency "rails", ">= 3.0"
   gem.add_development_dependency "pry"
+  gem.add_development_dependency "minitest"
 end

data/lib/action_controller/serialization.rb

@@ -33,19 +33,22 @@ module ActionController
     end
 
     def serialization_scope
-      send(_serialization_scope) if _serialization_scope && respond_to?(_serialization_scope, true)
+      send(_serialization_scope) if _serialization_scope &&
+        respond_to?(_serialization_scope, true)
     end
 
     def default_serializer_options
     end
 
-    def _render_option_json(resource, options)
-      json = ActiveModel::Serializer.build_json(self, resource, options)
+    [:_render_option_json, :_render_with_renderer_json].each do |renderer_method|
+      define_method renderer_method do |resource, options|
+        json = ActiveModel::Serializer.build_json(self, resource, options)
 
-      if json
-        super(json, options)
-      else
-        super
+        if json
+          super(json, options)
+        else
+          super(resource, options)
+        end
       end
     end
 

data/lib/active_model/serializers/version.rb

@@ -1,5 +1,5 @@
 module ActiveModel
   class Serializer
-    VERSION = "0.8.2"
+    VERSION = "0.8.3"
   end
 end

data/test/serialization_test.rb

@@ -84,8 +84,6 @@ class RenderJsonTest < ActionController::TestCase
   end
 
   class TestController < ActionController::Base
-    protect_from_forgery
-
     serialization_scope :current_user
     attr_reader :current_user
 

data/test/test_helper.rb

@@ -5,7 +5,7 @@ require "pry"
 
 require "active_model_serializers"
 require "active_support/json"
-require "test/unit"
+require "minitest/autorun"
 
 require 'rails'
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: active_model_serializers
 version: !ruby/object:Gem::Version
-  version: 0.8.2
+  version: 0.8.3
 platform: ruby
 authors:
 - José Valim
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-01 00:00:00.000000000 Z
+date: 2014-12-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
@@ -53,6 +53,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: minitest
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Making it easy to serialize models for client-side use
 email:
 - jose.valim@gmail.com