ayadn 2.0.10 → 2.0.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bf33bfde8fef88cb0cfb82f45fd388fc05147539
-  data.tar.gz: 0a7ec547cdc0dccc4b4de1e852436d4448fc6687
+  metadata.gz: e8855a888a4df8b8a2ce5faaec1b09a9e52a4eb0
+  data.tar.gz: 4fda3a6a7938cae52d79f8754d0d64aa0e528fd4
 SHA512:
-  metadata.gz: 5e70d85dc634475b3cb2b3a238b7090a9e5d3a77017af178e76c0a50653cf52ab61fa8cdc7d9362cbce1e47830f9cc21b22b3062767d7bbab40b83ea587f82da
-  data.tar.gz: dd7958ee8d7a976ac3ddceb331d00c19adec0833a4f1bd8789f17c95f9de9e041833bfba74decce8bad2e736d23f0eed63d2129e714f60e09aed3e0cd676edef
+  metadata.gz: f80c1b862b0ffc912501739b8e5ec9ea1f13d3bd59cbc984999549d192133dac899f6a047a137d2187a94728d84303212bc400ff328ddfd364f3c7eef2a86353
+  data.tar.gz: 0b541f61aa144fcca671072e8d1d0ed729eb7a82013dfdbb0adae7ca1c274e070744f9ba894d48a8a27e993a73c973d2f2bb9ccda9f7f0dbf4eb41935f0dcf06

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+## 2.0.11 - 2015-04-12 - 'Pink'
+
+- New: add single words to the blacklist
+- Fix: ignore unknown emoji modifiers (temporary)
+
 ## 2.0.10 - 2015-02-21 - 'Haneke'
 
 - New: cache results in Lists (and replay requests instantly)

data/doc/11-blacklist.md

@@ -16,13 +16,15 @@ Blacklist a user and, well, never see this user again.
 
 Blacklist a mention and you won't even see posts by other users mentioning the user you blacklisted!
 
+You can even blacklist a single keyword if you *really* don't want to see something.
+
 *Since Ayadn 2.0, adding and removing to/from the blacklist takes immediately effect and is shared with other Ayadn instances launched by the same user.*
 
 ## ADD
 
 Adds an item to your blacklist.
 
-Available items: client, hashtag, user, mention.
+Available items: client, hashtag, user, mention, word.
 
 `ayadn blacklist add mention @shmuck`
 
@@ -42,11 +44,15 @@ Add a hashtag:
 
 `ayadn -K add hashtag twitter`
 
+Add a keyword:
+
+`ayadn -K add word poo`
+
 ## REMOVE
 
 Removes an item from your blacklist.
 
-Available items: client, hashtag, user, mention.
+Available items: client, hashtag, user, mention, word.
 
 `ayadn blacklist remove mention @shmuck`
 
@@ -66,6 +72,10 @@ Remove a hashtag:
 
 `ayadn -K remove hashtag twitter`
 
+Remove a keyword:
+
+`ayadn -K remove word poo`
+
 ## LIST
 
 List all items in your blacklist.

data/lib/ayadn.rb

@@ -2,7 +2,7 @@
 
 begin
   require_relative 'ayadn/version'
-  %w{rest_client json thor rainbow/ext/string terminal-table yaml logger fileutils io/console unicode_utils/char_type readline amalgalite fast_cache}.each { |r| require "#{r}" }
+  %w{rest_client json thor rainbow/ext/string terminal-table yaml logger fileutils io/console unicode_utils readline amalgalite fast_cache}.each { |r| require "#{r}" }
   Rainbow.enabled = true
   require_relative 'ayadn/app'
 rescue LoadError => e

data/lib/ayadn/blacklist.rb

@@ -1,7 +1,7 @@
 # encoding: utf-8
 module Ayadn
   class Blacklist < Thor
-    desc "add TYPE TARGET", "Adds a mention, hashtag, client or username to your blacklist"
+    desc "add TYPE TARGET", "Adds a mention, hashtag, client, username or keyword to your blacklist"
     map "create" => :add
     long_desc Descriptions.blacklist_add
     def add(*args)
@@ -13,7 +13,7 @@ module Ayadn
       Status.new.done
     end
 
-    desc "remove TYPE TARGET", "Removes a mention, hashtag, client or username from your blacklist"
+    desc "remove TYPE TARGET", "Removes a mention, hashtag, client, username or keyword from your blacklist"
     map "delete" => :remove
     long_desc Descriptions.blacklist_remove
     def remove(*args)
@@ -101,6 +101,10 @@ module Ayadn
         when 'hashtag', 'tag'
           Databases.add_to_blacklist('hashtag', args)
           Logs.rec.info "Added '#{args}' to blacklist of hashtags."
+        when 'word', 'keyword'
+          args = args.map { |w| w.gsub(/[~:-;,?!\'&`^=+<>*%()\/"“”’°£$€.…]/, "") }
+          Databases.add_to_blacklist('word', args)
+          Logs.rec.info "Added '#{args}' to blacklist of words."
         else
           Status.new.wrong_arguments
         end
@@ -124,6 +128,10 @@ module Ayadn
         when 'hashtag', 'tag'
           Databases.remove_from_blacklist('hashtag', args)
           Logs.rec.info "Removed '#{type}:#{args}' from blacklist."
+        when 'word', 'keyword'
+          args = args.map { |w| w.gsub(/[~:-;,?!\'&`^=+<>*%()\/"“”’°£$€.…]/, "") }
+          Databases.remove_from_blacklist('word', args)
+          Logs.rec.info "Removed '#{type}:#{args}' from blacklist."
         else
           Status.new.wrong_arguments
         end

data/lib/ayadn/descriptions.rb

@@ -1680,17 +1680,21 @@ module Ayadn
 
       `ayadn -K add client 'Spammy Unknown Client'`
 
+      `ayadn -K add word poo`
+
       `ayadn -K remove mention @shmuck`
 
       `ayadn -K remove hashtag sports`
 
       `ayadn -K remove client IFTTT`
+
+      `ayadn -K remove word poo`
       \n\n
       USAGE
     end
     def self.blacklist_add
       <<-USAGE
-      Adds a mention, hashtag or client to your blacklist.
+      Adds a mention, hashtag, client or keyword to your blacklist.
 
       You don't have to respect the case as all data is recorded downcase.
 
@@ -1705,12 +1709,14 @@ module Ayadn
       `ayadn -K add client IFTTT`
 
       `ayadn -K add client 'Spammy Unknown Client'`
+
+      `ayadn -K add word poo`
       \n\n
       USAGE
     end
     def self.blacklist_remove
       <<-USAGE
-      Removes a mention, hashtag or client from your blacklist.
+      Removes a mention, hashtag, client or keyword from your blacklist.
 
       You don't have to respect the case as all data is recorded downcase.
 
@@ -1723,6 +1729,8 @@ module Ayadn
       `ayadn -K remove hashtag sports`
 
       `ayadn -K remove client IFTTT`
+
+      `ayadn -K remove word poo`
       \n\n
       USAGE
     end

data/lib/ayadn/nowplaying.rb

@@ -239,7 +239,10 @@ module Ayadn
     def get_itunes_store url, artist, track
       results = JSON.load(CNX.download(URI.escape(url)))['results']
 
-      # puts results.inspect
+      #
+      # require 'pp'; pp results; exit
+      # 
+      
       unless results.nil?
 
         if results.empty?
@@ -255,7 +258,10 @@ module Ayadn
           next if e['artistName'].nil?
           candidates << e if e['artistName'].downcase == artist.downcase
         end
+
+        #
         # require "pp";pp candidates; exit
+        #
 
         candidate = if candidates.empty?
           results[0]

data/lib/ayadn/version.rb

@@ -1,4 +1,4 @@
 # encoding: utf-8
 module Ayadn
-  VERSION = "2.0.10"
+  VERSION = "2.0.11"
 end

data/lib/ayadn/workers.rb

@@ -213,7 +213,20 @@ module Ayadn
           end
         end
         next if @skip
-
+        unless Settings.global[:force] == true
+          if Settings.options[:blacklist][:active] == true
+            post['text'].split(" ").each do |word|
+              target_word = word.gsub(/[~:-;,?!\'&`^=+<>*%()\/"“”’°£$€.…]/, "")
+              if Databases.is_in_blacklist?('word', target_word.downcase)
+                Debug.skipped({word: target_word})
+                @skip = true
+                break
+              end
+            end
+          end
+        end
+        next if @skip
+        
         # create custom objects from ADN response
         if niceranks[post['user']['id'].to_i]
           rank = niceranks[post['user']['id'].to_i][:rank]
@@ -536,6 +549,8 @@ module Ayadn
           word_chars.each do |ch|
             if UnicodeUtils.general_category(ch) == :Other_Symbol
               sanitized << "#{ch} "
+            elsif UnicodeUtils.char_name(ch).nil?
+              next
             else
               sanitized << ch
             end

data/spec/unit/blacklistworkers_spec.rb

@@ -65,6 +65,11 @@ describe Ayadn::BlacklistWorkers do
       k.add(['mentions', 'yolo'])
       expect(Ayadn::Databases.is_in_blacklist?('mention', 'yolo')).to eq true
     end
+    it "adds a word to the blacklist" do
+      k = Ayadn::BlacklistWorkers.new
+      k.add(['word', 'Instagram'])
+      expect(Ayadn::Databases.is_in_blacklist?('word', 'instagram')).to eq true
+    end
   end
 
   describe "remove" do
@@ -104,6 +109,15 @@ describe Ayadn::BlacklistWorkers do
       k.remove(['account', 'mrTest'])
       expect(Ayadn::Databases.is_in_blacklist?('user', 'mrtest')).to eq false
     end
+    it "removes a word from the blacklist" do
+      k = Ayadn::BlacklistWorkers.new
+      k.add(['word', 'Instagram'])
+      expect(Ayadn::Databases.is_in_blacklist?('word', 'instagram')).to eq true
+
+      k = Ayadn::BlacklistWorkers.new
+      k.remove(['word', 'Instagram'])
+      expect(Ayadn::Databases.is_in_blacklist?('word', 'instagram')).to eq false
+    end
   end
 
   after do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ayadn
 version: !ruby/object:Gem::Version
-  version: 2.0.10
+  version: 2.0.11
 platform: ruby
 authors:
 - Eric Dejonckheere
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-21 00:00:00.000000000 Z
+date: 2015-04-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor