presume 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9f7cffcbceea0dbba9c09052aef226006988e2e8
-  data.tar.gz: d2f85fd5e4705f57d7d6e21795fb5555ed572481
+  metadata.gz: 13cb96922821572cccc2881d5b0a7c22dafc16d6
+  data.tar.gz: 69ee0ec5baa75bb2b8e4e4170e09ccb7f171f511
 SHA512:
-  metadata.gz: 2bf2cdcd853b5fe8692243bd67397f1664482ea0750bad9cc1212f3c979163c950d941b3b27ae0db3d0837e9c5c5c27387cd59158b0fdf625291e6d2ab0ac425
-  data.tar.gz: 9ead41c210079f8494421cbe0b9d08b5470d2aea2419c3a87f514581ead44418c4cab96e9d4201d9c4418621e336f6951f9391b1d5cabaf8e07dec68936c4c2e
+  metadata.gz: c22668853c786dbad5c30986d1919e875dbe06ef1601861188f536aeac3787770d5a1e6b802e318e1cb1e23a2959f520d06102771ea5cd0e56385d220fea55ca
+  data.tar.gz: 300f8f75d369ef5ceda7d44847361ce4ec2af9d828be336f17e6567b5ab77d6dcc33e418aa4517306b1ae3eb6eaa45f13ce858c6438c533db449813ad027474c

data/README.md

@@ -66,12 +66,12 @@ Checks resumes for specific skills, positions, and their duration
     # After parsing a resume
 
     # Checking for certain position or education ("name", expected_minimum_duration_in_years)
-    intake_hash = {"Project Coordinator|Project Assistant" => 1, "Bachelors Finance|BF|B.F." => 4}
+    intake_hash = {"Project Coordinator,Project Assistant" => 1, "Bachelors Finance|BF|B.F." => 4}
 
     # Check for positions
     presume.positions?(intake_hash)
     
-    #=> {"Project Coordinator|Project Assistant" => [ MatchedHeaderObject1 ], "Bachelors Finance|BF|B.F." => [ MatchedHeaderObject2 ]}
+    #=> {"Project Coordinator,Project Assistant" => [ MatchedHeaderObject1 ], "Bachelors Finance|BF|B.F." => [ MatchedHeaderObject2 ]}
 
     # Checking for certain skills ("name", expected_minimum_duration_in_years)
     intake_hash = {"database management" => 1, "clear communication" => 0}

data/lib/classes/searchable.rb

@@ -7,12 +7,25 @@ class Searchable
 		@duration = hash[:duration]
 	end
 
+	def separate_synonyms
+		@separate_synonyms ||= @raw_name.split(Regexp.new("(| )\,(| )"))
+	end
+
+	def add_synonyms_to_names
+		@names = {}
+		separate_synonyms.each do |synonym|
+			@names[synonym] = []
+		end
+	end
+
 	def names
 		if @names.nil?
-			@names = []
-			@searchable_words = @raw_name.downcase.split
-			@searchable_words.each do |word|
-				@names += [stemmed(word)]
+			add_synonyms_to_names
+			separate_synonyms.length.times do |n|
+				@searchable_words = separate_synonyms[n].downcase.split
+				@searchable_words.each do |word|
+					@names[separate_synonyms[n]] += [stemmed(word)]
+				end
 			end
 			@names
 		else
@@ -22,12 +35,30 @@ class Searchable
 
 	def regex
 		if @regex.nil?
-			@regexes = ""
-			names.each do |name|
-				@regexes += '(?=.*' + name + ')'
+			@separate_regexes = []
+			separate_synonyms.length.times do |n|
+				@regexes = ""
+				names[separate_synonyms[n]].each do |name|
+					@regexes += '(?=.*' + name + ')'
+				end
+				@regexes += ".*"
+				@separate_regexes += [@regexes]
+			end
+			
+			@regex_count = 0
+			
+			@separate_regexes.each do |separate_regex|
+				@regex_count += 1
+				@new_regex = Regexp.new(separate_regex, "i")
+			
+				if @regex_count == 1
+					@regex = @new_regex
+				else
+					@regex = Regexp.union(@regex, @new_regex)
+				end
 			end
-			@regexes += ".*"
-			@regex = Regexp.new(@regexes, "i")
+		
+			@regex
 		else
 			@regex
 		end

data/spec/searchable_spec.rb

@@ -3,8 +3,10 @@ require 'spec_helper'
 describe Searchable do
 
 	searchable_params = {raw_name: "marketing coordinator", duration: 1}
+	searchable_params_2 = {raw_name: "marketing coordinator,marketing assistant", duration: 1}
 	let(:searchables) {Searchables.new({"marketing coordinator" => 1})}
 	let(:searchable){Searchable.new(searchable_params)}
+	let(:searchable_2){Searchable.new(searchable_params_2)}
 	
 	it "takes hash input" do
 		searchables.all
@@ -29,6 +31,11 @@ describe Searchable do
 		expect(searchable.check_regex("marketing possey")).to be_falsy
 	end
 
+	it "separates synonyms" do
+		expect(searchable_2.separate_synonyms.class.name).to eq("Array")
+		expect(searchable.separate_synonyms.class.name).to eq("Array")
+	end
+
 
 
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: presume
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - Leigh Silverstein