riot-mongo_mapper 0.0.3 → 0.1.0

data/Rakefile

@@ -1,8 +1,5 @@
-require 'rubygems'
-require 'rake'
-require 'mg'
-
-MG.new(File.join(File.dirname(__FILE__),"riot-mongo_mapper.gemspec"))
+require 'bundler'
+Bundler::GemHelper.install_tasks
 
 require 'rake/testtask'
 Rake::TestTask.new(:test) do |test|
@@ -10,27 +7,3 @@ Rake::TestTask.new(:test) do |test|
   test.pattern = 'test/**/*_test.rb'
   test.verbose = true
 end
-
-begin
-  require 'rcov/rcovtask'
-  Rcov::RcovTask.new do |test|
-    test.libs << 'test'
-    test.pattern = 'test/**/*_test.rb'
-    test.verbose = true
-  end
-rescue LoadError
-  task :rcov do
-    abort "RCov is not available. In order to run rcov, you must: sudo gem install spicycode-rcov"
-  end
-end
-
-task :default => :test
-
-begin
-  require 'yard'
-  YARD::Rake::YardocTask.new
-rescue LoadError
-  task :yardoc do
-    abort "YARD is not available. In order to run yardoc, you must: sudo gem install yard"
-  end
-end

data/lib/riot-mongo_mapper/has_association.rb

@@ -4,14 +4,20 @@ module RiotMongoMapper
 
     def evaluate(model, *association_macro_info)
       association_name, key_name, options = association_macro_info
-      association = model.associations[key_name.to_s]
+      association = model.associations[key_name.to_sym]
+      association_class = case association_name
+        when :many
+          MongoMapper::Plugins::Associations::ManyAssociation
+        when :one
+          MongoMapper::Plugins::Associations::OneAssociation
+        end
       if association.nil?
         fail("expected #{model} to have association #{association}")
       else
-        association_valid = association.type == association_name.to_sym
+        association_valid = association.class == association_class
         options_valid = options ? options.all? { |field,value| association.options[field] == value } : true
         options_valid && association_valid ? pass("#{model} has association '#{association_name}' on '#{key_name}' with options #{options.inspect}") :
-                                      fail("expected #{model} to have association #{association_name} with options #{options.inspect} on key #{key_name}")
+                                             fail("expected #{model} to have association #{association_name} with options #{options.inspect} on key #{key_name}")
       end
     end
   end

data/lib/riot-mongo_mapper/has_key.rb

@@ -4,7 +4,7 @@ module RiotMongoMapper
 
     def evaluate(model, *key_macro_info)
       key_name, key_type, options = key_macro_info
-      key = model.keys[key_name.to_sym]
+      key = model.keys[key_name.to_s]
       if key.nil?
         fail("expected #{model} to have field #{key_name}")
       else

data/lib/riot-mongo_mapper/has_validation.rb

@@ -3,20 +3,39 @@ module RiotMongoMapper
     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[validation_field].detect do |valid|
+        valid.class.name =~ /#{type.camelize}/
       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.nil?
-        fail("expected #{model} to have validation on #{validation_name} of type #{validation_type}")
-      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 validations on #{validation_name} with options #{options.inspect} of type #{validation_type}")
+        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}")
+
+        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
+
+        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
       end
     end
   end

data/riot-mongo_mapper.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name = "riot-mongo_mapper"
-  s.version = "0.0.3"
+  s.version = "0.1.0"
   s.required_rubygems_version = ">= 1.3.6"
   s.authors = ["Arthur Chiu"]
   s.date = Time.now.strftime("%Y-%m-%d")
@@ -12,9 +12,7 @@ Gem::Specification.new do |s|
   s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
   s.summary = %q{Riot assertions for MongoMapper}
-  s.add_development_dependency(%q<riot>, [">= 0"])
-  s.add_development_dependency(%q<yard>, [">= 0"])
-  s.add_runtime_dependency(%q<mongo_mapper>, [">= 0.8.2"])
-  s.add_runtime_dependency(%q<riot>, [">= 0.11.2"])
+  s.add_dependency 'mongo_mapper', '~>0.9.0'
+  s.add_dependency 'riot', '~>0.12.3'
 end
 

data/test/fixtures/test.rb

@@ -1,6 +1,8 @@
 module Plugins
   module Test
+    extend ActiveSupport::Concern
   end
   module Faux
+    extend ActiveSupport::Concern
   end
 end

data/test/has_association_test.rb

@@ -1,7 +1,8 @@
-require File.join(File.dirname(__FILE__),'teststrap')
+require File.expand_path('../teststrap', __FILE__)
 
 context "has_association macro" do
