riak-client 1.4.5 → 2.0.0.rc1

data/spec/support/certs/client.key

@@ -0,0 +1,27 @@
+-----BEGIN RSA PRIVATE KEY-----
+MIIEowIBAAKCAQEAsYmZjNwswx37osP9v6Qssrdsm6/50t5C2ZvFHOg/VNuFaKfQ
+Sl5SXA4udyR2yM1K5ydcSAD/FHXOwqLIcOYr1p/V6QSIXME6lPiJSHSev+8l0Zmx
+X9O8xSH06VZRCJ8tsMHPa8wJ+5rqEqOuV3AUY8WLrpIWyex+vANayZS40x0y2B+Q
+e5918wEwp72n+cSxrV0Odn/d3wGhsxjndtbhFG1ceoZvVgWoXQ9wsmjKrIARKnHM
+ShcHbtPTnD5RqINVmi8QheAtgb49jtT3/wsblfn8fvrHWojtrlXGQmmAFUWHMau7
+F3DY2cFIQc91O60PRiARWf24lqTqoIV+QqYZgQIDAQABAoIBAAa5QVl2VTOmhQsr
+BQcm/pJeI/zZc0qrJDj9jz+DBDMAhVLrWBYY8GGQH+5fMSh1reqHMRWBBCgQNh5k
+79ZmwS5Fq2JBy7BHmSJfL0PRNtnqArKncXJBoJqOqKnVnQgIj0BsdqCMf6xJt6ex
+Dz88fWkx6BJacgZ/sGUKc3vC6CUGm+pc6IIbDVopp5CS3vRQ/LfkJbbCkS0yLKLq
+rQUF9CzZ0Qor87sShJ4pDAsW/v4sipTHIAWjA21zx52a2vnBUOoxAtHR0k5Dhl1j
+DSkH91nfmlNSEXSYlPosF53CU0qyK1sUElISbOG2YiLpOz2Un42wCeny6SCQgrXG
+ILW7UmkCgYEA1r1L6fkbcnTA4xHcEbkUUL6/Z4MGQsO0fPJMyKzxHdo86emck+NE
+vFs8ZV0D1G5yqCJzNhV67xOjjrqXXVvNkVSyGLJsVHW1E93oXSxmfzJgYv3NDlIy
+tvZZ6puJuMaBb2KE2AehwVAm1GkgvAj2ZvQPCh9KEaSDZ7d1BhqHQqsCgYEA06Zl
+nEwaCfgP2qk6IckMsA4Wk3d39k8lWQl7DoXt4/GT42fCrE8/M0/VtHkuSarQEM+1
+erDkmQe5i36WL3DHpPeFHX2SXXktnEqqvkudw5mMYHmBZQGGh0xmHeJ/IO+5XF+c
+U0Qg44oXehuVin5vKnRaGCVejTbcewrPBuus9IMCgYBJrmQY4Q+o4yS4BQ3EywOM
+fRbB1rRUPkB0ytLL3INTIenavPyrxcR0+L0tbo/82PTgegmcGhy3Yb6yH5YGQ5Sy
+dCQz0yzWghjiuzaambyFkmx+KuWsL0oVe0v48ut7iikpZd19HolDAlSAd53yxwR8
+6OssJvZMPW2VLd6qfHnCxwKBgQCLsbAvUSt+mPQd5sQvuHtfWG0eOCQ9tk94TQGj
+vFIfuTtbRQkAoe2c+Hyc+b7LcKqT7gRiTo8TUj3tDEgkV9Pt1lFN/au1dl3cYov/
+vfkLOTWmF4yIFlGsy4g7AVvXaWJ2zcRoUPdEN8j3F23EU18cLl+owEGAA03TCHdM
+ohEt8QKBgAehR0mL2iFjPLNau91MFwAQ4AShGEN/GrhsrIX5rkpivR5ID6wO+2XH
+z+fxlI70Q+x+1+0p8UDhCfUGf946/CopI7ilFGh4K4Dx9IQNs708r8kI9I4PJkq+
+QNX1TPFcWD7L78nVSwhEO5Ev6cTPhi3/x+Zkat7uw3BzUUN2G6m7
+-----END RSA PRIVATE KEY-----

data/spec/support/certs/empty_ca.crt

@@ -0,0 +1,21 @@
+-----BEGIN CERTIFICATE-----
+MIIDfjCCAuegAwIBAgIJAO0pDelK8iopMA0GCSqGSIb3DQEBBQUAMIGHMQswCQYD
+VQQGEwJVUzEQMA4GA1UECBMHRmxvcmlkYTEOMAwGA1UEBxMFTWlhbWkxGzAZBgNV
+BAoTEkJhc2hvIFRlY2hub2xvZ2llczEZMBcGA1UECxMQUmlhayBSdWJ5IENsaWVu
+dDEeMBwGCSqGSIb3DQEJARYPYnJ5Y2VAYmFzaG8uY29tMB4XDTE0MDIwNDIyNTAw
+NFoXDTI0MDIwMjIyNTAwNFowgYcxCzAJBgNVBAYTAlVTMRAwDgYDVQQIEwdGbG9y
+aWRhMQ4wDAYDVQQHEwVNaWFtaTEbMBkGA1UEChMSQmFzaG8gVGVjaG5vbG9naWVz
+MRkwFwYDVQQLExBSaWFrIFJ1YnkgQ2xpZW50MR4wHAYJKoZIhvcNAQkBFg9icnlj
+ZUBiYXNoby5jb20wgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBAN4yelOGl+MW
+FY7Pf9vZjNHDuVQfBkiY9myriNpr3YGGou0xEIJvikkhl4eQAzDsw52qTsESlfwK
++uFmCBvhPBgeWYRd2LnAvRSrD4c7fDp+2eVUL3EKDHKdVNwnobvMiN2GQRZT2E+J
+gBX3Wx3VGDtI0+M1Q9QPI7J1iewE0rB/AgMBAAGjge8wgewwHQYDVR0OBBYEFAkx
+E0bwW0jX8FhWFW9XMhzGkMkhMIG8BgNVHSMEgbQwgbGAFAkxE0bwW0jX8FhWFW9X
+MhzGkMkhoYGNpIGKMIGHMQswCQYDVQQGEwJVUzEQMA4GA1UECBMHRmxvcmlkYTEO
+MAwGA1UEBxMFTWlhbWkxGzAZBgNVBAoTEkJhc2hvIFRlY2hub2xvZ2llczEZMBcG
+A1UECxMQUmlhayBSdWJ5IENsaWVudDEeMBwGCSqGSIb3DQEJARYPYnJ5Y2VAYmFz
+aG8uY29tggkA7SkN6UryKikwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAAOB
+gQCPgOgPnv33+/LrfSSDh/6OdtYAGdrxMkCsuPdwmyZlUl9W7gxFjX7EPxYycUgO
+HNGuI10vOipgXrsJZUtQFi9OZ8+2m2Y4JHZR1xqSoHmXL/LoZYggY0BcwfjpSujL
+pMhBUfzTLlULaaaBEGCVwxTabP+qzRma/d1FjkMUzbHrmQ==
+-----END CERTIFICATE-----

data/spec/support/certs/server.crl

@@ -0,0 +1,13 @@
+-----BEGIN X509 CRL-----
+MIICBTCB7gIBATANBgkqhkiG9w0BAQUFADCBkDELMAkGA1UEBhMCVVMxEzARBgNV
+BAgMCldhc2hpbmd0b24xEDAOBgNVBAcMB1NlYXR0bGUxDjAMBgNVBAoMBUJhc2hv
+MRswGQYDVQQLDBJSaWFrIFB5dGhvbiBDbGllbnQxCzAJBgNVBAMMAkNBMSAwHgYJ
+KoZIhvcNAQkBFhFjbGllbnRzQGJhc2hvLmNvbRcNMTQwNTI3MTk0MjQ4WhcNMTQw
+NjI2MTk0MjQ4WjAWMBQCA2beDRcNMTQwNTI3MTk0MjQ4WqARMA8wDQYDVR0UBAYC
+BACikbwwDQYJKoZIhvcNAQEFBQADggEBAKPIogNgS8I4MR21ZrLkyV0wPGjzB26W
+AplQMQqr8GYLLxkRPZBKDVdjwZINjmAm0MUsL74vnvrABJ91M0IRkanVPc3UA/Gk
+ZNjH5WgTWbGP8SwdwPzjJeYckVQRNTpF9YQ/0XN1mtJA95WwSy7VuWKnMNRU0uf6
+CWcXO+hlsPkwBTu+NMqkD2E5PpbcLvob9sdGMAJ2AzI2Oa8JPpVS9RXDFJTtqFAZ
+JikU5MmZmpY9hL++3OD4rRih2lW32OzO710olJGPcV3o8Ax8KxPk13sVgdwTNPmj
+auGtyqY/m/94SwNPUcglAkWn0wRO9sD+1PvoZJPxq+NBs/EKihFY1GI=
+-----END X509 CRL-----

data/spec/support/certs/server.crt

@@ -0,0 +1,95 @@
+Certificate:
+    Data:
+        Version: 3 (0x2)
+        Serial Number: 6741517 (0x66de0d)
+    Signature Algorithm: sha1WithRSAEncryption
+        Issuer: C=US, ST=Washington, L=Seattle, O=Basho, OU=Riak Python Client, CN=CA/emailAddress=clients@basho.com
+        Validity
+            Not Before: May 27 19:42:48 2014 GMT
+            Not After : May 24 19:42:48 2024 GMT
+        Subject: C=US, ST=Washington, O=Basho, OU=Riak Python Client, CN=riak@127.0.0.1/emailAddress=clients@basho.com
+        Subject Public Key Info:
+            Public Key Algorithm: rsaEncryption
+                Public-Key: (2048 bit)
+                Modulus:
+                    00:d6:2c:f3:40:a0:bc:22:54:18:b0:29:71:9c:64:
+                    77:c9:b7:eb:c7:df:16:1d:5d:56:cd:28:1f:f8:41:
+                    60:07:2c:a5:42:af:39:cc:2f:0d:a9:9e:32:96:0a:
+                    b3:08:ab:16:9a:3a:ef:7f:aa:83:c1:1f:59:19:02:
+                    b3:f1:bf:4f:59:37:74:18:bb:87:e1:b8:3e:42:59:
+                    fb:dd:f7:ef:1c:9f:f9:ec:96:dc:b8:46:d0:a6:25:
+                    02:e0:70:f8:9f:64:67:5c:69:88:26:2e:4c:a8:c7:
+                    ee:dd:9e:d0:47:79:61:14:b0:9f:9a:d9:ff:a8:56:
+                    ce:0f:59:64:7c:69:1f:d3:e9:d5:c5:e9:0b:6b:aa:
+                    63:77:39:ae:23:1e:8a:91:d2:8a:84:93:34:7f:3d:
+                    c9:37:27:af:20:85:0c:b6:02:c0:21:77:df:34:1a:
+                    b2:fd:f5:84:b8:da:90:33:a2:55:c9:ba:60:53:8a:
+                    a9:07:8c:2e:81:36:6f:ed:4a:f4:74:1f:e9:91:61:
+                    87:41:b6:47:3d:50:28:9b:eb:da:9d:58:e0:86:f5:
+                    66:92:5e:f0:fb:43:be:71:43:3b:ab:59:8c:8d:36:
+                    2f:54:25:4a:46:f8:16:3f:d0:db:6a:b7:ca:6f:cf:
+                    de:63:6b:97:b3:64:58:1b:18:d7:a0:85:09:f9:08:
+                    0f:a7
+                Exponent: 65537 (0x10001)
+        X509v3 extensions:
+            X509v3 Basic Constraints: 
+                CA:FALSE
+            Netscape Cert Type: 
+                SSL Client, SSL Server
+            X509v3 Key Usage: 
+                Digital Signature, Non Repudiation, Key Encipherment
+            Netscape Comment: 
+                Riak Python Client Testing Certificate
+            X509v3 Subject Key Identifier: 
+                E5:77:01:19:34:B0:B0:C5:D9:A3:D4:BD:8B:6B:A5:A8:73:E0:F2:50
+            X509v3 Authority Key Identifier: 
+                DirName:/C=US/ST=Washington/L=Seattle/O=Basho/OU=Riak Python Client/CN=CA/emailAddress=clients@basho.com
+                serial:9F:5A:C6:15:8C:23:44:9D
+
+            X509v3 Extended Key Usage: 
+                TLS Web Server Authentication, TLS Web Client Authentication
+    Signature Algorithm: sha1WithRSAEncryption
+         0e:8e:1e:93:17:55:90:ed:b2:b2:8f:03:84:8d:76:92:07:b6:
+         ef:5b:98:c0:4c:75:cc:d4:1c:f7:2c:d5:d9:01:96:ff:e7:13:
+         d0:94:1b:ac:21:ef:7f:71:98:a0:de:82:39:97:d3:11:24:54:
+         fa:d6:f6:b4:3f:eb:ee:c5:df:9c:19:b8:42:63:7c:a4:e0:1c:
+         29:d6:ff:f5:3c:d8:a4:ee:3f:65:21:83:2f:b5:b8:b3:4b:01:
+         03:c4:fa:e8:b3:be:e6:62:99:ce:8a:af:87:ce:c6:5e:94:db:
+         79:9c:29:61:81:5e:38:24:ab:6a:52:8a:a8:49:2e:90:71:4a:
+         b4:f8:b3:20:fc:74:16:ac:e5:a5:7c:58:72:30:ca:e0:24:f7:
+         49:cd:d1:d6:d9:1b:c0:9f:fe:27:38:5d:c4:b7:15:fc:0f:69:
+         3e:83:36:af:21:f7:de:9f:1e:01:ad:9c:c1:77:7a:07:f6:0f:
+         df:42:af:99:09:82:7a:e3:61:73:1f:a7:ea:a8:15:f5:02:68:
+         4a:e5:3a:d6:ba:bd:ec:22:6f:41:7f:d8:77:4b:08:0a:24:9c:
+         07:16:c7:a8:53:26:3a:90:cf:25:63:d4:6b:7a:42:83:22:2b:
+         3f:9d:13:e7:d3:4d:b0:31:71:32:63:a9:d3:86:ca:20:d0:f8:
+         b8:65:3c:05
+-----BEGIN CERTIFICATE-----
+MIIE8TCCA9mgAwIBAgIDZt4NMA0GCSqGSIb3DQEBBQUAMIGQMQswCQYDVQQGEwJV
+UzETMBEGA1UECAwKV2FzaGluZ3RvbjEQMA4GA1UEBwwHU2VhdHRsZTEOMAwGA1UE
+CgwFQmFzaG8xGzAZBgNVBAsMElJpYWsgUHl0aG9uIENsaWVudDELMAkGA1UEAwwC
+Q0ExIDAeBgkqhkiG9w0BCQEWEWNsaWVudHNAYmFzaG8uY29tMB4XDTE0MDUyNzE5
+NDI0OFoXDTI0MDUyNDE5NDI0OFowgYoxCzAJBgNVBAYTAlVTMRMwEQYDVQQIDApX
+YXNoaW5ndG9uMQ4wDAYDVQQKDAVCYXNobzEbMBkGA1UECwwSUmlhayBQeXRob24g
+Q2xpZW50MRcwFQYDVQQDDA5yaWFrQDEyNy4wLjAuMTEgMB4GCSqGSIb3DQEJARYR
+Y2xpZW50c0BiYXNoby5jb20wggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIB
+AQDWLPNAoLwiVBiwKXGcZHfJt+vH3xYdXVbNKB/4QWAHLKVCrznMLw2pnjKWCrMI
+qxaaOu9/qoPBH1kZArPxv09ZN3QYu4fhuD5CWfvd9+8cn/nslty4RtCmJQLgcPif
+ZGdcaYgmLkyox+7dntBHeWEUsJ+a2f+oVs4PWWR8aR/T6dXF6QtrqmN3Oa4jHoqR
+0oqEkzR/Pck3J68ghQy2AsAhd980GrL99YS42pAzolXJumBTiqkHjC6BNm/tSvR0
+H+mRYYdBtkc9UCib69qdWOCG9WaSXvD7Q75xQzurWYyNNi9UJUpG+BY/0Ntqt8pv
+z95ja5ezZFgbGNeghQn5CA+nAgMBAAGjggFWMIIBUjAJBgNVHRMEAjAAMBEGCWCG
+SAGG+EIBAQQEAwIGwDALBgNVHQ8EBAMCBeAwNQYJYIZIAYb4QgENBCgWJlJpYWsg
+UHl0aG9uIENsaWVudCBUZXN0aW5nIENlcnRpZmljYXRlMB0GA1UdDgQWBBTldwEZ
+NLCwxdmj1L2La6Woc+DyUDCBrwYDVR0jBIGnMIGkoYGWpIGTMIGQMQswCQYDVQQG
+EwJVUzETMBEGA1UECAwKV2FzaGluZ3RvbjEQMA4GA1UEBwwHU2VhdHRsZTEOMAwG
+A1UECgwFQmFzaG8xGzAZBgNVBAsMElJpYWsgUHl0aG9uIENsaWVudDELMAkGA1UE
+AwwCQ0ExIDAeBgkqhkiG9w0BCQEWEWNsaWVudHNAYmFzaG8uY29tggkAn1rGFYwj
+RJ0wHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMA0GCSqGSIb3DQEBBQUA
+A4IBAQAOjh6TF1WQ7bKyjwOEjXaSB7bvW5jATHXM1Bz3LNXZAZb/5xPQlBusIe9/
+cZig3oI5l9MRJFT61va0P+vuxd+cGbhCY3yk4Bwp1v/1PNik7j9lIYMvtbizSwED
+xPros77mYpnOiq+HzsZelNt5nClhgV44JKtqUoqoSS6QcUq0+LMg/HQWrOWlfFhy
+MMrgJPdJzdHW2RvAn/4nOF3EtxX8D2k+gzavIffenx4BrZzBd3oH9g/fQq+ZCYJ6
+42FzH6fqqBX1AmhK5TrWur3sIm9Bf9h3SwgKJJwHFseoUyY6kM8lY9RrekKDIis/
+nRPn002wMXEyY6nThsog0Pi4ZTwF
+-----END CERTIFICATE-----

data/spec/support/certs/server.key

@@ -0,0 +1,27 @@
+-----BEGIN RSA PRIVATE KEY-----
+MIIEogIBAAKCAQEA1izzQKC8IlQYsClxnGR3ybfrx98WHV1WzSgf+EFgByylQq85
+zC8NqZ4ylgqzCKsWmjrvf6qDwR9ZGQKz8b9PWTd0GLuH4bg+Qln73ffvHJ/57Jbc
+uEbQpiUC4HD4n2RnXGmIJi5MqMfu3Z7QR3lhFLCfmtn/qFbOD1lkfGkf0+nVxekL
+a6pjdzmuIx6KkdKKhJM0fz3JNyevIIUMtgLAIXffNBqy/fWEuNqQM6JVybpgU4qp
+B4wugTZv7Ur0dB/pkWGHQbZHPVAom+vanVjghvVmkl7w+0O+cUM7q1mMjTYvVCVK
+RvgWP9DbarfKb8/eY2uXs2RYGxjXoIUJ+QgPpwIDAQABAoIBAFytcMlrhF16dIBu
+PppFI0yniKChmUk1paT7EvJzH6GbIRv9BQ6k4c2fBhbFJHnAxvQQQqjE2WSNMxnO
+gJ1Ago6Bn3xAUelLt60wkPuZGOATHavSEEqxYgIzC86hNASNBukHRYH4EPYMJgHC
+gjAbhvXUBAyW/rkSbvJXZVMsjjg9MZ/43Mv1HlK38OoaNpjCjhNDnLOm17KiHB1T
+Fub0ALlsMrjco4cFPCwYzJCV4tRNYX3aHQOMv3/izYqTLbKu2Oo5DTLoo5gy+u1z
+sGh0kN3JHrya1KPn9ZomHUgOPWCzdOZqz1F0KHN45P6NQEnDhtfKIh4dy4j7ADh2
+5q7sxBECgYEA8hRDkcDDdyKxicL7g4r+rJB04udIgZU64vzKn/1nZsBcWsYd9Z9Y
+ySAUL83L/b+zIs4QB9OBaQNb8+CMHOqbFzM3UztrNkp/EVR3+BEMD6NukkBh0sJE
+J2GxF/xhZSB8HmNwNF3cbTrgOMqnVwBCkkaJeTC1g6AAkMYvIIl3jS8CgYEA4n3o
+V1kd/G1RYL1N9o+7QrT1YY0X9Xah9wOyu0ZTC3sByekrBKs37yy6x56RklNYOXUE
+YnxlhUaor+g7usl9NNywcRD5SPaVvIstdOdEPMAolzDtI0oLktEtkHxbzzimoBfq
+LSvLzFYy72o3HZHWrqsD9CKLgEKGrTUHqdmxNwkCgYAkTHuRSGlG3PHoKU+Teu0T
+LRoJyApsO9c3oBY2BUZS9vciOWDWqs0iY2gDfwVeiDcxOdrXgZR/DZzlJb98uoUE
+5o4eMeOyoVsKWzMeBFhdo/D5hyPj+XNEwHZQlWx5QHS8DccOYyChVFm4ylJrTkOt
+MVx9ypr9IKnVC5KXe2VsywKBgAIWXvnPHHOjHkjh9cH7+SHYQRqxDjN48G0yX4dS
+UpmcfJu7xmW4nj9aDi6gy36pvfpplazCsLzVteBJJ6PFD55ZGlcwbNu7Sg3+ymB1
+cS+OJdGe5dCZchncS6s1OjNitkZrcgEQkkRD1xxVwkRHf88ETHkHiHmaI1udTYDH
+PNbhAoGAVNexubIZDR1q5Cl4Ep0biUAQzOWrSaltIrpBSk2yih184BLo1r/IPrRv
+468ioLz9R7n8AAwa63aFr36BpsKUwbPs1kujzfvrvNZr81se1lM8lehQDv5OOPHK
+773Fl/A+7ePM+ZPXaW3zslPM722fBG32bBsMTceQnkVQItqR8jk=
+-----END RSA PRIVATE KEY-----

data/spec/support/integration_setup.rb

@@ -6,5 +6,5 @@ module IntegrationSpecs
 end
 
 RSpec.configure do |config|
-  config.include IntegrationSpecs, :example_group => { :file_path => %r{spec/integration} }
+  config.include IntegrationSpecs, file_path: %r{spec/integration}
 end

data/spec/support/search_corpus_setup.rb

@@ -1,18 +1,39 @@
+# encoding: utf-8
 shared_context "search corpus setup" do
   before do
-    @bucket = @client.bucket('search_test')
-    orig_proto, @client.protocol = @client.protocol, :http
-    @bucket.enable_index!
-    @client.protocol = orig_proto
+    @search_bucket = random_bucket 'search_test'
+    @backend.create_search_index @search_bucket.name
+
+    wait_until{ !@backend.get_search_index(@search_bucket.name).nil? }
+
+    @client.set_bucket_props(@search_bucket,
+                             {search_index: @search_bucket.name},
+                             'yokozuna')
+
+    wait_until do
+      p = @client.get_bucket_props(@search_bucket, type: 'yokozuna')
+      p['search_index'] == @search_bucket.name
+    end
+
     idx = 0
-    IO.foreach("spec/fixtures/munchausen.txt") do |para|
-      next if para =~ /^\s*$|introduction|chapter/i
+    old_encoding = Encoding.default_external
+    Encoding.default_external = Encoding::UTF_8
+    IO.foreach("spec/fixtures/bitcask.txt") do |para|
+      next if para =~ /^\s*$|introduction|chapter/ui
       idx += 1
-      Riak::RObject.new(@bucket, "munchausen-#{idx}") do |obj|
+      Riak::RObject.new(@search_bucket, "bitcask-#{idx}") do |obj|
         obj.content_type = 'text/plain'
         obj.raw_data = para
-        @backend.store_object(obj)
+        @backend.store_object(obj, type: 'yokozuna')
       end
     end
+    Encoding.default_external = old_encoding
+    
+    wait_until do
+      results = @backend.search(@search_bucket.name, 
+                                'contain your entire keyspace',
+                                df: 'text')
+      results['docs'].length > 0
+    end
   end
 end

data/spec/support/test_client.rb

@@ -0,0 +1,46 @@
+module TestClient
+  def test_client
+    if defined? $test_client and $test_client.ping
+      return $test_client
+    end
+
+    candidate_client = Riak::Client.new test_client_configuration
+
+    live = candidate_client.ping
+    
+    return $test_client = candidate_client if live
+  end
+
+  def test_client_configuration
+    TestClient.test_client_configuration
+  end
+
+  def self.test_client_configuration
+    if defined? $test_client_configuration
+      return $test_client_configuration
+    end
+
+    config_path = File.expand_path '../test_client.yml', __FILE__
+    config = YAML.load_file(config_path).symbolize_keys
+
+    if config[:nodes]
+      new_nodes = config[:nodes].map(&:symbolize_keys)
+      config[:nodes] = new_nodes
+    end
+
+    $test_client_configuration = config
+  end
+
+  def random_bucket(name='test_client')
+    bucket_name = [name, Time.now.to_i, random_key].join('-')
+    test_client.bucket bucket_name
+  end
+
+  def random_key
+    rand(36**10).to_s(36)
+  end
+end
+
+RSpec.configure do |config|
+  config.include TestClient, test_client: true
+end

data/spec/support/test_client.yml.example

@@ -0,0 +1,10 @@
+# This file is used for configuring test_client used by
+# many of the integration tests.
+#
+# Simply set the arguments you'd normally pass to
+# Riak::Client.new in the file.
+#
+# Don't run multiple nodes, integration tests include
+# quorum checks that may result in race conditions.
+
+pb_port: 10017

data/spec/support/unified_backend_examples.rb

@@ -1,67 +1,79 @@
 shared_examples_for "Unified backend API" do
   # ping
   it "should ping the server" do
-    @backend.ping.should be_true
+    expect(@backend.ping).to be_truthy
+  end
+
+  it "gets info about the server" do
+    expect{ @backend.server_info }.to_not raise_error
+
+    expect(@backend.server_info).to include(:node, :server_version)
+  end
+
+  it "gets client id" do
+    expect{ @backend.get_client_id }.to_not raise_error
+
+    expect(@backend.get_client_id).to be_a String
   end
 
   # fetch_object
   context "fetching an object" do
     before do
-      @robject = Riak::RObject.new(@client.bucket("test"), "fetch")
+      @robject = Riak::RObject.new(@bucket, "fetch")
       @robject.content_type = "application/json"
       @robject.data = { "test" => "pass" }
-      @robject.indexes['test_bin'] << 'pass' if test_server.version >= "1.0.0"
+      @robject.indexes['test_bin'] << 'pass'
       @robject.links << Riak::Link.new('/riak/foo/bar', 'next')
       @robject.links << Riak::Link.new('/riak/foo/baz', 'next')
       @backend.store_object(@robject)
     end
 
     it "should find a stored object" do
-      robj = @backend.fetch_object("test", "fetch")
-      robj.should be_kind_of(Riak::RObject)
-      robj.data.should == { "test" => "pass" }
-      robj.links.should be_a Set
+      robj = @backend.fetch_object(@bucket.name, "fetch")
+      expect(robj).to be_kind_of(Riak::RObject)
+      expect(robj.data).to eq({ "test" => "pass" })
+      expect(robj.links).to be_a Set
     end
 
     it "should raise an error when the object is not found" do
       begin
-        @backend.fetch_object("test", "notfound")
+        @backend.fetch_object(@bucket.name, "notfound")
       rescue Riak::FailedRequest => exception
         @exception = exception
       end
-      @exception.should be_kind_of(Riak::FailedRequest)
-      @exception.should be_not_found
+      expect(@exception).to be_kind_of(Riak::FailedRequest)
+      expect(@exception).to be_not_found
     end
 
     [1,2,3,:one,:quorum,:all,:default].each do |q|
       it "should accept a R value of #{q.inspect} for the request" do
-        robj = @backend.fetch_object("test", "fetch", :r => q)
-        robj.should be_kind_of(Riak::RObject)
-        robj.data.should == { "test" => "pass" }
+        robj = @backend.fetch_object(@bucket.name, "fetch", :r => q)
+        expect(robj).to be_kind_of(Riak::RObject)
+        expect(robj.data).to eq({ "test" => "pass" })
       end
 
-      it "should accept a PR value of #{q.inspect} for the request", :version => ">= 1.0.0" do
-        robj = @backend.fetch_object("test", "fetch", :pr => q)
-        robj.should be_kind_of(Riak::RObject)
-        robj.data.should == { "test" => "pass" }
+      it "should accept a PR value of #{q.inspect} for the request" do
+        robj = @backend.fetch_object(@bucket.name, "fetch", :pr => q)
+        expect(robj).to be_kind_of(Riak::RObject)
+        expect(robj.data).to eq({ "test" => "pass" })
       end
     end
 
-    sometimes "should marshal indexes properly", :version => ">= 1.0.0", :retries => 5 do
-      robj = @backend.fetch_object('test', 'fetch')
-      robj.indexes['test_bin'].should be
-      robj.indexes['test_bin'].should include('pass')
+    it "marshals indexes properly", :retries => 5 do
+      robj = @backend.fetch_object(@bucket.name, 'fetch')
+      expect(robj.indexes['test_bin']).to be
+      expect(robj.indexes['test_bin']).to include('pass')
     end
   end
 
   # reload_object
   context "reloading an existing object" do
     before do
-      @robject = Riak::RObject.new(@client.bucket('test'), 'reload')
+      @robject = Riak::RObject.new(@bucket, 'reload')
       @robject.content_type = "application/json"
       @robject.data = {"test" => "pass"}
       @backend.store_object(@robject)
-      @robject2 = @backend.fetch_object("test", "reload")
+      @robject2 = @backend.fetch_object(@bucket.name, "reload")
       @robject2.data["test"] = "second"
       @backend.store_object(@robject2, :returnbody => true)
     end
@@ -75,15 +87,15 @@ shared_examples_for "Unified backend API" do
         @backend.reload_object(@robject, :r => q)
       end
 
-      it "should accept a valid PR value of #{q.inspect} for the request", :version => ">= 1.0.0" do
+      it "should accept a valid PR value of #{q.inspect} for the request" do
         @backend.reload_object(@robject, :pr => q)
       end
     end
 
-    after do
+    after do |example|
       unless example.pending?
-        @robject.vclock.should == @robject2.vclock
-        @robject.data['test'].should == "second"
+        expect(@robject.vclock).to eq(@robject2.vclock)
+        expect(@robject.data['test']).to eq("second")
       end
     end
   end
@@ -91,7 +103,7 @@ shared_examples_for "Unified backend API" do
   # store_object
   context "storing an object" do
     before do
-      @robject = Riak::RObject.new(@client.bucket('test'), 'store')
+      @robject = Riak::RObject.new(@bucket, random_key)
       @robject.content_type = "application/json"
       @robject.data = {"test" => "pass"}
     end
@@ -102,33 +114,33 @@ shared_examples_for "Unified backend API" do
 
     it "should modify the object with the returned data if returnbody" do
       @backend.store_object(@robject, :returnbody => true)
-      @robject.vclock.should be_present
+      expect(@robject.vclock).to be_present
     end
 
     [1,2,3,:one,:quorum,:all,:default].each do |q|
       it "should accept a W value of #{q.inspect} for the request" do
         @backend.store_object(@robject, :returnbody => false, :w => q)
