primedia-endeca 0.9.21 → 0.9.22

data/Rakefile

@@ -44,5 +44,7 @@ PROJ.url = 'http://github.com/primedia/endeca-ruby'
 PROJ.version = Endeca::VERSION
 PROJ.rubyforge.name = 'endeca'
 PROJ.readme_file = "README.rdoc"
+PROJ.exclude << '.swp'
+PROJ.exclude << '.gitignore'
 
 # EOF

data/endeca.gemspec

@@ -1,32 +1,34 @@
+# -*- encoding: utf-8 -*-
+
 Gem::Specification.new do |s|
   s.name = %q{endeca}
-  s.version = "0.9.21"
+  s.version = "0.9.22"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Rein Henrichs", "Andy Stone"]
-  s.date = %q{2009-02-09}
+  s.date = %q{2009-02-10}
   s.description = %q{An Endeca client library for Ruby.}
   s.email = %q{}
-  s.extra_rdoc_files = ["History.txt", "Manifest.txt", "README.rdoc"]
-  s.files = [".gitignore", "History.txt", "Manifest.txt", "README.rdoc", "Rakefile", "endeca.gemspec", "example/benchmark.rb", "example/listing.rb", "lib/class_to_proc.rb", "lib/core_ext.rb", "lib/endeca.rb", "lib/endeca/breadcrumb.rb", "lib/endeca/breadcrumbs.rb", "lib/endeca/dimension.rb", "lib/endeca/document.rb", "lib/endeca/document_collection.rb", "lib/endeca/map.rb", "lib/endeca/readers.rb", "lib/endeca/refinement.rb", "lib/endeca/request.rb", "lib/endeca/transformer.rb", "spec/core_ext_spec.rb", "spec/endeca/breadcrumb_spec.rb", "spec/endeca/dimension_spec.rb", "spec/endeca/document_collection_spec.rb", "spec/endeca/document_spec.rb", "spec/endeca/map_spec.rb", "spec/endeca/readers_spec.rb", "spec/endeca/refinement_spec.rb", "spec/endeca/request_spec.rb", "spec/endeca/transformer_spec.rb", "spec/endeca_spec.rb", "spec/rcov.opts", "spec/spec.opts", "spec/spec_helper.rb"]
+  s.extra_rdoc_files = ["History.txt", "README.rdoc"]
+  s.files = ["History.txt", "Manifest.txt", "README.rdoc", "Rakefile", "endeca.gemspec", "example/benchmark.rb", "example/listing.rb", "lib/class_to_proc.rb", "lib/core_ext.rb", "lib/endeca.rb", "lib/endeca/dimension.rb", "lib/endeca/document.rb", "lib/endeca/document_collection.rb", "lib/endeca/map.rb", "lib/endeca/readers.rb", "lib/endeca/refinement.rb", "lib/endeca/request.rb", "lib/endeca/transformer.rb", "spec/core_ext_spec.rb", "spec/endeca/dimension_spec.rb", "spec/endeca/document_collection_spec.rb", "spec/endeca/document_spec.rb", "spec/endeca/map_spec.rb", "spec/endeca/readers_spec.rb", "spec/endeca/refinement_spec.rb", "spec/endeca/request_spec.rb", "spec/endeca/transformer_spec.rb", "spec/endeca_spec.rb", "spec/rcov.opts", "spec/spec.opts", "spec/spec_helper.rb"]
   s.has_rdoc = true
   s.homepage = %q{http://github.com/primedia/endeca-ruby}
   s.rdoc_options = ["--main", "README.rdoc"]
   s.require_paths = ["lib"]
   s.rubyforge_project = %q{endeca}
-  s.rubygems_version = %q{1.2.0}
+  s.rubygems_version = %q{1.3.1}
   s.summary = %q{An Endeca client library for Ruby}
 
   if s.respond_to? :specification_version then
     current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     s.specification_version = 2
 
-    if current_version >= 3 then
-      s.add_development_dependency(%q<bones>, [">= 2.3.1"])
+    if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
+      s.add_development_dependency(%q<bones>, [">= 2.2.0"])
     else
-      s.add_dependency(%q<bones>, [">= 2.3.1"])
+      s.add_dependency(%q<bones>, [">= 2.2.0"])
     end
   else
-    s.add_dependency(%q<bones>, [">= 2.3.1"])
+    s.add_dependency(%q<bones>, [">= 2.2.0"])
   end
 end

data/lib/core_ext.rb

@@ -4,6 +4,26 @@ class Array
   end
 end
 
+require 'benchmark'
+class << Benchmark
+  # Earlier Ruby had a slower implementation.
+  if RUBY_VERSION < '1.8.7'
+    remove_method :realtime
+
+    def realtime
+      r0 = Time.now
+      yield
+      r1 = Time.now
+      r1.to_f - r0.to_f
+    end
+  end
+
+  def ms
+    1000 * realtime { yield }
+  end
+end
+
+
 class Class
   def inherited_property(accessor, default = nil)
     instance_eval <<-RUBY, __FILE__, __LINE__ + 1
@@ -16,7 +36,7 @@ class Class
 
       def get_#{accessor}
         return @#{accessor} if instance_variable_defined?(:@#{accessor})
-        superclass.send(:#{accessor})
+        superclass.send(:get_#{accessor})
       end
     RUBY
 

data/lib/endeca/request.rb

@@ -30,9 +30,14 @@ module Endeca
     def get_response #:nodoc:
       http = Net::HTTP.new(uri.host, uri.port)
       request = Net::HTTP::Get.new(uri.request_uri)
+      response = nil
 
-      Endeca.logger.debug "ENDECA REQUEST: uri=#{uri}" if Endeca.debug
-      http.request(request)
+      Endeca.log "ENDECA ADAPTER REQUEST"
+      Endeca.log "    parameters => " + @query.inspect
+      Endeca.log "           uri => " + uri.to_s
+      Endeca.bm  "  request time => " do response = http.request(request) end
+
+      return response
     end
 
     # Raises exception Net::XXX (http error code) if an http error occured

data/lib/endeca.rb

@@ -7,6 +7,8 @@ require 'activesupport'
 $:.unshift(File.dirname(__FILE__))
 require 'core_ext'
 require 'class_to_proc'
+require 'endeca/logging'
+require 'endeca/benchmarking'
 require 'endeca/readers'
 require 'endeca/map'
 require 'endeca/transformer'
@@ -19,9 +21,11 @@ require 'endeca/document_collection'
 require 'endeca/document'
 
 module Endeca
+  extend Benchmarking
+  extend Logging
 
   # :stopdoc:
-  VERSION = '0.9.21'
+  VERSION = '0.9.22'
   # :startdoc:
 
   # Returns the version string for the library.
@@ -32,12 +36,14 @@ module Endeca
 
   # Set Endeca.debug = true to turn on query logging
   class << self
-    attr_accessor :debug
     attr_accessor :logger
+    attr_accessor :debug
+    attr_accessor :benchmark
   end
 
-  self.debug  = false
   self.logger = Logger.new(STDOUT)
+  self.debug  = false
+  self.benchmark  = false
   
   # Endeca URIs require colons to be escaped
   def self.escape(str)

data/spec/endeca/document_spec.rb

@@ -303,14 +303,6 @@ describe Endeca::Document do
 
             @current_query_options = {:name => 'bar', :new_name => 'foo'}
           end
-
-          it "should transform the new value with the current value" do
-            pending("Not sure of the use case.") do
-              expected_name = "foo|bar"
-              Endeca::Document.transform_query_options(@current_query_options).
-                should == {:new_name => expected_name}
-            end
-          end
         end
       end
     end

data/spec/endeca/map_spec.rb

@@ -101,10 +101,10 @@ describe Endeca::Map do
   end
 
   describe "#transform" do
-    it "should execute the transformation block on the query"
-      map = Endeca::Map.new(:field_list)
-      map.into(:F).transform do |fields_array|
+    it "should execute the transformation block on the query" do
+      map = Endeca::Map.new(:field_list, :F).transform do |fields_array|
         fields_array.collect{|field| "#{field.to_s}:1"}.join('|')
+      end
       map.perform(:field_list => [:first_name, :last_name, :email]).
         should == {:F => "first_name:1|last_name:1|email:1"}
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: primedia-endeca
 version: !ruby/object:Gem::Version 
-  version: 0.9.21
+  version: 0.9.22
 platform: ruby
 authors: 
 - Rein Henrichs
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-02-09 00:00:00 -08:00
+date: 2009-02-10 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -20,7 +20,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 2.3.1
+        version: 2.2.0
     version: 
 description: An Endeca client library for Ruby.
 email: ""
@@ -30,10 +30,8 @@ extensions: []
 
 extra_rdoc_files: 
 - History.txt
-- Manifest.txt
 - README.rdoc
 files: 
-- .gitignore
 - History.txt
 - Manifest.txt
 - README.rdoc
@@ -44,8 +42,6 @@ files:
 - lib/class_to_proc.rb
 - lib/core_ext.rb
 - lib/endeca.rb
-- lib/endeca/breadcrumb.rb
-- lib/endeca/breadcrumbs.rb
 - lib/endeca/dimension.rb
 - lib/endeca/document.rb
 - lib/endeca/document_collection.rb
@@ -55,7 +51,6 @@ files:
 - lib/endeca/request.rb
 - lib/endeca/transformer.rb
 - spec/core_ext_spec.rb
-- spec/endeca/breadcrumb_spec.rb
 - spec/endeca/dimension_spec.rb
 - spec/endeca/document_collection_spec.rb
 - spec/endeca/document_spec.rb

data/.gitignore

@@ -1,7 +0,0 @@
-*.swp
-.swn
-.swp
-.DS_Store
-coverage/
-pkg/
-doc/

data/lib/endeca/breadcrumb.rb

@@ -1,42 +0,0 @@
-module Endeca
-  
-  class Breadcrumb
-    extend Readers
-
-    def self.create(raw)
-      name = raw['Type']
-      breadcrumb_class = self
-
-      if name    
-        unless Breadcrumbs.include?(name)
-          raise Breadcrumbs::TypeError, "Unknown breadcrumb type: #{name.inspect}" 
-        end
-        breadcrumb_class = Breadcrumbs[name]
-      end
-
-      breadcrumb_class.new(raw)
-    end
-    
-    def self.to_proc
-      proc(&method(:create))
-    end
-
-    attr_reader :raw
-    def initialize(raw={})
-      @raw = raw
-    end
-    alias_method :attributes, :raw
-    
-    reader 'Type' => :type    
-    def name; '' end
-
-    def ==(other)
-      name == other.name
-    end
-
-    def inspect
-      "#<#{self.class}=0x#{self.object_id.to_s(16)} name=#{name.inspect}>"
-    end
-
-  end
-end

data/lib/endeca/breadcrumbs.rb

@@ -1,13 +0,0 @@
-module Endeca
-  module Breadcrumbs
-    class TypeError < StandardError; end
-    
-    def self.include?(klass)
-      self.const_defined?(klass)
-    end
-    
-    def self.[](klass)
-      self.const_get(klass)
-    end
-  end
-end

data/spec/endeca/breadcrumb_spec.rb

@@ -1,90 +0,0 @@
-require File.join(File.dirname(__FILE__), %w[.. spec_helper])
-
-module Endeca
-  module Breadcrumbs
-    class Navigation < Endeca::Breadcrumb
-    end
-  end
-end
-
-describe Endeca::Breadcrumb do
-  before do
-    @dimension_value = {
-      "DimValueID"   => "4343565665",
-      "RemovalLink"  => "N=",
-      "DimValueName" => "Apartment"
-    }
-    
-    @navigation_hash = { 
-      "Type"                 => "Navigation",
-      "DimensionName"        => "property type", 
-      "DimensionRemovalLink" => "N=", 
-      "DimensionValues"      => [@dimension_value] 
-    }
-
-    @dimensions = { "Dimensions" => [@navigation_hash] }
-    @breadcrumb = Endeca::Breadcrumb.new( @dimensions )
-  end
-  
-  describe ".create" do
-    before do
-      @navigation = Endeca::Breadcrumb.create(@navigation_hash)
-    end
-    
-    it "should create a breadcrumb of the appropriate type" do
-      Endeca::Breadcrumb.create(@navigation_hash).
-        should be_a_kind_of(Endeca::Breadcrumbs::Navigation)
-    end
-    
-    describe "with an invalid type" do
-      it do
-        creating_invalid_breadcrumb = lambda{Endeca::Breadcrumb.create({'Type' => 'Invalid'})}
-        creating_invalid_breadcrumb.should raise_error(Endeca::Breadcrumbs::TypeError)
-      end
-    end
-  end
-  
-  describe ".to_proc" do
-    it "should call create" do
-      Endeca::Breadcrumb.should_receive(:create).with(:obj)
-      [:obj].map(&Endeca::Breadcrumb)
-    end
-  end
-
-  describe '#==' do
-    it "should compare Breadcrumbs by name" do
-      doc_1, doc_2 = Endeca::Breadcrumb.new, Endeca::Breadcrumb.new
-      doc_1.stub!(:name).and_return('property type')
-      doc_2.stub!(:name).and_return('property type')
-      (doc_1 == doc_2).should be_true
-
-      doc_2.stub!(:name).and_return('something else')
-      (doc_1 == doc_2).should be_false
-    end
-  end
-
-  describe '#inspect' do
-    it "includes the class name" do
-      @breadcrumb.inspect.should include(Endeca::Breadcrumb.name)
-    end
-
-    it "includes the hex string of the object id" do
-      @breadcrumb.inspect.should include("0x#{@breadcrumb.object_id.to_s(16)}")
-    end
-
-    it "includes the inspected name" do
-      @breadcrumb.stub!(:name).and_return('A Name')
-      @breadcrumb.inspect.should include('name="A Name"')
-    end
-  end
-  
-  describe "#type" do
-    it "returns the Type value" do
-      Endeca::Breadcrumb.new('Type' => 'AType').type.should == 'AType'
-    end
-  end
-  
-  describe "#name" do
-    it {Endeca::Breadcrumb.new.name.should == ''}
-  end
-end