-  setup{ @assertion = RiotMongoMapper::HasAssociationAssertion.new }
+  helper(:macro) { RiotMongoMapper::HasAssociationAssertion.new }
+
   setup do
     mock_model do
       many :persons
@@ -9,24 +10,24 @@ context "has_association macro" do
     end
   end
   
-  asserts "passes when has association" do 
-    @assertion.evaluate(topic, :many, :persons).first
+  asserts "passes when has association" do
+    macro.evaluate(topic, :many, :persons).first
   end.equals(:pass)
   
-  asserts "fails when has association" do 
-    @assertion.evaluate(topic, :many, :dogs).first
+  asserts "fails when has association" do
+    macro.evaluate(topic, :many, :dogs).first
   end.equals(:fail)
   
-  asserts "passes when association options is specified" do 
-    @assertion.evaluate(topic, :many, :categories, :in => :category_ids, :class_name => 'Tags').first
+  asserts "passes when association options is specified" do
+    macro.evaluate(topic, :many, :categories, :in => :category_ids, :class_name => 'Tags').first
   end.equals(:pass)
   
-  asserts "fails when the options don't match" do 
-    @assertion.evaluate(topic, :many, :categories, :foreign_id => 'wtf').first
+  asserts "fails when the options don't match" do
+    macro.evaluate(topic, :many, :categories, :foreign_id => 'wtf').first
   end.equals(:fail)
   
-  asserts "returns a message" do 
-    @assertion.evaluate(topic, :many, :persons).last
+  asserts "returns a message" do
+    macro.evaluate(topic, :many, :persons).last
   end.matches %r{has association 'many' on 'persons' with options}
   
-end
+end

data/test/has_key_test.rb

@@ -1,7 +1,8 @@
-require File.join(File.dirname(__FILE__),'teststrap')
+require File.expand_path('../teststrap', __FILE__)
 
 context "has_key macro" do
-  setup { @assertion = RiotMongoMapper::HasKeyAssertion.new }
+  helper(:macro) { RiotMongoMapper::HasKeyAssertion.new }
+
   setup do
     mock_model do
       key :name, String
@@ -11,23 +12,23 @@ context "has_key macro" do
   end
 
   asserts "passes when the key is specified" do
-    @assertion.evaluate(topic, :name, String).first
+    macro.evaluate(topic, :name, String).first
   end.equals(:pass)
   
-  asserts "fails when the key doesn't match" do 
-    @assertion.evaluate(topic, :name, Array).first
+  asserts "fails when the key doesn't match" do
+    macro.evaluate(topic, :name, Array).first
   end.equals(:fail)
   
-  asserts "passes when options are specified" do 
-    @assertion.evaluate(topic, :age, Integer, :required => true, :default => 18).first
+  asserts "passes when options are specified" do
+    macro.evaluate(topic, :age, Integer, :required => true, :default => 18).first
   end.equals(:pass)
   
-  asserts "fails when the options specifed don't match" do 
-    @assertion.evaluate(topic, :foo, Boolean, :default => true).first
+  asserts "fails when the options specifed don't match" do
+    macro.evaluate(topic, :foo, Boolean, :default => true).first
   end.equals(:fail)
 
-  asserts "returns a message" do 
-    @assertion.evaluate(topic, :name, String).last
+  asserts "returns a message" do
+    macro.evaluate(topic, :name, String).last
   end.matches %r{has key 'name' with options}
 
 

data/test/has_plugin_test.rb

@@ -1,23 +1,24 @@
-require File.join(File.dirname(__FILE__),'teststrap')
-require File.join(File.dirname(__FILE__), 'fixtures', 'test')
+require File.expand_path('../teststrap', __FILE__)
+require File.expand_path('../fixtures/test', __FILE__)
 
 context "has_plugin macro" do
-  setup{ @assertion = RiotMongoMapper::HasPluginAssertion.new }
+  helper(:macro) { RiotMongoMapper::HasPluginAssertion.new }
+
   setup do
     mock_model do
       plugin Plugins::Test
     end
   end
   
-  asserts "passes when has plugin" do 
-    @assertion.evaluate(topic, Plugins::Test).first
+  asserts "passes when has plugin" do
+    macro.evaluate(topic, Plugins::Test).first
   end.equals(:pass)
   
-  asserts "fails when it doesn't have plugin" do 
-    @assertion.evaluate(topic, Plugins::Faux).first
+  asserts "fails when it doesn't have plugin" do
+    macro.evaluate(topic, Plugins::Faux).first
   end.equals(:fail)
   
