riot-mongoid 1.1.5 → 2.0.0.beta

data/README.md

@@ -27,6 +27,21 @@ Riot assertions for Mongoid
     end
     
 
+## Mongoid 1.9.1/ Mongoid2.0.0beta+
+
+To use riot-mongoid with Mongoid 1.9.1 do:
+
+    gem install riot-mongoid
+    
+or check out the [legacy branch](http://github.com/thumblemonks/riot-mongoid/tree/legacy)
+    
+To use riot-mongoid with Mongoid 2.0.0.beta+ do:
+
+    gem install riot-mongoid --pre
+
+or check out the [master branch](http://github.com/thumblemonks/riot-mongoid)
+
+
 ## Note on Patches/Pull Requests
  
 * Fork the project.

data/lib/riot-mongoid/has_association.rb

@@ -11,7 +11,7 @@ module RiotMongoid
       elsif assoc.nil? || assoc.macro != assoc_type.to_sym
         fail("expected #{model} to have association #{assoc_name} of type #{assoc_type}")
       else
-        options_valid = options.all? { |key,value| assoc.options.instance_variable_get("@attributes")[key] == value }
+        options_valid = options.all? { |key,value| assoc.send(key) == value }
         options_valid ? pass("#{model} has '#{assoc_type}' association '#{assoc_name}' with options #{options.inspect}") :
                         fail("expected model to have options #{options.inspect} on association #{assoc_name}")
       end

data/lib/riot-mongoid/has_validation.rb

@@ -3,20 +3,32 @@ module RiotMongoid
     register :has_validation
 
     def evaluate(model, *validation_macro_info)
-      validation_type, validation_name, options = validation_macro_info
-      validation = model.send(:all_validations).detect do |valid|
-        valid.key =~ %r{#{validation_type.to_s.camelize}} and valid.attribute == validation_name
+      validation_type, validation_field, options = validation_macro_info
+      type = validation_type.to_s
+      %w{validates_ _of}.each { |part| type.gsub!(%r{#{part}},'') }
+      validation = model.validators_on(validation_field).detect do |valid|
+        valid.class.name =~ %r{#{type.capitalize}}
       end
       options ||= {}
       case
-      when validation_name.nil? || validation_type.nil?
-        fail("validation name, type and potential options must be specified with this assertion macro")
+      when validation_field.nil? || validation_type.nil?
+        fail("validation field, type and potential options must be specified with this assertion macro")
       when validation.nil?
-        fail("expected #{model} to have validation on #{validation_name} of type #{validation_type}")
+        fail("expected #{model} to have validation on #{validation_field} of type #{validation_type}")
+      when (validation.class.name =~ %r{Length} and options.any?)
+        range = options[:within].to_a
+        if (validation.options[:minimum] == range.first) and (validation.options[:maximum] == range.last)
+          pass("#{model} has '#{validation_type}' validation '#{validation_field}' with options #{options.inspect}")
+        else
+          fail("expected #{model} to have options #{options.inspect} on validation #{validation_type}")
+        end
       else
-        options_valid = options.all? { |key,value| validation.send(key) == value }
-        options_valid ? pass("#{model} has '#{validation_type}' validation '#{validation_name}' with options #{options.inspect}") :
-                        fail("expected #{model} to have options #{options.inspect} on validation #{validation_type}")
+        options_valid = options.all? { |key,value| validation.options[key] == value }
+        if options_valid
+          pass("#{model} has '#{validation_type}' validation '#{validation_field}' with options #{options.inspect}")
+        else
+          fail("expected #{model} to have options #{options.inspect} on validation #{validation_type}")
+        end
       end
     end
   end

data/riot-mongoid.gemspec

@@ -1,13 +1,13 @@
 Gem::Specification.new do |s|
   s.name = %q{riot-mongoid}
-  s.version = "1.1.5"
+  s.version = "2.0.0.beta"
   s.required_rubygems_version = ">= 1.3.6"
-  s.authors = ["gabrielg","Arthur Chiu"]
+  s.authors = ["gabrielg", "Arthur Chiu"]
   s.date = Time.now.strftime("%Y-%m-%d")
   s.description = %q{A collection of assertion macros for testing Mongoid with Riot}
   s.email = %q{gabriel.gironda@gmail.com}
   s.extra_rdoc_files = ["README.md"]
-  s.files = %w{.document .gitignore LICENSE README.md Rakefile riot-mongoid.gemspec} + Dir.glob("{lib,test}/**/*")
+  s.files = %w{LICENSE README.md Rakefile riot-mongoid.gemspec} + Dir.glob("{lib,test}/**/*")
   s.homepage = %q{http://github.com/thumblemonks/riot-mongoid}
   s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]

data/test/has_association_test.rb

@@ -5,8 +5,7 @@ context "has_association macro" do
     test = mock_model do
       embeds_many :things
       embedded_in :another_thing, :inverse_of => :word
-      has_many_related :relations
-      has_many_related :reporters, :klass => 'Person'
+      references_many :relations
     end
   end
 
@@ -22,16 +21,12 @@ context "has_association macro" do
     RiotMongoid::HasAssociationAssertion.new.evaluate(topic, :embedded_in, :another_thing, :inverse_of => :word).last
   end.matches(/has 'embedded_in' association 'another_thing' with options \{:inverse_of=>:word\}/)
 
-  asserts "passes when the no association options are specified for a has_many_related" do
-    RiotMongoid::HasAssociationAssertion.new.evaluate(topic, :has_many_related, :relations).first
-  end.equals(:pass)
-
   asserts "passes when the association options are specified for a has_many_related" do
-    RiotMongoid::HasAssociationAssertion.new.evaluate(topic, :has_many_related, :reporters, :klass => 'Person').first
+    RiotMongoid::HasAssociationAssertion.new.evaluate(topic, :references_many, :relations).first
   end.equals(:pass)
-  
+
   asserts "fails when no association name is specified" do
-    RiotMongoid::HasAssociationAssertion.new.evaluate(topic, :has_many).first
+    RiotMongoid::HasAssociationAssertion.new.evaluate(topic, :has_many_related).first
   end.equals(:fail)
 
 end

data/test/has_validation_test.rb

@@ -6,9 +6,11 @@ context "has_validation macro" do
       field :name, :type => String
       field :rad,  :type => Boolean, :default => false
       field :surname, :type => String
+      field :role, :with => /[A-Za-z]/
 
       validates_presence_of :name, :surname
       validates_length_of :surname, :within => 4..40
+      validates_format_of :role,     :with => /[A-Za-z]/
       validates_uniqueness_of :rad
     end
   end
@@ -25,12 +27,16 @@ context "has_validation macro" do
     RiotMongoid::HasValidationAssertion.new.evaluate(topic, :validates_presence_of, :name).last
   end.matches(/has 'validates_presence_of' validation 'name'/)
 
-  asserts "passes when the validation options is specified" do
+  asserts "passes when the validation options is specified using within" do
     RiotMongoid::HasValidationAssertion.new.evaluate(topic, :validates_length_of, :surname, :within => 4..40).first
   end.equals(:pass)
 
+  asserts "passes when the validation options is specified" do
+    RiotMongoid::HasValidationAssertion.new.evaluate(topic, :validates_format_of, :role, :with => /[A-Za-z]/).first
+  end.equals(:pass)
+  
   asserts "passes when the validation options is specified and doesn't match" do
-    RiotMongoid::HasValidationAssertion.new.evaluate(topic, :validates_length_of, :surname, :within => 3..30).first
+    RiotMongoid::HasValidationAssertion.new.evaluate(topic, :validates_format_of, :role, :with => //).first
   end.equals(:fail)
 
   asserts "fails when invalid field options are specified" do

metadata

@@ -1,13 +1,14 @@
 --- !ruby/object:Gem::Specification 
 name: riot-mongoid
 version: !ruby/object:Gem::Version 
-  hash: 25
-  prerelease: false
+  hash: 31098209
+  prerelease: true
   segments: 
-  - 1
-  - 1
-  - 5
-  version: 1.1.5
+  - 2
+  - 0
+  - 0
+  - beta
+  version: 2.0.0.beta
 platform: ruby
 authors: 
 - gabrielg
@@ -16,7 +17,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-08-28 00:00:00 -07:00
+date: 2010-08-29 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -88,8 +89,6 @@ extensions: []
 extra_rdoc_files: 
 - README.md
 files: 
-- .document
-- .gitignore
 - LICENSE
 - README.md
 - Rakefile

data/.document

@@ -1,5 +0,0 @@
-README.rdoc
-lib/**/*.rb
-bin/*
-features/**/*.feature
-LICENSE

data/.gitignore

@@ -1,21 +0,0 @@
-## MAC OS
-.DS_Store
-
-## TEXTMATE
-*.tmproj
-tmtags
-
-## EMACS
-*~
-\#*
-.\#*
-
-## VIM
-*.swp
-
-## PROJECT::GENERAL
-coverage
-rdoc
-pkg
-
-## PROJECT::SPECIFIC