[ARVADOS] updated: 330a46e91b4ceaefba2bcfc383931eb59c77d461

[git at public.curoverse.com]

Summary of changes:
 apps/workbench/Gemfile                             |  2 +-
 apps/workbench/Gemfile.lock                        |  4 +-
 .../controllers/collections_controller_test.rb     | 19 +++++++
 sdk/ruby/lib/arvados/keep.rb                       |  5 +-
 sdk/ruby/test/test_keep_manifest.rb                | 66 ++++++++++++++++++++++
 services/api/Gemfile                               |  2 +-
 services/api/Gemfile.lock                          | 16 +++---
 services/api/test/fixtures/collections.yml         | 29 +++++++++-
 .../arvados/v1/collections_controller_test.rb      |  7 ++-
 .../api/test/integration/collections_api_test.rb   | 21 +++++++
 10 files changed, 153 insertions(+), 18 deletions(-)

       via  330a46e91b4ceaefba2bcfc383931eb59c77d461 (commit)
       via  fefce5e8e133a8fa064bbcdf31d85d41dc4a6729 (commit)
       via  204f433a870e2bf1cf7af1fbe076e91f427ef05e (commit)
       via  9b61792d905324a98b24224d45347082efbe5205 (commit)
       via  16b720950262eb559358cf357f5098a142901665 (commit)
       via  b6a7a62f4f38710f50d08a91a6a9b210700bb011 (commit)
       via  aaffcb23198b4223c48092ccd30ef7152b434187 (commit)
       via  20f5b178a850b029ecd501ed49e4ed0a537c1fad (commit)
       via  e2da84c1fd9052791ed2b684741469570e09ea35 (commit)
       via  2527b9cd7958d89a5ae0dd84856027908c48ae53 (commit)
       via  dd645c9e973b9b725f310513ce309fa1e1a82421 (commit)
      from  79aca915815d298d2c20546108284627ee6cb84b (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.


commit 330a46e91b4ceaefba2bcfc383931eb59c77d461
Author: Radhika Chippada <radhika at curoverse.com>
Date:   Mon Feb 9 21:34:45 2015 -0500

    4523: add search test looking for '_' which is ignored by full text search.

diff --git a/services/api/test/fixtures/collections.yml b/services/api/test/fixtures/collections.yml
index 9834716..9ddc452 100644
--- a/services/api/test/fixtures/collections.yml
+++ b/services/api/test/fixtures/collections.yml
@@ -378,6 +378,19 @@ upload_sandbox:
   manifest_text: ''
   name: upload sandbox
 
+collection_with_unique_words_to_test_full_text_search:
+  uuid: zzzzz-4zz18-mnt690klmb51aud
+  portable_data_hash: fa7aeb5140e2848d39b416daeef4ffc5+45
+  owner_uuid: zzzzz-tpzed-xurymjxw79nv3jz
+  created_at: 2014-02-03T17:22:54Z
+  modified_by_client_uuid: zzzzz-ozdt8-brczlopd8u8d0jr
+  modified_by_user_uuid: zzzzz-tpzed-d9tiejq69daie8f
+  modified_at: 2014-02-03T17:22:54Z
+  updated_at: 2014-02-03T17:22:54Z
+  manifest_text: ". 37b51d194a7513e45b56f6524f2d51f2+3 0:3:bar\n"
+  name: collection_with_some_unique_words
+  description: The quick_brown_fox jumps over the lazy_dog
+
 # Test Helper trims the rest of the file
 
 # Do not add your fixtures below this line as the rest of this file will be trimmed by test_helper
diff --git a/services/api/test/integration/collections_api_test.rb b/services/api/test/integration/collections_api_test.rb
index b44c4be..93ed156 100644
--- a/services/api/test/integration/collections_api_test.rb
+++ b/services/api/test/integration/collections_api_test.rb
@@ -252,4 +252,25 @@ class CollectionsApiTest < ActionDispatch::IntegrationTest
     }, auth(:active)
     assert_response 422
   end
+
+  [
+    'quick fox',
+    'quick_brown fox',
+    'brown_ fox',
+    'fox dogs',
+  ].each do |search_filter|
+    test "full text search ignores special characters and finds with filter #{search_filter}" do
+      # description: The quick_brown_fox jumps over the lazy_dog
+      # full text search treats '_' as space apparently
+      get '/arvados/v1/collections', {
+        :filters => [['any', '@@', search_filter]].to_json
+      }, auth(:active)
+      assert_response 200
+      response_items = json_response['items']
+      assert_not_nil response_items
+      first_item = response_items.first
+      refute_empty first_item
+      assert_equal first_item['description'], 'The quick_brown_fox jumps over the lazy_dog'
+    end
+  end
 end

commit fefce5e8e133a8fa064bbcdf31d85d41dc4a6729
Merge: 79aca91 204f433
Author: Radhika Chippada <radhika at curoverse.com>
Date:   Mon Feb 9 21:27:25 2015 -0500

    Merge branch 'master' into 4523-full-text-search


-----------------------------------------------------------------------


hooks/post-receive
--