-        @client.bucket("test").exists?("store").should be_true
+        expect(@bucket.exists?(@robject.key)).to be_truthy
       end
 
       it "should accept a DW value of #{q.inspect} for the request" do
         @backend.store_object(@robject, :returnbody => false, :w => :all, :dw => q)
       end
 
-      it "should accept a PW value of #{q.inspect} for the request", :version => ">= 1.0.0" do
+      it "should accept a PW value of #{q.inspect} for the request" do
         @backend.store_object(@robject, :returnbody => false, :pw => q)
       end
     end
 
-    it "should store an object with indexes", :version => ">= 1.0.0" do
+    it "should store an object with indexes" do
       @robject.indexes['foo_bin'] << 'bar'
       @backend.store_object(@robject, :returnbody => true)
-      @robject.indexes.should include('foo_bin')
-      @robject.indexes['foo_bin'].should include('bar')
+      expect(@robject.indexes).to include('foo_bin')
+      expect(@robject.indexes['foo_bin']).to include('bar')
     end
 
     after do
-      expect { @backend.fetch_object("test", "store") }.to_not raise_error(Riak::FailedRequest)
+      expect { @backend.fetch_object(@bucket.name, @robject.key) }.not_to raise_error
     end
   end
 
@@ -143,7 +155,7 @@ shared_examples_for "Unified backend API" do
 
     it "should remove the object" do
       @backend.delete_object("test", "delete")
-      @obj.bucket.exists?("delete").should be_false
+      expect(@obj.bucket.exists?("delete")).to be_falsey
     end
 
     [1,2,3,:one,:quorum,:all,:default].each do |q|
@@ -157,7 +169,7 @@ shared_examples_for "Unified backend API" do
     end
 
     after do
-      @obj.bucket.exists?("delete").should be_false
+      expect(@obj.bucket.exists?("delete")).to be_falsey
     end
   end
 
@@ -165,8 +177,8 @@ shared_examples_for "Unified backend API" do
   context "fetching bucket properties" do
     it "should fetch a hash of bucket properties" do
       props = @backend.get_bucket_props("test")
-      props.should be_kind_of(Hash)
-      props.should include("n_val")
+      expect(props).to be_kind_of(Hash)
+      expect(props).to include("n_val")
     end
   end
 
@@ -174,55 +186,56 @@ shared_examples_for "Unified backend API" do
   context "setting bucket properties" do
     it "should store properties for the bucket" do
       @backend.set_bucket_props("test", {"n_val" => 3})
-      @backend.get_bucket_props("test")["n_val"].should == 3
+      expect(@backend.get_bucket_props("test")["n_val"]).to eq(3)
     end
   end
 
   # list_keys
   context "listing keys in a bucket" do
     before do
-      obj = Riak::RObject.new(@client.bucket("test"), "keys")
+      @list_bucket = random_bucket 'unified_backend_list_keys'
+      obj = Riak::RObject.new(@list_bucket, "keys")
       obj.content_type = "application/json"
       obj.data = [1]
       @backend.store_object(obj)
     end
 
     it "should fetch an array of string keys" do
-      @backend.list_keys("test").should == ["keys"]
+      expect(@backend.list_keys(@list_bucket)).to eq(["keys"])
     end
 
     context "streaming through a block" do
       it "should handle a large number of keys" do
-        obj = Riak::RObject.new(@client.bucket("test"))
+        obj = Riak::RObject.new(@list_bucket)
         obj.content_type = "application/json"
         obj.data = [1]
         750.times do |i|
           obj.key = i.to_s
           obj.store(:w => 1, :dw => 0, :returnbody => false)
         end
-        @backend.list_keys("test") do |keys|
-          keys.should be_all {|k| k == 'keys' || (0..749).include?(k.to_i) }
+        @backend.list_keys(@list_bucket) do |keys|
+          expect(keys).to be_all {|k| k == 'keys' || (0..749).include?(k.to_i) }
         end
       end
 
       it "should pass an array of keys to the block" do
-        @backend.list_keys("test") do |keys|
-          keys.should == ["keys"] unless keys.empty?
+        @backend.list_keys(@list_bucket) do |keys|
+          expect(keys).to eq(["keys"]) unless keys.empty?
         end
       end
 
       it "should allow requests issued inside the block to execute" do
         errors = []
-        @backend.list_keys("test") do |keys|
+        @backend.list_keys(@list_bucket) do |keys|
           keys.each do |key|
             begin
-              @client.get_object("test", key)
+              @client.get_object(@list_bucket, key)
             rescue => e
               errors << e
             end
           end
         end
-        errors.should be_empty
+        expect(errors).to be_empty
       end
     end
   end
@@ -238,8 +251,8 @@ shared_examples_for "Unified backend API" do
 
     it "should fetch a list of string bucket names" do
       list = @backend.list_buckets
-      list.should be_kind_of(Array)
-      list.should include("test")
+      expect(list).to be_kind_of(Array)
+      expect(list).to include("test")
     end
   end
 
@@ -256,58 +269,56 @@ shared_examples_for "Unified backend API" do
     end
 
     it "should find keys for an equality query" do
-      @backend.get_index('test', 'index_int', 20).should == ["20"]
+      expect(@backend.get_index('test', 'index_int', 20)).to eq(["20"])
     end
 
     it "should find keys for a range query" do
-      @backend.get_index('test', 'index_int', 19..21).should =~ ["19","20", "21"]
+      expect(@backend.get_index('test', 'index_int', 19..21)).to match_array(["19","20", "21"])
     end
 
     it "should return an empty array for a query that does not match any keys" do
-      @backend.get_index('test', 'index_int', 10000).should == []
+      expect(@backend.get_index('test', 'index_int', 10000)).to eq([])
     end
   end
 
   # mapred
   context "performing MapReduce" do
     before do
-      obj = Riak::RObject.new(@client.bucket("test"), "1")
+      @mapred_bucket = random_bucket("mapred_test")
+      obj = Riak::RObject.new(@mapred_bucket, "1")
       obj.content_type = "application/json"
       obj.data = {"value" => "1" }
       @backend.store_object(obj)
-      @mapred = Riak::MapReduce.new(@client).add("test").map("Riak.mapValuesJson", :keep => true)
-    end
-
-    it "should raise an error without phases", :version => "< 1.1.0" do
-      @mapred.query.clear
-      expect { @backend.mapred(@mapred) }.to raise_error(Riak::MapReduceError)
+      @mapred = Riak::MapReduce.new(@client).
+        add(@mapred_bucket.name).
+        map("Riak.mapValuesJson", :keep => true)
     end
 
-    it "should not raise an error without phases", :version => ">= 1.1.0" do
+    it "should not raise an error without phases" do
       @mapred.query.clear
       @backend.mapred(@mapred)
     end
 
     it "should perform a simple MapReduce request" do
-      @backend.mapred(@mapred).should == [{"value" => "1"}]
+      expect(@backend.mapred(@mapred)).to eq([{"value" => "1"}])
     end
 
     it "should return an ordered array of results when multiple phases are kept" do
       @mapred.reduce("function(objects){ return objects; }", :keep => true)
-      @backend.mapred(@mapred).should == [[{"value" => "1"}], [{"value" => "1"}]]
+      expect(@backend.mapred(@mapred)).to eq([[{"value" => "1"}], [{"value" => "1"}]])
     end
 
     it "should not remove empty phase results when multiple phases are kept" do
       @mapred.reduce("function(){ return []; }", :keep => true)
-      @backend.mapred(@mapred).should == [[{"value" => "1"}], []]
+      expect(@backend.mapred(@mapred)).to eq([[{"value" => "1"}], []])
     end
 
     context "streaming results through a block" do
       it "should pass phase number and result to the block" do
         @backend.mapred(@mapred) do |phase, result|
           unless result.empty?
-            phase.should == 0
-            result.should == [{"value" => "1"}]
+            expect(phase).to eq(0)
+            expect(result).to eq([{"value" => "1"}])
           end
         end
       end
@@ -318,20 +329,20 @@ shared_examples_for "Unified backend API" do
           unless result.empty?
             result.each do |v|
               begin
-                @client.get_object("test", v['value'])
+                @client.get_object(@mapred_bucket, v['value'])
               rescue => e
                 errors << e
               end
             end
           end
         end
-        errors.should be_empty
+        expect(errors).to be_empty
       end
     end
   end
 
   # search
-  context "searching fulltext indexes", :version => ">= 1.2.0" do
+  context "searching fulltext indexes" do
     # Search functionality existed since Riak 0.13, but PBC only
     # entered into the picture in 1.2. PBC can support searches
     # against 1.1 and earlier nodes using MapReduce emulation, but has
@@ -339,21 +350,31 @@ shared_examples_for "Unified backend API" do
     # pre-1.2 functionality.
     include_context "search corpus setup"
 
-    it 'should find indexed documents, returning ids' do
-      results = @backend.search 'search_test', 'fearless elephant rushed', :fl => 'id'
-      results.should have_key 'docs'
-      results.should have_key 'max_score'
-      results.should have_key 'num_found'
-      results['docs'].should include({"id" => "munchausen-605"})
+    it 'finds indexed documents, returning ids' do
+      results = @backend.search @search_bucket.name, 'predictable operations behavior', fl: '_yz_rk', df: 'text'
+      expect(results).to have_key 'docs'
+      expect(results).to have_key 'max_score'
+      expect(results).to have_key 'num_found'
+
+      found = results['docs'].any? do |e|
+        e['_yz_rk'] == 'bitcask-10'
+      end
+
+      expect(found).to be_truthy
     end
 
-    it 'should find indexed documents, returning documents' do
+    it 'finds indexed documents, returning documents' do
       # For now use '*' until #122 is merged into riak_search
-      results = @backend.search 'search_test', 'fearless elephant rushed', :fl => '*'
-      results.should have_key 'docs'
-      results.should have_key 'max_score'
-      results.should have_key 'num_found'
-      results['docs'].should include({"id" => "munchausen-605", "value" => "Fearless I advanced against the elephant, desirous to take alive the haughty Tippoo Sahib; but he drew a pistol from his belt, and discharged it full in my face as I rushed upon him, which did me no further harm than wound my cheek-bone, which disfigures me somewhat under my left eye. I could not withstand the rage and impulse of that moment, and with one blow of my sword separated his head from his body.\n"})
+      results = @backend.search @search_bucket.name, 'predictable operations behavior', fl: '_yz_rk', df: 'text'
+      expect(results).to have_key 'docs'
+      expect(results).to have_key 'max_score'
+      expect(results).to have_key 'num_found'
+
+      found = results['docs'].any? do |e|
+        e['_yz_rk'] == 'bitcask-10'
+      end
+
+      expect(found).to be_truthy
     end
   end
 end