mongomodel 0.3.3 → 0.3.4

data/Appraisals

@@ -0,0 +1,9 @@
+appraise "rails-3.0" do
+  gem "activesupport", "3.0.9"
+  gem "activemodel", "3.0.9"
+end
+
+appraise "rails-3.1" do
+  gem "activesupport", :git => "https://github.com/rails/rails.git", :branch => "3-1-stable"
+  gem "activemodel", :git => "https://github.com/rails/rails.git", :branch => "3-1-stable"
+end

data/Gemfile

@@ -2,5 +2,5 @@ source "http://rubygems.org"
 
 gemspec
 
-gem "bson_ext", '~> 1.3.0'
-gem "SystemTimer"
+gem "appraisal", "~> 0.3.6"
+gem "bson_ext", "~> 1.3.0"

data/Rakefile

@@ -1,20 +1,23 @@
-require 'rake/rdoctask'
+require 'rubygems'
+require 'bundler/setup'
+
+require 'appraisal'
 
 task :default => :spec
 
 begin
-  require 'spec/rake/spectask'
+  require 'rspec/core/rake_task'
   desc 'Run the specs'
-  Spec::Rake::SpecTask.new(:spec) do |t|
-    t.libs << 'lib'
-    t.spec_opts = ['--options', "#{File.expand_path(File.dirname(__FILE__))}/spec/spec.opts"]
+  RSpec::Core::RakeTask.new(:spec) do |t|
+    #t.libs << 'lib'
+    t.rspec_opts = ['--options', "#{File.expand_path(File.dirname(__FILE__))}/spec/spec.opts"]
   end
   
   namespace :spec do
     desc "Run specs in nested documenting format"
-    Spec::Rake::SpecTask.new(:doc) do |t|
-      t.libs << 'lib'
-      t.spec_opts = ['--options', "#{File.expand_path(File.dirname(__FILE__))}/spec/specdoc.opts"]
+    RSpec::Core::RakeTask.new(:doc) do |t|
+      #t.libs << 'lib'
+      t.rspec_opts = ['--options', "#{File.expand_path(File.dirname(__FILE__))}/spec/specdoc.opts"]
     end
   end
 rescue LoadError
@@ -26,11 +29,18 @@ rescue LoadError
   end
 end
 
-desc "Generate documentation"
-Rake::RDocTask.new(:doc) do |rdoc|
-  rdoc.rdoc_dir = 'doc'
-  rdoc.options << '--line-numbers' << '--inline-source'
-  rdoc.rdoc_files.include('lib')
+begin
+  require 'rdoc/task'
+  desc "Generate documentation"
+  Rake::RDocTask.new(:doc) do |rdoc|
+    rdoc.rdoc_dir = 'doc'
+    rdoc.options << '--line-numbers' << '--inline-source'
+    rdoc.rdoc_files.include('lib')
+  end
+rescue LoadError
+  task :doc do
+    STDERR.puts "You must have rdoc to generate the documentation"
+  end
 end
 
 require 'bundler'

data/gemfiles/rails-3.0.gemfile

@@ -0,0 +1,10 @@
+# This file was generated by Appraisal
+
+source "http://rubygems.org"
+
+gem "appraisal", "~> 0.3.6"
+gem "bson_ext", "~> 1.3.0"
+gem "activesupport", "3.0.9"
+gem "activemodel", "3.0.9"
+
+gemspec :path=>"../"

data/gemfiles/rails-3.0.gemfile.lock

@@ -0,0 +1,73 @@
+PATH
+  remote: /Users/sam/Development/MongoDB/mongomodel
+  specs:
+    mongomodel (0.3.3)
+      activemodel (~> 3.0)
+      activesupport (~> 3.0)
+      mongo (~> 1.3.0)
+      will_paginate (~> 2.3.15)
+
+GEM
+  remote: http://rubygems.org/
+  specs:
+    activemodel (3.0.9)
+      activesupport (= 3.0.9)
+      builder (~> 2.1.2)
+      i18n (~> 0.5.0)
+    activesupport (3.0.9)
+    appraisal (0.3.6)
+      aruba (~> 0.4.2)
+      bundler
+      rake
+    aruba (0.4.3)
+      bcat (>= 0.6.1)
+      childprocess (>= 0.1.9)
+      cucumber (>= 0.10.7)
+      rdiscount (>= 1.6.8)
+      rspec (>= 2.6.0)
+    bcat (0.6.1)
+      rack (~> 1.0)
+    bson (1.3.1)
+    bson_ext (1.3.1)
+    builder (2.1.2)
+    childprocess (0.1.9)
+      ffi (~> 1.0.6)
+    cucumber (1.0.0)
+      builder (>= 2.1.2)
+      diff-lcs (>= 1.1.2)
+      gherkin (~> 2.4.1)
+      json (>= 1.4.6)
+      term-ansicolor (>= 1.0.5)
+    diff-lcs (1.1.2)
+    ffi (1.0.9)
+    gherkin (2.4.1)
+      json (>= 1.4.6)
+    i18n (0.5.0)
+    json (1.5.3)
+    mongo (1.3.1)
+      bson (>= 1.3.1)
+    rack (1.3.0)
+    rake (0.9.2)
+    rdiscount (1.6.8)
+    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)
+    term-ansicolor (1.0.5)
+    will_paginate (2.3.15)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  activemodel (= 3.0.9)
+  activesupport (= 3.0.9)
+  appraisal (~> 0.3.6)
+  bson_ext (~> 1.3.0)
+  bundler (>= 1.0.0)
+  mongomodel!
+  rspec (~> 2.6.0)

data/gemfiles/rails-3.1.gemfile

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

data/gemfiles/rails-3.1.gemfile.lock

@@ -0,0 +1,83 @@
+GIT
+  remote: https://github.com/rails/rails.git
+  revision: 07ea84a03b2a2c753768965a840913b4d4d42cee
+  branch: 3-1-stable
+  specs:
+    activemodel (3.1.0.rc4)
+      activesupport (= 3.1.0.rc4)
+      bcrypt-ruby (~> 2.1.4)
+      builder (~> 3.0.0)
+      i18n (~> 0.6)
+    activesupport (3.1.0.rc4)
+      multi_json (~> 1.0)
+
+PATH
+  remote: /Users/sam/Development/MongoDB/mongomodel
+  specs:
+    mongomodel (0.3.3)
+      activemodel (~> 3.0)
+      activesupport (~> 3.0)
+      mongo (~> 1.3.0)
+      will_paginate (~> 2.3.15)
+
+GEM
+  remote: http://rubygems.org/
+  specs:
+    appraisal (0.3.6)
+      aruba (~> 0.4.2)
+      bundler
+      rake
+    aruba (0.4.3)
+      bcat (>= 0.6.1)
+      childprocess (>= 0.1.9)
+      cucumber (>= 0.10.7)
+      rdiscount (>= 1.6.8)
+      rspec (>= 2.6.0)
+    bcat (0.6.1)
+      rack (~> 1.0)
+    bcrypt-ruby (2.1.4)
+    bson (1.3.1)
+    bson_ext (1.3.1)
+    builder (3.0.0)
+    childprocess (0.1.9)
+      ffi (~> 1.0.6)
+    cucumber (1.0.0)
+      builder (>= 2.1.2)
+      diff-lcs (>= 1.1.2)
+      gherkin (~> 2.4.1)
+      json (>= 1.4.6)
+      term-ansicolor (>= 1.0.5)
+    diff-lcs (1.1.2)
+    ffi (1.0.9)
+    gherkin (2.4.1)
+      json (>= 1.4.6)
+    i18n (0.6.0)
+    json (1.5.3)
+    mongo (1.3.1)
+      bson (>= 1.3.1)
+    multi_json (1.0.3)
+    rack (1.3.0)
+    rake (0.9.2)
+    rdiscount (1.6.8)
+    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)
+    term-ansicolor (1.0.5)
+    will_paginate (2.3.15)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  activemodel!
+  activesupport!
+  appraisal (~> 0.3.6)
+  bson_ext (~> 1.3.0)
+  bundler (>= 1.0.0)
+  mongomodel!
+  rspec (~> 2.6.0)

data/lib/mongomodel.rb

@@ -58,7 +58,6 @@ module MongoModel
     autoload :Store,          'mongomodel/attributes/store'
     autoload :Typecasting,    'mongomodel/attributes/typecasting'
     autoload :Mongo,          'mongomodel/attributes/mongo'
-    autoload :Dirty,          'mongomodel/attributes/dirty'
   end
   
   module Associations

data/lib/mongomodel/concerns/abstract_class.rb

@@ -3,6 +3,7 @@ module MongoModel
     extend ActiveSupport::Concern
     
     def inherited(subclass)
+      super
       subclass.abstract_class = false
     end
     

data/lib/mongomodel/concerns/associations.rb

@@ -10,6 +10,14 @@ module MongoModel
     end
     
     module ClassMethods
+      def associations
+        @_associations ||= {}
+      end
+      
+      def associations=(associations)
+        @_associations = associations
+      end
+      
       def belongs_to(name, options={})
         associations[name] = create_association(BelongsTo, name, options)
       end
@@ -17,9 +25,10 @@ module MongoModel
       def has_many(name, options={})
         associations[name] = create_association(has_many_type(options), name, options)
       end
-    
-      def associations
-        read_inheritable_attribute(:associations) || write_inheritable_attribute(:associations, {})
+      
+      def inherited(subclass)
+        super
+        subclass.associations = associations.dup
       end
     
     private

data/lib/mongomodel/concerns/associations/base/definition.rb

@@ -46,12 +46,14 @@ module MongoModel
           options.slice(:conditions, :select, :offset, :limit, :order)
         end
 
-        def self.properties(&block)
-          block_given? ? write_inheritable_attribute(:properties, block) : read_inheritable_attribute(:properties)
+        def self.properties
+          @properties = Proc.new if block_given?
+          @properties
         end
 
         def self.methods(&block)
-          block_given? ? write_inheritable_attribute(:methods, block) : read_inheritable_attribute(:methods)
+          @methods = Proc.new if block_given?
+          @methods
         end
 
       private

data/lib/mongomodel/concerns/attribute_methods.rb

@@ -8,7 +8,18 @@ module MongoModel
       # Generates all the attribute related methods for defined properties
       # accessors, mutators and query methods.
       def define_attribute_methods
+        return if attribute_methods_generated?
         super(properties.keys)
+        @attribute_methods_generated = true
+      end
+      
+      def attribute_methods_generated?
+        @attribute_methods_generated ||= false
+      end
+      
+      def undefine_attribute_methods(*args)
+        super
+        @attribute_methods_generated = false
       end
       
       def property(*args)
@@ -23,20 +34,16 @@ module MongoModel
       # see if we've created the method we're looking for.
       unless self.class.attribute_methods_generated?
         self.class.define_attribute_methods
-        method_name = method_id.to_s
-        
-        guard_private_attribute_method!(method_name, args)
         
-        if self.class.generated_attribute_methods.method_defined?(method_name)
-          return self.send(method_id, *args, &block)
-        end
+        guard_private_attribute_method!(method_id.to_s, args)
+        return __send__(method_id, *args, &block)
       end
       
       super
     end
     
     def respond_to?(*args)
-      self.class.define_attribute_methods
+      self.class.define_attribute_methods unless self.class.attribute_methods_generated?
       super
     end
     

data/lib/mongomodel/concerns/properties.rb

@@ -1,4 +1,3 @@
-require 'active_support/core_ext/class/inheritable_attributes'
 require 'active_support/core_ext/module/delegation'
 require 'active_support/core_ext/array/extract_options'
 require 'active_support/core_ext/hash/except'
@@ -7,9 +6,8 @@ module MongoModel
   module Properties
     extend ActiveSupport::Concern
     
-    included do
-      class_inheritable_accessor :properties
-      self.properties = ActiveSupport::OrderedHash.new
+    def properties
+      self.class.properties
     end
     
     module ClassMethods
@@ -19,6 +17,14 @@ module MongoModel
         end
       end
       
+      def properties
+        @properties ||= ActiveSupport::OrderedHash.new
+      end
+      
+      def properties=(properties)
+        @properties = properties
+      end
+      
       def model_properties
         properties.reject { |k, p| p.internal? }
       end
@@ -26,6 +32,11 @@ module MongoModel
       def internal_properties
         properties.select { |k, p| p.internal? }.map { |k, p| p }
       end
+      
+      def inherited(subclass)
+        super
+        subclass.properties = properties.dup
+      end
     end
   
     class Property

data/lib/mongomodel/document/indexes.rb

@@ -16,17 +16,21 @@ module MongoModel
           property
         end
         
+        def indexes
+          @_indexes ||= []
+        end
+        
+        def indexes=(indexes)
+          @_indexes = indexes
+        end
+        
         def index(*args)
           index = Index.new(*args)
-          indexes << index
+          self.indexes << index
           @_indexes_initialized = false
           index
         end
 
-        def indexes
-          read_inheritable_attribute(:indexes) || write_inheritable_attribute(:indexes, [])
-        end
-
         def indexes_initialized?
           @_indexes_initialized == true
         end
@@ -38,6 +42,11 @@ module MongoModel
 
           @_indexes_initialized = true
         end
+        
+        def inherited(subclass)
+          super
+          subclass.indexes = indexes.dup
+        end
       end
     end
   end