entangled 0.0.24 → 0.0.25

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.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: 1a88ff7623ddae9fbcfe0b93bc7080f309a48bf5
4
- data.tar.gz: 179aa9cd196ea36f70ba8f4baf3d2d6cfc0c5dfe
3
+ metadata.gz: 8ca5362f5aca57e992be81a4856c54006173ff27
4
+ data.tar.gz: 63181710cbfdb8c0b984a19e684e9d39a519ffaa
5
5
  SHA512:
6
- metadata.gz: 26935b60d39af34abfb60595102825d41a85188373bee4c5ac24b04392ceeb5ff8571f35229ef6ecb5432fca0626ac17286534256c3f4e9c9e5216cf4ad092e1
7
- data.tar.gz: 2440601fc453c11adebee76f0c1bc061bfe74ad4d0c0b996d93b01f433e120d66bf916e528f447b54fd48d9da7e420bca46352a8f540bc4c15d9dc524b8477d4
6
+ metadata.gz: ea9d8bac58de5cd03d45fc35b253f1a124baf29b6dce187039b149d1151d777365d5453c660952ac3d7103fec5843f2e7f643bcf1028b4e62bddba7e4b36acda
7
+ data.tar.gz: 84ab4fa51ccbf7eb5058a3ac780bd7552b00c099684ef38997eab065994a59b37bde85a95d06158c56194f5643500234f32db24ba0261fe800e4fc36a0a50ad5
data/README.md CHANGED
@@ -413,7 +413,6 @@ The gem relies heavily on convention over configuration and currently only works
413
413
  ## Development Priorities
414
414
  The following features are to be implemented next:
415
415
 
416
- - Check if routes really allow options right now. For example, what if I pass in shallow: true? Run rake routes to check!
417
416
  - Allow for more than one level of nesting of `#channels` in `Entangled::Model`
418
417
  - Support `belongsTo` in front end
419
418
  - Support deeply nested `belongs_to`, e.g. `Parent > Child > Grandchild`
@@ -69,8 +69,8 @@ module Entangled
69
69
  # its errors. This is necessary so that errors
70
70
  # are sent back to the client along with the
71
71
  # resource on create and update
72
- def as_json(options = {})
73
- attributes.merge(errors: errors).as_json
72
+ def as_json(options = nil)
73
+ super(options || attributes).merge(errors: errors).as_json
74
74
  end
75
75
 
76
76
  # Build channels. Channels always at least include
@@ -1,3 +1,3 @@
1
1
  module Entangled
2
- VERSION = "0.0.24"
2
+ VERSION = "0.0.25"
3
3
  end
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: entangled
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.0.24
4
+ version: 0.0.25
5
5
  platform: ruby
6
6
  authors:
7
7
  - Dennis Charles Hackethal
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2015-03-17 00:00:00.000000000 Z
11
+ date: 2015-03-22 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: bundler