mongocore 0.3.2 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2892cb201bc815741fda85f48d3dcd2b4546dec7
-  data.tar.gz: 36cfc6ded9f8b95fc7be644669c298511b2a102e
+  metadata.gz: 6530290c756f80c471d9c5565e7885fcf80a2c33
+  data.tar.gz: ba0ea77310386d919069e77552aee4620223e6ae
 SHA512:
-  metadata.gz: 0d15a8105f04db2f5583badc9c27005bc95b49cbc82897d47694bc6b4555f70ea9a5131dfbde0fe4eae09b86a5bffc046820b4a8e97a279966d976d6b3ebfd5c
-  data.tar.gz: 39a1baeb1e02ced7ef9b9d61d243ac79c362a69447bebe709399e84b0d9e8abab6063eb6b04119633dc92867c60d3c29cca402f98171ff539ba3ed1360b6a12d
+  metadata.gz: ecfc84ad83cf9f41669613c5925ff13aa632ace888bb4b6351d352a221a885b8114363f08cdec8449312330822d6947f2be51682190b9acfe134814d0f00d1ee
+  data.tar.gz: 70327cb292727616e66d15c842184746be4bd8e06fd362543d358dbfec4c593d963a31a89c7a6c16c624f4e4b02d540cd50ce9263fba3a4c54382a89168e92aa

data/CHANGELOG.md

@@ -1,3 +1,11 @@
+**Version 0.4.0** - *2017-12-01*
+
+- Added each_with_index, each_with_object and map
+- Added id = method
+- Refactored cursor, faster finds
+- Added paginate to model class methods
+
+
 **Version 0.3.2** - *2017-11-25*
 
 - Alias for insert is create

data/README.md

@@ -57,7 +57,7 @@ Mongocore.access = true
 Mongocore.timestamps = true
 
 # Default sorting, last will be opposite. Should be indexed.
-Mongocore.sort = {:_id => 1}
+Mongocore.sort = {}
 
 # Pagination results per page
 Mogocore.per_page = 20

data/lib/mongocore.rb

@@ -7,7 +7,7 @@ require 'mongo'
 require 'request_store'
 
 module Mongocore
-  VERSION = '0.3.2'
+  VERSION = '0.4.0'
 
   # # # # # #
   # Mongocore Ruby Database Driver.
@@ -31,7 +31,7 @@ module Mongocore
   @timestamps = true
 
   # Default sorting, last will be opposite. Should be indexed.
-  @sort = {:_id => 1}
+  @sort = {}
 
   # Pagination results per page
   @per_page = 20

data/lib/mongocore/document.rb

@@ -221,6 +221,11 @@ module Mongocore
         @_id ? @_id.to_s : nil
       end
 
+      # Assign id
+      def id=(val)
+        @_id = val.is_a?(BSON::ObjectId) ? val : BSON::ObjectId.from_string(val)
+      end
+
       # Print info about the instance
       def inspect
         "#<#{self.class} #{attributes.sort.map{|r| %{#{r[0]}: #{r[1].inspect}}}.join(', ')}>"
@@ -277,6 +282,11 @@ module Mongocore
         find(*args).all
       end
 
+      # Paginate
+      def paginate(*args)
+        find({}).paginate(*args)
+      end
+
       # Sort
       def sort(o = {})
         find({}, {}, :sort => o)
@@ -292,10 +302,11 @@ module Mongocore
         find({}, {}, :skip => n)
       end
 
-      # Fields (projection)
-      def fields(o = {})
-        find({}, {}, :fields => o)
+      # Projection
+      def projection(o = {})
+        find({}, {}, :projection => o)
       end
+      alias_method :fields, :projection
 
       # Insert
       def insert(a = {}, o = {})
@@ -308,6 +319,21 @@ module Mongocore
         find.each{|r| yield(r)}
       end
 
+      # Each with index
+      def each_with_index(&block)
+        find.each_with_index{|r, n| yield(r, n)}
+      end
+
+      # Each with object
+      def each_with_object(obj, &block)
+        find.each_with_object(obj){|r, o| yield(r, o)}
+      end
+
+      # Map
+      def map(&block)
+        find.map{|r| yield(r)}
+      end
+
 
       # # # # # # # # #
       # After, before and validation filters

data/lib/mongocore/query.rb

@@ -25,7 +25,7 @@ module Mongocore
       @collection = Mongocore.db[@colname]
 
       # Storing query and options
-      s[:limit] ||= 0; s[:chain] ||= []; s[:source] ||= nil; s[:fields] ||= {}; s[:skip] ||= 0
+      s[:chain] ||= []; s[:source] ||= nil; s[:sort] ||= Mongocore.sort; s[:projection] ||= {}; s[:skip] ||= 0; s[:limit] ||= 0
       @query, @options, @store = @model.schema.ids(hashify(q)), o, s
 
       # Set up cache
@@ -45,7 +45,12 @@ module Mongocore
 
     # Cursor
     def cursor
-      @collection.find(@query, @options).projection(@store[:fields]).skip(@store[:skip]).sort(@store[:sort] || Mongocore.sort).limit(@store[:limit])
+      c = @collection.find(@query, @options)
+      c = c.sort(@store[:sort]) if @store[:sort].any?
+      c = c.projection(@store[:projection]) if @store[:projection].any?
+      c = c.skip(@store[:skip]) if @store[:skip] > 0
+      c = c.limit(@store[:limit]) if @store[:limit] > 0
+      c
     end
 
     # Insert
@@ -85,8 +90,10 @@ module Mongocore
     end
 
     # Return last document
+    # Uses the opposite of the Mongocore.sort setting
     def last(*args)
-      sort((a = Mongocore.sort.dup).each{|k, v| a[k] = v * -1}).limit(1).first(*args)
+      a = Mongocore.sort.any? ? Mongocore.sort.dup : {:_id => 1}
+      sort(a.each{|k, v| a[k] = v * -1}).limit(1).first(*args)
     end
 
     # Return all documents
@@ -133,6 +140,21 @@ module Mongocore
       cursor.each{|r| yield(modelize(r))}
     end
 
+    # Each with index
+    def each_with_index(&block)
+      cursor.each_with_index{|r, n| yield(modelize(r), n)}
+    end
+
+    # Each with object
+    def each_with_object(obj, &block)
+      cursor.each_with_object(obj){|r, o| yield(modelize(r), o)}
+    end
+
+    # Map
+    def map(&block)
+      cursor.map{|r| yield(modelize(r))}
+    end
+
     # Sort
     def sort(o = {})
       find(@query, @options, @store.tap{(store[:sort] ||= {}).merge!(o)})
@@ -148,10 +170,11 @@ module Mongocore
       find(@query, @options, @store.tap{store[:skip] = n})
     end
 
-    # Fields (projection)
-    def fields(o = {})
-      find(@query, @options, @store.tap{store[:fields].merge!(o)})
+    # Projection
+    def projection(o = {})
+      find(@query, @options, @store.tap{store[:projection].merge!(o)})
     end
+    alias_method :fields, :projection
 
     # JSON format
     def as_json(o = {})

data/mongocore.gemspec

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