model_citizen 0.0.5 → 0.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4bc5e3aa17583826ceda631c7d3b90b8b276f117
-  data.tar.gz: 235c080c4e945208f5d9b0a0bbf2d21766acee79
+  metadata.gz: 3bc4e6c31d7ad4a3e168e3ce96b5e0177ed77e22
+  data.tar.gz: 684aac0117de260f271e1d355d82963c8c437585
 SHA512:
-  metadata.gz: 6453dfc59687b9e815eff1c792fa8c8529c8d3c7de0a44d1ac4db8896474dbf5671e5365e012de13629b621e0407f115c4446032aaa7da5bd4a7e214c687e11c
-  data.tar.gz: 5085e64d7a9589f55de7caeef136390d8c10f4e75740f623ae11b7ff7f9e8227934ca4ca85f49a3cf15265575ce73f3975eca312521e87b390e8e8e5d5c93a60
+  metadata.gz: 5d10dd098d6018d23cbf1db1a7cf94c4a157df4c27f585ca86f5c54396958c0da5c30f75ac241042172fd0331d389ee60bac9bbcf0f24b4c27585062be52bda4
+  data.tar.gz: 76cfe3c7a1b809af2611ee126f8b8d403b0c0477a5a81c8479989c1fc67cdb28043c16a0488c8db30c42ac99edfd6227b39849059eff49938df0eaff5a1ef56d

data/lib/model_citizen/messages.rb

@@ -4,32 +4,17 @@ module ModelCitizen
     attr_reader :messages
 
     def initialize
-      @messages = {"username_prompt" => "Please enter your username to get started",
-                   "choose_action" => "Please select what you'd like to do" ,
-                   "invalid_username" => "That is not a valid username, please try again",
-                   "invalid_timesheet" => "That is not a valid timesheet, please try again",
-                   "invalid_client" => "That is not a valid client, please try again",
-                   "invalid_employee" => "That is not a valid employee, please try again",
-                   "timesheet_success" => "Your timesheet has been successfully saved",
-                   "client_success" => "Client has been saved",
-                   "employee_success" => "Employee has been saved",
-                   "invalid_choice" => "That is not a valid choice, please try again",
-                   "enter_billing_type" => "Please enter project type",
-                   "enter_employee_first" => "Please enter employee first name",
-                   "enter_employee_last" => "Please enter employee last name",
-                   "enter_employee_username" => "Please enter employee username",
-                   "enter_employee_type" => "Please enter employee type (admin or non-admin)",
-                   "enter_client_name" => "Please enter client name",
-                   "enter_client_type" => "Please enter client type (if regular client, please enter 'standard')",
-                   "enter_date" => "Please input the project date using this format : YYYY/MM/DD",
-                   "future_date_error" => "You cannot log time for the future, please select a different date",
-                   "enter_hours" => "Please input hours worked",
-                   "log_time" => "Log time",
-                   "request_report" => "Request time report",
-                   "add_employee" => "Add employee",
-                   "add_client" => "Add client",
-                   "no_time_to_display" => "No time to display for this month",
-                   "request_employee_report" => "Request employee report"}
+      @messages = {
+        :invalid_username => "That is not a valid username, please try again",
+        :invalid_timesheet => "That is not a valid timesheet, please try again",
+        :invalid_client => "That is not a valid client, please try again",
+        :invalid_employee => "That is not a valid employee, please try again",
+        :timesheet_success => "Your timesheet has been successfully saved",
+        :client_success => "Client has been successfully saved",
+        :employee_success => "Employee has been successfully saved",
+        :future_date_error => "You cannot log time for the future, please select a different date",
+        :no_time_to_display => "No time to display for this month",
+        }
     end
 
     def get_message(message_choice)

data/lib/model_citizen/version.rb

@@ -1,3 +1,3 @@
 module ModelCitizen
-  VERSION = "0.0.5"
+  VERSION = "0.0.6"
 end

data/spec/messages_spec.rb

@@ -2,65 +2,49 @@ require "spec_helper"
 
 describe ModelCitizen::Messages do
 
-  context "displaying messages" do
-    it "should return a prompt to enter username" do
-      type_validator = ModelCitizen::Messages.new.get_message("username_prompt")
-      expect(type_validator).to eq("Please enter your username to get started")
-    end
-
-    it "should return a choose action message" do
-      type_validator = ModelCitizen::Messages.new.get_message("choose_action")
-      expect(type_validator).to eq("Please select what you'd like to do")
-    end
+  context "displaying error messages" do
 
-    it "should return an error message" do
-      type_validator = ModelCitizen::Messages.new.get_message("invalid_choice")
-      expect(type_validator).to eq("That is not a valid choice, please try again")
+    it "should return an error if username is invalid" do
+      type_validator = ModelCitizen::Messages.new.get_message(:invalid_username)
+      expect(type_validator).to eq("That is not a valid username, please try again")
     end
 
-    it "should return a prompt to enter employee first name" do
-      type_validator = ModelCitizen::Messages.new.get_message("enter_employee_first")
-      expect(type_validator).to eq("Please enter employee first name")
+    it "should return an error if timesheet is invalid" do
+      type_validator = ModelCitizen::Messages.new.get_message(:invalid_timesheet)
+      expect(type_validator).to eq("That is not a valid timesheet, please try again")
     end
 
-    it "should return a prompt to enter employee last name" do
-      type_validator = ModelCitizen::Messages.new.get_message("enter_employee_last")
-      expect(type_validator).to eq("Please enter employee last name")
+    it "should return an error if client is invalid" do
+      type_validator = ModelCitizen::Messages.new.get_message(:invalid_client)
+      expect(type_validator).to eq("That is not a valid client, please try again")
     end
 
-    it "should return a prompt tp enter employee username" do
-      type_validator = ModelCitizen::Messages.new.get_message("enter_employee_username")
-      expect(type_validator).to eq("Please enter employee username")
+    it "should return an error if employee is invalid" do
+      type_validator = ModelCitizen::Messages.new.get_message(:invalid_employee)
+      expect(type_validator).to eq("That is not a valid employee, please try again")
     end
 
-    it "should return a prompt to enter employee type" do
-      type_validator = ModelCitizen::Messages.new.get_message("enter_employee_type")
-      expect(type_validator).to eq("Please enter employee type (admin or non-admin)")
-    end
-
-    it "should return a prompt to enter client name" do
-      type_validator = ModelCitizen::Messages.new.get_message("enter_client_name")
-      expect(type_validator).to eq("Please enter client name")
+    it "should return an error for logging time in the future" do
+      type_validator = ModelCitizen::Messages.new.get_message(:future_date_error)
+      expect(type_validator).to eq("You cannot log time for the future, please select a different date")
     end
+  end
 
-    it "should return a prompt for client type" do
-      type_validator = ModelCitizen::Messages.new.get_message("enter_client_type")
-      expect(type_validator).to eq("Please enter client type (if regular client, please enter 'standard')")
-    end
+  context "displaying success messages" do
 
-    it "should return a prompt to input the date" do
-      type_validator = ModelCitizen::Messages.new.get_message("enter_date")
-      expect(type_validator).to eq("Please input the project date using this format : YYYY/MM/DD")
+    it "should return a success message if timesheet is valid" do
+      type_validator = ModelCitizen::Messages.new.get_message(:timesheet_success)
+      expect(type_validator).to eq("Your timesheet has been successfully saved")
     end
 
-    it "should return an error for logging time in the future" do
-      type_validator = ModelCitizen::Messages.new.get_message("future_date_error")
-      expect(type_validator).to eq("You cannot log time for the future, please select a different date")
+    it "should return a success message if client is valid" do
+      type_validator = ModelCitizen::Messages.new.get_message(:client_success)
+      expect(type_validator).to eq("Client has been successfully saved")
     end
 
-    it "should return a prompt for hours" do
-      type_validator = ModelCitizen::Messages.new.get_message("enter_hours")
-      expect(type_validator).to eq("Please input hours worked")
+    it "should return a success message if employee is valid" do
+      type_validator = ModelCitizen::Messages.new.get_message(:employee_success)
+      expect(type_validator).to eq("Employee has been successfully saved")
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: model_citizen
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
 platform: ruby
 authors:
 - Sylwia Olak
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-15 00:00:00.000000000 Z
+date: 2015-02-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler