mongocore 0.1.5.6 → 0.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 61117ab6407f2697bd0e53ea6f496c83aedc9bb8
-  data.tar.gz: 83964b5ff5fc6e995c3ee55f09c197be2c6a4ea2
+  metadata.gz: f2398fe451c3d58b40b9a635a4e5cd365a702cc3
+  data.tar.gz: 2e3f32a1f68b45543e75b5dfd9c607d7c81e682a
 SHA512:
-  metadata.gz: 38abb821b9d54b9be87a853eb1b78b450269655e1f5038d212302dc6ba331f5e733162cb9ddd6e4f9a02613f6bb4bafd10d1fa8a284a9f619a47c315b6f0342a
-  data.tar.gz: 813e69998c70273fd3fdd68a2346392d7c656ca00a4838fe65e13c8ef6d25394867ddb8bb506f3b65918ee495b4d1bc36e030ed91b5f753b87140041b3810f28
+  metadata.gz: 33843a29724bfcdb0e2e61a9ec9cf4bfae5df8990c1ab250c7bc1a0f8426e9997b53622476fbe553f7a397df3edd311038c13b6582e304358e952a87336a31c6
+  data.tar.gz: 6dfae14f09cf37cc1eafd82fd4920e37c676f3682f1ccf1f6fa9bc2b892c910c4a68a72426b9af13eba9ae383bef63ad52c569084a2e4865f72d5ddcf762ba9f

data/lib/mongocore/document.rb

@@ -92,7 +92,7 @@ module Mongocore
 
       # Reload the document from db and update attributes
       def reload
-        one.first.tap{|m| attributes = m.attributes}
+        one.first.tap{|m| self.attributes = m.attributes}
       end
 
       # Set the timestamps if enabled
@@ -107,7 +107,7 @@ module Mongocore
 
       # Collect the attributes, pass tags like defined in your model yml
       def attributes(*tags)
-        a = {}; self.class.schema.attributes(tags.map(&:to_s)).each{|k| a[k] = read!(k)}; string_id(a)
+        a = {}; self.class.schema.attributes(tags.map(&:to_s)).each{|k| a[k] = read!(k)}; a
       end
 
       # Set the attributes
@@ -122,7 +122,7 @@ module Mongocore
 
       # JSON format
       def as_json(options = {})
-        attributes
+        string_id(attributes)
       end
 
 

data/lib/mongocore/schema.rb

@@ -53,8 +53,10 @@ module Mongocore
       elsif type == :integer then val.to_i
       elsif type == :float then val.to_f
       elsif type == :boolean then val.to_s.to_bool
-      elsif type == :object_id && !val.is_a?(BSON::ObjectId)
-        BSON::ObjectId.from_string(val) rescue nil
+      elsif type == :object_id
+        # Convert string id to BSON::ObjectId
+        val.each{|k, v| val[k] = BSON::ObjectId.from_string(v) if v.is_a?(String)} if val.is_a?(Hash)
+        BSON::ObjectId.from_string(val) rescue val
       else
         val
       end

data/lib/mongocore.rb

@@ -7,7 +7,7 @@ require 'mongo'
 require 'request_store'
 
 module Mongocore
-  VERSION = '0.1.5.6'
+  VERSION = '0.1.6'
 
   # # # # # #
   # Mongocore Ruby Database Driver.

data/mongocore.gemspec

@@ -1,7 +1,7 @@
 Gem::Specification.new do |s|
   s.name        = 'mongocore'
-  s.version     = '0.1.5.6'
-  s.date        = '2017-10-20'
+  s.version     = '0.1.6'
+  s.date        = '2017-10-21'
   s.summary     = "MongoDB ORM implementation on top of the Ruby MongoDB driver"
   s.description = "Does validations, associations, scopes, filters, pagination, counter cache, request cache, and nested queries. Using a YAML schema file, which supports default values, data types, and security levels for each key."
   s.authors     = ["Fugroup Limited"]

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mongocore
 version: !ruby/object:Gem::Version
-  version: 0.1.5.6
+  version: 0.1.6
 platform: ruby
 authors:
 - Fugroup Limited
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-10-20 00:00:00.000000000 Z
+date: 2017-10-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mongo