mongocore 0.1.4.1 → 0.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 82ab8bff97378c5d4201d927c111a9975d3a1b66
-  data.tar.gz: a4c9fb66a260bc63c7bebc73a2420e268efbfa79
+  metadata.gz: 744f17825ab911d65f52d3503143554f866089b5
+  data.tar.gz: 99df9b5cf77a9b570314431bc886aff2ffca5337
 SHA512:
-  metadata.gz: 8b946978a281316973d65c9f93d814a8c8b44eb84f11c71839bc994b77619632a3486750b99517408159080ab3616dd323a7db4540d1cc8c4274fb51250a15de
-  data.tar.gz: b5f1b9c1eace40133164715217fec0ebc14a977b9be9a38b90b8044297a3c12d4581750fdc7c474897e6871db097e1bca5427a3fac49eacf106347775cba5c3b
+  metadata.gz: 51caf8f60dc78e033522e98d5f38ab0898fcd9924360ace6c2820ae513bb04f43bd519de7e680043eb24fbe2fe29e7b06a646f78de49dcc7d738adf739bb8e9d
+  data.tar.gz: '08f518db3a2d63ddcd4bfe528522309ea47e5379a7e61e371f01cda89ea2850551abba6fb877773e78deaecc9ecd041417e64eba1f2d8d00999c653110d6bc32'

data/lib/mongocore/query.rb

@@ -15,15 +15,6 @@ module Mongocore
     # Mongocore query initializer
     def initialize(m, q = {}, o = {}, s = {})
 
-      # Support find passing an ID
-      q = {:_id => oid(q)} unless q.is_a?(Hash)
-
-      # Support passing :id as :_id
-      q[:_id] = q.delete(:id) if q[:id]
-
-      # Support passing _id as a string
-      q[:_id] = oid(q[:_id]) if q[:_id].is_a?(String)
-
       # Storing model class. The instance can be found in store[:source]
       @model = m
 
@@ -35,7 +26,7 @@ module Mongocore
 
       # Storing query and options. Sort and limit is stored in options
       s[:sort] ||= {}; s[:limit] ||= 0; s[:chain] ||= []; s[:source] ||= nil; s[:fields] ||= {}; s[:skip] ||= 0
-      @query, @options, @store = q, o, s
+      @query, @options, @store = normalize(q), o, s
 
       # Set up cache
       @cache = Mongocore::Cache.new(self)
@@ -43,7 +34,21 @@ module Mongocore
 
     # Find. Returns a Mongocore::Query
     def find(q = {}, o = {}, s = {})
-      Mongocore::Query.new(@model, @query.merge(q), @options.merge(o), @store.merge(s))
+      Mongocore::Query.new(@model, @query.merge(normalize(q)), @options.merge(o), @store.merge(s))
+    end
+
+    # Normalize query
+    def normalize(q)
+      # Support find passing an ID
+      q = {:_id => oid(q)} unless q.is_a?(Hash)
+
+      # Support passing :id as :_id
+      q[:_id] = q.delete(:id) if q[:id]
+
+      # Convert object ID's to BSON::ObjectIds
+      q.each{|k, v| q[k] = oid(v) if k =~ /_id$/}
+
+      q
     end
 
     # Cursor
@@ -68,7 +73,8 @@ module Mongocore
     end
 
     # Count. Returns the number of documents as an integer
-    def count
+    def count(*args)
+      find(*args) if args.any?
       counter || fetch(:count)
     end
 
@@ -78,18 +84,25 @@ module Mongocore
     end
 
     # Return first document
-    def first(doc = nil)
-      (doc ||= fetch(:first)) ? @model.new(doc.to_hash) : nil
+    def first(*args)
+      find(*args) if args.any?
+      modelize(fetch(:first))
     end
 
     # Return last document
-    def last
+    def last(*args)
+      find(*args) if args.any?
       sort(:_id => -1).limit(1).first
     end
 
     # Return all documents
     def all
-      fetch(:to_a).map{|d| first(d)}
+      fetch(:to_a).map{|d| modelize(d)}
+    end
+
+    # Doc to model
+    def modelize(doc)
+      doc ? @model.new(doc.to_hash) : nil
     end
 
     # Paginate
@@ -111,7 +124,7 @@ module Mongocore
       store[:limit] = o[:per_page]
 
       # Fetch the result as array
-      fetch(:to_a).map{|d| first(d)}.tap{|r| r.total = total}
+      fetch(:to_a).map{|d| modelize(d)}.tap{|r| r.total = total}
     end
 
     # Fetch docs, pass type :first, :to_a or :count

data/lib/mongocore.rb

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

data/mongocore.gemspec

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