slipcover 0.2.65 → 0.2.66

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: be1ab035455907d50c7cacc7654370f7fbef11df
-  data.tar.gz: 9d9880467ec35758a35a6710221b658097f3bd19
+  metadata.gz: c30eb78e5ec3f19a657da3119d879a03be089de2
+  data.tar.gz: 48307fb9bd6423823cf6b00cf11a1b105dafff83
 SHA512:
-  metadata.gz: 0811923a620b9217c313c918ca1810bb52ebe57123c7710356068b82dca53ed48b8e86fca845589044aac5e243d4e39e947534121dda274853e39a468da26478
-  data.tar.gz: 6ae8a159b28ec8390f192153303232eeb133c5cb2313e8c6467cd19036a24a55e93f5f2992091496d64ffbc37532d70a2d850658029d4978a960a4ba126e0bba
+  metadata.gz: e9813aea3e0f1cb40c222a551f0890a5b42b28a927a9da0a69a1f41388f2f26e39e143572fe19027f1b793c28ba04e84985aa80115138054fbb1e92b0ae210a9
+  data.tar.gz: 0ab91d8b3d9e7a38596eb2fd2be4026f7fab8355607a8735e70f9651f545e65b4ab3ba6c9f229b523c1d551c317dd0ba0819b5b7d64a540ef083ac7c7e4fcf5f

data/lib/slipcover/query.rb

@@ -7,42 +7,53 @@ module Slipcover
       @view_name = view_name
     end
 
-    def http_adapter
-      @http_adapter ||= HttpAdapter.new
-    end
-
-    delegate :get,
-      to: :http_adapter
-
     def url
       "#{design_document.url}/_view/#{view_name}"
     end
 
     def all(opts={})
-      get(url, repackage(opts))[:rows].map{ |row|
+      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|
         doc_data = opts[:include_docs] ? row["doc"] : row
         Document.new(database.name, doc_data.symbolize_keys)
-      }
+      end
+    end
+
+    def database
+      design_document.database
+    end
+
+    private
+
+    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] = escape(value) if escape_key?(key)
+        opts[key] = jsonify_param(value) if jsonify_key?(key)
       end
     end
 
-    def database
-      design_document.database
+    def jsonify_param(value)
+      value.to_json
+    end
+
+    def jsonify_key?(key)
+      [:key, :startkey, :endkey].include?(key.to_sym)
     end
 
-    def escape(value)
-      CGI.escape(value.inspect)
+    def add_qs_to_url(url, params)
+      url + "?" + params.to_query
     end
 
-    def escape_key?(key)
-      [:key, :keys, :startkey, :startkey_docid, :endkey, :endkey_docid, :stale].include?(key.to_sym)
+    def http_adapter
+      @http_adapter ||= HttpAdapter.new
     end
   end
 end

data/lib/slipcover/version.rb

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

data/spec/query_spec.rb

@@ -42,6 +42,20 @@ describe Slipcover::Query do
         end
       end
 
+      it "filters by keys" do
+        results = query.all(keys: ["Deepti", "Fito"], include_docs: true)
+        results.map {|doc| doc[:name] }.should =~ ["Deepti", "Fito"]
+      end
+
+      # this required POSTing to a Couch view because the URL is too long when
+      # there are a lot of keys
+      it "can filter by a lot of keys" do
+        results = query.all(keys: ["Deepti", "Fito",
+                                   *999.times.map { |i| "Vlad#{i}" }],
+                            include_docs: true)
+        results.map {|doc| doc[:name] }.should =~ ["Deepti", "Fito"]
+      end
+
       context 'with a startkey and endkey' do
         it "return the range of docs" do
           results = query.all(startkey: 'Da', endkey: 'Fz', include_docs: true)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: slipcover
 version: !ruby/object:Gem::Version
-  version: 0.2.65
+  version: 0.2.66
 platform: ruby
 authors:
 - Kane Baccigalupi
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-29 00:00:00.000000000 Z
+date: 2014-12-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client