couchbase-orm 0.0.4 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 11c2ad7ff34f37ae315cd7c9a3fdc7a6996227e2
-  data.tar.gz: 3f6aefaa94d88a6aaebad20bedb1c78a28a70008
+  metadata.gz: 97d4d22e92253cd711eac00f3ef2be972e6a7edf
+  data.tar.gz: 54c9999852f93b4e3cdbc0902e2f5e1eb5d41410
 SHA512:
-  metadata.gz: c4ddb04a7d3bd75b42ea33c95d3381796c765232b13dff8a06210ed229282bbc061700c85966b79728fc57ab2d95c68d7559dec0c2a1752a334e2db113c4a9e7
-  data.tar.gz: 0e2364c88a7b6bee5ae8e3f0ce236fcab13fca16d404f3c2089cc73d9fd3f1d242a6065d81148df495b6f9f3828f46a2a2305c1a88370d7c750b15440b7209b1
+  metadata.gz: 0697517128397f38ed0e449ffc284a7df7023c73d04eeebd25d03cfc50af43702950d258a9de536835439bfd3ecddb0b29083df0bb5a583669f1ada6e69b00da
+  data.tar.gz: ade8348fee4da31af06dcf5174dfe68b8b13619d5a490470add44e85c7d74983722223b8f076ab55cb03f2f9a76f7776c8fc910ebf31e6bb83df44e35a143fb5

data/lib/couchbase-orm/base.rb

@@ -150,11 +150,11 @@ module CouchbaseOrm
                     @__metadata__.cas = model.cas
 
                     # This ensures that defaults are applied
-                    super(**doc)
+                    @__attributes__.merge! doc
                 when CouchbaseOrm::Base
                     attributes = model.attributes
                     attributes.delete(:id)
-                    super(**attributes)
+                    @__attributes__ = attributes
                 else
                     super(**attributes.merge(Hash(model)))
                 end
@@ -212,6 +212,12 @@ module CouchbaseOrm
             end
         end
 
+        ID_LOOKUP = ['id', :id].freeze
+        def read_attribute_for_serialization(attr)
+            return self.id if ID_LOOKUP.include?(attr)
+            @__attributes__[attr]
+        end
+
 
         #
         # Add support for comparisons

data/lib/couchbase-orm/railtie.rb

@@ -36,7 +36,9 @@ module Rails #:nodoc:
             def self.rescue_responses
                 {
                     'Libcouchbase::Error::KeyNotFound' => :not_found,
-                    'Libcouchbase::Error::NotStored' => :unprocessable_entity
+                    'Libcouchbase::Error::NotStored' => :unprocessable_entity,
+                    Libcouchbase::Error::KeyNotFound => :not_found,
+                    Libcouchbase::Error::NotStored => :unprocessable_entity
                 }
             end
 

data/lib/couchbase-orm/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true, encoding: ASCII-8BIT
 
 module CouchbaseOrm
-    VERSION = '0.0.4'
+    VERSION = '0.0.5'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: couchbase-orm
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors:
 - Stephen von Takach
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-11-11 00:00:00.000000000 Z
+date: 2016-11-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: libcouchbase