endeca 1.5.0 → 1.5.1
Sign up to get free protection for your applications and to get access to all the features.
- data/endeca.gemspec +12 -12
- data/lib/endeca.rb +1 -5
- data/lib/endeca/request.rb +36 -26
- data/spec/endeca/benchmarking_spec.rb +1 -3
- data/spec/endeca_spec.rb +0 -7
- metadata +12 -12
data/endeca.gemspec
CHANGED
@@ -5,11 +5,11 @@
|
|
5
5
|
|
6
6
|
Gem::Specification.new do |s|
|
7
7
|
s.name = %q{endeca}
|
8
|
-
s.version = "1.5.
|
8
|
+
s.version = "1.5.1"
|
9
9
|
|
10
10
|
s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
|
11
11
|
s.authors = ["Primedia Team"]
|
12
|
-
s.date = %q{2010-
|
12
|
+
s.date = %q{2010-06-03}
|
13
13
|
s.email = %q{}
|
14
14
|
s.extra_rdoc_files = [
|
15
15
|
"README.rdoc"
|
@@ -61,20 +61,20 @@ Gem::Specification.new do |s|
|
|
61
61
|
s.rubygems_version = %q{1.3.6}
|
62
62
|
s.summary = %q{Endeca adapter for use with the Endeca Bridge}
|
63
63
|
s.test_files = [
|
64
|
-
"spec/
|
65
|
-
"spec/
|
66
|
-
"spec/endeca/document_collection_spec.rb",
|
67
|
-
"spec/endeca/readers_spec.rb",
|
68
|
-
"spec/endeca/request_spec.rb",
|
69
|
-
"spec/endeca/transformer_spec.rb",
|
64
|
+
"spec/core_ext_spec.rb",
|
65
|
+
"spec/endeca/benchmarking_spec.rb",
|
70
66
|
"spec/endeca/breadcrumb_spec.rb",
|
71
|
-
"spec/endeca/
|
67
|
+
"spec/endeca/dimension_spec.rb",
|
68
|
+
"spec/endeca/document_collection_spec.rb",
|
72
69
|
"spec/endeca/document_spec.rb",
|
73
|
-
"spec/endeca/
|
70
|
+
"spec/endeca/logging_spec.rb",
|
74
71
|
"spec/endeca/map_spec.rb",
|
72
|
+
"spec/endeca/readers_spec.rb",
|
75
73
|
"spec/endeca/refinement_dimension_spec.rb",
|
76
|
-
"spec/endeca/
|
77
|
-
"spec/endeca/
|
74
|
+
"spec/endeca/refinement_spec.rb",
|
75
|
+
"spec/endeca/request_spec.rb",
|
76
|
+
"spec/endeca/transformer_spec.rb",
|
77
|
+
"spec/endeca_spec.rb",
|
78
78
|
"spec/spec_helper.rb"
|
79
79
|
]
|
80
80
|
|
data/lib/endeca.rb
CHANGED
@@ -13,7 +13,7 @@ module Endeca
|
|
13
13
|
extend Logging
|
14
14
|
|
15
15
|
# :stopdoc:
|
16
|
-
VERSION = '1.5.
|
16
|
+
VERSION = '1.5.1'
|
17
17
|
# :startdoc:
|
18
18
|
|
19
19
|
# Returns the version string for the library.
|
@@ -27,10 +27,6 @@ module Endeca
|
|
27
27
|
attr_accessor :logger
|
28
28
|
attr_accessor :timeout
|
29
29
|
|
30
|
-
def analyze?
|
31
|
-
debug? && benchmark?
|
32
|
-
end
|
33
|
-
|
34
30
|
def debug?
|
35
31
|
ENV['ENDECA_DEBUG'] == 'true'
|
36
32
|
end
|
data/lib/endeca/request.rb
CHANGED
@@ -13,7 +13,7 @@ module Endeca
|
|
13
13
|
@query = query
|
14
14
|
end
|
15
15
|
|
16
|
-
if Endeca.
|
16
|
+
if Endeca.benchmark?
|
17
17
|
def perform
|
18
18
|
raise RequestError, endeca_error[:message] if endeca_error?
|
19
19
|
Endeca.increase_metric(:request_count, 1)
|
@@ -25,7 +25,7 @@ module Endeca
|
|
25
25
|
return response
|
26
26
|
end
|
27
27
|
end
|
28
|
-
|
28
|
+
|
29
29
|
def response
|
30
30
|
@response ||= handle_response(get_response)
|
31
31
|
end
|
@@ -38,7 +38,7 @@ module Endeca
|
|
38
38
|
end
|
39
39
|
|
40
40
|
private
|
41
|
-
|
41
|
+
|
42
42
|
def endeca_error
|
43
43
|
method_response = response["methodResponse"]
|
44
44
|
fault = method_response && method_response["fault"]
|
@@ -54,21 +54,32 @@ module Endeca
|
|
54
54
|
!endeca_error.nil?
|
55
55
|
end
|
56
56
|
|
57
|
-
if Endeca.
|
57
|
+
if Endeca.benchmark?
|
58
|
+
def get_response #:nodoc:
|
59
|
+
Endeca.log "ENDECA ADAPTER REQUEST"
|
60
|
+
Endeca.log " parameters => " + @query.inspect
|
61
|
+
Endeca.log " uri => " + uri.to_s
|
62
|
+
Endeca.bm(:request_time, "#{@path} #{@query.inspect}") do
|
63
|
+
begin
|
64
|
+
Curl::Easy.perform(uri.to_s) do |curl|
|
65
|
+
curl.timeout = Endeca.timeout
|
66
|
+
end
|
67
|
+
rescue => e
|
68
|
+
raise RequestError, e.message
|
69
|
+
end
|
70
|
+
end
|
71
|
+
end
|
72
|
+
elsif Endeca.debug?
|
58
73
|
def get_response #:nodoc:
|
59
|
-
|
60
|
-
|
61
|
-
|
62
|
-
|
63
|
-
|
64
|
-
|
65
|
-
|
66
|
-
|
67
|
-
|
68
|
-
raise RequestError, e.message
|
69
|
-
end
|
70
|
-
end
|
71
|
-
end
|
74
|
+
Endeca.log "ENDECA ADAPTER REQUEST"
|
75
|
+
Endeca.log " parameters => " + @query.inspect
|
76
|
+
Endeca.log " uri => " + uri.to_s
|
77
|
+
Curl::Easy.perform(uri.to_s) do |curl|
|
78
|
+
curl.timeout = Endeca.timeout
|
79
|
+
end
|
80
|
+
rescue => e
|
81
|
+
raise RequestError, e.message
|
82
|
+
end
|
72
83
|
else
|
73
84
|
def get_response #:nodoc:
|
74
85
|
Curl::Easy.perform(uri.to_s) do |curl|
|
@@ -78,9 +89,8 @@ module Endeca
|
|
78
89
|
raise RequestError, e.message
|
79
90
|
end
|
80
91
|
end
|
81
|
-
|
82
|
-
if Endeca.
|
83
|
-
|
92
|
+
|
93
|
+
if Endeca.benchmark?
|
84
94
|
def handle_response(response) #:nodoc:
|
85
95
|
case response.response_code.to_s
|
86
96
|
when "200"
|
@@ -110,12 +120,12 @@ module Endeca
|
|
110
120
|
end
|
111
121
|
end
|
112
122
|
|
113
|
-
|
114
|
-
|
115
|
-
|
116
|
-
|
123
|
+
def query_string
|
124
|
+
@path.match(/\?(.*)$/)
|
125
|
+
query_string_parts = [$1, @query.to_endeca_params]
|
126
|
+
query_string_parts.reject!{ |s| s.nil? || s.empty? }
|
117
127
|
|
118
|
-
|
119
|
-
|
128
|
+
query_string_parts.empty? ? nil : query_string_parts.join('&')
|
129
|
+
end
|
120
130
|
end
|
121
131
|
end
|
@@ -10,7 +10,7 @@ describe Endeca::Benchmarking do
|
|
10
10
|
@logger = mock('Logger')
|
11
11
|
|
12
12
|
Endeca.stub!(:logger).and_return(@logger)
|
13
|
-
Endeca.stub!(:
|
13
|
+
Endeca.stub!(:benchmark => true)
|
14
14
|
|
15
15
|
Benchmark.stub!(:ms => 1)
|
16
16
|
end
|
@@ -23,8 +23,6 @@ describe Endeca::Benchmarking do
|
|
23
23
|
|
24
24
|
describe "#add_bm_detail" do
|
25
25
|
it "should add info to the current thread" do
|
26
|
-
Endeca.stub!(:analyze?).and_return(true)
|
27
|
-
|
28
26
|
Endeca.send(:add_bm_detail, :metric, 1.1, 'query query')
|
29
27
|
|
30
28
|
Thread.current[:endeca]["metric_detail"][0].should == {:detail => "query query", :time => 1.1}
|
data/spec/endeca_spec.rb
CHANGED
metadata
CHANGED
@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
|
|
5
5
|
segments:
|
6
6
|
- 1
|
7
7
|
- 5
|
8
|
-
-
|
9
|
-
version: 1.5.
|
8
|
+
- 1
|
9
|
+
version: 1.5.1
|
10
10
|
platform: ruby
|
11
11
|
authors:
|
12
12
|
- Primedia Team
|
@@ -14,7 +14,7 @@ autorequire:
|
|
14
14
|
bindir: bin
|
15
15
|
cert_chain: []
|
16
16
|
|
17
|
-
date: 2010-
|
17
|
+
date: 2010-06-03 00:00:00 -04:00
|
18
18
|
default_executable:
|
19
19
|
dependencies:
|
20
20
|
- !ruby/object:Gem::Dependency
|
@@ -137,18 +137,18 @@ signing_key:
|
|
137
137
|
specification_version: 3
|
138
138
|
summary: Endeca adapter for use with the Endeca Bridge
|
139
139
|
test_files:
|
140
|
-
- spec/endeca_spec.rb
|
141
140
|
- spec/core_ext_spec.rb
|
142
|
-
- spec/endeca/
|
143
|
-
- spec/endeca/readers_spec.rb
|
144
|
-
- spec/endeca/request_spec.rb
|
145
|
-
- spec/endeca/transformer_spec.rb
|
141
|
+
- spec/endeca/benchmarking_spec.rb
|
146
142
|
- spec/endeca/breadcrumb_spec.rb
|
147
|
-
- spec/endeca/
|
143
|
+
- spec/endeca/dimension_spec.rb
|
144
|
+
- spec/endeca/document_collection_spec.rb
|
148
145
|
- spec/endeca/document_spec.rb
|
149
|
-
- spec/endeca/
|
146
|
+
- spec/endeca/logging_spec.rb
|
150
147
|
- spec/endeca/map_spec.rb
|
148
|
+
- spec/endeca/readers_spec.rb
|
151
149
|
- spec/endeca/refinement_dimension_spec.rb
|
152
|
-
- spec/endeca/
|
153
|
-
- spec/endeca/
|
150
|
+
- spec/endeca/refinement_spec.rb
|
151
|
+
- spec/endeca/request_spec.rb
|
152
|
+
- spec/endeca/transformer_spec.rb
|
153
|
+
- spec/endeca_spec.rb
|
154
154
|
- spec/spec_helper.rb
|