dpla-analysand 3.1.0.pre.dpla.1 → 4.0.0.pre.dpla.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 90b8e57499d6d55a1dfabd8b3ce5e9998c2d2ad4
-  data.tar.gz: 509ade65129c5986fe24e4b8f2a5cb5883171461
+  metadata.gz: bb0af98e4a48d2c5e825d30f981553f287163ded
+  data.tar.gz: 0acb1dfb8ebf0cb1ab7c8e56264e99a63a759ee6
 SHA512:
-  metadata.gz: fa0aa6640a07ffa89a35f6aee54f6352d3e513abc6a43f6df053277b4ed41f453d3d4e0adbfb9b9c91eed74729ba7f57c1e758a3396e391a8e219dacc052c6fa
-  data.tar.gz: b1c7aff36819f6a3c22e2c04c21125efa1f6fec37bc57aa80c155ea543c81b5ac70aad096ae52bc3870d9b78f31469968d322065c8757a95f409c26280d486e6
+  metadata.gz: 96f055679e8445e1d33e19229277a63b34e8773d7339393ffc9b13c744da973a372c9b232da3812c611a17a1e3e935d354b7a97fd72019633b6ea2a7b3911cce
+  data.tar.gz: ffadffb98f0c27aa0a3701e96e84d47bc585010abb7d9d989f2a117d589c93d5708734891d19d51ccee546f0388fc5d39e158a9895e97861430c5ed693f45339

data/.travis.yml

@@ -1,7 +1,7 @@
 language: ruby
 rvm:
   - rbx-2.4.1
-  - 2.0.0
+  - 2.2.0
 before_script:
   - "./script/setup_database.rb"
 services:

data/CHANGELOG

@@ -1,6 +1,15 @@
 Issue numbers refer to issues on Analysand's Github tracker:
 https://github.com/yipdw/analysand/issues
 
+4.0.0 (?)
+---------
+
+Breaking changes:
+
+Analysand::Database methods no longer perform any escaping on document IDs.
+You will have to modify your code to use CGI.escape, Rack::Utils::escape_path,
+etc. when passing in document IDs.  (#7)
+
 3.1.0 (?)
 ---------
 

data/Gemfile

@@ -5,4 +5,5 @@ gemspec
 
 platform :rbx do
   gem 'rubysl'
+  gem 'psych'
 end

data/README

@@ -31,11 +31,10 @@ of specific admin and non-admin users for its test suite.
 See spec/support/test_parameters.rb for usernames, passwords, and connection
 information.
 
-Naturally, we hang with all the cool kids:
+Elsewhere on the Web:
 
 * Travis CI: https://travis-ci.org/#!/yipdw/analysand
 * Code Climate: https://codeclimate.com/github/yipdw/analysand
-* Gemnasium: https://gemnasium.com/yipdw/analysand
 
 4. License
 

data/lib/analysand/database.rb

@@ -229,6 +229,9 @@ module Analysand
   #
   #     vdb.copy('source', "destination?rev=#{rev}", credentials)
   #
+  # NOTE: CouchDB 1.5.0 and 1.6.1 expect an _unescaped_ destination document
+  # ID.
+  #
   #
   # Acceptable credentials
   # ======================

data/lib/analysand/http.rb

@@ -59,7 +59,7 @@ module Analysand
     # @private
     def _req(klass, doc_id, credentials, query, headers, body, block)
       uri = self.uri.dup
-      uri.path += URI.escape(doc_id)
+      uri.path += doc_id
       uri.query = build_query(query) unless query.empty?
 
       req = klass.new(uri.request_uri)

data/lib/analysand/version.rb

@@ -1,3 +1,3 @@
 module Analysand
-  VERSION = "3.1.0.pre.dpla.1"
+  VERSION = "4.0.0.pre.dpla.1"
 end

data/spec/analysand/database_spec.rb

@@ -69,6 +69,15 @@ module Analysand
       end
     end
 
+    describe '#get' do
+      it 'retrieves documents with URI-escaped IDs' do
+        doc_id = CGI.escape('10067--http://ark.cdlib.org/ark:/13030/kt067nc38g')
+        net_http_put!(db, doc_id, { 'foo' => 'bar' })
+
+        db.get(doc_id).body['foo'].should == 'bar'
+      end
+    end
+
     describe '#get!' do
       before do
         clean_databases!
@@ -76,6 +85,13 @@ module Analysand
         db.put!('foo', { 'foo' => 'bar' })
       end
 
+      it 'retrieves documents with URI-escaped IDs' do
+        doc_id = CGI.escape('10067--http://ark.cdlib.org/ark:/13030/kt067nc38g')
+        net_http_put!(db, doc_id, { 'foo' => 'bar' })
+
+        db.get!(doc_id).body['foo'].should == 'bar'
+      end
+
       describe 'if the response code is 200' do
         it 'returns the document' do
           db.get!('foo').body['foo'].should == 'bar'

data/spec/analysand/database_writing_spec.rb

@@ -75,10 +75,15 @@ module Analysand
         resp.should be_success
       end
 
-      it 'escapes document IDs' do
-        db.put('an ID', doc)
+      it 'does not double-escape document IDs' do
+        doc_id = CGI.escape('10067--http://ark.cdlib.org/ark:/13030/kt067nc38g')
+        put(doc_id, doc)
+
+        # Now we attempt to grab the escaped doc ID via good old HTTP.  If #put
+        # doesn't double-escape, this should not result in a 404.
+        resp = net_http_get(db, doc_id)
 
-        db.get('an ID').should be_success
+        expect(resp.code.to_i).to eq(200)
       end
 
       it 'handles URN-like IDs' do
@@ -397,10 +402,13 @@ module Analysand
         db.get('bar')['foo'].should == 'bar'
       end
 
-      it 'escapes document IDs in URIs' do
-        db.copy(doc_id, 'an ID')
+      it 'copies documents with IDs that need to be escaped' do
+        target_doc_id = '10067--http://ark.cdlib.org/ark:/13030/kt067nc38g'
+
+        db.copy(doc_id, target_doc_id)
 
-        db.get('an ID')['foo'].should == 'bar'
+        resp = net_http_get(db, CGI.escape(target_doc_id))
+        expect(resp.code.to_i).to eq(200)
       end
     end
 
@@ -435,11 +443,17 @@ module Analysand
         resp.should be_success
       end
 
-      it 'escapes document IDs in URIs' do
-        @put_resp = db.put!('an ID', doc)
+      it 'deletes documents with IDs that need to be escaped' do
+        doc_id = CGI.escape('10067--http://ark.cdlib.org/ark:/13030/kt067nc38g')
+        resp = net_http_put!(db, doc_id, {})
+        rev = JSON.parse(resp.body)['rev']
 
-        resp = db.delete('an ID', rev)
-        resp.should be_success
+        resp = db.delete(doc_id, rev)
+
+        # DELETE normally returns 200, but a CouchDB server can also return 202
+        # if it is configured to operate in delayed commit mode.  This test
+        # accepts either as success.
+        expect(resp.code).to match(/\A20[02]\Z/)
       end
     end
 

data/spec/analysand/view_streaming_spec.rb

@@ -69,7 +69,7 @@ module Analysand
         expect(resp.keys.take(10).each { |k| k }).to eq(['abc123'] * 10)
       end
 
-      it 'returns rows as soon as possible' do
+      xit 'returns rows as soon as possible' do
         # first, make sure the view's built
         db.head('_design/doc/_view/a_view', admin_credentials)
 

data/spec/spec_helper.rb

@@ -2,6 +2,7 @@ $LOAD_PATH.unshift(File.expand_path('../../lib', __FILE__))
 
 require File.expand_path('../support/database_access', __FILE__)
 require File.expand_path('../support/example_isolation', __FILE__)
+require File.expand_path('../support/net_http_access', __FILE__)
 require File.expand_path('../support/test_parameters', __FILE__)
 
 require 'celluloid/autostart'   # for ChangeWatcher specs
@@ -10,6 +11,7 @@ require 'vcr'
 RSpec.configure do |config|
   config.include DatabaseAccess
   config.include ExampleIsolation
+  config.include NetHttpAccess
   config.include TestParameters
 
   config.around do |example|

data/spec/support/net_http_access.rb

@@ -0,0 +1,22 @@
+require 'json'
+
+##
+# Methods to do GET and PUT without any of the extra stuff in Analysand::Http
+# or Analysand::Response.
+module NetHttpAccess
+  def net_http_get(db, doc_id)
+    Net::HTTP.get_response(URI.join(db.uri, doc_id))
+  end
+
+  def net_http_put!(db, doc_id, doc)
+    uri = URI.join(db.uri, doc_id)
+    req = Net::HTTP::Put.new(uri)
+    req.body = doc.to_json
+
+    resp = Net::HTTP.start(uri.hostname, uri.port) do |http|
+      http.request(req)
+    end
+
+    resp.tap { |r| raise unless Net::HTTPSuccess === r }
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dpla-analysand
 version: !ruby/object:Gem::Version
-  version: 3.1.0.pre.dpla.1
+  version: 4.0.0.pre.dpla.1
 platform: ruby
 authors:
 - David Yip
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-30 00:00:00.000000000 Z
+date: 2015-02-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: celluloid
@@ -236,6 +236,7 @@ files:
 - spec/spec_helper.rb
 - spec/support/database_access.rb
 - spec/support/example_isolation.rb
+- spec/support/net_http_access.rb
 - spec/support/test_parameters.rb
 homepage: https://github.com/yipdw/analysand
 licenses: []
@@ -280,5 +281,6 @@ test_files:
 - spec/spec_helper.rb
 - spec/support/database_access.rb
 - spec/support/example_isolation.rb
+- spec/support/net_http_access.rb
 - spec/support/test_parameters.rb
 has_rdoc: