mongoid-rspec 1.2.0 → 1.2.1

data/.rvmrc

@@ -1 +1 @@
-rvm 1.9.2-rc2
+rvm 1.9.2

data/Gemfile

@@ -1,11 +1,9 @@
 # A sample Gemfile
 source :gemcutter
 
-gem "rails", "3.0.0.rc"
-
-gem "mongoid", :git => 'git://github.com/durran/mongoid.git'
+gem "mongoid", '>= 2.0.0.beta.15'
 gem 'bson_ext', '>= 1.0.4'
 
 gem 'redgreen'
 
-gem 'rspec-rails', ">= 2.0.0.beta.19"
+gem 'rspec', ">= 2.0.0.beta.19"

data/Gemfile.lock

@@ -1,81 +1,24 @@
-GIT
-  remote: git://github.com/durran/mongoid.git
-  revision: 93bd79e
-  specs:
-    mongoid (2.0.0.beta.15)
-      activemodel (= 3.0.0.rc)
-      bson (= 1.0.4)
-      mongo (= 1.0.6)
-      tzinfo (= 0.3.22)
-      will_paginate (~> 3.0.pre)
-
 GEM
   remote: http://rubygems.org/
   specs:
-    abstract (1.0.0)
-    actionmailer (3.0.0.rc)
-      actionpack (= 3.0.0.rc)
-      mail (~> 2.2.5)
-    actionpack (3.0.0.rc)
-      activemodel (= 3.0.0.rc)
-      activesupport (= 3.0.0.rc)
-      builder (~> 2.1.2)
-      erubis (~> 2.6.6)
-      i18n (~> 0.4.1)
-      rack (~> 1.2.1)
-      rack-mount (~> 0.6.9)
-      rack-test (~> 0.5.4)
-      tzinfo (~> 0.3.22)
     activemodel (3.0.0.rc)
       activesupport (= 3.0.0.rc)
       builder (~> 2.1.2)
       i18n (~> 0.4.1)
-    activerecord (3.0.0.rc)
-      activemodel (= 3.0.0.rc)
-      activesupport (= 3.0.0.rc)
-      arel (~> 0.4.0)
-      tzinfo (~> 0.3.22)
-    activeresource (3.0.0.rc)
-      activemodel (= 3.0.0.rc)
-      activesupport (= 3.0.0.rc)
     activesupport (3.0.0.rc)
-    arel (0.4.0)
-      activesupport (>= 3.0.0.beta)
     bson (1.0.4)
     bson_ext (1.0.4)
     builder (2.1.2)
     diff-lcs (1.1.2)
-    erubis (2.6.6)
-      abstract (>= 1.0.0)
     i18n (0.4.1)
-    mail (2.2.5)
-      activesupport (>= 2.3.6)
-      mime-types
-      treetop (>= 1.4.5)
-    mime-types (1.16)
-    mongo (1.0.6)
+    mongo (1.0.7)
       bson (>= 1.0.4)
-    nokogiri (1.4.3.1)
-    polyglot (0.3.1)
-    rack (1.2.1)
-    rack-mount (0.6.9)
-      rack (>= 1.0.0)
-    rack-test (0.5.4)
-      rack (>= 1.0)
-    rails (3.0.0.rc)
-      actionmailer (= 3.0.0.rc)
-      actionpack (= 3.0.0.rc)
-      activerecord (= 3.0.0.rc)
-      activeresource (= 3.0.0.rc)
-      activesupport (= 3.0.0.rc)
-      bundler (>= 1.0.0.rc.1)
-      railties (= 3.0.0.rc)
-    railties (3.0.0.rc)
-      actionpack (= 3.0.0.rc)
-      activesupport (= 3.0.0.rc)
-      rake (>= 0.8.3)
-      thor (~> 0.14.0)
-    rake (0.8.7)
+    mongoid (2.0.0.beta.16)
+      activemodel (= 3.0.0.rc)
+      bson (= 1.0.4)
+      mongo (= 1.0.7)
+      tzinfo (= 0.3.22)
+      will_paginate (~> 3.0.pre)
     redgreen (1.2.2)
     rspec (2.0.0.beta.19)
       rspec-core (= 2.0.0.beta.19)
@@ -85,17 +28,7 @@ GEM
     rspec-expectations (2.0.0.beta.19)
       diff-lcs (>= 1.1.2)
     rspec-mocks (2.0.0.beta.19)
-    rspec-rails (2.0.0.beta.19)
-      rspec (= 2.0.0.beta.19)
-      webrat (>= 0.7.2.beta.1)
-    thor (0.14.0)
-    treetop (1.4.8)
-      polyglot (>= 0.3.1)
     tzinfo (0.3.22)
-    webrat (0.7.2.beta.1)
-      nokogiri (>= 1.2.0)
-      rack (>= 1.0)
-      rack-test (>= 0.5.3)
     will_paginate (3.0.pre2)
 
 PLATFORMS
@@ -103,7 +36,6 @@ PLATFORMS
 
 DEPENDENCIES
   bson_ext (>= 1.0.4)
-  mongoid!
-  rails (= 3.0.0.rc)
+  mongoid (>= 2.0.0.beta.15)
   redgreen
-  rspec-rails (>= 2.0.0.beta.19)
+  rspec (>= 2.0.0.beta.19)

data/README.markdown

@@ -0,0 +1,50 @@
+mongoid-rspec
+=
+
+RSpec matchers for Mongoid.
+
+
+Association Matchers
+-
+    describe User do
+      it { should reference_many :articles }
+      it { should reference_many :comments }    
+      it { should embed_one :profile }
+      it { should reference_many(:children).stored_as(:array) }
+    end
+  
+    describe Profile do
+      it { should be_embedded_in(:user).as_inverse_of(:profile) }
+    end
+  
+    describe Article do
+      it { should be_referenced_in(:user).as_inverse_of(:articles) }
+      it { should embed_many(:comments) }
+    end
+  
+    describe Comment do
+      it { should be_embedded_in(:article).as_inverse_of(:comments) }
+      it { should be_referenced_in(:user).as_inverse_of(:comments) }
+    end
+
+Validation Matchers
+-
+    describe User do
+      it { should validate_presence_of(:login) }
+      it { should validate_uniqueness_of(:login) }    
+      it { should validate_format_of(:login).to_allow("valid_login").not_to_allow("invalid login") }
+      it { should validate_associated(:profile) }
+      it { should validate_inclusion_of(:role).to_allow("admin", "member") }
+      it { should validate_numericality_of(:age) }
+    end
+
+Others
+-
+    describe User do
+      it { should have_fields(:email, :login) }
+      it { should have_field(:active).of_type(Boolean).with_default_value_of(false) }
+      it { should have_fields(:birthdate, :registered_at).of_type(DateTime) }
+
+      # useful if you use factory_girl and have Factory(:user) defined for User
+      it { should save }
+    end

data/Rakefile

@@ -12,7 +12,7 @@ begin
     gem.authors = ["Evan Sagge"]
     gem.add_dependency "mongoid", ">= 2.0.0.beta.15"
     gem.add_dependency "bson_ext", ">= 1.0.4"
-    gem.add_dependency "rspec-rails", ">= 2.0.0.beta.19"
+    gem.add_dependency "rspec", ">= 2.0.0.beta.19"
     # gem is a Gem::Specification... see http://www.rubygems.org/read/chapter/20 for additional settings
   end
   Jeweler::GemcutterTasks.new

data/VERSION

@@ -1 +1 @@
-1.2.0
+1.2.1

data/lib/matchers/associations.rb

@@ -4,6 +4,7 @@ module Mongoid
   module Matchers
     module Associations
       HAS_MANY = defined?(Mongoid::Associations::HasManyRelated) ? Mongoid::Associations::HasManyRelated : Mongoid::Associations::ReferencesMany
+      HAS_MANY_AS_ARRAY = Mongoid::Associations::ReferencesManyAsArray
       HAS_ONE = defined?(Mongoid::Associations::HasOneRelated) ? Mongoid::Associations::HasOneRelated : Mongoid::Associations::ReferencesOne
       BELONGS_TO = defined?(Mongoid::Associations::BelongsToRelated) ? Mongoid::Associations::BelongsToRelated : Mongoid::Associations::ReferencedIn
       EMBEDS_MANY = Mongoid::Associations::EmbedsMany
@@ -37,6 +38,11 @@ module Mongoid
           self
         end
         
+        def stored_as(store_as)
+          @association[:type] = HAS_MANY_AS_ARRAY if store_as == :array
+          self
+        end
+        
         def matches?(actual)
           @actual = actual.is_a?(Class) ? actual : actual.class
           association = @actual.associations[@association[:name]]
@@ -99,11 +105,13 @@ module Mongoid
           when HAS_ONE.name
             (passive ? 'reference' : 'references') << ' one'
           when HAS_MANY.name
-            (passive ? 'reference' : 'references') << ' many'          
+            (passive ? 'reference' : 'references') << ' many'
+          when HAS_MANY_AS_ARRAY.name
+            (passive ? 'reference' : 'references') << ' many as array'
           when BELONGS_TO.name
             (passive ? 'be referenced in' : 'referenced in')
           else
-            raise "Unknown association type"
+            raise "Unknown association type '%s'" % type
           end
         end
       end      

data/mongoid-rspec.gemspec

@@ -5,16 +5,16 @@
 
 Gem::Specification.new do |s|
   s.name = %q{mongoid-rspec}
