mongoid-rspec 1.5.5 → 1.5.6

data/lib/matchers/document.rb

@@ -5,6 +5,11 @@ module Mongoid
         @attributes = attrs.collect(&:to_s)
       end
 
+      def localized
+        @localized = true
+        self
+      end
+
       def of_type(type)
         @type = type
         self
@@ -43,6 +48,13 @@ module Mongoid
             end
 
             @errors.push("field #{attr.inspect}" << error) unless error.blank?
+
+            if @localized
+              unless @klass.fields[attr].localized?
+                @errors.push "is not localized #{attr.inspect}"
+              end
+            end
+            
           else
             @errors.push "no field named #{attr.inspect}"
           end

data/lib/matchers/indexes.rb

@@ -4,31 +4,31 @@ module Mongoid
       def initialize(index_fields)
         @index_fields = index_fields.symbolize_keys!
       end
-      
-      def with_options(options = {})
+
+      def with_options(options = { })
         @options = options
         self
       end
-      
+
       def matches?(klass)
-        @klass = klass.is_a?(Class) ? klass : klass.class
+        @klass  = klass.is_a?(Class) ? klass : klass.class
         @errors = []
-        
+
         unless @klass.index_options[@index_fields]
           @errors.push "no index for #{@index_fields}"
         else
           if !@options.nil? && !@options.empty?
             @options.each do |option, option_value|
-              if @klass.index_options[@index_fields].include?(option) && @klass.index_options[@index_fields][option] != option_value
+              if @klass.index_options[@index_fields][option] != option_value
                 @errors.push "index for #{@index_fields.inspect} with options of #{@klass.index_options[@index_fields].inspect}"
               end
             end
           end
         end
-        
+
         @errors.empty?
       end
-      
+
       def failure_message_for_should
         "Expected #{@klass.inspect} to #{description}, got #{@errors.to_sentence}"
       end

data/lib/matchers/validations.rb

@@ -36,7 +36,7 @@ module Mongoid
         end
 
         def description
-          desc = "validate #{@type} of #{@field.inspect}"
+          desc = "have #{@type.inspect} validator on #{@field.inspect}"
           desc << " on #{@options[:on]}" if @options[:on]
           desc
         end

data/lib/matchers/validations/inclusion_of.rb

@@ -1,23 +1,23 @@
 module Mongoid
   module Matchers
-    module Validations  
+    module Validations
       class ValidateInclusionOfMatcher < HaveValidationMatcher
         def initialize(name)
           super(name, :inclusion)
         end
-        
+
         def to_allow(*values)
           @allowed_values = values.map(&:to_a).flatten
           self
         end
-        
+
         def matches?(actual)
           return false unless result = super(actual)
 
           if @allowed_values
             raw_validator_allowed_values = @validator.options[:in]
 
-            validator_allowed_values = case raw_validator_allowed_values 
+            validator_allowed_values = case raw_validator_allowed_values
             when Range then raw_validator_allowed_values.to_a
             when Proc then raw_validator_allowed_values.call(actual)
             else raw_validator_allowed_values end
@@ -26,24 +26,24 @@ module Mongoid
             if not_allowed_values.empty?
               @positive_result_message = @positive_result_message << " allowing all values mentioned"
             else
-              @negative_result_message = @negative_result_message << " not allowing the following the ff. values: #{not_allowed_values.inspect}"
+              @negative_result_message = @negative_result_message << " not allowing these values: #{not_allowed_values.inspect}"
               result = false
             end
           end
-          
-          result          
+
+          result
         end
-        
+
         def description
           options_desc = []
-          options_desc << " allowing the ff. values: #{@allowed_values}" if @allowed_values                
+          options_desc << " allowing these values: #{@allowed_values}" if @allowed_values
           super << options_desc.to_sentence
-        end 
+        end
       end
 
       def validate_inclusion_of(field)
         ValidateInclusionOfMatcher.new(field)
-      end       
+      end
     end
   end
-end  
+end

data/lib/matchers/validations/length_of.rb

@@ -10,11 +10,13 @@ module Mongoid
           @maximum = value
           self
         end
+        alias :less_than :with_maximum
 
         def with_minimum(value)
           @minimum = value
           self
         end
+        alias :greater_than :with_minimum
 
         def within(value)
           @within = value
@@ -41,55 +43,82 @@ module Mongoid
 
         def description
           options_desc = []
-          options_desc << " with maximum #{@maximum}" if @maximum
-          options_desc << " with minimum #{@minimum}" if @minimum
-          options_desc << " within range #{@within}" if @within
-          options_desc << " as exactly #{@is}" if @is
-          super << options_desc.to_sentence
+          options_desc << "with minimum of #{@minimum}" if @minimum
+          options_desc << "with maximum of #{@maximum}" if @maximum
+          options_desc << "within the range of #{@within}" if @within
+          options_desc << "as exactly #{@is}" if @is
+          super << " #{options_desc.to_sentence}"
         end
 
         private
 
         def check_maximum
