slipcover 0.2.66 → 0.2.67

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c30eb78e5ec3f19a657da3119d879a03be089de2
-  data.tar.gz: 48307fb9bd6423823cf6b00cf11a1b105dafff83
+  metadata.gz: 417ec7939c7ef5d78b6c8ef1d0a1847e3045705e
+  data.tar.gz: 09f2b87cb89c7f9726a857beaf1632c9b3e4e4f5
 SHA512:
-  metadata.gz: e9813aea3e0f1cb40c222a551f0890a5b42b28a927a9da0a69a1f41388f2f26e39e143572fe19027f1b793c28ba04e84985aa80115138054fbb1e92b0ae210a9
-  data.tar.gz: 0ab91d8b3d9e7a38596eb2fd2be4026f7fab8355607a8735e70f9651f545e65b4ab3ba6c9f229b523c1d551c317dd0ba0819b5b7d64a540ef083ac7c7e4fcf5f
+  metadata.gz: 5bd92b0951ef316fe3328fa91f23a3da98f711ef8c748dd0947ef6b719d2b30883ea9715a8d05e501f8cbb5db279c47286d77b9ba4ea0b4c55deef5b4da60535
+  data.tar.gz: 76247d31077baa3f46c0a6fae8e2c30681811e8ea2f1b2f9eddf5b7937591b8a71d753e994fd9c6b9122b6c627ecb326df7a386bb92b543cefdc125fd8022f13

data/lib/slipcover/query.rb

@@ -12,10 +12,7 @@ module Slipcover
     end
 
     def all(opts={})
-      opts_params, body_params = url_params_and_body(opts)
-      url_with_qs = add_qs_to_url(url, repackage(opts_params))
-
-      http_adapter.post(url_with_qs, body_params)[:rows].map do |row|
+      do_http_request(opts)[:rows].map do |row|
         doc_data = opts[:include_docs] ? row["doc"] : row
         Document.new(database.name, doc_data.symbolize_keys)
       end
@@ -27,16 +24,27 @@ module Slipcover
 
     private
 
+    # This is here because Cloudant doesn't support POST without supplying
+    # `keys`.
+    def do_http_request(opts)
+      if opts.include?(:keys)
+        opts_params, body_params = url_params_and_body(opts)
+        url_with_qs = add_qs_to_url(url, repackage(opts_params))
+        http_adapter.post(url_with_qs, body_params)
+      else
+        url_with_qs = add_qs_to_url(url, repackage(opts))
+        http_adapter.get(url_with_qs)
+      end
+    end
+
     def url_params_and_body(opts)
       keys_for_body = [:keys]
       [opts.except(*keys_for_body), opts.slice(*keys_for_body)]
     end
 
     def repackage(opts)
-      opts = opts.dup
-
-      opts.each do |key, value|
-        opts[key] = jsonify_param(value) if jsonify_key?(key)
+      opts.each_with_object({}) do |(key, value), result|
+        result[key] = jsonify_key?(key) ? jsonify_param(value) : value
       end
     end
 

data/lib/slipcover/version.rb

@@ -1,3 +1,3 @@
 module Slipcover
-  VERSION = "0.2.66"
+  VERSION = "0.2.67"
 end

data/spec/query_spec.rb

@@ -71,6 +71,20 @@ describe Slipcover::Query do
           results.first[:name].should == "blah&"
         end
       end
+
+      # These tests are here because Cloudant doesn't support POST without
+      # supplying `keys`.
+      it "performs a GET request when keys is not supplied" do
+        Slipcover::HttpAdapter.any_instance.should_receive(:get).
+          and_call_original
+        query.all
+      end
+
+      it "performs a POST request when keys is supplied" do
+        Slipcover::HttpAdapter.any_instance.should_receive(:post).
+          and_call_original
+        query.all(keys: ["Fito"])
+      end
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: slipcover
 version: !ruby/object:Gem::Version
-  version: 0.2.66
+  version: 0.2.67
 platform: ruby
 authors:
 - Kane Baccigalupi