wordjelly-auth 1.2.5 → 1.2.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0275837f30cb48e6a6b6909f90df80197f83b386
-  data.tar.gz: a13e56f04e6bf1083ceb4c960a81825ce7b0148a
+  metadata.gz: ed99b909d845c1b58ae7ba9cb2001ff13393c8b2
+  data.tar.gz: 79dc45fb85d5c0eb1903551da31bdde8c42cf40d
 SHA512:
-  metadata.gz: f8d984f122cf6cec119aa08296ee7361a1fafe4d9067492da3bcf8539b01d8c9f5c6b56405aa091d1d7e0ea59f1caca5effde9390cd942338a68c03b73ad5a57
-  data.tar.gz: 924471718cb3b23c47cfbb47b82f462cde14da23998503f84a0cb6e60db53bd36b6a8cad1c76bc5f9a0328407b05d9b054ebb292e7eb65951f49649a574a547a
+  metadata.gz: 363a176574715a842f40fca2aa57a0f8d9dbec28752ef27e68c73249e547a7153b1877fa055f0f711b2797764909a7a883ef94b887a4d84514e0a2e2f7ab8eb5
+  data.tar.gz: 73cfe19dfba421533665e78d4cb503e3cccef9cb8ab701760c63f9b5117dcea5d79ecc5a0f169be7fdce00630ac3be14597edfb7138569ffab995881ff632c0d

data/app/assets/javascripts/auth/auth_modals_and_navbar.js

@@ -27,6 +27,7 @@ payumoney.js
 //= require you_need_to_sign_in.js
 //= require payumoney.js
 //= require search.js
+//= require bar_code.js
 
 /////THIS CODE SHOWS HOW TO OVERRIDE ALL THE CLIENT SIDE CODE NEEDED
 /////FOR VALIDATIONS TO WORK FOR THE SIGN_IN_FORM.

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

@@ -33,6 +33,7 @@ module Auth::Concerns::TokenConcern
 
     
     TCONDITIONS = {} unless defined? TCONDITIONS
+    LAST_FALLBACK = :devise unless defined? LAST_FALLBACK
 
 
     if Auth.configuration.enable_token_auth
@@ -65,14 +66,14 @@ module Auth::Concerns::TokenConcern
           ## for the last one, just dont add the fallback as none, other conditions are the same.
           res = Auth.configuration.auth_resources.keys[-1]
          
-          acts_as_token_authentication_handler_for(res.constantize,Auth.configuration.auth_resources[res].merge(self::TCONDITIONS || {}))
+          acts_as_token_authentication_handler_for(res.constantize,Auth.configuration.auth_resources[res].merge({:fallback => self::LAST_FALLBACK}).merge(self::TCONDITIONS || {}))
           
 
       else
         ## in case there is only one authentication resource, then the conditions are like the last one in case there are multiple(like above.)
         res = Auth.configuration.auth_resources.keys[0]
        
-        acts_as_token_authentication_handler_for(res.constantize,Auth.configuration.auth_resources[res].merge(self::TCONDITIONS || {}))
+        acts_as_token_authentication_handler_for(res.constantize,Auth.configuration.auth_resources[res].merge({:fallback => self::LAST_FALLBACK}).merge(self::TCONDITIONS || {}))
 
       end
     
@@ -91,32 +92,30 @@ module Auth::Concerns::TokenConcern
   ## if yes, sets the resource to the first encoutered such key and breaks the iteration
   ## basically a convenience method to set @resource variable, since when we have more than one model that is being authenticated with Devise, there is no way to know which one to call.
   def set_resource
-    
+  
+    puts "came to set resource."
 
     Auth.configuration.auth_resources.keys.each do |resource|
       break if @resource = self.send("current_#{resource.downcase}") 
     end
 
-    #puts "do we have a resource"
-    #puts @resource.to_s
-
     ## devise in registrations_controller#destroy assumes the existence of an 'resource' variable, so we set that here.
     if devise_controller?
       self.resource = @resource
     end
 
-   
+    puts "resource is: #{@resource.to_s}"
     
   end
 
 
   
   def lookup_resource 
-    puts "came to lookup resource."
+    #puts "came to lookup resource."
     ## if the current signed in resource si not an admin, just return it, because the concept of proxy arises only if the current_signed in resource is an admin.
-    puts "current signed in resource : #{current_signed_in_resource}"
+    #puts "current signed in resource : #{current_signed_in_resource}"
     return current_signed_in_resource unless current_signed_in_resource.is_admin?
-    puts "crossed resource."
+    #puts "crossed resource."
     ## else.
     
     ## first check the session or the params for a proxy resource.

data/app/controllers/auth/search_controller.rb

@@ -4,50 +4,52 @@ class Auth::SearchController < ApplicationController
 	CONDITIONS_FOR_TOKEN_AUTH = [:authenticated_user_search]
 
 	TCONDITIONS = {:only => CONDITIONS_FOR_TOKEN_AUTH}
+	LAST_FALLBACK = :none
 
 	include Auth::Concerns::DeviseConcern	
 	include Auth::Concerns::TokenConcern
 
 	before_action :do_before_request, TCONDITIONS
-	
-			
-	## the intention of this action is :
-	## to search all records as admin.
-	## to search a user's own records if you are user.
-	## to search all public records
 
-	## so if the user is an admin, then no resource_id is provided to the search.(basically all records are searched)
-	## if he's not an admin, then the lookup_resource user's id is provided.
-	
-	## this action assumes that the user is signed_in, will return not authenticated otherwise.
+	## only option is to set no fallback
+	## so that it will just go through.
 
-	## rendering logic : 
+			
+	## permitted_params[:query] is expected to be a hash, which can provide the following arguments
+	## :query_string => a string for the query
+	## :search_on_field => the field name on which the search can be performed, will default to the 'tags' field.
+	## :size => the number of results to return, will default to 5.
 	## @js erb -> renders html erb -> there each result class is detected and the requisite "_search.html.erb" partial is found for that class and rendered.
 	## @json => authenticated_user_search.json is rendered.
 	## @html => currently does not support html request.
 	def authenticated_user_search	
-		
-		
-		## m client will be available at this stage.
-		## the problem is that it is hard to pass it forward to the mongoid elasticsearch object.
-		## because while initializing the user it will have to first be set on the user.
-		## is there any other way to achieve this?
+
+		## remaining implementation is that a default as_json public has to be set to "no" for everything, and overriding it will be the job of the implementer to set it to "yes"
+		## that way a filter is maintained.
+
 		query = permitted_params[:query]
-		query[:resource_id] = lookup_resource.id.to_s if !current_signed_in_resource.is_admin?
 
+		if current_signed_in_resource
+			if current_signed_in_resource.is_admin?
+				query[:resource_is_admin] = true
+			else
+				query[:resource_id] = lookup_resource.id.to_s
+			end
+		end
 		
 		@search_results = Auth::Search::Main.search(query)
 		
-	
-		#dummy_product = Auth.configuration.product_class.constantize.new
-		#dummy_product.name = "test product"
-		#dummy_product.price = 100.20
-		#@search_results = [dummy_product,dummy_product]
 		@search_results.each do |res|
 			if res.respond_to? :m_client
 				res.m_client = self.m_client
 			end
 		end
+
+		puts "these are the search results."
+		@search_results.each do |result|
+			puts result.to_s	
+		end
+
 		respond_with @search_results
 	end
 

data/app/models/auth/concerns/chief_model_concern.rb

@@ -10,6 +10,7 @@ module Auth::Concerns::ChiefModelConcern
 		include Mongoid::Document
 		include Mongoid::Timestamps
 		include Mongoid::EmbeddedErrors
+		include Auth::Concerns::ImageLoadConcern
 		## expected to be a hash with names of callbacks and boolean values.
 		## eg: {:before_save => true, :after_save => false..}
 		## used in conjunction with the provided skip_callback?(callback_name) method to determine whether to execute the callbacks or not.
@@ -24,15 +25,8 @@ module Auth::Concerns::ChiefModelConcern
 		attr_accessor :embedded_document
 
 		## array of image ids, that are associated with the current document.
-		attr_accessor :images
-
-		field :public, type:String, default: "no"
-
-
-		after_initialize do |document|
-			document.load_images
-		end
-
+		
+		## moved field public to the es_concern.
 
 		def field_names_to_skip_while_making_form
 			["_id","_type.,","resource_id","resource_class","created_at","updated_at","public"]
@@ -43,12 +37,7 @@ module Auth::Concerns::ChiefModelConcern
 		end
 
 
-		##find an image/ images with this parent id.
-		##and add them to an images array. 
-		def load_images
-			self.images = Auth::Image.where(:parent_id => self.id.to_s) || []
-		end
-
+		
 
 		## returns a list of attributes of tis model other than those mentioned in #FIELD_NAMES_TO_SKIP_WHILE_MAKING_FORM in this concern.
 		## this is only used in the web api.

data/app/models/auth/concerns/es_concern.rb

@@ -2,9 +2,104 @@ module Auth::Concerns::EsConcern
 
 	extend ActiveSupport::Concern
 	
+	unless Auth::Concerns::EsConcern.included_modules.include? Mongoid::Document
+		include Mongoid::Document
+	end
+
 	included do 
 
+		## the page to which the user will be taken if they click on the suggestion.
+		## REQUIRED
+		field :primary_link, type: String
+
+
+		## key -> display name
+		## value -> hash
+		## value_key -> :url -> the url
+		## value_key -> :data -> hash of optional data-attributes.
+		field :secondary_links, type: Hash, default: {}
+
+
+		## now let us configure that bitch to show this bitch.
+		## REQUIRED
+		## array of tags on which to do the autocomplete
+		field :tags, type: Array, default: []
+
+		## OPTIONAL
+		## an optional description that will be shown below the result in the autocomplete.
+		field :autocomplete_description, type: String 
+
+		AUTOCOMPLETE_INDEX_SETTINGS =
+			{
+		        analysis:  {
+		            filter:  {
+		                nGram_filter:  {
+		                    type: "nGram",
+		                    min_gram: 2,
+		                    max_gram: 20,
+		                   	token_chars: [
+		                       "letter",
+		                       "digit",
+		                       "punctuation",
+		                       "symbol"
+		                    ]
+		                }
+		            },
+		            analyzer:  {
+		                nGram_analyzer:  {
+		                    type: "custom",
+		                    tokenizer:  "whitespace",
+		                    filter: [
+		                        "lowercase",
+		                        "asciifolding",
+		                        "nGram_filter"
+		                    ]
+		                },
+		                whitespace_analyzer: {
+		                    type: "custom",
+		                    tokenizer: "whitespace",
+		                    filter: [
+		                        "lowercase",
+		                        "asciifolding"
+		                    ]
+		                }
+		            }
+		        }
+			}
+
+		AUTOCOMPLETE_INDEX_MAPPINGS = 
+		{
+            properties: {
+            	tags:  {
+            		type: "text",
+	            	analyzer: "nGram_analyzer",
+	            	search_analyzer: "whitespace_analyzer"
+	        	},
+                public: {
+                	type: "keyword"
+                },
+                resource_id: {
+                	type: "keyword"
+                }
+            }
+        }
+
+        before_save do |document|
+        	document.set_primary_link
+        	document.set_secondary_links
+        	document.set_autocomplete_description
+        	document.set_autocomplete_tags
+        end
+
+
+
+		field :public, type:String, default: "no"
+
+
 		def self.create_es_index(definition)
+			## check the presence of a resource_id and a resource_class
+			#raise "Please define a resource_id field on this model to use it with elasticsearch, this field should be a string" unless self.respond_to? :resource_id
+			#raise "Please define a resource_class field on this model as well." unless self.respond_to? :resource_class
 			definition ||= {}
 			if Auth.configuration.use_es == true
 				include Mongoid::Elasticsearch
@@ -12,10 +107,52 @@ module Auth::Concerns::EsConcern
 						definition
 					)
 			end
+		
 		end	
 
 	end
 
+	def as_indexed_json(options={})
+		{
+			tags: self.tags,
+			public: self.public,
+			resource_id: self.resource_id,
+			resource_class: self.resource_class
+		}
+	end
+
+
+	def set_autocomplete_tags
+
+	end
+
+	def set_primary_link
+
+	end
+
+	def set_secondary_links
 
+	end
+
+	def set_autocomplete_description
+
+	end
+
+	def created_at=(created_at)
+		
+		super(created_at)
+		
+		return unless self.created_at
+		
+		human_readable = self.created_at.strftime("%B %-d %Y")
+		self.tags << human_readable unless self.tags.include? human_readable		
+	end
+
+	def clear_autocomplete_data
+		self.primary_link = nil
+		self.secondary_links.clear
+		self.autocomplete_description = nil
+		self.tags.clear
+	end
 
 end

data/app/models/auth/concerns/image_load_concern.rb

@@ -0,0 +1,21 @@
+module Auth::Concerns::ImageLoadConcern
+
+	extend ActiveSupport::Concern
+
+	included do 
+
+		attr_accessor :images
+		
+		after_initialize do |document|
+			document.load_images
+		end
+
+		##find an image/ images with this parent id.
+		##and add them to an images array. 
+		def load_images
+			self.images = Auth::Image.where(:parent_id => self.id.to_s) || []
+		end
+
+	end
+
+end

data/app/models/auth/concerns/search/autocompleted_concern.rb

@@ -0,0 +1,139 @@
+module Auth::Concerns::Search::AutocompletedConcern
+
+	extend ActiveSupport::Concern
+
+	unless Auth::Concerns::Search::AutocompleteConcern.included_modules.include? Mongoid::Document
+		include Mongoid::Document
+	end
+
+	unless Auth::Concerns::Search::AutocompleteConcern.included_modules.include? Mongoid::Elasticsearch
+		include Mongoid::Elasticsearch
+	end
+
+	included do
+
+		## the page to which the user will be taken if they click on the suggestion.
+		## REQUIRED
+		field :primary_link, type: String
+
+		## key -> display name
+		## value -> hash
+		## value_key -> :url -> the url
+		## value_key -> :data -> hash of optional data-attributes.
+		field :secondary_links, type: Hash, default: {}
+
+
+		## now let us configure that bitch to show this bitch.
+		## REQUIRED
+		## array of tags on which to do the autocomplete
+		field :tags, type: Array, default: []
+
+
+		## the tags that are shown in case the owner of the resource is not viewing the resource
+		field :masked_tags, type: Array, default: []
+
+		## OPTIONAL
+		## an optional description that will be shown below the result in the autocomplete.
+		field :autocomplete_description, type: String 
+
+		AUTOCOMPLETE_INDEX_SETTINGS =
+			{
+		        analysis:  {
+		            filter:  {
+		                nGram_filter:  {
+		                    type: "nGram",
+		                    min_gram: 2,
+		                    max_gram: 20,
+		                   	token_chars: [
+		                       "letter",
+		                       "digit",
+		                       "punctuation",
+		                       "symbol"
+		                    ]
+		                }
+		            },
+		            analyzer:  {
+		                nGram_analyzer:  {
+		                    type: "custom",
+		                    tokenizer:  "whitespace",
+		                    filter: [
+		                        "lowercase",
+		                        "asciifolding",
+		                        "nGram_filter"
+		                    ]
+		                },
+		                whitespace_analyzer: {
+		                    type: "custom",
+		                    tokenizer: "whitespace",
+		                    filter: [
+		                        "lowercase",
+		                        "asciifolding"
+		                    ]
+		                }
+		            }
+		        }
+			}
+
+		AUTOCOMPLETE_INDEX_MAPPINGS = 
+		{
+            properties: {
+            	tags:  {
+            		type: "text",
+	            	analyzer: "nGram_analyzer",
+	            	search_analyzer: "whitespace_analyzer"
+	        	},
+                public: {
+                	type: "keyword"
+                },
+                resource_id: {
+                	type: "keyword"
+                }
+            }
+        }
+
+        before_save do |document|
+        	document.set_primary_link
+        	document.set_secondary_links
+        	document.set_autocomplete_description
+        	document.set_autocomplete_tags
+        end
+
+	end
+
+	def set_autocomplete_tags
+
+	end
+
+	def set_primary_link
+
+	end
+
+	def set_secondary_links
+
+	end
+
+	def set_autocomplete_description
+
+	end
+
+	def created_at=(created_at)
+		
+		super(created_at)
+		
+		return unless self.created_at
+		
+		human_readable = self.created_at.strftime("%B %-d %Y")
+		self.tags << human_readable unless self.tags.include? human_readable		
+	end
+
+	def clear_autocomplete_data
+		self.primary_link = nil
+		self.secondary_links.clear
+		self.autocomplete_description = nil
+		self.tags.clear
+	end
+
+	## we don't want to index the primary or secondary links
+	## only the tags are considered
+
+end