grape-active_model_serializers 1.3.1 → 1.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3d1fc34293532a51eb2a8694d46c26d874b56d3c
-  data.tar.gz: dd6d159497a55ee86f431402f02e0991cfae55c9
+  metadata.gz: 0833fa7f880a3344cf42f728b3176856e6ffd2a4
+  data.tar.gz: d080d1eeb3674e584535668269ed1cef7af531e3
 SHA512:
-  metadata.gz: 1012cd5e379a6dd9b988cb23d02d84bc12e6c95a4a2b61390762f7f8bccab6cf4c55254bee506bb8d59a8ca82ab581e30c411a2bfdf09a6e78c979660007c06a
-  data.tar.gz: 4b9d9dbbd00137e3ed063ccc357efd36aeaabe6a446c2960022c951417cd2abf0b2bd1b175283da38af0bc67f568792b2e589edbbb5b999ff7898fd6282fe5c6
+  metadata.gz: b43a17bd55b83913d2d745db519c91e13523d601d318f6d87169ddbfae15105f71997b35461a21d238543d5e6b2cb4115b6a19083c7c39bc3ae4d81cd7ebaefb
+  data.tar.gz: 1aa226e6e3e42baa064c8d83f413be3da199e65add7c3cceba5fb2083154cfad2a764d906cd3ad1e4ac5082c7c10d620705584a696522ad6f46e7bf5bca65d6a

data/.rubocop.yml

@@ -0,0 +1,2 @@
+inherit_from: .rubocop_todo.yml
+

data/.rubocop_todo.yml

@@ -0,0 +1,24 @@
+# This configuration was generated by `rubocop --auto-gen-config`
+# on 2015-01-13 18:47:14 -0500 using RuboCop version 0.28.0.
+# The point is for the user to remove these configuration records
+# one by one as the offenses are removed from the code base.
+# Note that changes in the inspected code, or installation of new
+# versions of RuboCop, may require this file to be generated again.
+
+# Offense count: 25
+# Configuration parameters: AllowURI, URISchemes.
+Metrics/LineLength:
+  Max: 179
+
+# Offense count: 7
+Style/Documentation:
+  Enabled: false
+
+# Offense count: 2
+# Configuration parameters: Exclude.
+Style/FileName:
+  Enabled: false
+
+# Offense count: 4
+Style/RegexpLiteral:
+  MaxSlashes: 0

data/.travis.yml

@@ -0,0 +1,15 @@
+language: ruby
+
+sudo: false
+
+rvm:
+  - 2.1.1
+  - 1.9.3
+  - rbx-2.2.10
+  - jruby-19mode
+
+env:
+  - GRAPE_VERSION=0.8.0
+  - GRAPE_VERSION=0.9.0
+  - GRAPE_VERSION=0.10.1
+  - GRAPE_VERSION=HEAD

data/Gemfile

@@ -1,3 +1,10 @@
 source 'https://rubygems.org'
 
 gemspec
+
+case version = ENV['GRAPE_VERSION'] || '~> 0.10.0'
+when 'HEAD'
+  gem 'grape', github: 'intridea/grape'
+else
+  gem 'grape', version
+end

data/Guardfile

@@ -4,15 +4,15 @@
 guard 'rspec' do
   watch(%r{^spec/.+_spec\.rb$})
   watch(%r{^lib/(.+)\.rb$})     { |m| "spec/lib/#{m[1]}_spec.rb" }
-  watch('spec/spec_helper.rb')  { "spec" }
+  watch('spec/spec_helper.rb')  { 'spec' }
 
   # Rails example
   watch(%r{^app/(.+)\.rb$})                           { |m| "spec/#{m[1]}_spec.rb" }
   watch(%r{^app/(.*)(\.erb|\.haml)$})                 { |m| "spec/#{m[1]}#{m[2]}_spec.rb" }
   watch(%r{^app/controllers/(.+)_(controller)\.rb$})  { |m| ["spec/routing/#{m[1]}_routing_spec.rb", "spec/#{m[2]}s/#{m[1]}_#{m[2]}_spec.rb", "spec/acceptance/#{m[1]}_spec.rb"] }
