mongar 0.0.7 → 0.0.8

data/README.rdoc

@@ -63,44 +63,41 @@ Given an ActiveRecord model call Domain with two attributes name and client_id:
     # plans to use a configurable logger.
     # Valid log levels are :info and :debug
     log_level :debug
-    
+  
     mongo :default do
       database 'mydb'
     end
-  
+
     mongo :otherdb do
       database 'myotherdb'
       user 'mongouser'
       password 'password'
       host '127.0.0.1'
       port 27017
-      
+    
       # By default Mongar uses the 'statuses' collection to
       # keep track of the last replicated times, you can specify
       # a custom collection name
       status_collection :stati
     end
-    
+  
     # Minimal replica config to replicate the Domain model
     # to the 'domains' mongo collection on the mongo db defined
     # in the :default config above
-  
+
     replicate Domain do
       column :name do
         primary_index
       end
-      
+    
       column :client_id
     end
-  
+
     # Customized replica config to replicate the Client
     # model to the 'customers' mongo collection on the db
-    # defined in the :otherdb config above
-    
-    replicate Client => 'customers' do
-      # Use the other mongo database 
-      use_mongodb :otherdb
-      
+    # defined in the :otherdb config above as well as the
+    # default database
+    replicate Client => [{ :otherdb => 'clients' }, 'clients'] do
       # By default, Mongar will try to determine the time on the
       # backend database. The supported ActiveRecord database adapters
       # are MysqlAdapter, Mysql2Adapter, and SQLServerAdapter.
@@ -110,42 +107,42 @@ Given an ActiveRecord model call Domain with two attributes name and client_id:
         # this will run Client#get_db_time
         get_db_time
       end
-      
+    
       # Items are never deleted
       no_deleted_finder
-      
+    
       # Customize your updated record finder.  The block is 
       # run in the source class context
       set_updated_finder do |last_replicated_date|
         find(:all, :conditions => ['something > ?', last_replicated_date])
       end
-      
+    
       # Custom created item finder
       set_created_finder do |last_replicated_date|
         created_scope(last_replicated_date)
       end
-    
+  
       # Run a full refresh of all items in the database based
       # a condition returned by the Proc
       full_refresh :if => Proc.new do |last_replicated_date|
         # class eval'ed code
         any_changes_since?(last_replicated_date)
       end
-      
+    
       # You can also refresh every N seconds
       # full_refresh :every => 3600
-      
+    
       # Define your columns
       column :id do
         # The 'primary index' column is used to find items in the mongo collection
         primary_index
       end
-      
+    
       column :tag do
         # Run the procedure :downcase on the value of Client#tag
         transform :downcase
       end
-      
+    
       column :employee_count do
         # Run a block transformation on the value of Client#employee_count
         transform do |value|

data/VERSION

@@ -1 +1 @@
-0.0.7
+0.0.8

data/lib/mongar.rb

@@ -38,18 +38,28 @@ class Mongar
   def replicate(what, &block)
     if what.is_a?(Hash)
       source = what.keys.first
-      destination = what.values.first
+      destinations = what.values.first
     else
       source = what
-      destination = what.to_s.downcase.en.plural
-    end
-    
-    destination = Mongar::Mongo::Collection.new(:name => destination, :log_level => log_level)
+      destinations = what.to_s.downcase.en.plural
+    end  
+    destinations = [destinations] unless destinations.is_a?(Array)
     
     self.replicas ||= []
-    replica = Replica.new(:source => source, :destination => destination, :log_level => log_level)
-    replica.instance_eval(&block)
-    self.replicas << replica
+    
+    destinations.each do |destination|
+      database = nil
+      collection = if destination.is_a?(Hash)
+        database = destination.keys.first
+        Mongar::Mongo::Collection.new(:name => destination.values.first, :log_level => log_level)
+      else
+        Mongar::Mongo::Collection.new(:name => destination, :log_level => log_level)
+      end
+      
+      replica = Replica.new(:source => source, :destination => collection, :mongodb_name => database, :log_level => log_level)
+      replica.instance_eval(&block)
+      self.replicas << replica
+    end
   end
   
   def mongo(name, &block)

data/lib/mongar/mongo.rb

@@ -47,5 +47,9 @@ class Mongar
     def status_collection_accessor
       db[status_collection]
     end
+    
+    def time_on_server
+      db.eval("return new Date()")
+    end
   end
 end

data/lib/mongar/mongo/collection.rb

@@ -9,6 +9,7 @@ class Mongar::Mongo
       @name = args[:name]
       @replica = args[:replica]
       @log_level = args[:log_level]
+      @last_logged_activity = nil
     end
     
     def mongodb
@@ -40,43 +41,84 @@ class Mongar::Mongo
     def last_replicated_at=(date)
       info "   * Updating #{name}.last_replicated_at to #{date}"
       status_collection.update({ :collection_name => name }, 
-                               { :collection_name => name, :last_replicated_at => date }, 
+                               { '$set' => { :collection_name => name, :last_replicated_at => date } }, 
                                { :upsert => true })
     end
     
+    def last_activity_at=(date)
+      debug "Saving #{name} last_activity_at to #{date}"
+      status_collection.update({ :collection_name => name },
+                               { '$set' => { :collection_name => name, :last_activity_at => date } },
+                               { :upsert => true })
+    end
+    
+    def log_activity
+      return unless should_log_activity?
+      debug "Logging activity for #{name}"
+      
+      # should be able to set last_activity_at = new Date() but I can't figure out how to get
+      # ruby's mongo library to evaluate it instead of setting it to the string "new Date()"
+      status_collection.update({ :collection_name => name },
+                               { '$set' => { :collection_name => name, :last_activity_at => mongodb.time_on_server } },
+                               { :upsert => true })
+      @last_logged_activity = Time.now
+    end
+    
+    def should_log_activity?
+      @last_logged_activity.nil? || Time.now - @last_logged_activity > 5
+    end
+    
+    def last_activity_at
+      status = status_collection.find_one({ :collection_name => name })
+      return nil unless status && status['last_activity_at']
+      status['last_activity_at']
+    end
+    
     def find(key)
       debug "#{name}.find #{key.inspect}"
       collection.find_one(key)
     end
     
     def create(document)
+      log_activity
+      
       debug "#{name}.create #{document.inspect}"
       !collection.insert(document).nil?
     end
     
     def delete(key)
+      log_activity
+      
       debug "#{name}.delete #{key.inspect}"
       collection.remove(key, { :safe => true })
     end
     
     def update(key, document)
+      log_activity
+      
       debug "#{name}.update #{key.inspect} with #{document.inspect}"
       collection.update(key, document, { :safe => true })
     end
     
     def create_or_update(key, document)
+      log_activity
+      
       debug "#{name}.create_or_update #{key.inspect} with #{document.inspect}"
       
       collection.update(key, document, {:upsert => true, :safe => true})
     end
     
     def mark_all_items_pending_deletion
+      log_activity
+      
       info "   * Marking all items in #{name} for pending deletion"
       
       collection.update({ '_id' => { '$exists' => true } }, { "$set" => { :pending_deletion => true } }, { :multi => true, :safe => true })
     end
     
     def delete_all_items_pending_deletion
+      log_activity
+      
       info "   * Deleting all items in #{name} that are pending deletion"
       
       collection.remove({ :pending_deletion => true }, { :safe => true })

data/lib/mongar/replica.rb

@@ -28,13 +28,18 @@ class Mongar
     end
     
     def run
+      info "Replicating #{source.to_s} to #{mongodb.name}.#{destination.name}"
+    
+      if locked?
+        info " * Skipping locked replica"
+        return
+      end
+      
       time = current_time_on_database_server
       
       # Set the time back 1 second to make sure we don't miss any changes made mid-second
       time -= 1 unless time.nil?
       
-      info "Replicating #{source.to_s} to #{destination.name}"
-      
       if do_full_refresh?
         info " * Full refresh"
         
@@ -51,6 +56,7 @@ class Mongar
         run_sync_for([:deleted, :created_or_updated, :updated], last_replicated_at)
       end
       destination.last_replicated_at = time
+      destination.last_activity_at = nil
     end
     
     def run_sync_for(types, last_replicated_at)
@@ -184,5 +190,11 @@ class Mongar
     def current_time_on_database_server
       @db_time_selector.nil? ? default_time_selector(source) : source.instance_exec(&@db_time_selector)
     end
+    
+    def locked?
+      last_replicated_at = destination.last_activity_at
+      return false if last_replicated_at.nil?
+      Time.now - last_replicated_at < 300
+    end
   end
 end

data/mongar.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{mongar}
-  s.version = "0.0.7"
+  s.version = "0.0.8"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Philippe Green"]
-  s.date = %q{2011-12-16}
+  s.date = %q{2011-12-19}
   s.description = %q{Replicates data from ActiveRecord (or other Ruby data mapping class) to MongoDB}
   s.email = %q{phil@greenviewdata.com}
   s.extra_rdoc_files = [

data/spec/fixtures/full_configure.rb

@@ -35,12 +35,9 @@ Mongar.configure do
 
   # Customized replica config to replicate the Client
   # model to the 'customers' mongo collection on the db
-  # defined in the :otherdb config above
-  
-  replicate Client => 'customers' do
-    # Use the other mongo database 
-    use_mongodb :otherdb
-    
+  # defined in the :otherdb config above as well as the
+  # default database
+  replicate Client => [{ :otherdb => 'clients' }, 'clients'] do
     # By default, Mongar will try to determine the time on the
     # backend database. The supported ActiveRecord database adapters
     # are MysqlAdapter, Mysql2Adapter, and SQLServerAdapter.

data/spec/mongar/mongo/collection_spec.rb

@@ -198,4 +198,50 @@ describe "Mongar::Mongo::Collection" do
       @collection.last_replicated_at.should == Time.parse("1/1/1902 00:00:00")
     end
   end
+  
+  describe "#last_activity_at" do
+    it "should return the last activity date" do
+      @collection.last_activity_at = Time.parse("1/1/2012 1:01:00")
+      @collection.last_activity_at.should == Time.parse("1/1/2012 1:01:00")
+    end
+    
+    it "should return nil if the last activity date doesn't exist" do
+      @collection.last_activity_at.should be_nil
+    end
+  end
+  
+  describe "#log_activity" do
+    it "should log the current mongodb time in the statuses collection" do
+      @collection.log_activity
+      @collection.last_activity_at.should be_a_kind_of(Time)
+      @collection.last_activity_at.should be_within(10).of(Time.now)
+    end
+  end
+  
+  describe "#last_activity_at=" do
+    context "with no status collection record" do
+      before do
+        @time1 = @collection.last_activity_at = Time.parse("1/1/2012 1:01:00")
+      end
+      
+      it "should save the last activity date" do
+        @collection.last_activity_at.should == @time1
+      end
+    end
+    
+    context "with an existing status collection record" do
+      before do
+        @time1 = @collection.last_replicated_at = Time.parse("1/1/2012 1:00:00")
+        @time2 = @collection.last_activity_at = Time.parse("1/1/2012 1:01:00")
+      end
+      
+      it "should save the last activity date" do
+        @collection.last_activity_at.should == @time2
+      end
+      
+      it "should not overwrite the last_replicated_at" do
+        @collection.last_replicated_at.should == @time1
+      end
+    end
+  end
 end

data/spec/mongar/mongo_spec.rb

@@ -88,4 +88,14 @@ describe "Mongar::Mongo" do
       Mongar::Mongo.new.status_collection.should == 'statuses'
     end
   end
+  
+  describe "#time_on_server" do
+    before do
+      @mongo = Mongar::Mongo.new(:name => 'rspec_tests', 
+                                 :database => :rspec_tests)
+    end
+    it "should return a date/time" do
+      @mongo.time_on_server.should be_a_kind_of(Time)
+    end
+  end
 end

data/spec/mongar/replica_spec.rb

@@ -18,6 +18,7 @@ describe "Mongar::Replica" do
       
       @collection = Mongar::Mongo::Collection.new(:name => "clients")
       @replica = Mongar::Replica.new(:source => Client, :destination => @collection)
+      @replica.stub!(:locked?).and_return(false)
       @replica.column :name do
         primary_index
       end
@@ -31,9 +32,22 @@ describe "Mongar::Replica" do
       @last_replicated_time = Time.now - 86400
       @collection.stub!(:last_replicated_at).and_return(@last_replicated_time)
       
+      @collection.stub!(:last_activity_at=)
+      
       @created_client1 = Client.new(:name => "Otis Co", :employee_count => 600)
     end
     
+    context "with a locked replica" do
+      before do
+        @replica.stub!(:locked?).and_return(true)
+      end
+      it "should return without doing anything" do
+        @replica.should_not_receive(:do_full_refresh?)
+        @replica.should_not_receive(:find)
+        @replica.run
+      end
+    end
+    
     context "requiring a full refresh" do
       before do
         @replica.stub!(:find).with(:created, Time.parse("1/1/1902 00:00:00")).and_return([@created_client1])
@@ -472,4 +486,27 @@ describe "Mongar::Replica" do
       end
     end
   end
+  
+  describe "#locked?" do
+    before do
+      @collection = Mongar::Mongo::Collection.new(:name => "clients")
+      @replica = Mongar::Replica.new(:destination => @collection)
+      
+      @ten_min_ago = Time.now - 600
+      @two_min_ago = Time.now - 120
+      @collection.stub!(:last_activity_at).and_return(nil)
+    end
+    
+    it "should return false if the last_activity is null" do
+      @replica.locked?.should be_false
+    end
+    it "should return false if the last_activity is more than 5 minutes ago" do
+      @collection.stub!(:last_activity_at).and_return(@ten_min_ago)
+      @replica.locked?.should be_false
+    end
+    it "should return true if the last_activity is not null and within 5 minutes of the current time" do
+      @collection.stub!(:last_activity_at).and_return(@two_min_ago)
+      @replica.locked?.should be_true
+    end
+  end
 end

data/spec/mongar_spec.rb

@@ -16,26 +16,45 @@ describe "Mongar" do
       
       @block = lambda {}
       @mock_replica = mock(Mongar::Replica)
-      Mongar::Replica.stub!(:new).and_return(@mock_replica)
       @mock_replica.stub!(:instance_eval)
+      Mongar::Replica.stub!(:new).and_return(@mock_replica)
       
       @collection = Mongar::Mongo::Collection.new
       Mongar::Mongo::Collection.stub!(:new).and_return(@collection)
     end
     
-    it "should make a new Mongar::Replica and pass it the block" do
-      @mock_replica.should_receive(:instance_eval).with(&@block)
-      @mongar.replicate({ Client => 'clients' }, &@block)
+    context "given a string" do
+      it "should make a new Mongar::Replica and pass it the block" do
+        @mock_replica.should_receive(:instance_eval).with(&@block)
+        @mongar.replicate({ Client => 'clients' }, &@block)
+      end
+
+      it "should populate Mongar.replicas with one Replica instance for Clients" do
+        @mongar.replicate({ Client => 'clients' }, &@block)
+        @mongar.replicas.should == [@mock_replica]
+      end
+    
+      it "should initialize a new replica with the source and destination objects" do
+        Mongar::Replica.should_receive(:new).with(:source => Client, :destination => @collection, :mongodb_name => nil, :log_level => nil)
+        @mongar.replicate({ Client => 'clients' }, &@block)
+      end
     end
     
-    it "should populate Mongar.replicas with one Replica instance for Clients" do
-      @mongar.replicate({ Client => 'clients' }, &@block)
-      @mongar.replicas.should == [@mock_replica]
+    context 'given an array of destinations' do
+      before do
+        @mongar.replicate({ Client => ['clients', { :someotherdb => 'clients' }]})
+      end
+      
+      it "should create 2 replicas" do
+        @mongar.replicas.length.should == 2
+      end
     end
     
-    it "should initialize a new replica with the source and destination objects" do
-      Mongar::Replica.should_receive(:new).with(:source => Client, :destination => @collection, :log_level => nil)
-      @mongar.replicate({ Client => 'clients' }, &@block)
+    context "given a hash" do
+      it "should initialize a new replica" do
+        Mongar::Replica.should_receive(:new).with(:source => Client, :destination => @collection, :mongodb_name => :someotherdb, :log_level => nil)
+        @mongar.replicate(Client => { :someotherdb => 'clients'})
+      end
     end
   end
   

metadata

@@ -2,7 +2,7 @@
 name: mongar
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.0.7
+  version: 0.0.8
 platform: ruby
 authors: 
 - Philippe Green
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-12-16 00:00:00 -05:00
+date: 2011-12-19 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -139,7 +139,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: -627046195
+      hash: -176625357
       segments: 
       - 0
       version: "0"