ru_bee 0.0.8 → 0.0.9

data/lib/ru_bee/version.rb

@@ -1,3 +1,3 @@
 module RuBee
-  VERSION = "0.0.8"
+  VERSION = "0.0.9"
 end

data/lib/suggestion.rb

@@ -10,34 +10,51 @@ class Suggestion
   end
 
   def suggestions
-    result = try_1 
-    if result.count < 1
-      result = try_2
-      if try_2.count > 0
-        result = try_3
-      end
+    result = []
+    (0...5).each do |num|
+      result = self.send("try_#{num}", result)
+      break if result.count > 5
     end
     result
   end
 
-  def try_1
-    find(@word) | find(@word[0...-1]) | find(@word[0...-2])
+  def try_0 result
+    result | find_by_exp(/(^#{@word}.*)/) | 
+      find_by_exp(/(^#{@word[0...-1]}.*)/) | 
+      find_by_exp(/(^#{@word[0...-2]}.*)/)
   end
 
-  def try_2
+  def try_1 result
+    result | find(@word) | find(@word[0...-1]) | find(@word[0...-2])
+  end
+
+  def try_2 result
+    result |
     find(@word.reverse[0...-1].reverse) | 
       find(@word.reverse[0...-2].reverse) | 
       find(@word.reverse[0...-3].reverse)
   end
 
-  def try_3
-    @dictionary.join("\n").scan(/(.*[#{@word}]+.*)/).flatten
+  def try_3 result
+    result | find_by_exp(/(.*#{@word[0...3]}.*?[#{@word[0...-3]}]+.*)/)
+  end
+
+  def try_4 result
+    result | find_by_exp(/(.*[#{@word[0...3]}].*?#{@word[0...-3]}+.*)/)
+  end
+
+  def try_5 result
+    result | find_by_exp(/(.*[#{@word}]+.*)/)
   end
 
   def find word
     @dictionary.join("\n").scan(/(.*#{word}.*)/).flatten
   end
 
+  def find_by_exp exp 
+    @dictionary.join("\n").scan(exp).flatten
+  end
+
   def format sug_arr
     {word: @word, suggestions: sug_arr}
   end

data/spec/dictionary_spec.rb

@@ -7,7 +7,7 @@ describe Dictionary do
   describe '#contents' do
 
     it 'should have x amount contents' do
-      expect(dictionary.contents.count).to eq(235887)
+      expect(dictionary.contents.count).to eq(261473)
     end
 
   end

data/spec/scanner_spec.rb

@@ -34,7 +34,6 @@ describe String do
 
     it 'should return suggestions if optioned' do
       suggestions = test_string_bad.misspellings(suggestions: true)
-      expect(suggestions[0][:suggestions]).to eq([])
       answer = %w{berger brauneberger coberger johannisberger scharlachberger steinberger weinbergerite habergeon hauberget ramberge}
       expect(suggestions[1][:suggestions]).to eq(answer)
     end

data/spec/suggestion_spec.rb

@@ -37,7 +37,11 @@ describe Suggestion do
   describe '#try_1' do
     
     it 'should return 2 results' do
-      expect(suggestion.try_1).to eq(['tester', 'testit'])
+      expect(suggestion.try_1([])).to eq(['tester', 'testit'])
+    end
+
+    it 'should carry over results' do
+      expect(suggestion.try_1(['carryover'])).to eq(['carryover', 'tester', 'testit'])
     end
 
   end
@@ -45,7 +49,11 @@ describe Suggestion do
   describe '#try_2' do
     
     it 'should return 2 results' do
-      expect(suggestion.try_2).to eq(['tester', 'testit'])
+      expect(suggestion.try_2([])).to eq(['tester', 'testit'])
+    end
+
+    it 'should carry over results' do
+      expect(suggestion.try_2(['carryover'])).to eq(['carryover', 'tester', 'testit'])
     end
 
   end
@@ -53,7 +61,35 @@ describe Suggestion do
   describe '#try_3' do
     
     it 'should return 2 results' do
-      expect(suggestion.try_3).to eq(['tester', 'testit'])
+      expect(suggestion.try_3([])).to eq(['tester', 'testit'])
+    end
+
+    it 'should carry over results' do
+      expect(suggestion.try_3(['carryover'])).to eq(['carryover', 'tester', 'testit'])
+    end
+
+  end
+
+  describe '#try_4' do
+    
+    it 'should return 2 results' do
+      expect(suggestion.try_4([])).to eq(['tester', 'testit'])
+    end
+
+    it 'should carry over results' do
+      expect(suggestion.try_4(['carryover'])).to eq(['carryover', 'tester', 'testit'])
+    end
+
+  end
+
+  describe '#try_5' do
+    
+    it 'should return 2 results' do
+      expect(suggestion.try_5([])).to eq(['tester', 'testit'])
+    end
+
+    it 'should carry over results' do
+      expect(suggestion.try_5(['carryover'])).to eq(['carryover', 'tester', 'testit'])
     end
 
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ru_bee
 version: !ruby/object:Gem::Version
-  version: 0.0.8
+  version: 0.0.9
 platform: ruby
 authors:
 - dan
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-21 00:00:00.000000000 Z
+date: 2015-05-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler