endeca 1.3.8 → 1.4.0

data/lib/endeca/transformer.rb

@@ -26,10 +26,8 @@ module Endeca
     # Use the mappings hash to replace domain level query query_options with
     # their Endeca equivalent.
     def transform_query_options(query_options)
-      # {"apartments" => true}
       query = query_options.symbolize_keys
-      # {:apartments => true}
-      query.each do |key, _|
+      query.keys.each do |key|
         if mapping = mappings[key]
           new_options = mapping.perform(query)
           query.delete(key)

data/spec/core_ext_spec.rb

@@ -1,5 +1,25 @@
 require File.join(File.dirname(__FILE__), %w[spec_helper])
 
+class TestClass
+  def self.desire_it
+    desire 'mylib'
+  end
+end
+
+describe TestClass do
+  describe "#desire" do
+    it "should require lib" do
+      TestClass.should_receive(:require).with('mylib').and_return(true)
+      TestClass.desire_it
+    end
+
+    it "should rescue LoadError and return false" do
+      TestClass.should_receive(:require).with('mylib').and_raise(LoadError.new('mylib not found'))
+      TestClass.desire_it.should == false
+    end
+  end
+end
+
 describe Array do
   describe "#to_endeca_params" do
     it "should join the elements with ampersand" do
@@ -30,6 +50,12 @@ describe Benchmark do
       Benchmark.ms.should == 1000
     end
   end
+
+  describe "for version < 1.8.7" do
+    it "should remove realtime method" do
+      #Object.should_receive(:ruby_version).and_return('1.8.6')
+    end
+  end
 end
 
 describe Hash do

data/spec/endeca/breadcrumb_spec.rb

@@ -44,13 +44,6 @@ describe Endeca::Breadcrumb do
     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

data/spec/endeca/request_spec.rb

@@ -1,6 +1,3 @@
-require 'rubygems'
-require 'fake_web'
-require 'json'
 require File.join(File.dirname(__FILE__), %w[.. spec_helper])
 
 describe Endeca::Request do
@@ -30,10 +27,18 @@ describe Endeca::Request do
       @request.perform
     end    
 
+    describe "get response" do
+      it "shouse raise RequestError on exception" do
+        Curl::Easy.stub!(:perform).and_raise("Error happened")
+        lambda {@request.perform}.should raise_error(Endeca::RequestError, "Error happened")
+      end
+    end
     describe "when successful" do
       before do
+        @response_json = "{\"foo\":\"bar\"}"
         @response_hash = {"foo" => "bar"}
-        FakeWeb.register_uri(@path, :string => @response_hash.to_json)
+        @curl_obj = mock(:response_code => 200, :body_str => @response_json)
+        Curl::Easy.stub!(:perform).and_return(@curl_obj)
       end
 
       it "should return the parsed JSON of the response body" do
@@ -44,16 +49,25 @@ describe Endeca::Request do
         lambda { @request.perform }.should_not raise_error
       end
     end
-
+    
     describe "when unsuccessful" do
       before do
-        FakeWeb.register_uri(@path, :status => ['404', 'Not Found'])
+        @curl_obj = mock(:response_code => 404)
+        Curl::Easy.stub!(:perform).and_return(@curl_obj)
       end
-
+      
       it "should raise an Endeca::RequestError" do
-        lambda {@request.perform}.should raise_error(Endeca::RequestError, '404 "Not Found"')
+        lambda {@request.perform}.should raise_error(Endeca::RequestError, "404 HTTP Error")
       end
+    
+    end
 
+    describe "Yajl parser" do
+      it "should return Endeca::RequestError when malformed JSON is returned" do
+        @curl_obj = mock(:response_code => 200, :body_str => "!@!@#@SDSD}")
+        Curl::Easy.stub!(:perform).and_return(@curl_obj)
+        lambda {@request.perform}.should raise_error(Endeca::RequestError)
+      end
     end
     
     describe "when the response contains an error hash" do
