mongomatic 0.5.3 → 0.5.4

data/lib/mongomatic/base.rb

@@ -81,13 +81,22 @@ module Mongomatic
 
     attr_accessor :removed, :is_new, :errors
 
-    def initialize(doc={}, is_new=true)
-      @doc = doc.stringify_keys
+    def initialize(doc_hash=Mongomatic::MHash.new, is_new=true)
+      self.doc = doc_hash
       self.removed = false
       self.is_new  = is_new
       self.errors  = Mongomatic::Errors.new
     end
     
+    def doc=(hash)
+      hash = Mongomatic::MHash.new(hash) unless hash.is_a?(Mongomatic::MHash)
+      @doc = hash
+    end
+    
+    def doc
+      @doc
+    end
+    
     # Override this with your own validate() method for validations.
     # Simply push your errors into the self.errors property and
     # if self.errors remains empty your document will be valid.
@@ -121,6 +130,17 @@ module Mongomatic
       @doc[k.to_s] = v
     end
     
+    # Returns true if document contains key
+    def has_key?(key)
+      field, hash = hash_for_field(key.to_s, true)
+      hash.has_key?(field)
+    end
+    
+    def value_for_key(key)
+      field, hash = hash_for_field(key.to_s, true)
+      hash[field]
+    end
+    
     # Fetch a field (just like a hash):
     #  mydoc["name"]
     #   => "Ben"
@@ -147,7 +167,7 @@ module Mongomatic
     # Reload the document from the database
     def reload
       if obj = self.class.find({"_id" => @doc["_id"]}).next_document
-        @doc = obj.doc; true
+        self.doc = obj.doc; true
       end
     end
 
@@ -219,6 +239,19 @@ module Mongomatic
     
     protected
     
+    def hash_for_field(field, break_if_dne=false)
+      parts = field.split(".")
+      curr_hash = self.doc
+      return [parts[0], curr_hash] if parts.size == 1
+      field = parts.pop # last one is the field
+      parts.each_with_index do |part, i|
+        return [part, curr_hash] if break_if_dne && !curr_hash.has_key?(part)
+        curr_hash[part] ||= {}
+        return [field, curr_hash[part]] if parts.size == i+1
+        curr_hash = curr_hash[part]
+      end
+    end
+    
     def do_callback(meth)
       begin
         send(meth)
@@ -226,13 +259,5 @@ module Mongomatic
         false
       end
     end
-    
-    def doc
-      @doc
-    end
-    
-    def doc=(v)
-      @doc = v
-    end
   end
 end

data/lib/mongomatic/m_hash.rb

@@ -0,0 +1,4 @@
+module Mongomatic
+  class MHash < HashWithIndifferentAccess
+  end
+end

data/lib/mongomatic/modifiers.rb

@@ -4,19 +4,6 @@ module Mongomatic
 
     class UnexpectedFieldType < RuntimeError; end
     
-    def hash_for_field(field)
-      parts = field.split(".")
-      return [parts[0], self.doc] if parts.size == 1
-      field = parts.pop # last one is the field
-      curr_hash = self.doc
-      parts.each_with_index do |part, i|
-        curr_hash[part] ||= {}
-        return [field, curr_hash[part]] if parts.size == i+1
-        curr_hash = curr_hash[part]
-      end
-    end
-    private :hash_for_field
-    
     # MongoDB equivalent: { $push : { field : value } }<br/>
     # Appends value to field, if field is an existing array, otherwise sets field to the array [value] 
     # if field is not present. If field is present but is not an array, error is returned.

data/lib/mongomatic.rb

@@ -29,6 +29,7 @@ module Mongomatic
   end
 end
 
+require "#{File.dirname(__FILE__)}/mongomatic/m_hash"
 require "#{File.dirname(__FILE__)}/mongomatic/cursor"
 require "#{File.dirname(__FILE__)}/mongomatic/modifiers"
 require "#{File.dirname(__FILE__)}/mongomatic/errors"

data/test/test_mongomatic.rb

@@ -1,6 +1,23 @@
 require 'helper'
 
 class TestMongomatic < Test::Unit::TestCase
+  should "treat all keys as strings" do
+    Person.collection.drop
+    p1 = Person.new(:name => "Jordan")
+    p1[:address] = { :city => "San Francisco" }
+    assert_equal "Jordan", p1["name"]
+    assert_equal "Jordan", p1[:name]
+    assert_equal "San Francisco", p1["address"]["city"]
+    assert_equal "San Francisco", p1[:address][:city]
+    p1.insert
+    
+    p1 = Person.find_one(:name => "Jordan")
+    assert_equal "Jordan", p1["name"]
+    assert_equal "Jordan", p1[:name]
+    assert_equal "San Francisco", p1["address"]["city"]
+    assert_equal "San Francisco", p1[:address][:city]
+  end
+  
   should "find one with a query" do
     Person.collection.drop
     p1 = Person.new(:name => "Jordan")
@@ -549,4 +566,40 @@ class TestMongomatic < Test::Unit::TestCase
     p.valid?
     assert_equal 'Hair color must exist', p.errors.on(:hair_color)
   end
+  
+  should "be able to use has_key?" do
+    p = Person.new
+    
+    assert !p.has_key?(:name)
+    
+    p['name'] = 'Jordan'
+    
+    assert p.has_key?(:name)
+    assert p.has_key?('name')
+  end
+  
+  should "be able to reach into keys with has_key?" do
+    p = Person.new(:employer => {:name => 'Meta+Level Games', 
+                                 :function => 'Makes things with code', 
+                                 :something_else => {
+                                   :with_a_key => 'And Value'}
+                                 })
+                                 
+    assert !p.has_key?('employer.started_at')
+    assert p.has_key?('employer.name')
+    assert !p.has_key?('non.existent')
+    assert !p.has_key?('employer.something_else.not_here')
+    assert p.has_key?('employer.something_else.with_a_key')
+  end
+  
+  should "be able to get the value for a key in an embedded doc" do
+    p = Person.new(:employer => {:name => 'Meta+Level Games', 
+                                 :function => 'Makes things with code', 
+                                 :something_else => {
+                                   :with_a_key => 'And Value'}
+                                 })
+    assert_equal "And Value", p.value_for_key("employer.something_else.with_a_key")
+    assert_equal "Meta+Level Games", p.value_for_key("employer.name")
+    assert_nil p.value_for_key("some_key.that_does_not.exist")
+  end
 end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 5
-  - 3
-  version: 0.5.3
+  - 4
+  version: 0.5.4
 platform: ruby
 authors: 
 - Ben Myles
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-09-08 00:00:00 -07:00
+date: 2010-09-10 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -97,6 +97,7 @@ files:
 - lib/mongomatic/expectations/match.rb
 - lib/mongomatic/expectations/of_length.rb
 - lib/mongomatic/expectations/present.rb
+- lib/mongomatic/m_hash.rb
 - lib/mongomatic/modifiers.rb
 - LICENSE
 - README.rdoc