wordjelly-auth 1.2.6 → 1.2.8

data/app/models/auth/image.rb

@@ -6,6 +6,7 @@ class Auth::Image
   include Mongoid::Document
   include Auth::Concerns::OwnerConcern
 
+  ## now what about transformations ?
 
   ###########################################################
   ##
@@ -19,7 +20,7 @@ class Auth::Image
   ## the parent id is the id of the object in which the image is uploaded.
   ## it need not exist. but has to be a valid bson object id.
   def self.permitted_params
-    [{:image => [:_id,:parent_id,:parent_class,:active,:timestamp,:public_id]},:id]
+    [{:image => [:_id,:parent_id,:parent_class,:active,:timestamp,:public_id,:custom_coordinates]},:id]
   end
 
 
@@ -35,6 +36,7 @@ class Auth::Image
   field :parent_id, type: String
   field :parent_class, type: String
   field :active, type: Boolean, default: true  
+  field :custom_coordinates, type: String
   attr_accessor :signed_request
   attr_accessor :timestamp
   attr_accessor :public_id
@@ -65,6 +67,10 @@ class Auth::Image
     document.signed_request = get_signed_request
   end
 
+  ## this should destroy the image.
+  before_destroy do |document|
+    Cloudinary::Uploader.destroy(document.id.to_s)
+  end
 
   ###########################################################
   ##
@@ -93,8 +99,10 @@ class Auth::Image
   ##
   ############################################################
   def get_signed_request
-
-    Cloudinary::Utils.sign_request({:public_id => self.id.to_s,:timestamp=> self.timestamp, :callback => "http://widget.cloudinary.com/cloudinary_cors.html"}, :options=>{:api_key=>Cloudinary.config.api_key, :api_secret=>Cloudinary.config.api_secret})
+    ## these should be merged only if they exist.
+    params_to_sign = {:public_id => self.id.to_s,:timestamp=> self.timestamp, :callback => "http://widget.cloudinary.com/cloudinary_cors.html"}
+    params_to_sign.merge!({:custom_coordinates => self.custom_coordinates}) unless self.custom_coordinates.blank?
+    Cloudinary::Utils.sign_request(params_to_sign, :options=>{:api_key=>Cloudinary.config.api_key, :api_secret=>Cloudinary.config.api_secret})
 
   end
 
@@ -104,8 +112,11 @@ class Auth::Image
   end
 
   def get_url
-    Cloudinary::Utils.cloudinary_url(self.id.to_s)
+    if self.custom_coordinates
+      Cloudinary::Utils.cloudinary_url self.id.to_s, gravity: "custom", crop: "crop"
+    else
+      Cloudinary::Utils.cloudinary_url self.id.to_s
+    end
   end
 
-
 end

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

@@ -1,71 +1,122 @@
 class Auth::Shopping::BarCode
 	include Mongoid::Document
+
+	## let me continue with the navigation, 
+
 	field :resource_id, type: String
 	field :resource_class, type: String
 	field :assigned_to_object_id, type: String
 	field :assigned_to_object_class, type: String
 	field :bar_code_tag, type: String
-	index({ bar_code_tag: 1 }, { unique: true, name: "bar_code_tag_index" })
-		
-	## we do this to delet a reference to an object from a bar code.
-	def self.clear_object(bar_code_tag)
-		returned_document = collection.where(:bar_code_tag => bar_code_tag).find_one_and_update(
-			{
-				"$set" => {
-					"resource_id" => nil,
-					"resource_class" => nil,
-					"assigned_to_object_id" => nil,
-					"assigned_to_object_class" => nil
+	## this is used in the show_action to force render the show view, in case we just want to view the barcode record and not redirect to the 
+	attr_accessor :force_show
+	attr_accessor :go_to_next_step
+
+	## the primary link of the object to which to redirect.
+	## this is se tbefore show.
+	attr_accessor :assigned_to_object
+
+	## this changes what is being used as id.
+
+	def to_param
+		bar_code_tag
+	end
+
+	def self.find(*args)
+		@bar_codes = Auth::Shopping::BarCode.where(:bar_code_tag => args[0])
+		raise Mongoid::Errors::DocumentNotFound.new(Auth::Shopping::BarCode,[args[0]]) if (@bar_codes.nil? || (@bar_codes.size != 1))
+		@bar_codes.first
+	end
+
+	## these should be added to any controller that is going to be implementing the bar_code_concern.
+	## see auth/shopping/product_controller_concern, for an example of how the permitted params are 	
+	def self.allow_params
+		[:bar_code_tag,:remove_bar_code]
+	end
+
+	
+	def self.clear_object(assigned_to_object_id)
+		## we just do a find one and update
+		begin
+			returned_document = where(:assigned_to_object_id => assigned_to_object_id).find_one_and_update(
+				{
+					"$set" => {
+						"resource_id" => nil,
+						"resource_class" => nil,
+						"assigned_to_object_id" => nil,
+						"assigned_to_object_class" => nil
+					}
+				},
+				{
+					:return_document => :after
 				}
-			},
-			{
-				:return_document => :after
-			}
-		)
-		true if returned_document.assigned_to_object_id == nil
+			)
+			true
+		rescue
+			false
+		end
+		
 	end
 
-	## the object here must be implementing the bar code concern.
-	## what if another bar code has this object on it?
-	## now two barcodes refer to the same object, and we have no way of catching that
-	## so the 
+	## there should not already exist a bar code with this bar code
+	## or one where this object id is already assigned.
 	def self.upsert_and_assign_object(object)
-		returned_document = collection.where(
-			"$or" => [
+
+		returned_document = Auth::Shopping::BarCode.collection.find_one_and_update(
+				{
+					"$or" => 
+					[
 						{
-							:bar_code_tag => bar_code_tag
+							"bar_code_tag" => object.bar_code_tag
 						},
 						{
-							:assigned_to_object_id => object.id.to_s,
-							:assigned_to_object_class => object.class.name.to_s
+							"$and" => 
+							[
+								{
+									"assigned_to_object_id" => object.id.to_s
+								},
+								{
+									"assigned_to_object_class" => object.class.name.to_s
+								}
+							]
 						}
 					]
-			).find_one_and_update(
-			{
-				"setOnInsert" => {
-					"resource_id" => object.resource_id,
-					"resource_class" => object.resource_class,
-					"assigned_to_object_id" => object.id.to_s,
-					"assigned_to_object_class" => object.assigned_to_object_class,
-					"bar_code_tag" => object.bar_code_tag	
-				}
-			},
-			{
-				:returned_document => :after,
-				:upsert => true
-			}
-		)
-		
-		false unless returned_document
+				},
+				{
+					"$setOnInsert" => {
+						"bar_code_tag" => object.bar_code_tag,
+						"assigned_to_object_id" => object.id.to_s,
+						"assigned_to_object_class" => object.class.name.to_s,
+						"resource_id" => object.resource_id,
+						"resource_class" => object.resource_class
+					}
+				},
+				{
+					:return_document => :after,
+					:upsert => true
+				})
+
 
-		false if returned_document.assigned_to_object_id != object.id.to_s
+		return nil if returned_document.nil?
 
-		false if returned_document.bar_code_tag != object.bar_code_tag
+		returned_document = Mongoid::Factory.from_db(Auth::Shopping::BarCode,returned_document)
 
-		## as long as all this is satisfied, it means that there is either already this bar code assigned to this object, or 
+		return nil if returned_document.assigned_to_object_id.to_s != object.id.to_s
 
-		true
+		return nil if returned_document.bar_code_tag != object.bar_code_tag
 
+		return returned_document
+
+	end
+	
+	## so query options can be added as checkboxes.
+	## i can have some by default, others not.	
+	def set_assigned_object
+		begin
+    		self.assigned_to_object = self.assigned_to_object_class.constantize.find(self.assigned_to_object_id)
+    	rescue Mongoid::Errors::DocumentNotFound
+    		self.errors.add(:_id, "could not find the assigned object")
+    	end
 	end
 
 end

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

@@ -1,3 +1,6 @@
 class Auth::Shopping::CartItem
 	include Auth::Concerns::Shopping::CartItemConcern
+	def attributes_for_tags
+		["name","description"]
+	end
 end

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

@@ -6,7 +6,8 @@ class Auth::Shopping::Personality
 		:sex => ["Male","Female"]
 	}
 
-
-	
+	def attributes_for_tags
+		["fullname","sex","age"]
+	end
 
 end

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

@@ -1,3 +1,6 @@
 class Auth::Shopping::Place
 	include Auth::Concerns::Shopping::PlaceConcern
+	def attributes_for_tags
+		["unit_number","building","street","pin_code","city","country_state","country"]
+	end
 end

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

@@ -1,5 +1,6 @@
 class Auth::Shopping::Product
 	include Auth::Concerns::Shopping::ProductConcern
-
-	
+	def attributes_for_tags
+		["name","description"]
+	end
 end

data/app/views/auth/admin_create_users/search_results/_add_new_user.html.erb

@@ -0,0 +1,3 @@
+<% if current_signed_in_resource && current_signed_in_resource.is_admin? %>
+	<%= link_to "Add New User", new_admin_create_user_path %>
+<% end %>

data/app/views/auth/admin_create_users/search_results/_manage_user.html.erb

@@ -0,0 +1,5 @@
+<% if current_signed_in_resource && current_signed_in_resource.is_admin? %>
+	<div class="input-field">
+		<%= link_to "Manage this user", admin_create_user_path(:id => user.id.to_s) %>
+	</div>
+<% end %>

data/app/views/auth/images/_show.html.erb

@@ -0,0 +1,16 @@
+<div class="row">
+	<div class="col s12 m6 l6">
+	  <div class="card">
+	    <div class="card-image">
+	      <img src="<%= @image.get_url %>">
+	      <span class="card-title">Id No: <%= @image.id.to_s %></span>
+	    </div>
+	    <div class="card-content">
+	      <p>Image created on : <%= @image.created_at %></p>
+	    </div>
+	    <div class="card-action">
+	      <%= link_to "Delete", image_path(:id => @image.id.to_s), method: :delete, :remote => :true %>
+	    </div>
+	  </div>
+	</div>
+</div>

data/app/views/auth/images/destroy.js.erb

@@ -0,0 +1 @@
+location.reload();

data/app/views/auth/images/show.js.erb

@@ -0,0 +1 @@
+location.reload();

data/app/views/auth/profiles/_admin_profile.html.erb

@@ -0,0 +1,2 @@
+<!-- render this partial in case it is an admin -->
+Hello Admin You are viewing your own profile

data/app/views/auth/profiles/_proxy_resource.html.erb

@@ -1,5 +0,0 @@
-<%= content_tag(:div) do %>
-	<%= content_tag(:span) do %>
-		"You are acting on behalf of:" <%= proxy_resource.email.to_s %>
-	<% end %>
-<% end %> 

data/app/views/auth/profiles/search_results/_switch_to_user.html.erb

@@ -0,0 +1,16 @@
+<% if current_signed_in_resource && current_signed_in_resource.is_admin? %>
+	
+	<% path_params = {} %>
+	<% link_text = "" %>
+
+	<% if session[:proxy_resource_id] && session[:proxy_resource_id] == user.id.to_s %>
+		<% path_params = {:resource => user.class.name.pluralize, :id => user.id.to_s, :unset_proxy => true} %>
+		<% link_text = "Detach From This Account" %>
+	<% else %>
+		<% path_params = {:resource => user.class.name.pluralize, :id => user.id.to_s} %>
+		<% link_text = "Switch to This Account" %>
+	<% end %>
+
+	<%= link_to link_text, set_proxy_resource_profiles_path(path_params), method: :put, remote: true %>
+
+<% end %>

data/app/views/auth/profiles/set_proxy_resource.js.erb

@@ -1 +1,6 @@
-$("#proxy_user").html("<%= escape_javascript(render partial: 'auth/profiles/proxy_resource.html.erb', locals: {proxy_resource: @profile_resource}) %>").show();
+// clear the search results if any.
+$(".search_result").remove();
+$(".acting_for_user").remove();
+<% if session[:proxy_resource_id] %>
+	$("#acting_for_user_holder").html("<%= escape_javascript(render partial: 'layouts/auth/navbar/acting_for_user.html.erb') %>").show();	
+<% end %>

data/app/views/auth/profiles/show.html.erb

@@ -1,8 +1,17 @@
 <h4><%= flash[:notice] %></h4>
 <%= render :partial => "auth/shared/object_errors.html.erb", locals: {active_model_object: @profile_resource} %>
-<!-- if the current signed in resource is admin -->
-	<!-- give options to resend sms otp, resend confirmation email, basically render the options partial from admin_create_users -->
-	<%= render :partial => "auth/admin_create_users/admin_actions.html.erb", locals: {user: @profile_resource} %>
-<!-- else -->
+
+<% if current_signed_in_resource.is_admin? %>
+
+	<% if current_signed_in_resource.id.to_s == @profile_resource.id.to_s %>
+		
+		<%= render :partial => "auth/profiles/admin_profile.html.erb" %>
+
+	<% else %>
+		<!-- give options to resend sms otp, resend confirmation email, basically render the options partial from admin_create_users -->	
+		<%= render :partial => "auth/admin_create_users/admin_actions.html.erb", locals: {user: @profile_resource} %>
+	<% end %>
+
+<% else %>
 	
-<!-- end -->
+<% end %>

data/app/views/auth/search/_search_result.html.erb

@@ -1,8 +1,8 @@
 <li class="collection-item search_result teal-text">
 <%= link_to result.primary_link.html_safe do %>
-	<h5><%= result.tags.join(" ") %></h5>
+	<h5 class="search_result_tags"><%= result.tags.join(" ") %></h5>
 <% end %>
-<h6 class="grey-text"><%= result.autocomplete_description %></h6>
+<h6 class="grey-text search_result_description"><%= result.autocomplete_description %></h6>
 <% result.secondary_links.keys.each do |sl| %>
 	<% if result.secondary_links[sl][:partial] %>
 		<% locals = {} %>
@@ -13,8 +13,14 @@
 		<% end %>
 		<%= render :partial => result.secondary_links[sl][:partial], locals: locals %>
 	<% else %>
-		<%= link_to result.secondary_links[sl][:url].html_safe, :data => result.secondary_links[sl][:data] || {} do %>
-			<span class="m-20-right"><%= sl %></span>
+		<% if result.secondary_links[sl][:method] %>
+			<%= link_to result.secondary_links[sl][:url].html_safe, :data => result.secondary_links[sl][:data] || {}, :method => result.secondary_links[sl][:method], :class => result.secondary_links[sl][:class] || {} do %>
+				<span class="m-20-right"><%= sl %></span>
+			<% end %>
+		<% else %>
+			<%= link_to result.secondary_links[sl][:url].html_safe, :data => result.secondary_links[sl][:data] || {}, :class => result.secondary_links[sl][:class] || {} do %>
+				<span class="m-20-right"><%= sl %></span>
+			<% end %>
 		<% end %>
 	<% end %>
 <% end %>

data/app/views/auth/search/authenticated_user_search.json

@@ -1,7 +1,7 @@
 <%= 
 
-updated_array = @search_results.map do |k|
-		k = k.as_json({}).merge({:_type => k._type})
+updated_array = @search_results.map do |k|	
+	k = k.as_json({}).merge({:_type => k._type}).merge({:tags => k.tags, :masked_tags => k.masked_tags, :primary_link => k.primary_link, :secondary_links => k.secondary_links})
 end
 
 updated_array.to_json.html_safe %>

data/app/views/auth/search/authenticated_user_search_with_masking.json

@@ -0,0 +1,15 @@
+<%= 
+
+updated_array = @search_results.map do |k|
+		if current_signed_in_resource
+			if current_signed_in_resource.is_owner?(k)
+				k = k.as_json({}).merge({:_type => k._type}).merge({:tags => k.tags, :masked_tags => k.masked_tags, :primary_link => k.primary_link, :secondary_links => k.secondary_links})
+			else
+				k = k.as_json({}).merge({:_type => k._type}).merge({:masked_tags => k.masked_tags, :primary_link => k.primary_link, :secondary_links => k.secondary_links})
+			end
+		else
+			k = k.as_json({}).merge({:_type => k._type}).merge({:tags => k.tags, :masked_tags => k.masked_tags, :primary_link => k.primary_link, :secondary_links => k.secondary_links})
+		end
+end
+
+updated_array.to_json.html_safe %>

data/app/views/auth/shopping/bar_codes/_barcode_input_field.html.erb

@@ -0,0 +1,16 @@
+<!-- will accept the 'f' form object -->
+<% if defined? f %>
+	<%= f.text_field :bar_code_tag, :class => "bar_code" %>
+	<%= f.label :bar_code_tag %>
+
+	<!-- need a checkbox for the remove_bar_code -->
+	<% if f.object.bar_code_tag %>
+		<p>
+			<%= f.label(:remove_bar_code) do %>
+				<%= f.check_box(:remove_bar_code) %>
+				<span>Remove Bar COde</span>	
+			<% end %>
+		</p>
+	<% end %>
+
+<% end %>

data/app/views/auth/shopping/bar_codes/_get_object_button.html.erb

@@ -0,0 +1,21 @@
+<!-- this placeholder word is replaced by the barcode in the bar_code.js script -->
+
+<%= link_to 'Go', bar_code_path({:id => 'placeholder', :bar_code => {:force_show => true, :go_to_next_step => true}}), :class => "waves-effect waves-light btn", :id => "get_barcode_object", :remote => true %>
+
+<form action="#">
+    <p>
+      <!-- if this is checked, then add force_show=true to the link as a query parameter -->
+      <label>
+        <input id="force_show" type="checkbox" />
+        <span>Show BarCode Entry</span>
+      </label>
+    </p>
+    <p>
+      <!-- if this is checked, then add go_to_next_step=true to the link as a query parameter -->
+      <!-- this is checked by default -->
+      <label>
+        <input id="go_to_next_step" type="checkbox" checked="checked" />
+        <span>Go To Next Step</span>
+      </label>
+    </p>
+</form>