mongocore 0.1.5.4 → 0.1.5.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 528cba77e5787960a365aa15629a703e41fcedd3
-  data.tar.gz: 774cb561e0ce794c80a3ff3a03e0cc00c8ec767c
+  metadata.gz: e84e4c0a90381ed50bdc7912bded6cec7659fe48
+  data.tar.gz: a8dc0e269b5f2795a4d24cdc86f821e2e61d8076
 SHA512:
-  metadata.gz: 4648a17cbc9670bef907be425fa17a3c50a924cefedf7f35e08364130c0f409c3f130abc39d896a8dfc4091cd3801b75b67e537bf745079888852a15585e2e91
-  data.tar.gz: d3a1921104bbbc4f26ab79bbe789105fb878e285e1dbf13cdfcd5a0130320d11ad2dde5b345ae81e0d81abbe1f71cf275cba2543163dfb00206ac11f70c6c251
+  metadata.gz: a6fa7f82aa0107dbbb0947fe3ca7954980e3ae752c90b6ff626f3e90de96c1a569969578fbe5cbdbc1ed467ef7cc39fb4f66dafd1e289ade151122dbea1f3c64
+  data.tar.gz: 346c9981648cbff471c3cfe3a7b9ef028c21afbb8de698e317543e216ba39f3e144a1ac746b998c26bf4f5928aca034bcb74d14df1ef5860a97f17222aa44c9d

data/lib/mongocore/document.rb

@@ -14,7 +14,7 @@ module Mongocore
     # The Model class, accessible from Model or m.class, holds the data
     # for your models like the schema and the keys.
     #
-    # The model instance, m, lets you do operations on a single model
+    # The model instance, m, lets you do operations on a model
     # like m.save, m.update, m.delete
     #
 
@@ -72,21 +72,17 @@ module Mongocore
 
       # Save attributes to db
       def save(o = {})
-        # Send :validate => true to validate
-        return false unless valid? if o[:validate]
-
-        # Create a new query
-        filter(:save){mq(self.class, {:_id => @_id}).update(attributes).ok?}
+        persist(:save, o)
       end
 
       # Update document in db
-      def update(a = {})
-        self.attributes = a; filter(:update){single.update(a).ok?}
+      def update(a = {}, o = {})
+        self.attributes = a; persist(:update, o)
       end
 
       # Delete a document in db
       def delete
-        filter(:delete, false){single.delete}
+        filter(:delete, false){one.delete}
       end
 
       # Run filters before and after accessing the db
@@ -96,7 +92,7 @@ module Mongocore
 
       # Reload the document from db and update attributes
       def reload
-        single.first.tap{|m| attributes = m.attributes}
+        one.first.tap{|m| attributes = m.attributes}
       end
 
       # Set the timestamps if enabled
@@ -160,8 +156,8 @@ module Mongocore
         Mongocore::Query.new(m, q, o, {:source => self}.merge(s))
       end
 
-      # Short cut for simple query with cache buster
-      def single(s = {:cache => false})
+      # Short cut for query needing only id
+      def one(s = {})
         mq(self.class, {:_id => @_id}, {}, s)
       end
 
@@ -230,6 +226,17 @@ module Mongocore
         a.delete(:_id); {:id => id}.merge(a)
       end
 
+      private
+
+      # Persist for save and update
+      def persist(type, o)
+        # Send :validate => true to validate
+        return false unless valid? if o[:validate]
+
+        # Create a new query
+        filter(type){one.update(attributes).ok?}
+      end
+
     end
 
 

data/lib/mongocore/query.rb

@@ -34,7 +34,7 @@ module Mongocore
 
     # Find. Returns a Mongocore::Query
     def find(q = {}, o = {}, s = {})
-      self.class.new(@model, @query.merge(normalize(q)), @options.merge(o), @store.merge(s))
+      self.class.new(@model, @query.merge(q.is_a?(Hash) ? q : {:_id => q}), @options.merge(o), @store.merge(s))
     end
 
     # Normalize query

data/lib/mongocore/schema.rb

@@ -53,7 +53,7 @@ module Mongocore
       elsif type == :integer then val.to_i
       elsif type == :float then val.to_f
       elsif type == :boolean then !!val
-      elsif type == :object_id && val.is_a?(String)
+      elsif type == :object_id && !val.is_a?(BSON::ObjectId)
         BSON::ObjectId.from_string(val) rescue nil
       else
         val

data/lib/mongocore.rb

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

data/mongocore.gemspec

@@ -1,7 +1,7 @@
 Gem::Specification.new do |s|
   s.name        = 'mongocore'
-  s.version     = '0.1.5.4'
-  s.date        = '2017-10-18'
+  s.version     = '0.1.5.5'
+  s.date        = '2017-10-20'
   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.4
+  version: 0.1.5.5
 platform: ruby
 authors:
 - Fugroup Limited
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-10-18 00:00:00.000000000 Z
+date: 2017-10-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mongo