ayadn 1.2.8 → 1.2.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a05ff15391beac67e7ee90c71472a52902a98018
-  data.tar.gz: bdb58c558b8e16a55e5d1d60db39c4bf3f26a6b4
+  metadata.gz: 396696ba41b0ced3c60604dec4dbd72e0fce6aad
+  data.tar.gz: 4cc63db6bf94dd34e50947d3a40e5a6faf33bbd4
 SHA512:
-  metadata.gz: 7158eb289115d85c4dfbb31e7f32de9f268f82f418cf188e6c1f38ea545117fc4cdd0f18d96aeb7b37414fa2fada0191b13bb0fdc062ddafa2d250a83d6a18ff
-  data.tar.gz: f71e3a75b986786b21810b399c4975bd337a614e6eec9ada372c7f0b09ae47c247c4d015e9f1a7cb6a675d3b6ab4dea1c38bd0e8d166fbc0e5bb30a3ee949b90
+  metadata.gz: 66a344b2aa29c53ff5a4b131d1b760f9e493dba8d3644a65381187d4c3fb386bb3ac1b00502dffb29a1dc03d42578d80a6e9d57b4f635203c7d6ba8d5c8d69c7
+  data.tar.gz: 4d0c31c8dac46ccd6a5359af261bcf76af857f6d27b7190d027396dd3cf8c4203c83773ef184f1836f12e2712a4c70403445e93a27e8de918a0e5c95ab520dea

data/CHANGELOG.md

@@ -1,3 +1,10 @@
+# 1.2.9 - 'Kirschen'
+
+- NiceRank database auto-limits to 10000 users
+- Better handling of connection errors
+- Better display of emojis
+- General code cleaning
+
 # 1.2.8 - 'Hans'
 
 - No more Ruby 1.9.3

data/lib/ayadn/action.rb

@@ -460,7 +460,7 @@ module Ayadn
         if options[:users]
           stream['data'].sort_by! {|obj| obj['counts']['followers']}
           stream['data'].each do |obj|
-            puts "----------\n\n\n"
+            puts @view.big_separator
             @view.show_userinfos(obj, nil)
           end
         elsif options[:channels]
@@ -874,9 +874,7 @@ module Ayadn
         Databases.close_all
         abort(Status.error_only_osx) unless Settings.config[:platform] =~ /darwin/
         itunes = get_track_infos
-        itunes.each do |el|
-          abort(Status.empty_fields) if el.length == 0
-        end
+        itunes.each {|el| abort(Status.empty_fields) if el.length == 0}
         @view.clear_screen
         text_to_post = "#nowplaying\nTitle: ‘#{itunes.track}’\nArtist: #{itunes.artist}\nfrom ‘#{itunes.album}’"
         puts Status.writing
@@ -886,9 +884,8 @@ module Ayadn
           exit
         end
         puts "\n"
-        resp = Post.new.post([text_to_post])
         puts Status.yourpost
-        @view.show_posted(resp)
+        @view.show_posted(Post.new.post([text_to_post]))
       rescue => e
         puts Status.wtf
         Errors.global_error("action/nowplaying", itunes, e)
@@ -1082,13 +1079,13 @@ module Ayadn
     end
 
     def user_404(username)
-      puts "\nUser #{username} doesn't exist. It could be a deleted account.\n".color(:red)
+      puts Status.user_404 username
       Errors.info("User #{username} doesn't exist")
       exit
     end
 
     def post_404(post_id)
-      puts "\nImpossible to find #{post_id}. This post may have been deleted.\n".color(:red)
+      puts Status.post_404 post_id
       Errors.info("Impossible to find #{post_id}")
       exit
     end
@@ -1172,7 +1169,7 @@ module Ayadn
         channel_id = Databases.get_channel_id(orig)
         if channel_id.nil?
           Errors.warn("Alias '#{orig}' doesn't exist.")
-          puts "\nThis alias doesn't exist.\n\n".color(:red)
+          puts Status.no_alias
           exit
         end
       end
@@ -1221,7 +1218,7 @@ module Ayadn
     def get_track_infos
       track = `osascript -e 'tell application "iTunes"' -e 'set trackName to name of current track' -e 'return trackName' -e 'end tell'`
       if track.empty?
-        puts "\nCanceled: unable to get info from iTunes.\n".color(:red)
+        puts Status.no_itunes
         Errors.warn "Nowplaying canceled: unable to get info from iTunes."
         exit
       end
@@ -1260,24 +1257,26 @@ module Ayadn
     end
 
     def view_all_hashtag_links(stream, hashtag)
-      links = links_from_posts(stream)
       @view.clear_screen
       puts "Links from posts containing hashtag '##{hashtag}': \n".color(:cyan)
-      show_links(links)
+      show_links(links_from_posts(stream))
     end
 
     def view_all_search_links(stream, words)
-      links = links_from_posts(stream)
       @view.clear_screen
       puts "Links from posts containing word(s) '#{words}': \n".color(:cyan)
-      show_links(links)
+      show_links(links_from_posts(stream))
     end
 
     def view_all_stars_links(stream)
-      links = links_from_posts(stream)
       @view.clear_screen
       puts "Links from your starred posts: \n".color(:cyan)
-      show_links(links)
+      show_links(links_from_posts(stream))
+    end
+
+    def self.quit msg
+      puts msg
+      exit
     end
 
   end

data/lib/ayadn/alias.rb

@@ -10,8 +10,7 @@ module Ayadn
         unless args.empty?
           channel, channel_alias = args[0], args[1]
         else
-          puts Status.wrong_arguments
-          exit
+          Action.quit Status.wrong_arguments
         end
         if channel.is_integer?
           Databases.create_alias(channel, channel_alias)
@@ -37,8 +36,7 @@ module Ayadn
           Logs.rec.info "Deleted alias '#{args[0]}'."
           puts Status.done
         else
-          puts Status.wrong_arguments
-          exit
+          Action.quit Status.wrong_arguments
         end
       rescue => e
         Errors.global_error("alias/delete", args, e)
@@ -55,8 +53,7 @@ module Ayadn
         unless database.nil?
           new_db = File.realpath(database)
         else
-          puts Status.wrong_arguments
-          exit
+          Action.quit Status.wrong_arguments
         end
         if File.exist?(new_db)
           Databases.import_aliases(new_db)
@@ -85,9 +82,7 @@ module Ayadn
             list.each {|k,v| h[k] = v}
             puts h.to_json
           else
-            puts "\e[H\e[2J"
-            puts Workers.new.build_aliases_list(list)
-            puts "\n"
+            View.new.page Workers.new.build_aliases_list(list)
           end
         else
           puts Status.empty_list

data/lib/ayadn/api.rb

@@ -3,42 +3,30 @@ module Ayadn
   class API
 
     def get_unified(options)
-      if options[:new] || options[:scroll]
-        options = {since_id: Databases.pagination['unified']}
-      end
+      options = paginate options, 'unified'
       get_parsed_response(Endpoints.new.unified(options))
     end
 
     def get_checkins(options)
-      if options[:new] || options[:scroll]
-        options = {since_id: Databases.pagination['explore:checkins']}
-      end
+      options = paginate options, 'explore:checkins'
       get_parsed_response(Endpoints.new.checkins(options))
     end
 
     def get_global(options)
-      if options[:new] || options[:scroll]
-        options = {since_id: Databases.pagination['global']}
-      end
+      options = paginate options, 'global'
       get_parsed_response(Endpoints.new.global(options))
     end
 
     def get_trending(options)
-      if options[:new] || options[:scroll]
-        options = {since_id: Databases.pagination['explore:trending']}
-      end
+      options = paginate options, 'explore:trending'
       get_explore(:trending, options)
     end
     def get_photos(options)
-      if options[:new] || options[:scroll]
-        options = {since_id: Databases.pagination['explore:photos']}
-      end
+      options = paginate options, 'explore:photos'
       get_explore(:photos, options)
     end
     def get_conversations(options)
-      if options[:new] || options[:scroll]
-        options = {since_id: Databases.pagination['explore:replies']}
-      end
+      options = paginate options, 'explore:replies'
       get_explore(:conversations, options)
     end
 
@@ -125,8 +113,7 @@ module Ayadn
       options = {:count => 200, :before_id => nil}
       big = []
       loop do
