mongocore 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0a86b7528d0b827a5b34c351f9307408f4ef5f3f
-  data.tar.gz: d011a3b1ac8f3b2ff62bfe3ce256712c6b931dca
+  metadata.gz: e2b421c9156412c98e0da302d515db0283ba45ba
+  data.tar.gz: a14a5b1d90a91328eab16f8d2e6f083725ab8658
 SHA512:
-  metadata.gz: 9fd4a39adb5aecb254e867455502ccf2debdace855f2a5dec3640643c70d5ea7122b1a367d291478a6c854b7d76c2673c6608df198cd9f1d02b7da165acf6e51
-  data.tar.gz: f4e627193ae0cf71b37b975a1cd95c33c3270fd1b83ab3e72ccb11f63cfca874802f256112889f679a553c9c59076834f7fb5964a316a13a660321af5e5270d8
+  metadata.gz: c95e808a73109dbb45e4fb1538028c6cc453501a1fa90dcbae5ff3d0e2cc6ceb66fd9d0187a238dde05ca82df04e91ee50e438a3de73cc68198aba7eeff360b7
+  data.tar.gz: e904842600c7643bf831745ff487639e0b64b6221092eb650f9b7c8f657d90cbc526bbc5211ba3a75036cde2ae777d9ecf85225af4e53a6ec26940f31948e519

data/README.md

@@ -21,7 +21,7 @@ Please read [the source code](https://github.com/fugroup/mongocore/tree/master/l
 | -------------------------------------- | ----- | ------- | ------------- |
 | [Mongoid](http://mongoid.com)          | 256   | 14371   | 10590         |
 | [MongoMapper](http://mongomapper.com)  | 91    | 200     | 4070          |
-| [Mongocore](http://mongocore.com)      | 8     | 230     | 360           |
+| [Mongocore](http://mongocore.com)      | 8     | 256     | 454           |
 
 <br>
 

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 = normalize(q), o, s
+      @query, @options, @store = ids(transform(hashify(q))), o, s
 
       # Set up cache
       @cache = Mongocore::Cache.new(self)
@@ -34,22 +34,35 @@ module Mongocore
 
     # Find. Returns a Mongocore::Query
     def find(q = {}, o = {}, s = {})
-      self.class.new(@model, @query.merge(q.is_a?(Hash) ? q : {:_id => q}), @options.merge(o), @store.merge(s))
+      self.class.new(@model, @query.merge(hashify(q)), @options.merge(o), @store.merge(s))
     end
     alias_method :where, :find
 
-    # Normalize query
-    def normalize(q)
-      # Support find passing an ID
-      q = {:_id => oid(q)} unless q.is_a?(Hash)
-
-      # Support passing :id as :_id
-      q[:_id] = q.delete(:id) if q[:id]
+    # Convert string query to hash
+    def hashify(q)
+      q.is_a?(Hash) ? q : {:_id => q}
+    end
 
-      # Convert object ID's to BSON::ObjectIds
-      q.each{|k, v| q[k] = @model.schema.convert(k, v) if k =~ /_id$/}
+    # 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)) : oid(r)}
+        else
+          # Convert to object ID if applicable
+          h[k] = oid(v) if v.is_a?(String)
+        end
+      end
+    end
 
-      q
+    # Transform :id to :_id
+    def transform(h)
+      h.transform_keys!{|k| k == :id ? :_id : k}
     end
 
     # Cursor
@@ -172,11 +185,14 @@ module Mongocore
       @key ||= "#{@model}#{@query.sort}#{@options.sort}#{@store.values}"
     end
 
-    # String id to BSON::ObjectId, or create a new by passing nothing or nil
-    def oid(id = nil)
-      return id if id.is_a?(BSON::ObjectId)
-      return BSON::ObjectId.new if !id
-      BSON::ObjectId.from_string(id) rescue id
+    # Schema short cut for oid
+    def oid(k)
+      @model.schema.oid(k)
+    end
+
+    # Schema short cut for oid?
+    def oid?(k)
+      @model.schema.oid?(k)
     end
 
     # Call and return the scope if it exists

data/lib/mongocore/schema.rb

@@ -46,22 +46,39 @@ module Mongocore
     # Convert type if val and schema type is set
     def convert(key, val)
       return nil if val.nil?
-      type = @keys[key][:type].to_sym rescue :string
-
-      # Convert to the same type as in the schema
-      if type == :string then val.to_s
-      elsif type == :integer then val.to_i
-      elsif type == :float then val.to_f
-      elsif type == :boolean then val.to_s.to_bool
-      elsif type == :object_id
-        # Convert string id to BSON::ObjectId
-        val.each{|k, v| val[k] = BSON::ObjectId.from_string(v) if v.is_a?(String)} if val.is_a?(Hash)
-        BSON::ObjectId.from_string(val) rescue val
+      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
       end
     end
 
+    # Find type as defined in schema
+    def find_type(key)
+      @keys[key][:type].to_sym rescue :string
+    end
+
+    # This key is a BSON::Object ID?
+    def oid?(key)
+      find_type(key) === :object_id
+    end
+
+    # Convert to BSON::ObjectId
+    def oid(id = nil)
+      return id if id.is_a?(BSON::ObjectId)
+      return BSON::ObjectId.new if !id
+      BSON::ObjectId.from_string(id) rescue id
+    end
+
     # # # # # # # # #
     # Templates for foreign key, many-associations and scopes.
     #

data/lib/mongocore.rb

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

data/mongocore.gemspec

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