primedia-endeca 0.9.10 → 0.9.11

data/endeca.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{endeca}
-  s.version = "0.9.10"
+  s.version = "0.9.11"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Rein Henrichs", "Andy Stone"]

data/lib/endeca/document.rb

@@ -105,12 +105,16 @@ module Endeca
     private
 
     def self.request(query_options)
+      Endeca::Request.perform(get_path, parse_query_options(query_options))
+    end
+
+    def self.parse_query_options(query_options)
       if query_options.respond_to?(:merge)
         new_query_options = get_default_params.merge(query_options)
         query_options = transform_query_options(new_query_options)
+      else
+        query_options
       end
-
-      Endeca::Request.perform(get_path, query_options)
     end
   end
 end

data/lib/endeca.rb

@@ -20,7 +20,7 @@ require 'endeca/document'
 module Endeca
 
   # :stopdoc:
-  VERSION = '0.9.10'
+  VERSION = '0.9.11'
   # :startdoc:
 
   # Returns the version string for the library.

data/spec/endeca/document_spec.rb

@@ -205,6 +205,23 @@ describe Endeca::Document do
     end
   end
 
+  describe ".all" do
+    describe "with a query string" do
+      it 'should make a request with the query string' do
+        Endeca::Request.should_receive(:perform).with(anything, "query string")
+        Endeca::Document.all("query string")
+      end
+
+      describe "and default parameters" do
+        it "should make a request with the query string and ignore the defaults" do
+          Endeca::Document.default_params :foo => :bar
+          Endeca::Request.should_receive(:perform).with(anything, "query string")
+          Endeca::Document.all("query string")
+        end
+      end
+    end
+  end
+
   describe ".transform_query_options" do
     before do
       @query_options = {

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: primedia-endeca
 version: !ruby/object:Gem::Version 
-  version: 0.9.10
+  version: 0.9.11
 platform: ruby
 authors: 
 - Rein Henrichs