entangled 0.0.24 → 0.0.25

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1a88ff7623ddae9fbcfe0b93bc7080f309a48bf5
-  data.tar.gz: 179aa9cd196ea36f70ba8f4baf3d2d6cfc0c5dfe
+  metadata.gz: 8ca5362f5aca57e992be81a4856c54006173ff27
+  data.tar.gz: 63181710cbfdb8c0b984a19e684e9d39a519ffaa
 SHA512:
-  metadata.gz: 26935b60d39af34abfb60595102825d41a85188373bee4c5ac24b04392ceeb5ff8571f35229ef6ecb5432fca0626ac17286534256c3f4e9c9e5216cf4ad092e1
-  data.tar.gz: 2440601fc453c11adebee76f0c1bc061bfe74ad4d0c0b996d93b01f433e120d66bf916e528f447b54fd48d9da7e420bca46352a8f540bc4c15d9dc524b8477d4
+  metadata.gz: ea9d8bac58de5cd03d45fc35b253f1a124baf29b6dce187039b149d1151d777365d5453c660952ac3d7103fec5843f2e7f643bcf1028b4e62bddba7e4b36acda
+  data.tar.gz: 84ab4fa51ccbf7eb5058a3ac780bd7552b00c099684ef38997eab065994a59b37bde85a95d06158c56194f5643500234f32db24ba0261fe800e4fc36a0a50ad5

data/README.md

@@ -413,7 +413,6 @@ The gem relies heavily on convention over configuration and currently only works
 ## Development Priorities
 The following features are to be implemented next:
 
-- Check if routes really allow options right now. For example, what if I pass in shallow: true? Run rake routes to check!
 - Allow for more than one level of nesting of `#channels` in `Entangled::Model`
 - Support `belongsTo` in front end
 - Support deeply nested `belongs_to`, e.g. `Parent > Child > Grandchild`

data/lib/entangled/model.rb

@@ -69,8 +69,8 @@ module Entangled
       # its errors. This is necessary so that errors
       # are sent back to the client along with the
       # resource on create and update
-      def as_json(options = {})
-        attributes.merge(errors: errors).as_json
+      def as_json(options = nil)
+        super(options || attributes).merge(errors: errors).as_json
       end
 
       # Build channels. Channels always at least include

data/lib/entangled/version.rb

@@ -1,3 +1,3 @@
 module Entangled
-  VERSION = "0.0.24"
+  VERSION = "0.0.25"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: entangled
 version: !ruby/object:Gem::Version
-  version: 0.0.24
+  version: 0.0.25
 platform: ruby
 authors:
 - Dennis Charles Hackethal
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-17 00:00:00.000000000 Z
+date: 2015-03-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler