wordjelly-auth 1.3.3 → 1.3.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1a5d379162e1e991dd1d422f6694bd65749e2bb9
-  data.tar.gz: 5eb0df9157e2ab3181f0f0f65f6a4c603e02c15c
+  metadata.gz: b1e9b39e6c07b7dd628f6846703c6cb9f00e63d5
+  data.tar.gz: '08f6220eb0a9925449fe68312b8c2c2b023106b2'
 SHA512:
-  metadata.gz: 3dcf9226d9aa75f5f10ac1614943b62b0a5a601a5336d1d8411821bbc30bad2ea81ebbac9f6dccaec7ad01f915414579c0f9d521bfa19dd13319ff47717828b9
-  data.tar.gz: b574858f0278403feabcf091614347f50d345668a66b7b9ac668e0470d7755ef94a829e5899a7197b3839b5165118521c5980a910f8e37bbfbd5b558fafb030a
+  metadata.gz: b7705dafffa2f9e0aae0abc667dbfd60a49fe56669a5300062095a2123b38e538ffcede49e894c5d9d4fb0242ba5cb96ecef0929481388cdc624305aa2ac3c25
+  data.tar.gz: 3bb95056b379d45df8951d69eb810e2084bf262a4d99bbc9cb263e6c97e6d4b08f813880124839c4b43333df3a571ab5c1f0af90f7b41ec103ed4451959271db

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

@@ -134,7 +134,7 @@ module Auth::Concerns::EsConcern
         ## if the document is embedded, it can only be added to the es_index, through the controller create/update actions.
         after_save do |document|
 			unless document.class.embedded?
-			document.es_update
+				document.es_update
 			end
 		end
     

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

@@ -2,7 +2,6 @@
 module Auth::Concerns::Shopping::CartItemConcern
 
 
-
 	extend ActiveSupport::Concern
 	
 	include Auth::Concerns::Shopping::ProductConcern
@@ -423,14 +422,12 @@ module Auth::Concerns::Shopping::CartItemConcern
 	end
 
 	def set_autocomplete_tags
-
 		self.tags = []
 		self.tags << "item"
 		if self.personality_id
 			personality = Auth.configuration.personality_class.constantize.find(self.personality_id)
 			personality.add_info(self.tags)
 		end
-
 	end
 
 	def set_autocomplete_description
@@ -486,60 +483,46 @@ module Auth::Concerns::Shopping::CartItemConcern
 	def create_with_embedded(product_id)
 		created_document = nil
 		product = Auth.configuration.product_class.constantize.find(product_id)
-		#puts product.attributes.to_s
+		
 		product_clone = product.clone
-		#puts "product clone instructions."
-		#puts product_clone.instructions.to_s
-		#puts product_clone.instructions.map{|c| c = c.attributes}.to_s
-		#exit(1)
-		#puts "finished cloning."
-		if self.valid?
-			self.run_callbacks(:save) do
-	          	self.run_callbacks(:create) do
-		            create_hash = {
-		            	"$setOnInsert" => self.attributes
-		            }	            
-		            	
-		            #puts "cloned attributes."
-		            #clone_attributes = product_clone.attributes
-		            #puts clone_attributes
-		            product_attributes_to_assign.each do |attr|
-		            	if product_clone.send("#{attr}").respond_to? :embedded_in
-		            		create_hash["$setOnInsert"][attr.to_s] = 
-		            		product_clone.send("#{attr}").map{|c| c = c.attributes}
-		            	else
-		            		create_hash["$setOnInsert"][attr.to_s] = product_clone.send("#{attr}")
-		            	end
-		            end
-
-		            puts "Create hash is:"
-		            puts JSON.pretty_generate(create_hash)
-
-		            created_document = Auth.configuration.cart_item_class.constantize.
-					where({
-						"$and" => [
-							"_id" => BSON::ObjectId(self.id.to_s)
-						]
-					}).
-					find_one_and_update(
-						{
-							"$setOnInsert" => create_hash["$setOnInsert"]
-						},
-						{
-							:return_document => :after,
-							:upsert => true
-						}
-					)
-	          	end
-	        end
-	        unless created_document
-	        	self.errors.add(:_id,"failed to create the cart item")
-	        	false
-	    	else
-	    		created_document
-	    	end
-	    else
-	    	false
-		end	
+		
+        create_hash = {
+        	"$setOnInsert" => self.attributes
+        }	            
+        	
+        product_attributes_to_assign.each do |attr|
+        	if product_clone.send("#{attr}").respond_to? :embedded_in
+        		create_hash["$setOnInsert"][attr.to_s] = 
+        		product_clone.send("#{attr}").map{|c| c = c.attributes}
+        	else
+        		create_hash["$setOnInsert"][attr.to_s] = product_clone.send("#{attr}")
+        	end
+        end
+
+        c = Auth.configuration.cart_item_class.constantize.
+		where({
+			"$and" => [
+				"_id" => BSON::ObjectId(self.id.to_s)
+			]
+		}).
+		find_one_and_update(
+			{
+				"$setOnInsert" => create_hash["$setOnInsert"]
+			},
+			{
+				:return_document => :after,
+				:upsert => true
+			}
+		)
+
+		c.signed_in_resource = self.signed_in_resource
+		c.valid?
+  		c.run_callbacks(:save) do 
+  			c.run_callbacks(:create) do 
+
+  			end
+  		end
+  		c.run_callbacks(:after_save)
+  		c
 	end
 end

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

@@ -7,7 +7,6 @@ module Auth::Concerns::Shopping::ProductConcern
 	include Auth::Concerns::EsConcern
 	include Mongoid::Autoinc	
 
-
 	## include the bar code concern if enable_bar_code_api is enabled.
 
 	if Auth.configuration.enable_barcode_api == true

data/app/models/auth/shopping/cart_item.rb

@@ -3,4 +3,7 @@ class Auth::Shopping::CartItem
 	def attributes_for_tags
 		["name","description"]
 	end
+
+	
+    
 end

data/app/models/auth/shopping/product.rb

@@ -3,4 +3,7 @@ class Auth::Shopping::Product
 	def attributes_for_tags
 		["name","description"]
 	end
+
+	
+
 end

data/app/models/auth/work/instruction.rb

@@ -3,7 +3,6 @@ class Auth::Work::Instruction
 	include Mongoid::Timestamps
 	include Auth::Concerns::Work::CommunicationFieldsConcern
 	include Auth::Concerns::ImageLoadConcern
-	include Auth::Concerns::CloneConcern
 	
 	attr_accessor :product_id
 	attr_accessor :cart_item_id

data/lib/auth/version.rb

@@ -1,3 +1,3 @@
 module Auth
-  VERSION = "1.3.3"
+  VERSION = "1.3.5"
 end