mongoid-rspec 1.1.2 → 1.2.0

data/.bundle/config

@@ -1,2 +1,3 @@
 --- 
 BUNDLE_WITHOUT: ""
+BUNDLE_DISABLE_SHARED_GEMS: "1"

data/.rvmrc

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

data/Gemfile

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

data/Gemfile.lock

@@ -0,0 +1,109 @@
+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)
+      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)
+    redgreen (1.2.2)
+    rspec (2.0.0.beta.19)
+      rspec-core (= 2.0.0.beta.19)
+      rspec-expectations (= 2.0.0.beta.19)
+      rspec-mocks (= 2.0.0.beta.19)
+    rspec-core (2.0.0.beta.19)
+    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
+  ruby
+
+DEPENDENCIES
+  bson_ext (>= 1.0.4)
+  mongoid!
+  rails (= 3.0.0.rc)
+  redgreen
+  rspec-rails (>= 2.0.0.beta.19)

data/Rakefile

@@ -10,9 +10,9 @@ begin
     gem.email = "evansagge@gmail.com"
     gem.homepage = "http://github.com/evansagge/mongoid-rspec"
     gem.authors = ["Evan Sagge"]
-    gem.add_dependency "mongoid", ">= 2.0.0.beta3"
-    gem.add_dependency "bson_ext", ">= 0.20.1"    
-    gem.add_dependency "rspec-rails", ">= 2.0.0.beta.7"      
+    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 is a Gem::Specification... see http://www.rubygems.org/read/chapter/20 for additional settings
   end
   Jeweler::GemcutterTasks.new

data/VERSION

@@ -1 +1 @@
-1.1.2
+1.2.0

data/lib/matchers/associations.rb

@@ -16,12 +16,12 @@ module Mongoid
           @association = {}
           @association[:name] = name.to_s
           @association[:type] = association_type
-          begin
-            @association[:class] = name.to_s.classify.constantize
-          rescue
-          end
+          # begin
+          #   @association[:class] = name.to_s.classify.constantize
+          # rescue
+          # end
           @expectation_message = "#{type_description} #{@association[:name].inspect}"
-          @expectation_message << " of type #{@association[:class].inspect}"
+          @expectation_message << " of type #{@association[:class].inspect}" unless @association[:class].nil?
         end
         
         def of_type(klass)
@@ -56,7 +56,7 @@ module Mongoid
             @positive_result_message = "#{@actual.inspect} #{type_description(association.association, false)} #{@association[:name]}"
           end
           
-          if @association[:class] != association.klass
+          if !@association[:class].nil? and @association[:class] != association.klass
             @negative_result_message = "#{@positive_result_message} of type #{association.klass.inspect}"
             return false
           else
@@ -97,11 +97,11 @@ module Mongoid
           when EMBEDDED_IN.name
             (passive ? 'be' : 'is') << ' embedded in'
           when HAS_ONE.name
-            (passive ? 'have' : 'has') << ' one related'
+            (passive ? 'reference' : 'references') << ' one'
           when HAS_MANY.name
-            (passive ? 'have' : 'has') << ' many related'          
+            (passive ? 'reference' : 'references') << ' many'          
           when BELONGS_TO.name
-            (passive ? 'belong' : 'belongs') << ' to related'
+            (passive ? 'be referenced in' : 'referenced in')
           else
             raise "Unknown association type"
           end
@@ -123,14 +123,17 @@ module Mongoid
       def have_one_related(association_name)
         HaveAssociationMatcher.new(association_name, HAS_ONE)
       end        
+      alias :reference_one :have_one_related
       
       def have_many_related(association_name)
         HaveAssociationMatcher.new(association_name, HAS_MANY)
-      end        
+      end     
+      alias :reference_many :have_many_related   
       
       def belong_to_related(association_name)
         HaveAssociationMatcher.new(association_name, BELONGS_TO)
-      end      
+      end     
+      alias :be_referenced_in :belong_to_related 
     end 
   end
 end

data/lib/matchers/document.rb

