grape-entity 0.4.2 → 0.4.3

data/.rubocop.yml

@@ -1,5 +1,5 @@
 AllCops:
-  Excludes:
+  Exclude:
     - vendor/**
 
 LineLength:
@@ -23,15 +23,6 @@ Encoding:
   # no need to always specify encoding
   Enabled: false
 
-HashMethods:
-  # key? instead of has_key?
-  # value? instead of has_value?
-  Enabled: false
-
-StringLiterals:
-  # use single or double-quoted strings, as you please
-  Enabled: false
-
 Void:
   # == operator used in void context in specs
   Enabled: false
@@ -67,3 +58,6 @@ WordArray:
 CyclomaticComplexity:
   Enabled: false
 
+FileName:
+  # allow grape-entity.rb for a require
+  Enabled: false

data/.travis.yml

@@ -1,7 +1,18 @@
 language: ruby
+
 cache: bundler
+
 rvm:
+  - ruby-head
+  - 2.1.1
+  - 2.1.0
   - 2.0.0
   - 1.9.3
   - jruby-19mode
-  - rbx-2.1.1
+  - jruby-head
+  - rbx-2
+
+matrix:
+  allow_failures:
+    - rvm: ruby-head
+    - rvm: jruby-head

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+0.4.3 (2014-06-12)
+==================
+
+* [#77](https://github.com/intridea/grape-entity/pull/77): Fix compatibility with Rspec 3 - [@justfalter](https://github.com/justfalter).
+* [#76](https://github.com/intridea/grape-entity/pull/76): Improve performance of entity serialization - [@justfalter](https://github.com/justfalter)
+
 0.4.2 (2014-04-03)
 ==================
 

data/Gemfile

@@ -12,8 +12,7 @@ group :development, :test do
   gem 'json'
   gem 'rspec'
   gem 'rack-test', "~> 0.6.2", :require => "rack/test"
-  gem 'github-markup'
-  gem 'rubocop', '~> 0.16.0'
+  gem 'rubocop', '0.21.0'
 end
 
 platforms :rbx do

data/README.md

@@ -1,6 +1,6 @@
 # Grape::Entity
 
-[![Build Status](https://travis-ci.org/agileanimal/grape-entity.png?branch=master)](https://travis-ci.org/agileanimal/grape-entity)
+[![Build Status](https://travis-ci.org/intridea/grape-entity.svg?branch=master)](https://travis-ci.org/intridea/grape-entity)
 
 ## Introduction
 
@@ -86,7 +86,7 @@ expose :ip, if: { type: :full }
 
 expose :ip, if: lambda { |instance, options| options[:type] == :full } # exposed if the function evaluates to true
 expose :ip, if: :type # exposed if :type is available in the options hash
-expose :ip, if { type: :full } # exposed if options :type has a value of :full
+expose :ip, if: { type: :full } # exposed if options :type has a value of :full
 
 expose :ip, unless: ... # the opposite of :if
 ```
@@ -110,6 +110,15 @@ expose :contact_info do
 end
 ```
 
+#### Collection Exposure
+
+Use `root(plural, singular = nil)` to expose an object or a collection of objects with a root key.
+
+```ruby
+root 'users', 'user'
+expose :id, :name, ...
+```
+
 #### Runtime Exposure
 
 Use a block or a `Proc` to evaluate exposure at runtime. The supplied block or
@@ -172,7 +181,7 @@ expose :text, documentation: { type: "String", desc: "Status update text." }
 
 ### Options Hash
 
-The option keys `:version` and `:collection` are always defined. The `:version` key is defined as `api.version`. The `:collection` key is boolean, and defined as `true` if the object presented is an array. The options also contain the runtime environment in `:env`, which includes request parameters in `options[:env][:grape.request.params]`.
+The option keys `:version` and `:collection` are always defined. The `:version` key is defined as `api.version`. The `:collection` key is boolean, and defined as `true` if the object presented is an array. The options also contain the runtime environment in `:env`, which includes request parameters in `options[:env]['grape.request.params']`.
 
 Any additional options defined on the entity exposure are included as is. In the following example `user` is set to the value of `current_user`.
 

data/bench/serializing.rb

@@ -0,0 +1,98 @@
+$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
+require 'grape-entity'
+require 'benchmark'
+
+module Models
+  class School
+    attr_reader :classrooms
+    def initialize
+      @classrooms = []
+    end
+  end
+
+  class ClassRoom
+    attr_reader :students
+    attr_accessor :teacher
+    def initialize(opts = {})
+      @teacher = opts[:teacher]
+      @students = []
+    end
+  end
+
+  class Person
+    attr_accessor :name
+    def initialize(opts = {})
+      @name = opts[:name]
+    end
+  end
+
+  class Teacher < Models::Person
+    attr_accessor :tenure
+    def initialize(opts = {})
+      super(opts)
+      @tenure = opts[:tenure]
+    end
+  end
+
+  class Student < Models::Person
+    attr_reader :grade
+    def initialize(opts = {})
+      super(opts)
+      @grade = opts[:grade]
+    end
+  end
+end
+
+module Entities
+  class School < Grape::Entity
+    expose :classrooms, using: 'Entities::ClassRoom'
+  end
+
+  class ClassRoom < Grape::Entity
+    expose :teacher, using: 'Entities::Teacher'
+    expose :students, using: 'Entities::Student'
+    expose :size do |model, _opts|
+      model.students.count
+    end
+  end
+
+  class Person < Grape::Entity
+    expose :name
+  end
+
+  class Student < Entities::Person
+    expose :grade
+    expose :failing do |model, _opts|
+      model.grade == 'F'
+    end
+  end
+
+  class Teacher < Entities::Person
+    expose :tenure
+  end
+end
+
+teacher1 = Models::Teacher.new(name: 'John Smith', tenure: 2)
+classroom1 = Models::ClassRoom.new(teacher: teacher1)
+classroom1.students << Models::Student.new(name: 'Bobby', grade: 'A')
+classroom1.students << Models::Student.new(name: 'Billy', grade: 'B')
+
+teacher2 = Models::Teacher.new(name: 'Lisa Barns')
+classroom2 = Models::ClassRoom.new(teacher: teacher2, tenure: 15)
+classroom2.students << Models::Student.new(name: 'Eric', grade: 'A')
+classroom2.students << Models::Student.new(name: 'Eddie', grade: 'C')
+classroom2.students << Models::Student.new(name: 'Arnie', grade: 'C')
+classroom2.students << Models::Student.new(name: 'Alvin', grade: 'F')
+school = Models::School.new
+school.classrooms << classroom1
+school.classrooms << classroom2
+
+iters = 5000
+
+Benchmark.bm do |bm|
+  bm.report('serializing') do
+    iters.times do
+      Entities::School.represent(school, serializable: true)
+    end
+  end
+end

data/grape-entity.gemspec

@@ -1,22 +1,22 @@
-$:.push File.expand_path("../lib", __FILE__)
-require "grape_entity/version"
+$LOAD_PATH.push File.expand_path('../lib', __FILE__)
+require 'grape_entity/version'
 
 Gem::Specification.new do |s|
-  s.name        = "grape-entity"
+  s.name        = 'grape-entity'
   s.version     = GrapeEntity::VERSION
   s.platform    = Gem::Platform::RUBY
-  s.authors     = ["Michael Bleigh"]
-  s.email       = ["michael@intridea.com"]
-  s.homepage    = "https://github.com/intridea/grape-entity"
-  s.summary     = %q{A simple facade for managing the relationship between your model and API.}
-  s.description = %q{Extracted from Grape, A Ruby framework for rapid API development with great conventions.}
-  s.license     = "MIT"
+  s.authors     = ['Michael Bleigh']
+  s.email       = ['michael@intridea.com']
+  s.homepage    = 'https://github.com/intridea/grape-entity'
+  s.summary     = %q(A simple facade for managing the relationship between your model and API.)
+  s.description = %q(Extracted from Grape, A Ruby framework for rapid API development with great conventions.)
+  s.license     = 'MIT'
 
-  s.rubyforge_project = "grape-entity"
+  s.rubyforge_project = 'grape-entity'
 
   s.add_runtime_dependency 'activesupport'
   s.add_runtime_dependency 'multi_json', '>= 1.3.2'
-  
+
   s.add_development_dependency 'rake'
   s.add_development_dependency 'maruku'
   s.add_development_dependency 'yard'
@@ -25,6 +25,6 @@ Gem::Specification.new do |s|
 
   s.files         = `git ls-files`.split("\n")
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
-  s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
-  s.require_paths = ["lib"]
+  s.executables   = `git ls-files -- bin/*`.split("\n").map { |f| File.basename(f) }
+  s.require_paths = ['lib']
 end

data/lib/grape_entity.rb

@@ -1,3 +1,4 @@
-require "active_support/core_ext"
-require "grape_entity/version"
-require "grape_entity/entity"
+require 'active_support'
+require 'active_support/core_ext'
+require 'grape_entity/version'
+require 'grape_entity/entity'

data/lib/grape_entity/entity.rb

@@ -127,11 +127,11 @@ module Grape
       options = merge_options(args.last.is_a?(Hash) ? args.pop : {})
 
       if args.size > 1
-        raise ArgumentError, "You may not use the :as option on multi-attribute exposures." if options[:as]
-        raise ArgumentError, "You may not use block-setting on multi-attribute exposures." if block_given?
+        raise ArgumentError, 'You may not use the :as option on multi-attribute exposures.' if options[:as]
+        raise ArgumentError, 'You may not use block-setting on multi-attribute exposures.' if block_given?
       end
 
-      raise ArgumentError, "You may not use block-setting when also using format_with" if block_given? && options[:format_with].respond_to?(:call)
+      raise ArgumentError, 'You may not use block-setting when also using format_with' if block_given? && options[:format_with].respond_to?(:call)
 
       options[:proc] = block if block_given? && block.parameters.any?
 
@@ -139,7 +139,9 @@ module Grape
 
       args.each do |attribute|
         unless @nested_attributes.empty?
+          orig_attribute = attribute.to_sym
           attribute = "#{@nested_attributes.last}__#{attribute}"
+          nested_attribute_names_hash[attribute.to_sym] = orig_attribute
           options[:nested] = true
           nested_exposures_hash[@nested_attributes.last.to_sym] ||= {}
           nested_exposures_hash[@nested_attributes.last.to_sym][attribute.to_sym] = options
@@ -175,7 +177,9 @@ module Grape
     # are symbolized references to methods on the containing object, the values are
     # the options that were passed into expose.
     def self.exposures
-      @exposures ||= {}
+      return @exposures unless @exposures.nil?
+
+      @exposures = {}
 
       if superclass.respond_to? :exposures
         @exposures = superclass.exposures.merge(@exposures)
@@ -185,20 +189,39 @@ module Grape
     end
 
     class << self
+      attr_accessor :_nested_attribute_names_hash
       attr_accessor :_nested_exposures_hash
 
+      def nested_attribute_names_hash
+        self._nested_attribute_names_hash ||= {}
+      end
+
       def nested_exposures_hash
         self._nested_exposures_hash ||= {}
       end
 
+      def nested_attribute_names
+        return @nested_attribute_names unless @nested_attribute_names.nil?
+
+        @nested_attribute_names = {}.merge(nested_attribute_names_hash)
+
+        if superclass.respond_to? :nested_attribute_names
+          @nested_attribute_names = superclass.nested_attribute_names.deep_merge(@nested_attribute_names)
+        end
+
+        @nested_attribute_names
+      end
+
       def nested_exposures
-        value = nested_exposures_hash
+        return @nested_exposures unless @nested_exposures.nil?
+
+        @nested_exposures = {}.merge(nested_exposures_hash)
 
         if superclass.respond_to? :nested_exposures
-          value = superclass.nested_exposures.deep_merge(value)
+          @nested_exposures = superclass.nested_exposures.deep_merge(@nested_exposures)
         end
 
-        value
+        @nested_exposures
       end
     end
 
@@ -247,7 +270,7 @@ module Grape
     #   end
     #
     def self.format_with(name, &block)
-      raise ArgumentError, "You must pass a block for formatters" unless block_given?
+      raise ArgumentError, 'You must pass a block for formatters' unless block_given?
       formatters[name.to_sym] = block
     end
 
@@ -328,7 +351,7 @@ module Grape
         inner = inner.serializable_hash if options[:serializable]
       end
 
-      root_element = if options.has_key?(:root)
+      root_element = if options.key?(:root)
                        options[:root]
                      else
                        objects.respond_to?(:to_ary) ? @collection_root : @root
@@ -346,7 +369,7 @@ module Grape
     end
 
     def valid_exposures
-      exposures.reject { |a, options| options[:nested] }.select do |attribute, exposure_options|
+      exposures.reject { |_, options| options[:nested] }.select do |attribute, exposure_options|
         valid_exposure?(attribute, exposure_options)
       end
     end
@@ -404,7 +427,8 @@ module Grape
     protected
 
     def self.name_for(attribute)
-      attribute.to_s.split('__').last.to_sym
+      attribute = attribute.to_sym
+      nested_attribute_names[attribute] || attribute
     end
 
     def self.key_for(attribute)
@@ -469,13 +493,16 @@ module Grape
     def valid_exposure?(attribute, exposure_options)
       nested_exposures = self.class.nested_exposures_for(attribute)
       (nested_exposures.any? && nested_exposures.all? { |a, o| valid_exposure?(a, o) }) || \
-      exposure_options.has_key?(:proc) || \
+      exposure_options.key?(:proc) || \
       !exposure_options[:safe] || \
       object.respond_to?(self.class.name_for(attribute))
     end
 
     def conditions_met?(exposure_options, options)
-      if_conditions = (exposure_options[:if_extras] || []).dup
+      if_conditions = []
+      unless exposure_options[:if_extras].nil?
+        if_conditions.concat(exposure_options[:if_extras])
+      end
       if_conditions << exposure_options[:if] unless exposure_options[:if].nil?
 
       if_conditions.each do |if_condition|
@@ -486,7 +513,10 @@ module Grape
         end
       end
 
-      unless_conditions = (exposure_options[:unless_extras] || []).dup
+      unless_conditions = []
+      unless exposure_options[:unless_extras].nil?
+        unless_conditions.concat(exposure_options[:unless_extras])
+      end
       unless_conditions << exposure_options[:unless] unless exposure_options[:unless].nil?
 
       unless_conditions.each do |unless_condition|
@@ -500,8 +530,6 @@ module Grape
       true
     end
 
-    private
-
     # All supported options.
     OPTIONS = [
       :as, :if, :unless, :using, :with, :proc, :documentation, :format_with, :safe, :if_extras, :unless_extras
@@ -544,7 +572,7 @@ module Grape
         raise ArgumentError, "#{key.inspect} is not a valid option." unless OPTIONS.include?(key)
       end
 
-      options[:using] = options.delete(:with) if options.has_key?(:with)
+      options[:using] = options.delete(:with) if options.key?(:with)
       options
     end
   end

data/lib/grape_entity/version.rb

@@ -1,3 +1,3 @@
 module GrapeEntity
-  VERSION = '0.4.2'
+  VERSION = '0.4.3'
 end

data/spec/grape_entity/entity_spec.rb

@@ -46,7 +46,7 @@ describe Grape::Entity do
               attr_accessor :prop1
 
               def initialize
-                @prop1 = "value1"
+                @prop1 = 'value1'
               end
             end
 
@@ -56,7 +56,7 @@ describe Grape::Entity do
           end
 
           subject.expose(:bogus, using: EntitySpec::BogusEntity) do |entity|
-            entity.prop1 = "MODIFIED 2"
+            entity.prop1 = 'MODIFIED 2'
             entity
           end
 
@@ -65,7 +65,7 @@ describe Grape::Entity do
           value.should be_instance_of EntitySpec::BogusEntity
 
           prop1 = value.send(:value_for, :prop1)
-          prop1.should == "MODIFIED 2"
+          prop1.should == 'MODIFIED 2'
         end
 
         context 'with parameters passed to the block' do
@@ -100,37 +100,37 @@ describe Grape::Entity do
 
           it 'represents the exposure as a hash of its nested exposures' do
             subject.expose :awesome do
-              subject.expose(:nested) { |_| "value" }
-              subject.expose(:another_nested) { |_| "value" }
+              subject.expose(:nested) { |_| 'value' }
+              subject.expose(:another_nested) { |_| 'value' }
             end
 
             subject.represent({}).send(:value_for, :awesome).should == {
-              nested: "value",
-              another_nested: "value"
+              nested: 'value',
+              another_nested: 'value'
             }
           end
 
           it 'does not represent attributes, declared inside nested exposure, outside of it' do
             subject.expose :awesome do
-              subject.expose(:nested) { |_| "value" }
-              subject.expose(:another_nested) { |_| "value" }
+              subject.expose(:nested) { |_| 'value' }
+              subject.expose(:another_nested) { |_| 'value' }
               subject.expose :second_level_nested do
-                subject.expose(:deeply_exposed_attr) { |_| "value" }
+                subject.expose(:deeply_exposed_attr) { |_| 'value' }
               end
             end
 
             subject.represent({}).serializable_hash.should == {
               awesome: {
-                nested: "value",
-                another_nested: "value",
+                nested: 'value',
+                another_nested: 'value',
                 second_level_nested: {
-                    deeply_exposed_attr: "value"
+                  deeply_exposed_attr: 'value'
                 }
               }
             }
           end
 
-          it "complex nested attributes" do
+          it 'complex nested attributes' do
             class ClassRoom < Grape::Entity
               expose(:parents, using: 'Parent') { |_| [{}, {}] }
             end
@@ -157,15 +157,15 @@ describe Grape::Entity do
                 {
                   user: { in_first: 'value' },
                   children: [
-                    { user: { in_first: 'value', user_id: "value", display_id: "value" } },
-                    { user: { in_first: 'value', user_id: "value", display_id: "value" } }
+                    { user: { in_first: 'value', user_id: 'value', display_id: 'value' } },
+                    { user: { in_first: 'value', user_id: 'value', display_id: 'value' } }
                   ]
                 },
                 {
                   user: { in_first: 'value' },
                   children: [
-                    { user: { in_first: 'value', user_id: "value", display_id: "value" } },
-                    { user: { in_first: 'value', user_id: "value", display_id: "value" } }
+                    { user: { in_first: 'value', user_id: 'value', display_id: 'value' } },
+                    { user: { in_first: 'value', user_id: 'value', display_id: 'value' } }
                   ]
                 }
               ]
@@ -175,7 +175,7 @@ describe Grape::Entity do
           it 'is safe if its nested exposures are safe' do
             subject.with_options safe: true do
               subject.expose :awesome do
-                subject.expose(:nested) { |_| "value" }
+                subject.expose(:nested) { |_| 'value' }
               end
               subject.expose :not_awesome do
                 subject.expose :nested
@@ -252,12 +252,12 @@ describe Grape::Entity do
         it 'formats an exposure with a :format_with lambda that returns a value from the entity instance' do
           object = Hash.new
 
-          subject.expose(:size, format_with: lambda { |value| self.object.class.to_s })
+          subject.expose(:size, format_with: lambda { |_value| self.object.class.to_s })
           subject.represent(object).send(:value_for, :size).should == object.class.to_s
         end
 
         it 'formats an exposure with a :format_with symbol that returns a value from the entity instance' do
-          subject.format_with :size_formatter do |date|
+          subject.format_with :size_formatter do |_date|
             self.object.class.to_s
           end
 
@@ -312,8 +312,8 @@ describe Grape::Entity do
         subject.exposures[:awesome_thing].should == { as: :extra_smooth }
       end
 
-      it "merges nested :if option" do
-        match_proc = lambda { |obj, opts| true }
+      it 'merges nested :if option' do
+        match_proc = lambda { |_obj, _opts| true }
 
         subject.class_eval do
           # Symbol
@@ -338,7 +338,7 @@ describe Grape::Entity do
       end
 
       it 'merges nested :unless option' do
-        match_proc = lambda { |obj, opts| true }
+        match_proc = lambda { |_, _| true }
 
         subject.class_eval do
           # Symbol
@@ -382,10 +382,10 @@ describe Grape::Entity do
       end
 
       it 'overrides nested :proc option' do
-        match_proc = lambda { |obj, opts| 'more awesomer' }
+        match_proc = lambda { |_obj, _opts| 'more awesomer' }
 
         subject.class_eval do
-          with_options(proc: lambda { |obj, opts| 'awesome' }) do
+          with_options(proc: lambda { |_obj, _opts| 'awesome' }) do
             expose :awesome_thing, proc: match_proc
           end
         end
@@ -422,7 +422,7 @@ describe Grape::Entity do
 
       it 'adds the collection: true option if called with a collection' do
         representation = subject.represent(4.times.map { Object.new })
-        representation.each { |r| r.options[:collection].should be_true }
+        representation.each { |r| r.options[:collection].should be true }
       end
 
       it 'returns a serialized hash of a single object if serializable: true' do
@@ -557,8 +557,8 @@ describe Grape::Entity do
         birthday: Time.gm(2012, 2, 27),
         fantasies: ['Unicorns', 'Double Rainbows', 'Nessy'],
         friends: [
-          double(name: "Friend 1", email: 'friend1@example.com', fantasies: [], birthday: Time.gm(2012, 2, 27), friends: []),
-          double(name: "Friend 2", email: 'friend2@example.com', fantasies: [], birthday: Time.gm(2012, 2, 27), friends: [])
+          double(name: 'Friend 1', email: 'friend1@example.com', fantasies: [], birthday: Time.gm(2012, 2, 27), friends: []),
+          double(name: 'Friend 2', email: 'friend2@example.com', fantasies: [], birthday: Time.gm(2012, 2, 27), friends: [])
         ]
       }
     }
@@ -575,7 +575,7 @@ describe Grape::Entity do
         expect { fresh_class.new(nil).serializable_hash }.not_to raise_error
       end
 
-      context "with safe option" do
+      context 'with safe option' do
         it 'does not throw an exception when an attribute is not found on the object' do
           fresh_class.expose :name, :nonexistent_attribute, safe: true
           expect { fresh_class.new(model).serializable_hash }.not_to raise_error
@@ -602,24 +602,24 @@ describe Grape::Entity do
         end
       end
 
-      context "without safe option" do
+      context 'without safe option' do
         it 'throws an exception when an attribute is not found on the object' do
           fresh_class.expose :name, :nonexistent_attribute
           expect { fresh_class.new(model).serializable_hash }.to raise_error
         end
 
         it "exposes attributes that don't exist on the object only when they are generated by a block" do
-          fresh_class.expose :nonexistent_attribute do |model, _|
-            "well, I do exist after all"
+          fresh_class.expose :nonexistent_attribute do |_model, _opts|
+            'well, I do exist after all'
           end
           res = fresh_class.new(model).serializable_hash
           res.should have_key :nonexistent_attribute
         end
 
-        it "does not expose attributes that are generated by a block but have not passed criteria" do
-          fresh_class.expose :nonexistent_attribute, proc: lambda { |model, _|
-            "I exist, but it is not yet my time to shine"
-          },                                         if: lambda { |model, _| false }
+        it 'does not expose attributes that are generated by a block but have not passed criteria' do
+          fresh_class.expose :nonexistent_attribute, proc: lambda { |_model, _opts|
+            'I exist, but it is not yet my time to shine'
+          },                                         if: lambda { |_model, _opts| false }
           res = fresh_class.new(model).serializable_hash
           res.should_not have_key :nonexistent_attribute
         end
@@ -631,17 +631,17 @@ describe Grape::Entity do
           end
         end
 
-        fresh_class.expose :nonexistent_attribute, using: EntitySpec::TestEntity do |model, _|
-          "well, I do exist after all"
+        fresh_class.expose :nonexistent_attribute, using: EntitySpec::TestEntity do |_model, _opts|
+          'well, I do exist after all'
         end
         res = fresh_class.new(model).serializable_hash
         res.should have_key :nonexistent_attribute
       end
 
-      it "does not expose attributes that are generated by a block but have not passed criteria" do
-        fresh_class.expose :nonexistent_attribute, proc: lambda { |model, _|
-          "I exist, but it is not yet my time to shine"
-        },                                         if: lambda { |model, _| false }
+      it 'does not expose attributes that are generated by a block but have not passed criteria' do
+        fresh_class.expose :nonexistent_attribute, proc: lambda { |_, _|
+          'I exist, but it is not yet my time to shine'
+        },                                         if: lambda { |_, _| false }
         res = fresh_class.new(model).serializable_hash
         res.should_not have_key :nonexistent_attribute
       end
@@ -649,14 +649,14 @@ describe Grape::Entity do
       context '#serializable_hash' do
         module EntitySpec
           class EmbeddedExample
-            def serializable_hash(opts = {})
+            def serializable_hash(_opts = {})
               { abc: 'def' }
             end
           end
 
           class EmbeddedExampleWithHash
             def name
-              "abc"
+              'abc'
             end
 
             def embedded
@@ -666,7 +666,7 @@ describe Grape::Entity do
 
           class EmbeddedExampleWithMany
             def name
-              "abc"
+              'abc'
             end
 
             def embedded
@@ -676,7 +676,7 @@ describe Grape::Entity do
 
           class EmbeddedExampleWithOne
             def name
-              "abc"
+              'abc'
             end
 
             def embedded
@@ -688,19 +688,19 @@ describe Grape::Entity do
         it 'serializes embedded objects which respond to #serializable_hash' do
           fresh_class.expose :name, :embedded
           presenter = fresh_class.new(EntitySpec::EmbeddedExampleWithOne.new)
-          presenter.serializable_hash.should == { name: "abc", embedded: { abc: "def" } }
+          presenter.serializable_hash.should == { name: 'abc', embedded: { abc: 'def' } }
         end
 
         it 'serializes embedded arrays of objects which respond to #serializable_hash' do
           fresh_class.expose :name, :embedded
           presenter = fresh_class.new(EntitySpec::EmbeddedExampleWithMany.new)
-          presenter.serializable_hash.should == { name: "abc", embedded: [{ abc: "def" }, { abc: "def" }] }
+          presenter.serializable_hash.should == { name: 'abc', embedded: [{ abc: 'def' }, { abc: 'def' }] }
         end
 
         it 'serializes embedded hashes of objects which respond to #serializable_hash' do
           fresh_class.expose :name, :embedded
           presenter = fresh_class.new(EntitySpec::EmbeddedExampleWithHash.new)
-          presenter.serializable_hash.should == { name: "abc", embedded: { a: nil, b: { abc: "def" } } }
+          presenter.serializable_hash.should == { name: 'abc', embedded: { a: nil, b: { abc: 'def' } } }
         end
       end
     end
@@ -755,7 +755,7 @@ describe Grape::Entity do
           rep.last.serializable_hash[:name].should == 'Friend 2'
         end
 
-        it "passes through the proc which returns an array of objects with custom options(:using)" do
+        it 'passes through the proc which returns an array of objects with custom options(:using)' do
           module EntitySpec
             class FriendEntity < Grape::Entity
               root 'friends', 'friend'
@@ -764,7 +764,7 @@ describe Grape::Entity do
           end
 
           fresh_class.class_eval do
-            expose :custom_friends, using: EntitySpec::FriendEntity do |user, options|
+            expose :custom_friends, using: EntitySpec::FriendEntity do |user, _opts|
               user.friends
             end
           end
@@ -776,7 +776,7 @@ describe Grape::Entity do
           rep.last.serializable_hash.should == { name: 'Friend 2', email: 'friend2@example.com' }
         end
 
-        it "passes through the proc which returns single object with custom options(:using)" do
+        it 'passes through the proc which returns single object with custom options(:using)' do
           module EntitySpec
             class FriendEntity < Grape::Entity
               root 'friends', 'friend'
@@ -785,7 +785,7 @@ describe Grape::Entity do
           end
 
           fresh_class.class_eval do
-            expose :first_friend, using: EntitySpec::FriendEntity do |user, options|
+            expose :first_friend, using: EntitySpec::FriendEntity do |user, _opts|
               user.friends.first
             end
           end
@@ -795,7 +795,7 @@ describe Grape::Entity do
           rep.serializable_hash.should == { name: 'Friend 1', email: 'friend1@example.com' }
         end
 
-        it "passes through the proc which returns empty with custom options(:using)" do
+        it 'passes through the proc which returns empty with custom options(:using)' do
           module EntitySpec
             class FriendEntity < Grape::Entity
               root 'friends', 'friend'
@@ -804,8 +804,7 @@ describe Grape::Entity do
           end
 
           fresh_class.class_eval do
-            expose :first_friend, using: EntitySpec::FriendEntity do |user, options|
-
+            expose :first_friend, using: EntitySpec::FriendEntity do |_user, _opts|
             end
           end
 
@@ -873,7 +872,7 @@ describe Grape::Entity do
         subject.send(:value_for, :fantasies).should == ['Nessy', 'Double Rainbows', 'Unicorns']
       end
 
-      it "tries instance methods on the entity first" do
+      it 'tries instance methods on the entity first' do
         module EntitySpec
           class DelegatingEntity < Grape::Entity
             root 'friends', 'friend'
@@ -883,18 +882,18 @@ describe Grape::Entity do
             private
 
             def name
-              "cooler name"
+              'cooler name'
             end
           end
         end
 
-        friend = double("Friend", name: "joe", email: "joe@example.com")
+        friend = double('Friend', name: 'joe', email: 'joe@example.com')
         rep = EntitySpec::DelegatingEntity.new(friend)
-        rep.send(:value_for, :name).should == "cooler name"
-        rep.send(:value_for, :email).should == "joe@example.com"
+        rep.send(:value_for, :name).should == 'cooler name'
+        rep.send(:value_for, :email).should == 'joe@example.com'
       end
 
-      context "using" do
+      context 'using' do
         before do
           module EntitySpec
             class UserEntity < Grape::Entity
@@ -902,15 +901,15 @@ describe Grape::Entity do
             end
           end
         end
-        it "string" do
+        it 'string' do
           fresh_class.class_eval do
-            expose :friends, using: "EntitySpec::UserEntity"
+            expose :friends, using: 'EntitySpec::UserEntity'
           end
 
           rep = subject.send(:value_for, :friends)
           rep.should be_kind_of Array
           rep.size.should == 2
-          rep.all? { |r| r.is_a?(EntitySpec::UserEntity) }.should be_true
+          rep.all? { |r| r.is_a?(EntitySpec::UserEntity) }.should be true
         end
 
         it 'class' do
@@ -921,7 +920,7 @@ describe Grape::Entity do
           rep = subject.send(:value_for, :friends)
           rep.should be_kind_of Array
           rep.size.should == 2
-          rep.all? { |r| r.is_a?(EntitySpec::UserEntity) }.should be_true
+          rep.all? { |r| r.is_a?(EntitySpec::UserEntity) }.should be true
         end
       end
     end
@@ -934,7 +933,7 @@ describe Grape::Entity do
       end
 
       it 'returns each defined documentation hash' do
-        doc = { type: "foo", desc: "bar" }
+        doc = { type: 'foo', desc: 'bar' }
         fresh_class.expose :name, documentation: doc
         fresh_class.expose :email, documentation: doc
         fresh_class.expose :birthday
@@ -943,7 +942,7 @@ describe Grape::Entity do
       end
 
       it 'returns each defined documentation hash with :as param considering' do
-        doc = { type: "foo", desc: "bar" }
+        doc = { type: 'foo', desc: 'bar' }
         fresh_class.expose :name, documentation: doc, as: :label
         fresh_class.expose :email, documentation: doc
         fresh_class.expose :birthday
@@ -973,54 +972,54 @@ describe Grape::Entity do
       it 'only passes through hash :if exposure if all attributes match' do
         exposure_options = { if: { condition1: true, condition2: true } }
 
-        subject.send(:conditions_met?, exposure_options, {}).should be_false
-        subject.send(:conditions_met?, exposure_options, condition1: true).should be_false
-        subject.send(:conditions_met?, exposure_options, condition1: true, condition2: true).should be_true
-        subject.send(:conditions_met?, exposure_options, condition1: false, condition2: true).should be_false
-        subject.send(:conditions_met?, exposure_options, condition1: true, condition2: true, other: true).should be_true
+        subject.send(:conditions_met?, exposure_options, {}).should be false
+        subject.send(:conditions_met?, exposure_options, condition1: true).should be false
+        subject.send(:conditions_met?, exposure_options, condition1: true, condition2: true).should be true
+        subject.send(:conditions_met?, exposure_options, condition1: false, condition2: true).should be false
+        subject.send(:conditions_met?, exposure_options, condition1: true, condition2: true, other: true).should be true
       end
 
       it 'looks for presence/truthiness if a symbol is passed' do
         exposure_options = { if: :condition1 }
 
-        subject.send(:conditions_met?, exposure_options, {}).should be_false
-        subject.send(:conditions_met?, exposure_options,  condition1: true).should be_true
-        subject.send(:conditions_met?, exposure_options,  condition1: false).should be_false
-        subject.send(:conditions_met?, exposure_options,  condition1: nil).should be_false
+        subject.send(:conditions_met?, exposure_options, {}).should be false
+        subject.send(:conditions_met?, exposure_options,  condition1: true).should be true
+        subject.send(:conditions_met?, exposure_options,  condition1: false).should be false
+        subject.send(:conditions_met?, exposure_options,  condition1: nil).should be false
       end
 
       it 'looks for absence/falsiness if a symbol is passed' do
         exposure_options = { unless: :condition1 }
 
-        subject.send(:conditions_met?, exposure_options, {}).should be_true
-        subject.send(:conditions_met?, exposure_options,  condition1: true).should be_false
-        subject.send(:conditions_met?, exposure_options,  condition1: false).should be_true
-        subject.send(:conditions_met?, exposure_options,  condition1: nil).should be_true
+        subject.send(:conditions_met?, exposure_options, {}).should be true
+        subject.send(:conditions_met?, exposure_options,  condition1: true).should be false
+        subject.send(:conditions_met?, exposure_options,  condition1: false).should be true
+        subject.send(:conditions_met?, exposure_options,  condition1: nil).should be true
       end
 
       it 'only passes through proc :if exposure if it returns truthy value' do
         exposure_options = { if: lambda { |_, opts| opts[:true] } }
 
-        subject.send(:conditions_met?, exposure_options, true: false).should be_false
-        subject.send(:conditions_met?, exposure_options, true: true).should be_true
+        subject.send(:conditions_met?, exposure_options, true: false).should be false
+        subject.send(:conditions_met?, exposure_options, true: true).should be true
       end
 
       it 'only passes through hash :unless exposure if any attributes do not match' do
         exposure_options = { unless: { condition1: true, condition2: true } }
 
-        subject.send(:conditions_met?, exposure_options, {}).should be_true
-        subject.send(:conditions_met?, exposure_options, condition1: true).should be_false
-        subject.send(:conditions_met?, exposure_options, condition1: true, condition2: true).should be_false
-        subject.send(:conditions_met?, exposure_options, condition1: false, condition2: true).should be_false
-        subject.send(:conditions_met?, exposure_options, condition1: true, condition2: true, other: true).should be_false
-        subject.send(:conditions_met?, exposure_options, condition1: false, condition2: false).should be_true
+        subject.send(:conditions_met?, exposure_options, {}).should be true
+        subject.send(:conditions_met?, exposure_options, condition1: true).should be false
+        subject.send(:conditions_met?, exposure_options, condition1: true, condition2: true).should be false
+        subject.send(:conditions_met?, exposure_options, condition1: false, condition2: true).should be false
+        subject.send(:conditions_met?, exposure_options, condition1: true, condition2: true, other: true).should be false
+        subject.send(:conditions_met?, exposure_options, condition1: false, condition2: false).should be true
       end
 
       it 'only passes through proc :unless exposure if it returns falsy value' do
         exposure_options = { unless: lambda { |_, options| options[:true] == true } }
 
-        subject.send(:conditions_met?, exposure_options, true: false).should be_true
-        subject.send(:conditions_met?, exposure_options, true: true).should be_false
+        subject.send(:conditions_met?, exposure_options, true: false).should be true
+        subject.send(:conditions_met?, exposure_options, true: true).should be false
       end
     end
 

metadata

@@ -1,88 +1,100 @@
 --- !ruby/object:Gem::Specification
 name: grape-entity
 version: !ruby/object:Gem::Version
-  version: 0.4.2
+  version: 0.4.3
+  prerelease: 
 platform: ruby
 authors:
 - Michael Bleigh
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-03 00:00:00.000000000 Z
+date: 2014-06-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: multi_json
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 1.3.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 1.3.2
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: maruku
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: yard
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -90,6 +102,7 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -97,15 +110,17 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 description: Extracted from Grape, A Ruby framework for rapid API development with
@@ -129,6 +144,7 @@ files:
 - README.md
 - RELEASING.md
 - Rakefile
+- bench/serializing.rb
 - grape-entity.gemspec
 - lib/grape-entity.rb
 - lib/grape_entity.rb
@@ -139,26 +155,33 @@ files:
 homepage: https://github.com/intridea/grape-entity
 licenses:
 - MIT
-metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
-  - - '>='
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: -128903481528041369
 required_rubygems_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
-  - - '>='
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: -128903481528041369
 requirements: []
 rubyforge_project: grape-entity
-rubygems_version: 2.0.14
+rubygems_version: 1.8.25
 signing_key: 
-specification_version: 4
+specification_version: 3
 summary: A simple facade for managing the relationship between your model and API.
 test_files:
 - spec/grape_entity/entity_spec.rb

checksums.yaml

@@ -1,7 +0,0 @@
----
-SHA1:
-  metadata.gz: 4165ed088e82e10584f53bf9436053d18c647b41
-  data.tar.gz: be2d0321743d7d27dcc1d3c1f30a9e5483e5c92d
-SHA512:
-  metadata.gz: 2059bf88e77709d197f923e0c4659747d83ed2a859325cecdcbb286cdc828a82a07a8c6571df886be941059b6c2c98110327c04809d453824ff377d387919c5e
-  data.tar.gz: e2c16d535392af2daf37b834589f63933f66f960c15e199956419dd894a3bd95ab06b76a53b3ca594714f854845c4137b65add706b8be02c8d6e580b7d3e2062