mongodb_model 2.0.1 → 2.0.2

data/lib/mongo/model/conversion.rb

@@ -20,10 +20,6 @@ module Mongo::Model::Conversion
   end
 
   def to_hash options = {}
-    # return super if args.empty?
-    #
-    # options = args.first
-
     if profile = options[:profile]
       raise "no other optins are allowed when using :profile option!" if options.size > 1
       profile_options = self.class.profiles[profile] || raise("profile :#{profile} not defined for #{self.class}!")
@@ -44,21 +40,21 @@ module Mongo::Model::Conversion
       instance_variables.each do |iv_name|
         value = instance_variable_get iv_name
         value = convert_model value, :to_hash, child_options
-        result[iv_name[1.. -1]] = value
+        result[iv_name[1.. -1].to_sym] = value
       end
 
       methods = options[:methods] ? Array(options[:methods]) : []
       methods.each do |method|
         value = send method
         value = convert_model value, :to_hash, child_options
-        result[method.to_s] = value
+        result[method.to_sym] = value
       end
 
       with_errors = options.include?(:errors) ? options[:errors] : true
       if with_errors and !(errors = self.errors).empty?
-        stringified_errors = {}
-        errors.each{|k, v| stringified_errors[k.to_s] = v}
-        result['errors'] = stringified_errors
+        errors = {}
+        self.errors.each{|k, v| errors[k.to_sym] = v}
+        result[:errors] = errors
       end
 
       result

data/lib/mongo/model/support.rb

@@ -7,5 +7,4 @@ Hash.class_eval do
   def collect_with_value &block
     {}.tap{|h| self.each{|k, v| h[k] = block.call v}}
   end
-end
-
+end

data/spec/conversion_spec.rb

@@ -41,24 +41,24 @@ describe 'Conversion' do
   it "should work without arguments" do
     post = build_post_with_comment
     post.to_hash.should == {
-      'text' => 'StarCraft releasing soon!',
-      'token' => 'secret',
-      'comments' => [
-        {'text' => 'Cool!'}
+      text:     'StarCraft releasing soon!',
+      token:    'secret',
+      comments: [
+        {text: 'Cool!'}
       ]
     }
   end
 
   it "should accept :only, :except and :methods options" do
     post = build_post_with_comment
-    post.to_hash(only: :text).should == {'text' => 'StarCraft releasing soon!'}
+    post.to_hash(only: :text).should == {text: 'StarCraft releasing soon!'}
     post.to_hash(except: :token).should == {
-      'text' => 'StarCraft releasing soon!',
-      'comments' => [
-        {'text' => 'Cool!'}
+      text:     'StarCraft releasing soon!',
+      comments: [
+        {text: 'Cool!'}
       ]
     }
-    post.to_hash(only: [], methods: :teaser).should == {'teaser' => 'StarCraft r'}
+    post.to_hash(only: [], methods: :teaser).should == {teaser: 'StarCraft r'}
   end
 
   it "should use conversion profiles" do
@@ -75,10 +75,10 @@ describe 'Conversion' do
     end
 
     post.to_hash(profile: :public).should == {
-      'text' => 'StarCraft releasing soon!',
-      'teaser' => 'StarCraft r',
-      'comments' => [
-        {'text' => 'Cool!'}
+      text:     'StarCraft releasing soon!',
+      teaser:   'StarCraft r',
+      comments: [
+        {text: 'Cool!'}
       ]
     }
   end
@@ -92,12 +92,12 @@ describe 'Conversion' do
     post.valid?.should be_false
 
     post.to_hash.should == {
-      'text' => 'StarCraft releasing soon!',
-      'errors' => {"token" => ["can't be empty"]}
+      text:   'StarCraft releasing soon!',
+      errors: {token: ["can't be empty"]}
     }
 
     post.to_hash(errors: false).should == {
-      'text' => 'StarCraft releasing soon!'
+      text: 'StarCraft releasing soon!'
     }
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mongodb_model
 version: !ruby/object:Gem::Version
-  version: 2.0.1
+  version: 2.0.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-11-18 00:00:00.000000000Z
+date: 2011-11-19 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mongodb
-  requirement: &2848920 !ruby/object:Gem::Requirement
+  requirement: &2848930 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2848920
+  version_requirements: *2848930
 - !ruby/object:Gem::Dependency
   name: validatable2
-  requirement: &2848680 !ruby/object:Gem::Requirement
+  requirement: &2848690 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2848680
+  version_requirements: *2848690
 - !ruby/object:Gem::Dependency
   name: ruby_ext
-  requirement: &2848440 !ruby/object:Gem::Requirement
+  requirement: &2848450 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,7 +43,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2848440
+  version_requirements: *2848450
 description: 
 email: 
 executables: []