-        url = get_list_url(username, target, options)
-        resp = get_parsed_response(url)
+        resp = get_parsed_response(get_list_url(username, target, options))
         big << resp
         break if resp['meta']['min_id'] == nil || resp['meta']['more'] == false
         options = {:count => 200, :before_id => resp['meta']['min_id']}
@@ -231,9 +218,7 @@ module Ayadn
     end
 
     def get_messages(channel_id, options)
-      if options[:new] || options[:scroll]
-        options = {since_id: Databases.pagination["channel:#{channel_id}"]}
-      end
+      options = paginate options, "channel:#{channel_id}"
       get_parsed_response(Endpoints.new.messages(channel_id, options))
     end
 
@@ -291,6 +276,13 @@ module Ayadn
 
     private
 
+    def paginate options, target
+      if options[:new] || options[:scroll]
+        return {since_id: Databases.pagination[target]}
+      end
+      return options
+    end
+
     def get_parsed_response(url)
       JSON.parse(CNX.get_response_from(url))
     end
@@ -307,8 +299,7 @@ module Ayadn
       options = {:count => 200, :before_id => nil}
       big_hash = {}
       loop do
-        url = get_list_url(username, target, options)
-        resp = get_parsed_response(url)
+        resp = get_parsed_response(get_list_url(username, target, options))
         big_hash.merge!(Workers.extract_users(resp))
         break if resp['meta']['min_id'] == nil
         options = {:count => 200, :before_id => resp['meta']['min_id']}

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 nicerank}.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 debug}.each { |r| require_relative "#{r}" }
 
     desc "timeline", "Show your App.net timeline, aka the Unified Stream (-tl)"
     map "unified" => :timeline

data/lib/ayadn/blacklist.rb

@@ -4,22 +4,16 @@ module Ayadn
     desc "add TYPE TARGET", "Adds a mention, hashtag or client to your blacklist"
     long_desc Descriptions.blacklist_add
     def add(*args)
-      if args.length < 2
-        puts Status.type_and_target_missing
-      end
-      blacklist = BlacklistWorkers.new
-      blacklist.add(args)
+      Action.quit(Status.type_and_target_missing) if args.length < 2
+      BlacklistWorkers.new.add(args)
       puts Status.done
     end
 
     desc "remove TYPE TARGET", "Removes a mention, hashtag or client from your blacklist"
     long_desc Descriptions.blacklist_remove
     def remove(*args)
-      if args.length < 2
-        puts Status.type_and_target_missing
-      end
-      blacklist = BlacklistWorkers.new
-      blacklist.remove(args)
+      Action.quit(Status.type_and_target_missing) if args.length < 2
+      BlacklistWorkers.new.remove(args)
       puts Status.done
     end
 
@@ -27,23 +21,19 @@ module Ayadn
     long_desc Descriptions.blacklist_list
     option :raw, aliases: "-x", type: :boolean, desc: "Outputs the raw list in CSV"
     def list
-      blacklist = BlacklistWorkers.new
-      blacklist.list(options)
+      BlacklistWorkers.new.list(options)
     end
 
     desc "import DATABASE", "Imports a blacklist database from another Ayadn account"
     long_desc Descriptions.blacklist_import
     def import(database)
-      blacklist = BlacklistWorkers.new
-      blacklist.import(database)
-      puts Status.done
+      BlacklistWorkers.new.import(database)
     end
 
     desc "convert", "Convert your current blacklist database to the new format"
     long_desc Descriptions.blacklist_convert
     def convert
-      blacklist = BlacklistWorkers.new
-      blacklist.convert
+      BlacklistWorkers.new.convert
       puts Status.done
     end
 

data/lib/ayadn/cnx.rb

@@ -3,18 +3,28 @@ module Ayadn
   class CNX
 
     def self.get url
+      working = true
       begin
         RestClient.get(url) do |response, request, result|
-          debug(response, url) if Settings.options[:timeline][:show_debug] == true
-          #response
+          Debug.http response, url
           check_nr response, url
         end
       rescue SocketError => e
-        puts "\nConnection error.".color(:red)
-        Errors.global_error("cnx.rb/get", url, e)
+        if working == true
+          working = false
+          sleep 0.5
+          retry
+        end
+        Errors.nr "URL: #{url}"
+        return {'meta' => {'code' => 666}, 'data' => "#{e}"}.to_json
       rescue SystemCallError => e
