mongocore 0.4.5 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2b7497f2ffc863157d942ced1f326b41a595ab1f
-  data.tar.gz: f65ce1925bc082ffa01b603f8975752c40960b8e
+  metadata.gz: 74fdbe4ae3a48d20051b091780897353f615973e
+  data.tar.gz: b608caf9da396253e7024d84dfdff74547f01058
 SHA512:
-  metadata.gz: d8728af7535106eb8865794093c8cca1b44d20276864267760622b03a183a818b80d63fdd92fa37b53d344b2ff21fd4e1d62aeeebe87a7d6bcfaa043622bd80c
-  data.tar.gz: 49ba47e50f24a96ef3d3e4441145661e93c5651787fd02d9b4a4a4714a070ad2e5945815d36d9ee802a06a7a9868c6a613a5f45b0d2c025fa9e954a3075df5d8
+  metadata.gz: d42222537d1c66933894c3c527742e690db6dc6acfe82e72e2394ce9192624c66d1f0c39ba2503f573fcab92e32dcd78790a88f3bd26f179aa94820ec5e18f52
+  data.tar.gz: '0287ca2b41a01ca0b2ff079d5e457212690b3c5cb011ce3f4d4078a833b402b1bbebc5350e4da506d9f606c1025ec30cee610c3f5e0b1a2708f4d7aaab334157'

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+**Version 0.5.0** - *2018-01-24*
+
+- Speed optimizations
+- Support for binary type
+
+
 **Version 0.4.5** - *2018-01-23*
 
 - Fixed memory bug with Mongocore.sort option

data/README.md

@@ -263,7 +263,7 @@ keys:
   # is an alias to _id, but always returns a string instead of a BSON::ObjectId
   # Any object ids as strings will be automatically converted into ObjectIds
   # @desc: Describes the key, can be used for documentation.
-  # @type: object_id, string, integer, float, boolean, time, hash, array
+  # @type: object_id, string, integer, float, boolean, time, binary, hash, array
   # @default: the default value for the key when you call .new
   # @read: access level for read: all, user, owner, dev, admin, super, app
   # @write: access level for write. Returns nil if no access, as on read

data/config/db/schema/model.yml

@@ -56,6 +56,11 @@ keys:
     default: false
     read: user
     write: dev
+  zip_file:
+    desc: Zip file
+    type: binary
+    read: user
+    write: user
   votes_count:
     desc: Votes count
     type: integer

data/lib/mongocore.rb

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

data/lib/mongocore/document.rb

@@ -50,12 +50,12 @@ module Mongocore
       #
       def initialize(a = {})
 
+        # Storing original state for dirty tracking
+        @original = {}
+
         # Store attributes.
         self.attributes = @_id ? a : self.class.schema.defaults.merge(a)
 
-        # Storing original state for dirty tracking.
-        @original = self.attributes
-
         # The _id is a BSON object, create new unless it exists
         @_id ? @persisted = true : @_id = BSON::ObjectId.new
 
@@ -95,12 +95,12 @@ module Mongocore
 
       # Reload the document from db and update attributes
       def reload
-        one.first.tap{|m| self.attributes = m.attributes; reset!}
+        m = one.first; self.attributes = m.attributes; reset!; self
       end
 
       # Set the timestamps if enabled
       def timestamps
-        t = Time.now.utc; @updated_at = t; @created_at = t if unsaved?
+        t = Time.now.utc; write(:updated_at, t); write(:created_at, t) if unsaved?
       end
 
       # Reset internals
@@ -142,7 +142,7 @@ module Mongocore
         @errors.clear; self.class.filters.valid?(self)
       end
 
-      # Available filters are :save, :update, :delete
+      # Available filters are :save, :delete
       def run(filter, key = nil)
         self.class.filters.run(self, filter, key)
       end
@@ -177,12 +177,7 @@ module Mongocore
 
       # Get attribute if access
       def read(key)
-        self.class.access.read?((key = key.to_sym)) ? read!(key) : nil
-      end
-
-      # Get attribute
-      def read!(key)
-        instance_variable_get("@#{key}")
+        read!(key) if self.class.access.read?((key = key.to_sym))
       end
 
       # Set attribute if access
@@ -190,20 +185,20 @@ module Mongocore
         return nil unless self.class.access.write?((key = key.to_sym))
 
         # Convert to type as in schema yml
-        v = self.class.schema.convert(key, val)
-
-        # Record change for dirty attributes
-        read!(key).tap{|r| @changes[key] = [@original[key], v] if v != r} if @changes
+        v = self.class.schema.set(key, val)
+
+        if @changes
+          # Record change for dirty attributes
+          @changes[key] = [@original[key], v] if v != read!(key)
+        else
+          # Store original values for dirty tracking support
+          @original[key] = v
+        end
 
         # Write attribute
         write!(key, v)
       end
 
-      # Set attribute
-      def write!(key, v)
-        instance_variable_set("@#{key}", v)
-      end
-
       # Dynamically read or write attributes
       def method_missing(name, *args, &block)
         # Extract name and write mode
@@ -255,6 +250,16 @@ module Mongocore
         a.delete(:_id); {:id => id}.merge(a)
       end
 
+      # Set attribute
+      def write!(key, v)
+        instance_variable_set("@#{key}", v)
+      end
+
+      # Get attribute
+      def read!(key)
+        instance_variable_get("@#{key}")
+      end
+
     end
 
 
@@ -318,7 +323,7 @@ module Mongocore
 
       # Insert
       def insert(a = {}, o = {})
-        new(a).tap{|r| r.save(o)}
+        r = new(a); r.save(o); r
       end
       alias_method :create, :insert
 
@@ -347,7 +352,7 @@ module Mongocore
       # After, before and validation filters
       # Pass a method name as symbol or a block
       #
-      # Possible events for after and before are :save, :update, :delete
+      # Possible events for after and before are :save, :delete
       #
 
       # After

data/lib/mongocore/query.rb

@@ -170,22 +170,26 @@ module Mongocore
 
     # Sort
     def sort(o = {})
-      find(@query, @options.tap{(@options[:sort] ||= {}).merge!(o)})
+      (@options[:sort] ||= {}).merge!(o)
+      find(@query, @options)
     end
 
     # Limit
     def limit(n = 1)
-      find(@query, @options.tap{@options[:limit] = n})
+      @options[:limit] = n
+      find(@query, @options)
     end
 
     # Skip
     def skip(n = 0)
-      find(@query, @options.tap{@options[:skip] = n})
+      @options[:skip] = n
+      find(@query, @options)
     end
 
     # Projection
     def projection(o = {})
-      find(@query, @options.tap{@options[:projection].merge!(o)})
+      @options[:projection].merge!(o)
+      find(@query, @options)
     end
     alias_method :fields, :projection
 
@@ -201,7 +205,10 @@ module Mongocore
 
     # Call and return the scope if it exists
     def method_missing(name, *arguments, &block)
-      return @model.send(name, @query, @options.tap{|r| r[:chain] << name}) if @model.schema.scopes.has_key?(name)
+      if @model.schema.scopes.has_key?(name)
+        @options[:chain] << name
+        return @model.send(name, @query, @options)
+      end
       super
     end
 

data/lib/mongocore/schema.rb

@@ -46,15 +46,20 @@ module Mongocore
     # Get time
     def time(val)
       case val
-      when Date then val.to_time.utc
-      when String then Time.parse(val).utc
       when Time then val.utc
+      when String then Time.parse(val).utc
+      when Date, DateTime then val.to_time.utc
       else nil
       end
     end
 
-    # Convert type if val and schema type is set
-    def convert(key, val)
+    # Convert to binary
+    def bin(val)
+      val.is_a?(BSON::Binary) ? val : BSON::Binary.new(val)
+    end
+
+    # Set value based on type
+    def set(key, val)
       return nil if val.nil?
       case type(key)
       when :string       then val.to_s
@@ -64,6 +69,7 @@ module Mongocore
       when :boolean      then val.to_s.to_bool
       when :object_id    then oid(val)
       when :array, :hash then ids(val)
+      when :binary       then bin(val)
       else val
       end
     end
@@ -103,7 +109,7 @@ module Mongocore
     end
 
     # # # # # # # # #
-    # Templates for foreign key, many-associations and scopes.
+    # Templates for foreign key, many-associations and scopes
     #
 
     # Foreign keys

data/mongocore.gemspec

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