endeca 1.5.0 → 1.5.1

data/endeca.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{endeca}
-  s.version = "1.5.0"
+  s.version = "1.5.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Primedia Team"]
-  s.date = %q{2010-05-06}
+  s.date = %q{2010-06-03}
   s.email = %q{}
   s.extra_rdoc_files = [
     "README.rdoc"
@@ -61,20 +61,20 @@ Gem::Specification.new do |s|
   s.rubygems_version = %q{1.3.6}
   s.summary = %q{Endeca adapter for use with the Endeca Bridge}
   s.test_files = [
-    "spec/endeca_spec.rb",
-     "spec/core_ext_spec.rb",
-     "spec/endeca/document_collection_spec.rb",
-     "spec/endeca/readers_spec.rb",
-     "spec/endeca/request_spec.rb",
-     "spec/endeca/transformer_spec.rb",
+    "spec/core_ext_spec.rb",
+     "spec/endeca/benchmarking_spec.rb",
      "spec/endeca/breadcrumb_spec.rb",
-     "spec/endeca/logging_spec.rb",
+     "spec/endeca/dimension_spec.rb",
+     "spec/endeca/document_collection_spec.rb",
      "spec/endeca/document_spec.rb",
-     "spec/endeca/refinement_spec.rb",
+     "spec/endeca/logging_spec.rb",
      "spec/endeca/map_spec.rb",
+     "spec/endeca/readers_spec.rb",
      "spec/endeca/refinement_dimension_spec.rb",
-     "spec/endeca/dimension_spec.rb",
-     "spec/endeca/benchmarking_spec.rb",
+     "spec/endeca/refinement_spec.rb",
+     "spec/endeca/request_spec.rb",
+     "spec/endeca/transformer_spec.rb",
+     "spec/endeca_spec.rb",
      "spec/spec_helper.rb"
   ]
 

data/lib/endeca.rb

@@ -13,7 +13,7 @@ module Endeca
   extend Logging
 
   # :stopdoc:
-  VERSION = '1.5.0'
+  VERSION = '1.5.1'
   # :startdoc:
 
   # Returns the version string for the library.
@@ -27,10 +27,6 @@ module Endeca
     attr_accessor :logger
     attr_accessor :timeout
 
-    def analyze?
-      debug? && benchmark?
-    end
-
     def debug?
       ENV['ENDECA_DEBUG'] == 'true' 
     end

data/lib/endeca/request.rb

@@ -13,7 +13,7 @@ module Endeca
       @query = query
     end
 
-    if Endeca.analyze?
+    if Endeca.benchmark?
       def perform
         raise RequestError, endeca_error[:message] if endeca_error?
         Endeca.increase_metric(:request_count, 1)
@@ -25,7 +25,7 @@ module Endeca
         return response
       end
     end
-    
+
     def response
       @response ||= handle_response(get_response)
     end
@@ -38,7 +38,7 @@ module Endeca
     end
 
     private
-    
+
     def endeca_error
       method_response = response["methodResponse"]
       fault = method_response && method_response["fault"]
@@ -54,21 +54,32 @@ module Endeca
       !endeca_error.nil?
     end
 
-    if Endeca.analyze?
+    if Endeca.benchmark?
+      def get_response #:nodoc:
+        Endeca.log "ENDECA ADAPTER REQUEST"
+        Endeca.log "    parameters => " + @query.inspect
+        Endeca.log "           uri => " + uri.to_s
+        Endeca.bm(:request_time, "#{@path} #{@query.inspect}") do 
+          begin
+            Curl::Easy.perform(uri.to_s) do |curl|
+              curl.timeout = Endeca.timeout
+            end
+          rescue => e
+            raise RequestError, e.message
+          end
+        end
+      end
+    elsif Endeca.debug?
       def get_response #:nodoc:
-         Endeca.log "ENDECA ADAPTER REQUEST"
-         Endeca.log "    parameters => " + @query.inspect
-         Endeca.log "           uri => " + uri.to_s
-         Endeca.bm(:request_time, "#{@path} #{@query.inspect}") do 
-           begin
-             Curl::Easy.perform(uri.to_s) do |curl|
-               curl.timeout = Endeca.timeout
-             end
-           rescue => e
-             raise RequestError, e.message
-           end
-         end
-       end
+        Endeca.log "ENDECA ADAPTER REQUEST"
+        Endeca.log "    parameters => " + @query.inspect
+        Endeca.log "           uri => " + uri.to_s
+        Curl::Easy.perform(uri.to_s) do |curl|
+          curl.timeout = Endeca.timeout
+        end
+      rescue => e
+        raise RequestError, e.message
+      end
     else
       def get_response #:nodoc:
         Curl::Easy.perform(uri.to_s) do |curl|
@@ -78,9 +89,8 @@ module Endeca
         raise RequestError, e.message
       end
     end
-    
-    if Endeca.analyze?
-    
+
+    if Endeca.benchmark?
       def handle_response(response) #:nodoc:
         case response.response_code.to_s
         when "200"
@@ -110,12 +120,12 @@ module Endeca
       end
     end
 
-     def query_string
-       @path.match(/\?(.*)$/)
-       query_string_parts = [$1, @query.to_endeca_params]
-       query_string_parts.reject!{ |s| s.nil? || s.empty? }
+    def query_string
+      @path.match(/\?(.*)$/)
+      query_string_parts = [$1, @query.to_endeca_params]
+      query_string_parts.reject!{ |s| s.nil? || s.empty? }
 
-       query_string_parts.empty? ? nil : query_string_parts.join('&')
-     end
+      query_string_parts.empty? ? nil : query_string_parts.join('&')
+    end
   end
 end

data/spec/endeca/benchmarking_spec.rb

@@ -10,7 +10,7 @@ describe Endeca::Benchmarking do
       @logger = mock('Logger')
 
       Endeca.stub!(:logger).and_return(@logger)
-      Endeca.stub!(:debug => true, :benchmark => true)
+      Endeca.stub!(:benchmark => true)
 
       Benchmark.stub!(:ms => 1)
     end
@@ -23,8 +23,6 @@ describe Endeca::Benchmarking do
 
   describe "#add_bm_detail" do
     it "should add info to the current thread" do
-      Endeca.stub!(:analyze?).and_return(true)
-
       Endeca.send(:add_bm_detail, :metric, 1.1, 'query query')
 
       Thread.current[:endeca]["metric_detail"][0].should == {:detail => "query query", :time => 1.1}

data/spec/endeca_spec.rb

@@ -15,13 +15,6 @@ describe Endeca do
 
   end
 
-  it "#anaylze" do
-    Endeca.should_receive(:debug?).and_return(true)
-    Endeca.should_receive(:benchmark?).and_return(true)
-
-    Endeca.analyze?
-  end
-
   it "#debug?" do
     ENV['ENDECA_DEBUG'] = 'true'
 

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 1
   - 5
-  - 0
-  version: 1.5.0
+  - 1
+  version: 1.5.1
 platform: ruby
 authors: 
 - Primedia Team
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-05-06 00:00:00 -04:00
+date: 2010-06-03 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -137,18 +137,18 @@ signing_key:
 specification_version: 3
 summary: Endeca adapter for use with the Endeca Bridge
 test_files: 
-- spec/endeca_spec.rb
 - spec/core_ext_spec.rb
-- spec/endeca/document_collection_spec.rb
-- spec/endeca/readers_spec.rb
-- spec/endeca/request_spec.rb
-- spec/endeca/transformer_spec.rb
+- spec/endeca/benchmarking_spec.rb
 - spec/endeca/breadcrumb_spec.rb
-- spec/endeca/logging_spec.rb
+- spec/endeca/dimension_spec.rb
+- spec/endeca/document_collection_spec.rb
 - spec/endeca/document_spec.rb
-- spec/endeca/refinement_spec.rb
+- spec/endeca/logging_spec.rb
 - spec/endeca/map_spec.rb
+- spec/endeca/readers_spec.rb
 - spec/endeca/refinement_dimension_spec.rb
-- spec/endeca/dimension_spec.rb
-- spec/endeca/benchmarking_spec.rb
+- spec/endeca/refinement_spec.rb
+- spec/endeca/request_spec.rb
+- spec/endeca/transformer_spec.rb
+- spec/endeca_spec.rb
 - spec/spec_helper.rb