-  watch(%r{^spec/support/(.+)\.rb$})                  { "spec" }
-  watch('config/routes.rb')                           { "spec/routing" }
-  watch('app/controllers/application_controller.rb')  { "spec/controllers" }
+  watch(%r{^spec/support/(.+)\.rb$})                  { 'spec' }
+  watch('config/routes.rb')                           { 'spec/routing' }
+  watch('app/controllers/application_controller.rb')  { 'spec/controllers' }
 
   # Capybara features specs
   watch(%r{^app/views/(.+)/.*\.(erb|haml)$})          { |m| "spec/features/#{m[1]}_spec.rb" }
@@ -21,4 +21,3 @@ guard 'rspec' do
   watch(%r{^spec/acceptance/(.+)\.feature$})
   watch(%r{^spec/acceptance/steps/(.+)_steps\.rb$})   { |m| Dir[File.join("**/#{m[1]}.feature")][0] || 'spec/acceptance' }
 end
-

data/README.md

@@ -82,18 +82,18 @@ end
 
 ```ruby
 # Serializer options can be specified on routes or namespaces.
-namespace 'foo', :serializer => BarSerializer do
+namespace 'foo', serializer: BarSerializer do
   get "/" do
     # will use "bar" serializer
   end
 
   # Options specified on a route or namespace override those of the containing namespace.
-  get "/home", :serializer => HomeSerializer do
+  get "/home", serializer: HomeSerializer do
     # will use "home" serializer
   end
 
   # All standard options for `ActiveModel::Serializers` are supported.
-  get "/fancy_homes", :root => 'world', :each_serializer => FancyHomesSerializer
+  get "/fancy_homes", root: 'world', each_serializer: FancyHomesSerializer
   ...
   end
 end
@@ -112,11 +112,11 @@ end
 ### Support for `default_serializer_options`
 
 ```ruby
-  helper do
-    def default_serializer_options
-      {only: params[:only], except: params[:except]}
-    end
+helpers do
+  def default_serializer_options
+    {only: params[:only], except: params[:except]}
   end
+end
 ```
 
 ### current_user
@@ -128,15 +128,15 @@ In Grape, you can get the same behavior by defining a `current_user`
 helper method:
 
 ```ruby
-  helpers do
-    def current_user
-      @current_user ||= User.where( :access_token => params[:token]).first
-    end
-
-    def authenticate!
-      error!('401 Unauthenticated', 401) unless current_user
-    end
+helpers do
+  def current_user
+    @current_user ||= User.where(access_token: params[:token]).first
+  end
+
+  def authenticate!
+    error!('401 Unauthenticated', 401) unless current_user
   end
+end
 ```
 
 Then, in your serializer, you could show or hide some elements
@@ -168,7 +168,7 @@ class API < Grape::API
   end
 end
 
-API.new.get "/home" # => '{:user=>{:first_name=>"JR", :last_name=>"HE"}}'
+API.new.get "/home" # => '{ user: { first_name: "JR", last_name: "HE" } }'
 ```
 
 
@@ -180,6 +180,10 @@ Enjoy :)
 
 ## Changelog
 
+#### Next
+* Adds support for Grape 0.10.x
+
+
 #### v1.2.1
 * Adds support for active model serializer 0.9.x
 

data/Rakefile

@@ -1,5 +1,5 @@
 #!/usr/bin/env rake
-require "bundler/gem_tasks"
+require 'bundler/gem_tasks'
 
 require 'rspec/core'
 require 'rspec/core/rake_task'
@@ -8,4 +8,7 @@ RSpec::Core::RakeTask.new(:spec) do |spec|
   spec.pattern = FileList['spec/**/*_spec.rb']
 end
 
-task :default => :spec
+require 'rubocop/rake_task'
+RuboCop::RakeTask.new(:rubocop)
+
+task default: [:rubocop, :spec]

data/grape-active_model_serializers.gemspec

@@ -2,25 +2,26 @@
 require File.expand_path('../lib/grape-active_model_serializers/version', __FILE__)
 
 Gem::Specification.new do |gem|
-  gem.authors       = ["Jonathan Richard Henry Evans"]
-  gem.email         = ["contact@jrhe.co.uk"]
-  gem.summary       = %q{Use active_model_serializer in grape}
-  gem.description   = %q{Provides a Formatter for the Grape API DSL to emit objects serialized with active_model_serializers.}
-  gem.homepage      = "https://github.com/jrhe/grape-active_model_serializers"
+  gem.authors       = ['Jonathan Richard Henry Evans']
+  gem.email         = ['contact@jrhe.co.uk']
+  gem.summary       = 'Use active_model_serializer in grape'
+  gem.description   = 'Provides a Formatter for the Grape API DSL to emit objects serialized with active_model_serializers.'
+  gem.homepage      = 'https://github.com/jrhe/grape-active_model_serializers'
 
-  gem.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
+  gem.executables   = `git ls-files -- bin/*`.split("\n").map { |f| File.basename(f) }
   gem.files         = `git ls-files`.split("\n")
   gem.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
-  gem.name          = "grape-active_model_serializers"
-  gem.require_paths = ["lib"]
+  gem.name          = 'grape-active_model_serializers'
+  gem.require_paths = ['lib']
   gem.version       = Grape::ActiveModelSerializers::VERSION
   gem.licenses      = ['MIT']
 
-  gem.add_dependency "grape", "~> 0.3"
-  gem.add_dependency "active_model_serializers", ">= 0.9.0"
+  gem.add_dependency 'grape'
+  gem.add_dependency 'active_model_serializers', '>= 0.9.0'
 
-  gem.add_development_dependency "rspec"
-  gem.add_development_dependency "rack-test"
-  gem.add_development_dependency "rake"
-  gem.add_development_dependency "guard-rspec"
+  gem.add_development_dependency 'rspec'
+  gem.add_development_dependency 'rack-test'
+  gem.add_development_dependency 'rake'
+  gem.add_development_dependency 'guard-rspec'
+  gem.add_development_dependency 'rubocop', '0.28.0'
 end

data/lib/grape-active_model_serializers/endpoint_extension.rb

@@ -9,11 +9,19 @@ module Grape
     attr_accessor :controller_name
 
     def namespace_options
-      settings[:namespace] ? settings[:namespace].options : {}
+      if self.respond_to?(:inheritable_setting)
+        inheritable_setting.namespace
+      else
+        settings[:namespace] ? settings[:namespace].options : {}
+      end
     end
 
     def route_options
-      options[:route_options]
+      if self.respond_to?(:inheritable_setting)
+        inheritable_setting.route
+      else
+        options[:route_options]
+      end
     end
 
     def self.included(base)
@@ -27,26 +35,17 @@ module Grape
       end
     end
 
-    def render(resources, meta={})
-      set_meta_and_meta_key(meta)
+    def render(resources, meta = {})
+      env['ams_meta'] = meta
       resources
     end
 
-    def default_serializer_options; end
-
-    def url_options; end
-
-    private
-
-    def set_meta_and_meta_key(meta)
-      if meta.has_key?(:meta)
-        Formatter::ActiveModelSerializers.meta = meta[:meta]
-        if meta.has_key?(:meta_key)
-          Formatter::ActiveModelSerializers.meta_key = meta[:meta_key]
-        end
-      end
+    def default_serializer_options
     end
 
+    def url_options
+    end
   end
+
   Endpoint.send(:include, EndpointExtension)
 end

data/lib/grape-active_model_serializers/formatter.rb

@@ -16,56 +16,40 @@ module Grape
           endpoint = env['api.endpoint']
           options = build_options_from_endpoint(endpoint)
 
