riot-mongoid 2.0.0.beta.rc.7 → 2.1.0

data/README.md

@@ -4,51 +4,46 @@ Riot assertions for Mongoid
 
 ## Examples
 
-    context "Photo Model" do
+```ruby
+context "Photo Model" do
 
-      context 'definition' do
-        setup { Photo }
+  context 'definition' do
+    setup { Photo }
 
-        # field associations
-        asserts_topic.has_field :title,   :type => String
-        asserts_topic.has_field :caption, :type => String, :default => ""
+    # field associations
+    asserts_topic.has_field :title,   :type => String
+    asserts_topic.has_field :caption, :type => String, :default => ""
 
-        # association assertions
-        asserts_topic.has_association :referenced_in,   :account
-        asserts_topic.has_association :references_many, :comments
-        asserts_topic.has_association :embedded_in,     :customer, :class_name => "Person"
+    # association assertions
+    asserts_topic.has_association :referenced_in,   :account
+    asserts_topic.has_association :references_many, :comments
+    asserts_topic.has_association :embedded_in,     :customer, :class_name => "Person"
 
-        # validation assertions
-        asserts_topic.has_validation :validates_presence_of, :caption
+    # validation assertions
+    asserts_topic.has_validation :validates_presence_of, :caption
 
-        # support for custom validators, see the tests for a complete example
-        validates :states, :inclusion_of_set => { :in => [1, 2, 3] }
+    # support for custom validators, see the tests for a complete example
+    validates :states, :inclusion_of_set => { :in => [1, 2, 3] }
 
-        # key assertions
-        asserts_topic.has_key :title, :caption
-      end
-    end
+    # key assertions
+    asserts_topic.has_key :title, :caption
+  end
+end
+```
 
 
-## Mongoid 1.9.1/ Mongoid2.0.0beta+ / Mongoid2.0.0.rc.7
+## Mongoid 1.9.1
 