-        puts "\nConnection error.".color(:red)
-        Errors.global_error("cnx.rb/get", url, e)
+        if working == true
+          working = false
+          sleep 0.5
+          retry
+        end
+        Errors.nr "URL: #{url}"
+        return {'meta' => {'code' => 666}, 'data' => "#{e}"}.to_json
       rescue => e
         Errors.global_error("cnx.rb/get", url, e)
       end
@@ -25,39 +35,49 @@ module Ayadn
       when 200
         response
       when 204
-        puts "\nError: the NiceRank filter made too many requests to the server. You may either wait for a little while before scrolling the filtered Global again, or set the scroll timer to a greater value (example: `ayadn set scroll timer 5`). You can also let the unranked posts appear in the stream if you prefer (see http://ayadn-app.net/doc).\n".color(:red)
+        puts "\nError: the NiceRank filter made too many requests to the server. You may either wait for a little while before scrolling the filtered Global again, or set the scroll timer to a greater value (example: `ayadn set scroll timer 5`). (see http://ayadn-app.net/doc).\n".color(:red)
         Errors.global_error("cnx.rb/get", [url, response.inspect, response.headers], "NiceRank: TOO MANY REQUESTS")
       else
         response
       end
     end
 
-    def self.debug response, url
-      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)
+      try_cnx = 1
       begin
         RestClient.get(url) do |response, request, result| #, :verify_ssl => OpenSSL::SSL::VERIFY_NONE
-          debug(response, url) if Settings.options[:timeline][:show_debug] == true
-          check(response)
+          Debug.http response, url
+          check response
         end
       rescue SocketError => e
+        if try_cnx < 4
+          try_cnx = retry_adn 10, try_cnx
+          retry
+        end
         puts "\nConnection error.".color(:red)
-        Errors.global_error("cnx.rb/get", url, e)
+        Errors.global_error("cnx.rb/get_response_from", url, e)
       rescue SystemCallError => e
+        if try_cnx < 4
+          try_cnx = retry_adn 15, try_cnx
+          retry
+        end
         puts "\nConnection error.".color(:red)
-        Errors.global_error("cnx.rb/get", url, e)
+        Errors.global_error("cnx.rb/get_response_from", url, e)
       rescue => e
-        Errors.global_error("cnx.rb/get", url, e)
+        Errors.global_error("cnx.rb/get_response_from", url, e)
       end
     end
 
-    def self.check(response)
+    def self.retry_adn seconds, try_cnx
+      Errors.warn "Unable to connect to App.net"
+      puts "\n\nUnable to connect to App.net\nRetrying in #{seconds} seconds... (#{try_cnx}/3)\n".color(:red)
+      try_cnx += 1
+      sleep seconds
+      puts "\e[H\e[2J"
+      try_cnx
+    end
+
+    def self.check response
       message = JSON.parse(response)['meta']['error_message'] if response.code != 200
       case response.code
       when 200
@@ -96,8 +116,8 @@ module Ayadn
       begin
         #RestClient::Resource.new(url).delete
         RestClient.delete(url) do |response, request, result|
-          debug(response, url) if Settings.options[:timeline][:show_debug] == true
-          check(response)
+          Debug.http response, url
+          check response
         end
       rescue SocketError => e
         puts "\nConnection error.".color(:red)
@@ -113,8 +133,8 @@ module Ayadn
     def self.post(url, payload = nil)
       begin
         RestClient.post(url, payload.to_json, :content_type => :json, :accept => :json) do |response, request, result|
-          debug(response, url) if Settings.options[:timeline][:show_debug] == true
-          check(response)
+          Debug.http response, url
+          check response
         end
       rescue SocketError => e
         puts "\nConnection error.".color(:red)
@@ -130,8 +150,8 @@ module Ayadn
     def self.put(url, payload)
       begin
         RestClient.put(url, payload.to_json, :content_type => :json, :accept => :json) do |response, request, result|
-          debug(response, url) if Settings.options[:timeline][:show_debug] == true
-          check(response)
+          Debug.http response, url
+          check response
         end
       rescue SocketError => e
         puts "\nConnection error.".color(:red)

