mongorilla 0.6.1 → 0.7.0

data/ChangeLog

@@ -0,0 +1,8 @@
+0.7.0
+*	add [] method
+*	add []= method
+* add attributes method
+* modify inspect
+* add to_json if json include
+* add to_yaml if yaml include
+* if field type is Time,return localtime

data/README.rdoc

@@ -20,6 +20,8 @@ mongorilla accept single server or Master/Slave or Replica Set
   u.push("logs","bb")    #$push whithout update db yet 
   u.push("logs","cc")    #$push whithout update db yet 
   p u.logs               # ["ooooo","bb","cc"]
+  p u.password           # "hello"
+  p u["password"]        # "hello"
   u.inc("log_count",2)   #$inc +2 whithout update db yet 
   p u.log_count          # 3
   ret = u.save({:log_count => {"$lt" => 1}},Mongorilla::Document::SYNC) #update failed because log_count was 1.

data/lib/mongorilla/document.rb

@@ -28,6 +28,48 @@ module Mongorilla
       end
     end
 
+    def self.recursive_convert(m,trancefar)
+      case m
+      when Array
+        m.map{|a| recursive_convert(a,trancefar)}
+      when Hash
+        {}.tap{|h| m.each{|k,v| h[k.to_s] = recursive_convert(v,trancefar)}}
+      else
+        trancefar.call(m)
+      end
+    end
+
+    def self.convert
+      lambda{|m|
+        case m
+        when Time
+          m.localtime
+        when String
+          m.dup
+        when Symbol
+          m.to_s
+        else
+          m
+        end
+      }
+    end
+
+    def self.convert_string
+      lambda{|m|
+        case m
+        when String
+          m.dup
+        when Symbol
+          m.to_s
+        when BSON::ObjectId
+          m.to_s
+        else
+          m
+        end
+      }
+    end
+
+
     def self.included(c)
       fields = c.const_get("#{c}Fields")
       fields.each do |f|
@@ -40,10 +82,35 @@ module Mongorilla
 
       def initialize(doc)
         @orig = doc
-        @doc = Marshal.load(Marshal.dump(@orig))
+        @doc = Document.recursive_convert(@orig,Document.convert)
         @changes={}
       end
 
+      def [](f)
+        send(f.to_sym)
+      end
+
+      def attributes
+        fields = self.class.const_get("#{self.class}Fields")
+        {}.tap{|h| fields.each{|f| h[f.to_s] = @doc[f.to_s]}}
+      end
+
+      def to_json
+        Document.recursive_convert(attributes,Document.convert_string).to_json
+      end
+
+      def to_yaml
+        Document.recursive_convert(attributes,Document.convert_string).to_yaml
+      end
+
+      def inspect
+        Document.recursive_convert(attributes,Document.convert_string).inspect
+      end
+
+      def to_s
+        inspect
+      end
+
       def origin
         @orig
       end
@@ -54,11 +121,13 @@ module Mongorilla
 
       def set(f,v)
         send(f)
-        @doc[f] = v
+        @doc[f.to_s] = v
         @changes["$set"] ||= {}
-        @changes["$set"][f] = v
+        @changes["$set"][f.to_s] = v
       end
 
+      alias []= set
+
       def inc(f,v)
         @doc[f] = 0 unless send(f)
         @doc[f] += v

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mongorilla
 version: !ruby/object:Gem::Version
-  version: 0.6.1
+  version: 0.7.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-12-09 00:00:00.000000000 Z
+date: 2011-12-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mongo
-  requirement: &15662160 !ruby/object:Gem::Requirement
+  requirement: &11767280 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *15662160
+  version_requirements: *11767280
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &15660540 !ruby/object:Gem::Requirement
+  requirement: &9559420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: 2.3.0
   type: :development
   prerelease: false
-  version_requirements: *15660540
+  version_requirements: *9559420
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &15658880 !ruby/object:Gem::Requirement
+  requirement: &11853580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *15658880
+  version_requirements: *11853580
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &15657280 !ruby/object:Gem::Requirement
+  requirement: &11850160 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +54,10 @@ dependencies:
         version: 1.6.4
   type: :development
   prerelease: false
-  version_requirements: *15657280
+  version_requirements: *11850160
 - !ruby/object:Gem::Dependency
   name: rcov
-  requirement: &15655960 !ruby/object:Gem::Requirement
+  requirement: &11847840 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,18 +65,20 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *15655960
+  version_requirements: *11847840
 description: Small Object Document Mapper for Mongo. you can update atomic  with condition
 email: laten@nifty.com
 executables: []
 extensions: []
 extra_rdoc_files:
+- ChangeLog
 - LICENSE.txt
 - README.rdoc
 files:
 - lib/mongorilla.rb
 - lib/mongorilla/collection.rb
 - lib/mongorilla/document.rb
+- ChangeLog
 - LICENSE.txt
 - README.rdoc
 homepage: http://github.com/takeshy/mongorilla
@@ -94,7 +96,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2358068409636906117
+      hash: 986614645559502525
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: