crnixon-mongomapper 0.2.0 → 0.3.4

data/lib/mongomapper/pagination.rb

@@ -0,0 +1,52 @@
+module MongoMapper
+  module Pagination
+    class PaginationProxy < BasicObject
+      attr_accessor :subject
+      attr_reader :total_entries, :per_page, :current_page
+      alias limit per_page
+      
+      def initialize(total_entries, current_page, per_page=nil)
+        @total_entries    = total_entries.to_i
+        self.per_page     = per_page
+        self.current_page = current_page
+      end
+      
+      def total_pages
+        (total_entries / per_page.to_f).ceil
+      end
+      
+      def out_of_bounds?
+        current_page > total_pages
+      end
+      
+      def previous_page
+        current_page > 1 ? (current_page - 1) : nil
+      end
+      
+      def next_page
+        current_page < total_pages ? (current_page + 1) : nil
+      end
+      
+      def skip
+        (current_page - 1) * per_page
+      end
+      alias offset skip
+      
+      def method_missing(name, *args, &block)
+        @subject.send(name, *args, &block)
+      end
+      
+      private
+        def per_page=(value)
+          value = 25 if value.blank?
+          @per_page = value.to_i
+        end
+        
+        def current_page=(value)
+          value = value.to_i
+          value = 1 if value < 1
+          @current_page = value
+        end
+    end
+  end
+end

data/lib/mongomapper/rails_compatibility/document.rb

@@ -0,0 +1,15 @@
+module MongoMapper
+  module RailsCompatibility
+    module Document
+      def self.included(model)
+        model.class_eval do
+          alias_method :new_record?, :new?
+        end
+      end
+
+      def to_param
+        id
+      end
+    end
+  end
+end

data/lib/mongomapper/rails_compatibility/embedded_document.rb

@@ -0,0 +1,25 @@
+module MongoMapper
+  module RailsCompatibility
+    module EmbeddedDocument
+      def self.included(model)
+        model.class_eval do
+          extend ClassMethods
+        end
+
+        class << model
+          alias has_many many
+        end
+      end
+
+      module ClassMethods
+        def column_names
+          keys.keys
+        end
+      end
+
+      def to_param
+        raise "Missing to_param method in #{self.class}. You should implement it to return the unique identifier of this embedded document within a document."
+      end
+    end
+  end
+end

data/lib/mongomapper/serialization.rb

@@ -10,7 +10,7 @@ module MongoMapper #:nodoc:
       end
 
       def serializable_key_names
-        key_names = @record.send :defined_key_names
+        key_names = @record.attributes.keys
 
         if options[:only]
           options.delete(:except)

data/lib/mongomapper/serializers/json_serializer.rb

@@ -50,6 +50,8 @@ module MongoMapper #:nodoc:
     #         "created_at": "2006/08/01", "awesome": true,
     #         "permalink": "1-konata-izumi"}
     def to_json(options = {})
+      apply_to_json_defaults(options)
+      
       if include_root_in_json
         "{#{self.class.json_class_name}: #{JsonSerializer.new(self, options).to_s}}"
       else
@@ -73,5 +75,18 @@ module MongoMapper #:nodoc:
         @json_class_name ||= name.demodulize.underscore.inspect
       end
     end
+    
+    private
+      def apply_to_json_defaults(options)
+        unless options[:only]
+          methods = [options.delete(:methods)].flatten.compact
+          methods << :id
+          options[:methods] = methods.uniq
+        end
+
+        except = [options.delete(:except)].flatten.compact
+        except << :_id
+        options[:except] = except
+      end
   end
 end

data/lib/mongomapper/support.rb

@@ -0,0 +1,30 @@
+class BasicObject #:nodoc:
+  instance_methods.each { |m| undef_method m unless m =~ /(^__|^nil\?$|^send$|instance_eval|proxy_|^object_id$)/ }
+end unless defined?(BasicObject)
+
+class Boolean
+  def self.mm_typecast(value)
+    ['true', 't', '1'].include?(value.to_s.downcase)
+  end
+end
+
+class Object
+  # The hidden singleton lurks behind everyone
+  def metaclass
+    class << self; self end
+  end
+
+  def meta_eval(&blk)
+    metaclass.instance_eval(&blk)
+  end
+
+  # Adds methods to a metaclass
+  def meta_def(name, &blk)
+    meta_eval { define_method(name, &blk) }
+  end
+
+  # Defines an instance method within a class
+  def class_def(name, &blk)
+    class_eval { define_method(name, &blk) }
+  end
+end

