gpi-active_model_serializers 0.8.2 → 0.8.3.alpha1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -1,3 +1,7 @@
1
+
2
+ puts "LOADING ASSOCIATIONS!!"
3
+
4
+
1
5
  module ActiveModel
2
6
  class Serializer
3
7
  class Association #:nodoc:
@@ -62,17 +66,22 @@ module ActiveModel
62
66
  attr_reader :embed_key, :serializer_class, :options, :serializer_options
63
67
 
64
68
  def find_serializable(object)
69
+ puts ">>>>>>> find_serializable <<<<<< #{serializer_options} <<<"
70
+
65
71
  if serializer_class
72
+ puts ">>>>>>> a <<<<<<"
66
73
  serializer_class.new(object, serializer_options)
67
74
  elsif object.respond_to?(:active_model_serializer) && (ams = object.active_model_serializer)
75
+ puts ">>>>>>> b <<<<<<"
68
76
  options = serializer_options.except(:only, :include)
69
77
 
70
- if serializer_options.key?(:include) && serializer_options[:include].include?(name)
78
+ if serializer_options[:include].present? && serializer_options[:include][name].present?
71
79
  options.merge!(serializer_options[:include][name])
72
80
  end
73
81
 
74
82
  ams.new(object, options)
75
83
  else
84
+ puts ">>>>>>> c <<<<<<"
76
85
  object
77
86
  end
78
87
  end
@@ -1,5 +1,5 @@
1
1
  module ActiveModel
2
2
  class Serializer
3
- VERSION = "0.8.2"
3
+ VERSION = "0.8.3.alpha1"
4
4
  end
5
5
  end
metadata CHANGED
@@ -1,8 +1,8 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: gpi-active_model_serializers
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.8.2
5
- prerelease:
4
+ version: 0.8.3.alpha1
5
+ prerelease: 6
6
6
  platform: ruby
7
7
  authors:
8
8
  - José Valim
@@ -152,9 +152,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
152
152
  required_rubygems_version: !ruby/object:Gem::Requirement
153
153
  none: false
154
154
  requirements:
155
- - - ! '>='
155
+ - - ! '>'
156
156
  - !ruby/object:Gem::Version
157
- version: '0'
157
+ version: 1.3.1
158
158
  requirements: []
159
159
  rubyforge_project:
160
160
  rubygems_version: 1.8.23