ayadn 1.2.5 → 1.2.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8a7696488646606308bd4a59ece5d8faa47c6665
-  data.tar.gz: 04575cfb41cd34bababb716b27dc84655c5d3c21
+  metadata.gz: d182ebc33f66f34540b3b629d5ae372ca8aec63e
+  data.tar.gz: b80897e1c4bf6c5b534cd8c0d036dd3693c66786
 SHA512:
-  metadata.gz: e11432bb675b394cc3874e6e3f0c9dad7f540a3fef7a205e37fce39a943e4fd6f77a75b0394d038415894954759c2e5b12dd079a2c5cd6115c288a8cf569a7bd
-  data.tar.gz: d2dc7e23f994b8824738a24a342887dd2dba7e25d100336db30b66cb3a16a1b26e36a5fdc65c9eb5eae3b8579f89095faec07bda09d8afcc5d99008e6f8a4d07
+  metadata.gz: a72d7b598cca41d2c77300b6bbbf232bfce4c4bb5ade10815211ed1da4013418579b0531ed14a3b9e8c86fdba67323a8d8f3600456c53c303e2eafffece4f845
+  data.tar.gz: 5d5263954d304b55f093d2bb148590c0e76f36fe71fc1d2cedcb4399cb5876efcfe0d870cf4c06c0d83573daaa71d7e442fbf02c83e4f529a2e269922683836b

data/CHANGELOG.md

@@ -1,3 +1,12 @@
+# 1.2.6 - 'Saket'
+
+- NiceRank enabled by default on new installs
+- NiceRank cache expires after 48h by default
+- NiceRank cache auto-limits to 5000 users
+- Set the NiceRank cache value (in hours)
+- More debug info
+- Misc fixes related to recent features
+
 # 1.2.5 - 'Bis repetita'
 
 - Fix the NiceRank filter staying on true

data/lib/ayadn/action.rb

@@ -45,18 +45,16 @@ module Ayadn
     def global(settings)
       begin
         options = settings.dup
-        options[:filter] = true if Settings.options[:nicerank][:filter] == true
+        if Settings.options[:nicerank]
+          options[:filter] = true if Settings.options[:nicerank][:filter] == true
+        end
         doing(options)
         stream = @api.get_global(options)
-
-        ###DEBUG
-        #niceranks = @api.get_niceranks stream
-        niceranks, _ = @api.get_niceranks stream, 0
-
+        niceranks = NiceRank.new.get_ranks stream
         (no_new_posts unless Databases.has_new?(stream, 'global')) if options[:new]
         Databases.save_max_id(stream)
         render_view(stream, options, niceranks)
-        Scroll.new(@api, @view).global(options, niceranks) if options[:scroll]
+        Scroll.new(@api, @view).global(options) if options[:scroll]
       rescue => e
         Errors.global_error("action/global", options, e)
       ensure

data/lib/ayadn/api.rb

@@ -200,99 +200,6 @@ module Ayadn
       end
     end
 
-    ###DEBUG
-    #def get_niceranks stream
-    def get_niceranks stream, iter
-      ###DEBUG
-      @iter = iter
-
-      user_ids, table, niceranks = [], {}, {}
-      stream['data'].each do |post|
-        user_ids << post['user']['id'].to_i
-        table[post['user']['id'].to_i] = post['user']['username']
-      end
-      user_ids.uniq!
-
-      db_ranks = Databases.get_niceranks user_ids
-      get_these = []
-      db_ranks.each do |id,ranks|
-        if ranks.nil?
-          get_these << id
-        elsif (Time.now - ranks[:cached]) > 86400 # 24 hours cache
-          get_these << id
-        else
-          niceranks[id] = {
-          username: ranks[:username],
-          rank: ranks[:rank],
-          is_human: ranks[:is_human],
-          cached: ranks[:cached]
-          }
-        end
-      end
-
-      if Settings.options[:timeline][:show_debug] == true
-        puts "=====\nNiceRanks\n".color(Settings.options[:colors][:debug])
-        puts "From DB:\t#{niceranks}\n".color(Settings.options[:colors][:debug])
-        puts "To get:\t\t#{get_these}\n=====\n".color(Settings.options[:colors][:debug])
-      end
-
-      unless get_these.empty?
-        req = "http://api.search-adn.net/user/nicerank?ids=#{get_these.join(',')}"
-        resp = JSON.parse(CNX.get req)
-
-        #Error handling
-        if resp['meta']['code'] != 200
-          if Settings.options[:timeline][:show_debug] == true
-            puts "=====\nNiceRank:\tError #{resp['meta']['code']} (#{resp['meta']['time']})\n=====\n".color(Settings.options[:colors][:debug])
-          end
-          Errors.nr "REQUESTED: #{get_these.join(' ')}"
-
-          ###DEBUG
-          @iter += 1
-
-          if niceranks
-            if Settings.options[:timeline][:show_debug] == true
-              puts "=====\nNiceRanks:\t#{niceranks}".color(Settings.options[:colors][:debug])
-              puts "=====\n".color(Settings.options[:colors][:debug])
-            end
-
-            #return niceranks
-
-            ###DEBUG
-            return niceranks, @iter
-          else
-
-            # return {}
-
-            ###DEBUG
-            return {}, @iter
-          end
-        end
-
-        ###DEBUG
-        @iter += 1
-
-        resp['data'].each do |obj|
-          niceranks[obj['user_id']] = {
-            username: table[obj['user_id']],
-            rank: obj['rank'],
-            is_human: obj['is_human'],
-            cached: Time.now
-          }
-        end
-        if Settings.options[:timeline][:show_debug] == true
-          puts "=====\nNiceRanks:\t#{niceranks}".color(Settings.options[:colors][:debug])
-          puts "Resp:\t\t#{resp}".color(Settings.options[:colors][:debug])
-          puts "=====\n".color(Settings.options[:colors][:debug])
-        end
-      end
-      Databases.add_niceranks niceranks
-
-      ###DEBUG
-      #niceranks
-      return niceranks, @iter
-    end
-
     def get_channels
       options = {:count => 200, :recent_message => 1, :annotations => 1, :before_id => nil}
       get_parsed_response(Endpoints.new.channels(options))

data/lib/ayadn/app.rb

@@ -3,7 +3,7 @@ module Ayadn
   class App < Thor
     package_name "Ayadn"
 
-    %w{action api descriptions endpoints cnx view workers settings post status extend databases fileops logs pinboard set alias errors blacklist scroll authorize switch mark}.each { |r| require_relative "#{r}" }
+    %w{action api descriptions endpoints cnx view workers settings post status extend databases fileops logs pinboard set alias errors blacklist scroll authorize switch mark nicerank}.each { |r| require_relative "#{r}" }
 
     desc "timeline", "Show your App.net timeline, aka the Unified Stream (-tl)"
     map "unified" => :timeline

data/lib/ayadn/cnx.rb

@@ -33,12 +33,11 @@ module Ayadn
     end
 
     def self.debug response, url
-      puts ":::::".color(Settings.options[:colors][:debug])
-      puts "Url:\t\t#{url}\n".color(Settings.options[:colors][:debug])
-      #puts "Resp:\t\t#{response.code}\n".color(Settings.options[:colors][:debug])
-      puts "Headers:\t#{response.headers}\n".color(Settings.options[:colors][:debug])
-      puts "Remaining:\t#{response.headers[:x_ratelimit_remaining]}".color(Settings.options[:colors][:debug])
-      puts ":::::\n".color(Settings.options[:colors][:debug])
+      deb = ":::::\n"
+      deb << "Url:\t\t#{url}\n\n"
+      deb << "Headers:\t#{response.headers}\n"
+      deb << ":::::\n"
+      puts deb.color(Settings.options[:colors][:debug])
     end
 
     def self.get_response_from(url)

data/lib/ayadn/databases.rb

@@ -18,6 +18,33 @@ module Ayadn
     end
 
     def self.close_all
+
+      if @nicerank.size > 5000
+        limit = Time.now - 432000
+        @nicerank.each {|k,v| @nicerank.delete(k) if v[:cached] < limit}
+        if @nicerank.size > 5000
+          limit = Time.now - 86400
+          @nicerank.each {|k,v| @nicerank.delete(k) if v[:cached] < limit}
+        end
+      end
+
+      if Settings.options[:timeline][:show_debug] == true
+        puts "/////\nSETTINGS\n"
+        jj JSON.parse((Settings.config).to_json)
+        jj JSON.parse((Settings.options).to_json)
+        puts "/////\n\n"
+
+        puts ">>>>>\nDATABASES\n"
+        [@users, @index, @pagination, @aliases, @blacklist, @bookmarks, @nicerank].each do |db|
+          puts "Path:\t#{db.file}\nLength:\t#{db.size}\nSize:\t#{db.bytesize / 1024}KB"
+        end
+        puts ">>>>>\n\n"
+
+        puts "^^^^^\nTOKEN\n"
+        puts Settings.user_token
+        puts "^^^^^\n\n"
+      end
+
       [@users, @index, @pagination, @aliases, @blacklist, @bookmarks, @nicerank].each do |db|
           db.flush
           db.compact

data/lib/ayadn/errors.rb

@@ -11,9 +11,9 @@ module Ayadn
       Logs.rec.debug "STACK: #{caller}"
       Logs.rec.error "--END--"
       puts "\n(error logged in #{Settings.config[:paths][:log]}/ayadn.log)\n".color(:blue)
-      #if Settings.options[:timeline][:show_debug] == true
-        #raise error
-      #end
+      if Settings.options[:timeline][:show_debug] == true
+        raise error
+      end
       exit
     end
     def self.error(status)

data/lib/ayadn/nicerank.rb

@@ -0,0 +1,109 @@
+# encoding: utf-8
+module Ayadn
+  class NiceRank
+
+    def initialize
+      @url = 'http://api.search-adn.net/user/nicerank?ids='
+      @show_debug = Settings.options[:timeline][:show_debug]
+    end
+
+    def get_ranks stream
+      user_ids, get_these, table, niceranks = [], [], {}, {}
+
+      stream['data'].each do |post|
+        user_ids << post['user']['id'].to_i
+        table[post['user']['id'].to_i] = post['user']['username']
+      end
+      user_ids.uniq!
+
+      db_ranks = Databases.get_niceranks user_ids
+      if Settings.options[:nicerank].nil?
+        expire = 172800 # 48h
+      else
+        if Settings.options[:nicerank][:cache].nil?
+          Settings.options[:nicerank][:cache] = 48
+          expire = 172800
+        else
+          expire = Settings.options[:nicerank][:cache] * 3600
+        end
+      end
+      db_ranks.each do |id, ranks|
+        if ranks.nil? || (Time.now - ranks[:cached]) > expire
+          get_these << id
+        else
+          niceranks[id] = {
+            username: ranks[:username],
+            rank: ranks[:rank],
+            is_human: ranks[:is_human],
+            cached: ranks[:cached]
+          }
+        end
+      end
+
+      how_many(niceranks, get_these) if @show_debug == true
+
+      unless get_these.empty?
+        resp = JSON.parse(CNX.get "#{@url}#{get_these.join(',')}")
+
+        if resp['meta']['code'] != 200
+          nr_error(resp) if @show_debug == true
+          Errors.nr "REQUESTED: #{get_these.join(' ')}"
+          Errors.nr "RESPONSE: #{resp}"
+          if niceranks
+            in_pool(niceranks) if @show_debug == true
+            return niceranks
+          else
+            return {}
+          end
+        end
+
+        resp['data'].each do |obj|
+          niceranks[obj['user_id']] = {
+            username: table[obj['user_id']],
+            rank: obj['rank'],
+            is_human: obj['is_human'],
+            cached: Time.now
+          }
+        end
+
+        got(niceranks) if @show_debug == true
+      end
+
+      Databases.add_niceranks niceranks
+
+      niceranks
+    end
+
+    private
+
+    def how_many niceranks, get_these
+      deb = "=====\n"
+      deb << "NR from DB:\t#{niceranks}\n\n"
+      deb << "NR to get:\t#{get_these}\n"
+      deb << "=====\n"
+      puts deb.color(Settings.options[:colors][:debug])
+    end
+
+    def in_pool niceranks
+      deb = "=====\n"
+      deb << "NR in pool:\t#{niceranks}\n"
+      deb << "=====\n"
+      puts deb.color(Settings.options[:colors][:debug])
+    end
+
+    def nr_error resp
+      deb = "=====\n"
+      deb << "NR Error:\t#{resp['meta']}"
+      deb << "=====\n"
+      puts deb.color(Settings.options[:colors][:debug])
+    end
+
+    def got niceranks
+      deb = "=====\n"
+      deb << "NiceRanks:\t#{niceranks}\n\n"
+      deb << "DB size:\t#{Databases.nicerank.size}\n"
+      deb << "=====\n"
+      puts deb.color(Settings.options[:colors][:debug])
+    end
+  end
+end

data/lib/ayadn/scroll.rb

@@ -6,56 +6,37 @@ module Ayadn
       @api = api
       @view = view
       @chars = %w{ | / - \\ }
+      @show_debug = Settings.options[:timeline][:show_debug]
     end
 
-    def method_missing(meth, options, niceranks = {})
+    def method_missing(meth, options)
       case meth.to_s
       when 'trending', 'photos', 'checkins', 'replies', 'global', 'unified'
-        scroll_it(meth.to_s, options, niceranks)
+        scroll_it(meth.to_s, options)
       else
         super
       end
     end
 
-    def scroll_it(target, options, niceranks)
+    def scroll_it(target, options)
       options = check_raw(options)
       orig_target = target
-
-      ###DEBUG
-      @iter = 0
-      @adn = 1
-
+      @nr = NiceRank.new
       loop do
         begin
           stream = get(target, options)
 
-          ###DEBUG
-          @adn += 1
-
-          if options[:filter] == true
+          # if options[:filter] == true
             unless stream['data'].empty?
-              ###DEBUG
-              #niceranks = @api.get_niceranks stream
-              niceranks, @iter = @api.get_niceranks stream, @iter
-              ###DEBUG
-              if Settings.options[:timeline][:show_debug] == true
-                puts "@@@@@\nADN calls:\t#{@adn}\n".color(Settings.options[:colors][:debug])
-                puts "NiceRank calls:\t#{@iter}".color(Settings.options[:colors][:debug])
-                puts "@@@@@\n".color(Settings.options[:colors][:debug])
-              end
+              niceranks = @nr.get_ranks stream
             else
               niceranks = {}
             end
-          else
-            niceranks = {}
-          end
+          # else
+          #   niceranks = {}
+          # end
 
-          if Settings.options[:timeline][:show_debug] == true
-            puts "+++++\nStream meta:\t#{stream['meta']}\n".color(Settings.options[:colors][:debug])
-            puts "Options:\t#{options.inspect}\n".color(Settings.options[:colors][:debug])
-            puts "Target:\t\t#{target.inspect}\n".color(Settings.options[:colors][:debug])
-            puts "Posts:\t\t#{stream['data'].length}\n+++++\n".color(Settings.options[:colors][:debug])
-          end
+          debug_stream(stream, options, target) if @show_debug == true
 
           target = "explore:#{target}" if explore?(target)
           show_if_new(stream, options, target, niceranks)
@@ -76,12 +57,7 @@ module Ayadn
         begin
           stream = @api.get_mentions(username, options)
 
-          if Settings.options[:timeline][:show_debug] == true
-            puts "+++++\nStream meta:\t#{stream['meta']}\n".color(Settings.options[:colors][:debug])
-            puts "Options:\t#{options.inspect}\n".color(Settings.options[:colors][:debug])
-            puts "Target:\t\t#{username}\n".color(Settings.options[:colors][:debug])
-            puts "Posts:\t\t#{stream['data'].length}\n+++++\n".color(Settings.options[:colors][:debug])
-          end
+          debug_stream(stream, options, username) if @show_debug == true
 
           show_if_new(stream, options, "mentions:#{id}")
           options = save_then_return(stream, options)
@@ -100,12 +76,7 @@ module Ayadn
         begin
           stream = @api.get_posts(username, options)
 