data/mongomapper.gemspec

@@ -1,13 +1,18 @@
+# Generated by jeweler
+# DO NOT EDIT THIS FILE
+# Instead, edit Jeweler::Tasks in Rakefile, and run `rake gemspec`
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
   s.name = %q{mongomapper}
-  s.version = "0.2.0"
+  s.version = "0.3.4"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["John Nunemaker"]
-  s.date = %q{2009-07-07}
+  s.date = %q{2009-08-28}
+  s.default_executable = %q{mmconsole}
   s.email = %q{nunemaker@gmail.com}
+  s.executables = ["mmconsole"]
   s.extra_rdoc_files = [
     "LICENSE",
      "README.rdoc"
@@ -19,86 +24,122 @@ Gem::Specification.new do |s|
      "README.rdoc",
      "Rakefile",
      "VERSION",
+     "bin/mmconsole",
      "lib/mongomapper.rb",
      "lib/mongomapper/associations.rb",
-     "lib/mongomapper/associations/array_proxy.rb",
      "lib/mongomapper/associations/base.rb",
+     "lib/mongomapper/associations/belongs_to_polymorphic_proxy.rb",
      "lib/mongomapper/associations/belongs_to_proxy.rb",
-     "lib/mongomapper/associations/has_many_embedded_proxy.rb",
-     "lib/mongomapper/associations/has_many_proxy.rb",
-     "lib/mongomapper/associations/polymorphic_belongs_to_proxy.rb",
+     "lib/mongomapper/associations/many_documents_as_proxy.rb",
+     "lib/mongomapper/associations/many_documents_proxy.rb",
+     "lib/mongomapper/associations/many_embedded_polymorphic_proxy.rb",
+     "lib/mongomapper/associations/many_embedded_proxy.rb",
+     "lib/mongomapper/associations/many_polymorphic_proxy.rb",
+     "lib/mongomapper/associations/many_proxy.rb",
      "lib/mongomapper/associations/proxy.rb",
      "lib/mongomapper/callbacks.rb",
      "lib/mongomapper/document.rb",
+     "lib/mongomapper/dynamic_finder.rb",
      "lib/mongomapper/embedded_document.rb",
      "lib/mongomapper/finder_options.rb",
      "lib/mongomapper/key.rb",
      "lib/mongomapper/observing.rb",
-     "lib/mongomapper/rails_compatibility.rb",
+     "lib/mongomapper/pagination.rb",
+     "lib/mongomapper/rails_compatibility/document.rb",
+     "lib/mongomapper/rails_compatibility/embedded_document.rb",
      "lib/mongomapper/save_with_validation.rb",
      "lib/mongomapper/serialization.rb",
      "lib/mongomapper/serializers/json_serializer.rb",
+     "lib/mongomapper/support.rb",
      "lib/mongomapper/validations.rb",
      "mongomapper.gemspec",
-     "test/serializers/test_json_serializer.rb",
-     "test/test_associations.rb",
-     "test/test_callbacks.rb",
-     "test/test_document.rb",
-     "test/test_embedded_document.rb",
-     "test/test_finder_options.rb",
+     "test/NOTE_ON_TESTING",
+     "test/functional/associations/test_belongs_to_polymorphic_proxy.rb",
+     "test/functional/associations/test_belongs_to_proxy.rb",
+     "test/functional/associations/test_many_documents_as_proxy.rb",
+     "test/functional/associations/test_many_embedded_polymorphic_proxy.rb",
+     "test/functional/associations/test_many_embedded_proxy.rb",
+     "test/functional/associations/test_many_polymorphic_proxy.rb",
+     "test/functional/associations/test_many_proxy.rb",
+     "test/functional/test_associations.rb",
+     "test/functional/test_callbacks.rb",
+     "test/functional/test_document.rb",
+     "test/functional/test_pagination.rb",
+     "test/functional/test_rails_compatibility.rb",
+     "test/functional/test_validations.rb",
+     "test/models.rb",
      "test/test_helper.rb",
-     "test/test_key.rb",
-     "test/test_mongomapper.rb",
-     "test/test_observing.rb",
-     "test/test_rails_compatibility.rb",
-     "test/test_serializations.rb",
-     "test/test_validations.rb"
+     "test/unit/serializers/test_json_serializer.rb",
+     "test/unit/test_association_base.rb",
+     "test/unit/test_document.rb",
+     "test/unit/test_embedded_document.rb",
+     "test/unit/test_finder_options.rb",
+     "test/unit/test_key.rb",
+     "test/unit/test_mongomapper.rb",
+     "test/unit/test_observing.rb",
+     "test/unit/test_pagination.rb",
+     "test/unit/test_rails_compatibility.rb",
+     "test/unit/test_serializations.rb",
+     "test/unit/test_validations.rb"
   ]
-  s.has_rdoc = true
   s.homepage = %q{http://github.com/jnunemaker/mongomapper}
   s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
   s.rubyforge_project = %q{mongomapper}
-  s.rubygems_version = %q{1.3.1}
+  s.rubygems_version = %q{1.3.5}
   s.summary = %q{Awesome gem for modeling your domain and storing it in mongo}
   s.test_files = [
-    "test/serializers/test_json_serializer.rb",
-     "test/test_associations.rb",
-     "test/test_callbacks.rb",
-     "test/test_document.rb",
-     "test/test_embedded_document.rb",
-     "test/test_finder_options.rb",
+    "test/functional/associations/test_belongs_to_polymorphic_proxy.rb",
+     "test/functional/associations/test_belongs_to_proxy.rb",
+     "test/functional/associations/test_many_documents_as_proxy.rb",
+     "test/functional/associations/test_many_embedded_polymorphic_proxy.rb",
+     "test/functional/associations/test_many_embedded_proxy.rb",
+     "test/functional/associations/test_many_polymorphic_proxy.rb",
+     "test/functional/associations/test_many_proxy.rb",
+     "test/functional/test_associations.rb",
+     "test/functional/test_callbacks.rb",
+     "test/functional/test_document.rb",
+     "test/functional/test_pagination.rb",
+     "test/functional/test_rails_compatibility.rb",
+     "test/functional/test_validations.rb",
+     "test/models.rb",
      "test/test_helper.rb",
-     "test/test_key.rb",
-     "test/test_mongomapper.rb",
-     "test/test_observing.rb",
-     "test/test_rails_compatibility.rb",
-     "test/test_serializations.rb",
-     "test/test_validations.rb"
+     "test/unit/serializers/test_json_serializer.rb",
+     "test/unit/test_association_base.rb",
+     "test/unit/test_document.rb",
+     "test/unit/test_embedded_document.rb",
+     "test/unit/test_finder_options.rb",
+     "test/unit/test_key.rb",
+     "test/unit/test_mongomapper.rb",
+     "test/unit/test_observing.rb",
+     "test/unit/test_pagination.rb",
+     "test/unit/test_rails_compatibility.rb",
+     "test/unit/test_serializations.rb",
+     "test/unit/test_validations.rb"
   ]
 
   if s.respond_to? :specification_version then
     current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
-    s.specification_version = 2
+    s.specification_version = 3
 
     if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<activesupport>, [">= 0"])
-      s.add_runtime_dependency(%q<mongodb-mongo>, ["= 0.9"])
-      s.add_runtime_dependency(%q<jnunemaker-validatable>, ["= 1.7.1"])
-      s.add_development_dependency(%q<mocha>, ["= 0.9.4"])
-      s.add_development_dependency(%q<jnunemaker-matchy>, ["= 0.4.0"])
+      s.add_runtime_dependency(%q<mongodb-mongo>, [">= 0.11.1"])
+      s.add_runtime_dependency(%q<jnunemaker-validatable>, [">= 1.7.2"])
+      s.add_development_dependency(%q<mocha>, [">= 0.9.4"])
+      s.add_development_dependency(%q<jnunemaker-matchy>, [">= 0.4.0"])
     else
       s.add_dependency(%q<activesupport>, [">= 0"])
