mongocore 0.1.8 → 0.1.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2f5279b423c7236ffb2ec14bd1e3a0452141ea85
-  data.tar.gz: 4b14aa11206589e12ad7d300649a8908da0e01cb
+  metadata.gz: '0926f21e762a1dfd60a63bc58ba12c9fc9dccf1e'
+  data.tar.gz: c933d56aa6bff657ccefd65611dfc11199aa276b
 SHA512:
-  metadata.gz: 51c7ccbd672e2eec11c19654c60fe424ea240699d9d5242a12840dbaccca49a5daa0cdcb41006f16b2f80d759a5745b1b44cb8310e41d793404721f64684b7f0
-  data.tar.gz: 1a1c470e31454eede0c0c8bab19f8dcbeba44a76e3c654d379d4d1e874c683a8fc861595ffbbdb66cf77966ca834d963065745ccf953da0c1cef43e1b21f11cf
+  metadata.gz: 7c1ee0350b7569e1e2883701710834df7612a78f687c6607e7091053892e7bd76cebd2f5590bded66a5fec3f7b0f5719248b1a8d9406ca77af54ba4fcba1aabe
+  data.tar.gz: 72139c91f9d3291ad023bce34cb8c786a2d26e417a171e7b438fdf28c41db99a9615432cb90743a3372769aae5ec6a110dbf5329d4d8e6e454435a767c1e21b8

data/lib/mongocore/document.rb

@@ -121,11 +121,10 @@ module Mongocore
       end
 
       # JSON format
-      def as_json(options = {})
-        string_id(attributes)
+      def as_json(o = {})
+        string_id(attributes(*o[:data]))
       end
 
-
       # # # # # # # # # # # # # # # #
       # Validation methods
       #
@@ -147,9 +146,11 @@ module Mongocore
 
       # Saved? Persisted?
       def saved?; !!@saved; end
+      alias_method :persisted?, :saved?
 
       # Unsaved? New record?
       def unsaved?; !@saved; end
+      alias_method :new_record?, :unsaved?
 
       # Short cut for setting up a Mongocore::Query object
       def mq(m, q = {}, o = {}, s = {})
@@ -250,6 +251,7 @@ module Mongocore
       def find(*args)
         mq(self, *args)
       end
+      alias_method :where, :find
 
       # Count
       def count(*args)

data/lib/mongocore/query.rb

@@ -36,6 +36,7 @@ module Mongocore
     def find(q = {}, o = {}, s = {})
       self.class.new(@model, @query.merge(q.is_a?(Hash) ? q : {:_id => q}), @options.merge(o), @store.merge(s))
     end
+    alias_method :where, :find
 
     # Normalize query
     def normalize(q)
@@ -102,11 +103,6 @@ module Mongocore
       fetch(:to_a).map{|d| modelize(d)}
     end
 
-    # Doc to model
-    def modelize(doc)
-      doc ? @model.new(doc.to_hash) : nil
-    end
-
     # Paginate
     def paginate(o = {})
       # Get total count before applying pagination
@@ -125,7 +121,12 @@ module Mongocore
       store[:limit] = o[:per_page]
 
       # Fetch the result as array
-      fetch(:to_a).map{|d| modelize(d)}.tap{|r| r.total = total}
+      all.tap{|r| r.total = total}
+    end
+
+    # BSON::Document to model
+    def modelize(doc)
+      doc ? @model.new(doc.to_hash) : nil
     end
 
     # Fetch docs, pass type :first, :to_a or :count
@@ -161,6 +162,11 @@ module Mongocore
       find(@query, @options, @store.tap{store[:fields].merge!(o)})
     end
 
+    # JSON format
+    def as_json(o = {})
+      all
+    end
+
     # Cache key
     def key
       @key ||= "#{@model}#{@query.sort}#{@options.sort}#{@store.values}"

data/lib/mongocore.rb

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

data/mongocore.gemspec

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