moped 2.0.0.beta → 2.0.0.beta2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 13a013a208ac0941e9a6d68d183574f2becafa79
-  data.tar.gz: 808d31b55227c47ff8d9503918c218d191b6b193
+  metadata.gz: d09eab93cd0182d6a05493df401ab183e83e3e2c
+  data.tar.gz: ec4275fe3a9c9b7e8e78832f879088f39518895b
 SHA512:
-  metadata.gz: 56f954deab2f283830fc371a134d8f1b9055b6d985910886a27ed905a55b58403044f7acd9ea58e363b5dd296858a7dadc152ca8934e048c9fcec7ad60e5d600
-  data.tar.gz: b568935bcda3e6a73e5601819de389bab69f9e1acba1b40395bd0042b1a062ea86606e787778505fb08a3230855e9cf1b8be57d30925bd6611fe03967a8d1114
+  metadata.gz: cdb92718589cc2fd38d8f9297dfc4d898cf9aa3fce14d19bd85b00932e5437909c3ba99f508086b4db963bd11e21d575a0b16e56d818e7c103cc643a110ed591
+  data.tar.gz: 7ea98d6a337de3f7b67f48a1ab3a1058b5774d016c5fab87dbd92464d5691f3571db06155c64bec7c73eb6338608f71d06f4b5bf44690ff6f8f3ba3776753c0e

data/CHANGELOG.md

@@ -8,6 +8,12 @@
 
 ### API Changes (Backwards Incompatible)
 
+* Query.cursor will return a Enumerable instead of a Enumerator. (Arthur Neves)
+
+* Moped's BSON implementation has been removed in favor of the 10gen
+  bson gem 2.0 and higher. All `Moped::BSON` references should be changed
+  to just `BSON`.
+
 * \#190 Connection retries are now logged. (Jan Paul Posma)
 
 * \#133 Moped now supports the new read preferences that the core drivers
@@ -42,6 +48,10 @@
 
     The `:safe` option is no longer valid and will be ignored.
 
+### Resolved Issues
+
+* \#210 Moped no longer attempts to refresh arbiters as they cannot be queried.
+
 ## 1.5.1
 
 ### Resolved Issues

data/lib/moped.rb

@@ -3,6 +3,7 @@ require "logger"
 require "stringio"
 require "monitor"
 require "timeout"
+require 'resolv'
 require "bson"
 require "optionable"
 require "moped/errors"

data/lib/moped/address.rb

@@ -26,10 +26,11 @@ module Moped
     # @param [ String ] address The host:port pair as a string.
     #
     # @since 2.0.0
-    def initialize(address)
+    def initialize(address, timeout)
       @original = address
       @host, port = address.split(":")
       @port = (port || 27017).to_i
+      @timeout = timeout
     end
 
     # Resolve the address for the provided node. If the address cannot be
@@ -45,10 +46,18 @@ module Moped
     # @since 2.0.0
     def resolve(node)
       begin
-        @ip ||= Socket.getaddrinfo(host, nil, Socket::AF_INET, Socket::SOCK_STREAM).first[3]
+        Timeout::timeout(@timeout) do
+          Resolv.each_address(host) do |ip|
+            if ip =~ Resolv::IPv4::Regex
+              @ip ||= ip
+              break
+            end
+          end
+          raise Resolv::ResolvError unless @ip
+        end
         @resolved ||= "#{ip}:#{port}"
-      rescue SocketError => e
-        node.instrument(Node::WARN, prefix: "  MOPED:", message: "Could not resolve IP for: #{original}")
+      rescue Timeout::Error, Resolv::ResolvError
+        Loggable.warn("  MOPED:", "Could not resolve IP for: #{original}", "n/a")
         node.down! and false
       end
     end

data/lib/moped/cluster.rb

@@ -302,6 +302,7 @@ module Moped
     #
     # @since 2.0.0
     def refreshable?(node)
+      return false if node.arbiter?
       node.down? ? node.down_at < down_boundary : node.needs_refresh?(refresh_boundary)
     end
 

data/lib/moped/cursor.rb

@@ -5,6 +5,7 @@ module Moped
   # @api private
   class Cursor
     include Readable
+    include Enumerable
 
     # @attribute [r] get_more_op The get more message.
     # @attribute [r] kill_cursor_op The kill cursor message.

data/lib/moped/instrumentable.rb

@@ -8,12 +8,7 @@ module Moped
     # The name of the topic of operations for Moped.
     #
     # @since 2.0.0
