mongar 0.0.8 → 0.0.11

data/VERSION

@@ -1 +1 @@
-0.0.8
+0.0.11

data/lib/mongar.rb

@@ -1,16 +1,16 @@
 require 'linguistics'
+require 'logger'
 
 class Mongar
+  class UnknownLogLevel < StandardError; end
+  
   autoload :Replica, 'mongar/replica'
   autoload :Column, 'mongar/column'
   autoload :Mongo, 'mongar/mongo'
-  autoload :Logger, 'mongar/logger'
-
-  include Mongar::Logger
 
   Linguistics.use :en  
   
-  attr_accessor :replicas, :status_collection, :log_level
+  attr_accessor :replicas, :status_collection, :log_level, :logger
   
   class << self
     def configure &block
@@ -21,14 +21,11 @@ class Mongar
   end
   
   def initialize
+    self.log_level = :debug
+    self.logger = Logger.new(STDOUT)
     self.replicas = []
   end
   
-  def log_level(level = nil)
-    return @log_level if level.nil?
-    @log_level = level
-  end
-  
   def run
     replicas.each do |replica|
       replica.run
@@ -51,12 +48,12 @@ class Mongar
       database = nil
       collection = if destination.is_a?(Hash)
         database = destination.keys.first
-        Mongar::Mongo::Collection.new(:name => destination.values.first, :log_level => log_level)
+        Mongar::Mongo::Collection.new(:name => destination.values.first, :logger => logger)
       else
-        Mongar::Mongo::Collection.new(:name => destination, :log_level => log_level)
+        Mongar::Mongo::Collection.new(:name => destination, :logger => logger)
       end
       
-      replica = Replica.new(:source => source, :destination => collection, :mongodb_name => database, :log_level => log_level)
+      replica = Replica.new(:source => source, :destination => collection, :mongodb_name => database, :logger => logger)
       replica.instance_eval(&block)
       self.replicas << replica
     end
@@ -72,4 +69,26 @@ class Mongar
   def set_status_collection(val)
     self.status_collection = val
   end
+
+  def log_level(level = nil)
+    return @log_level if level.nil?
+    unless [:fatal, :error, :warn, :info, :debug].include?(level)
+      raise UnknownLogLevel, "Log level #{level} is unknown. Valid levels are :fatal, :error, :warn, :info, :debug" 
+    end
+    @log_level = level
+    set_log_level
+  end
+  
+  def log(destination)
+    if destination == :stdout
+      @logger = Logger.new(STDOUT)
+    else
+      @logger = Logger.new(destination, 'daily')
+    end
+    set_log_level
+  end
+  
+  def set_log_level
+    @logger.level = Logger.const_get(@log_level.to_s.upcase)
+  end
 end

data/lib/mongar/mongo/collection.rb

@@ -1,14 +1,12 @@
 class Mongar::Mongo
   class Collection
-    include Mongar::Logger
-    
-    attr_reader :name, :log_level
+    attr_reader :name, :logger
     attr_accessor :replica
     
     def initialize(args = {})
       @name = args[:name]
       @replica = args[:replica]
-      @log_level = args[:log_level]
+      @logger = args[:logger] || Logger.new(nil)
       @last_logged_activity = nil
     end
     
@@ -39,14 +37,14 @@ class Mongar::Mongo
     end
     
     def last_replicated_at=(date)
-      info "   * Updating #{name}.last_replicated_at to #{date}"
+      logger.info "   * Updating #{name}.last_replicated_at to #{date}"
       status_collection.update({ :collection_name => name }, 
                                { '$set' => { :collection_name => name, :last_replicated_at => date } }, 
                                { :upsert => true })
     end
     
     def last_activity_at=(date)
-      debug "Saving #{name} last_activity_at to #{date}"
+      logger.debug "Saving #{name} last_activity_at to #{date}"
       status_collection.update({ :collection_name => name },
                                { '$set' => { :collection_name => name, :last_activity_at => date } },
                                { :upsert => true })
@@ -54,7 +52,7 @@ class Mongar::Mongo
     
     def log_activity
       return unless should_log_activity?
-      debug "Logging activity for #{name}"
+      logger.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()"
@@ -75,35 +73,35 @@ class Mongar::Mongo
     end
     
     def find(key)
-      debug "#{name}.find #{key.inspect}"
+      logger.debug "#{name}.find #{key.inspect}"
       collection.find_one(key)
     end
     
     def create(document)
       log_activity
       
-      debug "#{name}.create #{document.inspect}"
-      !collection.insert(document).nil?
+      logger.debug "#{name}.create #{document.inspect}"
+      !collection.insert(document, { :safe => true }).nil?
     end
     
     def delete(key)
       log_activity
       
-      debug "#{name}.delete #{key.inspect}"
+      logger.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 })
+      logger.debug "#{name}.update #{key.inspect} with #{document.inspect}"
+      collection.update(key, document, { :upsert => true, :safe => true })
     end
     
     def create_or_update(key, document)
       log_activity
       
-      debug "#{name}.create_or_update #{key.inspect} with #{document.inspect}"
+      logger.debug "#{name}.create_or_update #{key.inspect} with #{document.inspect}"
       
       collection.update(key, document, {:upsert => true, :safe => true})
     end
@@ -111,7 +109,7 @@ class Mongar::Mongo
     def mark_all_items_pending_deletion
       log_activity
       
-      info "   * Marking all items in #{name} for pending deletion"
+      logger.info "   * Marking all items in #{name} for pending deletion"
       
       collection.update({ '_id' => { '$exists' => true } }, { "$set" => { :pending_deletion => true } }, { :multi => true, :safe => true })
     end
@@ -119,7 +117,7 @@ class Mongar::Mongo
     def delete_all_items_pending_deletion
       log_activity
       
-      info "   * Deleting all items in #{name} that are pending deletion"
+      logger.info "   * Deleting all items in #{name} that are pending deletion"
       
       collection.remove({ :pending_deletion => true }, { :safe => true })
     end

data/lib/mongar/replica.rb

@@ -1,14 +1,12 @@
 class Mongar
   class Replica
-    include Mongar::Logger
-    
-    attr_accessor :source, :destination, :log_level
+    attr_accessor :source, :destination, :logger
     attr_accessor :mongodb_name
     attr_accessor :created_finder, :deleted_finder, :updated_finder, :db_time_selector
     attr_accessor :columns
     
     def initialize(args = {})
-      self.log_level = args[:log_level]
+      self.logger = args[:logger] || Logger.new(nil)
       self.source = args[:source]
       self.destination = args[:destination]
       self.mongodb_name = args[:mongodb_name] || :default
@@ -28,20 +26,21 @@ class Mongar
     end
     
     def run
-      info "Replicating #{source.to_s} to #{mongodb.name}.#{destination.name}"
+      logger.info "Replicating #{source.to_s} to #{mongodb.name}.#{destination.name}"
     
       if locked?
-        info " * Skipping locked replica"
+        logger.info " * Skipping locked replica"
         return
       end
       
       time = current_time_on_database_server
+      logger.debug " * Time on server #{time}"
       
       # Set the time back 1 second to make sure we don't miss any changes made mid-second
       time -= 1 unless time.nil?
       
       if do_full_refresh?
-        info " * Full refresh"
+        logger.info " * Full refresh"
         
         destination.mark_all_items_pending_deletion!
         
@@ -51,16 +50,17 @@ class Mongar
       else
         last_replicated_at = destination.last_replicated_at
         
-        info " * Incremental updates since #{last_replicated_at}"
+        logger.info " * Incremental updates since #{last_replicated_at}"
         
         run_sync_for([:deleted, :created_or_updated, :updated], last_replicated_at)
       end
+      logger.debug " * Setting last_replicated_at to #{time}"
       destination.last_replicated_at = time
       destination.last_activity_at = nil
     end
     
     def run_sync_for(types, last_replicated_at)
-      info "   * Syncing #{types.join(', ')} items"
+      logger.info "   * Syncing #{types.join(', ')} items"
       
       # find deleted
       find(:deleted, last_replicated_at).each do |deleted_item|
@@ -150,6 +150,7 @@ class Mongar
     end
     
     def find(type, last_replicated_time)
+      logger.debug " * Find #{type} from last replicated time #{last_replicated_time}"
       finder_function = self.send("#{type}_finder".to_sym)
       return [] if finder_function.nil?
       # execute the finder proc on the source object with an argument of the last replicated date/time
@@ -177,7 +178,7 @@ class Mongar
       adapter = $1 if adapter =~ /::([^:]+)$/
       
       time = if adapter == 'MysqlAdapter'
-        Time.parse(object.connection.execute("SELECT UTC_TIMESTAMP()").fetch_row.first)
+        Time.parse(object.connection.execute("SELECT UTC_TIMESTAMP()").fetch_row.first + " UTC")
       elsif adapter == 'Mysql2Adapter'
         object.connection.execute("SELECT UTC_TIMESTAMP()").first.first
       elsif adapter == 'SQLServerAdapter'

data/mongar.gemspec

@@ -4,14 +4,14 @@
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
-  s.name = %q{mongar}
-  s.version = "0.0.8"
+  s.name = "mongar"
+  s.version = "0.0.11"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Philippe Green"]
-  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.date = "2012-04-19"
+  s.description = "Replicates data from ActiveRecord (or other Ruby data mapping class) to MongoDB"
+  s.email = "phil@greenviewdata.com"
   s.extra_rdoc_files = [
     "LICENSE.txt",
     "README.rdoc"
@@ -27,7 +27,6 @@ Gem::Specification.new do |s|
     "VERSION",
     "lib/mongar.rb",
     "lib/mongar/column.rb",
-    "lib/mongar/logger.rb",
     "lib/mongar/mongo.rb",
     "lib/mongar/mongo/collection.rb",
     "lib/mongar/replica.rb",
@@ -43,11 +42,11 @@ Gem::Specification.new do |s|
     "spec/mongar_spec.rb",
     "spec/spec_helper.rb"
   ]
-  s.homepage = %q{http://github.com/gdi/mongar}
+  s.homepage = "http://github.com/gdi/mongar"
   s.licenses = ["MIT"]
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.6.2}
-  s.summary = %q{Replicates data from ActiveRecord (or other Ruby data mapping class) to MongoDB}
+  s.rubygems_version = "1.8.10"
+  s.summary = "Replicates data from ActiveRecord (or other Ruby data mapping class) to MongoDB"
 
   if s.respond_to? :specification_version then
     s.specification_version = 3

data/spec/fixtures/configure.rb

@@ -1,4 +1,7 @@
 Mongar.configure do
+  log :stdout
+  log_level :fatal
+
   mongo :default do
     database 'integration_spec'
     

data/spec/fixtures/full_configure.rb

@@ -1,8 +1,16 @@
 Mongar.configure do
+  # You should put log_level and log statements at the top of the configure block
+  
   # Currently we only log to STDOUT, we have plans to use a
   # plans to use a configurable logger.
-  # Valid log levels are :info and :debug
-  log_level :debug
+  # Valid log levels are :fatal, :error, :warn, :info, :debug
+  # Default is :debug
+  log_level :fatal
+  
+  # Set the log destination to standard out
+  # You can also specify a file name, it will rotate daily
+  # log '/tmp/mongar.log'
+  log :stdout
   
   mongo :default do
     database 'mydb'

data/spec/integration_spec.rb

@@ -16,6 +16,10 @@ describe "Mongar" do
       @collection = Mongar::Mongo.databases[:default].db['domains']
     end
     
+    it "should have set the log level properly" do
+      @mongar.logger.level.should == Logger::FATAL
+    end
+    
     it "should add, delete, and update items properly" do
       # inserts
       domain = Domain.create(:name => "test.com", :client_id => 1)

data/spec/mongar_spec.rb

@@ -1,9 +1,76 @@
 require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
 
 describe "Mongar" do
-  describe ".configure" do
+  describe "#log" do
     before do
-      
+      @mongar = Mongar.new
+    end
+    it "should setup a logger for the file name specified" do
+      @mongar.log "/tmp/mongar_test.log"
+      @mongar.logger.instance_variable_get(:@logdev).instance_variable_get(:@filename).should == "/tmp/mongar_test.log"
+    end
+    it "should setup a logger for standard out" do
+      @mongar.log :stdout
+      @mongar.logger.instance_variable_get(:@logdev).instance_variable_get(:@dev).should be_a_kind_of(IO)
+    end
+  end
+  
+  describe "#log_level" do
+    before do
+      @mongar = Mongar.new
+    end
+    it "should set the log level on a logger created after the log_level statement" do
+      @mongar.log_level :fatal
+      @mongar.log :stdout
+      @mongar.logger.level.should == Logger::FATAL
+    end
+    it "should set the log level on a logger created before the log_level statement" do
+      @mongar.log :stdout
+      @mongar.log_level :fatal
+      @mongar.logger.level.should == Logger::FATAL
+    end
+  end
+  
+  describe "#set_log_level" do
+    before do
+      @mongar = Mongar.new
+      @mongar.log :stdout
+      @mongar.instance_variable_set(:@log_level, :info)
+      @mongar.set_log_level
+    end
+    
+    it "should set the log level on each logger" do
+      @mongar.logger.level.should == Logger::INFO
+    end
+    
+    it "should convert :info to Logger::INFO" do
+      @mongar.instance_variable_set(:@log_level, :info)
+      @mongar.set_log_level
+      @mongar.logger.level.should == Logger::INFO
+    end
+    
+    it "should convert :fatal to Logger::FATAL" do
+      @mongar.instance_variable_set(:@log_level, :fatal)
+      @mongar.set_log_level
+      @mongar.logger.level.should == Logger::FATAL
+    end
+    
+    it "should convert :error to Logger::ERROR" do
+      @mongar.instance_variable_set(:@log_level, :error)
+      @mongar.set_log_level
+      @mongar.logger.level.should == Logger::ERROR
+    end
+    
+    it "should convert :warn to Logger::WARN" do
+      @mongar.instance_variable_set(:@log_level, :warn)
+      @mongar.set_log_level
+      @mongar.logger.level.should == Logger::WARN
+    end
+    
+    it "should convert :debug to Logger::DEBUG" do
+      @mongar.instance_variable_set(:@log_level, :debug)
+      @mongar.set_log_level
+      @mongar.logger.level.should == Logger::DEBUG
     end
   end
   