-  s.version = "1.2.0"
+  s.version = "1.2.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Evan Sagge"]
-  s.date = %q{2010-08-03}
+  s.date = %q{2010-08-25}
   s.description = %q{RSpec matches for Mongoid models, including association and validation matchers}
   s.email = %q{evansagge@gmail.com}
   s.extra_rdoc_files = [
     "LICENSE",
-     "README.rdoc"
+     "README.markdown"
   ]
   s.files = [
     ".bundle/config",
@@ -24,7 +24,7 @@ Gem::Specification.new do |s|
      "Gemfile",
      "Gemfile.lock",
      "LICENSE",
-     "README.rdoc",
+     "README.markdown",
      "Rakefile",
      "VERSION",
      "lib/matchers/associations.rb",
@@ -70,16 +70,16 @@ Gem::Specification.new do |s|
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<mongoid>, [">= 2.0.0.beta.15"])
       s.add_runtime_dependency(%q<bson_ext>, [">= 1.0.4"])
-      s.add_runtime_dependency(%q<rspec-rails>, [">= 2.0.0.beta.19"])
+      s.add_runtime_dependency(%q<rspec>, [">= 2.0.0.beta.19"])
     else
       s.add_dependency(%q<mongoid>, [">= 2.0.0.beta.15"])
       s.add_dependency(%q<bson_ext>, [">= 1.0.4"])
-      s.add_dependency(%q<rspec-rails>, [">= 2.0.0.beta.19"])
+      s.add_dependency(%q<rspec>, [">= 2.0.0.beta.19"])
     end
   else
     s.add_dependency(%q<mongoid>, [">= 2.0.0.beta.15"])
     s.add_dependency(%q<bson_ext>, [">= 1.0.4"])
-    s.add_dependency(%q<rspec-rails>, [">= 2.0.0.beta.19"])
+    s.add_dependency(%q<rspec>, [">= 2.0.0.beta.19"])
   end
 end
 

data/spec/models/user.rb

@@ -7,6 +7,7 @@ class User
   
   references_many :articles
   references_many :comments
+  references_many :children, :stored_as => :array, :class_name => "User"
   
   embeds_one :profile
   

data/spec/unit/associations_spec.rb

@@ -1,31 +1,24 @@
-# require 'spec_helper'
-# 
-# describe "Associations" do
-#   describe User do
-#     subject { User }
-#     
-#     it { should reference_many :articles }
-#     it { should reference_many :comments }    
-#     it { should embed_one :profile }
-#   end
-#   
-#   describe Profile do
-#     subject { Profile }
-#     
-#     it { should be_embedded_in(:user).as_inverse_of(:profile) }
-#   end
-#   
-#   describe Article do
-#     subject { Article }
-#     
-#     it { should be_referenced_in(:user).as_inverse_of(:articles) }
-#     it { should embed_many(:comments) }
-#   end
-#   
-#   describe Comment do
-#     subject { Comment }
-#     
-#     it { should be_embedded_in(:article).as_inverse_of(:comments) }
-#     it { should be_referenced_in(:user).as_inverse_of(:comments) }
-#   end
-# end
+require 'spec_helper'
+
+describe "Associations" do
+  describe User do
+    it { should reference_many :articles }
+    it { should reference_many :comments }    
+    it { should embed_one :profile }
+    it { should reference_many(:children).stored_as(:array) }
+  end
+  
+  describe Profile do
+    it { should be_embedded_in(:user).as_inverse_of(:profile) }
+  end
+  
+  describe Article do
+    it { should be_referenced_in(:user).as_inverse_of(:articles) }
+    it { should embed_many(:comments) }
+  end
+  
+  describe Comment do
+    it { should be_embedded_in(:article).as_inverse_of(:comments) }
+    it { should be_referenced_in(:user).as_inverse_of(:comments) }
+  end
+end

data/spec/unit/validations_spec.rb

@@ -8,7 +8,7 @@ describe "Validations" do
     it { should validate_associated(:profile) }
     it { should validate_inclusion_of(:role).to_allow("admin", "member") }
   end
-  
+
   describe Profile do
     it { should validate_numericality_of(:age) }
   end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 1
   - 2
-  - 0
-  version: 1.2.0
+  - 1
+  version: 1.2.1
 platform: ruby
 authors: 
 - Evan Sagge
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-08-03 00:00:00 +08:00
+date: 2010-08-25 00:00:00 +08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -50,7 +50,7 @@ dependencies:
   type: :runtime
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
-  name: rspec-rails
+  name: rspec
   prerelease: false
   requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
@@ -74,7 +74,7 @@ extensions: []
 
 extra_rdoc_files: 
 - LICENSE
-- README.rdoc
+- README.markdown
 files: 
 - .bundle/config
 - .document
@@ -83,7 +83,7 @@ files:
 - Gemfile
 - Gemfile.lock
 - LICENSE
-- README.rdoc
+- README.markdown
 - Rakefile
 - VERSION
 - lib/matchers/associations.rb

data/README.rdoc

@@ -1,3 +0,0 @@
-= mongoid-rspec
-
-RSpec matchers for Mongoid