couchrest_changes 0.1.0 → 0.1.1

data/Readme.md

@@ -66,3 +66,10 @@ Examples
 ------------------------
 
 See [tapicero](https://github.com/leapcode/tapicero) for a daemon that uses CouchRest::Changes. Historically CouchRest::Changes was extracted from tapicero.
+
+Known Issues
+-------------
+
+* CouchRest will miss the first change in a continuous feed.
+  https://github.com/couchrest/couchrest/pull/104 has a fix.
+  You might want to monkeypatch it.

data/lib/couchrest/changes/observer.rb

@@ -39,17 +39,21 @@ module CouchRest::Changes
     def listen
       info "listening..."
       debug "Starting at sequence #{since}"
+      last = nil
       result = db.changes feed_options do |hash|
+        last = hash
         @retry_count = 0
-        callbacks(hash)
+        callbacks(hash) if hash_for_change?(hash)
         store_seq(hash["seq"])
       end
       raise EOFError
     # appearently MultiJson has issues with the end of the couch stream.
     # So sometimes we get a MultiJson::LoadError instead...
     rescue MultiJson::LoadError, EOFError, RestClient::ServerBrokeConnection
-      retry if retry_without_sequence?(result) || retry_later?
       info "Couch stream ended."
+      debug result.inspect
+      debug last.inspect
+      retry if retry_without_sequence?(result, last) || retry_later?
     end
 
     def last_sequence
@@ -74,7 +78,7 @@ module CouchRest::Changes
     def callbacks(hash)
       # let's not track design document changes
       return if hash['id'].start_with? '_design/'
-      return unless changes = hash["changes"]
+      changes = hash["changes"]
       changed(hash)
       return deleted(hash) if hash["deleted"]
       return created(hash) if changes[0]["rev"].start_with?('1-')
@@ -114,10 +118,11 @@ module CouchRest::Changes
       File.write Config.seq_file, MultiJson.dump(seq)
     end
 
-    def retry_without_sequence?(result)
-      return unless malformated_sequence?(result)
-      @since = nil
-      info "Trying to start from scratch."
+    def retry_without_sequence?(result, last_hash)
+      if malformated_sequence?(result) || malformated_sequence?(last_hash)
+        @since = nil
+        info "Trying to start from scratch."
+      end
     end
 
     def malformated_sequence?(result)
@@ -125,6 +130,10 @@ module CouchRest::Changes
       reason && ( reason.include?('since') || reason == 'badarg' )
     end
 
+    def hash_for_change?(hash)
+      hash["id"] && hash["changes"]
+    end
+
     def retry_later?
       return unless rerun?
       info "Will retry in 15 seconds."

data/lib/couchrest/changes/version.rb

@@ -1,5 +1,5 @@
 module CouchRest
   module Changes
-    VERSION = "0.1.0"
+    VERSION = "0.1.1"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: couchrest_changes
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-02 00:00:00.000000000 Z
+date: 2014-09-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: couchrest
@@ -154,12 +154,18 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: -2972848587685415057
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: -2972848587685415057
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.28