bento_search 1.5.0 → 2.0.0.rc1

data/test/search_engines/search_engine_test.rb

@@ -4,50 +4,50 @@ require 'test_helper'
 
 class SearchEngineTest < ActiveSupport::TestCase
   MockEngine = BentoSearch::MockEngine
-  
+
     test "takes configuration" do
       conf = Confstruct::Configuration.new( :foo => "foo", :bar => "bar", :top => {:next => "required key"} )
       engine = MockEngine.new(conf)
-      
+
       assert_not_nil engine.configuration
       assert_equal "foo", engine.configuration.foo
       assert_equal "bar", engine.configuration.bar
       assert_equal "required key", engine.configuration.top.next
     end
-    
+
     test "nested configuration with hash" do
       # possible bug in Confstruct make sure we're working around
-      # if needed. 
+      # if needed.
       # https://github.com/mbklein/confstruct/issues/14
       engine = MockEngine.new("top" => {"one" => "two"})
-      
-      assert_equal "two", engine.configuration.top.one       
+
+      assert_equal "two", engine.configuration.top.one
     end
-    
+
     test "nested required config key" do
       requires_class = Class.new(MockEngine) do
         def self.required_configuration
           ["required.mykey"]
         end
       end
-            
+
       assert_raise ArgumentError do
         requires_class.new
-      end      
-      
+      end
+
       assert_raise ArgumentError do
         requires_class.new(:requires => {})
       end
-      
+
       assert_raise ArgumentError do
         requires_class.new(:required => {:mykey => nil})
       end
-      
+
       assert_nothing_raised do
         requires_class.new(:required => {:mykey => "foo"})
       end
     end
-     
+
     test "merges default configuration" do
       @dummy_class = Class.new do
         include BentoSearch::SearchEngine
@@ -59,120 +59,132 @@ class SearchEngineTest < ActiveSupport::TestCase
           }
         end
       end
-      
+
       engine = @dummy_class.new( :two => "new", :array => ["one", "two"], :nested => {:two => "new"}, :required => {:mykey => "required key"} )
-      
+
       assert_kind_of Confstruct::Configuration, engine.configuration
       assert_equal "default"      , engine.configuration.one
       assert_equal "new"          , engine.configuration.two
       assert_equal "default"      , engine.configuration.nested.one
       assert_equal "new"          , engine.configuration.nested.two
-      assert_equal ["one", "two"] , engine.configuration.array      
+      assert_equal ["one", "two"] , engine.configuration.array
     end
-    
+
     test "no default configuration" do
       @dummy_class = Class.new do
         include BentoSearch::SearchEngine
       end
-      
+
       engine = @dummy_class.new( :one => "one" )
-      
+
       assert_kind_of Confstruct::Configuration, engine.configuration
       assert_equal "one", engine.configuration.one
     end
-      
+
     test "sets metadata on results" do
       engine = MockEngine.new(:id => "foo")
-      
+
       results = engine.search(:query => "cancer", :per_page => 20)
-      
+
       assert_present results.search_args
       assert_equal "foo", results.engine_id
-      
+
       pagination = results.pagination
       assert_present pagination
-      
+
       assert_equal 20, pagination.per_page
       assert_equal 1, pagination.current_page
       assert_equal 1, pagination.start_record
       assert_equal 20, pagination.end_record
       assert pagination.first_page?
-      
+
       assert_present pagination.total_pages
       assert_present pagination.count_records
-            
+
     end
-    
+
     test "sets metadata on items" do
-      engine = MockEngine.new(:id => "foo", :for_display => {:mykey => "value", :decorator => "Foo"})      
+      engine = MockEngine.new(:id => "foo", :for_display => {:mykey => "value", :decorator => "Foo"})
       results = engine.search(:query => "cancer")
       record = results.first
-      
+
       assert_present record.engine_id
       assert_present record.display_configuration
-      assert_present record.decorator      
+      assert_present record.decorator
     end
-    
+
     test "failed sets metadata on results" do
       engine = MockEngine.new(:id => "fail_engine", :error => {:message => "failed"}, :for_display => {:foo => "foo"})
-      
+
       results = engine.search(:query => "cancer", :per_page => 20)
-      
+
       assert          results.failed?
       assert_present  results.error
       assert_equal    "fail_engine", results.engine_id
       assert_present  results.search_args
-      assert_equal(  {:foo => "foo"}, results.display_configuration )       
+      assert_equal(  {:foo => "foo"}, results.display_configuration )
     end
-    
+
     test "auto rescued exception, with proper metadata" do
-      engine = MockEngine.new(:id => "raises", :raise_exception_class => 'TimeoutError', :for_display => {:foo => "foo"})
-      
+      engine = MockEngine.new(:id => "raises", :raise_exception_class => BentoSearch::RubyTimeoutClass.name, :for_display => {:foo => "foo"})
+
       results = engine.search("foo", :per_page => 20)
-      
+
       assert          results.failed?, "marked failed"
-      assert_present  results.error      
+      assert_present  results.error
+      assert_present  results.error[:exception]
       assert_equal    "raises", results.engine_id
       assert_present  results.search_args
       assert_equal    "foo", results.search_args[:query]
-      
+
       assert_equal(  {:foo => "foo"}, results.display_configuration )
     end
-      
-    
+
+    test "can set auto rescued exceptions on instance" do
+      engine = MockEngine.new(:id => "raises", :raise_exception_class => "StandardError", :for_display => {:foo => "foo"})
+      engine.auto_rescued_exceptions = [StandardError]
+
+      results = engine.search("foo", :per_page => 20)
+
+      assert          results.failed?, "marked failed"
+      assert_present  results.error
+      assert_present  results.error[:exception]
+    end
+
+
     test "has empty :for_display config" do
       engine = MockEngine.new
-      
+
       assert_not_nil engine.configuration.for_display
     end
-    
+
     test "error results still filled out okay" do
       engine = MockEngine.new(:error => {:msg => "forced error"}, :id => "test")
-      
+
       results = engine.search("foo")
-      
+
       assert_present results.search_args
       assert_equal "test", results.engine_id
-      
+
       pagination = nil
       assert_nothing_raised {  pagination = results.pagination  }
-      
+
       assert_present pagination
       assert_equal 0, pagination.count_records
-      
+
     end
-    
-    
+
+
     test "carries display configuration over to results" do
-      engine = MockEngine.new(:id => "foo", 
+      engine = MockEngine.new(:id => "foo",
         :for_display => {:foo => "bar", :nested => {"one" => "two"}}
       )
-      
+
       results = engine.search("foo")
 
       assert_present  results.display_configuration
-      assert_present  results.display_configuration.foo      
-      assert_present  results.display_configuration.nested.one                  
+      assert_present  results.display_configuration.foo
+      assert_present  results.display_configuration.nested.one
     end
-    
+
 end

data/test/support/atom.xsd.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8" ?>
-<xs:schema targetNamespace="http://www.w3.org/2005/Atom" elementFormDefault="qualified" 
+<xs:schema targetNamespace="http://www.w3.org/2005/Atom" elementFormDefault="qualified"
 	attributeFormDefault="unqualified"
 	xmlns:atom="http://www.w3.org/2005/Atom" xmlns:xs="http://www.w3.org/2001/XMLSchema">
 	<xs:annotation>
@@ -8,7 +8,7 @@
 				found here http://www.atomenabled.org/developers/syndication/atom-format-spec.php.
 			</xs:documentation>
 	</xs:annotation>
-	<xs:import namespace="http://www.w3.org/XML/1998/namespace" schemaLocation="http://www.w3.org/2001/03/xml.xsd" />
+	<xs:import namespace="http://www.w3.org/XML/1998/namespace" schemaLocation="./xml.xsd" />
 	<xs:annotation>
 		<xs:documentation>
 			An Atom document may have two root elements, feed and entry, as defined in section 2.
@@ -237,4 +237,4 @@
 		<xs:attribute ref="xml:lang" />
 		<xs:anyAttribute namespace="##other"/>
 	</xs:attributeGroup>
-</xs:schema>
+</xs:schema>

data/test/support/xml.xsd

@@ -0,0 +1,117 @@
+<?xml version='1.0'?>
+<!DOCTYPE xs:schema PUBLIC "-//W3C//DTD XMLSCHEMA 200102//EN" "XMLSchema.dtd" >
+<xs:schema targetNamespace="http://www.w3.org/XML/1998/namespace" xmlns:xs="http://www.w3.org/2001/XMLSchema" xml:lang="en">
+
+ <xs:annotation>
+  <xs:documentation>
+   See http://www.w3.org/XML/1998/namespace.html and
+   http://www.w3.org/TR/REC-xml for information about this namespace.
+
+    This schema document describes the XML namespace, in a form
+    suitable for import by other schema documents.  
+
+    Note that local names in this namespace are intended to be defined
+    only by the World Wide Web Consortium or its subgroups.  The
+    following names are currently defined in this namespace and should
+    not be used with conflicting semantics by any Working Group,
+    specification, or document instance:
+
+    base (as an attribute name): denotes an attribute whose value
+         provides a URI to be used as the base for interpreting any
+         relative URIs in the scope of the element on which it
+         appears; its value is inherited.  This name is reserved
+         by virtue of its definition in the XML Base specification.
+
+    lang (as an attribute name): denotes an attribute whose value
+         is a language code for the natural language of the content of
+         any element; its value is inherited.  This name is reserved
+         by virtue of its definition in the XML specification.
+  
+    space (as an attribute name): denotes an attribute whose
+         value is a keyword indicating what whitespace processing
+         discipline is intended for the content of the element; its
+         value is inherited.  This name is reserved by virtue of its
+         definition in the XML specification.
+
+    Father (in any context at all): denotes Jon Bosak, the chair of 
+         the original XML Working Group.  This name is reserved by 
+         the following decision of the W3C XML Plenary and 
+         XML Coordination groups:
+
+             In appreciation for his vision, leadership and dedication
+             the W3C XML Plenary on this 10th day of February, 2000
+             reserves for Jon Bosak in perpetuity the XML name
+             xml:Father
+  </xs:documentation>
+ </xs:annotation>
+
+ <xs:annotation>
+  <xs:documentation>This schema defines attributes and an attribute group
+        suitable for use by
+        schemas wishing to allow xml:base, xml:lang or xml:space attributes
+        on elements they define.
+
+        To enable this, such a schema must import this schema
+        for the XML namespace, e.g. as follows:
+        &lt;schema . . .>
+         . . .
+         &lt;import namespace="http://www.w3.org/XML/1998/namespace"
+                    schemaLocation="http://www.w3.org/2001/03/xml.xsd"/>
+
+        Subsequently, qualified reference to any of the attributes
+        or the group defined below will have the desired effect, e.g.
+
+        &lt;type . . .>
+         . . .
+         &lt;attributeGroup ref="xml:specialAttrs"/>
+ 
+         will define a type which will schema-validate an instance
+         element with any of those attributes</xs:documentation>
+ </xs:annotation>
+
+ <xs:annotation>
+  <xs:documentation>In keeping with the XML Schema WG's standard versioning
+   policy, this schema document will persist at
+   http://www.w3.org/2001/03/xml.xsd.
+   At the date of issue it can also be found at
+   http://www.w3.org/2001/xml.xsd.
+   The schema document at that URI may however change in the future,
+   in order to remain compatible with the latest version of XML Schema
+   itself.  In other words, if the XML Schema namespace changes, the version
+   of this document at
+   http://www.w3.org/2001/xml.xsd will change
+   accordingly; the version at
+   http://www.w3.org/2001/03/xml.xsd will not change.
+  </xs:documentation>
+ </xs:annotation>
+
+ <xs:attribute name="lang" type="xs:language">
+  <xs:annotation>
+   <xs:documentation>In due course, we should install the relevant ISO 2- and 3-letter
+         codes as the enumerated possible values . . .</xs:documentation>
+  </xs:annotation>
+ </xs:attribute>
+
+ <xs:attribute name="space" default="preserve">
+  <xs:simpleType>
+   <xs:restriction base="xs:NCName">
+    <xs:enumeration value="default"/>
+    <xs:enumeration value="preserve"/>
+   </xs:restriction>
+  </xs:simpleType>
+ </xs:attribute>
+
+ <xs:attribute name="base" type="xs:anyURI">
+  <xs:annotation>
+   <xs:documentation>See http://www.w3.org/TR/xmlbase/ for
+                     information about this attribute.</xs:documentation>
+  </xs:annotation>
+ </xs:attribute>
+
+ <xs:attributeGroup name="specialAttrs">
+  <xs:attribute ref="xml:base"/>
+  <xs:attribute ref="xml:lang"/>
+  <xs:attribute ref="xml:space"/>
+ </xs:attributeGroup>
+
+</xs:schema>

data/test/test_helper.rb

@@ -2,14 +2,25 @@
 ENV["RAILS_ENV"] = "test"
 
 require File.expand_path("../dummy/config/environment.rb",  __FILE__)
+ActiveRecord::Migrator.migrations_paths = [File.expand_path("../../test/dummy/db/migrate", __FILE__)]
 
-# we insist on minitest, when only the best will do. 
-# Rails will build on top of it if it's there. 
-require 'minitest/autorun'
-require 'minitest/unit'
-
+# we insist on minitest, when only the best will do.
+# Rails will build on top of it if it's there.
+require 'minitest/spec'
 require "rails/test_help"
 
+# Filter out Minitest backtrace while allowing backtrace from other libraries
+# to be shown.
+Minitest.backtrace_filter = Minitest::BacktraceFilter.new
+
+# We're not supposed to have to manually install rails-controller-testing, not
+# sure why we do.
+begin
+  require 'rails-controller-testing'
+  Rails::Controller::Testing.install
+rescue LoadError
+end
+
 Rails.backtrace_cleaner.remove_silencers!
 
 # Load support files
@@ -25,23 +36,23 @@ end
 # back. Useful for efficiency, also useful for
 # testing code against API's that not everyone
 # has access to -- the responses can be cached
-# and re-used. 
+# and re-used.
 require 'vcr'
 require 'webmock'
 
 # To allow us to do real HTTP requests in a VCR.turned_off, we
-# have to tell webmock to let us. 
+# have to tell webmock to let us.
 WebMock.allow_net_connect!
 
 VCR.configure do |c|
   c.cassette_library_dir = 'test/vcr_cassettes'
   # webmock needed for HTTPClient testing
-  c.hook_into :webmock 
+  c.hook_into :webmock
 end
 
 # Silly way to not have to rewrite all our tests if we
 # temporarily disable VCR, make VCR.use_cassette a no-op
-# instead of no-such-method. 
+# instead of no-such-method.
 if ! defined? VCR
   module VCR
     def self.use_cassette(*args)
@@ -50,9 +61,9 @@ if ! defined? VCR
   end
 end
 
-# re-open to add 
+# re-open to add
 # some custom assertions, that used to be in mini-test, or that
-# we wanted to add. 
+# we wanted to add.
 class ActiveSupport::TestCase
 
   def assert_present(object, msg = nil)
@@ -65,4 +76,4 @@ class ActiveSupport::TestCase
     assert object.blank?, msg
   end
 
-end
+end