mongar 0.0.11 → 0.0.12

data/Gemfile

@@ -4,7 +4,7 @@ source "http://rubygems.org"
 #   gem "activesupport", ">= 2.3.5"
 
 gem 'linguistics'
-gem 'mongo'
+gem 'mongo', '1.12.3'
 
 # Add dependencies to develop your gem here.
 # Include everything needed to run rake, tests, features, etc.

data/Gemfile.lock

@@ -1,7 +1,7 @@
 GEM
   remote: http://rubygems.org/
   specs:
-    bson (1.5.1)
+    bson (1.12.3)
     diff-lcs (1.1.3)
     git (1.2.5)
     jeweler (1.6.4)
@@ -9,8 +9,8 @@ GEM
       git (>= 1.2.5)
       rake
     linguistics (1.0.9)
-    mongo (1.5.1)
-      bson (= 1.5.1)
+    mongo (1.12.3)
+      bson (= 1.12.3)
     rake (0.9.2.2)
     rcov (0.9.11)
     rspec (2.3.0)
@@ -30,7 +30,7 @@ DEPENDENCIES
   bundler (~> 1.0.0)
   jeweler (~> 1.6.4)
   linguistics
-  mongo
+  mongo (= 1.12.3)
   rcov
   rspec (~> 2.3.0)
   yard (~> 0.6.0)

data/VERSION

@@ -1 +1 @@
-0.0.11
+0.0.12

data/lib/mongar/mongo.rb

@@ -21,7 +21,7 @@ class Mongar
       @status_collection ||= 'statuses'
     end
     
-    [:database, :user, :password, :host, :port, :status_collection].each do |attr_name|
+    [:database, :auth_database, :auth_mechanism, :user, :password, :host, :port, :status_collection].each do |attr_name|
       define_method(attr_name) do |*args|
         val = args.first
         return instance_variable_get(:"@#{attr_name}") if val.nil?
@@ -30,10 +30,7 @@ class Mongar
     end
     
     def connection
-      @connection = ::Mongo::Connection.new(host, port)
-      return @connection if self.user.nil? || @connection.authenticate(user, password)
-      @connection.close
-      @connection = nil
+      ::Mongo::Connection.new(host, port)
     end
     
     def connection!
@@ -41,7 +38,14 @@ class Mongar
     end
     
     def db
-      @db ||= connection!.db(database.to_s)
+      return @db unless @db.nil?
+      @db = connection!.db(database.to_s)
+      unless self.user.nil?
+        db = self.auth_database.nil? ? @db : connection!.db(self.auth_database)
+        mechanism = self.auth_mechanism || 'SCRAM-SHA-1'
+        db.authenticate(user, password, :mechanism => mechanism)
+      end
+      @db
     end
     
     def status_collection_accessor
@@ -52,4 +56,4 @@ class Mongar
       db.eval("return new Date()")
     end
   end
-end
+end

data/lib/mongar/mongo/collection.rb

@@ -53,12 +53,23 @@ class Mongar::Mongo
     def log_activity
       return unless should_log_activity?
       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()"
-      status_collection.update({ :collection_name => name },
-                               { '$set' => { :collection_name => name, :last_activity_at => mongodb.time_on_server } },
-                               { :upsert => true })
+
+      # MongoDB 2.6+ supports currentDate, so let's try that first.
+      begin
+        status_collection.update(
+          { :collection_name => name },
+          { '$currentDate' => { :last_activity_at => true }, '$set' => { :collection_name => name } },
+          { :upsert => true }
+        )
+      rescue => e
+        raise e unless e.to_s =~ /Invalid modifier specified \$currentDate/
+        # Fallback to an $eval to get the date (gross).
+        status_collection.update(
+          { :collection_name => name },
+          { '$set' => { :collection_name => name, :last_activity_at => mongodb.time_on_server } },
+          { :upsert => true }
+        )
+      end
       @last_logged_activity = Time.now
     end
     
@@ -130,4 +141,4 @@ class Mongar::Mongo
       end
     end
   end
-end
+end

data/mongar.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "mongar"
-  s.version = "0.0.11"
+  s.version = "0.0.12"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Philippe Green"]
-  s.date = "2012-04-19"
+  s.date = "2015-09-11"
   s.description = "Replicates data from ActiveRecord (or other Ruby data mapping class) to MongoDB"
   s.email = "phil@greenviewdata.com"
   s.extra_rdoc_files = [
@@ -45,7 +45,7 @@ Gem::Specification.new do |s|
   s.homepage = "http://github.com/gdi/mongar"
   s.licenses = ["MIT"]
   s.require_paths = ["lib"]
-  s.rubygems_version = "1.8.10"
+  s.rubygems_version = "1.8.29"
   s.summary = "Replicates data from ActiveRecord (or other Ruby data mapping class) to MongoDB"
 
   if s.respond_to? :specification_version then
@@ -53,7 +53,7 @@ Gem::Specification.new do |s|
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<linguistics>, [">= 0"])
-      s.add_runtime_dependency(%q<mongo>, [">= 0"])
+      s.add_runtime_dependency(%q<mongo>, ["= 1.12.3"])
       s.add_development_dependency(%q<rspec>, ["~> 2.3.0"])
       s.add_development_dependency(%q<yard>, ["~> 0.6.0"])
       s.add_development_dependency(%q<bundler>, ["~> 1.0.0"])