-      s.add_dependency(%q<mongodb-mongo>, ["= 0.9"])
-      s.add_dependency(%q<jnunemaker-validatable>, ["= 1.7.1"])
-      s.add_dependency(%q<mocha>, ["= 0.9.4"])
-      s.add_dependency(%q<jnunemaker-matchy>, ["= 0.4.0"])
+      s.add_dependency(%q<mongodb-mongo>, [">= 0.11.1"])
+      s.add_dependency(%q<jnunemaker-validatable>, [">= 1.7.2"])
+      s.add_dependency(%q<mocha>, [">= 0.9.4"])
+      s.add_dependency(%q<jnunemaker-matchy>, [">= 0.4.0"])
     end
   else
     s.add_dependency(%q<activesupport>, [">= 0"])
-    s.add_dependency(%q<mongodb-mongo>, ["= 0.9"])
-    s.add_dependency(%q<jnunemaker-validatable>, ["= 1.7.1"])
-    s.add_dependency(%q<mocha>, ["= 0.9.4"])
-    s.add_dependency(%q<jnunemaker-matchy>, ["= 0.4.0"])
+    s.add_dependency(%q<mongodb-mongo>, [">= 0.11.1"])
+    s.add_dependency(%q<jnunemaker-validatable>, [">= 1.7.2"])
+    s.add_dependency(%q<mocha>, [">= 0.9.4"])
+    s.add_dependency(%q<jnunemaker-matchy>, [">= 0.4.0"])
   end
 end

data/test/NOTE_ON_TESTING

@@ -0,0 +1 @@
+I am doing my best to keep unit and functional tests separate. As I see them, functional tests hit the database and should never care about internals. Unit tests do not hit the database.

data/test/functional/associations/test_belongs_to_polymorphic_proxy.rb

@@ -0,0 +1,53 @@
+require 'test_helper'
+require 'models'
+
+class BelongsToPolymorphicProxyTest < Test::Unit::TestCase
+  def setup
+    clear_all_collections
+  end
+  
+  should "default to nil" do
+    status = Status.new
+    status.target.should be_nil
+  end
+
+  should "be able to replace the association" do
+    status = Status.new
+    project = Project.new(:name => "mongomapper")
+    status.target = project
+    status.save.should be_true
+
+    from_db = Status.find(status.id)
+    from_db.target.should_not be_nil
+    from_db.target_id.should == project.id
+    from_db.target_type.should == "Project"
+    from_db.target.name.should == "mongomapper"
+  end
+
+  should "unset the association" do
+    status = Status.new
+    project = Project.new(:name => "mongomapper")
+    status.target = project
+    status.save.should be_true
+
+    from_db = Status.find(status.id)
+    from_db.target = nil
+    from_db.target_type.should be_nil
+    from_db.target_id.should be_nil
+    from_db.target.should be_nil
+  end
+  
+  context "association id set but document not found" do
+    setup do
+      @status = Status.new
+      project = Project.new(:name => "mongomapper")
+      @status.target = project
+      @status.save.should be_true
+      project.destroy
+    end
+
+    should "return nil instead of raising error" do
+      @status.target.should be_nil
+    end
+  end
+end

data/test/functional/associations/test_belongs_to_proxy.rb

@@ -0,0 +1,45 @@
+require 'test_helper'
+require 'models'
+
+class BelongsToProxyTest < Test::Unit::TestCase
+  def setup
+    clear_all_collections
+  end
+  
+  should "default to nil" do
+    status = Status.new
+    status.project.should be_nil
+  end
+  
+  should "be able to replace the association" do
+    status = Status.new
+    project = Project.new(:name => "mongomapper")
+    status.project = project
+    status.save.should be_true
+    
+    from_db = Status.find(status.id)
+    from_db.project.should_not be_nil
+    from_db.project.name.should == "mongomapper"
+  end
+  
+  should "unset the association" do
+    status = Status.new
+    project = Project.new(:name => "mongomapper")
+    status.project = project
+    status.save.should be_true
+    
+    from_db = Status.find(status.id)
+    from_db.project = nil
+    from_db.project.should be_nil
+  end
+  
+  context "association id set but document not found" do
+    setup do
+      @status = Status.new(:name => 'Foo', :project_id => '1234')
+    end
+
+    should "return nil instead of raising error" do
+      @status.project.should be_nil
+    end
+  end
+end