mongoid 0.12.0 → 1.0.0

data/lib/mongoid/extensions/string/inflections.rb

@@ -28,6 +28,14 @@ module Mongoid #:nodoc:
         def plural?
           pluralize == self
         end
+
+        def reader
+          writer? ? gsub("=", "") : self
+        end
+
+        def writer?
+          include?("=")
+        end
       end
     end
   end

data/lib/mongoid/fields.rb

@@ -0,0 +1,58 @@
+# encoding: utf-8
+module Mongoid #:nodoc
+  module Fields #:nodoc
+    def self.included(base)
+      base.class_eval do
+        extend ClassMethods
+        # Set up the class attributes that must be available to all subclasses.
+        # These include defaults, fields
+        class_inheritable_accessor :defaults, :fields
+
+        self.defaults = {}.with_indifferent_access
+        self.fields = {}.with_indifferent_access
+
+        delegate :defaults, :fields, :to => "self.class"
+      end
+    end
+
+    module ClassMethods #:nodoc
+      # Defines all the fields that are accessable on the Document
+      # For each field that is defined, a getter and setter will be
+      # added as an instance method to the Document.
+      #
+      # Options:
+      #
+      # name: The name of the field, as a +Symbol+.
+      # options: A +Hash+ of options to supply to the +Field+.
+      #
+      # Example:
+      #
+      # <tt>field :score, :default => 0</tt>
+      def field(name, options = {})
+        set_field(name, options)
+        set_default(name, options)
+      end
+
+      protected
+      # Define a field attribute for the +Document+.
+      def set_field(name, options = {})
+        meth = options.delete(:as) || name
+        fields[name] = Field.new(name.to_s, options)
+        create_accessors(name, meth, options)
+      end
+
+      # Create the field accessors.
+      def create_accessors(name, meth, options = {})
+        define_method(meth) { read_attribute(name) }
+        define_method("#{meth}=") { |value| write_attribute(name, value) }
+        define_method("#{meth}?") { read_attribute(name) == true } if options[:type] == Boolean
+      end
+
+      # Set up a default value for a field.
+      def set_default(name, options = {})
+        value = options[:default]
+        defaults[name] = value if value
+      end
+    end
+  end
+end

data/lib/mongoid/indexes.rb

@@ -0,0 +1,30 @@
+# encoding: utf-8
+module Mongoid #:nodoc
+  module Indexes #:nodoc
+    def self.included(base)
+      base.class_eval do
+        extend ClassMethods
+
+        cattr_accessor :indexed
+        self.indexed = false
+      end
+    end
+
+    module ClassMethods #:nodoc
+      # Add the default indexes to the root document if they do not already
+      # exist. Currently this is only _type.
+      def add_indexes
+        unless indexed
+          self._collection.create_index(:_type, false)
+          self.indexed = true
+        end
+      end
+
+      # Adds an index on the field specified. Options can be :unique => true or
+      # :unique => false. It will default to the latter.
+      def index(name, options = { :unique => false })
+        collection.create_index(name, options[:unique])
+      end
+    end
+  end
+end

data/mongoid.gemspec

@@ -5,21 +5,21 @@
 
 Gem::Specification.new do |s|
   s.name = %q{mongoid}
-  s.version = "0.12.0"
+  s.version = "1.0.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Durran Jordan"]
-  s.date = %q{2010-01-08}
+  s.date = %q{2010-01-09}
   s.email = %q{durran@gmail.com}
   s.extra_rdoc_files = [
-    "README.textile"
+    "README.rdoc"
   ]
   s.files = [
     ".gitignore",
      ".watchr",
      "HISTORY",
      "MIT_LICENSE",
-     "README.textile",
+     "README.rdoc",
      "Rakefile",
      "VERSION",
      "lib/mongoid.rb",
@@ -33,6 +33,7 @@ Gem::Specification.new do |s|
      "lib/mongoid/associations/options.rb",
      "lib/mongoid/associations/proxy.rb",
      "lib/mongoid/attributes.rb",
+     "lib/mongoid/callbacks.rb",
      "lib/mongoid/commands.rb",
      "lib/mongoid/commands/create.rb",
      "lib/mongoid/commands/delete.rb",
@@ -42,6 +43,7 @@ Gem::Specification.new do |s|
      "lib/mongoid/commands/destroy_all.rb",
      "lib/mongoid/commands/save.rb",
      "lib/mongoid/complex_criterion.rb",
+     "lib/mongoid/components.rb",
      "lib/mongoid/config.rb",
      "lib/mongoid/criteria.rb",
      "lib/mongoid/document.rb",
@@ -66,8 +68,10 @@ Gem::Specification.new do |s|
      "lib/mongoid/extensions/string/inflections.rb",
      "lib/mongoid/extensions/symbol/inflections.rb",
      "lib/mongoid/extensions/time/conversions.rb",
-     "lib/mongoid/field.rb",
+     "lib/mongoid/fields.rb",
+     "lib/mongoid/fields/field.rb",
      "lib/mongoid/finders.rb",
+     "lib/mongoid/indexes.rb",
      "lib/mongoid/memoization.rb",
      "lib/mongoid/timestamps.rb",
      "lib/mongoid/versioning.rb",
@@ -90,6 +94,7 @@ Gem::Specification.new do |s|
      "spec/unit/mongoid/associations/options_spec.rb",
      "spec/unit/mongoid/associations_spec.rb",
      "spec/unit/mongoid/attributes_spec.rb",
+     "spec/unit/mongoid/callbacks_spec.rb",
      "spec/unit/mongoid/commands/create_spec.rb",
      "spec/unit/mongoid/commands/delete_all_spec.rb",
      "spec/unit/mongoid/commands/delete_spec.rb",
@@ -121,7 +126,9 @@ Gem::Specification.new do |s|
      "spec/unit/mongoid/extensions/symbol/inflections_spec.rb",
      "spec/unit/mongoid/extensions/time/conversions_spec.rb",
      "spec/unit/mongoid/field_spec.rb",
+     "spec/unit/mongoid/fields_spec.rb",
      "spec/unit/mongoid/finders_spec.rb",
+     "spec/unit/mongoid/indexes_spec.rb",
      "spec/unit/mongoid/memoization_spec.rb",
      "spec/unit/mongoid/timestamps_spec.rb",
      "spec/unit/mongoid/versioning_spec.rb",
@@ -149,6 +156,7 @@ Gem::Specification.new do |s|
      "spec/unit/mongoid/associations/options_spec.rb",
      "spec/unit/mongoid/associations_spec.rb",
      "spec/unit/mongoid/attributes_spec.rb",
+     "spec/unit/mongoid/callbacks_spec.rb",
      "spec/unit/mongoid/commands/create_spec.rb",
      "spec/unit/mongoid/commands/delete_all_spec.rb",
      "spec/unit/mongoid/commands/delete_spec.rb",
@@ -180,7 +188,9 @@ Gem::Specification.new do |s|
      "spec/unit/mongoid/extensions/symbol/inflections_spec.rb",
      "spec/unit/mongoid/extensions/time/conversions_spec.rb",
      "spec/unit/mongoid/field_spec.rb",
+     "spec/unit/mongoid/fields_spec.rb",
      "spec/unit/mongoid/finders_spec.rb",
+     "spec/unit/mongoid/indexes_spec.rb",
      "spec/unit/mongoid/memoization_spec.rb",
      "spec/unit/mongoid/timestamps_spec.rb",
      "spec/unit/mongoid/versioning_spec.rb",
@@ -194,14 +204,14 @@ Gem::Specification.new do |s|
     if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<activesupport>, [">= 2.2.2"])
       s.add_runtime_dependency(%q<mongo>, [">= 0.18.2"])
-      s.add_runtime_dependency(%q<durran-validatable>, [">= 1.8.4"])
+      s.add_runtime_dependency(%q<durran-validatable>, [">= 2.0.0"])
       s.add_runtime_dependency(%q<leshill-will_paginate>, [">= 2.3.11"])
       s.add_development_dependency(%q<rspec>, [">= 1.2.9"])
       s.add_development_dependency(%q<mocha>, [">= 0.9.8"])
     else
       s.add_dependency(%q<activesupport>, [">= 2.2.2"])
       s.add_dependency(%q<mongo>, [">= 0.18.2"])
-      s.add_dependency(%q<durran-validatable>, [">= 1.8.4"])
+      s.add_dependency(%q<durran-validatable>, [">= 2.0.0"])
       s.add_dependency(%q<leshill-will_paginate>, [">= 2.3.11"])
       s.add_dependency(%q<rspec>, [">= 1.2.9"])
       s.add_dependency(%q<mocha>, [">= 0.9.8"])
@@ -209,7 +219,7 @@ Gem::Specification.new do |s|
   else
     s.add_dependency(%q<activesupport>, [">= 2.2.2"])
     s.add_dependency(%q<mongo>, [">= 0.18.2"])
-    s.add_dependency(%q<durran-validatable>, [">= 1.8.4"])
+    s.add_dependency(%q<durran-validatable>, [">= 2.0.0"])
     s.add_dependency(%q<leshill-will_paginate>, [">= 2.3.11"])
     s.add_dependency(%q<rspec>, [">= 1.2.9"])
     s.add_dependency(%q<mocha>, [">= 0.9.8"])

data/spec/integration/mongoid/document_spec.rb

@@ -6,6 +6,21 @@ describe Mongoid::Document do
     Mongoid.database.collection(:people).drop
   end
 
+  context "when document contains a hash field" do
+
+    before do
+      @map = { "first" => 10, "second" => "Blah" }
+      @person = Person.create(:map => @map)
+    end
+
+    it "properly gets and sets the has attributes" do
+      @person.map.should == @map
+      @from_db = Person.find(@person.id)
+      @from_db.map.should == @map
+    end
+
+  end
+
   describe ".collection" do
 
     context "on a subclass of a root document" do

data/spec/unit/mongoid/attributes_spec.rb

@@ -89,6 +89,57 @@ describe Mongoid::Attributes do
 
   end
 
+  describe "#_id" do
+
+    before do
+      @person = Person.new
+    end
+
+    it "delegates to #id" do
+      @person._id.should == @person.id
+    end
+
+  end
+
+  describe "#_id=" do
+
+    before do
+      @person = Person.new
+    end
+
+    it "delegates to #id=" do
+      @id = Mongo::ObjectID.new.to_s
+      @person._id = @id
+      @person.id.should == @id
+    end
+
+  end
+
+  describe "#method_missing" do
+
+    before do
+      Mongoid.allow_dynamic_fields = true
+      @attributes = {
+        :testing => "Testing"
+      }
+      @person = Person.new(@attributes)
+    end
+
+    context "when an attribute exists" do
+
+      it "allows the getter" do
+        @person.testing.should == "Testing"
+      end
+
+      it "allows the setter" do
+        @person.testing = "Test"
+        @person.testing.should == "Test"
+      end
+
+    end
+
+  end
+
   describe "#process" do
 
     context "when attributes dont have fields defined" do
@@ -110,7 +161,7 @@ describe Mongoid::Attributes do
 
         context "when attribute is a string" do
 
-          it "adds a string field" do
+          it "adds the string to the attributes" do
             @person.attributes[:nofieldstring].should == "Testing"
           end
 
@@ -118,21 +169,12 @@ describe Mongoid::Attributes do
 
         context "when attribute is not a string" do
 
-          it "adds a properly typed field" do
+          it "adds a cast value to the attributes" do
             @person.attributes[:nofieldint].should == 5
           end
 
         end
 
-        context "when a method has been defined for the attribute" do
-
-          it "does not create the field" do
-            @person.fields.keys.should_not include("employer")
-            @person.fields.keys.should_not include("employer=")
-          end
-
-        end
-
       end
 
       context "when not allowing dynamic fields" do

data/spec/unit/mongoid/callbacks_spec.rb

@@ -0,0 +1,55 @@
+require "spec_helper"
+
+describe Mongoid::Callbacks do
+
+  describe ".included" do
+
+    before do
+      @class = Class.new do
+        include Mongoid::Callbacks
+      end
+    end
+
+    it "includes the before_create callback" do
+      @class.should respond_to(:before_create)
+    end
+
+    it "includes the after_create callback" do
+      @class.should respond_to(:after_create)
+    end
+
+    it "includes the before_destroy callback" do
+      @class.should respond_to(:before_destroy)
+    end
+
+    it "includes the after_destroy callback" do
+      @class.should respond_to(:after_destroy)
+    end
+
+    it "includes the before_save callback" do
+      @class.should respond_to(:before_save)
+    end
+
+    it "includes the after_save callback" do
+      @class.should respond_to(:after_save)
+    end
+
+    it "includes the before_update callback" do
+      @class.should respond_to(:before_update)
+    end
+
+    it "includes the after_update callback" do
+      @class.should respond_to(:after_update)
+    end
+
+    it "includes the before_validation callback" do
+      @class.should respond_to(:before_validation)
+    end
+
+    it "includes the after_validation callback" do
+      @class.should respond_to(:after_validation)
+    end
+
+  end
+
+end

data/spec/unit/mongoid/commands_spec.rb

@@ -215,7 +215,6 @@ describe Mongoid::Commands do
     end
 
     it "runs the validation callbacks" do
-      @comment.expects(:run_callbacks).with(:validate)
       @comment.expects(:run_callbacks).with(:before_validation)
       @comment.expects(:run_callbacks).with(:after_validation)
       @comment.valid?

