couchrest_changes 0.2.0 → 0.2.1

data/lib/couchrest/changes/observer.rb

@@ -38,6 +38,12 @@ module CouchRest::Changes
     end
   end
 
+  #
+  # NOTE: the sequence stored in the variable @since is a different format
+  # depending on which flavor of couchdb is being used. For normal couchdb
+  # prior to version 2.0, the sequence is just a number. For bigcouch and
+  # new couchdb instances, the sequence is an array.
+  #
   class Observer
 
     attr_writer :logger
@@ -160,19 +166,20 @@ module CouchRest::Changes
       debug "Looking up sequence here: #{filename}"
       result = File.read(filename)
       if result.empty?
-        debug "Found no sequence in the file."
+        debug "Found no sequence in the file #{filename}."
         return 0
       else
         debug "Found sequence: #{result}"
-        return result.to_i
+        return result
       end
     rescue Errno::ENOENT => e
-      warn "No sequence file found. Starting from scratch"
+      warn "No sequence file found. Starting from scratch (#{filename})"
       return 0
     end
 
     def store_seq(db_name, seq)
-      File.write sequence_file_name(db_name), seq.to_i
+      # seq might be a number or an array
+      File.write sequence_file_name(db_name), MultiJson.dump(seq)
     end
 
     def sequence_file_name(db_name)
@@ -182,7 +189,8 @@ module CouchRest::Changes
     def retry_without_sequence?(result, last_hash)
       if malformated_sequence?(result) || malformated_sequence?(last_hash)
         @since = 0
-        info "Trying to start from scratch."
+        info "Trying to start from scratch (db #{@db_name})."
+        debug { {:result => result, :last_hash => last_hash}.inspect }
       end
     end
 
@@ -211,24 +219,24 @@ module CouchRest::Changes
       Config.flags.include?('--run-once')
     end
 
-    def info(message)
+    def info(*args, &block)
       return unless log_attempt?
-      logger.info message
+      logger.info *args, &block
     end
 
-    def debug(message)
+    def debug(*args, &block)
       return unless log_attempt?
-      logger.debug message
+      logger.debug *args, &block
     end
 
-    def warn(message)
+    def warn(*args, &block)
       return unless log_attempt?
-      logger.warn message
+      logger.warn *args, &block
     end
 
-    def error(message)
+    def error(*args, &block)
       return unless log_attempt?
-      logger.error message
+      logger.error *args, &block
     end
 
     # let's not clutter the logs if couch is down for a longer time.

data/lib/couchrest/changes/version.rb

@@ -1,5 +1,5 @@
 module CouchRest
   module Changes
-    VERSION = "0.2.0"
+    VERSION = "0.2.1"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: couchrest_changes
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-17 00:00:00.000000000 Z
+date: 2015-04-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: couchrest
@@ -155,18 +155,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 3909050601515988109
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 3909050601515988109
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23