mongocore 0.2.2 → 0.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 28fcb4fb984516032b665605855fa978c7d8cda2
-  data.tar.gz: ecdb708c8470c2aec2cd624bdc35457e1fedb547
+  metadata.gz: bc69ea47a26f1a85fd3519180999a21710800a44
+  data.tar.gz: 523eaba0048b6d6f887bf4b1647f2f6f1ba8ecb1
 SHA512:
-  metadata.gz: 9bd1c5dc2e11c6d3422a1fef2ac7e6c7e7b2f169cc5016da379f6d5dbb42e60b86fb06a40a2f488bd7724dea34e19d79597be5dd1eb45fc9efe13f52e117a077
-  data.tar.gz: ad17bff6efbe5f07828d5f0f452a53bc21af5108e878ae48fa54c34f86e59f18f80e7e34b5a5ce0a7e14f5ee2d4a9beee80636c016ca7723b4c87ad9da15d6d9
+  metadata.gz: 1129eb75394fa108c0c701bf2c8722c8cca9b886c4e3ff2d8eb1c9d496e98b46bb69af066489ae0f4158eb67394f2e1ea193a222544bed0f7f16831224db803d
+  data.tar.gz: 05f1db2a8a7077981fb1690906e8c0e328fc531ff740a2ad226b6fb3d819347e9fb4b1426edaa91da8d945656d39f1bab347d77fc447159df857962162b8259f

data/README.md

@@ -239,6 +239,7 @@ keys:
 
   # Define the _id field for all your models. The id field (without _)
   # 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
   # @default: the default value for the key when you call .new

data/config/db/schema/model.yml

@@ -39,6 +39,13 @@ keys:
   location_data:
     desc: Model location data
     type: hash
+    default: {}
+    read: all
+    write: user
+  lists:
+    desc: Model list
+    type: array
+    default: []
     read: all
     write: user
   reminders_sent:

data/lib/mongocore/document.rb

@@ -221,11 +221,6 @@ module Mongocore
         @_id ? @_id.to_s : nil
       end
 
-      # Replace _id with id, takes a hash
-      def string_id(a)
-        a.each{|k, v| a[k] = v.to_s if v.is_a?(BSON::ObjectId)}; a.delete(:_id); {:id => id}.merge(a)
-      end
-
       # Print info about the instance
       def inspect
         "#<#{self.class} #{attributes.sort.map{|r| %{#{r[0]}: #{r[1].inspect}}}.join(', ')}>"
@@ -242,6 +237,11 @@ module Mongocore
         filter(type){one.send((@saved ? :update : :insert), attributes).ok?}
       end
 
+      # Replace _id with id, takes a hash
+      def string_id(a)
+        a.delete(:_id); {:id => id}.merge(a)
+      end
+
     end
 
 

data/lib/mongocore/query.rb

@@ -26,7 +26,7 @@ module Mongocore
 
       # 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
-      @query, @options, @store = ids(transform(hashify(q))), o, s
+      @query, @options, @store = @model.schema.ids(hashify(q)), o, s
 
       # Set up cache
       @cache = Mongocore::Cache.new(self)
@@ -43,28 +43,6 @@ module Mongocore
       q.is_a?(Hash) ? q : {:_id => q}
     end
 
-    # Setup query, replace :id with :_id, set up ObjectIds
-    def ids(h)
-      h.each do |k, v|
-        case v
-        when Hash
-          # Call hashes recursively
-          ids(transform(v))
-        when Array
-          # Return mapped array or recurse hashes
-          h[k] = v.map{|r| r.is_a?(Hash) ? ids(transform(r)) : @model.schema.oid(r)}
-        else
-          # Convert to object ID if applicable
-          h[k] = @model.schema.oid(v) if v.is_a?(String)
-        end
-      end
-    end
-
-    # Transform :id to :_id
-    def transform(h)
-      h.transform_keys!{|k| k == :id ? :_id : k}
-    end
-
     # Cursor
     def cursor
       @collection.find(@query, @options).projection(@store[:fields]).skip(@store[:skip]).sort(@store[:sort]).limit(@store[:limit])

data/lib/mongocore/schema.rb

@@ -46,24 +46,41 @@ module Mongocore
     # Convert type if val and schema type is set
     def convert(key, val)
       return nil if val.nil?
-      case find_type(key)
-      when :string
-        val.to_s
-      when :integer
-        val.to_i
-      when :float
-        val.to_f
-      when :boolean
-        val.to_s.to_bool
-      when :object_id
-        oid(val)
-      else
-        val
+      case type(key)
+      when :string       then val.to_s
+      when :integer      then val.to_i
+      when :float        then val.to_f
+      when :boolean      then val.to_s.to_bool
+      when :object_id    then oid(val)
+      when :array, :hash then ids(val)
+      else val
       end
     end
 
+    # Setup query, replace :id with :_id, set up object ids
+    def ids(h)
+      transform(h).each do |k, v|
+        case v
+        when Hash
+          # Call hashes recursively
+          ids(v)
+        when Array
+          # Return mapped array or recurse hashes
+          v.map!{|r| r.is_a?(Hash) ? ids(r) : oid(r)}
+        else
+          # Convert to object ID if applicable
+          h[k] = oid(v) if v.is_a?(String)
+        end
+      end
+    end
+
+    # Transform :id to _id or id to object id
+    def transform(e)
+      e.is_a?(Hash) ? e.transform_keys!{|k| k == :id ? :_id : k} : e.map!{|r| oid(r)}
+    end
+
     # Find type as defined in schema
-    def find_type(key)
+    def type(key)
       @keys[key][:type].to_sym rescue :string
     end
 

data/lib/mongocore.rb

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

data/mongocore.gemspec

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