ayadn 1.2.10 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 59e66569c512036ff97974dabb24cbef415d082b
-  data.tar.gz: 5bc80e482e6118f1c743733eff0e4e25418c54be
+  metadata.gz: 68be7f0b81c33d2647ee698be5d787d3ab302b23
+  data.tar.gz: dee94c175ef19fead20537823adb02e293817cfe
 SHA512:
-  metadata.gz: 1c50fd4120b74b199008bf6a701aa22ad0c30725235e7248184e1f9ba375cbd696a3b665fbbcfc39f0fad017095ba388735ca926699b7ab3f280c70ae3734d8a
-  data.tar.gz: 7a91a9a7c28056bbe80706cda043dbc2be0c85bf7379196e3c7bbf01d27201b174492017c3197bb9e7701bd3bf2f3234a90b4a4393660efaf96df5920c2474ae
+  metadata.gz: 1b41aee21510a8dc7baec12d9cd874c304fc39bd2be299e4df82c58a19e44100f11caa7fe71a2f3bad5f385c64aa5cbfb72c72dc7d9ab3f869ff80a535b6dd08
+  data.tar.gz: b116e88c21e37e31d29532f679a444301535cf5cd4902d5bbae7077a52bde198ed003da610cc6f5078c9b44639c297d961a46c937db0aca9ae5eff23dcab19f3

data/CHANGELOG.md

@@ -1,3 +1,16 @@
+# 1.3.0 - 'K'
+
+- Updated the NiceRank API url
+- NiceRank filter is more efficient (checks is_human + real_person)
+- A few gridless grids for readability
+- Added several command synonyms     
+Features:
+- New color: black. Depends on your terminal. (ex: ayadn set color date black)
+- Silence a user (ayadn -K add user @username)
+- Clear the contents of the aliases database (ayadn -A clear)
+- Clear the contents of the blacklist database (ayadn -K clear)
+- Clear the contents of the bookmarks database (ayadn mark clear)
+
 # 1.2.10 - 'Anders'
 
 - Fixed the non-installing unicode_utils Gem

data/lib/ayadn/alias.rb

@@ -3,6 +3,7 @@ module Ayadn
   class Alias < Thor
 
     desc "create CHANNEL ALIAS", "Creates an alias for a channel"
+    map "add" => :create
     long_desc Descriptions.alias_create
     def create(*args)
       begin
@@ -27,6 +28,7 @@ module Ayadn
     end
 
     desc "delete ALIAS", "Deletes a previously created alias"
+    map "remove" => :delete
     long_desc Descriptions.alias_delete
     def delete(*args)
       begin
@@ -94,6 +96,26 @@ module Ayadn
       end
     end
 
+    desc "clear", "Clear your aliases database"
+    def clear
+      begin
+        init
+        puts "\n\nAre you sure you want to erase all the content of your aliases database?\n\n[y/N]\n".color(:red)
+        input = STDIN.getch
+        if input == 'y' || input == 'Y'
+          Databases.clear_aliases
+          Logs.rec.info "Cleared the aliases database."
+          puts Status.done
+        else
+          abort Status.canceled
+        end
+      rescue => e
+        Errors.global_error("alias/clear", args, e)
+      ensure
+        Databases.close_all
+      end
+    end
+
     private
 
     def init

data/lib/ayadn/blacklist.rb

@@ -1,7 +1,8 @@
 # encoding: utf-8
 module Ayadn
   class Blacklist < Thor
-    desc "add TYPE TARGET", "Adds a mention, hashtag or client to your blacklist"
+    desc "add TYPE TARGET", "Adds a mention, hashtag, client or username to your blacklist"
+    map "create" => :add
     long_desc Descriptions.blacklist_add
     def add(*args)
       Action.quit(Status.type_and_target_missing) if args.length < 2
@@ -9,7 +10,8 @@ module Ayadn
       puts Status.done
     end
 
-    desc "remove TYPE TARGET", "Removes a mention, hashtag or client from your blacklist"
+    desc "remove TYPE TARGET", "Removes a mention, hashtag, client or username from your blacklist"
+    map "delete" => :remove
     long_desc Descriptions.blacklist_remove
     def remove(*args)
       Action.quit(Status.type_and_target_missing) if args.length < 2
@@ -37,6 +39,12 @@ module Ayadn
       puts Status.done
     end
 
+    desc "clear", "Clear your blacklist database"
+    def clear
+      BlacklistWorkers.new.clear
+      puts Status.done
+    end
+
   end
 
   class BlacklistWorkers
@@ -68,10 +76,28 @@ module Ayadn
         Databases.close_all
       end
     end
+    def clear
+      begin
+        puts "\n\nAre you sure you want to erase all the content of your blacklist database?\n\n[y/N]\n".color(:red)
+        input = STDIN.getch
+        if input == 'y' || input == 'Y'
+          Databases.clear_blacklist
+          Logs.rec.info "Cleared the blacklist database."
+        else
+          abort Status.canceled
+        end
+      ensure
+        Databases.close_all
+      end
+    end
     def add(args)
       begin
         type = args.shift
         case type
+        when 'user', 'username', 'account'
+          target = Workers.add_arobases_to_usernames args
+          Databases.add_user_to_blacklist(target)
+          Logs.rec.info "Added '#{target}' to blacklist of users."
         when 'mention', 'mentions'
           target = Workers.add_arobases_to_usernames args
           Databases.add_mention_to_blacklist(target)
@@ -93,6 +119,11 @@ module Ayadn
       begin
         type = args.shift
         case type
+        when 'user', 'username', 'account'
+          temp = Workers.add_arobases_to_usernames args
+          target = temp.map {|u| "-#{u}"}
+          Databases.remove_from_blacklist(target)
+          Logs.rec.info "Removed '#{target}' from blacklist of users."
         when 'mention', 'mentions'
           target = Workers.add_arobases_to_usernames args
           Databases.remove_from_blacklist(target)

data/lib/ayadn/databases.rb

@@ -61,6 +61,9 @@ module Ayadn
       ids
     end
 
+    def self.add_user_to_blacklist(target)
+      target.each {|username| @blacklist["-#{username.downcase}"] = :user}
+    end
     def self.add_mention_to_blacklist(target)
       target.each {|username| @blacklist[username.downcase] = :mention}
     end
@@ -96,6 +99,18 @@ module Ayadn
       @aliases.delete(channel_alias)
     end
 
+    def self.clear_aliases
+      @aliases.clear
+    end
+
+    def self.clear_blacklist
+      @blacklist.clear
+    end
+
+    def self.clear_bookmarks
+      @bookmarks.clear
+    end
+
     def self.get_channel_id(channel_alias)
       @aliases[channel_alias]
     end

data/lib/ayadn/mark.rb

@@ -76,6 +76,26 @@ module Ayadn
       end
     end
 
+    desc "clear", "Clear your bookmarks database"
+    def clear
+      begin
+        init
+        puts "\n\nAre you sure you want to erase all the content of your bookmarks database?\n\n[y/N]\n".color(:red)
+        input = STDIN.getch
+        if input == 'y' || input == 'Y'
+          Databases.clear_bookmarks
+          Logs.rec.info "Cleared the bookmarks database."
+          puts Status.done
+        else
+          abort Status.canceled
+        end
+      rescue => e
+        Errors.global_error("mark/clear", nil, e)
+      ensure
+        Databases.close_all
+      end
+    end
+
     desc "delete POST_ID", "Delete entry POST_ID from your bookmarked conversations"
     long_desc Descriptions.mark_delete
     def delete *args

data/lib/ayadn/nicerank.rb

@@ -3,7 +3,7 @@ module Ayadn
   class NiceRank
 
     def initialize
-      @url = 'http://api.search-adn.net/user/nicerank?ids='
+      @url = 'http://api.nice.social/user/nicerank?ids='
     end
 
     def get_ranks stream
@@ -35,6 +35,7 @@ module Ayadn
             username: ranks[:username],
             rank: ranks[:rank],
             is_human: ranks[:is_human],
+            real_person: ranks[:real_person],
             cached: ranks[:cached]
           }
         end
@@ -43,7 +44,7 @@ module Ayadn
       Debug.how_many_ranks niceranks, get_these
 
       unless get_these.empty?
-        resp = JSON.parse(CNX.get "#{@url}#{get_these.join(',')}")
+        resp = JSON.parse(CNX.get "#{@url}#{get_these.join(',')}&show_details=Y")
 
         if resp['meta']['code'] != 200
           Debug.niceranks_error resp
@@ -62,6 +63,7 @@ module Ayadn
             username: table[obj['user_id']],
             rank: obj['rank'],
             is_human: obj['is_human'],
+            real_person: obj['account']['real_person'],
             cached: Time.now
           }
         end

data/lib/ayadn/set.rb

@@ -243,7 +243,7 @@ module Ayadn
       end
     end
     def self.cache_range value
-      if value >= 3 && value <= 720
+      if value >= 1 && value <= 168
         value.round
       else
         abort(Status.cache_range)
@@ -254,7 +254,7 @@ module Ayadn
       t >= 1 ? t : 3
     end
     def self.color(color)
-      colors_list = %w{red green magenta cyan yellow blue white}
+      colors_list = %w{red green magenta cyan yellow blue white black}
       unless colors_list.include?(color)
         puts Status.error_missing_parameters
         abort(Status.valid_colors(colors_list))
@@ -452,18 +452,34 @@ module Ayadn
       Settings.options[:colors][:hashtags] = color.to_sym
     end
 
+    def hashtag color
+      hashtags color
+    end
+
     def mentions(color)
       Settings.options[:colors][:mentions] = color.to_sym
     end
 
+    def mention color
+      mentions color
+    end
+
     def source(color)
       Settings.options[:colors][:source] = color.to_sym
     end
 
+    def client color
+      source color
+    end
+
     def symbols(color)
       Settings.options[:colors][:symbols] = color.to_sym
     end
 
+    def symbol(color)
+      symbols color
+    end
+
     def debug(color)
       Settings.options[:colors][:debug] = color.to_sym
     end

data/lib/ayadn/status.rb

@@ -245,7 +245,7 @@ module Ayadn
       "\nPlease wait while Ayadn is pruning and compacting the #{db} database...\n".color(:cyan)
     end
     def self.cache_range
-      "\nPlease enter a number of hours between 3 and 168.\n\n".color(:red)
+      "\nPlease enter a number of hours between 1 and 168.\n\n".color(:red)
     end
     def self.must_be_in_index
       "\nNumber must be in the range of the indexed posts.\n".color(:red)

data/lib/ayadn/version.rb

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

data/lib/ayadn/view.rb

@@ -77,7 +77,7 @@ module Ayadn
 
     def show_settings
       table = Terminal::Table.new do |t|
-        t.style = { :width => Settings.options[:formats][:table][:width] }
+        t.style = { :width => Settings.options[:formats][:table][:width], border_x: ' ', border_i: ' ', border_y: ' ' }
         t.title = "Current Ayadn settings".color(:cyan)
         t.headings = [ "Category".color(:red), "Parameter".color(:red), "Value(s)".color(:red) ]
         @iter = 0
@@ -296,14 +296,13 @@ module Ayadn
               unless content[:nicerank] == false
                 next if content[:nicerank] < Settings.options[:nicerank][:threshold]
                 next if content[:is_human] == false
+                next if content[:real_person] == false
               end
               filtered[id] = content
             end
             return filtered
           end
-          return posts
         end
-        return posts
       end
       return posts
     end

data/lib/ayadn/workers.rb

@@ -5,6 +5,7 @@ module Ayadn
     def build_aliases_list(list)
       table = init_table
       table.title = "List of your channel aliases".color(:cyan) + "".color(:white)
+      table.style = {border_x: '~', border_i: '+', border_y: ':'}
       list.each {|k,v| table << ["#{k}".color(:green), "#{v}".color(:red)]}
       table
     end
@@ -12,6 +13,8 @@ module Ayadn
     def build_blacklist_list(list)
       table = init_table
       table.title = "Your blacklist".color(:cyan) + "".color(:white)
+      table.style = {border_x: '~', border_i: '+', border_y: ':'}
+      list = list.sort_by {|k,v| v} # no sort_by! for Daybreak dbs
       list.each {|k,v| table << ["#{v.capitalize}".color(:green), "#{k}".color(:red)]}
       table
     end
@@ -24,6 +27,7 @@ module Ayadn
         obj['name'].nil? ? name = "" : name = obj['name']
         users_list << {:username => obj['username'], :name => name, :you_follow => obj['you_follow'], :follows_you => obj['follows_you']}
       end
+      table.style = {border_x: ' ', border_i: ' ', border_y: ' '}
       return users_list, table
     end
 
@@ -35,6 +39,7 @@ module Ayadn
         obj['name'].nil? ? name = "" : name = obj['name']
         users_list << {:username => obj['username'], :name => name, :you_follow => obj['you_follow'], :follows_you => obj['follows_you']}
       end
+      table.style = {border_x: ' ', border_i: ' ', border_y: ' '}
       return users_list, table
     end
 
@@ -45,6 +50,7 @@ module Ayadn
       else
         "List of users ".color(:cyan) + "#{target}".color(:red) + " is following ".color(:cyan) + "".color(:white)
       end
+      table.style = {border_x: ' ', border_i: ' ', border_y: ' '}
       users_list = build_users_array(list)
       build_users_list(users_list, table)
     end
@@ -56,27 +62,32 @@ module Ayadn
       else
         "List of users following ".color(:cyan) + "#{target}".color(:red) + "".color(:white)
       end
+      table.style = {border_x: ' ', border_i: ' ', border_y: ' '}
       build_users_list(build_users_array(list), table)
     end
 
     def build_muted_list(list)
       table = init_table
       table.title = "List of users you muted".color(:cyan) + "".color(:white)
+      table.style = {border_x: ' ', border_i: ' ', border_y: ' '}
       build_users_list(build_users_array(list), table)
     end
 
     def build_blocked_list(list)
       table = init_table
       table.title = "List of users you blocked".color(:cyan) + "".color(:white)
