From 9829e04f13396560259981a15f453a3f848dd8f3 Mon Sep 17 00:00:00 2001 From: BryanReese Date: Tue, 12 Sep 2017 15:44:02 -0700 Subject: [PATCH 1/4] warmup completed --- warmup.rb | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/warmup.rb b/warmup.rb index b343bb8..3b73ed4 100644 --- a/warmup.rb +++ b/warmup.rb @@ -1,17 +1,21 @@ # Run `rspec spec/the_warmup_spec.rb` to get started. def say_hello - "hi" + "hello" end def scream(message) - message + message.upcase+"!" end -def first_char - "z" +def first_char(word) + word[0].downcase end -def polly_wanna - "crackercrackercracker" +def polly_wanna(word) + word*3 end + +def after_you +"no, after you" +end \ No newline at end of file From 5d2bee8d67cd2fbacf4fa96870f9c40f144e70f5 Mon Sep 17 00:00:00 2001 From: BryanReese Date: Tue, 12 Sep 2017 20:06:44 -0700 Subject: [PATCH 2/4] format-name --- username.rb | 60 +++++++++++++++++++++++++++++++++++++++++++++++++---- 1 file changed, 56 insertions(+), 4 deletions(-) diff --git a/username.rb b/username.rb index 21fa043..0e568e5 100644 --- a/username.rb +++ b/username.rb @@ -2,13 +2,65 @@ # Run `rspec /spec/username_spec.rb` to get started. def format_name(first, last) - nil +if first.length<1 || last.length<1 + nil +else + first = first.split.join + last = last.split.join + str = (first[0]+last).downcase end +end + + + + +def check_privilege(type) + +if type.floor == 1 + "seller" + +elsif type.floor == 2 + "manager" -def format_year - nil +elsif type.floor == 3 + "admin" + +else + "user" + + end end + + +def user_type_prefix(type) + if type.floor == 1 + "seller"+"-" + +elsif type.floor == 2 + "manager"+"-" + +elsif type.floor == 3 + "admin"+"-" + +else + "user"+"-" + + end +end + + + + + + +def format_year(year) + year.to_s.length == 4 ? year.to_s.slice(-2,2) : nil +end + + + + def build_username - nil + nil end From 8fe01f3ccd2af65d8b20f2c8bde45b3e087b6768 Mon Sep 17 00:00:00 2001 From: BryanReese Date: Tue, 12 Sep 2017 20:45:28 -0700 Subject: [PATCH 3/4] generate-username --- username.rb | 23 +++++++++++++++++++---- 1 file changed, 19 insertions(+), 4 deletions(-) diff --git a/username.rb b/username.rb index 0e568e5..fbe9413 100644 --- a/username.rb +++ b/username.rb @@ -13,7 +13,7 @@ def format_name(first, last) - +#not sure why this doesnt passr def check_privilege(type) if type.floor == 1 @@ -60,7 +60,22 @@ def format_year(year) +def generate_username(privilege_level, year, first, last) -def build_username - nil -end + date = year.to_s.slice(-2,2) + username = (first[0]+last).downcase + +if privilege_level.floor == 1 + "seller"+"-"+username+date + +elsif privilege_level.floor == 2 + "manager"+"-"+username+date + +elsif privilege_level.floor == 3 + "admin"+"-"+username+date + +else + "user"+"-"+username+date + + end +end \ No newline at end of file From cefcfb9bbd6c80299b41a759d577e58864306904 Mon Sep 17 00:00:00 2001 From: BryanReese Date: Wed, 13 Sep 2017 15:10:48 -0700 Subject: [PATCH 4/4] hw --- username.rb | 28 ++++++++++++++++------------ 1 file changed, 16 insertions(+), 12 deletions(-) diff --git a/username.rb b/username.rb index fbe9413..c96f991 100644 --- a/username.rb +++ b/username.rb @@ -1,5 +1,5 @@ -# Make sure to run the tests in your /spec folder -# Run `rspec /spec/username_spec.rb` to get started. +# # Make sure to run the tests in your /spec folder +# # Run `rspec /spec/username_spec.rb` to get started. def format_name(first, last) if first.length<1 || last.length<1 @@ -7,7 +7,7 @@ def format_name(first, last) else first = first.split.join last = last.split.join - str = (first[0]+last).downcase + str = (first[0]+last).downcase.gsub(/[^0-9a-z]/i, '') end end @@ -53,29 +53,33 @@ def user_type_prefix(type) - def format_year(year) year.to_s.length == 4 ? year.to_s.slice(-2,2) : nil end -def generate_username(privilege_level, year, first, last) - date = year.to_s.slice(-2,2) - username = (first[0]+last).downcase +def generate_username(first_name, last_name, birth_year, privilege_level) + + date = birth_year.to_s.slice(-2,2) + username = (first_name[0]+last_name).downcase if privilege_level.floor == 1 - "seller"+"-"+username+date + username+date elsif privilege_level.floor == 2 - "manager"+"-"+username+date + username+date elsif privilege_level.floor == 3 - "admin"+"-"+username+date + username+date else - "user"+"-"+username+date + username+date end -end \ No newline at end of file +end + + + +