-          if serializer = options.fetch(:serializer, ActiveModel::Serializer.serializer_for(resource))
-            options[:scope] = endpoint unless options.has_key?(:scope)
-            # ensure we have an root to fallback on
-            options[:resource_name] = default_root(endpoint) if resource.respond_to?(:to_ary)
-            serializer.new(resource, options.merge(other_options))
-          end
+          serializer = options.fetch(:serializer, ActiveModel::Serializer.serializer_for(resource))
+          return nil unless serializer
+
+          options[:scope] = endpoint unless options.key?(:scope)
+          # ensure we have an root to fallback on
+          options[:resource_name] = default_root(endpoint) if resource.respond_to?(:to_ary)
+          serializer.new(resource, options.merge(other_options(env)))
         end
 
-        def other_options
+        def other_options(env)
           options = {}
-          if @meta_content_items
-            if @meta_key
-             key_option = @meta_key[:meta_key]
-              @meta_key.delete(:meta_key)
-              options[:meta_key] = key_option if key_option
-            end
-            meta_option = @meta_content_items[:meta]
-            @meta_content_items.delete(:meta)
-            options[key_option || :meta] = meta_option if meta_option
-          end
+          ams_meta = env['ams_meta'] || {}
+          meta =  ams_meta.delete(:meta)
+          meta_key = ams_meta.delete(:meta_key)
+          options[:meta_key] = meta_key if meta && meta_key
+          options[meta_key || :meta] = meta if meta
           options
         end
 
-        def meta
-          @meta_content_items || {}
-        end
-
-        def meta=(meta_content)
-          @meta_content_items = { meta: meta_content } if meta_content
-        end
-
-        def meta_key
-          @meta_key || {}
-        end
-
-        def meta_key=(key)
-          @meta_key = { meta_key: key } if key
-        end
-
         def build_options_from_endpoint(endpoint)
-          [endpoint.default_serializer_options || {}, endpoint.namespace_options, endpoint.route_options].reduce(:merge)
+          [endpoint.default_serializer_options || {}, endpoint.namespace_options, endpoint.route_options, endpoint.options, endpoint.options.fetch(:route_options)].reduce(:merge)
         end
 
         # array root is the innermost namespace name ('space') if there is one,
         # otherwise the route name (e.g. get 'name')
         def default_root(endpoint)
-          innermost_scope = endpoint.settings.peek
-
-          if innermost_scope[:namespace]
-            innermost_scope[:namespace].space
+          innermost_scope = if endpoint.respond_to?(:namespace_stackable)
+                              endpoint.namespace_stackable(:namespace).last
+                            else
+                              endpoint.settings.peek[:namespace]
+                            end
+
+          if innermost_scope
+            innermost_scope.space
           else
             endpoint.options[:path][0].to_s.split('/')[-1]
           end

data/lib/grape-active_model_serializers/version.rb

@@ -1,5 +1,5 @@
 module Grape
   module ActiveModelSerializers
-    VERSION = '1.3.1'
+    VERSION = '1.3.2'
   end
 end

data/spec/features/grape-active_model_serializers/render_spec.rb

@@ -20,43 +20,40 @@ describe '#render' do
 
   context 'with meta key' do
     it 'includes meta key and content' do
-      result = get_resource_with({ meta: { total: 2 }})
+      result = get_resource_with(meta: { total: 2 })
       expect(result).to have_key('meta')
-      expect(result.fetch('meta')).to eq({ 'total' => 2 })
+      expect(result.fetch('meta')).to eq('total' => 2)
     end
   end
 
   context 'with a custom meta_key' do
-
     it 'includes the custom meta key name' do
-      result = get_resource_with({ meta: { total: 2 }, meta_key: :custom_key_name })
+      result = get_resource_with(meta: { total: 2 }, meta_key: :custom_key_name)
       expect(result).to have_key('custom_key_name')
-      expect(result.fetch('custom_key_name')).to eq({ 'total' => 2 })
+      expect(result.fetch('custom_key_name')).to eq('total' => 2)
     end
 
     it 'ignores a lonely meta_key' do
-      result = get_resource_with({ meta_key: :custom_key_name })
+      result = get_resource_with(meta_key: :custom_key_name)
       expect(result).not_to have_key('meta')
       expect(result).not_to have_key('custom_key_name')
     end
   end
 
   context 'junk keys' do
-
     it 'ignores junk keys' do
-      result = get_resource_with({ junk_key: { total: 2 } })
+      result = get_resource_with(junk_key: { total: 2 })
       expect(result).not_to have_key('junk_key')
     end
 
     it 'ignores empty meta_key' do
-      result = get_resource_with({ meta: { total: 2 }, meta_key: nil })
+      result = get_resource_with(meta: { total: 2 }, meta_key: nil)
       expect(result).to have_key('meta')
     end
 
     it 'ignores empty meta' do
-      result = get_resource_with({ meta: nil })
+      result = get_resource_with(meta: nil)
       expect(result).not_to have_key('meta')
     end
-
   end
 end

data/spec/grape-active_model_serializers/endpoint_extension_spec.rb

@@ -1,8 +1,11 @@
 require 'spec_helper'
 
 describe 'Grape::EndpointExtension' do
-
-  subject { Grape::Endpoint.new({}, {path: '/', method: 'foo'}) }
+  if Grape::Util.const_defined?('InheritableSetting')
+    subject { Grape::Endpoint.new(Grape::Util::InheritableSetting.new, path: '/', method: 'foo') }
+  else
+    subject { Grape::Endpoint.new({}, path: '/', method: 'foo') }
+  end
 
   let(:serializer) { Grape::Formatter::ActiveModelSerializers }
 
@@ -16,24 +19,25 @@ describe 'Grape::EndpointExtension' do
 
   let(:users) { [user, user] }
 
-  describe "#render" do
+  describe '#render' do
+    before do
+      allow(subject).to receive(:env).and_return({})
+    end
     it { should respond_to(:render) }
-    let (:meta_content) { { total: 2 } }
-    let (:meta_full) { { meta: meta_content } }
+    let(:meta_content) { { total: 2 } }
+    let(:meta_full) { { meta: meta_content } }
     context 'supplying meta' do
       it 'passes through the Resource and uses given meta settings' do
-        expect(serializer).to receive(:meta=).with(meta_content)
+        allow(subject).to receive(:env).and_return(meta: meta_full)
         expect(subject.render(users, meta_full)).to eq(users)
       end
     end
     context 'supplying meta and key' do
-      let (:meta_key) { { meta_key: :custom_key_name } }
+      let(:meta_key) { { meta_key: :custom_key_name } }
       it 'passes through the Resource and uses given meta settings' do
-        expect(serializer).to receive(:meta=).with(meta_content)
-        expect(serializer).to receive(:meta_key=).with(meta_key[:meta_key])
+        allow(subject).to receive(:env).and_return(meta: meta_full.merge(meta_key))
         expect(subject.render(users, meta_full.merge(meta_key))).to eq(users)
       end
     end
   end
-
 end

data/spec/grape-active_model_serializers/formatter_spec.rb

@@ -3,38 +3,35 @@ require 'grape-active_model_serializers/formatter'
 
 describe Grape::Formatter::ActiveModelSerializers do
   subject { Grape::Formatter::ActiveModelSerializers }
-  it { should respond_to(:meta) }
-  it { should respond_to(:meta=) }
-  it { should respond_to(:meta_key) }
-  it { should respond_to(:meta_key=) }
-
-  context '#meta' do
-    it 'will silently accept falsy input but return empty Hash' do
-      subject.meta = nil
-      expect(subject.meta).to eq({})
-    end
 