-To use riot-mongoid with Mongoid 1.9.1 do:
+To use riot-mongoid with Mongoid 1.9.1 check out the [legacy branch](http://github.com/thumblemonks/riot-mongoid/tree/legacy)
 
-    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:
+## Mongoid 2.1.x
 
-    gem install riot-mongoid -v 2.0.0.beta.2
+To use riot-mongoid with Mongoid 2.1.x do:
 
-or check out the [beta20 branch](http://github.com/thumblemonks/riot-mongoid/tree/beta20)
-
-For Mongoid 2.0.0.rc.7 do:
+    gem install riot-mongoid
 
-    gem install riot-mongoid --pre
+or check out the [master branch](http://github.com/thumblemonks/riot-mongoid/tree/beta20)
 
-or check out the [master branch](http://github.com/thumblemonks/riot-mongoid)
 
 ## Note on Patches/Pull Requests
 

data/lib/riot-mongoid/has_association.rb

@@ -2,19 +2,20 @@ module RiotMongoid
   class HasAssociationAssertion < Riot::AssertionMacro
     register :has_association
 
-    def evaluate(model, *association_macro_info)
-      assoc_type, assoc_name, options = association_macro_info
-      assoc = model.relations[assoc_name.to_s]
-      options ||= {}
-      if assoc_name.nil?
-        fail("association name and potential options must be specified with this assertion macro")
-      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.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}")
+    def evaluate(model, type, field, options = {})
+      fail_msg = "expected #{model.class.to_s} to have assocation '#{type} :#{field}'"
+      pass_msg = "#{model.class.to_s} has association '#{type} :#{field}'"
+      opt_msg  = " with options #{options.inspect}"
+      assoc    = model.relations[field.to_s]
+
+      return fail(fail_msg) if assoc.nil? || assoc.macro != type.to_sym
+
+      unless options.empty?
+        return fail(fail_msg + opt_msg) unless options.all? { |k, v| assoc.send(k) == v }
+        return pass(pass_msg + opt_msg)
       end
+
+      pass pass_msg
     end
   end
 end

data/lib/riot-mongoid/has_field.rb

@@ -2,18 +2,20 @@ module RiotMongoid
   class HasFieldAssertion < Riot::AssertionMacro
     register :has_field
 
-    def evaluate(model, *macro_info)
-      field_name, options = macro_info
-      field = model.fields[field_name.to_s]
-      # if options.nil? || options.empty?
-      #   fail("field options must be specified with this assertion macro")
-      if field.nil?
-        fail("expected #{model} to have field #{field_name}")
-      else
-        options_valid = options.all? { |key,value| field.send(key) == value }
-        options_valid ? pass("#{model} has field '#{field_name}' with options #{options.inspect}") :
-                        fail("expected model to have options #{options.inspect} on field #{field_name}")
+    def evaluate(model, field_name, options = {})
+      fail_msg = "expected #{model.class.to_s} to have field :#{field_name}"
+      pass_msg = "#{model.class.to_s} has field :#{field_name}"
+      opt_msg  = " with options #{options.inspect}"
+      field    = model.fields[field_name.to_s]
+
+      return fail(fail_msg) if field.nil?
+
+      unless options.empty?
+        return fail(fail_msg + opt_msg) unless options.all? { |k,v| field.send(k) == v }
+        return pass(pass_msg + opt_msg)
       end
+
+      pass pass_msg
     end
   end
-end
+end

data/lib/riot-mongoid/has_validation.rb

@@ -2,41 +2,33 @@ module RiotMongoid
   class HasValidationAssertion < Riot::AssertionMacro
     register :has_validation
 
-    def evaluate(model, *validation_macro_info)
-      validation_type, validation_field, options = validation_macro_info
-      type = validation_type.to_s
+    def evaluate(model, type, field, options = {})
+      fail_msg = "expected #{model.class.to_s} to have validation '#{type} :#{field}'"
+      pass_msg = "#{model.class.to_s} has validation '#{type} :#{field}'"
+      opt_msg  = " with options #{options.inspect}"
 
-      %w{validates_ _of}.each { |part| type.gsub!(%r{#{part}},'') }
+      type = type.to_s.match(/validates_(.*)_of/)[1] rescue type.to_s
 
-      validation = model._validators[validation_field].detect do |valid|
-        valid.class.name =~ /#{type.camelize}/
-      end
-
-      options ||= {}
-
-      case
-        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_field} of type #{validation_type}")
+      validation = model._validators[field].detect { |v| v.class.name =~ /#{type.camelize}/ }
 
-        when (validation.class.name =~ %r{Length} and options[:within])
-          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
+      return fail(fail_msg) if validation.nil?
 
+      # special case to check for validates_length_of :within option
+      if validation.class.name =~ %r{Length} and options[:within]
+        range = options[:within].to_a
+        if (validation.options[:minimum] == range.first) and (validation.options[:maximum] == range.last)
+          return pass(pass_msg + opt_msg)
         else
-          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
+          return fail(fail_msg + opt_msg)
+        end
       end
+
+      unless options.empty?
+        return fail(fail_msg + opt_msg) unless options.all? { |k,v| validation.options[k] == v }
+        return pass(pass_msg + opt_msg)
+      end
+
+      pass pass_msg
     end
   end
 end

data/riot-mongoid.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name = %q{riot-mongoid}
-  s.version = "2.0.0.beta.rc.7"
+  s.version = "2.1.0"
   s.required_rubygems_version = ">= 1.3.6"
   s.authors = ["gabrielg", "Arthur Chiu"]
   s.date = Time.now.strftime("%Y-%m-%d")
@@ -12,7 +12,7 @@ Gem::Specification.new do |s|
   s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
   s.summary = %q{Riot assertions for Mongoid}
-  s.add_dependency  "mongoid", "~> 2.0.0.beta.rc.7"
+  s.add_dependency  "mongoid", "~> 2.1.0"
   s.add_dependency  "riot",    "~> 0.12.3"
   s.add_development_dependency "yard", ">= 0"
 end

data/test/has_association_test.rb

@@ -19,14 +19,9 @@ context "has_association macro" do
 
   asserts "returns useful message" 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\}/)
+  end.matches(/Class has association 'embedded_in :another_thing' with options \{:inverse_of=>:word\}/)
 
   asserts "passes when the association options are specified for a references_many" do
     RiotMongoid::HasAssociationAssertion.new.evaluate(topic, :references_many, :relations, :class_name => "Relation").first
   end.equals(:pass)
-
-  asserts "fails when no association name is specified" do
-    RiotMongoid::HasAssociationAssertion.new.evaluate(topic, :has_many_related).first
-  end.equals(:fail)
-
 end

data/test/has_field_test.rb

@@ -13,7 +13,7 @@ context "has_field macro" do
 
   asserts "returns useful message" do
     RiotMongoid::HasFieldAssertion.new.evaluate(topic, :name, :type => String).last
-  end.matches(/has field 'name' with options \{:type=>String\}/)
+  end.matches(/Class has field :name with options \{:type=>String\}/)
 
   asserts "fails when invalid field options are specified" do
     RiotMongoid::HasFieldAssertion.new.evaluate(topic, :name, :type => Date).first

data/test/has_validation_test.rb

@@ -41,7 +41,7 @@ context "has_validation macro" do
 
   asserts "returns useful message" do
     RiotMongoid::HasValidationAssertion.new.evaluate(topic, :validates_presence_of, :name).last
-  end.matches(/has 'validates_presence_of' validation 'name'/)
+  end.matches(/Class has validation 'validates_presence_of :name'/)
 
   asserts "passes when the validation options is specified using within" do
     RiotMongoid::HasValidationAssertion.new.evaluate(topic, :validates_length_of, :surname, :within => 4..40).first

metadata

@@ -1,85 +1,57 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: riot-mongoid
-version: !ruby/object:Gem::Version 
-  hash: 125915043
-  prerelease: 6
-  segments: 
-  - 2
-  - 0
-  - 0
-  - beta
-  - rc
-  - 7
-  version: 2.0.0.beta.rc.7
+version: !ruby/object:Gem::Version
+  version: 2.1.0
+  prerelease: 
 platform: ruby
-authors: 
+authors:
 - gabrielg
 - Arthur Chiu
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-03-17 00:00:00 -07:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2011-08-18 00:00:00.000000000Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: mongoid
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: &2153377560 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 125915043
-        segments: 
-        - 2
-        - 0
-        - 0
-        - beta
-        - rc
-        - 7
-        version: 2.0.0.beta.rc.7
+      - !ruby/object:Gem::Version
+        version: 2.1.0
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: riot
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: *2153377560
+- !ruby/object:Gem::Dependency
+  name: riot
+  requirement: &2153377100 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 41
-        segments: 
-        - 0
-        - 12
-        - 3
+      - !ruby/object:Gem::Version
         version: 0.12.3
   type: :runtime
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: yard
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: *2153377100
+- !ruby/object:Gem::Dependency
+  name: yard
+  requirement: &2153376640 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id003
+  prerelease: false
+  version_requirements: *2153376640
 description: A collection of assertion macros for testing Mongoid with Riot
 email: gabriel.gironda@gmail.com
 executables: []
-
 extensions: []
-
-extra_rdoc_files: 
+extra_rdoc_files:
 - README.md
-files: 
+files:
 - LICENSE
 - README.md
 - Rakefile
@@ -94,41 +66,29 @@ files:
 - test/has_key_test.rb
 - test/has_validation_test.rb
 - test/teststrap.rb
-has_rdoc: true
 homepage: http://github.com/thumblemonks/riot-mongoid
 licenses: []
-
 post_install_message: 
-rdoc_options: 
+rdoc_options:
 - --charset=UTF-8
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 23
-      segments: 
-      - 1
-      - 3
-      - 6
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
       version: 1.3.6
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.6.1
+rubygems_version: 1.8.6
 signing_key: 
 specification_version: 3
 summary: Riot assertions for Mongoid
 test_files: []
-