-          if Settings.options[:timeline][:show_debug] == true
-            puts "+++++\nStream meta:\t#{stream['meta']}\n".color(Settings.options[:colors][:debug])
-            puts "Options:\t#{options.inspect}\n".color(Settings.options[:colors][:debug])
-            puts "Target:\t\t#{username}\n".color(Settings.options[:colors][:debug])
-            puts "Posts:\t\t#{stream['data'].length}\n+++++\n".color(Settings.options[:colors][:debug])
-          end
+          debug_stream(stream, options, username) if @show_debug == true
 
           show_if_new(stream, options, "posts:#{id}")
           options = save_then_return(stream, options)
@@ -122,12 +93,7 @@ module Ayadn
         begin
           stream = @api.get_convo(post_id, options)
 
-          if Settings.options[:timeline][:show_debug] == true
-            puts "+++++\nStream meta:\t#{stream['meta']}\n".color(Settings.options[:colors][:debug])
-            puts "Options:\t#{options.inspect}\n".color(Settings.options[:colors][:debug])
-            puts "Target:\t\t#{post_id}\n".color(Settings.options[:colors][:debug])
-            puts "Posts:\t\t#{stream['data'].length}\n+++++\n".color(Settings.options[:colors][:debug])
-          end
+          debug_stream(stream, options, post_id) if @show_debug == true
 
           show_if_new(stream, options, "replies:#{post_id}")
           options = save_then_return(stream, options)
@@ -144,12 +110,7 @@ module Ayadn
         begin
           stream = @api.get_messages(channel_id, options)
 
-          if Settings.options[:timeline][:show_debug] == true
-            puts "+++++\nStream meta:\t#{stream['meta']}\n".color(Settings.options[:colors][:debug])
-            puts "Options:\t#{options.inspect}\n".color(Settings.options[:colors][:debug])
-            puts "Target:\t\t#{channel_id}\n".color(Settings.options[:colors][:debug])
-            puts "Posts:\t\t#{stream['data'].length}\n+++++\n".color(Settings.options[:colors][:debug])
-          end
+          debug_stream(stream, options, channel_id) if @show_debug == true
 
           show_if_new(stream, options, "channel:#{channel_id}")
           options = save_then_return(stream, options)
@@ -162,6 +123,14 @@ module Ayadn
 
     private
 
+    def debug_stream stream, options, target
+      deb = "+++++\nStream meta:\t#{stream['meta']}\n\n"
+      deb << "Options:\t#{options.inspect}\n\n"
+      deb << "Target:\t\t#{target.inspect}\n\n"
+      deb << "Posts:\t\t#{stream['data'].length}\n+++++\n"
+      puts deb.color(Settings.options[:colors][:debug])
+    end
+
     def countdown
       if Settings.options[:timeline][:show_spinner] == true
         waiting

data/lib/ayadn/set.rb

@@ -163,7 +163,8 @@ module Ayadn
       unless Settings.options[:nicerank]
         Settings.options[:nicerank] = {
           threshold: 2,
-          filter: false,
+          cache: 48,
+          filter: true,
           filter_unranked: false
         }
       end
@@ -188,6 +189,9 @@ module Ayadn
     def threshold value
       Settings.options[:nicerank][:threshold] = value.to_f
     end
+    def cache value
+      Settings.options[:nicerank][:cache] = Validators.cache_range value.to_i
+    end
   end
 
   class SetBackup
@@ -238,6 +242,13 @@ module Ayadn
         abort(Status.must_be_integer)
       end
     end
+    def self.cache_range value
+      if value >= 3 && value <= 720
+        value.round
+      else
+        abort(Status.cache_range)
+      end
+    end
     def self.timer(t)
       t = t.to_i
       t >= 1 ? t : 3
@@ -366,8 +377,8 @@ module Ayadn
     def show_nicerank value
       unless Settings.options[:nicerank]
         Settings.options[:nicerank] = {
-          threshold: 2.1,
-          filter: false,
+          threshold: 2,
+          filter: true,
           filter_unranked: false
         }
       end

data/lib/ayadn/settings.rb

@@ -204,7 +204,8 @@ module Ayadn
         },
         nicerank: {
           threshold: 2,
-          filter: false,
+          cache: 48,
+          filter: true,
           filter_unranked: false
         }
       }

data/lib/ayadn/status.rb

@@ -8,10 +8,10 @@ module Ayadn
       "\nFile downloaded in #{Settings.config[:paths][:downloads]}/#{name}\n".color(:green)
     end
     def self.downloading
-      "Downloading from ADN...".inverse
+      "Downloading from ADN...\n\n".inverse
     end
     def self.posting
-      "Posting to ADN...".inverse
+      "Posting to ADN...\n\n".inverse
     end
     def self.deleting_post(post_id)
       "\nDeleting post #{post_id}".inverse
@@ -241,5 +241,11 @@ module Ayadn
       view << "At any moment, starting now, hit CTRL+C to exit.\n\n".color(:yellow)
       view << "\n\t--AUTO POSTING MODE ACTIVATED--\n\n".color(:red)
     end
+    def self.reducing db
+      "\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)
+    end
   end
 end

data/lib/ayadn/version.rb

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

data/lib/ayadn/view.rb

@@ -305,7 +305,7 @@ module Ayadn
       @view = ""
       posts = @workers.build_posts(data.reverse, niceranks)
 
-      posts = filter_nicerank posts, options
+      posts = filter_nicerank(posts, options)
 
       posts.each do |id,content|
         count = "%03d" % content[:count]
@@ -326,7 +326,7 @@ module Ayadn
       @view = ""
       posts = @workers.build_posts(data.reverse, niceranks)
 
-      posts = filter_nicerank posts, options
+      posts = filter_nicerank(posts, options)
 
       posts.each do |id,content|
         if content[:username] == Settings.config[:identity][:username]
@@ -460,9 +460,11 @@ module Ayadn
         header << content[:name].color(Settings.options[:colors][:name])
       end
 
-      if Settings.options[:timeline][:show_nicerank] && content[:nicerank] && Settings.options[:nicerank][:filter]
-        header << " "
-        header << "[#{content[:nicerank]}]".color(Settings.options[:colors][:nicerank])
+      if Settings.options[:timeline][:show_nicerank] && content[:nicerank]
+        if Settings.options[:nicerank][:filter] == true
+          header << " "
+          header << "[#{content[:nicerank]}]".color(Settings.options[:colors][:nicerank])
+        end
       end
 
       if Settings.options[:timeline][:show_date]

data/spec/mock/nicerank.log

@@ -0,0 +1 @@
+# Logfile created on 2014-05-26 18:41:42 +0200 by logger.rb/44203

data/spec/unit/blacklistworkers_spec.rb

@@ -54,37 +54,37 @@ describe Ayadn::BlacklistWorkers do
       k = Ayadn::BlacklistWorkers.new
       k.add(['client', 'IFTTT'])
       expect(Ayadn::Databases.blacklist['ifttt']).to eq :client
-      expect(File.read('spec/mock/ayadn.log')).to include "(wee) INFO -- Added 'IFTTT' to blacklist of clients."
+      expect(File.read('spec/mock/ayadn.log')).to include "(wee) INFO -- Added '[\"IFTTT\"]' to blacklist of clients."
     end
     it "adds a client to the blacklist" do
       k = Ayadn::BlacklistWorkers.new
       k.add(['source', 'Zapier'])
       expect(Ayadn::Databases.blacklist['zapier']).to eq :client
-      expect(File.read('spec/mock/ayadn.log')).to include "(wee) INFO -- Added 'Zapier' to blacklist of clients."
+      expect(File.read('spec/mock/ayadn.log')).to include "(wee) INFO -- Added '[\"Zapier\"]' to blacklist of clients."
     end
     it "adds a hashtag to the blacklist" do
       k = Ayadn::BlacklistWorkers.new
       k.add(['hashtag', 'Sports'])
       expect(Ayadn::Databases.blacklist['sports']).to eq :hashtag
-      expect(File.read('spec/mock/ayadn.log')).to include "(wee) INFO -- Added 'Sports' to blacklist of hashtags."
+      expect(File.read('spec/mock/ayadn.log')).to include "(wee) INFO -- Added '[\"Sports\"]' to blacklist of hashtags."
     end
     it "adds a hashtag to the blacklist" do
       k = Ayadn::BlacklistWorkers.new
       k.add(['tag', 'tv'])
       expect(Ayadn::Databases.blacklist['tv']).to eq :hashtag
-      expect(File.read('spec/mock/ayadn.log')).to include "(wee) INFO -- Added 'tv' to blacklist of hashtags."
+      expect(File.read('spec/mock/ayadn.log')).to include "(wee) INFO -- Added '[\"tv\"]' to blacklist of hashtags."
     end
     it "adds a mention to the blacklist" do
       k = Ayadn::BlacklistWorkers.new
       k.add(['mention', 'mrTest'])
       expect(Ayadn::Databases.blacklist['@mrtest']).to eq :mention
-      expect(File.read('spec/mock/ayadn.log')).to include "(wee) INFO -- Added '@mrTest' to blacklist of mentions."
+      expect(File.read('spec/mock/ayadn.log')).to include "(wee) INFO -- Added '[\"@mrTest\"]' to blacklist of mentions."
     end
     it "adds a mention to the blacklist" do
       k = Ayadn::BlacklistWorkers.new
       k.add(['mentions', 'yolo'])
       expect(Ayadn::Databases.blacklist['@yolo']).to eq :mention
-      expect(File.read('spec/mock/ayadn.log')).to include "(wee) INFO -- Added '@yolo' to blacklist of mentions."
+      expect(File.read('spec/mock/ayadn.log')).to include "(wee) INFO -- Added '[\"@yolo\"]' to blacklist of mentions."
     end
   end
 
@@ -93,11 +93,11 @@ describe Ayadn::BlacklistWorkers do
       k = Ayadn::BlacklistWorkers.new
       k.add(['client', 'IFTTT'])
       expect(Ayadn::Databases.blacklist['ifttt']).to eq :client
-      expect(File.read('spec/mock/ayadn.log')).to include "(wee) INFO -- Added 'IFTTT' to blacklist of clients."
+      expect(File.read('spec/mock/ayadn.log')).to include "(wee) INFO -- Added '[\"IFTTT\"]' to blacklist of clients."
       k = Ayadn::BlacklistWorkers.new
       k.remove(['client', 'IFTTT'])
       expect(Ayadn::Databases.blacklist['ifttt']).to eq nil
-      expect(File.read('spec/mock/ayadn.log')).to include "(wee) INFO -- Removed 'client:IFTTT' from blacklist."
+      expect(File.read('spec/mock/ayadn.log')).to include "(wee) INFO -- Removed 'client:[\"IFTTT\"]' from blacklist."
     end
   end
 

data/spec/unit/databases_spec.rb

@@ -9,6 +9,13 @@ describe Ayadn::Databases do
           pagination: 'spec/mock/'
         }
       })
+    Ayadn::Settings.stub(:options).and_return(
+        {
+          timeline: {
+            show_debug: false
+          }
+        }
+      )
     Ayadn::Databases.open_databases
   end
   describe ".add_to_users_db" do

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 31
+      expect(posts[23187443].length).to eq 32
     end
     it "gets oembed link from checkins post" do
       posts = Ayadn::Workers.new.build_posts(checkins['data'])

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ayadn
 version: !ruby/object:Gem::Version
-  version: 1.2.5
+  version: 1.2.6
 platform: ruby
 authors:
 - Eric Dejonckheere
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-25 00:00:00.000000000 Z
+date: 2014-05-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -216,6 +216,7 @@ files:
 - lib/ayadn/fileops.rb
 - lib/ayadn/logs.rb
 - lib/ayadn/mark.rb
+- lib/ayadn/nicerank.rb
 - lib/ayadn/pinboard.rb
 - lib/ayadn/post.rb
 - lib/ayadn/scroll.rb
@@ -235,6 +236,8 @@ files:
 - spec/mock/checkins.json
 - spec/mock/fwr_@ayadn.json
 - spec/mock/index.db
+- spec/mock/nicerank.db
+- spec/mock/nicerank.log
 - spec/mock/pagination.db
 - spec/mock/posted.json
 - spec/mock/regex.json
@@ -286,6 +289,8 @@ test_files:
 - spec/mock/checkins.json
 - spec/mock/fwr_@ayadn.json
 - spec/mock/index.db
+- spec/mock/nicerank.db
+- spec/mock/nicerank.log
 - spec/mock/pagination.db
 - spec/mock/posted.json
 - spec/mock/regex.json