gummi 0.2.2 → 0.2.3

data/lib/gummi/db_layer/document/search/filtered.rb

@@ -6,12 +6,14 @@ module Gummi
           include Gummi::DbLayer::Document::Search::Searching
 
           attribute :query_string,  Gummi::DbLayer::Fields::SanitizedString
-          attribute :query_filters, Array[Hash],                    default: []
-          attribute :facets,        Hash,                           default: {}
+          attribute :query_filters, Array[Hash], default: []
+          attribute :facets,        Hash,        default: {}
+          attribute :sort,          Hash,        default: {}
 
           def to_client_args
             args = super
             args[:body] = { query: filtered, facets: facets }
+            args[:body].merge!(sort: sort) if sort.present?
             args
           end
 

data/lib/gummi/db_layer/document/search/searching.rb

@@ -18,9 +18,10 @@ module Gummi
 
           def to_client_args
             args = {
-              index: index,
-              from:  from,
-              size:  size,
+              index:   index,
+              from:    from,
+              size:    size,
+              lenient: true,
             }
             args[:type]  = type if type
             args.merge options

data/lib/gummi/db_layer/favorstuff.rb

@@ -0,0 +1,15 @@
+def self.favored_by(user_id, lot_ids = nil, search_options = {})
+   seek = Seek.new search_options, valid_sort_bys: %w{ catalogue_number }, max_per_page: 50, default_sort_by: :catalogue_number, default_sort_direction: :asc
+   favor_query  = { filtered: { query: { match_all: {} }, filter: { term: { user_id: user_id.to_i } } } }
+   favor_filter = { has_child: { type: DB::Favoring.document_type, query: favor_query } }
+   if lot_ids
+     lot_ids   = lot_ids.presence || [-1]
+     lot_query = { ids: { values: lot_ids } }
+     query     = { filtered: { query: lot_query, filter: favor_filter }}
+     body      = { query: query }
+   else
+     body = { query: favor_filter }
+   end
+   body.merge! sort: { seek.sort_by => seek.sort_direction }
+   raw_search seek.to_hash.merge options: { body: body }
+end

data/lib/gummi/version.rb

@@ -1,3 +1,3 @@
 module Gummi
-  VERSION = '0.2.2'
+  VERSION = '0.2.3'
 end

data/spec/lib/gummi/db_layer/document_spec.rb

@@ -57,7 +57,7 @@ describe Gummi::DbLayer::Document do
 
   context 'attributes' do
 
-    context 'date times' do
+    context 'date times', elastic: true do
       it 'coerces from elastics strings to real Time' do
         time = Time.now
         person = DB::Person.new(born_at: time)
@@ -96,7 +96,7 @@ describe Gummi::DbLayer::Document do
     end
   end
 
-  context 'getting from elastic' do
+  context 'getting from elastic', elastic: true do
     let(:person) { DB::Person.create(name: 'Buzz Lightyear') }
 
     it 'returns an instance of the document_class' do
@@ -105,7 +105,7 @@ describe Gummi::DbLayer::Document do
     end
   end
 
-  context 'child documents' do
+  context 'child documents', elastic: true do
     let(:person) { DB::Person.create name: 'Superman' }
     let(:rating) { DB::Rating.create person_id: person.id, stars: 5 }
 

data/spec/lib/gummi/repository_layer/repository_spec.rb

@@ -16,7 +16,7 @@ describe Gummi::RepositoryLayer::Repository do
     end
   end
 
-  describe '.get' do
+  describe '.get', elastic: true do
     context 'existing record' do
       let (:db_person) { DB::Person.create name: 'Buzz Lightyear' }
 
@@ -34,14 +34,20 @@ describe Gummi::RepositoryLayer::Repository do
     end
   end
 
-  describe '.search' do
+  describe '.search', elastic: true do
+    let(:buzz)  { DB::Person.create name: 'Buzz Lightyear' }
+    let(:woody) { DB::Person.create name: 'Woody' }
 
     before do
-      DB::Person.create name: 'Buzz Lightyear'
-      DB::Person.create name: 'Woody'
+      buzz && woody
       Gummi::DbLayer::DefaultIndex.refresh
     end
 
+    it 'sorts correctly' do
+      People.search(sort: { name: :asc  }).records.map(&:name).should == [buzz.name, woody.name]
+      People.search(sort: { name: :desc }).records.map(&:name).should == [woody.name, buzz.name]
+    end
+
     it 'finds the correct documents' do
       result = People.search do |search|
         search.query_string = 'Woody'

data/spec/spec_helper.rb

@@ -33,14 +33,25 @@ require 'db/person'
 require 'db/rating'
 require 'db/ship'
 
+def setup_elastic
+  Gummi::DbLayer::DefaultIndex.setup
+  DB::Person.sync_mapping!
+  DB::Rating.sync_mapping!
+  DB::Ship.sync_mapping!
+end
+
 RSpec.configure do |config|
   config.before(:suite) do
-    Gummi::DbLayer::DefaultIndex.setup
-    DB::Person.sync_mapping!
-    DB::Rating.sync_mapping!
-    DB::Ship.sync_mapping!
+    setup_elastic
+  end
+
+  config.before(:each, elastic: true) do
+    setup_elastic
   end
 
+  config.after(:each, elastic: true) do
+    Gummi::DbLayer::DefaultIndex.teardown
+  end
   config.after(:suite) do
     Gummi::DbLayer::DefaultIndex.teardown
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gummi
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.2.3
   prerelease: 
 platform: ruby
 authors:
@@ -214,6 +214,7 @@ files:
 - lib/gummi/db_layer/document/search/raw.rb
 - lib/gummi/db_layer/document/search/result.rb
 - lib/gummi/db_layer/document/search/searching.rb
+- lib/gummi/db_layer/favorstuff.rb
 - lib/gummi/db_layer/fields/boolean.rb
 - lib/gummi/db_layer/fields/integer.rb
 - lib/gummi/db_layer/fields/keyword.rb