@@ -12,6 +79,8 @@ describe "Mongar" do
       class Client
       end
       
+      @logger = mock(Logger)
+      Logger.stub!(:new).and_return(@logger)
       @mongar = Mongar.new
       
       @block = lambda {}
@@ -35,7 +104,7 @@ describe "Mongar" do
       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::Replica.should_receive(:new).with(:source => Client, :destination => @collection, :mongodb_name => nil, :logger => @logger)
         @mongar.replicate({ Client => 'clients' }, &@block)
       end
     end
@@ -52,7 +121,7 @@ describe "Mongar" do
     
     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::Replica.should_receive(:new).with(:source => Client, :destination => @collection, :mongodb_name => :someotherdb, :logger => @logger)
         @mongar.replicate(Client => { :someotherdb => 'clients'})
       end
     end

metadata

@@ -1,105 +1,102 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: mongar
-version: !ruby/object:Gem::Version 
+version: !ruby/object:Gem::Version
+  version: 0.0.11
   prerelease: 
-  version: 0.0.8
 platform: ruby
-authors: 
+authors:
 - Philippe Green
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-12-19 00:00:00 -05:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2012-04-19 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: linguistics
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: &70284555282580 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
+  version_requirements: *70284555282580
+- !ruby/object:Gem::Dependency
   name: mongo
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  requirement: &70284555281820 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
+  version_requirements: *70284555281820
+- !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  requirement: &70284555280780 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
+      - !ruby/object:Gem::Version
         version: 2.3.0
   type: :development
   prerelease: false
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
+  version_requirements: *70284555280780
+- !ruby/object:Gem::Dependency
   name: yard
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  requirement: &70284555279440 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
+      - !ruby/object:Gem::Version
         version: 0.6.0
   type: :development
   prerelease: false
-  version_requirements: *id004
-- !ruby/object:Gem::Dependency 
+  version_requirements: *70284555279440
+- !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  requirement: &70284555278960 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
+      - !ruby/object:Gem::Version
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *id005
-- !ruby/object:Gem::Dependency 
+  version_requirements: *70284555278960
+- !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  requirement: &70284555303760 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
+      - !ruby/object:Gem::Version
         version: 1.6.4
   type: :development
   prerelease: false
-  version_requirements: *id006
-- !ruby/object:Gem::Dependency 
+  version_requirements: *70284555303760
+- !ruby/object:Gem::Dependency
   name: rcov
-  requirement: &id007 !ruby/object:Gem::Requirement 
+  requirement: &70284555303040 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
   prerelease: false
-  version_requirements: *id007
-description: Replicates data from ActiveRecord (or other Ruby data mapping class) to MongoDB
+  version_requirements: *70284555303040
+description: Replicates data from ActiveRecord (or other Ruby data mapping class)
+  to MongoDB
 email: phil@greenviewdata.com
 executables: []
-
 extensions: []
-
-extra_rdoc_files: 
+extra_rdoc_files:
 - LICENSE.txt
 - README.rdoc
-files: 
+files:
 - .document
 - .rspec
 - Gemfile
@@ -110,7 +107,6 @@ files:
 - VERSION
 - lib/mongar.rb
 - lib/mongar/column.rb
-- lib/mongar/logger.rb
 - lib/mongar/mongo.rb
 - lib/mongar/mongo/collection.rb
 - lib/mongar/replica.rb
@@ -125,36 +121,32 @@ files:
 - spec/mongar/replica_spec.rb
 - spec/mongar_spec.rb
 - spec/spec_helper.rb
-has_rdoc: true
 homepage: http://github.com/gdi/mongar
-licenses: 
+licenses:
 - MIT
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: -176625357
-      segments: 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+      segments:
       - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+      hash: -260101698656845288
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.6.2
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: Replicates data from ActiveRecord (or other Ruby data mapping class) to MongoDB
 test_files: []
-

data/lib/mongar/logger.rb

@@ -1,15 +0,0 @@
-class Mongar
-  module Logger
-    def info(log_message)
-      return unless @log_level && [:info, :debug].include?(@log_level)
-      
-      puts "Info: #{log_message}"
-    end
-    
-    def debug(log_message)
-      return unless @log_level && @log_level == :debug
-      
-      puts "Debug: #{log_message}"
-    end
-  end
-end