riot-mongoid 1.1.3 → 1.1.4

data/README.md

@@ -16,7 +16,8 @@ Riot assertions for Mongoid
         # association assertions
         asserts_topic.has_association :belongs_to_related, :account
         asserts_topic.has_association :has_many_related, :comments
-
+        asserts_topic.has_association :embedded_in, :person, :inverse_of => :address
+        
         # validation assertions
         asserts_topic.has_validation :validates_presence_of, :caption
         

data/Rakefile

@@ -1,24 +1,8 @@
 require 'rubygems'
 require 'rake'
+require 'mg'
 
-begin
-  require 'jeweler'
-  Jeweler::Tasks.new do |gem|
-    gem.name = "riot-mongoid"
-    gem.summary = %Q{Riot assertions for Mongoid}
-    gem.description = %Q{A collection of assertion macros for testing Mongoid with Riot}
-    gem.email = "gabriel.gironda@gmail.com"
-    gem.homepage = "http://github.com/gabrielg/riot-mongoid"
-    gem.authors = ["gabrielg"]
-    gem.add_development_dependency "riot", ">= 0"
-    gem.add_development_dependency "yard", ">= 0"
-    gem.add_dependency "mongoid", ">=1.2.7"
-    gem.add_dependency "riot",    ">=0.10.12"
-  end
-  Jeweler::GemcutterTasks.new
-rescue LoadError
-  puts "Jeweler (or a dependency) not available. Install it with: gem install jeweler"
-end
+MG.new(File.join(File.dirname(__FILE__),"riot-mongoid.gemspec"))
 
 require 'rake/testtask'
 Rake::TestTask.new(:test) do |test|
@@ -40,8 +24,6 @@ rescue LoadError
   end
 end
 
-task :test => :check_dependencies
-
 task :default => :test
 
 begin

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.send(key) == value }
+        options_valid = options.all? { |key,value| assoc.options.instance_variable_get("@attributes")[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/riot-mongoid.gemspec

@@ -5,69 +5,21 @@
 
 Gem::Specification.new do |s|
   s.name = %q{riot-mongoid}
-  s.version = "1.1.3"
-
-  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
+  s.version = "1.1.4"
+  s.required_rubygems_version = ">= 1.3.6"
   s.authors = ["gabrielg"]
-  s.date = %q{2010-06-10}
+  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 = [
-    "LICENSE",
-     "README.md"
-  ]
-  s.files = [
-    ".document",
-     ".gitignore",
-     "LICENSE",
-     "README.md",
-     "Rakefile",
-     "VERSION",
-     "lib/riot-mongoid.rb",
-     "lib/riot-mongoid/has_association.rb",
-     "lib/riot-mongoid/has_field.rb",
-     "lib/riot-mongoid/has_key.rb",
-     "lib/riot-mongoid/has_validation.rb",
-     "riot-mongoid.gemspec",
-     "test/has_association_test.rb",
-     "test/has_field_test.rb",
-     "test/has_key_test.rb",
-     "test/has_validation_test.rb",
-     "test/teststrap.rb"
-  ]
+  s.extra_rdoc_files = ["README.md"]
+  s.files = %w{.document .gitignore LICENSE README.md Rakefile riot-mongoid.gemspec} + Dir.glob("{lib,test}/**/*")
   s.homepage = %q{http://github.com/gabrielg/riot-mongoid}
   s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.6}
   s.summary = %q{Riot assertions for Mongoid}
-  s.test_files = [
-    "test/has_association_test.rb",
-     "test/has_field_test.rb",
-     "test/has_key_test.rb",
-     "test/has_validation_test.rb",
-     "test/teststrap.rb"
-  ]
-
-  if s.respond_to? :specification_version then
-    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
-    s.specification_version = 3
-
-    if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
-      s.add_development_dependency(%q<riot>, [">= 0"])
-      s.add_development_dependency(%q<yard>, [">= 0"])
-      s.add_runtime_dependency(%q<mongoid>, [">= 1.2.7"])
-      s.add_runtime_dependency(%q<riot>, [">= 0.10.12"])
-    else
-      s.add_dependency(%q<riot>, [">= 0"])
-      s.add_dependency(%q<yard>, [">= 0"])
-      s.add_dependency(%q<mongoid>, [">= 1.2.7"])
-      s.add_dependency(%q<riot>, [">= 0.10.12"])
-    end
-  else
-    s.add_dependency(%q<riot>, [">= 0"])
-    s.add_dependency(%q<yard>, [">= 0"])
-    s.add_dependency(%q<mongoid>, [">= 1.2.7"])
-    s.add_dependency(%q<riot>, [">= 0.10.12"])
-  end
+  s.add_development_dependency(%q<riot>, [">= 0"])
+  s.add_development_dependency(%q<yard>, [">= 0"])
+  s.add_runtime_dependency(%q<mongoid>, [">= 1.2.7"])
+  s.add_runtime_dependency(%q<riot>, [">= 0.10.12"])
 end
 

data/test/has_association_test.rb

@@ -6,6 +6,7 @@ context "has_association macro" do
       embeds_many :things
       embedded_in :another_thing, :inverse_of => :word
       has_many_related :relations
+      has_many_related :reporters, :klass => 'Person'
     end
   end
 
@@ -21,10 +22,14 @@ 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 association options are specified for a has_many_related" do
+  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
+  end.equals(:pass)
+  
   asserts "fails when no association name is specified" do
     RiotMongoid::HasAssociationAssertion.new.evaluate(topic, :has_many).first
   end.equals(:fail)

data/test/has_validation_test.rb

@@ -34,7 +34,7 @@ context "has_validation macro" do
   end.equals(:fail)
 
   asserts "fails when invalid field options are specified" do
-    RiotMongoid::HasValidationAssertion.new.evaluate(topic, :validates_length_of, :type => Date).first
+    RiotMongoid::HasValidationAssertion.new.evaluate(topic, :validates_length_of, :name, :type => Date).first
   end.equals(:fail)
 
   asserts "passes when another validation is specified" do

metadata

@@ -1,12 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: riot-mongoid
 version: !ruby/object:Gem::Version 
+  hash: 27
   prerelease: false
   segments: 
   - 1
   - 1
-  - 3
-  version: 1.1.3
+  - 4
+  version: 1.1.4
 platform: ruby
 authors: 
 - gabrielg
@@ -14,16 +15,18 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-06-10 00:00:00 -05:00
+date: 2010-06-17 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"
@@ -33,9 +36,11 @@ dependencies:
   name: yard
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
         segments: 
         - 0
         version: "0"
@@ -45,9 +50,11 @@ dependencies:
   name: mongoid
   prerelease: false
   requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 17
         segments: 
         - 1
         - 2
@@ -59,9 +66,11 @@ dependencies:
   name: riot
   prerelease: false
   requirement: &id004 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 47
         segments: 
         - 0
         - 10
@@ -76,7 +85,6 @@ executables: []
 extensions: []
 
 extra_rdoc_files: 
-- LICENSE
 - README.md
 files: 
 - .document
@@ -84,13 +92,12 @@ files:
 - LICENSE
 - README.md
 - Rakefile
-- VERSION
-- lib/riot-mongoid.rb
+- riot-mongoid.gemspec
 - lib/riot-mongoid/has_association.rb
 - lib/riot-mongoid/has_field.rb
 - lib/riot-mongoid/has_key.rb
 - lib/riot-mongoid/has_validation.rb
-- riot-mongoid.gemspec
+- lib/riot-mongoid.rb
 - test/has_association_test.rb
 - test/has_field_test.rb
 - test/has_key_test.rb
@@ -106,29 +113,31 @@ rdoc_options:
 require_paths: 
 - lib
 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 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 23
       segments: 
-      - 0
-      version: "0"
+      - 1
+      - 3
+      - 6
+      version: 1.3.6
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.6
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: Riot assertions for Mongoid
-test_files: 
-- test/has_association_test.rb
-- test/has_field_test.rb
-- test/has_key_test.rb
-- test/has_validation_test.rb
-- test/teststrap.rb
+test_files: []
+

data/VERSION

@@ -1 +0,0 @@
-1.1.3