mm_to_view_model 0.1.1 → 0.1.2

data/Gemfile.lock

@@ -1,3 +1,9 @@
+PATH
+  remote: .
+  specs:
+    mm_to_view_model (0.1.1)
+      mongo_mapper (~> 0.9.2)
+
 GEM
   remote: http://rubygems.org/
   specs:
@@ -19,7 +25,9 @@ GEM
       rspec-instafail (~> 0.1.8)
       ruby-progressbar (~> 0.0.10)
     i18n (0.6.0)
-    mocha (0.9.12)
+    metaclass (0.0.1)
+    mocha (0.10.0)
+      metaclass (~> 0.0.1)
     mongo (1.4.0)
       bson (= 1.4.0)
     mongo_mapper (0.9.2)
@@ -46,8 +54,9 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
-  fuubar
-  mocha
-  mongo_mapper
-  rspec
-  watchr
+  bundler (~> 1.0.0)
+  fuubar (~> 0.0.6)
+  mm_to_view_model!
+  mocha (~> 0.10.0)
+  rspec (~> 2.6.0)
+  watchr (~> 0.7.0)

data/VERSION

@@ -1 +1 @@
-0.1.1
+0.1.2

data/lib/mm_to_view_model.rb

@@ -1,6 +1,5 @@
 require 'bundler/setup'
-Bundler.require(:default)
-# require 'active_support/core_ext/string'
+require 'mongo_mapper'
 
 module MongoMapper
   module Plugins
@@ -13,8 +12,23 @@ module MongoMapper
             memo[k.to_s] = if v.type == ObjectId
               nil
             else
-              v.type.new rescue nil
+              begin
+                unless v.default_value.nil?
+                  v.default_value
+                else
+                  v.type.new
+                end
+              rescue
+                nil
+              end
             end
+            
+            begin
+              memo[k.to_s] = memo[k.to_s].class.from_mongo(memo[k.to_s])
+            rescue
+              # keep the unconverted version
+            end
+            
             memo
           end
           
@@ -31,6 +45,13 @@ module MongoMapper
         def to_view_model
           fields = keys.inject({}) do |memo, (k, v)|
             memo[k.to_s] = send(k)
+            
+            begin
+              memo[k.to_s] = memo[k.to_s].class.from_mongo(memo[k.to_s])
+            rescue
+              # keep the unconverted version
+            end
+            
             memo
           end
           

data/spec/mm_to_view_model_spec.rb

@@ -6,6 +6,7 @@ class User
   
   key :name, String
   key :hobbies, Array
+  key :unemployed, Boolean, :default => false
   
   many :posts
 end
@@ -30,6 +31,7 @@ describe User do
         "_id" => nil, 
         "name" => "",
         "hobbies" => [],
+        "unemployed" => false,
         "posts" => [
           { "_id" => nil, "title" => "", "body" => "" }
         ]
@@ -51,7 +53,8 @@ describe User do
     subject do
       User.new(
         "name" => "SomeBrodi12",
-        "posts" => [first_post, second_post]
+        "posts" => [first_post, second_post],
+        "unemployed" => false
       )
     end
     
@@ -60,6 +63,7 @@ describe User do
         "_id" => subject.id, 
         "name" => "SomeBrodi12",
         "hobbies" => [],
+        "unemployed" => false,
         "posts" => [
           { "_id" => first_post.id, "title" => "Some new cool thing", "body" => "This new cool thing rocks!", "user_id" => subject.id },
           { "_id" => second_post.id, "title" => "News about Paris", "body" => "They remade the eiffel tower out of cheese!", "user_id" => subject.id },

data/spec/spec_helper.rb

@@ -7,7 +7,6 @@ MongoMapper.connection = Mongo::Connection.new('127.0.0.1', 27017)
 RSpec.configure do |config|
   config.before(:each) do
     MongoMapper.database.collections.each { |collection| collection.remove }.collect(&:name)
-    system("clear")
   end
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mm_to_view_model
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2011-10-05 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mongo_mapper
-  requirement: &70359705826240 !ruby/object:Gem::Requirement
+  requirement: &70149344652140 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,21 @@ dependencies:
         version: 0.9.2
   type: :runtime
   prerelease: false
-  version_requirements: *70359705826240
+  version_requirements: *70149344652140
+- !ruby/object:Gem::Dependency
+  name: bundler
+  requirement: &70149344651640 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.0.0
+  type: :development
+  prerelease: false
+  version_requirements: *70149344651640
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70359705825760 !ruby/object:Gem::Requirement
+  requirement: &70149344651180 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +43,10 @@ dependencies:
         version: 2.6.0
   type: :development
   prerelease: false
-  version_requirements: *70359705825760
+  version_requirements: *70149344651180
 - !ruby/object:Gem::Dependency
   name: mocha
-  requirement: &70359705825280 !ruby/object:Gem::Requirement
+  requirement: &70149344650700 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +54,10 @@ dependencies:
         version: 0.10.0
   type: :development
   prerelease: false
-  version_requirements: *70359705825280
+  version_requirements: *70149344650700
 - !ruby/object:Gem::Dependency
   name: fuubar
-  requirement: &70359705824740 !ruby/object:Gem::Requirement
+  requirement: &70149344650240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +65,10 @@ dependencies:
         version: 0.0.6
   type: :development
   prerelease: false
-  version_requirements: *70359705824740
+  version_requirements: *70149344650240
 - !ruby/object:Gem::Dependency
   name: watchr
-  requirement: &70359705824260 !ruby/object:Gem::Requirement
+  requirement: &70149344649740 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,7 +76,7 @@ dependencies:
         version: 0.7.0
   type: :development
   prerelease: false
-  version_requirements: *70359705824260
+  version_requirements: *70149344649740
 description: ! '`mm_to_view_model` is a `MongoMapper` plugin that adds a `to_view_model`
   class and instance method.'
 email: c00lryguy@gmail.com