mongoid-rspec 1.8.1 → 1.8.2

data/README.md

@@ -62,6 +62,10 @@ Association Matchers
       it { should belong_to(:user).as_inverse_of(:record) }
     end
 
+    describe Site do
+      it { should have_many(:users).as_inverse_of(:site).ordered_by(:email.asc) }
+    end
+
 Mass Assignment Matcher
 -
     describe User do

data/lib/matchers/associations.rb

@@ -43,6 +43,12 @@ module Mongoid
           raise "#{@association[:type].inspect} does not respond to :order" unless [HAS_MANY, HAS_AND_BELONGS_TO_MANY, EMBEDS_MANY].include?(@association[:type])
           @association[:order] = association_field_name.to_s
           @expectation_message << " ordered by #{@association[:order].inspect}"
+
+          if association_field_name.is_a? Origin::Key
+            @association[:order_operator] = association_field_name.operator
+            @expectation_message << " #{order_way(@association[:order_operator])}"
+          end
+
           self
         end
 
@@ -124,6 +130,15 @@ module Mongoid
             end
           end
 
+          if @association[:order_operator]
+            if @association[:order_operator] != metadata.order.operator
+              @negative_result_message = "#{@positive_result_message} #{order_way(@association[:order_operator] * -1)}"
+              return false
+            else
+              @positive_result_message = "#{@positive_result_message} #{order_way(@association[:order_operator])}"
+            end
+          end
+
           if @association[:dependent]
             if @association[:dependent].to_s != metadata.dependent.to_s
               @negative_result_message = "#{@positive_result_message} which specified dependent as #{metadata.dependent}"
@@ -205,6 +220,12 @@ module Mongoid
             raise "Unknown association type '%s'" % type
           end
         end
+
+        private
+
+        def order_way(operator)
+          [nil, "ascending", "descending"][operator]
+        end
       end
 
       def embed_one(association_name)

data/lib/matchers/validations.rb

@@ -13,7 +13,9 @@ module Mongoid
         def matches?(actual)
           @klass = actual.is_a?(Class) ? actual : actual.class
 
-          @validator = @klass.validators_on(@field).detect{|v| v.kind.to_s == @type}
+          @validator = @klass.validators_on(@field).detect{ |v|
+            v.kind.to_s == @type and (!v.options[:on] or on_options_matches?(v))
+          }
 
           if @validator
             @negative_result_message = "#{@type.inspect} validator on #{@field.inspect}"
@@ -52,7 +54,7 @@ module Mongoid
           if validator_on_methods.any?
             message = " on methods: #{validator_on_methods}"
 
-            if (@options[:on] - validator_on_methods).empty?
+            if on_options_covered_by?( @validator )
               @positive_result_message << message
             else
               @negative_result_message << message
@@ -60,6 +62,16 @@ module Mongoid
             end
           end
         end
+
+        private
+
+        def on_options_matches?(validator)
+          @options[:on] and validator.options[:on] and on_options_covered_by?(validator)
+        end
+
+        def on_options_covered_by?(validator)
+          ([@options[:on]].flatten - [validator.options[:on]].flatten).empty?
+        end
       end
     end
   end

data/lib/mongoid-rspec/version.rb

@@ -1,5 +1,5 @@
 module Mongoid
   module Rspec
-    VERSION = "1.8.1"
+    VERSION = "1.8.2"
   end
 end

data/spec/models/article.rb

@@ -10,6 +10,7 @@ class Article
   field :published, :type => Boolean, :default => false
   field :allow_comments, :type => Boolean, :default => true
   field :number_of_comments, :type => Integer
+  field :status, :type => Symbol
 
   embeds_many :comments
   embeds_one :permalink
@@ -17,6 +18,9 @@ class Article
 
   validates :title, :presence => true
 
+  validates_inclusion_of :status, :in => [:pending], :on => :create
+  validates_inclusion_of :status, :in => [:approved, :rejected ], :on => :update
+
   validates_length_of :title, :within => 8..16
   validates_length_of :content, :minimum => 200
 

data/spec/models/site.rb

@@ -3,8 +3,8 @@ class Site
 
   field :name
 
-  has_many :users, :inverse_of => :site
+  has_many :users, :inverse_of => :site, :order => :email.desc
 
   validates :name, :presence => true, :uniqueness => true
 
-end
+end

data/spec/unit/associations_spec.rb

@@ -37,6 +37,6 @@ describe "Associations" do
   end
 
   describe Site do
-    it { should have_many(:users).as_inverse_of(:site) }
+    it { should have_many(:users).as_inverse_of(:site).ordered_by(:email.desc) }
   end
 end

data/spec/unit/validations_spec.rb

@@ -33,6 +33,8 @@ describe "Validations" do
     it { should validate_length_of(:title).within(8..16) }
     it { should_not validate_length_of(:content).greater_than(200).less_than(16) }
     it { should validate_length_of(:content).greater_than(200) }
+    it { should validate_inclusion_of(:status).to_allow([:pending]).on( :create ) }
+    it { should validate_inclusion_of(:status).to_allow([:approved, :rejected]).on( :update ) }
   end
 
   describe MovieArticle do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mongoid-rspec
 version: !ruby/object:Gem::Version
-  version: 1.8.1
+  version: 1.8.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-03 00:00:00.000000000 Z
+date: 2013-05-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -130,7 +130,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3977837244165332206
+      hash: 1210204238905216362
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -139,7 +139,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3977837244165332206
+      hash: 1210204238905216362
 requirements: []
 rubyforge_project: mongoid-rspec
 rubygems_version: 1.8.25