@@ -63,45 +77,34 @@ describe Endeca::Request do
           "methodResponse"=>
             {"fault"=>
               {"value"=>
-                {"faultCode"=>"-1",
-                 "faultString"=> @error_message}}}}
-        @error_request = Endeca::Request.new(@path)
-        @error_request.stub!(:handle_response).and_return(@error_response)
+                {"faultCode"=>"-1", "faultString"=> @error_message}
+              }
+            }
+        }
+@error_request = Endeca::Request.new(@path)
+@error_request.stub!(:handle_response).and_return(@error_response)
       end
-      
+         
       it "should raise an Endeca::RequestError" do
         lambda { @error_request.perform }.should raise_error(Endeca::RequestError, @error_message)
       end
     end
 
-  end
+  end # perform
 
   describe '#uri' do
-    
     describe "with a hash of query options" do
-      
       it "should append the query options onto the url" do
         query = {:foo => :bar}
-        Endeca::Request.new(@path, query).uri.query.should == query.to_endeca_params
-      end
-      
-    end
-    
-    describe "with a query with '/_/' in it" do
-      
-      it "should not insert the ? before the query" do
-        query = "/Beds-2/Baths-3/Dishwasher/_/N=324432/Ne=listing?test=true"
-        Endeca::Request.new(@path, query).uri.to_s.should == "#{@path}#{query}"
+        URI.parse(Endeca::Request.new(@path, query).uri).query.should == query.to_endeca_params
       end
-      
     end
-    
   end
 
   describe "with a string of query options" do
     it "should append the query options string onto the url" do
       query = 'N=56'
-      Endeca::Request.new(@path, query).uri.query.should == query.to_endeca_params
+      URI.parse(Endeca::Request.new(@path, query).uri).query.should == query.to_endeca_params
     end
   end
 end

data/spec/endeca_spec.rb

@@ -14,24 +14,6 @@ describe Endeca do
     Endeca.escape(query).should == 'N=5875%205922&Nf=geocode%7CGCLT%2026.121900,-80.143600%2032.18688&Nu=mgtcoid&Ns=searchonly%7C0%7C%7Cisapartment%7C1%7C%7Csortorder%7C0&Ntk=showapartment%7Cmgtcologodisplay&F=cityseopath%3A1%7Cmediummgtcologo%3A1%7Cmgtcodescription%3A1%7Cmgtcoid%3A1%7Cmgtcologo%3A1%7Cmgtcologodisplay%3A1%7Cmgtconame%3A1%7Cmsa_code%3A1%7Cpropertycity%3A1%7Cpropertystatelong%3A1%7Csmallmgtcologo%3A1%7Cwebtollfree%3A1%7Cmvtphone%3A1&Ntt=1%7C1&M=recs_per_page%3A99999%7Cexpand_all_dims%3A0'
 
   end
-
-  describe "#get_timer" do
-    it "without system_timer available returns Timeout" do
-      Endeca.should_receive(:require).
-        with('system_timer').and_raise(LoadError)
-      Endeca.should_receive(:require).
-        with('timeout').and_return(true)
-
-      Endeca.send(:get_timer).should == Timeout
-    end
-
-    it "will return SystemTimer if available" do
-      Endeca.should_receive(:require).
-        with('system_timer').and_return(true)
-
-      Endeca.send(:get_timer).should == SystemTimer
-    end
-  end
 end
 
 # EOF

metadata

@@ -1,47 +1,43 @@
 --- !ruby/object:Gem::Specification 
 name: endeca
 version: !ruby/object:Gem::Version 
-  version: 1.3.8
+  version: 1.4.0
 platform: ruby
 authors: 
-- Rein Henrichs
-- Andy Stone
+- Primedia Team
 autorequire: 
 bindir: bin
 cert_chain: []
 
-date: 2009-11-13 00:00:00 -05:00
+date: 2010-02-19 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: bones
+  name: rspec
   type: :development
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 2.4.0
+        version: "0"
     version: 
-description: An Endeca client library for Ruby.
+description: 
 email: ""
 executables: []
 
 extensions: []
 
 extra_rdoc_files: 
-- History.txt
-- Manifest.txt
 - README.rdoc
 files: 
-- History.txt
+- .gitignore
 - 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/benchmarking.rb
@@ -73,26 +69,13 @@ files:
 - spec/rcov.opts
 - spec/spec.opts
 - spec/spec_helper.rb
-- tasks/ann.rake
-- tasks/bones.rake
-- tasks/gem.rake
-- tasks/git.rake
-- tasks/notes.rake
-- tasks/post_load.rake
-- tasks/rdoc.rake
-- tasks/rubyforge.rake
-- tasks/setup.rb
-- tasks/spec.rake
-- tasks/svn.rake
-- tasks/test.rake
 has_rdoc: true
 homepage: http://github.com/primedia/endeca-ruby
 licenses: []
 
 post_install_message: 
 rdoc_options: 
-- --main
-- README.rdoc
+- --charset=UTF-8
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
@@ -109,10 +92,23 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   version: 
 requirements: []
 
-rubyforge_project: endeca
+rubyforge_project: 
 rubygems_version: 1.3.5
 signing_key: 
 specification_version: 3
-summary: An Endeca client library for Ruby
-test_files: []
-
+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/breadcrumb_spec.rb
+- spec/endeca/document_spec.rb
+- spec/endeca/refinement_spec.rb
+- spec/endeca/map_spec.rb
+- spec/endeca/refinement_dimension_spec.rb
+- spec/endeca/dimension_spec.rb
+- spec/endeca/benchmarking_spec.rb
+- spec/spec_helper.rb

data/History.txt

@@ -1,4 +0,0 @@
-== 0.1.0 / 2009-01-20
-
-* 1 major enhancement
-  * Birthday!

data/lib/class_to_proc.rb

@@ -1,5 +0,0 @@
-module ClassToProc
-  def to_proc
-    proc(&method(:new))
-  end
-end

data/tasks/ann.rake

@@ -1,80 +0,0 @@
-
-begin
-  require 'bones/smtp_tls'
-rescue LoadError
-  require 'net/smtp'
-end
-require 'time'
-
-namespace :ann do
-
-  # A prerequisites task that all other tasks depend upon
-  task :prereqs
-
-  file PROJ.ann.file do
-    ann = PROJ.ann
-    puts "Generating #{ann.file}"
-    File.open(ann.file,'w') do |fd|
-      fd.puts("#{PROJ.name} version #{PROJ.version}")
-      fd.puts("    by #{Array(PROJ.authors).first}") if PROJ.authors
-      fd.puts("    #{PROJ.url}") if PROJ.url.valid?
-      fd.puts("    (the \"#{PROJ.release_name}\" release)") if PROJ.release_name
-      fd.puts
-      fd.puts("== DESCRIPTION")
-      fd.puts
-      fd.puts(PROJ.description)
-      fd.puts
-      fd.puts(PROJ.changes.sub(%r/^.*$/, '== CHANGES'))
-      fd.puts
-      ann.paragraphs.each do |p|
-        fd.puts "== #{p.upcase}"
-        fd.puts
-        fd.puts paragraphs_of(PROJ.readme_file, p).join("\n\n")
-        fd.puts
-      end
-      fd.puts ann.text if ann.text
-    end
-  end
-
-  desc "Create an announcement file"
-  task :announcement => ['ann:prereqs', PROJ.ann.file]
-
-  desc "Send an email announcement"
-  task :email => ['ann:prereqs', PROJ.ann.file] do
-    ann = PROJ.ann
-    from = ann.email[:from] || Array(PROJ.authors).first || PROJ.email
-    to   = Array(ann.email[:to])
-
-    ### build a mail header for RFC 822
-    rfc822msg =  "From: #{from}\n"
-    rfc822msg << "To: #{to.join(',')}\n"
-    rfc822msg << "Subject: [ANN] #{PROJ.name} #{PROJ.version}"
-    rfc822msg << " (#{PROJ.release_name})" if PROJ.release_name
-    rfc822msg << "\n"
-    rfc822msg << "Date: #{Time.new.rfc822}\n"
-    rfc822msg << "Message-Id: "
-    rfc822msg << "<#{"%.8f" % Time.now.to_f}@#{ann.email[:domain]}>\n\n"
-    rfc822msg << File.read(ann.file)
-
-    params = [:server, :port, :domain, :acct, :passwd, :authtype].map do |key|
-      ann.email[key]
-    end
-
-    params[3] = PROJ.email if params[3].nil?
-
-    if params[4].nil?
-      STDOUT.write "Please enter your e-mail password (#{params[3]}): "
-      params[4] = STDIN.gets.chomp
-    end
-
-    ### send email
-    Net::SMTP.start(*params) {|smtp| smtp.sendmail(rfc822msg, from, to)}
-  end
-end  # namespace :ann
-
-desc 'Alias to ann:announcement'
-task :ann => 'ann:announcement'
-
-CLOBBER << PROJ.ann.file
-
-# EOF