data/spec/unit/mongoid/document_spec.rb

@@ -164,42 +164,6 @@ describe Mongoid::Document do
 
   end
 
-  describe ".defaults" do
-
-    it "returns a hash of all the default values" do
-      Game.defaults.should == { "high_score" => 500, "score" => 0 }
-    end
-
-  end
-
-  describe "#defaults" do
-
-    context "on parent classes" do
-
-      before do
-        @shape = Shape.new
-      end
-
-      it "does not return subclass defaults" do
-        @shape.defaults.should == { "x" => 0, "y" => 0 }
-      end
-
-    end
-
-    context "on subclasses" do
-
-      before do
-        @circle = Circle.new
-      end
-
-      it "has the parent and child defaults" do
-        @circle.defaults.should == { "x" => 0, "y" => 0, "radius" => 0 }
-      end
-
-    end
-
-  end
-
   describe ".embedded?" do
 
     context "when the document is embedded" do
@@ -251,113 +215,6 @@ describe Mongoid::Document do
 
   end
 
-  describe ".field" do
-
-    context "with no options" do
-
-      before do
-        Person.field(:testing)
-      end
-
-      it "adds a reader for the fields defined" do
-        @person = Person.new(:testing => "Test")
-        @person.testing.should == "Test"
-      end
-
-      it "adds a writer for the fields defined" do
-        @person = Person.new(:testing => "Test")
-        @person.testing = "Testy"
-        @person.testing.should == "Testy"
-      end
-
-    end
-
-    context "when type is an object" do
-
-      before do
-        @person = Person.new
-        @drink = MixedDrink.new(:name => "Jack and Coke")
-        @person.mixed_drink = @drink
-      end
-
-      it "allows proper access to the object" do
-        @person.mixed_drink.should == @drink
-        @person.attributes[:mixed_drink].except(:_id).except(:_type).should ==
-          { "name" => "Jack and Coke" }
-      end
-
-    end
-
-    context "when type is a boolean" do
-
-      before do
-        @person = Person.new(:terms => true)
-      end
-
-      it "adds an accessor method with a question mark" do
-        @person.terms?.should be_true
-      end
-
-    end
-
-    context "when as is specified" do
-
-      before do
-        Person.field :aliased, :as => :alias, :type => Boolean
-        @person = Person.new(:alias => true)
-      end
-
-      it "uses the alias to write the attribute" do
-        @person.expects(:write_attribute).with(:aliased, true)
-        @person.alias = true
-      end
-
-      it "uses the alias to read the attribute" do
-        @person.expects(:read_attribute).with(:aliased)
-        @person.alias
-      end
-
-      it "uses the alias for the query method" do
-        @person.expects(:read_attribute).with(:aliased)
-        @person.alias?
-      end
-
-    end
-
-  end
-
-  describe "#fields" do
-
-    context "on parent classes" do
-
-      before do
-        @shape = Shape.new
-      end
-
-      it "does not return subclass fields" do
-        @shape.fields.keys.should include("x")
-        @shape.fields.keys.should include("y")
-        @shape.fields.keys.should_not include("radius")
-      end
-
-    end
-
-    context "on subclasses" do
-
-      before do
-        @circle = Circle.new
-      end
-
-      it "has the parent and child fields" do
-        @circle.fields.keys.should include("x")
-        @circle.fields.keys.should include("y")
-        @circle.fields.keys.should include("radius")
-      end
-
-    end
-
-  end
-
   describe ".human_name" do
 
     it "returns the class name underscored and humanized" do
@@ -366,49 +223,6 @@ describe Mongoid::Document do
 
   end
 
-  describe "#_id" do
-
-    before do
-      @person = Person.new
-    end
-
-    it "delegates to #id" do
-      @person._id.should == @person.id
-    end
-
-  end
-
-  describe ".index" do
-
-    context "when unique options are not provided" do
-
-      it "delegates to collection with unique => false" do
-        @collection.expects(:create_index).with(:title, false)
-        Person.index :title
-      end
-
-    end
-
-    context "when unique option is provided" do
-
-      it "delegates to collection with unique option" do
-        @collection.expects(:create_index).with(:title, true)
-        Person.index :title, :unique => true
-      end
-
-    end
-
-    context "when indexing a subclass" do
-
-      it "sets the index on the root class collection" do
-        @canvas_collection.expects(:create_index).with(:name, true)
-        Firefox.index :name, :unique => true
-      end
-
-    end
-
-  end
-
   describe ".instantiate" do
 
     before do