@@ -6,15 +6,15 @@ module Mongoid
       end
 
       def of_type(type)
-        @type = type  
+        @type = type
         self
       end
-      
+
       def with_default_value_of(default)
         @default = default
         self
       end
-      
+
       def matches?(klass)
         @klass = klass.is_a?(Class) ? klass : klass.class
         @errors = []
@@ -24,11 +24,11 @@ module Mongoid
             if @type and @klass.fields[attr].type != @type
               error << " of type #{@klass.fields[attr].type}"
             end
-            
+
             if @default and @klass.fields[attr].default != @default
               error << " with default value of #{@klass.fields[attr].default}"
             end
-            
+
             @errors.push("field #{attr.inspect}" << error) unless error.blank?
           else
             @errors.push "no field named #{attr.inspect}"
@@ -52,51 +52,51 @@ module Mongoid
         desc
       end
     end
-    
+
     def have_field(*args)
       HaveFieldMatcher.new(*args)
     end
     alias_method :have_fields, :have_field
-    
+
     class SaveMatcher
       def initialize(attributes = {})
         @attributes = attributes
       end
-      
+
       def matches?(actual)
-        @actual = actual.is_a?(Class) ? 
+        @actual = actual.is_a?(Class) ?
           ( defined?(::Factory) ? ::Factory.build(actual.name.underscore, @attributes) : actual.new(@attributes)) :
           actual
         @actual.valid? and @actual.save
       end
-      
+
       def failure_message_for_should
         "Expected #{@actual.inspect} to save properly, got #{@actual.errors.full_messages.to_sentence}"
       end
-      
+
       def failure_message_for_should_not
         "Expected #{@actual.inspect} to not save, got saved instead"
       end
-      
+
       def description
         "save properly"
       end
     end
-    
+
     def save(attributes = {})
       SaveMatcher.new(attributes)
     end
-    alias_method :save_properly, :save    
-    
+    alias_method :save_properly, :save
+
   end
 end
 
-Rspec::Matchers.define :have_instance_method do |name|
+RSpec::Matchers.define :have_instance_method do |name|
   match do |klass|
     klass.instance_methods.include?(name.to_sym)
   end
-  
+
   description do
     "have instance method #{name.to_s}"
   end
-end
+end

data/lib/matchers/validations.rb

@@ -38,4 +38,4 @@ module Mongoid
       end     
     end
   end
-end
+end

data/lib/mongoid-rspec.rb

@@ -1,6 +1,7 @@
 $LOAD_PATH.unshift(File.dirname(__FILE__))
 
 require 'mongoid'
+require 'rspec'
 require 'matchers/document'
 require 'matchers/associations'
 require 'matchers/validations'
@@ -16,4 +17,4 @@ module Mongoid
     include Mongoid::Matchers::Associations
     include Mongoid::Matchers::Validations
   end
-end
+end

