wordjelly-auth 1.2.0 → 1.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c42a092272dcecebcb9c5f277eb787c3c7ef9ab3
-  data.tar.gz: 99fa8856c5190308411e17fe33eceeda23e6db6e
+  metadata.gz: 998b4b6ae8498893000130fff555afcfbfc1a7f2
+  data.tar.gz: dbeca1a615b51d298572a4ef696230c0a1fd08a7
 SHA512:
-  metadata.gz: 34a5426617603247d634b31ab22c5e91ad992925555ff32d95183430921feea2d102ebc27ca34bfa1db9a63f36c356216a88e6ecaef9b46448a2e17d3560d7c1
-  data.tar.gz: 701f931788735292d0c9faf7139cff73516091a9adae3496ae1430a5647605b07bebea06f1faa2b5bd6abe594747cadf225a650b54264f8c1f7f46ccf7980163
+  metadata.gz: c6be7258a114b841b96c867bae18551ddf7100e69707c2166f954e8c884a9613898d28f2b9fb9df8be35d1d3c6b04375742123932d3d70d49c9703a33bd06a63
+  data.tar.gz: 9a089cdd3b60dd2bc778cd1fe1d50356a1d7e7ab813701fa0cb29f50295715688387e1d210e9e0f5723a90fd0f3cabfbe124fa925b7ab1a3be1dce0dbb200958

data/app/controllers/auth/concerns/token_concern.rb

@@ -31,6 +31,7 @@ module Auth::Concerns::TokenConcern
     ## if there is more than one model : all but the last will have a fallback of :none.
     ## 
 
+    
     TCONDITIONS = {} unless defined? TCONDITIONS
 
 

data/app/models/auth/concerns/shopping/cart_item_concern.rb

@@ -12,9 +12,6 @@ module Auth::Concerns::Shopping::CartItemConcern
 
 	included do 
 
-
-		
-
 		INDEX_DEFINITION = {
 			index_options:  {
 			        settings:  {

data/app/models/auth/work/VICTORY SPEECH:

@@ -1,13 +1,36 @@
-Some people who deserve a mention:
-
--Dr.Manas Dutta(for the motivation, and setting a fine example),
--Dr.Harvinder Singh & Dr. Priyam Pargaonkar(for being so understanding in my first year),
--Dr.Shailendra Tiwari(for the tutorial on Hindi romantic poetry and its indications and contraindications),
--Dr.Vanshika Shahi(for teaching me pathology),
--Dr.Rishabh Joshi(for redefining my notion of 'capacity'),
--Dr.Chaitrangi Rohekar Paranjpe(for being as blunt as is humanly possible), 
--Dr.Iqbal Ahmed Farooqi(for the tips on MCQ's),
--Dr.Monalisa Makashir Laturkar(for telling me I'd top this exam),
--Dr.Kumud Jeswani Raut(for the sugar cubes, and Lahejat tea),
--Dr.Aditya Raut(for existing) and my parents(for everything).
+Some sunshine after nearly 15 years of hell.
+
+It feels good to be back to doing what I was once the best at.
+
+I'd like to thank some people who have been instrumental in this:
+
+1. My parents - for the unconditional love.
+
+2. My brother - for managing everything at home.
+   Dr.Kumud Jeswani - for being so kind all throughout.
+
+3. Dr.Manas Dutta - The only person who saw from up close what it took to get here. It has been a honour and a privilege to know you.
+
+4. Dr.Iqbal Ahmed Farooqi - For all the tips on MCQ's.
+
+5. Dr. Rishabh Joshi, Dr.Shailendra Tiwari - The surgery buddies I should have had from day one, especially Dr.Shailendra who got me into the habit of studying for 24 hours in a row.
+
+Dr.Harvinder Singh, Dr.Vanshika Shahi, Dr.Priyam Pargaonkar, Dr.Jinal Patel, Dr Nidhi Patel, Dr.Khushboo Patel, Dr.Ansul Choudhary, Dr Puja Karalia and all my other colleagues at the Dept of Pathology, who were kind enough to overlook my frequent disappearances. 
+
+Dr.Anjali Kelkar - for teaching us that hematology is much to vast to be learnt in 2 short years.
+
+Dr.Ashka Kodnani - for being so kind while teaching me cytology reporting.
+
+Dr.Nisal, Dr.Doshi, Dr.Jagadale and Dr.Lakhe, Dr.Nimbargi - for everything.
+
+Dr.N.S.Mani for introducing to me the concept of the 1st reading, 2nd reading and 3rd reading. Until then I only read things once.
+
+6. Dr.Manjiri Karandikar my original MBBS pathology teacher, whose dedication to her work is impossible to emulate, and whose concepts are simply too clear to be true.
+
+7. Possibly the most important person: Dr.Chaitrangi Rohekar Paranjpe, who told me to get my act together.
+
+8. Dr.Monalisa Makashir, for telling me 6 months ago, that I was going to top the exam. I don't know how you did that. 
+
+9. Dr.S.P - for existing.
+
 

data/lib/auth/omniauth/path.rb

@@ -14,12 +14,10 @@ module Auth
 				cls_name_as_string.split("::").map{|c| c = c.underscore}.join("/")
 			end
 
-
 			def self.new_path(cls)
 				"new_" + cls.constantize.new.class.name.underscore.gsub(/\//,"_") + "_path"
 			end
 
-
 			def self.show_or_update_or_delete_path(cls)
 				
 				parts = cls.constantize.new.class.name.split("::")

data/lib/auth/search/main.rb

@@ -1,18 +1,18 @@
 module Auth
 	module Search
 		module Main
+
 			## this def, returns a hash with the structure for the basic ngram query.
 			## the query_string is left blank, and you should merge this in through any def that wants to perform an ngram query.
 			## @return[Hash]
-			def self.base_ngram_query
+			def self.es_six_base_ngram_query
 				{
 					body: {
 						query: {
-							filtered: 
-							{
-								query: {
+							bool: {
+								must: {
 									match: {
-										_all: {
+										_all_fields: {
 											query: "",
 											operator: "and"
 										}
@@ -29,29 +29,33 @@ module Auth
 				}
 			end
 
+
+			## searches all indices, for the search string.
 			## @param[Hash] : This is expected to contain the following:
 			## @query_string : the query supplied by the user
 			## @resource_id : a resource_id with which to filter search results, if its not provided, no filter is used on the search results
 			## @size : if not provided a default size of 20 is used
 			## this def will use the #base_ngram_query hash and merge in a filter for the resource_id.
-			
 			## 'Public' Resources
 			##  if the public field is present, don't add any resource_id filter.
 			##  if the public field is not present, then add the resource_id filter if the resource_id is provided.
+			## @return[Hash] : returns a query clause(hash) 
+			def self.es_six_finalize_search_query_clause(args)
 
-			
-			## @return[Array] response: an array of mongoid search result objects. 
-			def self.search(args)	
+				
 				args = args.deep_symbolize_keys
+				
 				return [] unless args[:query_string]
-				query = base_ngram_query
 				
-				## set all the required values.
+				query = es_six_base_ngram_query
+				
 				query[:size] = args[:size] || 20
-	
-				query[:body][:query][:filtered][:query][:match][:_all][:query] = args[:query_string]
+				
+				query[:body][:query][:bool][:must][:match][:_all_fields][:query] = args[:query_string]
+
+				
 				if args[:resource_id]
-					query[:body][:query][:filtered][:filter] = {
+					query[:body][:query][:bool][:filter] = {
 							
 								bool: {
 									should: [
@@ -89,7 +93,15 @@ module Auth
 					## as is.
 				end
 
-				#puts JSON.pretty_generate(query)
+				query
+
+			end
+
+
+			## delegates the building of the query to finalize_search_query_clause.
+			## @return[Array] response: an array of mongoid search result objects. 
+			def self.search(args)	
+				query = es_six_finalize_search_query_clause(args)
 				Mongoid::Elasticsearch.search(query,{:wrapper => :load}).results
 			end
 		end

data/lib/auth/version.rb

@@ -1,3 +1,3 @@
 module Auth
-  VERSION = "1.2.0"
+  VERSION = "1.2.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: wordjelly-auth
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.2.1
 platform: ruby
 authors:
 - bhargav
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-06-28 00:00:00.000000000 Z
+date: 2018-07-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: xpath