mongomodel 0.3.3 → 0.3.4

data/lib/mongomodel/document/persistence.rb

@@ -6,8 +6,6 @@ module MongoModel
       included do
         undef_method :id if method_defined?(:id)
         property :id, MongoModel::Reference, :as => '_id', :default => lambda { |doc| doc.generate_id }
-        
-        class_inheritable_writer :collection_name
       end
       
       # Reload the document from the database. If the document
@@ -93,12 +91,16 @@ module MongoModel
         
         def collection_name
           if superclass.abstract_class?
-            read_inheritable_attribute(:collection_name) || name.tableize.gsub(/\//, '.')
+            @_collection_name || name.tableize.gsub(/\//, '.')
           else
             superclass.collection_name
           end
         end
         
+        def collection_name=(name)
+          @_collection_name = name
+        end
+        
         def use_type_selector?
           !superclass.abstract_class?
         end
@@ -116,11 +118,11 @@ module MongoModel
         end
         
         def save_safely?
-          @save_safely
+          @_save_safely
         end
         
         def save_safely=(val)
-          @save_safely = val
+          @_save_safely = val
         end
       end
     

data/lib/mongomodel/document/scopes.rb

@@ -23,10 +23,6 @@ module MongoModel
           current_scope.clone
         end
         
-        def scopes
-          read_inheritable_attribute(:scopes) || write_inheritable_attribute(:scopes, {})
-        end
-        
         def scope(name, scope)
           name = name.to_sym
           
@@ -52,6 +48,28 @@ module MongoModel
           previous_scope = default_scoping.last || unscoped
           default_scoping << previous_scope.merge(scope)
         end
+        
+        def scopes
+          @_scopes ||= {}
+        end
+        
+        def scopes=(scopes)
+          @_scopes = scopes
+        end
+        
+        def default_scoping
+          @_default_scoping ||= []
+        end
+        
+        def default_scoping=(scoping)
+          @_default_scoping = scoping
+        end
+        
+        def inherited(subclass)
+          super
+          subclass.scopes = scopes.dup
+          subclass.default_scoping = default_scoping.dup
+        end
       
       protected
         def with_scope(scope, &block)
@@ -76,10 +94,6 @@ module MongoModel
         def reset_current_scopes
           Thread.current[:"#{self}_scopes"] = nil
         end
-        
-        def default_scoping
-          read_inheritable_attribute(:default_scoping) || write_inheritable_attribute(:default_scoping, [])
-        end
       end
     end
   end

data/lib/mongomodel/railtie.rb

@@ -1,7 +1,6 @@
 module MongoModel
   class Railtie < Rails::Railtie
-
-    config.generators.orm :mongo_model, :migration => false
+    config.app_generators.orm :mongo_model, :migration => false
 
     rake_tasks do
       load "mongomodel/tasks/database.rake"
@@ -18,7 +17,7 @@ module MongoModel
     initializer "mongomodel.database_configuration" do |app|
       require 'erb'
       
-      config = Pathname.new(app.paths.config.to_a.first).join("mongomodel.yml")
+      config = Rails.root.join("config", "mongomodel.yml")
       
       if File.exists?(config)
         mongomodel_configuration = YAML::load(ERB.new(IO.read(config)).result)

data/lib/mongomodel/support/collection.rb

@@ -1,3 +1,5 @@
+require 'active_support/core_ext/class/attribute'
+
 module MongoModel
   class Collection < Array
     module PropertyDefaults
@@ -14,7 +16,7 @@ module MongoModel
     
     ARRAY_CONVERTER = Types.converter_for(Array)
     
-    class_inheritable_accessor :type
+    class_attribute :type
     self.type = Object
     
     include DocumentParent

data/lib/mongomodel/support/map.rb

@@ -1,3 +1,5 @@
+require 'active_support/core_ext/class/attribute'
+
 module MongoModel
   class Map < Hash
     module PropertyDefaults
@@ -12,10 +14,10 @@ module MongoModel
       end
     end
     
-    class_inheritable_accessor :from
+    class_attribute :from
     self.from = String
     
-    class_inheritable_accessor :to
+    class_attribute :to
     self.to = Object
     
     HASH_CONVERTER = Types.converter_for(Hash)

data/lib/mongomodel/support/mongo_options.rb

@@ -26,31 +26,16 @@ module MongoModel
       result = {}
       
       (options[:conditions] || {}).each do |k, v|
-        if k.is_a?(MongoOperator)
-          key = k.field
-        else
-          key = k
-        end
+        key = k.is_a?(MongoOperator) ? k.field : k
         
         if property = @model.properties[key]
           key = property.as
-          
-          if k.is_a?(MongoOperator)
-            value = k.to_mongo_selector(v.is_a?(Array) ? v.map { |i| property.to_query(i) } : property.to_query(v))
-          else
-            value = property.to_query(v)
-          end
+          value = v.is_a?(Array) ? v.map { |i| property.to_query(i) } : property.to_query(v);
         else
-          converter = Types.converter_for(value.class)
-          
-          if k.is_a?(MongoOperator)
-            value = k.to_mongo_selector(converter.to_mongo(v))
-          else
-            value = converter.to_mongo(v)
-          end
+          value = Types.converter_for(v.class).to_mongo(v)
         end
-        
-        result[key] = value
+
+        result[key] = k.is_a?(MongoOperator) ? k.to_mongo_selector(value) : value
       end
       
       result
@@ -59,7 +44,7 @@ module MongoModel
     def extract_options(options)
       result = {}
       
-      result[:fields] = options[:select] if options[:select]
+      result[:fields] = convert_select(options[:select]) if options[:select]
       result[:skip]   = options[:offset] if options[:offset]
       result[:limit]  = options[:limit]  if options[:limit]
       result[:sort]   = MongoOrder.parse(options[:order]).to_sort(@model) if options[:order]
@@ -67,19 +52,9 @@ module MongoModel
       result
     end
     
-    def convert_order(order)
-      case order
-      when Array
-        order.map { |clause|
-          key, sort = clause.split(/ /)
-          
-          property = @model.properties[key.to_sym]
-          sort = (sort =~ /desc/i) ? :descending : :ascending
-          
-          [property ? property.as : key, sort]
-        } if order.size > 0
-      when String, Symbol
-        convert_order(order.to_s.split(/,/).map { |c| c.strip })
+    def convert_select(fields)
+      fields.map do |key|
+        (@model.properties[key.to_sym].try(:as) || key).to_sym
       end
     end
     

data/lib/mongomodel/support/scope.rb

@@ -131,29 +131,17 @@ module MongoModel
     end
     
     def finder_options
-      @finder_options ||= begin
-        result = {}
-        
+      @finder_options ||= {}.tap do |result|
         result[:conditions] = finder_conditions if where_values.any?
         result[:select]     = select_values     if select_values.any?
         result[:order]      = order_values      if order_values.any?
         result[:limit]      = limit_value       if limit_value.present?
         result[:offset]     = offset_value      if offset_value.present?
-        
-        result
       end
     end
     
     def options_for_create
-      @options_for_create ||= begin
-        result = {}
-      
-        finder_conditions.each do |k, v|
-          result[k] = v unless k.is_a?(MongoModel::MongoOperator)
-        end
-      
-        result
-      end
+      @options_for_create ||= finder_conditions.reject { |k, v| k.is_a?(MongoModel::MongoOperator) }
     end
     
     def respond_to?(method, include_private = false)

data/lib/mongomodel/version.rb

@@ -1,3 +1,3 @@
 module MongoModel
-  VERSION = "0.3.3"
+  VERSION = "0.3.4"
 end

data/mongomodel.gemspec

@@ -14,8 +14,8 @@ Gem::Specification.new do |s|
   s.required_rubygems_version = ">= 1.3.6"
   s.rubyforge_project         = "mongomodel"
   
-  s.add_dependency "activesupport", "~> 3.0.3"
-  s.add_dependency "activemodel",   "~> 3.0.3"
+  s.add_dependency "activesupport", "~> 3.0"
+  s.add_dependency "activemodel",   "~> 3.0"
   s.add_dependency "mongo",         "~> 1.3.0"
   s.add_dependency "will_paginate", "~> 2.3.15"
 
@@ -24,7 +24,7 @@ Gem::Specification.new do |s|
   end
 
   s.add_development_dependency "bundler", ">= 1.0.0"
-  s.add_development_dependency "rspec",   "= 1.3.0"
+  s.add_development_dependency "rspec",   "~> 2.6.0"
 
   s.files        = `git ls-files`.split("\n")
   s.require_path = 'lib'

data/spec/mongomodel/concerns/associations/belongs_to_spec.rb

@@ -8,8 +8,6 @@ module MongoModel
     let(:user) { User.create! }
     let(:special_user) { SpecialUser.create! }
     
-    subject { Article.new }
-    
     context "when uninitialized" do
       it "should be nil" do
         subject.user.should be_nil
@@ -79,6 +77,8 @@ module MongoModel
         belongs_to :user
       end
       
+      subject { Article.new }
+      
       it_should_behave_like "assigning correct class to belongs_to association"
       
       describe "setting a different class type" do
@@ -92,8 +92,6 @@ module MongoModel
       end
       
       describe "#build_user" do
-        subject { Article.new }
-        
         let(:user) { subject.build_user(:id => '123') }
         
         it "should return a new unsaved user with the given attributes" do
@@ -104,8 +102,6 @@ module MongoModel
       end
       
       describe "#create_user" do
-        subject { Article.new }
-        
         it "should return a new saved user with the given attributes" do
           user = subject.create_user(:id => '123')
           user.should be_an_instance_of(User)
@@ -120,6 +116,8 @@ module MongoModel
         belongs_to :user, :polymorphic => true
       end
       
+      subject { Article.new }
+      
       define_class(:NonUser, Document)
       
       let(:non_user) { NonUser.create! }

data/spec/mongomodel/concerns/associations/has_many_by_ids_spec.rb

@@ -13,6 +13,129 @@ module MongoModel
     end
   end
   
+  shared_examples_for "accessing and manipulating a has_many :by => :ids association" do
+    it "should access chapters" do
+      subject.chapters.should == [chapter1, chapter2]
+    end
+    
+    it "should access chapter ids through association" do
+      subject.chapters.ids.should == [chapter1.id, chapter2.id]
+    end
+    
+    it "should have chapter ids" do
+      subject.chapter_ids.should == [chapter1.id, chapter2.id]
+    end
+    
+    it "should add chapters with <<" do
+      subject.chapters << chapter3
+      subject.chapters.should == [chapter1, chapter2, chapter3]
+      subject.chapter_ids.should == [chapter1.id, chapter2.id, chapter3.id]
+    end
+    
+    it "should add/change chapters with []=" do
+      subject.chapters[2] = chapter3
+      subject.chapters.should == [chapter1, chapter2, chapter3]
+      subject.chapter_ids.should == [chapter1.id, chapter2.id, chapter3.id]
+    end
+    
+    it "should add chapters with concat" do
+      subject.chapters.concat([chapter3])
+      subject.chapters.should == [chapter1, chapter2, chapter3]
+      subject.chapter_ids.should == [chapter1.id, chapter2.id, chapter3.id]
+    end
+    
+    it "should insert chapters" do
+      subject.chapters.insert(1, chapter3)
+      subject.chapters.should == [chapter1, chapter3, chapter2]
+      subject.chapter_ids.should == [chapter1.id, chapter3.id, chapter2.id]
+    end
+    
+    it "should replace chapters" do
+      subject.chapters.replace([chapter2, chapter3])
+      subject.chapters.should == [chapter2, chapter3]
+      subject.chapter_ids.should == [chapter2.id, chapter3.id]
+    end
+    
+    it "should add chapters with push" do
+      subject.chapters.push(chapter3)
+      subject.chapters.should == [chapter1, chapter2, chapter3]
+      subject.chapter_ids.should == [chapter1.id, chapter2.id, chapter3.id]
+    end
+    
+    it "should add chapters with unshift" do
+      subject.chapters.unshift(chapter3)
+      subject.chapters.should == [chapter3, chapter1, chapter2]
+      subject.chapter_ids.should == [chapter3.id, chapter1.id, chapter2.id]
+    end
+    
+    it "should clear chapters" do
+      subject.chapters.clear
+      subject.chapters.should be_empty
+      subject.chapter_ids.should be_empty
+    end
+    
+    it "should remove chapters with delete" do
+      subject.chapters.delete(chapter1)
+      subject.chapters.should == [chapter2]
+      subject.chapter_ids.should == [chapter2.id]
+    end
+    
+    it "should remove chapters with delete_at" do
+      subject.chapters.delete_at(0)
+      subject.chapters.should == [chapter2]
+      subject.chapter_ids.should == [chapter2.id]
+    end
+    
+    it "should remove chapters with delete_if" do
+      subject.chapters.delete_if { |c| c.id == chapter1.id }
+      subject.chapters.should == [chapter2]
+      subject.chapter_ids.should == [chapter2.id]
+    end
+    
+    it "should build a chapter" do
+      chapter4 = subject.chapters.build(:id => '4')
+      subject.chapters.should == [chapter1, chapter2, chapter4]
+      subject.chapter_ids.should == [chapter1.id, chapter2.id, chapter4.id]
+      
+      chapter4.should be_a_new_record
+      chapter4.id.should == '4'
+    end
+    
+    it "should create a chapter" do
+      chapter4 = subject.chapters.create(:id => '4')
+      subject.chapters.should == [chapter1, chapter2, chapter4]
+      subject.chapter_ids.should == [chapter1.id, chapter2.id, chapter4.id]
+      
+      chapter4.should_not be_a_new_record
+      chapter4.id.should == '4'
+    end
+    
+    it "should find chapters" do
+      # Create bogus chapters
+      Chapter.create!(:id => '999')
+      Chapter.create!(:id => '998')
+      
+      result = subject.chapters.order(:id.desc)
+      result.should == [chapter2, chapter1]
+    end
+    
+    describe "adding a non-chapter" do
+      def self.should_raise(message, &block)
+        it "should raise an AsssociationTypeMismatch error when #{message}" do
+          lambda { instance_eval(&block) }.should raise_error(AssociationTypeMismatch, "expected instance of Chapter but got NonChapter")
+        end
+      end
+      
+      should_raise("assigning an array containing non-chapters") { subject.chapters = [nonchapter] }
+      should_raise("adding a non-chapter using <<") { subject.chapters << nonchapter }
+      should_raise("adding non-chapters with concat") { subject.chapters.concat([nonchapter]) }
+      should_raise("inserting chapters") { subject.chapters.insert(1, nonchapter) }
+      should_raise("replacing chapters") { subject.chapters.replace([nonchapter]) }
+      should_raise("addding chapters with push") { subject.chapters.push(nonchapter) }
+      should_raise("addding chapters with unshift") { subject.chapters.unshift(nonchapter) }
+    end
+  end
+  
   specs_for(Document, EmbeddedDocument) do
     describe "has_many :by => :ids association" do
       define_class(:Chapter, Document)
@@ -39,129 +162,6 @@ module MongoModel
         end
       end
       
-      shared_examples_for "accessing and manipulating a has_many :by => :ids association" do
-        it "should access chapters" do
-          subject.chapters.should == [chapter1, chapter2]
-        end
-        
-        it "should access chapter ids through association" do
-          subject.chapters.ids.should == [chapter1.id, chapter2.id]
-        end
-        
-        it "should have chapter ids" do
-          subject.chapter_ids.should == [chapter1.id, chapter2.id]
-        end
-        
-        it "should add chapters with <<" do
-          subject.chapters << chapter3
-          subject.chapters.should == [chapter1, chapter2, chapter3]
-          subject.chapter_ids.should == [chapter1.id, chapter2.id, chapter3.id]
-        end
-        
-        it "should add/change chapters with []=" do
-          subject.chapters[2] = chapter3
-          subject.chapters.should == [chapter1, chapter2, chapter3]
-          subject.chapter_ids.should == [chapter1.id, chapter2.id, chapter3.id]
-        end
-        
-        it "should add chapters with concat" do
-          subject.chapters.concat([chapter3])
-          subject.chapters.should == [chapter1, chapter2, chapter3]
-          subject.chapter_ids.should == [chapter1.id, chapter2.id, chapter3.id]
-        end
-        
-        it "should insert chapters" do
-          subject.chapters.insert(1, chapter3)
-          subject.chapters.should == [chapter1, chapter3, chapter2]
-          subject.chapter_ids.should == [chapter1.id, chapter3.id, chapter2.id]
-        end
-        
-        it "should replace chapters" do
-          subject.chapters.replace([chapter2, chapter3])
-          subject.chapters.should == [chapter2, chapter3]
-          subject.chapter_ids.should == [chapter2.id, chapter3.id]
-        end
-        
-        it "should add chapters with push" do
-          subject.chapters.push(chapter3)
-          subject.chapters.should == [chapter1, chapter2, chapter3]
-          subject.chapter_ids.should == [chapter1.id, chapter2.id, chapter3.id]
-        end
-        
-        it "should add chapters with unshift" do
-          subject.chapters.unshift(chapter3)
-          subject.chapters.should == [chapter3, chapter1, chapter2]
-          subject.chapter_ids.should == [chapter3.id, chapter1.id, chapter2.id]
-        end
-        
-        it "should clear chapters" do
-          subject.chapters.clear
-          subject.chapters.should be_empty
-          subject.chapter_ids.should be_empty
-        end
-        
-        it "should remove chapters with delete" do
-          subject.chapters.delete(chapter1)
-          subject.chapters.should == [chapter2]
-          subject.chapter_ids.should == [chapter2.id]
-        end
-        
-        it "should remove chapters with delete_at" do
-          subject.chapters.delete_at(0)
-          subject.chapters.should == [chapter2]
-          subject.chapter_ids.should == [chapter2.id]
-        end
-        
-        it "should remove chapters with delete_if" do
-          subject.chapters.delete_if { |c| c.id == chapter1.id }
-          subject.chapters.should == [chapter2]
-          subject.chapter_ids.should == [chapter2.id]
-        end
-        
-        it "should build a chapter" do
-          chapter4 = subject.chapters.build(:id => '4')
-          subject.chapters.should == [chapter1, chapter2, chapter4]
-          subject.chapter_ids.should == [chapter1.id, chapter2.id, chapter4.id]
-          
-          chapter4.should be_a_new_record
-          chapter4.id.should == '4'
-        end
-        
-        it "should create a chapter" do
-          chapter4 = subject.chapters.create(:id => '4')
-          subject.chapters.should == [chapter1, chapter2, chapter4]
-          subject.chapter_ids.should == [chapter1.id, chapter2.id, chapter4.id]
-          
-          chapter4.should_not be_a_new_record
-          chapter4.id.should == '4'
-        end
-        
-        it "should find chapters" do
-          # Create bogus chapters
-          Chapter.create!(:id => '999')
-          Chapter.create!(:id => '998')
-          
-          result = subject.chapters.order(:id.desc)
-          result.should == [chapter2, chapter1]
-        end
-        
-        describe "adding a non-chapter" do
-          def self.should_raise(message, &block)
-            it "should raise an AsssociationTypeMismatch error when #{message}" do
-              lambda { instance_eval(&block) }.should raise_error(AssociationTypeMismatch, "expected instance of Chapter but got NonChapter")
-            end
-          end
-          
-          should_raise("assigning an array containing non-chapters") { subject.chapters = [nonchapter] }
-          should_raise("adding a non-chapter using <<") { subject.chapters << nonchapter }
-          should_raise("adding non-chapters with concat") { subject.chapters.concat([nonchapter]) }
-          should_raise("inserting chapters") { subject.chapters.insert(1, nonchapter) }
-          should_raise("replacing chapters") { subject.chapters.replace([nonchapter]) }
-          should_raise("addding chapters with push") { subject.chapters.push(nonchapter) }
-          should_raise("addding chapters with unshift") { subject.chapters.unshift(nonchapter) }
-        end
-      end
-      
       context "with chapters set" do
         subject { Book.new(:chapters => [chapter1, chapter2]) }
         it_should_behave_like "accessing and manipulating a has_many :by => :ids association"