mongoa 0.0.2 → 0.1.1

data/VERSION

@@ -1 +1 @@
-0.0.2
+0.1.1

data/lib/mongoa/{rspec2.rb → integrations/rspec2.rb}

@@ -5,3 +5,4 @@ module RSpec
     include Mongoa::MongoMapper::Matchers
   end
 end
+

data/lib/mongoa/mongo_mapper/association_matcher.rb

@@ -27,7 +27,11 @@ module Mongoa
           return false
         end
         @subject = subject
-        association_exists? && macro_correct? && foreign_key_exists?
+        result = (association_exists? && macro_correct?)
+        if result && macro == :belongs_to
+          result = foreign_key_exists?
+        end
+        result
       end
 
       def failure_message
@@ -53,7 +57,6 @@ module Mongoa
       end
 
       def model_class
-        p @subject
         @subject.class
       end
 
@@ -74,17 +77,14 @@ module Mongoa
       def association_exists?
         if !association
           @missing = "no association called #{name}"
-          false
+          return false
         end
         true
       end
       
-      def association_exists?
-        association
-      end
-
-      def macro_correct?
-        association.type == macro
+     def macro_correct?
+        (association.type == :belongs_to && macro == :belongs_to) ||
+        (association.type == :many && macro == :has_many)
       end
 
       def foreign_key_exists?
@@ -92,7 +92,7 @@ module Mongoa
       end
 
       def belongs_to_foreign_key_exists?
-        macro == :belongs_to && model_class.keys.keys.include?("#{reflection_name}_id")
+        model_class.keys.keys.include?("#{reflection_name}_id")
       end
 
       def reflection_name

data/lib/mongoa/mongo_mapper/associations.rb

@@ -0,0 +1,12 @@
+module MongoMapper
+  module Plugins
+    module Associations
+      module ClassMethods
+        def find_association(name)
+          name_association = self.associations.detect {|key, value| key.to_s == name.to_s}
+          name_association ? name_association.last : nil
+        end
+      end
+    end
+  end
+end

data/lib/mongoa/{matchers.rb → mongo_mapper/matchers.rb}

@@ -1,3 +1,4 @@
+require 'mongoa/mongo_mapper/associations'
 require 'mongoa/mongo_mapper/association_matcher'
 
 module Mongoa

data/lib/mongoa.rb

@@ -1,5 +1,5 @@
-if defined?(RSpec)
+# if defined?(RSpec)
   require 'mongoa/integrations/rspec2'
-else
-  raise 'DONT SUPPORT THAT TEST FRAMEWORK'
-end
+# else
+#   raise 'DONT SUPPORT THAT TEST FRAMEWORK'
+# end

data/mongoa.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{mongoa}
-  s.version = "0.0.2"
+  s.version = "0.1.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Scott J. Tamosunas"]
-  s.date = %q{2010-08-06}
+  s.date = %q{2010-08-08}
   s.description = %q{Adds the association and validation macros for Rspec in the same way Shoulda does for ActiveRecord.}
   s.email = %q{tamosunas@gmail.com}
   s.extra_rdoc_files = [
@@ -24,9 +24,10 @@ Gem::Specification.new do |s|
      "Rakefile",
      "VERSION",
      "lib/mongoa.rb",
-     "lib/mongoa/matchers.rb",
+     "lib/mongoa/integrations/rspec2.rb",
      "lib/mongoa/mongo_mapper/association_matcher.rb",
-     "lib/mongoa/rspec2.rb",
+     "lib/mongoa/mongo_mapper/associations.rb",
+     "lib/mongoa/mongo_mapper/matchers.rb",
      "mongoa.gemspec",
      "spec/mongoa_spec.rb",
      "spec/spec.opts",

metadata

@@ -4,9 +4,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 0
-  - 0
-  - 2
-  version: 0.0.2
+  - 1
+  - 1
+  version: 0.1.1
 platform: ruby
 authors: 
 - Scott J. Tamosunas
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-08-06 00:00:00 -04:00
+date: 2010-08-08 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -49,9 +49,10 @@ files:
 - Rakefile
 - VERSION
 - lib/mongoa.rb
-- lib/mongoa/matchers.rb
+- lib/mongoa/integrations/rspec2.rb
 - lib/mongoa/mongo_mapper/association_matcher.rb
-- lib/mongoa/rspec2.rb
+- lib/mongoa/mongo_mapper/associations.rb
+- lib/mongoa/mongo_mapper/matchers.rb
 - mongoa.gemspec
 - spec/mongoa_spec.rb
 - spec/spec.opts