data/tasks/bones.rake

@@ -1,20 +0,0 @@
-
-if HAVE_BONES
-
-namespace :bones do
-
-  desc 'Show the PROJ open struct'
-  task :debug do |t|
-    atr = if t.application.top_level_tasks.length == 2
-      t.application.top_level_tasks.pop
-    end
-
-    if atr then Bones::Debug.show_attr(PROJ, atr)
-    else Bones::Debug.show PROJ end
-  end
-
-end  # namespace :bones
-
-end  # HAVE_BONES
-
-# EOF

data/tasks/gem.rake

@@ -1,201 +0,0 @@
-
-require 'find'
-require 'rake/packagetask'
-require 'rubygems/user_interaction'
-require 'rubygems/builder'
-
-module Bones
-class GemPackageTask < Rake::PackageTask
-  # Ruby GEM spec containing the metadata for this package.  The
-  # name, version and package_files are automatically determined
-  # from the GEM spec and don't need to be explicitly provided.
-  #
-  attr_accessor :gem_spec
-
-  # Tasks from the Bones gem directory
-  attr_reader :bones_files
-
-  # Create a GEM Package task library.  Automatically define the gem
-  # if a block is given.  If no block is supplied, then +define+
-  # needs to be called to define the task.
-  #
-  def initialize(gem_spec)
-    init(gem_spec)
-    yield self if block_given?
-    define if block_given?
-  end
-
-  # Initialization tasks without the "yield self" or define
-  # operations.
-  #
-  def init(gem)
-    super(gem.name, gem.version)
-    @gem_spec = gem
-    @package_files += gem_spec.files if gem_spec.files
-    @bones_files = []
-
-    local_setup = File.join(Dir.pwd, %w[tasks setup.rb])
-    if !test(?e, local_setup)
-      Dir.glob(::Bones.path(%w[lib bones tasks *])).each {|fn| bones_files << fn}
-    end
-  end
-
-  # Create the Rake tasks and actions specified by this
-  # GemPackageTask.  (+define+ is automatically called if a block is
-  # given to +new+).
-  #
-  def define
-    super
-    task :prereqs
-    task :package => ['gem:prereqs', "#{package_dir_path}/#{gem_file}"]
-    file "#{package_dir_path}/#{gem_file}" => [package_dir_path] + package_files + bones_files do
-      when_writing("Creating GEM") {
-        chdir(package_dir_path) do
-          Gem::Builder.new(gem_spec).build
-          verbose(true) {
-            mv gem_file, "../#{gem_file}"
-          }
-        end
-      }
-    end
-
-    file package_dir_path => bones_files do
-      mkdir_p package_dir rescue nil
-
-      gem_spec.files = (gem_spec.files +
-          bones_files.map {|fn| File.join('tasks', File.basename(fn))}).sort
-
-      bones_files.each do |fn|
-        base_fn = File.join('tasks', File.basename(fn))
-        f = File.join(package_dir_path, base_fn)
-        fdir = File.dirname(f)
-        mkdir_p(fdir) if !File.exist?(fdir)
-        if File.directory?(fn)
-          mkdir_p(f)
-        else
-          raise "file name conflict for '#{base_fn}' (conflicts with '#{fn}')" if test(?e, f)
-          safe_ln(fn, f)
-        end
-      end
-    end
-  end
-  
-  def gem_file
-    if @gem_spec.platform == Gem::Platform::RUBY
-      "#{package_name}.gem"
-    else
-      "#{package_name}-#{@gem_spec.platform}.gem"
-    end
-  end
-end  # class GemPackageTask
-end  # module Bones
-
-namespace :gem do
-
-  PROJ.gem._spec = Gem::Specification.new do |s|
-    s.name = PROJ.name
-    s.version = PROJ.version
-    s.summary = PROJ.summary
-    s.authors = Array(PROJ.authors)
-    s.email = PROJ.email
-    s.homepage = Array(PROJ.url).first
-    s.rubyforge_project = PROJ.rubyforge.name
-
-    s.description = PROJ.description
-
-    PROJ.gem.dependencies.each do |dep|
-      s.add_dependency(*dep)
-    end
-
-    PROJ.gem.development_dependencies.each do |dep|
-      s.add_development_dependency(*dep)
-    end
-
-    s.files = PROJ.gem.files
-    s.executables = PROJ.gem.executables.map {|fn| File.basename(fn)}
-    s.extensions = PROJ.gem.files.grep %r/extconf\.rb$/
-
-    s.bindir = 'bin'
-    dirs = Dir["{#{PROJ.libs.join(',')}}"]
-    s.require_paths = dirs unless dirs.empty?
-
-    incl = Regexp.new(PROJ.rdoc.include.join('|'))
-    excl = PROJ.rdoc.exclude.dup.concat %w[\.rb$ ^(\.\/|\/)?ext]
-    excl = Regexp.new(excl.join('|'))
-    rdoc_files = PROJ.gem.files.find_all do |fn|
-                   case fn
-                   when excl; false
-                   when incl; true
-                   else false end
-                 end
-    s.rdoc_options = PROJ.rdoc.opts + ['--main', PROJ.rdoc.main]
-    s.extra_rdoc_files = rdoc_files
-    s.has_rdoc = true
-
-    if test ?f, PROJ.test.file
-      s.test_file = PROJ.test.file
-    else
-      s.test_files = PROJ.test.files.to_a
-    end
-
-    # Do any extra stuff the user wants
-    PROJ.gem.extras.each do |msg, val|
-      case val
-      when Proc
-        val.call(s.send(msg))
-      else
-        s.send "#{msg}=", val
-      end
-    end
-  end  # Gem::Specification.new
-
-  Bones::GemPackageTask.new(PROJ.gem._spec) do |pkg|
-    pkg.need_tar = PROJ.gem.need_tar
-    pkg.need_zip = PROJ.gem.need_zip
-  end
-
-  desc 'Show information about the gem'
-  task :debug => 'gem:prereqs' do
-    puts PROJ.gem._spec.to_ruby
-  end
-
-  desc 'Write the gemspec '
-  task :spec => 'gem:prereqs' do
-    File.open("#{PROJ.name}.gemspec", 'w') do |f|
-      f.write PROJ.gem._spec.to_ruby
-    end
-  end
-
-  desc 'Install the gem'
-  task :install => [:clobber, 'gem:package'] do
-    sh "#{SUDO} #{GEM} install --local pkg/#{PROJ.gem._spec.full_name}"
-
-    # use this version of the command for rubygems > 1.0.0
-    #sh "#{SUDO} #{GEM} install --no-update-sources pkg/#{PROJ.gem._spec.full_name}"
-  end
-
-  desc 'Uninstall the gem'
-  task :uninstall do
-    installed_list = Gem.source_index.find_name(PROJ.name)
-    if installed_list and installed_list.collect { |s| s.version.to_s}.include?(PROJ.version) then
-      sh "#{SUDO} #{GEM} uninstall --version '#{PROJ.version}' --ignore-dependencies --executables #{PROJ.name}"
-    end
-  end
-
-  desc 'Reinstall the gem'
-  task :reinstall => [:uninstall, :install]
-
-  desc 'Cleanup the gem'
-  task :cleanup do
-    sh "#{SUDO} #{GEM} cleanup #{PROJ.gem._spec.name}"
-  end
-end  # namespace :gem
-
-
-desc 'Alias to gem:package'
-task :gem => 'gem:package'
-
-task :clobber => 'gem:clobber_package'
-remove_desc_for_task 'gem:clobber_package'
-
-# EOF