-  asserts "returns a message" do 
-    @assertion.evaluate(topic, Plugins::Test).last
-  end.matches %r{has plugin Plugins::Test}  
-end
+  asserts "returns a message" do
+    macro.evaluate(topic, Plugins::Test).last
+  end.matches %r{has plugin Plugins::Test}
+end

data/test/has_validation_test.rb

@@ -1,7 +1,9 @@
-require File.join(File.dirname(__FILE__),'teststrap')
+require File.expand_path('../teststrap', __FILE__)
 
 context "has_validation macro" do
-  setup { @assertion = RiotMongoMapper::HasValidationAssertion.new }
+
+  helper(:macro) { RiotMongoMapper::HasValidationAssertion.new }
+
   setup do
     mock_model do
       key :name, String
@@ -15,30 +17,30 @@ context "has_validation macro" do
   end
 
   asserts "passes when the validation is specified" do
-    @assertion.evaluate(topic, :validates_presence_of, :name).first
+    macro.evaluate(topic, :validates_presence_of, :name).first
   end.equals(:pass)
 
   asserts "passes when the validation is specified" do
-    @assertion.evaluate(topic, :validates_presence_of, :surname).first
+    macro.evaluate(topic, :validates_presence_of, :surname).first
   end.equals(:pass)
 
   asserts "returns useful message" do
-    @assertion.evaluate(topic, :validates_presence_of, :name).last
+    macro.evaluate(topic, :validates_presence_of, :name).last
   end.matches(/has 'validates_presence_of' validation 'name'/)
 
   asserts "passes when the validation options is specified" do
-    @assertion.evaluate(topic, :validates_length_of, :surname, :within => 4..40).first
+    macro.evaluate(topic, :validates_length_of, :surname, :within => 4..40).first
   end.equals(:pass)
 
   asserts "passes when the validation options is specified and doesn't match" do
-    @assertion.evaluate(topic, :validates_length_of, :surname, :within => 3..30).first
+    macro.evaluate(topic, :validates_length_of, :surname, :within => 3..30).first
   end.equals(:fail)
 
   asserts "fails when invalid field options are specified" do
-    @assertion.evaluate(topic, :validates_length_of, :name, :type => Date).first
+    macro.evaluate(topic, :validates_length_of, :name, :type => Date).first
   end.equals(:fail)
 
   asserts "passes when another validation is specified" do
-    @assertion.evaluate(topic, :validates_uniqueness_of, :rad).first
+    macro.evaluate(topic, :validates_uniqueness_of, :rad).first
   end.equals(:pass)
 end

data/test/teststrap.rb

@@ -1,8 +1,7 @@
 require 'rubygems'
 require 'riot'
 require 'mongo_mapper'
-require File.join(File.dirname(__FILE__),'..','lib','riot-mongo_mapper')
-
+require File.expand_path(File.dirname(__FILE__) + '/../lib/riot-mongo_mapper.rb')
 
 class Riot::Situation
   def mock_model(&block)

metadata

@@ -1,13 +1,8 @@
 --- !ruby/object:Gem::Specification 
 name: riot-mongo_mapper
 version: !ruby/object:Gem::Version 
-  hash: 25
-  prerelease: false
-  segments: 
-  - 0
-  - 0
-  - 3
-  version: 0.0.3
+  prerelease: 
+  version: 0.1.0
 platform: ruby
 authors: 
 - Arthur Chiu
@@ -15,69 +10,31 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-07-23 00:00:00 -07:00
+date: 2011-04-16 00:00:00 -07:00
 default_executable: 
 dependencies: 
-- !ruby/object:Gem::Dependency 
-  name: riot
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  type: :development
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: yard
-  prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  type: :development
-  version_requirements: *id002
 - !ruby/object:Gem::Dependency 
   name: mongo_mapper
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
-        hash: 59
-        segments: 
-        - 0
-        - 8
-        - 2
-        version: 0.8.2
+        version: 0.9.0
   type: :runtime
-  version_requirements: *id003
+  version_requirements: *id001
 - !ruby/object:Gem::Dependency 
   name: riot
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
-        hash: 55
-        segments: 
-        - 0
-        - 11
-        - 2
-        version: 0.11.2
+        version: 0.12.3
   type: :runtime
-  version_requirements: *id004
+  version_requirements: *id002
 description: A collection of assertion macros for testing MongoMapper with Riot
 email: mr.arthur.chiu@gmail.com
 executables: []
@@ -116,25 +73,17 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 23
-      segments: 
-      - 1
-      - 3
-      - 6
       version: 1.3.6
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.6.1
 signing_key: 
 specification_version: 3
 summary: Riot assertions for MongoMapper