data/lib/ayadn/databases.rb

@@ -17,35 +17,24 @@ module Ayadn
       @nicerank = self.init "#{Settings.config[:paths][:db]}/nicerank.db"
     end
 
+    def self.all_dbs
+      [@users, @index, @pagination, @aliases, @blacklist, @bookmarks, @nicerank]
+    end
+
     def self.close_all
 
-      if @nicerank.size > 5000
-        limit = Time.now - 432000
+      if @nicerank.size > 10000
+        limit = Time.now - (3600 * 168)
         @nicerank.each {|k,v| @nicerank.delete(k) if v[:cached] < limit}
-        if @nicerank.size > 5000
-          limit = Time.now - 86400
+        if @nicerank.size > 10000
+          limit = Time.now - (3600 * 48)
           @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"
+      Debug.db all_dbs
 
-        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|
+      all_dbs.each do |db|
           db.flush
           db.compact
           db.close
@@ -63,38 +52,26 @@ module Ayadn
     end
 
     def self.add_niceranks niceranks
-      niceranks.each do |id,infos|
-        @nicerank[id] = infos
-      end
+      niceranks.each {|id,infos| @nicerank[id] = infos}
     end
 
     def self.get_niceranks user_ids
       ids = {}
-      user_ids.each do |id|
-        ids[id] = @nicerank[id]
-      end
+      user_ids.each {|id| ids[id] = @nicerank[id]}
       ids
     end
 
     def self.add_mention_to_blacklist(target)
-      target.each do |username|
-        @blacklist[username.downcase] = :mention
-      end
+      target.each {|username| @blacklist[username.downcase] = :mention}
     end
     def self.add_client_to_blacklist(target)
-      target.each do |source|
-        @blacklist[source.downcase] = :client
-      end
+      target.each {|source| @blacklist[source.downcase] = :client}
     end
     def self.add_hashtag_to_blacklist(target)
-      target.each do |tag|
-        @blacklist[tag.downcase] = :hashtag
-      end
+      target.each {|tag| @blacklist[tag.downcase] = :hashtag}
     end
     def self.remove_from_blacklist(target)
-      target.each do |el|
-        @blacklist.delete(el.downcase)
-      end
+      target.each {|el| @blacklist.delete(el.downcase)}
     end
     def self.import_blacklist(blacklist)
       new_list = self.init blacklist
@@ -103,13 +80,9 @@ module Ayadn
     end
     def self.convert_blacklist
       dummy = {}
-      @blacklist.each do |v,k|
-        dummy[v.downcase] = k
-      end
+      @blacklist.each {|v,k| dummy[v.downcase] = k}
       @blacklist.clear
-      dummy.each do |v,k|
-        @blacklist[v] = k
-      end
+      dummy.each {|v,k| @blacklist[v] = k}
     end
     def self.save_max_id(stream)
       @pagination[stream['meta']['marker']['name']] = stream['meta']['max_id']
@@ -134,17 +107,13 @@ module Ayadn
     end
 
     def self.get_alias_from_id(channel_id)
-      @aliases.each do |al, id|
-        return al if id == channel_id
-      end
+      @aliases.each {|al, id| return al if id == channel_id}
       nil
     end
 
     def self.save_indexed_posts(posts)
       @index.clear
-      posts.each do |id, hash|
-        @index[id] = hash
-      end
+      posts.each {|id, hash| @index[id] = hash}
     end
 
     def self.get_index_length
@@ -153,19 +122,15 @@ module Ayadn
 
     def self.get_post_from_index(number)
       unless number > @index.length || number <= 0
-        @index.each do |id, values|
-          return values if values[:count] == number
-        end
+        @index.each {|id, values| return values if values[:count] == number}
       else
-        puts "\nNumber must be in the range of the indexed posts.\n".color(:red)
+        puts Status.must_be_in_index
         Errors.global_error("databases/get_post_from_index", number, "out of range")
       end
     end
 
     def self.add_to_users_db_from_list(list)
-      list.each do |id, content_array|
-        @users[id] = {content_array[0] => content_array[1]}
-      end
+      list.each { |id, content_array| @users[id] = {content_array[0] => content_array[1]} }
     end
 
     def self.add_to_users_db(id, username, name)