mongo_light 0.0.1 → 0.0.2

data/lib/mongo_light/document.rb

@@ -14,9 +14,15 @@ module MongoLight
         found = collection.find_one(real_id)
         found.nil? ? nil : self.new(unmap(found))
       end
-      def find_one(selector = {})
+      def find_one(selector = {}, opts={})
         found = collection.find_one(map(selector))
-        found.nil? ? nil : self.new(unmap(found))
+        if found.nil?
+          return nil
+        end
+        if opts.delete(:raw)
+          return unmap(found, true)
+        end
+        self.new(unmap(found))
       end
       def find(selector={}, opts={}, collection = nil)
         raw = opts.delete(:raw) || false
@@ -64,11 +70,11 @@ module MongoLight
       def collection
         self.class.collection
       end
-      def save
-        collection.save(self.class.map(@attributes))
+      def save(safe = false)
+        collection.save(self.class.map(@attributes), {:safe => safe})
       end
       def save!
-        collection.save(self.class.map(@attributes), {:safe => true})
+        save(true)
       end
     end
   end

data/lib/mongo_light/embedded_document.rb

@@ -1,3 +1,4 @@
+require 'active_support'
 module MongoLight
   module EmbeddedDocument
     extend ActiveSupport::Concern
@@ -10,24 +11,27 @@ module MongoLight
           define_method(k) { @attributes[k] }
           define_method("#{k}=") {|value| @attributes[k] = value }
           if v.is_a?(Hash)
-            @unmap[v[:field].to_s] = {:prop => k, :class => v[:class]}
+            @unmap[v[:field].to_s] = {:prop => k, :class => v[:class], :array => v[:array]}
           else
             @unmap[v.to_s] = k
           end
         end
       end
       def map(raw)
-        return {} if raw.blank? || !raw.is_a?(Hash)
+        return {} if raw.nil? || !raw.is_a?(Hash)
         hash = {}
         raw.each do |key, value|
+          sym = key.to_sym
           if value.is_a?(EmbeddedDocument)
             v = value.class.map(value.attributes)
           elsif value.is_a?(Hash)
             v = map(value)
+          elsif value.is_a?(Array) && @map[sym].is_a?(Hash) && @map[sym][:array]
+            v = value.map{|vv| vv.class.map(vv.attributes)}
           else
             v = value
           end
-          hash[map_key(key.to_sym)] = v
+          hash[map_key(sym)] = v
         end
         return hash
       end
@@ -37,13 +41,17 @@ module MongoLight
         options
       end
       def unmap(data, raw = false)
-        return {} if data.blank? || !data.is_a?(Hash)
+        return {} if data.nil? || !data.is_a?(Hash)
         hash = {}
         data.each do |key, value|
           if @unmap[key].is_a?(Hash)
             real_key = @unmap[key][:prop]
             c = @unmap[key][:class]
-            v = raw ? c.unmap(value) : c.new(c.unmap(value))
+            if @unmap[key][:array]
+              v = value.map{|vv| raw ? c.unmap(vv) : c.new(c.unmap(vv))}
+            else
+              v = raw ? c.unmap(value) : c.new(c.unmap(value))
+            end
           else
             real_key = key == '_id' ? :_id : @unmap[key]
             v = value

data/lib/mongo_light/id.rb

@@ -4,7 +4,7 @@ module MongoLight
       BSON::ObjectId.new
     end
     def self.valid?(id)
-      return false if id.blank? || id.class == Fixnum
+      return false if id.nil? || id.class == Fixnum
       return true if id.class == BSON::ObjectId
       BSON::ObjectId.legal?(id)
     end

data/lib/mongo_light/mongo_extensions.rb

@@ -0,0 +1,10 @@
+module Mongo
+  class OperationFailure
+    def duplicate?
+      !(message =~ /duplicate key/).nil?
+    end
+    def duplicate_on?(field)
+      message.include? field.is_a?(Symbol) ? field.to_s : field
+    end
+  end
+end

data/lib/mongo_light/version.rb

@@ -1,3 +1,3 @@
 module MongoLight
-  Version = '0.0.1'
+  Version = '0.0.2'
 end

data/lib/mongo_light.rb

@@ -1,4 +1,5 @@
 require 'mongo_light/id'
 require 'mongo_light/connection'
 require 'mongo_light/embedded_document'
-require 'mongo_light/document'
+require 'mongo_light/document'
+require 'mongo_light/mongo_extensions'

data/readme.markdown

@@ -54,11 +54,16 @@ Next, use the following fancy syntax for your root document:
 
 	class User
 		include MongoLight::Document
-		mongo_accessor({:name => :name, password => :pw, :email => :e, :comments => {:field => :c, :class => Comment}})
+		mongo_accessor({:name => :name, password => :pw, :email => :e, :comment => {:field => :c, :class => Comment}})
 	end
 
 Again, this'll make `comments` accessible on your objects, but store it within the `c` field.
 
+If you want an array of embedded documents, simply specify `:array => true`:
+
+	...
+	:comments => {:field => :c, :class => Comment, array => true}})
+
 Please note that aliasing completely fails when querying embedded documents - you need to use the shortened name:
 
 	User.find({:name => 'blah', 'c.t' => 'blah2}) #yes, it sucks

metadata

@@ -1,62 +1,54 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: mongo_light
-version: !ruby/object:Gem::Version 
+version: !ruby/object:Gem::Version
+  version: 0.0.2
   prerelease: 
-  version: 0.0.1
 platform: ruby
-authors: 
+authors:
 - Karl Seguin
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-06-27 00:00:00 Z
+date: 2011-08-13 00:00:00.000000000 Z
 dependencies: []
-
 description: 
-email: 
-- karlseguin@gmail.com
+email:
+- karl@openmymind.net
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - lib/mongo_light/connection.rb
 - lib/mongo_light/document.rb
 - lib/mongo_light/embedded_document.rb
 - lib/mongo_light/id.rb
+- lib/mongo_light/mongo_extensions.rb
 - lib/mongo_light/version.rb
 - lib/mongo_light.rb
 - license
 - readme.markdown
 homepage: http://github.com/karlseguib/MongoLight
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.8.5
+rubygems_version: 1.8.6
 signing_key: 
 specification_version: 3
 summary: A Lightweight ORM for Rails and MongoDB
 test_files: []
-