-    it 'will wrap valid input in the meta: {} wrapper' do
-      subject.meta = { total: 2 }
-      expect(subject.meta).to eq({ meta: { total: 2 } })
-    end
-  end
+  describe 'serializer options from namespace' do
+    let(:app) { Class.new(Grape::API) }
 
-  context '#meta_key' do
-    it 'will silently accept falsy input but return empty Hash' do
-      subject.meta_key = nil
-      expect(subject.meta_key).to eq({})
+    before do
+      app.format :json
+      app.formatter :json, Grape::Formatter::ActiveModelSerializers
+
+      app.namespace('space') do |ns|
+        ns.get('/', root: false) do
+          { user: { first_name: 'JR', last_name: 'HE' } }
+        end
+      end
     end
 
-    it 'will wrap valid input in the meta_key: {} wrapper' do
-      subject.meta_key = :custom_key_name
-      expect(subject.meta_key).to eq({ meta_key: :custom_key_name })
+    it 'should read serializer options like "root"' do
+      expect(described_class.build_options_from_endpoint(app.endpoints.first)).to include :root
     end
   end
 
   describe '.fetch_serializer' do
     let(:user) { User.new(first_name: 'John') }
-    let(:endpoint) { Grape::Endpoint.new({}, {path: '/', method: 'foo'}) }
+
+    if Grape::Util.const_defined?('InheritableSetting')
+      let(:endpoint) { Grape::Endpoint.new(Grape::Util::InheritableSetting.new, path: '/', method: 'foo', root: false) }
+    else
+      let(:endpoint) { Grape::Endpoint.new({}, path: '/', method: 'foo', root: false) }
+    end
+
     let(:env) { { 'api.endpoint' => endpoint } }
 
     before do
@@ -59,5 +56,9 @@ describe Grape::Formatter::ActiveModelSerializers do
       expect(subject.instance_variable_get('@only')).to eq([:only])
       expect(subject.instance_variable_get('@except')).to eq([:except])
     end
+
+    it 'should read serializer options like "root"' do
+      expect(described_class.build_options_from_endpoint(endpoint).keys).to include :root
+    end
   end
 end

data/spec/grape-active_model_serializers_spec.rb

@@ -1,5 +1,4 @@
 require 'spec_helper'
 
 describe 'grape-active_model_serializers' do
-
 end

data/spec/old_grape_ams_spec.rb

@@ -3,90 +3,90 @@ require 'support/models/user'
 require 'support/models/blog_post'
 require 'support/serializers/user_serializer'
 require 'support/serializers/blog_post_serializer'
-require "grape-active_model_serializers"
+require 'grape-active_model_serializers'
 
 describe Grape::ActiveModelSerializers do
   let(:app) { Class.new(Grape::API) }
+  subject { last_response.body }
 
   before do
     app.format :json
     app.formatter :json, Grape::Formatter::ActiveModelSerializers
   end
 
-
-  it "should respond with proper content-type" do
-    app.get("/home/users", :serializer => UserSerializer) do
+  it 'should respond with proper content-type' do
+    app.get('/home/users', serializer: UserSerializer) do
       User.new
     end
-    get("/home/users")
-    last_response.headers["Content-Type"].should == "application/json"
+    get('/home/users')
+    expect(last_response.headers['Content-Type']).to eql 'application/json'
   end
 
   context 'serializer is set to nil' do
     before do
-      app.get("/home", serializer: nil) do
-        {user: {first_name: "JR", last_name: "HE"}}
+      app.get('/home', serializer: nil) do
+        { user: { first_name: 'JR', last_name: 'HE' } }
       end
     end
-    it 'uses the built in grape serializer' do 
-      get("/home")
-      last_response.body.should == "{\"user\":{\"first_name\":\"JR\",\"last_name\":\"HE\"}}"
+    it 'uses the built in grape serializer' do
+      get('/home')
+      expect(subject).to eql "{\"user\":{\"first_name\":\"JR\",\"last_name\":\"HE\"}}"
     end
   end
 
   context "serializer isn't set" do
     before do