data/mongoid-rspec.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{mongoid-rspec}
-  s.version = "1.1.2"
+  s.version = "1.2.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Evan Sagge"]
-  s.date = %q{2010-06-08}
+  s.date = %q{2010-08-03}
   s.description = %q{RSpec matches for Mongoid models, including association and validation matchers}
   s.email = %q{evansagge@gmail.com}
   s.extra_rdoc_files = [
@@ -22,6 +22,7 @@ Gem::Specification.new do |s|
      ".gitignore",
      ".rvmrc",
      "Gemfile",
+     "Gemfile.lock",
      "LICENSE",
      "README.rdoc",
      "Rakefile",
@@ -49,7 +50,7 @@ Gem::Specification.new do |s|
   s.homepage = %q{http://github.com/evansagge/mongoid-rspec}
   s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.6}
+  s.rubygems_version = %q{1.3.7}
   s.summary = %q{RSpec matchers for Mongoid}
   s.test_files = [
     "spec/models/article.rb",
@@ -66,19 +67,19 @@ Gem::Specification.new do |s|
     current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     s.specification_version = 3
 
-    if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<mongoid>, [">= 2.0.0.beta3"])
-      s.add_runtime_dependency(%q<bson_ext>, [">= 0.20.1"])
-      s.add_runtime_dependency(%q<rspec-rails>, [">= 2.0.0.beta.7"])
+    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"])
     else
-      s.add_dependency(%q<mongoid>, [">= 2.0.0.beta3"])
-      s.add_dependency(%q<bson_ext>, [">= 0.20.1"])
-      s.add_dependency(%q<rspec-rails>, [">= 2.0.0.beta.7"])
+      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"])
     end
   else
-    s.add_dependency(%q<mongoid>, [">= 2.0.0.beta3"])
-    s.add_dependency(%q<bson_ext>, [">= 0.20.1"])
-    s.add_dependency(%q<rspec-rails>, [">= 2.0.0.beta.7"])
+    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"])
   end
 end
 

data/spec/models/article.rb

@@ -6,7 +6,7 @@ class Article
   field :published, :type => Boolean, :default => false
   
   embeds_many :comments
-  belongs_to_related :user, :inverse_of => :articles
+  referenced_in :user, :inverse_of => :articles
   
   validates :title, :presence => true
 end

data/spec/models/comment.rb

@@ -2,5 +2,5 @@ class Comment
   include Mongoid::Document
 
   embedded_in :article, :inverse_of => :comments
-  belongs_to_related :user, :inverse_of => :comments
+  referenced_in :user, :inverse_of => :comments
 end

data/spec/models/user.rb

@@ -5,8 +5,8 @@ class User
   field :email
   field :role
   
-  has_many_related :articles
-  has_many_related :comments
+  references_many :articles
+  references_many :comments
   
   embeds_one :profile
   

data/spec/spec_helper.rb

@@ -22,11 +22,11 @@ Dir[ File.join(MODELS, "*.rb") ].sort.each { |file| require File.basename(file)
 
 require 'mongoid-rspec'
 
-Rspec.configure do |config|
-  config.include Rspec::Matchers
+RSpec.configure do |config|
+  config.include RSpec::Matchers
   config.include Mongoid::Matchers
   config.mock_with :rspec
   config.after :all do
     Mongoid.master.collections.each(&:drop)
   end
-end
+end

data/spec/unit/associations_spec.rb

@@ -1,31 +1,31 @@
-require 'spec_helper'
-
-describe "Associations" do
-  describe User do
-    subject { User }
-    
-    it { should have_many_related :articles }
-    it { should have_many_related :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 belong_to_related(: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 belong_to_related(:user).as_inverse_of(:comments) }
-  end
-end
+# 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

metadata

@@ -4,9 +4,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 1
-  - 1
   - 2
-  version: 1.1.2
+  - 0
+  version: 1.2.0
 platform: ruby
 authors: 
 - Evan Sagge
@@ -14,13 +14,14 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-06-08 00:00:00 +08:00
+date: 2010-08-03 00:00:00 +08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: mongoid
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
@@ -28,28 +29,31 @@ dependencies:
         - 2
         - 0
         - 0
-        - beta3
-        version: 2.0.0.beta3
+        - beta
+        - 15
+        version: 2.0.0.beta.15
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
   name: bson_ext
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
         segments: 
-        - 0
-        - 20
         - 1
-        version: 0.20.1
+        - 0
+        - 4
+        version: 1.0.4
   type: :runtime
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
   name: rspec-rails
   prerelease: false
   requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
@@ -58,8 +62,8 @@ dependencies:
         - 0
         - 0
         - beta
-        - 7
-        version: 2.0.0.beta.7
+        - 19
+        version: 2.0.0.beta.19
   type: :runtime
   version_requirements: *id003
 description: RSpec matches for Mongoid models, including association and validation matchers
@@ -77,6 +81,7 @@ files:
 - .gitignore
 - .rvmrc
 - Gemfile
+- Gemfile.lock
 - LICENSE
 - README.rdoc
 - Rakefile
@@ -110,6 +115,7 @@ rdoc_options:
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
@@ -117,6 +123,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
@@ -126,7 +133,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.6
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: RSpec matchers for Mongoid