mongocore 0.2.1 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e2b421c9156412c98e0da302d515db0283ba45ba
-  data.tar.gz: a14a5b1d90a91328eab16f8d2e6f083725ab8658
+  metadata.gz: 28fcb4fb984516032b665605855fa978c7d8cda2
+  data.tar.gz: ecdb708c8470c2aec2cd624bdc35457e1fedb547
 SHA512:
-  metadata.gz: c95e808a73109dbb45e4fb1538028c6cc453501a1fa90dcbae5ff3d0e2cc6ceb66fd9d0187a238dde05ca82df04e91ee50e438a3de73cc68198aba7eeff360b7
-  data.tar.gz: e904842600c7643bf831745ff487639e0b64b6221092eb650f9b7c8f657d90cbc526bbc5211ba3a75036cde2ae777d9ecf85225af4e53a6ec26940f31948e519
+  metadata.gz: 9bd1c5dc2e11c6d3422a1fef2ac7e6c7e7b2f169cc5016da379f6d5dbb42e60b86fb06a40a2f488bd7724dea34e19d79597be5dd1eb45fc9efe13f52e117a077
+  data.tar.gz: ad17bff6efbe5f07828d5f0f452a53bc21af5108e878ae48fa54c34f86e59f18f80e7e34b5a5ce0a7e14f5ee2d4a9beee80636c016ca7723b4c87ad9da15d6d9

data/README.md

@@ -21,7 +21,7 @@ Please read [the source code](https://github.com/fugroup/mongocore/tree/master/l
 | -------------------------------------- | ----- | ------- | ------------- |
 | [Mongoid](http://mongoid.com)          | 256   | 14371   | 10590         |
 | [MongoMapper](http://mongomapper.com)  | 91    | 200     | 4070          |
-| [Mongocore](http://mongocore.com)      | 8     | 256     | 454           |
+| [Mongocore](http://mongocore.com)      | 8     | 254     | 448           |
 
 <br>
 

data/lib/mongocore/ext.rb

@@ -18,3 +18,13 @@ class String
   end
 
 end
+
+module BSON
+  class ObjectId
+
+    def as_json(o = {})
+      self.to_s
+    end
+
+  end
+end

data/lib/mongocore/query.rb

@@ -52,10 +52,10 @@ module Mongocore
           ids(transform(v))
         when Array
           # Return mapped array or recurse hashes
-          h[k] = v.map{|r| r.is_a?(Hash) ? ids(transform(r)) : oid(r)}
+          h[k] = v.map{|r| r.is_a?(Hash) ? ids(transform(r)) : @model.schema.oid(r)}
         else
           # Convert to object ID if applicable
-          h[k] = oid(v) if v.is_a?(String)
+          h[k] = @model.schema.oid(v) if v.is_a?(String)
         end
       end
     end
@@ -128,10 +128,10 @@ module Mongocore
       o[:per_page] = o[:per_page].to_i; o[:per_page] = Mongocore.per_page if o[:per_page] < 1
 
       # Skip results
-      store[:skip] = o[:per_page] * (o[:page] - 1)
+      @store[:skip] = o[:per_page] * (o[:page] - 1)
 
       # Apply limit
-      store[:limit] = o[:per_page]
+      @store[:limit] = o[:per_page]
 
       # Fetch the result as array
       all.tap{|r| r.total = total}
@@ -185,16 +185,6 @@ module Mongocore
       @key ||= "#{@model}#{@query.sort}#{@options.sort}#{@store.values}"
     end
 
-    # Schema short cut for oid
-    def oid(k)
-      @model.schema.oid(k)
-    end
-
-    # Schema short cut for oid?
-    def oid?(k)
-      @model.schema.oid?(k)
-    end
-
     # Call and return the scope if it exists
     def method_missing(name, *arguments, &block)
       return @model.send(name, @query, @options, @store.tap{@store[:chain] << name}) if @model.schema.scopes.has_key?(name)

data/lib/mongocore/schema.rb

@@ -67,11 +67,6 @@ module Mongocore
       @keys[key][:type].to_sym rescue :string
     end
 
-    # This key is a BSON::Object ID?
-    def oid?(key)
-      find_type(key) === :object_id
-    end
-
     # Convert to BSON::ObjectId
     def oid(id = nil)
       return id if id.is_a?(BSON::ObjectId)

data/lib/mongocore.rb

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

data/mongocore.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name        = 'mongocore'
-  s.version     = '0.2.1'
+  s.version     = '0.2.2'
   s.date        = '2017-10-27'
   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."

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mongocore
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors:
 - Fugroup Limited