-      app.get("/home") do
-        User.new({first_name: 'JR', last_name: 'HE', email: 'contact@jrhe.co.uk'})
+      app.get('/home') do
+        User.new(first_name: 'JR', last_name: 'HE', email: 'contact@jrhe.co.uk')
       end
     end
 
     it 'infers the serializer' do
-      get "/home"
-      last_response.body.should == "{\"user\":{\"first_name\":\"JR\",\"last_name\":\"HE\"}}"
+      get '/home'
+      expect(subject).to eql "{\"user\":{\"first_name\":\"JR\",\"last_name\":\"HE\"}}"
     end
   end
 
-  it "serializes arrays of objects" do
-    app.get("/users") do
-      user = User.new({first_name: 'JR', last_name: 'HE', email: 'contact@jrhe.co.uk'})
+  it 'serializes arrays of objects' do
+    app.get('/users') do
+      user = User.new(first_name: 'JR', last_name: 'HE', email: 'contact@jrhe.co.uk')
       [user, user]
     end
 
-    get "/users"
-    last_response.body.should == "{\"users\":[{\"first_name\":\"JR\",\"last_name\":\"HE\"},{\"first_name\":\"JR\",\"last_name\":\"HE\"}]}"
+    get '/users'
+    expect(subject).to eql "{\"users\":[{\"first_name\":\"JR\",\"last_name\":\"HE\"},{\"first_name\":\"JR\",\"last_name\":\"HE\"}]}"
   end
 
-  context "models with compound names" do
+  context 'models with compound names' do
     it "generates the proper 'root' node for individual objects" do
-      app.get("/home") do
-        BlogPost.new({title: 'Grape AM::S Rocks!', body: 'Really, it does.'})
+      app.get('/home') do
+        BlogPost.new(title: 'Grape AM::S Rocks!', body: 'Really, it does.')
       end
 
-      get "/home"
-      last_response.body.should == "{\"blog_post\":{\"title\":\"Grape AM::S Rocks!\",\"body\":\"Really, it does.\"}}"
+      get '/home'
+      expect(subject).to eql "{\"blog_post\":{\"title\":\"Grape AM::S Rocks!\",\"body\":\"Really, it does.\"}}"
     end
 
     it "generates the proper 'root' node for serialized arrays" do
-      app.get("/blog_posts") do
-        blog_post = BlogPost.new({title: 'Grape AM::S Rocks!', body: 'Really, it does.'})
+      app.get('/blog_posts') do
+        blog_post = BlogPost.new(title: 'Grape AM::S Rocks!', body: 'Really, it does.')
         [blog_post, blog_post]
       end
 
-      get "/blog_posts"
-      last_response.body.should == "{\"blog_posts\":[{\"title\":\"Grape AM::S Rocks!\",\"body\":\"Really, it does.\"},{\"title\":\"Grape AM::S Rocks!\",\"body\":\"Really, it does.\"}]}"
+      get '/blog_posts'
+      expect(subject).to eql "{\"blog_posts\":[{\"title\":\"Grape AM::S Rocks!\",\"body\":\"Really, it does.\"},{\"title\":\"Grape AM::S Rocks!\",\"body\":\"Really, it does.\"}]}"
     end
   end
 
-  it "uses namespace options when provided" do
-    app.namespace :admin, :serializer => UserSerializer do
+  it 'uses namespace options when provided' do
+    app.namespace :admin, serializer: UserSerializer do
       get('/jeff') do
         User.new(first_name: 'Jeff')
       end
     end
 
-    get "/admin/jeff"
-    last_response.body.should == "{\"user\":{\"first_name\":\"Jeff\",\"last_name\":null}}"
+    get '/admin/jeff'
+    expect(subject).to eql "{\"user\":{\"first_name\":\"Jeff\",\"last_name\":null}}"
   end
 
   context 'route is in a namespace' do
@@ -98,8 +98,8 @@ describe Grape::ActiveModelSerializers do
         end
       end
 
-      get "/admin/jeff"
-      last_response.body.should == "{\"admin\":[{\"first_name\":\"Jeff\",\"last_name\":null},{\"first_name\":\"Jeff\",\"last_name\":null}]}"
+      get '/admin/jeff'
+      expect(subject).to eql "{\"admin\":[{\"first_name\":\"Jeff\",\"last_name\":null},{\"first_name\":\"Jeff\",\"last_name\":null}]}"
     end
   end
 
@@ -110,9 +110,8 @@ describe Grape::ActiveModelSerializers do
         [user, user]
       end
 
-      get "/people"
-      last_response.body.should == "{\"people\":[{\"first_name\":\"Jeff\",\"last_name\":null},{\"first_name\":\"Jeff\",\"last_name\":null}]}"
+      get '/people'
+      expect(subject).to eql "{\"people\":[{\"first_name\":\"Jeff\",\"last_name\":null},{\"first_name\":\"Jeff\",\"last_name\":null}]}"
     end
   end
 end
-

data/spec/spec_helper.rb

@@ -4,9 +4,9 @@ $LOAD_PATH.unshift(File.dirname(__FILE__))
 require 'bundler'
 Bundler.setup :default, :test
 
-require "active_model_serializers"
+require 'active_model_serializers'
 require 'active_support/core_ext/hash/conversions'
-require "active_support/json"
+require 'active_support/json'
 require 'rspec'
 require 'rack/test'
 require 'grape-active_model_serializers'
@@ -15,4 +15,4 @@ RSpec.configure do |config|
   config.include Rack::Test::Methods
 end
 
-Dir["#{File.dirname(__FILE__)}/support/**/*.rb"].each {|f| require f}
+Dir["#{File.dirname(__FILE__)}/support/**/*.rb"].each { |f| require f }

data/spec/support/models/blog_post.rb

@@ -2,8 +2,8 @@ class BlogPost
   include ActiveModel::SerializerSupport
   attr_accessor :title, :body
 
-  def initialize(params={})
-    params.each do |k,v|
+  def initialize(params = {})
+    params.each do |k, v|
       instance_variable_set("@#{k}", v) unless v.nil?
     end
   end

data/spec/support/models/user.rb

@@ -2,8 +2,8 @@ class User
   include ActiveModel::SerializerSupport
   attr_accessor :first_name, :last_name, :password, :email
 
-  def initialize(params={})
-    params.each do |k,v|
+  def initialize(params = {})
+    params.each do |k, v|
       instance_variable_set("@#{k}", v) unless v.nil?
     end
   end

metadata

@@ -1,99 +1,113 @@
 --- !ruby/object:Gem::Specification
 name: grape-active_model_serializers
 version: !ruby/object:Gem::Version
-  version: 1.3.1
+  version: 1.3.2
 platform: ruby
 authors:
 - Jonathan Richard Henry Evans
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-20 00:00:00.000000000 Z
+date: 2015-02-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: grape
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0.3'
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0.3'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: active_model_serializers
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.9.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.9.0
 - !ruby/object:Gem::Dependency
   name: rspec
   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'
 - !ruby/object:Gem::Dependency
   name: rack-test
   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'
 - !ruby/object:Gem::Dependency
   name: rake
   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'
 - !ruby/object:Gem::Dependency
   name: guard-rspec
   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'
+- !ruby/object:Gem::Dependency
+  name: rubocop
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.28.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.28.0
 description: Provides a Formatter for the Grape API DSL to emit objects serialized
   with active_model_serializers.
 email:
@@ -102,7 +116,10 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
+- ".gitignore"
+- ".rubocop.yml"
+- ".rubocop_todo.yml"
+- ".travis.yml"
 - Gemfile
 - Guardfile
 - LICENSE.txt
@@ -135,17 +152,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.14
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: Use active_model_serializer in grape