-          actual = @validator.options[:maximum]
-          if actual == @maximum
+          if actual_max.nil?
+            @negative_result_message << " with no maximum"
+            @result = false
+          elsif actual_max == @maximum
             @positive_result_message << " with maximum of #{@maximum}"
           else
-            @negative_result_message << " with maximum of #{actual}"
+            @negative_result_message << " with maximum of #{actual_max}"
             @result = false
           end
         end
 
         def check_minimum
-          actual = @validator.options[:minimum]
-          if actual == @minimum
+          if actual_min.nil?
+            @negative_result_message << " with no minimum"
+            @result = false
+          elsif actual_min == @minimum
             @positive_result_message << " with minimum of #{@minimum}"
           else
-            @negative_result_message << " with minimum of #{actual}"
+            @negative_result_message << " with minimum of #{actual_min}"
             @result = false
           end
         end
 
         def check_range
           min, max = [@within.min, @within.max]
-          actual = @validator.options
-          if actual[:minimum] == min && actual[:maximum] == max
-            @positive_result_message << " with range #{@within.inspect}"
+          if !actual_min.nil? and actual_max.nil?
+            @negative_result_message << " with no minimum but with maximum of #{actual_max}"
+            @result = false
+          elsif actual_min.nil? and !actual_max.nil?
+            @negative_result_message << " with minimum_of #{actual_min} but no maximum"
+            @result = false
+          elsif actual_min.nil? and actual_max.nil?
+            @negative_result_message << " with no minimum and maximum"
+            @result = false
+          elsif actual_min == min && actual_max == max
+            @positive_result_message << " within the range of #{@within.inspect}"
           else
-            @negative_result_message << " with range #{(actual[:minimum]..actual[:maximum]).inspect}"
+            @negative_result_message << " within the range of #{(actual_min..actual_max).inspect}"
             @result = false
           end
         end
 
         def check_exact
-          actual = @validator.options[:is]
-          if actual == @is
-            @positive_result_message << " is exactly #{@is}"
+          if actual_is == @is
+            @positive_result_message << " as exactly #{@is}"
           else
-            @negative_result_message << " is exactly #{actual}"
+            @negative_result_message << " as exactly #{actual_is}"
             @result = false
           end
         end
+
+        def actual_is
+          actual_is = @validator.options[:is]
+        end
+
+        def actual_min
+          @validator.options[:minimum] || ((@validator.options[:in] || @validator.options[:within]).try(&:min)).tap do |x|
+            puts "minimum: #{x}, #{@validator.options}"
+          end
+        end
+
+        def actual_max
+          @validator.options[:maximum] || ((@validator.options[:in] || @validator.options[:within]).try(&:max)).tap do |x|
+            puts "maximum: #{x}"
+          end
+        end
       end
 
       def validate_length_of(field)

data/lib/mongoid-rspec/version.rb

@@ -1,5 +1,5 @@
 module Mongoid
   module Rspec
-    VERSION = "1.5.5"
+    VERSION = "1.5.6"
   end
 end

data/spec/models/article.rb

@@ -5,7 +5,7 @@ class Article
   include Mongoid::Versioning
   include Mongoid::MultiParameterAttributes
 
-  field :title
+  field :title, :localize => true
   field :content
   field :published, :type => Boolean, :default => false
   field :allow_comments, :type => Boolean, :default => true
@@ -17,7 +17,8 @@ class Article
 
   validates :title, :presence => true
 
-  validates_length_of :title, :minimum => 8, :maximum => 16
+  validates_length_of :title, :within => 8..16
+  validates_length_of :content, :minimum => 200
 
   index({ title: 1 }, { unique: true, background: true })
   index({ published: 1 })

data/spec/unit/document_spec.rb

@@ -11,6 +11,8 @@ describe "Document" do
   describe Article do
     it { should have_field(:published).of_type(Boolean).with_default_value_of(false) }
     it { should have_field(:allow_comments).of_type(Boolean).with_default_value_of(true) }
+    it { should belong_to(:author) }
+    it { should have_field(:title).localized }
     it { should_not have_field(:allow_comments).of_type(Boolean).with_default_value_of(false) }
     it { should_not have_field(:number_of_comments).of_type(Integer).with_default_value_of(1) }
     it { should be_mongoid_document }

data/spec/unit/validations_spec.rb

@@ -30,6 +30,8 @@ describe "Validations" do
 
   describe Article 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) }
   end
 
   describe MovieArticle do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mongoid-rspec
 version: !ruby/object:Gem::Version
-  version: 1.5.5
+  version: 1.5.6
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-28 00:00:00.000000000 Z
+date: 2013-01-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -133,7 +133,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: mongoid-rspec
-rubygems_version: 1.8.24
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: RSpec matchers for Mongoid
@@ -156,3 +156,4 @@ test_files:
 - spec/unit/indexes_spec.rb
 - spec/unit/validations_spec.rb
 - spec/validators/ssn_validator.rb
+has_rdoc: