mingo 0.4.0 → 0.4.1

data/lib/mingo/connection.rb

@@ -3,7 +3,11 @@ class Mingo
     attr_writer :db, :collection
     
     def db
-      @db || superclass.db
+      (defined?(@db) && @db) or superclass.respond_to?(:db) ? superclass.db : nil
+    end
+
+    def connected?
+      !!db
     end
     
     def connect(dbname_or_uri)

data/lib/mingo/cursor.rb

@@ -32,16 +32,6 @@ class Mingo
       Hash === selector[:_id] && selector[:_id]["$in"]
     end
     
-    def next_document
-      if !@query_run && by_ids? && !order
-        limit_ids do
-          preload_cache
-          sort_cache_by_ids
-        end
-      end
-      super
-    end
-    
     def reverse
       check_modifiable
       if by_ids? and !order
@@ -62,6 +52,19 @@ class Mingo
     end
     
     private
+
+    alias refresh_without_sorting refresh
+
+    def refresh
+      if !@query_run && by_ids? && !order
+        limit_ids do
+          preload_cache
+          sort_cache_by_ids
+        end
+      else
+        refresh_without_sorting
+      end
+    end
     
     def limit_ids
       if @limit > 0 || @skip > 0
@@ -82,7 +85,7 @@ class Mingo
     
     def preload_cache
       begin
-        refresh
+        refresh_without_sorting
       end until @cursor_id.zero? || closed? || @n_received.to_i < 1
     end
     

data/lib/mingo/properties.rb

@@ -11,12 +11,13 @@ class Mingo
     module ClassMethods
       attr_reader :properties
 
-      def property(name, options = {})
+      def property(name, options = nil)
         self.properties << name.to_sym
 
         setter_name = "#{name}="
         unless method_defined?(setter_name)
-          class_eval <<-RUBY, __FILE__, __LINE__
+          methods = Module.new
+          methods.module_eval <<-RUBY, __FILE__, __LINE__ + 1
             def #{name}(&block)
               self.[](#{name.to_s.inspect}, &block)
             end
@@ -25,6 +26,7 @@ class Mingo
               self.[]=(#{name.to_s.inspect}, value)
             end
           RUBY
+          include methods
         end
 
         if defined? @subclasses

data/spec/mingo_spec.rb

@@ -6,13 +6,32 @@ Mingo.connect('mingo')
 class User < Mingo
   property :name
   property :age
+
+  def age=(value)
+    super(value.nil? ? nil : value.to_i)
+  end
 end
 
 describe User do
   before :all do
     User.collection.remove
   end
-  
+
+  it "has connection" do
+    Mingo.should be_connected
+    User.should be_connected
+
+    old_db = Mingo.db
+    Mingo.db = nil
+    begin
+      Mingo.should_not be_connected
+      User.should_not be_connected
+      User.db.should be_nil
+    ensure
+      Mingo.db = old_db
+    end
+  end
+
   it "obtains an ID by saving" do
     user = build :name => 'Mislav'
     user.should_not be_persisted
@@ -76,6 +95,12 @@ describe User do
       doc.should have_key('name')
     end
   end
+
+  it "supports overloading the setter method" do
+    user = build
+    user.age = '12'
+    user.age.should == 12
+  end
   
   context "existing doc" do
     before do

metadata

@@ -2,7 +2,7 @@
 name: mingo
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.4.0
+  version: 0.4.1
 platform: ruby
 authors: 
 - "Mislav Marohni\xC4\x87"
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-07-24 00:00:00 Z
+date: 2011-08-31 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: mongo
@@ -39,7 +39,6 @@ files:
 - lib/mingo/cursor.rb
 - lib/mingo/finders.rb
 - lib/mingo/many_proxy.rb
-- lib/mingo/pagination.rb
 - lib/mingo/persistence.rb
 - lib/mingo/properties.rb
 - lib/mingo/timestamps.rb
@@ -68,7 +67,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.8.5
+rubygems_version: 1.8.8
 signing_key: 
 specification_version: 3
 summary: Minimal Mongo

data/lib/mingo/pagination.rb

@@ -1,29 +0,0 @@
-require 'will_paginate/finders/base'
-
-class Mingo
-  module Pagination
-    def self.extended(base)
-      klass = base::Cursor
-      unless klass.instance_methods.map(&:to_sym).include? :paginate
-        klass.send(:include, PaginatedCursor)
-      end
-    end
-    
-    def paginate(options)
-      find.paginate(options)
-    end
-    
-    module PaginatedCursor
-      include WillPaginate::Finders::Base
-
-      def wp_query(options, pager, args)
-        self.limit pager.per_page
-        self.skip pager.offset
-        pager.replace self.to_a
-        pager.total_entries = self.count unless pager.total_entries
-      end
-    end
-  end
-  
-  extend Pagination
-end