mongomodel 0.3.3 → 0.3.4

data/spec/mongomodel/concerns/logging_spec.rb

@@ -6,7 +6,7 @@ module MongoModel
       define_class(:TestDocument, described_class)
       
       let(:logger) { mock('logger').as_null_object }
-      before(:all) { MongoModel.logger = logger }
+      before(:each) { MongoModel.logger = logger }
       
       it "should have a logger reader on the class" do
         TestDocument.logger.should == logger

data/spec/mongomodel/document/dynamic_finders_spec.rb

@@ -18,6 +18,38 @@ module MongoModel
         @mary = Person.create!(:name => 'Mary', :age => 33, :id => '5')
       end
       
+      def self.should_find(*args, &block)
+        it "should return correct results when called with #{args.inspect}" do
+          expected = instance_eval(&block)
+          subject.send(valid_finder, *args).should == expected
+        end
+      end
+      
+      def self.should_raise(*args, &block)
+        it "should raise DocumentNotFound exception if results not found" do
+          message = instance_eval(&block)
+          lambda { subject.send(valid_finder, *args) }.should raise_error(DocumentNotFound, message)
+        end
+      end
+      
+      def self.should_initialize(*args, &block)
+        it "should initialize new instance" do
+          result = subject.send(valid_finder, *args)
+          result.should be_a_new_record
+          result.should be_an_instance_of(Person)
+          yield(result).should be_true
+        end
+      end
+      
+      def self.should_create(*args, &block)
+        it "should create new instance" do
+          result = subject.send(valid_finder, *args)
+          result.should_not be_a_new_record
+          result.should be_an_instance_of(Person)
+          yield(result).should be_true
+        end
+      end
+      
       shared_examples_for "a dynamic finder" do
         it { should respond_to(valid_finder) }
         it { should_not respond_to(invalid_finder) }
@@ -25,38 +57,6 @@ module MongoModel
         it "should raise NoMethodError calling an invalid finder" do
           lambda { subject.send(invalid_finder, "Foo") }.should raise_error(NoMethodError)
         end
-        
-        def self.should_find(*args, &block)
-          it "should return correct results when called with #{args.inspect}" do
-            expected = instance_eval(&block)
-            subject.send(valid_finder, *args).should == expected
-          end
-        end
-        
-        def self.should_raise(*args, &block)
-          it "should raise DocumentNotFound exception if results not found" do
-            message = instance_eval(&block)
-            lambda { subject.send(valid_finder, *args) }.should raise_error(DocumentNotFound, message)
-          end
-        end
-        
-        def self.should_initialize(*args, &block)
-          it "should initialize new instance" do
-            result = subject.send(valid_finder, *args)
-            result.should be_a_new_record
-            result.should be_an_instance_of(Person)
-            yield(result).should be_true
-          end
-        end
-        
-        def self.should_create(*args, &block)
-          it "should create new instance" do
-            result = subject.send(valid_finder, *args)
-            result.should_not be_a_new_record
-            result.should be_an_instance_of(Person)
-            yield(result).should be_true
-          end
-        end
       end
       
       describe "find first by single property" do

data/spec/mongomodel/support/scope_spec.rb

@@ -398,15 +398,6 @@ module MongoModel
                 subject.first.should == posts[0]
               end
             end
-
-            subject_not_loaded do
-              it "should cache find result" do
-                model.should_find(finder_options.merge(:limit => 1), [posts[0]]) do
-                  subject.first
-                  subject.first
-                end
-              end
-            end
           end
         end
       end
@@ -483,15 +474,6 @@ module MongoModel
                 subject.last.should == post
               end
             end
-
-            subject_not_loaded do
-              it "should cache find result" do
-                model.should_find(reversed_finder_options.merge(:limit => 1), [post]) do
-                  subject.last
-                  subject.last
-                end
-              end
-            end
           end
         end
       end

data/spec/spec.opts

@@ -1,7 +1,4 @@
 --colour
 --format
 progress
---loadby
-mtime
---reverse
 --backtrace

data/spec/spec_helper.rb

@@ -1,14 +1,14 @@
 require 'rubygems'
 require 'bundler/setup'
-require 'spec'
 
-# Require MongoModel library
-require File.dirname(__FILE__) + '/../lib/mongomodel'
+require 'rspec'
+
+require 'mongomodel'
 
 # Require spec helpers
 Dir[File.dirname(__FILE__) + "/support/**/*.rb"].each { |f| require f }
 
-Spec::Runner.configure do |config|
+RSpec.configure do |config|
   include SpecsFor
   include DefineClass
   

data/spec/support/helpers/document_finder_stubs.rb

@@ -1,7 +1,7 @@
-require 'spec/mocks'
+require 'rspec/mocks'
 
 module DocumentFinderStubs
-  include Spec::Mocks::ExampleMethods
+  include RSpec::Mocks::ExampleMethods
   
   def stub_find(result)
     find_result = mock('find result', :to_a => result.map { |doc| doc.to_mongo }, :count => result.size).as_null_object

data/spec/support/matchers/be_a_subclass_of.rb

@@ -1,4 +1,4 @@
-Spec::Matchers.define(:be_a_subclass_of) do |ancestor|
+RSpec::Matchers.define(:be_a_subclass_of) do |ancestor|
   match do |klass|
     klass.ancestors.include?(ancestor)
   end

data/spec/support/matchers/be_truthy.rb

@@ -1,4 +1,4 @@
-Spec::Matchers.define(:be_truthy) do
+RSpec::Matchers.define(:be_truthy) do
   match do |object|
     !!object
   end

data/spec/support/matchers/find_with.rb

@@ -1,5 +1,5 @@
-Spec::Matchers.define(:find_with) do |find_options|
-  extend Spec::Mocks::ExampleMethods
+RSpec::Matchers.define(:find_with) do |find_options|
+  extend RSpec::Mocks::ExampleMethods
   
   match do |klass|
     selector, options = MongoModel::MongoOptions.new(klass, find_options).to_a
@@ -16,8 +16,8 @@ Spec::Matchers.define(:find_with) do |find_options|
   end
 end
 
-Spec::Matchers.define(:count_with) do |find_options|
-  extend Spec::Mocks::ExampleMethods
+RSpec::Matchers.define(:count_with) do |find_options|
+  extend RSpec::Mocks::ExampleMethods
   
   match do |klass|
     selector, options = MongoModel::MongoOptions.new(klass, find_options).to_a

data/spec/support/matchers/respond_to_boolean.rb

@@ -1,4 +1,4 @@
-Spec::Matchers.define(:respond_to_boolean) do |method|
+RSpec::Matchers.define(:respond_to_boolean) do |method|
   match do |instance|
     instance.respond_to?(method) && is_boolean?(instance.send(method))
   end

data/spec/support/matchers/run_callbacks.rb

@@ -1,4 +1,4 @@
-Spec::Matchers.define(:run_callbacks) do |*callbacks|
+RSpec::Matchers.define(:run_callbacks) do |*callbacks|
   match do |instance|
     instance.history == expand_callbacks(callbacks)
   end

metadata

@@ -1,13 +1,8 @@
 --- !ruby/object:Gem::Specification 
 name: mongomodel
 version: !ruby/object:Gem::Version 
-  hash: 21
   prerelease: 
-  segments: 
-  - 0
-  - 3
-  - 3
-  version: 0.3.3
+  version: 0.3.4
 platform: ruby
 authors: 
 - Sam Pohlenz
@@ -15,121 +10,75 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-04-21 00:00:00 +09:30
+date: 2011-07-06 00:00:00 +09:30
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: activesupport
-  prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 1
-        segments: 
-        - 3
-        - 0
-        - 3
-        version: 3.0.3
+        version: "3.0"
   type: :runtime
+  prerelease: false
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
   name: activemodel
-  prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 1
-        segments: 
-        - 3
-        - 0
-        - 3
-        version: 3.0.3
+        version: "3.0"
   type: :runtime
+  prerelease: false
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
   name: mongo
-  prerelease: false
   requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 27
-        segments: 
-        - 1
-        - 3
-        - 0
         version: 1.3.0
   type: :runtime
+  prerelease: false
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
   name: will_paginate
-  prerelease: false
   requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 29
-        segments: 
-        - 2
-        - 3
-        - 15
         version: 2.3.15
   type: :runtime
-  version_requirements: *id004
-- !ruby/object:Gem::Dependency 
-  name: SystemTimer
   prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 25
-        segments: 
-        - 1
-        - 2
-        - 3
-        version: 1.2.3
-  type: :runtime
-  version_requirements: *id005
+  version_requirements: *id004
 - !ruby/object:Gem::Dependency 
   name: bundler
-  prerelease: false
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 23
-        segments: 
-        - 1
-        - 0
-        - 0
         version: 1.0.0
   type: :development
-  version_requirements: *id006
+  prerelease: false
+  version_requirements: *id005
 - !ruby/object:Gem::Dependency 
   name: rspec
-  prerelease: false
-  requirement: &id007 !ruby/object:Gem::Requirement 
+  requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - "="
+    - - ~>
       - !ruby/object:Gem::Version 
-        hash: 27
-        segments: 
-        - 1
-        - 3
-        - 0
-        version: 1.3.0
+        version: 2.6.0
   type: :development
-  version_requirements: *id007
+  prerelease: false
+  version_requirements: *id006
 description: MongoModel is a MongoDB ORM for Ruby/Rails similar to ActiveRecord and DataMapper.
 email: 
 - sam@sampohlenz.com
@@ -141,12 +90,17 @@ extra_rdoc_files: []
 
 files: 
 - .gitignore
+- Appraisals
 - Gemfile
 - LICENSE
 - README.md
 - Rakefile
 - autotest/discover.rb
 - bin/console
+- gemfiles/rails-3.0.gemfile
+- gemfiles/rails-3.0.gemfile.lock
+- gemfiles/rails-3.1.gemfile
+- gemfiles/rails-3.1.gemfile.lock
 - lib/mongomodel.rb
 - lib/mongomodel/attributes/mongo.rb
 - lib/mongomodel/attributes/store.rb
@@ -303,7 +257,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
+      hash: -3936197743219655173
       segments: 
       - 0
       version: "0"
@@ -312,16 +266,11 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 23
-      segments: 
-      - 1
-      - 3
-      - 6
       version: 1.3.6
 requirements: []
 
 rubyforge_project: mongomodel
-rubygems_version: 1.6.1
+rubygems_version: 1.5.2
 signing_key: 
 specification_version: 3
 summary: MongoDB ORM for Ruby/Rails