grape-active_model_serializers 1.2.1 → 1.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5e9d5adc2e060c4ff6cb0ff20b716af5ac60b65f
-  data.tar.gz: 1175bcd15b520733dca73731304eb07c1ef41ff1
+  metadata.gz: 3d1fc34293532a51eb2a8694d46c26d874b56d3c
+  data.tar.gz: dd6d159497a55ee86f431402f02e0991cfae55c9
 SHA512:
-  metadata.gz: 2253fc66827baafc811df441f44e6d44119a19a6c5b3c926d3a643259a6cafe3059eb9cf2c9523a973900884093dd30ba374de6c178d333477462e67efc501d3
-  data.tar.gz: e5e75c33e502cd1b41d1e94ad2b9489cd26cc47f3dfff68e1692445d7366f61d1eb4bb91bd681bf5391b78dce23c315f1a93166790a9f99e77408a1b061a93f3
+  metadata.gz: 1012cd5e379a6dd9b988cb23d02d84bc12e6c95a4a2b61390762f7f8bccab6cf4c55254bee506bb8d59a8ca82ab581e30c411a2bfdf09a6e78c979660007c06a
+  data.tar.gz: 4b9d9dbbd00137e3ed063ccc357efd36aeaabe6a446c2960022c951417cd2abf0b2bd1b175283da38af0bc67f568792b2e589edbbb5b999ff7898fd6282fe5c6

data/.gitignore

@@ -16,3 +16,4 @@ rerun.txt
 pickle-email-*.html
 Gemfile.lock
 .DS_Store
+*.gem

data/Gemfile

@@ -1,7 +1,3 @@
 source 'https://rubygems.org'
 
 gemspec
-
-group :test do
-  gem 'jazz_hands', git: 'https://github.com/jrhe/jazz_hands.git', branch: 'without_rails' 
-end

data/README.md

@@ -82,18 +82,18 @@ end
 
 ```ruby
 # Serializer options can be specified on routes or namespaces.
-namespace 'foo', :serializer => :bar 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 => :home 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 => :fancy_homes
+  get "/fancy_homes", :root => 'world', :each_serializer => FancyHomesSerializer
   ...
   end
 end
@@ -109,6 +109,16 @@ get "/homes"
 end
 ```
 
+### Support for `default_serializer_options`
+
+```ruby
+  helper do
+    def default_serializer_options
+      {only: params[:only], except: params[:except]}
+    end
+  end
+```
+
 ### current_user
 
 One of the nice features of ActiveModel::Serializers is that it
@@ -170,6 +180,10 @@ Enjoy :)
 
 ## Changelog
 
+#### v1.2.1
+* Adds support for active model serializer 0.9.x
+
+
 #### v1.0.0
 * Released on rubygems.org
 * *BREAKING* Changes behaviour of root keys when serialising arrays. See [Array roots](https://github.com/jrhe/grape-active_model_serializers#array-roots)

data/grape-active_model_serializers.gemspec

@@ -17,11 +17,10 @@ Gem::Specification.new do |gem|
   gem.licenses      = ['MIT']
 
   gem.add_dependency "grape", "~> 0.3"
-  gem.add_dependency "active_model_serializers", ">= 0.9.0.alpha1"
+  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 "jazz_hands"
-  gem.add_development_dependency 'guard-rspec'
+  gem.add_development_dependency "guard-rspec"
 end

data/lib/.travis.yml

@@ -1,8 +1,10 @@
 rvm:
   - 1.9.2
   - 1.9.3
+  - 2.0.0
+  - 2.1.2
   - ruby-head
   - rbx-19mode
 
 env:
-   - JRUBY_OPTS="--1.9"
+   - JRUBY_OPTS="--1.9"

data/lib/grape-active_model_serializers/formatter.rb

@@ -17,7 +17,7 @@ module Grape
           options = build_options_from_endpoint(endpoint)
 
           if serializer = options.fetch(:serializer, ActiveModel::Serializer.serializer_for(resource))
-            options[:scope] = serialization_scope unless options.has_key?(:scope)
+            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))
@@ -56,7 +56,7 @@ module Grape
         end
 
         def build_options_from_endpoint(endpoint)