@@ -61,7 +61,7 @@ Gem::Specification.new do |s|
       s.add_development_dependency(%q<rcov>, [">= 0"])
     else
       s.add_dependency(%q<linguistics>, [">= 0"])
-      s.add_dependency(%q<mongo>, [">= 0"])
+      s.add_dependency(%q<mongo>, ["= 1.12.3"])
       s.add_dependency(%q<rspec>, ["~> 2.3.0"])
       s.add_dependency(%q<yard>, ["~> 0.6.0"])
       s.add_dependency(%q<bundler>, ["~> 1.0.0"])
@@ -70,7 +70,7 @@ Gem::Specification.new do |s|
     end
   else
     s.add_dependency(%q<linguistics>, [">= 0"])
-    s.add_dependency(%q<mongo>, [">= 0"])
+    s.add_dependency(%q<mongo>, ["= 1.12.3"])
     s.add_dependency(%q<rspec>, ["~> 2.3.0"])
     s.add_dependency(%q<yard>, ["~> 0.6.0"])
     s.add_dependency(%q<bundler>, ["~> 1.0.0"])

metadata

@@ -1,102 +1,140 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification 
 name: mongar
-version: !ruby/object:Gem::Version
-  version: 0.0.11
+version: !ruby/object:Gem::Version 
+  hash: 7
   prerelease: 
+  segments: 
+  - 0
+  - 0
+  - 12
+  version: 0.0.12
 platform: ruby
-authors:
+authors: 
 - Philippe Green
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-04-19 00:00:00.000000000 Z
-dependencies:
-- !ruby/object:Gem::Dependency
-  name: linguistics
-  requirement: &70284555282580 !ruby/object:Gem::Requirement
+
+date: 2015-09-11 00:00:00 Z
+dependencies: 
+- !ruby/object:Gem::Dependency 
+  requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  name: linguistics
   prerelease: false
-  version_requirements: *70284555282580
-- !ruby/object:Gem::Dependency
-  name: mongo
-  requirement: &70284555281820 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  version_requirements: *id001
   type: :runtime
+- !ruby/object:Gem::Dependency 
+  requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - "="
+      - !ruby/object:Gem::Version 
+        hash: 33
+        segments: 
+        - 1
+        - 12
+        - 3
+        version: 1.12.3
+  name: mongo
   prerelease: false
-  version_requirements: *70284555281820
-- !ruby/object:Gem::Dependency
-  name: rspec
-  requirement: &70284555280780 !ruby/object:Gem::Requirement
+  version_requirements: *id002
+  type: :runtime
+- !ruby/object:Gem::Dependency 
+  requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 2
+        - 3
+        - 0
         version: 2.3.0
-  type: :development
+  name: rspec
   prerelease: false
-  version_requirements: *70284555280780
-- !ruby/object:Gem::Dependency
-  name: yard
-  requirement: &70284555279440 !ruby/object:Gem::Requirement
+  version_requirements: *id003
+  type: :development
+- !ruby/object:Gem::Dependency 
+  requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
+      - !ruby/object:Gem::Version 
+        hash: 7
+        segments: 
+        - 0
+        - 6
+        - 0
         version: 0.6.0
-  type: :development
+  name: yard
   prerelease: false
-  version_requirements: *70284555279440
-- !ruby/object:Gem::Dependency
-  name: bundler
-  requirement: &70284555278960 !ruby/object:Gem::Requirement
+  version_requirements: *id004
+  type: :development
+- !ruby/object:Gem::Dependency 
+  requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
+      - !ruby/object:Gem::Version 
+        hash: 23
+        segments: 
+        - 1
+        - 0
+        - 0
         version: 1.0.0
-  type: :development
+  name: bundler
   prerelease: false
-  version_requirements: *70284555278960
-- !ruby/object:Gem::Dependency
-  name: jeweler
-  requirement: &70284555303760 !ruby/object:Gem::Requirement
+  version_requirements: *id005
+  type: :development
+- !ruby/object:Gem::Dependency 
+  requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
+      - !ruby/object:Gem::Version 
+        hash: 7
+        segments: 
+        - 1
+        - 6
+        - 4
         version: 1.6.4
-  type: :development
+  name: jeweler
   prerelease: false
-  version_requirements: *70284555303760
-- !ruby/object:Gem::Dependency
-  name: rcov
-  requirement: &70284555303040 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  version_requirements: *id006
   type: :development
+- !ruby/object:Gem::Dependency 
+  requirement: &id007 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  name: rcov
   prerelease: false
-  version_requirements: *70284555303040
-description: Replicates data from ActiveRecord (or other Ruby data mapping class)
-  to MongoDB
+  version_requirements: *id007
+  type: :development
+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
@@ -122,31 +160,37 @@ files:
 - spec/mongar_spec.rb
 - spec/spec_helper.rb
 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
-      version: '0'
-      segments:
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
       - 0
-      hash: -260101698656845288
-required_rubygems_version: !ruby/object:Gem::Requirement
+      version: "0"
+required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
+      version: "0"
 requirements: []
+
 rubyforge_project: 
-rubygems_version: 1.8.10
+rubygems_version: 1.8.29
 signing_key: 
 specification_version: 3
 summary: Replicates data from ActiveRecord (or other Ruby data mapping class) to MongoDB
 test_files: []
+