agile_serializer 0.0.4.1 → 0.0.5

Sign up to get free protection for your applications and to get access to all the features.
@@ -1,3 +1,3 @@
1
1
  module AgileSerializer
2
- VERSION = "0.0.4.1"
2
+ VERSION = "0.0.5"
3
3
  end
@@ -78,9 +78,12 @@ module AgileSerializer
78
78
  super(self.class.serialization_options(set).deep_merge(opts))
79
79
  end
80
80
 
81
- def as_json(opts = {})
81
+ def as_json(opts = nil)
82
+ opts ||= {}
82
83
  set, opts = parse_serialization_options(opts)
83
- super(self.class.serialization_options(set).deep_merge(opts))
84
+ ser_opts = self.class.serialization_options(set)
85
+
86
+ super(ser_opts.deep_merge(opts))
84
87
  end
85
88
 
86
89
  private
metadata CHANGED
@@ -1,14 +1,13 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: agile_serializer
3
3
  version: !ruby/object:Gem::Version
4
- hash: 93
4
+ hash: 21
5
5
  prerelease: false
6
6
  segments:
7
7
  - 0
8
8
  - 0
9
- - 4
10
- - 1
11
- version: 0.0.4.1
9
+ - 5
10
+ version: 0.0.5
12
11
  platform: ruby
13
12
  authors:
14
13
  - Christos Trochalakis
@@ -16,7 +15,7 @@ autorequire:
16
15
  bindir: bin
17
16
  cert_chain: []
18
17
 
19
- date: 2010-12-22 00:00:00 +02:00
18
+ date: 2011-01-11 00:00:00 +02:00
20
19
  default_executable:
21
20
  dependencies: []
22
21