analysand 3.0.1 → 3.1.0

checksums.yaml

@@ -1,7 +1,7 @@
---- 
-SHA1: 
-  metadata.gz: fb756b7603b4df704ece51bc868196e6a99fd8a2
-  data.tar.gz: 271fce3c8b81ea091e5a786857e7efecbe31c845
-SHA512: 
-  metadata.gz: dbcfe0f9aa777af05f6cf145b4f5ee4d744df2430bbc4f2cd726571b1e7297537983ee6e12f64e47e0b14778efdd57fbda6aea1716ea6de16d509261767bc321
-  data.tar.gz: 8eafdc8896c2aa0f65f7a7a7365a939a2ef5bb7ebfd5dae421a0c826aa2906261dc560d026308e20f2cc58aeaa6d3388cbd338a44e825e7a4968c5d64dd92bd5
+---
+SHA1:
+  metadata.gz: 8530353cf2a187253a38f68e81c92c4db6269f1b
+  data.tar.gz: 2805780572de1e5df3581a7720e76591af57e9cd
+SHA512:
+  metadata.gz: 7e983135f366396eb9767c9af43b656d81f5d3002512fc7069567af881ce18595f6209a228c3b1674ea36ee8562f6952f5a766c153d809373c7d56eb73a41d60
+  data.tar.gz: 81d3c799ce2eda121427df8678d0a81ad3474e333633cd20772e91aa2c23e9784826312b6b67903c02250016e2b164110616ab920613eaf8fea7f13b4b59ddc1

data/.travis.yml

@@ -1,6 +1,6 @@
 language: ruby
 rvm:
-  - rbx-2.2.3
+  - rbx-2.4.1
   - 2.0.0
 before_script:
   - "./script/setup_database.rb"

data/CHANGELOG

@@ -1,6 +1,16 @@
 Issue numbers refer to issues on Analysand's Github tracker:
 https://github.com/yipdw/analysand/issues
 
+3.1.0 (2015-02-03)
+------------------
+
+* New: StreamingViewResponse#keys (#6)
+
+3.0.2 (2014-12-01)
+-----------------
+
+* Change Celluloid dependency to ~> 0.16.0.
+
 3.0.1 (2014-01-14)
 ------------------
 

data/analysand.gemspec

@@ -17,7 +17,7 @@ Gem::Specification.new do |gem|
 
   gem.required_ruby_version = '>= 1.9'
 
-  gem.add_dependency 'celluloid', '~> 0.15.0'
+  gem.add_dependency 'celluloid', '~> 0.16.0'
   gem.add_dependency 'celluloid-io'
   gem.add_dependency 'http_parser.rb'
   gem.add_dependency 'json'

data/lib/analysand/errors.rb

@@ -10,6 +10,18 @@ module Analysand
         ex.response = response
       end
     end
+
+    # Like #ex, but customized for bulk operations.  (CouchDB's bulk_docs can
+    # return 2xx even on failure; you need to inspect the response body to
+    # figure out what happened.)
+    #
+    # klass    - the exception class
+    # response - the response object that caused the error
+    def bulk_ex(klass, response)
+      klass.new("Bulk operation failed (some records reported failure)").tap do |ex|
+        ex.response = response
+      end
+    end
   end
 
   class InvalidURIError < StandardError

data/lib/analysand/streaming_view_response.rb

@@ -55,6 +55,22 @@ module Analysand
       each { |r| yield r['doc'] if r.has_key?('doc') }
     end
 
+    # Public: Yields document keys from the view stream.
+    #
+    # Note that #keys and #rows advance the same stream, so expect to miss half
+    # your rows if you do something like
+    #
+    #     resp.keys.zip(resp.rows)
+    #
+    # If this is a problem for you, let me know and we can work out a solution.
+    def keys
+      to_enum(:get_keys)
+    end
+
+    def get_keys
+      each { |r| yield r['key'] if r.has_key?('key') }
+    end
+
     def total_rows
       read until @generator.total_rows
 

data/lib/analysand/version.rb

@@ -1,3 +1,3 @@
 module Analysand
-  VERSION = "3.0.1"
+  VERSION = "3.1.0"
 end

data/lib/analysand/view_response.rb

@@ -20,5 +20,9 @@ module Analysand
     def docs
       rows.map { |r| r['doc'] }.compact
     end
+
+    def keys
+      rows.map { |r| r['key'] }.compact
+    end
   end
 end

data/lib/analysand/writing.rb

@@ -29,7 +29,7 @@ module Analysand
 
     def bulk_docs!(docs, credentials = nil, options = {})
       bulk_docs(docs, credentials, options).tap do |resp|
-        raise ex(BulkOperationFailed, resp) unless resp.success?
+        raise bulk_ex(BulkOperationFailed, resp) unless resp.success?
       end
     end
 

data/spec/analysand/a_response.rb

@@ -12,13 +12,13 @@ shared_examples_for 'a response' do
     it 'returns true if response code is 409' do
       response.stub(:code => '409')
 
-      response.should be_conflict
+      expect(response.conflict?).to eq(true)
     end
 
     it 'returns false if response code is 200' do
       response.stub(:code => '200')
 
-      response.should_not be_conflict
+      expect(response.conflict?).to eq(false)
     end
   end
 

data/spec/analysand/change_watcher_spec.rb

@@ -52,7 +52,7 @@ module Analysand
         it 'passes credentials' do
           watcher = TestWatcher.new(db, admin_credentials)
 
-          watcher.connection_ok.should be_true
+          expect(watcher.connection_ok).to eq(true)
         end
       end
     end
@@ -96,7 +96,7 @@ module Analysand
       db.put('foo', { 'foo' => 'bar' }, admin_credentials)
       waiter.wait
 
-      watcher.changes.select { |r| r['id'] == 'foo' }.length.should == 1
+      expect(watcher.changes.select { |r| r['id'] == 'foo' }.length).to eq(1)
     end
   end
 end

data/spec/analysand/database_spec.rb

@@ -55,12 +55,6 @@ module Analysand
       end
     end
 
-    describe '#close' do
-      it "shuts down the current thread's connection" do
-        pending 'a good way to test this'
-      end
-    end
-
     describe '#head' do
       before do
         clean_databases!

data/spec/analysand/database_writing_spec.rb

@@ -354,7 +354,7 @@ module Analysand
         end
 
         it 'raises Analysand::BulkOperationFailed' do
-          lambda { db.bulk_docs!([doc1, doc2]) }.should raise_error(Analysand::BulkOperationFailed)
+          lambda { db.bulk_docs!([doc1, doc2]) }.should raise_error(Analysand::BulkOperationFailed, /bulk operation failed/i)
         end
       end
     end

data/spec/analysand/instance_spec.rb

@@ -164,7 +164,7 @@ module Analysand
         instance.delete_config('foo/bar', admin_credentials)
 
         resp = instance.get_config('foo/bar', admin_credentials)
-        resp.not_found?.should be_true
+        expect(resp.not_found?).to eq(true)
       end
     end
 

data/spec/analysand/view_response_spec.rb

@@ -40,5 +40,23 @@ module Analysand
         end
       end
     end
+
+    describe '#keys' do
+      describe 'if the view includes docs' do
+        subject { ViewResponse.new(double(:body => resp_with_docs)) }
+
+        it 'returns the value of the "key" key in each row' do
+          subject.keys.should == ['foo']
+        end
+      end
+
+      describe 'if the view does not include docs' do
+        subject { ViewResponse.new(double(:body => resp_without_docs)) }
+
+        it 'returns []' do
+          subject.keys.should == ['foo']
+        end
+      end
+    end
   end
 end

data/spec/analysand/view_streaming_spec.rb

@@ -61,7 +61,12 @@ module Analysand
       it 'yields docs' do
         resp = get_view(:include_docs => true, :stream => true)
 
-        resp.docs.take(10).all? { |d| d.has_key?('_id') }.should be_true
+        expect(resp.docs.take(10).all? { |d| d.has_key?('_id') }).to eq(true)
+      end
+
+      it 'yields keys' do
+        resp = get_view(:include_docs => false, :stream => true)
+        expect(resp.keys.take(10).each { |k| k }).to eq(['abc123'] * 10)
       end
 
       it 'returns rows as soon as possible' do

metadata

@@ -1,130 +1,194 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: analysand
-version: !ruby/object:Gem::Version 
-  version: 3.0.1
+version: !ruby/object:Gem::Version
+  version: 3.1.0
 platform: ruby
-authors: 
+authors:
 - David Yip
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2014-01-15 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2015-02-03 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.16.0
   name: celluloid
   prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        version: 0.15.0
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.16.0
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
+- !ruby/object:Gem::Dependency
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
   name: celluloid-io
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
-    requirements: 
-    - &id003 
-      - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
+- !ruby/object:Gem::Dependency
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
   name: http_parser.rb
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
-    requirements: 
-    - *id003
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id004
-- !ruby/object:Gem::Dependency 
+- !ruby/object:Gem::Dependency
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
   name: json
   prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
-    requirements: 
-    - *id003
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id005
-- !ruby/object:Gem::Dependency 
+- !ruby/object:Gem::Dependency
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
   name: json-stream
   prerelease: false
-  requirement: &id006 !ruby/object:Gem::Requirement 
-    requirements: 
-    - *id003
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id006
-- !ruby/object:Gem::Dependency 
+- !ruby/object:Gem::Dependency
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
   name: net-http-persistent
   prerelease: false
-  requirement: &id007 !ruby/object:Gem::Requirement 
-    requirements: 
-    - *id003
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id007
-- !ruby/object:Gem::Dependency 
+- !ruby/object:Gem::Dependency
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
   name: rack
   prerelease: false
-  requirement: &id008 !ruby/object:Gem::Requirement 
-    requirements: 
-    - *id003
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id008
-- !ruby/object:Gem::Dependency 
+- !ruby/object:Gem::Dependency
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
   name: yajl-ruby
   prerelease: false
-  requirement: &id009 !ruby/object:Gem::Requirement 
-    requirements: 
-    - *id003
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id009
-- !ruby/object:Gem::Dependency 
+- !ruby/object:Gem::Dependency
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
   name: rake
   prerelease: false
-  requirement: &id010 !ruby/object:Gem::Requirement 
-    requirements: 
-    - *id003
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id010
-- !ruby/object:Gem::Dependency 
+- !ruby/object:Gem::Dependency
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
   name: rspec
   prerelease: false
-  requirement: &id011 !ruby/object:Gem::Requirement 
-    requirements: 
-    - *id003
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id011
-- !ruby/object:Gem::Dependency 
+- !ruby/object:Gem::Dependency
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
   name: vcr
   prerelease: false
-  requirement: &id012 !ruby/object:Gem::Requirement 
-    requirements: 
-    - *id003
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id012
-- !ruby/object:Gem::Dependency 
+- !ruby/object:Gem::Dependency
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
   name: webmock
   prerelease: false
-  requirement: &id013 !ruby/object:Gem::Requirement 
-    requirements: 
-    - *id003
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id013
 description: A terrible burden for a couch
-email: 
+email:
 - yipdw@member.fsf.org
-executables: 
+executables:
 - analysand
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
-- .gitignore
-- .rspec
-- .travis.yml
+files:
+- ".gitignore"
+- ".rspec"
+- ".travis.yml"
 - CHANGELOG
 - Gemfile
 - LICENSE
@@ -175,30 +239,28 @@ files:
 - spec/support/test_parameters.rb
 homepage: https://github.com/yipdw/analysand
 licenses: []
-
 metadata: {}
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
-  requirements: 
+required_ruby_version: !ruby/object:Gem::Requirement
+  requirements:
   - - ">="
-    - !ruby/object:Gem::Version 
-      version: "1.9"
-required_rubygems_version: !ruby/object:Gem::Requirement 
-  requirements: 
-  - *id003
+    - !ruby/object:Gem::Version
+      version: '1.9'
+required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements:
+  - - ">="
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 2.1.10
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: A CouchDB client of dubious worth
-test_files: 
+test_files:
 - spec/analysand/a_response.rb
 - spec/analysand/change_watcher_spec.rb
 - spec/analysand/database_spec.rb