replacer_bot 0.1.1.pre.rc1 → 0.1.1.pre.rc2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f2a369cf5d62f75a206c64ec2f2fed6490b688c3
-  data.tar.gz: ace466966daaf290e16b44055d7dd41b64267474
+  metadata.gz: 3826a9d118356a0f052648585a26e6a0583b570a
+  data.tar.gz: badfd138905d15a4ca6dc52d8c11d0ff04207c61
 SHA512:
-  metadata.gz: 1ae3d0d9c21d8f7059ce1bf76fc22d226edcc8ba4364389b1b0851ff4830f881c69910617bc8d2ae3934766d8abcd442c6b9f0133a5763b966837d06f26731b4
-  data.tar.gz: e0823bf012f30e62ebd4f8eb4f2d33fe9f2c57a522e8a11d3770d57c9370a68bd3a2bfa521db52a630445b8bea74fa8ee16039f243a16e411343da9090c6de65
+  metadata.gz: 72c4e941085e4ecf3406ab028584b999683e9b952f057fccf9cbaf78adfc70ded5e294bb423d5bf2d49ad7f2632517c30cda9d0ed015d7be5c3553b7202bb1fc
+  data.tar.gz: a8c07e4495fa7e81c39fe4ee969dd6dc0e9d820ee9c6edc72a1ad846bcda97fdf5baf40ab67a36ba9f7996d87001ed145173595bc218d305718d73c58452598c

data/lib/replacer_bot/helpers.rb

@@ -13,7 +13,6 @@ end
 
 module ReplacerBot
   def self.encode term:
-    return term if self.complex_search(string: term)
     URI.encode "\"#{term}\""
   end
 
@@ -39,22 +38,10 @@ module ReplacerBot
   def self.validate string:, term: Config.instance.config.search_term, ignore_spaces: true
     return false if string[0...2] == 'RT'
     return false if string[0] == '@'
+    return false unless self.has_extra_terms(string: string)
 
-    unless self.complex_search(string: term)
-      term = term.gsub ' ', ' ?' if ignore_spaces
-    end
+    term = term.gsub ' ', ' ?' if ignore_spaces
     return true if string.index(/#{term}/i) && SeenTweets.validate(string)
-    return true if self.complex_search(string: term)
-
-    false
-  end
-
-  def self.complex_search string:
-    ['OR', 'AND'].map do |word|
-      if string.index " #{word} "
-        return true
-      end
-    end
 
     false
   end
@@ -64,6 +51,16 @@ module ReplacerBot
       select { |i| i.id > self.last_tweet}
   end
 
+  def self.has_extra_terms string:
+    return true unless Config.instance.config.extra_search_terms
+
+    Config.instance.config.extra_search_terms.each do |term|
+      return true if string.downcase.index term.downcase
+    end
+
+    false
+  end
+
   def self.dehash word
     if is_hashtag word
       return word[1..-1]

data/lib/replacer_bot/version.rb

@@ -1,3 +1,3 @@
 module ReplacerBot
-  VERSION = "0.1.1-rc1"
+  VERSION = "0.1.1-rc2"
 end

data/spec/lib/replacer_bot/advanced_search_spec.rb

@@ -1,8 +1,8 @@
 module ReplacerBot
   describe Replacer do
     before :each do
-    #  Config.instance.config.search_term = "artificial intelligence AND (detect OR predict)"
-      Config.instance.config.search_term = "everton AND (koeman OR goodison)"
+      Config.instance.config.search_term = "joe root"
+      Config.instance.config.extra_search_terms = [ "ashes", "england" ]
     end
 
     after :each do
@@ -23,12 +23,21 @@ module ReplacerBot
       end
 
       it 'finds the correct tweets', :vcr do
-        expect(replacer.search.first.text).to match /everton/i
-      #  expect(replacer.search.all? { |tweet| tweet.text.match /everton/i }).to eq true
+        expect(replacer.search.first.text).to match /joe root/i
+      #  expect(replacer.search.all? { |tweet| tweet.text.match /(detect|predict)/i }).to eq true
+      end
+    end
+
+    context 'search helper' do
+      it 'matches against extra search terms' do
+        Config.instance.config.extra_search_terms = [ "predict", "future" ]
+        expect(ReplacerBot.has_extra_terms string: "foo").to eq false
+        expect(ReplacerBot.has_extra_terms string: "foo in the future").to eq true
       end
 
-      it 'finds English tweets', :vcr do
-        expect(replacer.search.all? { |tweet| tweet.lang == 'en' }).to eq true
+      it 'does the right thing with no extra terms' do
+        Config.instance.config.extra_search_terms = nil
+        expect(ReplacerBot.has_extra_terms string: "foo").to eq true
       end
     end
   end

data/spec/lib/replacer_bot/helpers_spec.rb

@@ -53,16 +53,9 @@ module ReplacerBot
       it 'filters retweets' do
         expect(ReplacerBot.validate string: 'RT @xyz This is about Open Data').to eq false
       end
-
       it 'filters direct replies' do
         expect(ReplacerBot.validate string: '@abc This is a reply about Open Data').to eq false
       end
-
-      it 'knows what a Complex Search is' do
-        expect(ReplacerBot.complex_search string: 'this OR that').to eq true
-        expect(ReplacerBot.complex_search string: 'this AND that').to eq true
-        expect(ReplacerBot.complex_search string: 'this, that').to eq false
-      end
     end
 
     context 'search and replace' do