-    TOPIC = "moped.operations"
-
-    # Topic for warning instrumentation.
-    #
-    # @since 2.0.0
-    WARN = "moped.warn"
+    TOPIC = "query.moped"
 
     # @!attribute instrumenter
     #   @return [ Object ] The instrumenter

data/lib/moped/instrumentable/log.rb

@@ -6,36 +6,30 @@ module Moped
     # notifications.
     #
     # @since 2.0.0
-    class Log
+    module Log
+      extend self
 
-      class << self
-
-        # Instrument the log payload.
-        #
-        # @example Instrument the log payload.
-        #   Log.instrument("moped.ops", {})
-        #
-        # @param [ String ] name The name of the logging type.
-        # @param [ Hash ] payload The log payload.
-        #
-        # @return [ Object ] The result of the yield.
-        #
-        # @since 2.0.0
-        def instrument(name, payload = {})
-          started = Time.new
-          begin
-            yield if block_given?
-          rescue Exception => e
-            payload[:exception] = [ e.class.name, e.message ]
-            raise e
-          ensure
-            runtime = ("%.4fms" % (1000 * (Time.now.to_f - started.to_f)))
-            if name == TOPIC
-              Moped::Loggable.log_operations(payload[:prefix], payload[:ops], runtime)
-            else
-              Moped::Loggable.debug(payload[:prefix], payload.reject { |k,v| k == :prefix }, runtime)
-            end
-          end
+      # Instrument the log payload.
+      #
+      # @example Instrument the log payload.
+      #   Log.instrument("moped.ops", {})
+      #
+      # @param [ String ] name The name of the logging type.
+      # @param [ Hash ] payload The log payload.
+      #
+      # @return [ Object ] The result of the yield.
+      #
+      # @since 2.0.0
+      def instrument(name, payload = {})
+        started = Time.new
+        begin
+          yield if block_given?
+        rescue Exception => e
+          payload[:exception] = [ e.class.name, e.message ]
+          raise e
+        ensure
+          runtime = ("%.4fms" % (1000 * (Time.now.to_f - started.to_f)))
+          Moped::Loggable.log_operations(payload[:prefix], payload[:ops], runtime)
         end
       end
     end

data/lib/moped/node.rb

@@ -253,7 +253,6 @@ module Moped
     #
     # @since 1.0.0
     def initialize(address, options = {})
-      @address = Address.new(address)
       @options = options
       @down_at = nil
       @refreshed_at = nil
@@ -261,6 +260,7 @@ module Moped
       @primary = nil
       @secondary = nil
       @instrumenter = options[:instrumenter] || Instrumentable::Log
+      @address = Address.new(address, timeout)
       @address.resolve(self)
     end
 

data/lib/moped/query.rb

@@ -13,7 +13,7 @@ module Moped
   #   people.find.skip(2).update(name: "John")
   #   people.find.skip(2).first # => { id: 3, name: "John" }
   #
-  #   people.find(name: nil).update_all(name: "Unknown")
+  #   people.find(name: nil).update_all("$set" => { name: "Unknown" })
   #   people.find.one # => { id: 5, name: "Unknown" }
   #   people.find.first # => { id: 5, name: "Unknown" }
   #   people.find.select(name: 0).first # => { id: 5 }
@@ -68,20 +68,18 @@ module Moped
     #     #...
     #   end
     #
-    # @return [ Enumerator ] The enumerator.
+    # @return [ Enumerable ]
     #
     # @since 1.0.0
     #
     # @yieldparam [ Hash ] document each matching document
-    def each
-      cursor = Cursor.new(session, operation)
-      enum = cursor.to_enum
-      enum.each do |document|
-        yield document
-      end if block_given?
-      enum
+    def each(*args, &blk)
+      cursor.each(*args, &blk)
+    end
+
+    def cursor
+      Cursor.new(session, operation)
     end
-    alias :cursor :each
 
     # Explain the current query.
     #
@@ -393,7 +391,7 @@ module Moped
     # Update multiple documents matching the query's selector.
     #
     # @example Update multiple documents.
-    #   db[:people].find(name: "John").update_all(name: "Mary")
+    #   db[:people].find(name: "John").update_all("$set" => { name: "Mary" })
     #
     # @param [ Hash ] change The changes to make to the documents
     #

data/lib/moped/version.rb

@@ -1,4 +1,4 @@
 # encoding: utf-8
 module Moped
-  VERSION = "2.0.0.beta"
+  VERSION = "2.0.0.beta2"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: moped
 version: !ruby/object:Gem::Version
-  version: 2.0.0.beta
+  version: 2.0.0.beta2
 platform: ruby
 authors:
 - Durran Jordan
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-24 00:00:00.000000000 Z
+date: 2013-10-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bson