inquisitio 1.1.1 → 1.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2441b583d2147a1ae532629e234864e41e647559
-  data.tar.gz: 27392ff3783c2a60312f24d4a20e9da16d87bede
+  metadata.gz: a82ff5d2d9e82c66a70e7f562fe341dbcf801132
+  data.tar.gz: 001c23a1eb0cc0bda0312c5b0e750823c9de5ef1
 SHA512:
-  metadata.gz: aa1af91095a8da0800a5f66c5deef6c328d17c31bdd2c3005b47081dc1a612e9fc3088da6d8d2b8250f6815b2c14484779aa8f5793cfe81e3c060c90c312b2ce
-  data.tar.gz: 369761c5a03509d7ee631207243d29dbdb79eb743b15e90c1101f9b69238db2c1dc895fe437515070f25662e4a4035b98110317a341f4c25bfdd8158d2bfcd60
+  metadata.gz: 86d076089e49f4312e987ed5fb3aaa89a90eb998b5bcf6c95057ca240577de82b86b9092bb51a80ad56f7c2954e826d73ae364d7ae784424064434fe97e0388c
+  data.tar.gz: d3d5df92f1a49fa3fbe43c43a104966d16cd88eacf856f910c2352cf3665f428c566fa0ceb50c0ad9c9f90911a9f18dba0b7e0144c2abae949f99598e203b8ff

data/CHANGELOG.md

@@ -1,97 +1,77 @@
-1.1.1 / 2014-01-25
+1.1.2 / 2014-03-20
+[BUGFIX] Encode ampersands
 
+1.1.1 / 2014-01-25
 [BUGFIX] Sort records into result order before returning
 
 1.1.0 / 2014-01-24
-
 [BUGFIX] Use 'type' and 'id' fields instead of deprecated med_ fields
 
 0.2.0 / 2014-01-14
-
 [FEATURE] Add support for retrying query
 
 0.1.7 / 2013-12-13
-
 [FEATURE] Added dry-run configuration option to prevent data being sent to 
           CloudSearch when indexing.
 
 0.1.6 / 2013-11-05
-
 [BUGFIX] Correctly ignore nil fields when indexing.
 
 0.1.5 / 2013-11-05
-
 [FEATURE] Ignore nil fields when indexing.
 
 0.1.4 / 2013-11-05
-
 [FEATURE] Added logging when indexing.
 
 0.1.3 / 2013-10-31
-
 [BUGFIX] Fix namespacing issue with ActiveSupport::String
 
 0.1.2 / 2013-10-30
-
 [BUGFIX] Convert EXCON ERROR to Inquisitio Error
 
 0.1.1 / 2013-10-29 
-
 [FEATURE] Add pagination methods to match Kaminari
 
 0.1.0 / 2013-10-28
-
 [BUGFIX] Parse ids properly.
 
 0.0.13 / 2013-10-28
-
 [FEATURE] Implement Searcher#records
 [FEATURE] Implement Searcher#ids
 [FEATURE] Allow for Array-style method iteration
 [FEATURE] Changed syntax to match ActiveRecord style.
 
 0.0.12 / 2013-10-24
-
 [FEATURE] Allow filter values to be arrays.
 
 0.0.12 / 2013-10-24
-
 [FEATURE] Searcher now has default size read from configuration.
 [FEATURE] Searcher now performs simple sanatization of search queries.
 
 0.0.9 / Unreleased
-
 [FEATURE] Searcher now has id, records and results.
 [FEATURE] Refactor SearchUrlBuilder out of Searcher.
 
 0.0.8 / 2013-10-23
-
 [FEATURE] Extended searcher to handle arguments (for example, facet arguments).
 
 0.0.7 / 2013-10-23
-
 [FEATURE] Extended searcher to handle boolean queries.
 
 0.0.6 / 2013-10-23
-
 [FEATURE] Changed version of excon
 
 0.0.5 / 2013-10-22
-
 [FEATURE] Initial indexer created.
 
 0.0.4 / 2013-10-22
-
 [FEATURE] Return_fields is now optional in search call.
 
 0.0.3 / 2013-10-21
-
 [FEATURE] Added ability to perform search using Searcher class.
 
 0.0.2 / 2013-10-21
-
 [FEATURE] Added Document class representing AWS SDF document.
 
 0.0.1 / 2013-10-21
-
 [FEATURE] Added configuration, logger and error classes.

data/README.md

@@ -4,7 +4,7 @@
 [![Dependencies](https://gemnasium.com/meducation/inquisitio.png?travis)](https://gemnasium.com/meducation/inquisitio)
 [![Code Climate](https://codeclimate.com/github/meducation/inquisitio.png)](https://codeclimate.com/github/meducation/inquisitio)
 
-Inquisitio is a ruby wrapper around Amazon Cloud Search. It is currently under active development.
+Inquisitio is a ruby wrapper around Amazon Cloud Search. 
 
 ## Installation
 
@@ -42,6 +42,7 @@ These individuals have come up with the ideas and written the code that made thi
 - [Jeremy Walker](http://github.com/iHID)
 - [Malcolm Landon](http://github.com/malcyL)
 - [Charles Care](http://github.com/ccare)
+- [Rob Styles](http://github.com/mmmmmrob)
 
 ## Licence
 

data/lib/inquisitio/search_url_builder.rb

@@ -24,7 +24,7 @@ module Inquisitio
 
     private
     def simple_query
-      "q=#{URI.encode(@query.first.gsub('\'',''))}"
+      "q=#{URI.encode(sanitise(@query.first)).gsub('&', '%26')}"
     end
 
     def boolean_query
@@ -49,11 +49,11 @@ module Inquisitio
         end
       end
 
-      "bq=#{URI.encode("(and #{query_blocks.join(' ')})")}"
+      "bq=#{URI.encode("(and #{query_blocks.join(' ')})").gsub('&', '%26')}"
     end
 
     def sanitise(value)
-      value.to_s.gsub('\'','');
+      value.to_s.gsub('\'','')
     end
 
     def return_fields_query_string

data/lib/inquisitio/version.rb

@@ -1,3 +1,3 @@
 module Inquisitio
-  VERSION = "1.1.1"
+  VERSION = "1.1.2"
 end

data/test/search_url_builder_test.rb

@@ -15,18 +15,25 @@ module Inquisitio
       assert_equal expected_url, url
     end
 
+    def test_create_correct_search_url_with_ampersand
+      url = SearchUrlBuilder.build(query: ['Star&Wars'])
+      expected_url = 'http://my.search-endpoint.com/2011-02-01/search?q=Star%26Wars&size=10'
+      assert_equal expected_url, url
+    end
+
     def test_create_correct_search_url_with_multiple_criteria_should_create_boolean_query
       url = SearchUrlBuilder.build(query: ['Star Wars', 'Episode One'])
       expected_url = 'http://my.search-endpoint.com/2011-02-01/search?bq=(and%20(or%20\'Star%20Wars\'%20\'Episode%20One\'))&size=10'
       assert_equal expected_url, url
     end
 
-    def test_create_correct_search_url_with_multiple_criteria
-      url = SearchUrlBuilder.build(query: ['Star Wars'])
-      expected_url = 'http://my.search-endpoint.com/2011-02-01/search?q=Star%20Wars&size=10'
+    def test_create_correct_search_url_with_multiple_criteria_with_ampersand
+      url = SearchUrlBuilder.build(query: ['Star&Wars', 'Episode One'])
+      expected_url = 'http://my.search-endpoint.com/2011-02-01/search?bq=(and%20(or%20\'Star%26Wars\'%20\'Episode%20One\'))&size=10'
       assert_equal expected_url, url
     end
 
+
     def test_create_correct_search_url_including_return_fields
       url = SearchUrlBuilder.build(query: ['Star Wars'], return_fields: [ 'title', 'year', '%' ] )
       expected_url = 'http://my.search-endpoint.com/2011-02-01/search?q=Star%20Wars&return-fields=title,year,%25&size=10'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: inquisitio
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.1.2
 platform: ruby
 authors:
 - Jeremy Walker
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-25 00:00:00.000000000 Z
+date: 2014-03-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: excon