-          endpoint.namespace_options.merge(endpoint.route_options)
+          [endpoint.default_serializer_options || {}, endpoint.namespace_options, endpoint.route_options].reduce(:merge)
         end
 
         # array root is the innermost namespace name ('space') if there is one,
@@ -70,10 +70,6 @@ module Grape
             endpoint.options[:path][0].to_s.split('/')[-1]
           end
         end
-
-        def serialization_scope
-          :current_user
-        end
       end
     end
   end

data/lib/grape-active_model_serializers/version.rb

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

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

@@ -1,7 +1,4 @@
 require 'spec_helper'
-require 'support/models/user'
-require 'support/serializers/user_serializer'
-require 'grape-active_model_serializers'
 require 'securerandom'
 
 describe '#render' do

data/spec/grape-active_model_serializers/endpoint_extension_spec.rb

@@ -2,17 +2,17 @@ require 'spec_helper'
 
 describe 'Grape::EndpointExtension' do
 
-  subject { Grape::Endpoint.new(nil, {path: '/', method: 'foo'}) }
+  subject { Grape::Endpoint.new({}, {path: '/', method: 'foo'}) }
 
   let(:serializer) { Grape::Formatter::ActiveModelSerializers }
 
   let(:user) do
-               Object.new do
-                 def name
-                   'sven'
-                 end
-               end
-             end
+    Object.new do
+      def name
+        'sven'
+      end
+    end
+  end
 
   let(:users) { [user, user] }
 

data/spec/grape-active_model_serializers/formatter_spec.rb

@@ -31,4 +31,33 @@ describe Grape::Formatter::ActiveModelSerializers do
       expect(subject.meta_key).to eq({ meta_key: :custom_key_name })
     end
   end
+
+  describe '.fetch_serializer' do
+    let(:user) { User.new(first_name: 'John') }
+    let(:endpoint) { Grape::Endpoint.new({}, {path: '/', method: 'foo'}) }
+    let(:env) { { 'api.endpoint' => endpoint } }
+
+    before do
+      def endpoint.current_user
+        @current_user ||= User.new(first_name: 'Current user')
+      end
+
+      def endpoint.default_serializer_options
+        { only: :only, except: :except }
+      end
+    end
+
+    subject { described_class.fetch_serializer(user, env) }
+
+    it { should be_a UserSerializer }
+
+    it 'should have correct scope set' do
+      expect(subject.scope.current_user).to eq(endpoint.current_user)
+    end
+
+    it 'should read default serializer options' do
+      expect(subject.instance_variable_get('@only')).to eq([:only])
+      expect(subject.instance_variable_get('@except')).to eq([:except])
+    end
+  end
 end

data/spec/spec_helper.rb

@@ -9,8 +9,7 @@ require 'active_support/core_ext/hash/conversions'
 require "active_support/json"
 require 'rspec'
 require 'rack/test'
-
-require 'jazz_hands'
+require 'grape-active_model_serializers'
 
 RSpec.configure do |config|
   config.include Rack::Test::Methods

metadata

@@ -1,111 +1,97 @@
 --- !ruby/object:Gem::Specification
 name: grape-active_model_serializers
 version: !ruby/object:Gem::Version
-  version: 1.2.1
+  version: 1.3.1
 platform: ruby
 authors:
 - Jonathan Richard Henry Evans
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-23 00:00:00.000000000 Z
+date: 2014-11-20 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'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '0.3'
 - !ruby/object:Gem::Dependency
   name: active_model_serializers
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
-        version: 0.9.0.alpha1
+        version: 0.9.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
-        version: 0.9.0.alpha1
+        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: jazz_hands
-  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'
 description: Provides a Formatter for the Grape API DSL to emit objects serialized
@@ -116,7 +102,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- ".gitignore"
+- .gitignore
 - Gemfile
 - Guardfile
 - LICENSE.txt
@@ -149,17 +135,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.2.0
+rubygems_version: 2.0.14
 signing_key: 
 specification_version: 4
 summary: Use active_model_serializer in grape
@@ -174,4 +160,3 @@ test_files:
 - spec/support/models/user.rb
 - spec/support/serializers/blog_post_serializer.rb
 - spec/support/serializers/user_serializer.rb
-has_rdoc: