mongocore 0.3.0 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fb6147e53bf5b8b125cb237a5eaa5345f75391f4
-  data.tar.gz: 378a53e4425a375587dcce8c16a0e6f660f6d248
+  metadata.gz: b41d351659b6eb32abc203fcf4bfca71475fa310
+  data.tar.gz: 0f62bcc88e7c58aa4574fd0bd2c78366bbba886a
 SHA512:
-  metadata.gz: e438ad2a1d641ee29777e116dec35187f8a113e1fd4233eba36cb6ac3ce924f6d1a877673ada4762000b0a20a4addb2ddc6d7774fd89df2f5ec90a7727fb497e
-  data.tar.gz: 8c29834f2ec9975eec10f65beeda434fd8a9d7d141ab08bda548ce82e7768d40577205348e11541065cba1ebd52892a15eec199ac9882d54bad3da831835114e
+  metadata.gz: fdf761b37d0e415e7806bfa5e908737160ae2a9f59d6f0315c58b05cb8dad87448bd3d79049fe9ab224b3c9baf5164b430de8be51ffadfff914182ca0c911055
+  data.tar.gz: 91d1fc13533117f0ddf899d6fd29b18a5110c490731f35a9914e2ced321c0658d29ac066ab8a5dc9ad8c436246acac6d5603d99ebffd7dff2364f916e2d63b8d

data/CHANGELOG.md

@@ -1,3 +1,10 @@
+**Version 0.3.1** - *2017-11-25*
+
+- Fixed bug where error didn't get reset on validation
+- Can set association = nil
+- Added default sort option
+- Renamed a few internal variables
+
 **Version 0.3.0** - *2017-10-30*
 
 - Removed support for dependent destroy

data/README.md

@@ -56,6 +56,9 @@ Mongocore.access = true
 # Enable timestamps, auto-save created_at and updated_at keys
 Mongocore.timestamps = true
 
+# Default sorting, last will be opposite. Should be indexed.
+Mongocore.sort = {:_id => 1}
+
 # Pagination results per page
 Mogocore.per_page = 20
 

data/lib/mongocore/access.rb

@@ -3,7 +3,7 @@ module Mongocore
 
     # # # # # # # #
     # The Access class is responsible for checking if an attribute
-    # can be read or written. It uses 6 access levels and the
+    # can be read or written. It uses 7 access levels and the
     # read and write attributes in the schema yml file for the model.
     #
     # If your current access level is above the key level, then you
@@ -24,17 +24,17 @@ module Mongocore
 
     # Key readable?
     def read?(key)
-      ok?(keys[key][:read] || :all) rescue false
+      ok?(@keys[key][:read] || :all) rescue false
     end
 
     # Key writable?
     def write?(key)
-      ok?(keys[key][:write] || :all) rescue false
+      ok?(@keys[key][:write] || :all) rescue false
     end
 
     # Ok?
     def ok?(level)
-      !Mongocore.access || self.class.get.nil? || AL.index(level.to_sym) <= AL.index(self.class.get || :app)
+      !Mongocore.access || (g = self.class.get).nil? || AL.index(level.to_sym) <= AL.index(g || :app)
     end
 
 

data/lib/mongocore/document.rb

@@ -38,10 +38,10 @@ module Mongocore
       # Instance variables
       # @errors is used for validates
       # @changes keeps track of object changes
-      # @saved indicates whether this is saved or not
+      # @persisted indicates whether this is saved or not
       #
 
-      attr_accessor :errors, :changes, :saved, :state
+      attr_accessor :errors, :changes, :persisted, :original
 
       # # # # # # # # # # #
       # The class initializer, called when you write Model.new
@@ -50,11 +50,11 @@ module Mongocore
       #
       def initialize(a = {})
 
-        # Store attributes. Storing state state for dirty tracking.
-        self.attributes = self.class.schema.defaults.merge(a).tap{|r| self.state = r.dup}
+        # Store attributes. Storing original state for dirty tracking.
+        self.attributes = self.class.schema.defaults.merge(a).tap{|r| @original = r.dup}
 
         # The _id is a BSON object, create new unless it exists
-        @_id ? @saved = true : @_id = BSON::ObjectId.new
+        @_id ? @persisted = true : @_id = BSON::ObjectId.new
 
         # The errors hash
         @errors = Hash.new{|h, k| h[k] = []}
@@ -86,8 +86,8 @@ module Mongocore
       end
 
       # Run filters before and after accessing the db
-      def filter(cmd, saved = true, &block)
-        run(:before, cmd); yield.tap{@saved = saved; run(:after, cmd)}
+      def filter(cmd, persisted = true, &block)
+        run(:before, cmd); yield.tap{@persisted = persisted; run(:after, cmd)}
       end
 
       # Reload the document from db and update attributes
@@ -131,7 +131,7 @@ module Mongocore
 
       # Valid?
       def valid?
-        self.class.filters.valid?(self)
+        @errors.clear; self.class.filters.valid?(self)
       end
 
       # Available filters are :save, :update, :delete
@@ -145,11 +145,11 @@ module Mongocore
       #
 
       # Saved? Persisted?
-      def saved?; !!@saved; end
+      def saved?; !!@persisted; end
       alias_method :persisted?, :saved?
 
       # Unsaved? New record?
-      def unsaved?; !@saved; end
+      def unsaved?; !@persisted; end
       alias_method :new_record?, :unsaved?
 
       # Short cut for setting up a Mongocore::Query object
@@ -185,7 +185,7 @@ module Mongocore
         v = self.class.schema.convert(key, val)
 
         # Record change for dirty attributes
-        read!(key).tap{|r| @changes[key] = [@state[key], v] if v != r} if @changes
+        read!(key).tap{|r| @changes[key] = [@original[key], v] if v != r} if @changes
 
         # Write attribute
         write!(key, v)
@@ -210,7 +210,7 @@ module Mongocore
         return @changes.has_key?($1.to_sym) if key =~ /(.+)_changed\?/
 
         # Attributes was
-        return @state[$1.to_sym] if key =~ /(.+)_was/
+        return @original[$1.to_sym] if key =~ /(.+)_was/
 
         # Pass if nothing found
         super
@@ -234,7 +234,7 @@ module Mongocore
         return false unless valid? if o[:validate]
 
         # Create a new query
-        filter(type){one.send((@saved ? :update : :insert), attributes).ok?}
+        filter(type){one.send((@persisted ? :update : :insert), attributes).ok?}
       end
 
       # Replace _id with id, takes a hash

data/lib/mongocore/ext.rb

@@ -22,6 +22,7 @@ end
 module BSON
   class ObjectId
 
+    # Override the to_json method
     def as_json(o = {})
       self.to_s
     end

data/lib/mongocore/query.rb

@@ -24,8 +24,8 @@ module Mongocore
       # Storing the Mongo::Collection object
       @collection = Mongocore.db[@colname]
 
-      # 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
+      # Storing query and options
+      s[:limit] ||= 0; s[:chain] ||= []; s[:source] ||= nil; s[:fields] ||= {}; s[:skip] ||= 0
       @query, @options, @store = @model.schema.ids(hashify(q)), o, s
 
       # Set up cache
@@ -45,7 +45,7 @@ module Mongocore
 
     # Cursor
     def cursor
-      @collection.find(@query, @options).projection(@store[:fields]).skip(@store[:skip]).sort(@store[:sort]).limit(@store[:limit])
+      @collection.find(@query, @options).projection(@store[:fields]).skip(@store[:skip]).sort(@store[:sort] || Mongocore.sort).limit(@store[:limit])
     end
 
     # Insert
@@ -86,7 +86,7 @@ module Mongocore
 
     # Return last document
     def last(*args)
-      sort(:_id => -1).limit(1).first(*args)
+      sort((a = Mongocore.sort.dup).each{|k, v| a[k] = v * -1}).limit(1).first(*args)
     end
 
     # Return all documents
@@ -135,7 +135,7 @@ module Mongocore
 
     # Sort
     def sort(o = {})
-      find(@query, @options, @store.tap{store[:sort].merge!(o)})
+      find(@query, @options, @store.tap{(store[:sort] ||= {}).merge!(o)})
     end
 
     # Limit

data/lib/mongocore/schema.rb

@@ -104,7 +104,7 @@ module Mongocore
         end
 
         def #{$1}=(m)
-          @#{key} = m._id
+          @#{key} = m ? m._id : nil
           @#{$1} = m
         end
       }

data/lib/mongocore.rb

@@ -7,7 +7,7 @@ require 'mongo'
 require 'request_store'
 
 module Mongocore
-  VERSION = '0.3.0'
+  VERSION = '0.3.1'
 
   # # # # # #
   # Mongocore Ruby Database Driver.
@@ -16,7 +16,7 @@ module Mongocore
   # @license:  MIT, contributions are welcome.
   # # # # # #
 
-  class << self; attr_accessor :db, :schema, :cache, :access, :timestamps, :per_page, :debug; end
+  class << self; attr_accessor :db, :schema, :cache, :access, :timestamps, :sort, :per_page, :debug; end
 
   # Schema path is $app_root/config/db/schema/:model_name.yml
   @schema = File.join(Dir.pwd, 'config', 'db', 'schema')
@@ -30,6 +30,9 @@ module Mongocore
   # Enable timestamps, auto-save created_at and updated_at fields
   @timestamps = true
 
+  # Default sorting, last will be opposite. Should be indexed.
+  @sort = {:_id => 1}
+
   # Pagination results per page
   @per_page = 20
 

data/mongocore.gemspec

@@ -1,10 +1,10 @@
 Gem::Specification.new do |s|
   s.name        = 'mongocore'
-  s.version     = '0.3.0'
-  s.date        = '2017-10-30'
+  s.version     = '0.3.1'
+  s.date        = '2017-11-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"]
+  s.authors     = ['Fugroup Limited']
   s.email       = 'mail@fugroup.net'
 
   s.add_runtime_dependency 'mongo', '~> 2.2'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mongocore
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
 platform: ruby
 authors:
 - Fugroup Limited
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-10-30 00:00:00.000000000 Z
+date: 2017-11-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mongo