mongocore 0.4.4 → 0.4.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 101270d2604389fccdfd5cb57406447a7a722ee6
-  data.tar.gz: 94e67537e7c525525bde6af3afeb63d1160d994d
+  metadata.gz: 2b7497f2ffc863157d942ced1f326b41a595ab1f
+  data.tar.gz: f65ce1925bc082ffa01b603f8975752c40960b8e
 SHA512:
-  metadata.gz: 213d43d5682528b73b2088fb5e65fdba442b8e78f768cb40875aa5778ed4d3cefbbe6e7ddad5b91319de6250255b6a051a443e54b0a7582f0a5e29763d9c4195
-  data.tar.gz: 5af984bb234f941208cbbba636ff6183bc07f1d3e9e30d41162078434a7798b60bf3026dd4d0d87685ef7d3d3d44bb4558c9958e600637989a0b7e6048e7f1e6
+  metadata.gz: d8728af7535106eb8865794093c8cca1b44d20276864267760622b03a183a818b80d63fdd92fa37b53d344b2ff21fd4e1d62aeeebe87a7d6bcfaa043622bd80c
+  data.tar.gz: 49ba47e50f24a96ef3d3e4441145661e93c5651787fd02d9b4a4a4714a070ad2e5945815d36d9ee802a06a7a9868c6a613a5f45b0d2c025fa9e954a3075df5d8

data/CHANGELOG.md

@@ -1,7 +1,15 @@
+**Version 0.4.5** - *2018-01-23*
+
+- Fixed memory bug with Mongocore.sort option
+- Removed unused option
+- Optimized cursor query
+
+
 **Version 0.4.4** - *2018-01-19*
 
 - Fixed dirty tracking clearing after save
 
+
 **Version 0.4.3** - *2018-01-19*
 
 - Reset model properly when doing a reload

data/README.md

@@ -134,13 +134,13 @@ Model.find(:duration => 50).each{|m| puts m}
 m = Model.find(:house => {:$ne => nil, :$eq => 'Nice'}).last
 
 # Sorting, use -1 for descending, 1 for ascending
-m = Model.find({:duration => {:$gt => 40}}, {}, :sort => {:duration => -1}).all
+m = Model.find({:duration => {:$gt => 40}}, :sort => {:duration => -1}).all
 m = p.models.find(:duration => 10).sort(:duration => -1).first
 
 # Limit, pass as third option to find or chain, up to you
 p = Parent.find.sort(:duration => 1).limit(5).all
 p = Parent.limit(1).last
-m = p.models.find({}, {}, :sort => {:goal => 1}, :limit => 1).first
+m = p.models.find({}, :sort => {:goal => 1}, :limit => 1).first
 m = Model.sort(:goal => 1, :duration => -1).limit(10).all
 
 # First

data/lib/mongocore.rb

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

data/lib/mongocore/document.rb

@@ -161,13 +161,13 @@ module Mongocore
       alias_method :new_record?, :unsaved?
 
       # Short cut for setting up a Mongocore::Query object
-      def mq(m, q = {}, o = {}, s = {})
-        Mongocore::Query.new(m, q, o, {:source => self}.merge(s))
+      def mq(m, q = {}, o = {})
+        Mongocore::Query.new(m, q, {:source => self}.merge(o))
       end
 
       # Short cut for query needing only id
-      def one(s = {})
-        mq(self.class, {:_id => @_id}, {}, s)
+      def one(o = {})
+        mq(self.class, {:_id => @_id}, o)
       end
 
 
@@ -297,22 +297,22 @@ module Mongocore
 
       # Sort
       def sort(o = {})
-        find({}, {}, :sort => o)
+        find({}, :sort => o)
       end
 
       # Limit
       def limit(n = 1)
-        find({}, {}, :limit => n)
+        find({}, :limit => n)
       end
 
       # Skip
       def skip(n = 0)
-        find({}, {}, :skip => n)
+        find({}, :skip => n)
       end
 
       # Projection
       def projection(o = {})
-        find({}, {}, :projection => o)
+        find({}, :projection => o)
       end
       alias_method :fields, :projection
 

data/lib/mongocore/query.rb

@@ -10,12 +10,12 @@ module Mongocore
     # it's only the parameters that change.
     #
 
-    attr_accessor :model, :collection, :colname, :query, :options, :store, :cache
+    attr_accessor :model, :collection, :colname, :query, :options, :cache
 
     # Mongocore query initializer
-    def initialize(m, q = {}, o = {}, s = {})
+    def initialize(m, q = {}, o = {})
 
-      # Storing model class. The instance can be found in store[:source]
+      # Storing model class. The instance can be found in options[:source]
       @model = m
 
       # The model name is singular, the collection name is plural
@@ -24,17 +24,24 @@ module Mongocore
       # Storing the Mongo::Collection object
       @collection = Mongocore.db[@colname]
 
+      # Default options
+      o[:source] ||= nil
+      o[:chain] ||= []
+      o[:skip] ||= 0
+      o[:limit] ||= 0
+      o[:sort] ||= Mongocore.sort.dup
+      o[:projection] ||= {}
+
       # Storing query and options
-      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
+      @query, @options = @model.schema.ids(hashify(q)), o
 
       # Set up cache
       @cache = Mongocore::Cache.new(self)
     end
 
     # Find. Returns a Mongocore::Query
-    def find(q = {}, o = {}, s = {})
-      self.class.new(@model, @query.merge(hashify(q)), @options.merge(o), @store.merge(s))
+    def find(q = {}, o = {})
+      self.class.new(@model, @query.merge(hashify(q)), @options.merge(o))
     end
     alias_method :where, :find
 
@@ -45,12 +52,16 @@ module Mongocore
 
     # Cursor
     def cursor
-      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
+      o = @options.dup
+
+      # Remove blank options
+      o.delete(:skip) if o[:skip] < 1
+      o.delete(:limit) if o[:limit] < 1
+      o.delete(:sort) if o[:sort].empty?
+      o.delete(:projection) if o[:projection].empty?
+
+      # Return view
+      @collection.find(@query, o)
     end
 
     # Insert
@@ -80,7 +91,7 @@ module Mongocore
     end
 
     # Check if there's a corresponding counter for this count
-    def counter(s = @store[:source], c = @store[:chain])
+    def counter(s = @options[:source], c = @options[:chain])
       s.send(%{#{@colname}#{c.present? ? "_#{c.join('_')}" : ''}_count}) rescue nil
     end
 
@@ -107,16 +118,18 @@ module Mongocore
       total = fetch(:count)
 
       # Set page, defaults to 1
-      o[:page] = o[:page].to_i; o[:page] = 1 if o[:page] < 1
+      o[:page] = o[:page].to_i
+      o[:page] = 1 if o[:page] < 1
 
       # Set results per page, defaults to 20 in Mongocore.per_page setting
-      o[:per_page] = o[:per_page].to_i; o[:per_page] = Mongocore.per_page if o[:per_page] < 1
+      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)
+      @options[:skip] = o[:per_page] * (o[:page] - 1)
 
       # Apply limit
-      @store[:limit] = o[:per_page]
+      @options[:limit] = o[:per_page]
 
       # Fetch the result as array
       all.tap{|r| r.total = total}
@@ -157,22 +170,22 @@ module Mongocore
 
     # Sort
     def sort(o = {})
-      find(@query, @options, @store.tap{(store[:sort] ||= {}).merge!(o)})
+      find(@query, @options.tap{(@options[:sort] ||= {}).merge!(o)})
     end
 
     # Limit
     def limit(n = 1)
-      find(@query, @options, @store.tap{store[:limit] = n})
+      find(@query, @options.tap{@options[:limit] = n})
     end
 
     # Skip
     def skip(n = 0)
-      find(@query, @options, @store.tap{store[:skip] = n})
+      find(@query, @options.tap{@options[:skip] = n})
     end
 
     # Projection
     def projection(o = {})
-      find(@query, @options, @store.tap{store[:projection].merge!(o)})
+      find(@query, @options.tap{@options[:projection].merge!(o)})
     end
     alias_method :fields, :projection
 
@@ -183,12 +196,12 @@ module Mongocore
 
     # Cache key
     def key
-      @key ||= "#{@model}#{@query.sort}#{@options.sort}#{@store.values}"
+      @key ||= "#{@model}#{@query.sort}#{@options.values}"
     end
 
     # Call and return the scope if it exists
     def method_missing(name, *arguments, &block)
-      return @model.send(name, @query, @options, @store.tap{|r| r[:chain] << name}) if @model.schema.scopes.has_key?(name)
+      return @model.send(name, @query, @options.tap{|r| r[:chain] << name}) if @model.schema.scopes.has_key?(name)
       super
     end
 

data/lib/mongocore/schema.rb

@@ -126,7 +126,7 @@ module Mongocore
     def many(key)
       t = %Q{
         def #{key}
-          mq(#{key.to_s.singularize.capitalize}, {:#{@klass.to_s.downcase}_id => @_id}, {}, :source => self)
+          mq(#{key.to_s.singularize.capitalize}, {:#{@klass.to_s.downcase}_id => @_id}, :source => self)
         end
       }
       @klass.class_eval t
@@ -148,8 +148,8 @@ module Mongocore
       # Define the scope method so we can call it
       j = pm.any? ? %{#{pm.join(', ')},} : ''
       t = %Q{
-        def #{key}(#{j} q = {}, o = {}, s = {})
-          mq(self, q.merge(#{d}), o, {:scope => [:#{key}]}.merge(s))
+        def #{key}(#{j} q = {}, o = {})
+          mq(self, q.merge(#{d}), {:scope => [:#{key}]}.merge(o))
         end
       }
       @klass.instance_eval t

data/mongocore.gemspec

@@ -1,7 +1,7 @@
 Gem::Specification.new do |s|
   s.name        = 'mongocore'
-  s.version     = '0.4.4'
-  s.date        = '2018-01-19'
+  s.version     = '0.4.5'
+  s.date        = '2018-01-23'
   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.4.4
+  version: 0.4.5
 platform: ruby
 authors:
 - Fugroup Limited
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-01-19 00:00:00.000000000 Z
+date: 2018-01-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mongo