wordjelly-auth 1.1.7 → 1.1.8

data/spec/dummy/app/views/layouts/application.html.erb

@@ -8,7 +8,6 @@
   <%= stylesheet_link_tag    "https://fonts.googleapis.com/icon?family=Material+Icons", media: "all" %>
   <%= javascript_include_tag "application" %>
   <%= csrf_meta_tags %>
-  
   <%= cloudinary_js_config %>
   <%= javascript_include_tag  "https://widget.cloudinary.com/global/all.js" %>
   

data/spec/dummy/app/views/new/notification.text.erb

@@ -1 +1 @@
-notification.text.erb
+hi this is a text partial.

data/spec/dummy/app/views/worms/new.html.erb

@@ -3,3 +3,6 @@
 <%= render 'form' %>
 
 <%= link_to 'Back', worms_path %>
+
+<% @model = @worm %>
+<%= render :partial => "auth/images/image_concern.html.erb" %>

data/spec/dummy/config/cloudinary.yml

@@ -1,19 +1,19 @@
 ---
 development:
   cloud_name: doohavoda
-  api_key: '779116626984783'
-  api_secret: cOGDGWqkPT9rQ-VtBxBb5ej1j50
+  api_key: <%= ENV["CLOUDINARY_API_KEY"] %>
+  api_secret: <%= ENV["CLOUDINARY_API_SECRET"] %>
   enhance_image_tag: true
   static_image_support: false
 production:
   cloud_name: doohavoda
-  api_key: '779116626984783'
-  api_secret: cOGDGWqkPT9rQ-VtBxBb5ej1j50
+  api_key: <%= ENV["CLOUDINARY_API_KEY"] %>
+  api_secret: <%= ENV["CLOUDINARY_API_SECRET"] %>
   enhance_image_tag: true
   static_image_support: true
 test:
   cloud_name: doohavoda
-  api_key: '779116626984783'
-  api_secret: cOGDGWqkPT9rQ-VtBxBb5ej1j50
+  api_key: <%= ENV["CLOUDINARY_API_KEY"] %>
+  api_secret: <%= ENV["CLOUDINARY_API_SECRET"] %>
   enhance_image_tag: true
   static_image_support: false

data/spec/dummy/config/initializers/preinitializer.rb

@@ -136,15 +136,12 @@ Mongoid::Elasticsearch.client_options = {hosts: ["localhost"], port: 9200, trans
 [Auth.configuration.product_class, Auth.configuration.cart_class, Auth.configuration.cart_item_class, Auth.configuration.payment_class, Auth.configuration.discount_class, Auth.configuration.user_class, Auth.configuration.assembly_class]. each do |cl|
 
   if ((cl) && (cl.constantize.respond_to? :es))
-    puts "CREATING INDEX : #{cl}  , IF IT DOESNT EXIST"
+
     cl.constantize.es.index.create
   end
 
 end
 
-puts "--------------------------------------------------------------------------------------------------------------------------------------------------------------------"
-
-
 
 ##TEST CODE TO RUN BEFORE EACH STARTUP.
 

data/spec/models/auth/work/minute_spec.rb

@@ -1,5 +1,5 @@
 require 'rails_helper'
-RSpec.describe Auth::Shopping::Product, type: :model, :minute_model => true do
+RSpec.describe Auth::Work::Minute, type: :model, :minute_model => true do
 
 	context " -- wrapper -- " do 
 
@@ -27,6 +27,8 @@ RSpec.describe Auth::Shopping::Product, type: :model, :minute_model => true do
 			clean_all_work_related_classes
 		end
 
+
+
 		it " -- adds the entity types and counts to the minutes -- ", :update_minute_entities => true do 
 
 			### CREATING PRODUCTS AND CYCLES
@@ -297,42 +299,49 @@ RSpec.describe Auth::Shopping::Product, type: :model, :minute_model => true do
 
 		end
 
-		it " -- finds the nearest minute to schedule the job -- " do 
-
-			## so we have three products that need to be done
-			## product 1 -> starts with cycle a : {worker_type_a => 1, entity_type_a => 1, :capacity => }
-			## product 2 -> starts with cycle b : {worker_type_a => 1, enttity_type_a => 1} : this could 
-			## product 3 -> starts with cycle c : {worker_type_b => 1}
-
-			## what if two products, need the same start cycle ?
-			## then they have to be fused, just bumping the capacity.
-			## so that will be the first step.
-			## a cycle runs on a certain set of samples.
-			## so basically we are looking for something with a minimum capacity of say 10.
-			## why not complicate this with redis
-			## wouldn't that be really fun.
-			## subtract total worker types found, from the maximum needed, 
-			## this not practical by any length.
-			## i need to structure the cycles like that.
-			## worker type a, worker type b, worker type c
-			## project a -> 
-			## so first of all have to build this.
-
-
-			## so in order to do this job, we need 2 workers of type a, and one of type b.
-			## the minimum's are to be found and defined first.
-			## so they will be the individual start cycle clauses.
-			## now the search is done for the bare minimum's
-			## 
+
+		it " -- finds the nearest minute to schedule the job -- ", :find_minutes => true do 
+
+			
+			minutes_hash = setup_minutes_with_cycles
+			
+			cycles = {}	
+
+			cycle_one = Auth::Work::Cycle.new
+			cycle_one.cycle_type = "a"
+			cycle_one.capacity = 1
+			cycle_one.requirements = {
+				:person_trained_on_em_200 => 1
+			}
+
+			cycles[cycle_one.id.to_s] = cycle_one
+
+			cycle_two = Auth::Work::Cycle.new
+			cycle_two.cycle_type = "b"
+			cycle_two.capacity = 1
+			cycle_two.requirements = {
+				:person_trained_on_em_200 => 1
+			}
+
+			cycles[cycle_two.id.to_s] = cycle_two
+
+			## why this is not working is because the minutes dont have anything in them.
+
+			applicable_minutes = Auth::Work::Minute.find_applicable_minutes(cycles)
+
+			applicable_minutes.each do |min|
+				puts min
+			end
 
 		end
-		
+
+=begin
+{"_id"=>BSON::ObjectId('5b2deab0421aa958e6e221d1'), "entity_types"=>{}, "time"=>2011-05-05 04:43:00 UTC, "cycles"=>[{"_id"=>BSON::ObjectId('5b2deab0421aa958e6e221cd'), "capacity"=>1, "time_since_prev_cycle"=>0, "output"=>[], "cycle_chain"=>[], "duration"=>10, "time_to_next_cycle"=>20, "cycle_type"=>"a", "requirements"=>{"person_trained_on_em_200"=>1}, "start_time"=>1304570580, "end_time"=>1304570590}, {"_id"=>BSON::ObjectId('5b2deab0421aa958e6e221ce'), "capacity"=>1, "time_since_prev_cycle"=>0, "output"=>[], "cycle_chain"=>["5b2deab0421aa958e6e221cd"], "duration"=>10, "time_to_next_cycle"=>20, "cycle_type"=>"b", "requirements"=>{"person_trained_on_em_200"=>1}, "cycle_code"=>"5b2deaaf421aa958e6e221c0", "start_time"=>1304570580, "end_time"=>1304570590}, {"_id"=>BSON::ObjectId('5b2deab0421aa958e6e221cf'), "capacity"=>1, "time_since_prev_cycle"=>0, "output"=>[], "cycle_chain"=>["5b2deab0421aa958e6e221cd", "5b2deab0421aa958e6e221ce"], "duration"=>10, "time_to_next_cycle"=>20, "cycle_type"=>"c", "requirements"=>{"person_trained_on_em_200"=>1, "em_200"=>1}, "cycle_code"=>"5b2deaaf421aa958e6e221c1", "start_time"=>1304570580, "end_time"=>1304570590}]}
+=end
+
+
 	end
 
 end
 
-## rough plan
-## 10 -> 20 : finish the cycles, and then decide what kind of ui it should have, test object + integration with shopping cart + notifications + video / image integration with cycle + bar code.
-## 20 -> 30 : b2b + collection boy interface + location interface + apis for the symptoms, videos, image + 
-## 20 -> 30 : cycle ui + symptom test
-## 1 -> 7 : add all the cycles and steps into the 
+

data/spec/requests/user/amazon_sns_request_spec.rb

@@ -52,12 +52,14 @@ RSpec.describe "Registration requests", :amazon_endpoint => true,:authentication
 
 	    end	
 
-		it " -- adds android endpoint to user -- " do 
+		it " -- adds android endpoint to user -- ", :user_endpoint => true do 
 
 		    a = {:id => @u2.id.to_s, :user => {:android_token => "xyz"}, api_key: @ap_key, :current_app_id => "testappid", :resource => "users"}
 		    
 		    put credential_exists_profiles_path, a.to_json, @headers
 
+		    #puts response.body.to_s
+		    #puts response.code.to_s
 		    ## get this user
 		    ## assert that it has an endpoint.
 		    user = User.find(@u2.id.to_s)
@@ -65,9 +67,39 @@ RSpec.describe "Registration requests", :amazon_endpoint => true,:authentication
 
 		end
 
-		it " -- creates android endpoint only from json request -- " do 
+		it " -- creates android endpoint only from json request -- ", :raw_endpoint => true do 
 
+			a = {:endpoint => {:android_token => "abc"}, api_key: @ap_key, :current_app_id => "testappid"}
 
+			post endpoints_path, a.to_json, { "CONTENT_TYPE" => "application/json" , "ACCEPT" => "application/json"}
+
+			
+
+			endpoint = JSON.parse(response.body)
+			expect(response.code).to eq("201")
+			expect(endpoint["android_endpoint"]).not_to be_nil
+
+		end
+
+
+		it " -- does not respond to the request if headers are non-json -- ", :json_only => true do 
+
+			a = {:endpoint => {:android_token => "abc"}, api_key: @ap_key, :current_app_id => "testappid"}
+
+			post endpoints_path, a.to_json, {}
+
+			expect(response.code).to eq("404")
+
+		end
+
+
+		it " -- does not respond without valid api key --- " do 
+
+			a = {:endpoint => {:android_token => "abc"}}
+
+			post endpoints_path, a.to_json, { "CONTENT_TYPE" => "application/json" , "ACCEPT" => "application/json"}
+
+			expect(response.code).to eq("401")
 
 		end
 

data/spec/support/work_support.rb

@@ -6,6 +6,139 @@ module WorkSupport
 			Auth::Work::Schedule.delete_all
 			Auth::Work::Minute.delete_all
 	end
+
+	
+	## creates three cycles
+	## creates two minutes
+	## adds the cycles to the minutes
+	## saves the minutes
+	## @return[Hash] {epoch => minute_object}
+	def setup_minutes_with_cycles
+
+		### CREATING PRODUCTS AND CYCLES
+		product = Auth.configuration.product_class.constantize.new
+		product.resource_id = @admin.id.to_s
+        product.resource_class = @admin.class.name
+        product.price = 10.00
+        product.signed_in_resource = @admin
+        
+        cycle = Auth::Work::Cycle.new
+        cycle.id = "first_cycle"
+        cycle.duration = 10
+        cycle.time_to_next_cycle = 20
+        cycle.cycle_type = "a"
+        cycle.requirements = {
+        	:person_trained_on_em_200 => 1
+        }
+        product.cycles << cycle
+
+        product.save
+
+
+        cycle = Auth::Work::Cycle.new
+        cycle.id = "second_cycle"
+        cycle.duration = 10
+        cycle.time_to_next_cycle = 20
+        cycle.cycle_type = "b"
+        cycle.requirements = {
+        	:person_trained_on_em_200 => 1
+        }
+        product.cycles << cycle
+
+        product.save
+
+
+        cycle = Auth::Work::Cycle.new
+        cycle.duration = 10
+        cycle.id = "third_cycle"
+        cycle.time_to_next_cycle = 20
+        cycle.cycle_type = "c"
+        cycle.requirements = {
+        	:person_trained_on_em_200 => 1,
+        	:em_200 => 1
+        }
+        product.cycles << cycle
+        
+        
+
+        u = User.new(attributes_for(:user_confirmed))
+        u.save
+        c = Auth::Client.new(:resource_id => @u.id, :api_key => "test", :app_ids => ["testappid"])
+        c.redirect_urls = ["http://www.google.com"]
+        c.versioned_create
+        u.client_authentication["testappid"] = "testestoken"
+        u.cycle_types = {:person_trained_on_em_200 => true}
+	    expect(u.save).to be_truthy
+
+	    
+
+	    ## now the next thing is the entity
+	    e = Auth::Work::Entity.new
+	    e.cycle_types = {:em_200 => true}
+	    e.save
+
+	    e1 = Auth::Work::Entity.new
+	    e1.cycle_types = {:em_200 => true}
+	    e1.save
+	    
+
+	    ## now we have to create schedules
+	    ## this one is for the user.
+	    schedule = Auth::Work::Schedule.new
+	    schedule.start_time = Time.new(2010,05,17)
+	    schedule.end_time = Time.new(2012,07,9)
+	    schedule.for_object_id = u.id.to_s
+	    schedule.for_object_class = u.class.name.to_s
+	    schedule.can_do_cycles = [product.cycles.first.id.to_s]
+	    schedule.location_id = "first_location"
+	    schedule.save
+
+
+	    ## now one for the entity
+		schedule = Auth::Work::Schedule.new
+	    schedule.start_time = Time.new(2010,05,17)
+	    schedule.end_time = Time.new(2012,07,9)
+	    schedule.for_object_id = e.id.to_s
+	    schedule.for_object_class = e.class.name.to_s
+	    schedule.can_do_cycles = [product.cycles.first.id.to_s]
+	    schedule.location_id = "first_location"
+	    schedule.save
+
+	    schedule = Auth::Work::Schedule.new
+	    schedule.start_time = Time.new(2010,05,17)
+	    schedule.end_time = Time.new(2012,07,9)
+	    schedule.for_object_id = e1.id.to_s
+	    schedule.for_object_class = e1.class.name.to_s
+	    schedule.can_do_cycles = [product.cycles.first.id.to_s]
+	    schedule.location_id = "first_location"
+	    schedule.save		    
+
+	    ## add the location
+	    l = Auth.configuration.location_class.constantize.new
+	    l.id = "first_location"
+	    l.save
+	    #puts l.attributes.to_s
+	    ## so for the minutes, they are going to be the first and second minute in the duration of the schedules
+	    minutes = {}
+	    first_minute = Auth::Work::Minute.new
+	    first_minute.time = Time.new(2011,05,5,10,12,0)
+	    minutes[first_minute.time.to_i] = first_minute
+
+	    ## and now the second minute
+		second_minute = Auth::Work::Minute.new
+	    second_minute.time = Time.new(2011,05,5,10,13,0)
+	    minutes[second_minute.time.to_i] = second_minute
+
+	    	
+	   	returned_minutes = Auth.configuration.product_class.constantize.schedule_cycles(minutes,"first_location")
+
+	   	returned_minutes.keys.each do |epoch|
+	   		expect(returned_minutes[epoch].save).to be_truthy
+	   	end
+
+	   	returned_minutes
+	end
+
 end
 RSpec.configure do |config|
 	config.include WorkSupport, :type => :request

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: wordjelly-auth
 version: !ruby/object:Gem::Version
-  version: 1.1.7
+  version: 1.1.8
 platform: ruby
 authors:
 - bhargav
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-06-20 00:00:00.000000000 Z
+date: 2018-06-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: xpath
@@ -670,6 +670,7 @@ files:
 - app/controllers/auth/concerns/shopping/payment_controller_concern.rb
 - app/controllers/auth/concerns/shopping/product_controller_concern.rb
 - app/controllers/auth/concerns/token_concern.rb
+- app/controllers/auth/concerns/work/communication_controller_concern.rb
 - app/controllers/auth/concerns/work/instruction_controller_concern.rb
 - app/controllers/auth/confirmations_controller.rb
 - app/controllers/auth/endpoints_controller.rb
@@ -690,6 +691,7 @@ files:
 - app/controllers/auth/unlocks_controller.rb
 - app/controllers/auth/webhooks_controller.rb
 - app/controllers/auth/work/bullets_controller.rb
+- app/controllers/auth/work/communications_controller.rb
 - app/controllers/auth/work/instructions_controller.rb
 - app/controllers/auth/work/work_controller.rb
 - app/controllers/auth/workflow/assemblies_controller.rb
@@ -728,9 +730,11 @@ files:
 - app/helpers/auth/users/profiles_helper.rb
 - app/helpers/auth/work/bullets/bullets_helper.rb
 - app/helpers/auth/work/instructions/instructions_helper.rb
+- app/jobs/notification_job.rb
 - app/jobs/otp_job.rb
 - app/mailers/application_mailer.rb
 - app/mailers/auth/notifier.rb
+- app/mailers/auth/send_mail.rb
 - app/models/auth/admin_create_user.rb
 - app/models/auth/client.rb
 - app/models/auth/concerns/activity_concern.rb
@@ -783,6 +787,7 @@ files:
 - 'app/models/auth/work/VICTORY SPEECH:'
 - app/models/auth/work/actor.rb
 - app/models/auth/work/bullet.rb
+- app/models/auth/work/communication.rb
 - app/models/auth/work/cycle.rb
 - app/models/auth/work/entity.rb
 - app/models/auth/work/information.rb
@@ -900,6 +905,7 @@ files:
 - app/views/auth/search/_search_results.html.erb
 - app/views/auth/search/authenticated_user_search.js.erb
 - app/views/auth/search/authenticated_user_search.json
+- app/views/auth/send_mail/send.html.erb
 - app/views/auth/sessions/create.js.erb
 - app/views/auth/sessions/new.html.erb
 - app/views/auth/sessions/new.js.erb
@@ -966,9 +972,13 @@ files:
 - app/views/auth/work/bullets/_show.html.erb
 - app/views/auth/work/bullets/edit.html.erb
 - app/views/auth/work/bullets/new.html.erb
+- app/views/auth/work/communications/_form.html.erb
 - app/views/auth/work/instructions/_form.html.erb
+- app/views/auth/work/instructions/_image.html.erb
 - app/views/auth/work/instructions/_show.html.erb
 - app/views/auth/work/instructions/edit.html.erb
+- app/views/auth/work/instructions/new.html.erb
+- app/views/auth/work/instructions/show.html.erb
 - app/views/layouts/auth/_modals.html.erb
 - app/views/layouts/auth/application.html.erb
 - app/views/layouts/auth/navbar/_navbar.html.erb
@@ -976,6 +986,7 @@ files:
 - app/views/layouts/auth/navbar/_progress_spinner.html.erb
 - app/views/layouts/mailer.html.erb
 - app/views/layouts/mailer.text.erb
+- app/views/layouts/send_mail.html.erb
 - config/initializers/active_model.rb
 - config/initializers/aws.rb
 - config/initializers/devise.rb