+      table.style = {border_x: ' ', border_i: ' ', border_y: ' '}
       build_users_list(build_users_array(list), table)
     end
 
     def build_users_list(list, table)
       list.each_with_index do |obj, index|
+        obj[:username].length > 35 ? username = "#{obj[:username][0...32]}..." : username = obj[:username]
         unless obj[:name].nil?
-          table << [ "@#{obj[:username]} ".color(Settings.options[:colors][:username]), "#{obj[:name]}" ]
+          obj[:name].length > 35 ? name = "#{obj[:name][0...32]}..." : name = obj[:name]
+          table << [ "@#{username} ".color(Settings.options[:colors][:username]), "#{name}" ]
         else
-          table << [ "@#{obj[:username]} ".color(Settings.options[:colors][:username]), "" ]
+          table << [ "@#{username} ".color(Settings.options[:colors][:username]), "" ]
         end
         table << :separator unless index + 1 == list.length
       end
@@ -89,6 +100,7 @@ module Ayadn
 
       data.each.with_index(1) do |post, index|
         next if Databases.blacklist[post['source']['name'].downcase]
+        next if Databases.blacklist["-@#{post['user']['username'].downcase}"]
         hashtags = extract_hashtags(post)
         @skip = false
         hashtags.each do |h|
@@ -101,7 +113,7 @@ module Ayadn
         mentions= []
         post['entities']['mentions'].each { |m| mentions << m['name'] }
         mentions.each do |m|
-          if Databases.blacklist["@" + m.downcase]
+          if Databases.blacklist["@#{m.downcase}"]
             @skip = true
             break
           end
@@ -111,9 +123,11 @@ module Ayadn
         if niceranks[post['user']['id'].to_i]
           rank = niceranks[post['user']['id'].to_i][:rank]
           is_human = niceranks[post['user']['id'].to_i][:is_human]
+          real_person = niceranks[post['user']['id'].to_i][:real_person]
         else
           rank = false
           is_human = 'unknown'
+          real_person = nil
         end
 
         if post['user'].has_key?('name')
@@ -133,6 +147,7 @@ module Ayadn
           user_id: post['user']['id'].to_i,
           nicerank: rank,
           is_human: is_human,
+          real_person: real_person,
           handle: "@#{post['user']['username']}",
           type: post['user']['type'],
           date: parsed_time(post['created_at']),

data/spec/unit/workers_spec.rb

@@ -41,7 +41,7 @@ describe Ayadn::Workers do
       expect(posts[23187443][:has_checkins]).to be false
       expect(posts[23187443][:mentions]).to eq []
       expect(posts[23187443][:checkins]).to be_empty
-      expect(posts[23187443].length).to eq 32
+      expect(posts[23187443].length).to eq 33
     end
     it "gets oembed link from checkins post" do
       posts = Ayadn::Workers.new.build_posts(checkins['data'])
@@ -88,7 +88,7 @@ describe Ayadn::Workers do
       printed = capture_stdout do
         puts Ayadn::Workers.new.build_followers_list(list, "@test")
       end
-      expect(printed).to include "+----"
+      #expect(printed).to include "+----"
       expect(printed).to include "@test"
       expect(printed).to include "@bond"
       expect(printed).to include "Mr Test"
@@ -100,7 +100,7 @@ describe Ayadn::Workers do
       printed = capture_stdout do
         puts Ayadn::Workers.new.build_followings_list(list, "@test")
       end
-      expect(printed).to include "+----"
+      #expect(printed).to include "+~~~~"
       expect(printed).to include "@test"
       expect(printed).to include "@bond"
       expect(printed).to include "Mr Test"
@@ -112,7 +112,7 @@ describe Ayadn::Workers do
       printed = capture_stdout do
         puts Ayadn::Workers.new.build_muted_list(list)
       end
-      expect(printed).to include "+----"
+      #expect(printed).to include "+----"
       expect(printed).to include "@bond"
       expect(printed).to include "Mr Test"
     end
@@ -123,7 +123,7 @@ describe Ayadn::Workers do
       printed = capture_stdout do
         puts Ayadn::Workers.new.build_blocked_list(list)
       end
-      expect(printed).to include "+----"
+      #expect(printed).to include "+----"
       expect(printed).to include "@bond"
       expect(printed).to include "Mr Test"
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ayadn
 version: !ruby/object:Gem::Version
-  version: 1.2.10
+  version: 1.3.0
 platform: ruby
 authors:
 - Eric Dejonckheere
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-30 00:00:00.000000000 Z
+date: 2014-06-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -322,4 +322,3 @@ test_files:
 - spec/unit/status_spec.rb
 - spec/unit/view_spec.rb
 - spec/unit/workers_spec.rb
-has_rdoc: