mongomodel 0.4.3 → 0.4.4

data/.gitignore

@@ -1,3 +1,4 @@
 .bundle
 Gemfile.lock
+gemfiles/*.lock
 pkg/*

data/Appraisals

@@ -1,9 +1,9 @@
 appraise "rails-3.1" do
-  gem "activesupport", "3.1.0"
-  gem "activemodel", "3.1.0"
+  gem "activesupport", "3.1.3"
+  gem "activemodel", "3.1.3"
 end
 
-appraise "rails-edge" do
-  gem "activesupport", :git => "https://github.com/rails/rails.git"
-  gem "activemodel", :git => "https://github.com/rails/rails.git"
+appraise "rails-3.2" do
+  gem "activesupport", :git => "https://github.com/rails/rails.git", :branch => '3-2-stable'
+  gem "activemodel", :git => "https://github.com/rails/rails.git", :branch => '3-2-stable'
 end

data/gemfiles/rails-3.1.gemfile

@@ -2,10 +2,10 @@
 
 source "http://rubygems.org"
 
+gem "appraisal", "~> 0.3.6"
 gem "bson_ext", "~> 1.5"
 gem "tzinfo"
-gem "activemodel", "3.1.0"
-gem "activesupport", "3.1.0"
-gem "appraisal", "~> 0.3.6"
+gem "activesupport", "3.1.3"
+gem "activemodel", "3.1.3"
 
 gemspec :path=>"../"

data/gemfiles/rails-3.2.gemfile

@@ -0,0 +1,11 @@
+# This file was generated by Appraisal
+
+source "http://rubygems.org"
+
+gem "appraisal", "~> 0.3.6"
+gem "bson_ext", "~> 1.5"
+gem "tzinfo"
+gem "activesupport", :git=>"https://github.com/rails/rails.git", :branch=>"3-2-stable"
+gem "activemodel", :git=>"https://github.com/rails/rails.git", :branch=>"3-2-stable"
+
+gemspec :path=>"../"

data/lib/mongomodel/concerns/attribute_methods.rb

@@ -9,6 +9,7 @@ module MongoModel
       # accessors, mutators and query methods.
       def define_attribute_methods
         return if attribute_methods_generated?
+        superclass.define_attribute_methods unless abstract_class?
         super(properties.keys)
         @attribute_methods_generated = true
       end
@@ -27,6 +28,13 @@ module MongoModel
         undefine_attribute_methods
         property
       end
+    
+    protected
+      def instance_method_already_implemented?(method_name)
+        method_defined?(method_name) ||
+          private_method_defined?(method_name) ||
+          super
+      end
     end
     
     def method_missing(method, *args, &block)

data/lib/mongomodel/concerns/attribute_methods/read.rb

@@ -3,8 +3,11 @@ module MongoModel
     module Read
       extend ActiveSupport::Concern
       
-      included do
-        attribute_method_suffix ""
+      # ActiveModel 3.2 defines the non-prefixed attribute name automatically
+      if ActiveModel::VERSION::STRING <= "3.2"
+        included do
+          attribute_method_suffix ""
+        end
       end
       
       # Returns the value of the attribute identified by +name+ after it has been typecast (for example,

data/lib/mongomodel/support/types.rb

@@ -1,7 +1,21 @@
-require 'rational' unless RUBY_VERSION >= '1.9.2'
-require 'set'
-
 require 'mongomodel/support/types/object'
+require 'mongomodel/support/types/custom'
+
+module MongoModel
+  module Types
+    CONVERTERS = Hash.new { |h, k| h[k] = Types::Custom.new(k) }
+    
+    def self.register_converter(type, converter)
+      CONVERTERS[type] = converter
+    end
+    
+    def self.converter_for(type)
+      CONVERTERS[type]
+    end
+  end
+end
+
+# Built-in types
 require 'mongomodel/support/types/string'
 require 'mongomodel/support/types/integer'
 require 'mongomodel/support/types/float'
@@ -10,35 +24,8 @@ require 'mongomodel/support/types/symbol'
 require 'mongomodel/support/types/date'
 require 'mongomodel/support/types/time'
 require 'mongomodel/support/types/date_time'
-require 'mongomodel/support/types/custom'
 require 'mongomodel/support/types/array'
 require 'mongomodel/support/types/set'
 require 'mongomodel/support/types/hash'
 require 'mongomodel/support/types/rational'
-
-module MongoModel
-  module Types
-    CONVERTERS = {
-      ::String   => Types::String.new,
-      ::Integer  => Types::Integer.new,
-      ::Float    => Types::Float.new,
-      ::Boolean  => Types::Boolean.new,
-      ::Symbol   => Types::Symbol.new,
-      ::Date     => Types::Date.new,
-      ::Time     => Types::Time.new,
-      ::DateTime => Types::DateTime.new,
-      ::Array    => Types::Array.new,
-      ::Set      => Types::Set.new,
-      ::Hash     => Types::Hash.new,
-      ::Rational => Types::Rational.new
-    }
-    
-    def self.converter_for(type)
-      if CONVERTERS[type]
-        CONVERTERS[type]
-      else
-        CONVERTERS[type] = Types::Custom.new(type)
-      end
-    end
-  end
-end
+require 'mongomodel/support/types/openstruct'

data/lib/mongomodel/support/types/array.rb

@@ -2,14 +2,14 @@ module MongoModel
   module Types
     class Array < Object
       def to_mongo(array)
-        array.map { |i|
-          Types.converter_for(i.class).to_mongo(i)
-        } if array
+        array.map { |i| convert(i) } if array
       end
       
       def to_query(value)
-        Types.converter_for(value.class).to_mongo(value)
+        convert(value)
       end
     end
   end
 end
+
+MongoModel::Types.register_converter(Array, MongoModel::Types::Array.new)

data/lib/mongomodel/support/types/boolean.rb

@@ -23,3 +23,5 @@ module MongoModel
     end
   end
 end
+
+MongoModel::Types.register_converter(Boolean, MongoModel::Types::Boolean.new)

data/lib/mongomodel/support/types/date.rb

@@ -25,3 +25,5 @@ module MongoModel
     end
   end
 end
+
+MongoModel::Types.register_converter(Date, MongoModel::Types::Date.new)

data/lib/mongomodel/support/types/date_time.rb

@@ -37,3 +37,5 @@ module MongoModel
     end
   end
 end
+
+MongoModel::Types.register_converter(DateTime, MongoModel::Types::DateTime.new)

data/lib/mongomodel/support/types/float.rb

@@ -15,3 +15,5 @@ module MongoModel
     end
   end
 end
+
+MongoModel::Types.register_converter(Float, MongoModel::Types::Float.new)

data/lib/mongomodel/support/types/hash.rb

@@ -5,7 +5,7 @@ module MongoModel
     class Hash < Object
       def to_mongo(hash)
         hash.inject({}) { |result, (k, v)|
-          result[k] = Types.converter_for(v.class).to_mongo(v)
+          result[convert(k)] = convert(v)
           result
         } if hash
       end
@@ -16,3 +16,5 @@ module MongoModel
     end
   end
 end
+
+MongoModel::Types.register_converter(Hash, MongoModel::Types::Hash.new)

data/lib/mongomodel/support/types/integer.rb

@@ -19,3 +19,5 @@ module MongoModel
     end
   end
 end
+
+MongoModel::Types.register_converter(Integer, MongoModel::Types::Integer.new)

data/lib/mongomodel/support/types/object.rb

@@ -20,6 +20,11 @@ module MongoModel
       def to_query(value)
         to_mongo(cast(value))
       end
+    
+    protected
+      def convert(value)
+        Types.converter_for(value.class).to_mongo(value)
+      end
     end
   end
 end

data/lib/mongomodel/support/types/openstruct.rb

@@ -0,0 +1,26 @@
+require 'ostruct'
+
+module MongoModel
+  module Types
+    class OpenStruct < Object
+      def cast(value)
+        case value
+        when ::OpenStruct
+          value
+        else
+          ::OpenStruct.new(value)
+        end
+      end
+
+      def to_mongo(value)
+        value.marshal_dump if value
+      end
+
+      def from_mongo(value)
+        ::OpenStruct.new(value)
+      end
+    end
+  end
+end
+
+MongoModel::Types.register_converter(OpenStruct, MongoModel::Types::OpenStruct.new)

data/lib/mongomodel/support/types/rational.rb

@@ -1,3 +1,5 @@
+require 'rational' unless RUBY_VERSION >= '1.9.2'
+
 module MongoModel
   module Types
     class Rational < Object
@@ -40,3 +42,5 @@ module MongoModel
     end
   end
 end
+
+MongoModel::Types.register_converter(Rational, MongoModel::Types::Rational.new)

data/lib/mongomodel/support/types/set.rb

@@ -1,3 +1,5 @@
+require 'set'
+
 module MongoModel
   module Types
     class Set < Array
@@ -7,3 +9,5 @@ module MongoModel
     end
   end
 end
+
+MongoModel::Types.register_converter(Set, MongoModel::Types::Set.new)

data/lib/mongomodel/support/types/string.rb

@@ -7,3 +7,5 @@ module MongoModel
     end
   end
 end
+
+MongoModel::Types.register_converter(String, MongoModel::Types::String.new)

data/lib/mongomodel/support/types/symbol.rb

@@ -7,3 +7,5 @@ module MongoModel
     end
   end
 end
+
+MongoModel::Types.register_converter(Symbol, MongoModel::Types::Symbol.new)

data/lib/mongomodel/support/types/time.rb

@@ -31,3 +31,5 @@ module MongoModel
     end
   end
 end
+
+MongoModel::Types.register_converter(Time, MongoModel::Types::Time.new)

data/lib/mongomodel/version.rb

@@ -1,3 +1,3 @@
 module MongoModel
-  VERSION = "0.4.3"
+  VERSION = "0.4.4"
 end

data/mongomodel.gemspec

@@ -20,7 +20,7 @@ Gem::Specification.new do |s|
   s.add_dependency "will_paginate", "~> 2.3.15"
 
   s.add_development_dependency "bundler",     ">= 1.0.0"
-  s.add_development_dependency "rspec",       "~> 2.6.0"
+  s.add_development_dependency "rspec",       "~> 2.8"
   s.add_development_dependency "guard-rspec", "~> 0.5.0"
 
   s.files        = `git ls-files`.split("\n")

data/spec/mongomodel/attributes/store_spec.rb

@@ -1,7 +1,9 @@
 require 'spec_helper'
-
 require 'active_support/core_ext/hash/indifferent_access'
-require 'active_support/core_ext/time/conversions'
+
+require 'set'
+require "ostruct"
+require 'rational' unless RUBY_VERSION >= '1.9.2'
 
 module MongoModel
   describe Attributes::Store do
@@ -18,6 +20,7 @@ module MongoModel
       properties[:time]    = MongoModel::Properties::Property.new(:time, Time)
       properties[:datetime] = MongoModel::Properties::Property.new(:datetime, DateTime)
       properties[:rational] = MongoModel::Properties::Property.new(:rational, Rational)
+      properties[:openstruct] = MongoModel::Properties::Property.new(:openstruct, OpenStruct)
       properties[:custom]  = MongoModel::Properties::Property.new(:custom, CustomClass)
       properties[:custom_default] = MongoModel::Properties::Property.new(:custom_default, CustomClassWithDefault)
       properties[:default] = MongoModel::Properties::Property.new(:default, String, :default => 'Default')
@@ -153,6 +156,11 @@ module MongoModel
           {
             Rational(1, 15) => Rational(1, 15),
             "2/3"           => Rational(2, 3)
+          },
+        :openstruct =>
+          {
+            OpenStruct.new(:abc => 123) => OpenStruct.new(:abc => 123),
+            { :mykey => "Hello world" } => OpenStruct.new(:mykey => "Hello world")
           }
       }
     
@@ -201,6 +209,7 @@ module MongoModel
         :hash => [ { :foo => 'bar' } ],
         :array => [ [123, 'abc', :foo, true] ],
         :rational => [ "2/3" ],
+        :openstruct => [ { :abc => 123 } ],
         :date => [ Date.civil(2009, 11, 15), Time.local(2008, 12, 3, 0, 0, 0, 0), "2009/3/4", "Sat Jan 01 20:15:01 UTC 2000" ],
         :time => [ Time.local(2008, 5, 14, 1, 2, 3, 4), Date.civil(2009, 11, 15), "Sat Jan 01 20:15:01 UTC 2000", "2009/3/4" ]
       }
@@ -229,6 +238,7 @@ module MongoModel
         :date => [ Date.civil(2009, 11, 15) ],
         :time => [ Time.local(2008, 5, 14, 1, 2, 3, 4) ],
         :rational => [ Rational(2, 3) ],
+        :openstruct => [ {} ],
         :custom => [ CustomClass.new('foobar'), 'baz' ]
       }
     
@@ -243,6 +253,7 @@ module MongoModel
         :date => [ nil, '' ],
         :time => [ nil, '' ],
         :rational => [ nil ],
+        :openstruct => [ nil ],
         :custom => [ nil ]
       }
     
@@ -281,6 +292,7 @@ module MongoModel
         subject[:date] = Date.civil(2009, 11, 15)
         subject[:time] = Time.local(2008, 5, 14, 1, 2, 3, 4, 0.5)
         subject[:rational] = Rational(2, 3)
+        subject[:openstruct] = OpenStruct.new(:abc => 123)
         subject[:custom] = CustomClass.new('custom')
         subject[:as] = "As property"
         subject[:non_property] = "Hello World"
@@ -297,6 +309,7 @@ module MongoModel
           'date' => "2009/11/15",
           'time' => Time.local(2008, 5, 14, 1, 2, 3, 4, 0),
           'rational' => "2/3",
+          'openstruct' => { :abc => 123 },
           'custom' => { :name => 'custom' },
           '_custom_as' => "As property",
           'non_property' => "Hello World",
@@ -316,6 +329,7 @@ module MongoModel
           'date' => Time.utc(2009, 11, 15),
           'time' => Time.local(2008, 5, 14, 1, 2, 3, 4, 0.5),
           'rational' => "2/3",
+          'openstruct' => { "foo" => "bar" },
           'custom' => { :name => 'custom' },
           '_custom_as' => "As property",
           'custom_non_property' => { :name => 'custom non property' }
@@ -331,6 +345,7 @@ module MongoModel
         subject[:date].should == Date.civil(2009, 11, 15)
         subject[:time].should == Time.local(2008, 5, 14, 1, 2, 3, 4, 0)
         subject[:rational].should == Rational(2, 3)
+        subject[:openstruct].should == OpenStruct.new(:foo => "bar")
         subject[:custom].should == CustomClass.new('custom')
         subject[:as].should == "As property"
         subject[:custom_non_property].should == { :name => 'custom non property' }

data/spec/mongomodel/concerns/activemodel_spec.rb

@@ -1,106 +1,25 @@
 require 'spec_helper'
 
-# Specs ported from ActiveModel::Lint::Tests
-#
-# These tests do not attempt to determine the semantic correctness of the
-# returned values. For instance, you could implement valid? to always
-# return true, and the tests would pass. It is up to you to ensure that
-# the values are semantically meaningful.
-#
-# Objects you pass in are expected to return a compliant object from a
-# call to to_model. It is perfectly fine for to_model to return self.
 module MongoModel
-  specs_for(Document, EmbeddedDocument) do
-    define_class(:TestModel, described_class)
-    
-    subject { TestModel.new.to_model }
-    
-    # == Responds to <tt>to_key</tt>
-    #
-    # Returns an Enumerable of all (primary) key attributes
-    # or nil if model.persisted? is false
-    it { should respond_to(:to_key) }
-    
-    specify "to_key should return nil if subject.persisted? is false" do
-      subject.stub!(:persisted?).and_return(false)
-      subject.to_key.should be_nil
-    end
-    
-    # == Responds to <tt>to_param</tt>
-    #
-    # Returns a string representing the object's key suitable for use in URLs
-    # or nil if model.persisted? is false.
-    #
-    # Implementers can decide to either raise an exception or provide a default
-    # in case the record uses a composite primary key. There are no tests for this
-    # behavior in lint because it doesn't make sense to force any of the possible
-    # implementation strategies on the implementer. However, if the resource is
-    # not persisted?, then to_param should always return nil.
-    it { should respond_to(:to_param) }
-    
-    specify "to_param should return nil if subject.persisted? is false" do
-      subject.stub!(:to_key).and_return([1])
-      subject.stub!(:persisted?).and_return(false)
-      subject.to_param.should be_nil
-    end
-    
-    # == Responds to <tt>valid?</tt>
-    #
-    # Returns a boolean that specifies whether the object is in a valid or invalid
-    # state.
-    it { should respond_to_boolean(:valid?) }
+  shared_examples_for "ActiveModel" do
+    require 'test/unit/assertions'
+    include Test::Unit::Assertions
     
-    # == Responds to <tt>persisted?</tt>
-    #
-    # Returns a boolean that specifies whether the object has been persisted yet.
-    # This is used when calculating the URL for an object. If the object is
-    # not persisted, a form for that object, for instance, will be POSTed to the
-    # collection. If it is persisted, a form for the object will put PUTed to the
-    # URL for the object.
-    it { should respond_to_boolean(:persisted?) }
+    include ActiveModel::Lint::Tests
     
-    # == Naming
-    #
-    # Model.model_name must returns a string with some convenience methods as
-    # :human and :partial_path. Check ActiveModel::Naming for more information.
-    #
-    specify "the model class should respond to model_name" do
-      subject.class.should respond_to(:model_name)
-    end
-    
-    it "should return strings for model_name" do
-      model_name = subject.class.model_name
-      model_name.should be_a_kind_of(String)
-      model_name.human.should be_a_kind_of(String)
-      model_name.partial_path.should be_a_kind_of(String)
-      model_name.singular.should be_a_kind_of(String)
-      model_name.plural.should be_a_kind_of(String)
-    end
-    
-    # == Errors Testing
-    # 
-    # Returns an object that has :[] and :full_messages defined on it. See below
-    # for more details.
-    describe "errors" do
-      it { should respond_to(:errors) }
-      
-      # Returns an Array of Strings that are the errors for the attribute in
-      # question. If localization is used, the Strings should be localized
-      # for the current locale. If no error is present, this method should
-      # return an empty Array.
-      describe "#[]" do
-        it "should return an Array" do
-          subject.errors[:hello].should be_an(Array)
-        end
-      end
-      
-      # Returns an Array of all error messages for the object. Each message
-      # should contain information about the field, if applicable.
-      describe "#full_messages" do
-        it "should return an Array" do
-          subject.errors.full_messages.should be_an(Array)
-        end
+    ActiveModel::Lint::Tests.public_instance_methods.map{|m| m.to_s}.grep(/^test/).each do |m|
+      example m.gsub('_',' ') do
+        send m
       end
     end
+    
+    let(:model) { subject }
+  end
+  
+  specs_for(Document, EmbeddedDocument) do
+    define_class(:TestModel, described_class)
+    subject { TestModel.new }
+        
+    it_should_behave_like "ActiveModel"
   end
 end

data/spec/mongomodel/concerns/attribute_methods_spec.rb

@@ -0,0 +1,68 @@
+require 'spec_helper'
+
+module MongoModel
+  specs_for(Document, EmbeddedDocument) do
+    describe "generating attribute methods" do
+      define_class(:TestDocument, described_class) do
+        property :foo, String
+        
+        def foo(a); "from method"; end
+      end
+      
+      subject { TestDocument.new }
+      
+      it "should not overwrite an existing method" do
+        subject.foo(1).should == "from method"
+      end
+      
+      context "on a subclass" do
+        define_class(:SubDocument, :TestDocument)
+        subject { SubDocument.new }
+      
+        it "should not overwrite methods defined on the superclass" do
+          subject.foo(1).should == "from method"
+        end
+      end
+      
+      context "on a class with an included module" do
+        module TestModule
+          def foo(a); "from method"; end
+        end
+        
+        it "should not overwrite methods defined on the included module" do
+          TestDocument.send(:include, TestModule)
+          subject.foo(1).should == "from method"
+        end
+      end
+      
+      context "on a class with an included concern that defines the property" do
+        module TestConcern
+          extend ActiveSupport::Concern
+          
+          included do
+            property :bar, String
+          end
+          
+          def bar(a); "from concern"; end
+        end
+        
+        context "the base class" do
+          it "should not overwrite methods defined within the concern" do
+            TestDocument.send(:include, TestConcern)
+            subject.bar(1).should == "from concern"
+          end
+        end
+        
+        context "subclasses" do
+          define_class(:SubDocument, :TestDocument)
+          subject { SubDocument.new }
+          
+          it "should not overwrite methods defined within the concern" do
+            SubDocument.send(:include, TestConcern)
+            subject.bar(1).should == "from concern"
+          end
+        end
+      end
+    end
+  end
+end

data/spec/mongomodel/support/map_spec.rb

@@ -212,6 +212,15 @@ module MongoModel
         subject.values_at(:another, :abc).should == [doc2, doc1]
       end
     end
+    
+    describe "map from Date to String" do
+      let(:klass) { Map[Date => String] }
+      subject { klass.new(Date.civil(2009, 11, 15) => "Hello world") }
+      
+      it "should cast key to String on #to_mongo" do
+        subject.to_mongo.should == { "2009/11/15" => "Hello world" }
+      end
+    end
   end
   
   specs_for(Document, EmbeddedDocument) do

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: mongomodel
 version: !ruby/object:Gem::Version 
-  hash: 9
+  hash: 7
   prerelease: 
   segments: 
   - 0
   - 4
-  - 3
-  version: 0.4.3
+  - 4
+  version: 0.4.4
 platform: ruby
 authors: 
 - Sam Pohlenz
@@ -15,10 +15,9 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-12-14 00:00:00 Z
+date: 2012-01-28 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: activesupport
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
@@ -30,10 +29,10 @@ dependencies:
         - 3
         - 1
         version: "3.1"
-  type: :runtime
   version_requirements: *id001
+  name: activesupport
+  type: :runtime
 - !ruby/object:Gem::Dependency 
-  name: activemodel
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
@@ -45,10 +44,10 @@ dependencies:
         - 3
         - 1
         version: "3.1"
-  type: :runtime
   version_requirements: *id002
+  name: activemodel
+  type: :runtime
 - !ruby/object:Gem::Dependency 
-  name: mongo
   prerelease: false
   requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
@@ -60,10 +59,10 @@ dependencies:
         - 1
         - 5
         version: "1.5"
-  type: :runtime
   version_requirements: *id003
+  name: mongo
+  type: :runtime
 - !ruby/object:Gem::Dependency 
-  name: will_paginate
   prerelease: false
   requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
@@ -76,10 +75,10 @@ dependencies:
         - 3
         - 15
         version: 2.3.15
-  type: :runtime
   version_requirements: *id004
+  name: will_paginate
+  type: :runtime
 - !ruby/object:Gem::Dependency 
-  name: bundler
   prerelease: false
   requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
@@ -92,26 +91,25 @@ dependencies:
         - 0
         - 0
         version: 1.0.0
-  type: :development
   version_requirements: *id005
+  name: bundler
+  type: :development
 - !ruby/object:Gem::Dependency 
-  name: rspec
   prerelease: false
   requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 23
+        hash: 19
         segments: 
         - 2
-        - 6
-        - 0
-        version: 2.6.0
-  type: :development
+        - 8
+        version: "2.8"
   version_requirements: *id006
+  name: rspec
+  type: :development
 - !ruby/object:Gem::Dependency 
-  name: guard-rspec
   prerelease: false
   requirement: &id007 !ruby/object:Gem::Requirement 
     none: false
@@ -124,8 +122,9 @@ dependencies:
         - 5
         - 0
         version: 0.5.0
-  type: :development
   version_requirements: *id007
+  name: guard-rspec
+  type: :development
 description: MongoModel is a MongoDB ORM for Ruby/Rails similar to ActiveRecord and DataMapper.
 email: 
 - sam@sampohlenz.com
@@ -145,9 +144,7 @@ files:
 - Rakefile
 - bin/console
 - gemfiles/rails-3.1.gemfile
-- gemfiles/rails-3.1.gemfile.lock
-- gemfiles/rails-edge.gemfile
-- gemfiles/rails-edge.gemfile.lock
+- gemfiles/rails-3.2.gemfile
 - lib/mongomodel.rb
 - lib/mongomodel/attributes/mongo.rb
 - lib/mongomodel/attributes/store.rb
@@ -226,6 +223,7 @@ files:
 - lib/mongomodel/support/types/hash.rb
 - lib/mongomodel/support/types/integer.rb
 - lib/mongomodel/support/types/object.rb
+- lib/mongomodel/support/types/openstruct.rb
 - lib/mongomodel/support/types/rational.rb
 - lib/mongomodel/support/types/set.rb
 - lib/mongomodel/support/types/string.rb
@@ -251,6 +249,7 @@ files:
 - spec/mongomodel/concerns/attribute_methods/query_spec.rb
 - spec/mongomodel/concerns/attribute_methods/read_spec.rb
 - spec/mongomodel/concerns/attribute_methods/write_spec.rb
+- spec/mongomodel/concerns/attribute_methods_spec.rb
 - spec/mongomodel/concerns/attributes_spec.rb
 - spec/mongomodel/concerns/callbacks_spec.rb
 - spec/mongomodel/concerns/logging_spec.rb
@@ -325,10 +324,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: mongomodel
-rubygems_version: 1.8.6
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: MongoDB ORM for Ruby/Rails
 test_files: []
 
-has_rdoc: 

data/gemfiles/rails-3.1.gemfile.lock

@@ -1,62 +0,0 @@
-PATH
-  remote: /Users/sam/Work/mongomodel
-  specs:
-    mongomodel (0.4.3)
-      activemodel (~> 3.1)
-      activesupport (~> 3.1)
-      mongo (~> 1.5)
-      will_paginate (~> 2.3.15)
-
-GEM
-  remote: http://rubygems.org/
-  specs:
-    activemodel (3.1.0)
-      activesupport (= 3.1.0)
-      bcrypt-ruby (~> 3.0.0)
-      builder (~> 3.0.0)
-      i18n (~> 0.6)
-    activesupport (3.1.0)
-      multi_json (~> 1.0)
-    appraisal (0.3.8)
-      bundler
-      rake
-    bcrypt-ruby (3.0.1)
-    bson (1.5.2)
-    bson_ext (1.5.2)
-      bson (= 1.5.2)
-    builder (3.0.0)
-    diff-lcs (1.1.3)
-    guard (0.8.8)
-      thor (~> 0.14.6)
-    guard-rspec (0.5.9)
-      guard (>= 0.8.4)
-    i18n (0.6.0)
-    mongo (1.5.2)
-      bson (= 1.5.2)
-    multi_json (1.0.4)
-    rake (0.9.2.2)
-    rspec (2.6.0)
-      rspec-core (~> 2.6.0)
-      rspec-expectations (~> 2.6.0)
-      rspec-mocks (~> 2.6.0)
-    rspec-core (2.6.4)
-    rspec-expectations (2.6.0)
-      diff-lcs (~> 1.1.2)
-    rspec-mocks (2.6.0)
-    thor (0.14.6)
-    tzinfo (0.3.31)
-    will_paginate (2.3.16)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  activemodel (= 3.1.0)
-  activesupport (= 3.1.0)
-  appraisal (~> 0.3.6)
-  bson_ext (~> 1.5)
-  bundler (>= 1.0.0)
-  guard-rspec (~> 0.5.0)
-  mongomodel!
-  rspec (~> 2.6.0)
-  tzinfo

data/gemfiles/rails-edge.gemfile

@@ -1,11 +0,0 @@
-# This file was generated by Appraisal
-
-source "http://rubygems.org"
-
-gem "bson_ext", "~> 1.5"
-gem "tzinfo"
-gem "activemodel", :git=>"https://github.com/rails/rails.git"
-gem "activesupport", :git=>"https://github.com/rails/rails.git"
-gem "appraisal", "~> 0.3.6"
-
-gemspec :path=>"../"

data/gemfiles/rails-edge.gemfile.lock

@@ -1,66 +0,0 @@
-GIT
-  remote: https://github.com/rails/rails.git
-  revision: 38703ac8972c7e8f3f3f1ac95aa506cc4ae30ef0
-  specs:
-    activemodel (3.2.0.beta)
-      activesupport (= 3.2.0.beta)
-      builder (~> 3.0.0)
-      i18n (~> 0.6)
-    activesupport (3.2.0.beta)
-      i18n (~> 0.6)
-      multi_json (~> 1.0)
-
-PATH
-  remote: /Users/sam/Work/mongomodel
-  specs:
-    mongomodel (0.4.3)
-      activemodel (~> 3.1)
-      activesupport (~> 3.1)
-      mongo (~> 1.5)
-      will_paginate (~> 2.3.15)
-
-GEM
-  remote: http://rubygems.org/
-  specs:
-    appraisal (0.3.8)
-      bundler
-      rake
-    bson (1.5.2)
-    bson_ext (1.5.2)
-      bson (= 1.5.2)
-    builder (3.0.0)
-    diff-lcs (1.1.3)
-    guard (0.8.8)
-      thor (~> 0.14.6)
-    guard-rspec (0.5.9)
-      guard (>= 0.8.4)
-    i18n (0.6.0)
-    mongo (1.5.2)
-      bson (= 1.5.2)
-    multi_json (1.0.4)
-    rake (0.9.2.2)
-    rspec (2.6.0)
-      rspec-core (~> 2.6.0)
-      rspec-expectations (~> 2.6.0)
-      rspec-mocks (~> 2.6.0)
-    rspec-core (2.6.4)
-    rspec-expectations (2.6.0)
-      diff-lcs (~> 1.1.2)
-    rspec-mocks (2.6.0)
-    thor (0.14.6)
-    tzinfo (0.3.31)
-    will_paginate (2.3.16)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  activemodel!
-  activesupport!
-  appraisal (~> 0.3.6)
-  bson_ext (~> 1.5)
-  bundler (>= 1.0.0)
-  guard-rspec (~> 0.5.0)
-  mongomodel!
-  rspec (~> 2.6.0)
-  tzinfo