ayadn 1.2.8 → 1.2.9

data/lib/ayadn/debug.rb

@@ -0,0 +1,91 @@
+# encoding: utf-8
+module Ayadn
+  class Debug
+
+    def self.http response, url
+      if Settings.options[:timeline][:show_debug] == true
+        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
+    end
+
+    def self.db dbs
+      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"
+        dbs.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
+    end
+
+    def self.err error
+      if Settings.options[:timeline][:show_debug] == true
+        puts "--*--\nTRACE:\n"
+        raise error
+        puts "\n--*--\n\n"
+      end
+    end
+
+    def self.how_many_ranks niceranks, get_these
+      if Settings.options[:timeline][:show_debug] == true
+        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
+    end
+
+    def self.ranks_pool niceranks
+      if Settings.options[:timeline][:show_debug] == true
+        deb = "=====\n"
+        deb << "NR in pool:\t#{niceranks}\n"
+        deb << "=====\n"
+        puts deb.color(Settings.options[:colors][:debug])
+      end
+    end
+
+    def self.niceranks_error resp
+      if Settings.options[:timeline][:show_debug] == true
+        deb = "=====\n"
+        deb << "NR Error:\t#{resp}\n"
+        deb << "=====\n"
+        puts deb.color(Settings.options[:colors][:debug])
+      end
+    end
+
+    def self.total_ranks niceranks
+      if Settings.options[:timeline][:show_debug] == true
+        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
+
+    def self.stream stream, options, target
+      if Settings.options[:timeline][:show_debug] == true
+        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
+    end
+
+  end
+end

data/lib/ayadn/endpoints.rb

@@ -33,82 +33,82 @@ module Ayadn
     end
 
     def unified(options)
-      if options[:count] || options[:since_id]
-        @options_list = API.build_query(options)
+      @options_list = if options[:count] || options[:since_id]
+        API.build_query(options)
       else
-        @options_list = API.build_query({count: Settings.options[:counts][:unified]})
+        API.build_query({count: Settings.options[:counts][:unified]})
       end
       "#{@posts_url}stream/unified?access_token=#{Settings.user_token}#{@options_list}"
     end
 
     def checkins(options)
-      if options[:count] || options[:since_id]
-        @options_list = API.build_query(options)
+      @options_list = if options[:count] || options[:since_id]
+        API.build_query(options)
       else
-        @options_list = API.build_query({count: Settings.options[:counts][:checkins]})
+        API.build_query({count: Settings.options[:counts][:checkins]})
       end
       "#{@posts_url}stream/explore/checkins?access_token=#{Settings.user_token}#{@options_list}"
     end
 
     def global(options)
-      if options[:count] || options[:since_id]
-        @options_list = API.build_query(options)
+      @options_list = if options[:count] || options[:since_id]
+        API.build_query(options)
       else
-        @options_list = API.build_query({count: Settings.options[:counts][:global]})
+        API.build_query({count: Settings.options[:counts][:global]})
       end
       "#{@posts_url}stream/global?access_token=#{Settings.user_token}#{@options_list}"
     end
 
     def trending(options)
-      if options[:count] || options[:since_id]
-        @options_list = API.build_query(options)
+      @options_list = if options[:count] || options[:since_id]
+        API.build_query(options)
       else
-        @options_list = API.build_query({count: Settings.options[:counts][:trending]})
+        API.build_query({count: Settings.options[:counts][:trending]})
       end
       "#{@posts_url}stream/explore/trending?access_token=#{Settings.user_token}#{@options_list}"
     end
 
     def photos(options)
-      if options[:count] || options[:since_id]
-        @options_list = API.build_query(options)
+      @options_list = if options[:count] || options[:since_id]
+        API.build_query(options)
       else
-        @options_list = API.build_query({count: Settings.options[:counts][:photos]})
+        API.build_query({count: Settings.options[:counts][:photos]})
       end
       "#{@posts_url}stream/explore/photos?access_token=#{Settings.user_token}#{@options_list}"
     end
 
     def conversations(options)
-      if options[:count] || options[:since_id]
-        @options_list = API.build_query(options)
+      @options_list = if options[:count] || options[:since_id]
+        API.build_query(options)
       else
-        @options_list = API.build_query({count: Settings.options[:counts][:conversations]})
+        API.build_query({count: Settings.options[:counts][:conversations]})
       end
       "#{@posts_url}stream/explore/conversations?access_token=#{Settings.user_token}#{@options_list}"
     end
 
     def mentions(username, options)
-      if options[:count]
-        @options_list = API.build_query(options)
+      @options_list = if options[:count]
+        API.build_query(options)
       else
-        @options_list = API.build_query({count: Settings.options[:counts][:mentions]})
+        API.build_query({count: Settings.options[:counts][:mentions]})
       end
       "#{@users_url}#{username}/mentions/?access_token=#{Settings.user_token}#{@options_list}"
     end
 
     def posts(username, options)
-      if options[:count]
-        @options_list = API.build_query(options)
+      @options_list = if options[:count]
+        API.build_query(options)
       else
-        @options_list = API.build_query({count: Settings.options[:counts][:posts]})
+        API.build_query({count: Settings.options[:counts][:posts]})
       end
       "#{@users_url}#{username}/posts/?access_token=#{Settings.user_token}#{@options_list}"
     end
 
     def whatstarred(username, options)
-      if options[:count]
-        @options_list = API.build_query(options)
+      @options_list = if options[:count]
+        API.build_query(options)
       else
-        @options_list = API.build_query({count: Settings.options[:counts][:default]})
+        API.build_query({count: Settings.options[:counts][:default]})
       end
       "#{@users_url}#{username}/stars/?access_token=#{Settings.user_token}#{@options_list}"
     end
@@ -126,10 +126,10 @@ module Ayadn
     end
 
     def convo(post_id, options)
-      if options[:count]
-        @options_list = API.build_query(options)
+      @options_list = if options[:count]
+        API.build_query(options)
       else
-        @options_list = API.build_query({count: Settings.options[:counts][:convo]})
+        API.build_query({count: Settings.options[:counts][:convo]})
       end
       "#{@posts_url}#{post_id}/replies/?access_token=#{Settings.user_token}#{@options_list}"
     end
@@ -155,37 +155,37 @@ module Ayadn
     end
 
     def search(words, options)
-      if options[:count]
-        @options_list = API.build_query(options)
+      @options_list = if options[:count]
+        API.build_query(options)
       else
-        @options_list = API.build_query({count: Settings.options[:counts][:search]})
+        API.build_query({count: Settings.options[:counts][:search]})
       end
       "#{@posts_url}search?text=#{words}&access_token=#{Settings.user_token}#{@options_list}"
     end
 
     def search_users words, options
-      if options[:count]
-        @options_list = API.build_query(options)
+      @options_list = if options[:count]
+        API.build_query(options)
       else
-        @options_list = API.build_query({count: Settings.options[:counts][:search]})
+        API.build_query({count: Settings.options[:counts][:search]})
       end
       "#{@users_url}search?q=#{words}&access_token=#{Settings.user_token}#{@options_list}"
     end
 
     def search_annotations anno, options
-      if options[:count]
-        @options_list = API.build_query(options)
+      @options_list = if options[:count]
+        API.build_query(options)
       else
-        @options_list = API.build_query({count: Settings.options[:counts][:search]})
+        API.build_query({count: Settings.options[:counts][:search]})
       end
       "#{@posts_url}search?annotation_types=#{anno}&access_token=#{Settings.user_token}#{@options_list}"
     end
 
     def search_messages channel_id, words, options
-      if options[:count]
-        @options_list = API.build_query(options)
+      @options_list = if options[:count]
+        API.build_query(options)
       else
-        @options_list = API.build_query({count: Settings.options[:counts][:search]})
+        API.build_query({count: Settings.options[:counts][:search]})
       end
       "#{@channels_url}messages/search?query=#{words}&channel_ids=#{channel_id}&access_token=#{Settings.user_token}#{@options_list}"
     end
@@ -200,15 +200,14 @@ module Ayadn
     end
 
     def single_post(post_id, options)
-      @options_list = API.build_query(options)
-      "#{@posts_url}#{post_id}?access_token=#{Settings.user_token}#{@options_list}"
+      "#{@posts_url}#{post_id}?access_token=#{Settings.user_token}#{API.build_query(options)}"
     end
 
     def files_list(options)
-      if options[:count]
-        @options_list = API.build_query(options)
+      @options_list = if options[:count]
+        API.build_query(options)
       else
-        @options_list = API.build_query({count: Settings.options[:counts][:files]})
+        API.build_query({count: Settings.options[:counts][:files]})
       end
       "#{@users_url}me/files?access_token=#{Settings.user_token}#{@options_list}"
     end

data/lib/ayadn/errors.rb

@@ -11,9 +11,7 @@ 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
+      Debug.err error
       exit
     end
     def self.error(status)

data/lib/ayadn/fileops.rb

@@ -38,9 +38,7 @@ module Ayadn
 
     def get_users(list)
       h = {}
-      list.each do |k,v|
-        h[k] = { username: v[0], name: v[1] }
-      end
+      list.each {|k,v| h[k] = { username: v[0], name: v[1] }}
       h
     end
 

data/lib/ayadn/mark.rb

@@ -139,7 +139,7 @@ module Ayadn
       entry << "Beginning:".color(:cyan)
       text = content[:root_text].gsub(/[\r\n]/, ' ')
       if text.length <= 60
-        entry << "\t#{text[0..60]}\n"
+        entry << "\t#{text}\n"
       else
         entry << "\t#{text[0..60]} [...]\n"
       end

data/lib/ayadn/nicerank.rb

@@ -4,7 +4,6 @@ module Ayadn
 
     def initialize
       @url = 'http://api.search-adn.net/user/nicerank?ids='
-      @show_debug = Settings.options[:timeline][:show_debug]
     end
 
     def get_ranks stream
@@ -27,6 +26,7 @@ module Ayadn
           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
@@ -40,17 +40,17 @@ module Ayadn
         end
       end
 
-      how_many(niceranks, get_these) if @show_debug == true
+      Debug.how_many_ranks niceranks, get_these
 
       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
+          Debug.niceranks_error resp
           Errors.nr "REQUESTED: #{get_these.join(' ')}"
           Errors.nr "RESPONSE: #{resp}"
           if niceranks
-            in_pool(niceranks) if @show_debug == true
+            Debug.ranks_pool niceranks
             return niceranks
           else
             return {}
@@ -66,7 +66,7 @@ module Ayadn
           }
         end
 
-        got(niceranks) if @show_debug == true
+        Debug.total_ranks niceranks
       end
 
       Databases.add_niceranks niceranks
@@ -74,36 +74,5 @@ module Ayadn
       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/pinboard.rb

@@ -8,9 +8,9 @@ module Ayadn
 
     def ask_credentials
       begin
-        puts "Please enter your Pinboard username (CTRL+C to cancel): ".color(:green)
+        puts Status.pin_username
         pin_username = STDIN.gets.chomp()
-        puts "\nPlease enter your Pinboard password (invisible, CTRL+C to cancel): ".color(:green)
+        puts Status.pin_password
         pin_password = STDIN.noecho(&:gets).chomp()
       rescue Interrupt
         abort(Status.canceled)

data/lib/ayadn/post.rb

@@ -56,8 +56,7 @@ module Ayadn
           post << buffer
         end
       rescue Interrupt
-        #temp
-        Errors.info "Write post: canceled."
+        #Errors.info "Write post: canceled."
         abort(Status.canceled)
       end
       post
@@ -93,10 +92,10 @@ module Ayadn
       send_content(url, payload_basic(text))
     end
 
-    def send_log(data)
-      url = Endpoints.new.ayadnlog
-      send_content(url, payload_log(data))
-    end
+    # def send_log(data)
+    #   url = Endpoints.new.ayadnlog
+    #   send_content(url, payload_log(data))
+    # end
 
     def send_post(text)
       url = Endpoints.new.posts_url
@@ -114,13 +113,11 @@ module Ayadn
     end
 
     def check_post_length(lines_array)
-      max_size = Settings.config[:post_max_length]
-      check_length(lines_array, max_size)
+      check_length(lines_array, Settings.config[:post_max_length])
     end
 
     def check_message_length(lines_array)
-      max_size = Settings.config[:message_max_length]
-      check_length(lines_array, max_size)
+      check_length(lines_array, Settings.config[:message_max_length])
     end
 
     def check_length(lines_array, max_size)
@@ -132,7 +129,7 @@ module Ayadn
         exit
       elsif size > max_size
         Errors.warn "Canceled: too long (#{size - max_size}chars)"
-        abort("\n\nCanceled: too long. #{max_size} max, #{size - max_size} characters to remove.\n\n\n".color(:red))
+        abort(Status.too_long(size, max_size))
       end
     end
 
@@ -150,7 +147,7 @@ module Ayadn
     end
 
     def error_text_empty
-      puts "\n\nYou should provide some text.\n\n".color(:red)
+      puts Status.no_text
       Errors.warn "-Post without text-"
     end
 
@@ -214,18 +211,18 @@ module Ayadn
       }
     end
 
-    def payload_log(data)
-      extended = annotations
-      extended << {
-          "type" => "com.ayadn.log",
-          "value" => data
-        }
-      return {
-        "text" => "#ayadnlog",
-        "entities" => entities,
-        "annotations" => extended
-      }
-    end
+    # def payload_log(data)
+    #   extended = annotations
+    #   extended << {
+    #       "type" => "com.ayadn.log",
+    #       "value" => data
+    #     }
+    #   return {
+    #     "text" => "#ayadnlog",
+    #     "entities" => entities,
+    #     "annotations" => extended
+    #   }
+    # end
 
   end
 end

data/lib/ayadn/scroll.rb

@@ -6,7 +6,6 @@ module Ayadn
       @api = api
       @view = view
       @chars = %w{ | / - \\ }
-      @show_debug = Settings.options[:timeline][:show_debug]
     end
 
     def method_missing(meth, options)
@@ -25,19 +24,8 @@ module Ayadn
       loop do
         begin
           stream = get(target, options)
-
-          # if options[:filter] == true
-            unless stream['data'].empty?
-              niceranks = @nr.get_ranks stream
-            else
-              niceranks = {}
-            end
-          # else
-          #   niceranks = {}
-          # end
-
-          debug_stream(stream, options, target) if @show_debug == true
-
+          stream['data'].empty? ? niceranks = {} : niceranks = @nr.get_ranks(stream)
+          Debug.stream stream, options, target
           target = "explore:#{target}" if explore?(target)
           show_if_new(stream, options, target, niceranks)
           target = orig_target if target =~ /explore/
@@ -51,14 +39,11 @@ module Ayadn
 
     def mentions(username, options)
       options = check_raw(options)
-      user = @api.get_user(username)
-      id = user['data']['id']
+      id = @api.get_user(username)['data']['id']
       loop do
         begin
           stream = @api.get_mentions(username, options)
-
-          debug_stream(stream, options, username) if @show_debug == true
-
+          Debug.stream stream, options, username
           show_if_new(stream, options, "mentions:#{id}")
           options = save_then_return(stream, options)
           countdown
@@ -70,14 +55,11 @@ module Ayadn
 
     def posts(username, options)
       options = check_raw(options)
-      user = @api.get_user(username)
-      id = user['data']['id']
+      id = @api.get_user(username)['data']['id']
       loop do
         begin
           stream = @api.get_posts(username, options)
-
-          debug_stream(stream, options, username) if @show_debug == true
-
+          Debug.stream stream, options, username
           show_if_new(stream, options, "posts:#{id}")
           options = save_then_return(stream, options)
           countdown
@@ -92,9 +74,7 @@ module Ayadn
       loop do
         begin
           stream = @api.get_convo(post_id, options)
-
-          debug_stream(stream, options, post_id) if @show_debug == true
-
+          Debug.stream stream, options, post_id
           show_if_new(stream, options, "replies:#{post_id}")
           options = save_then_return(stream, options)
           countdown
@@ -109,9 +89,7 @@ module Ayadn
       loop do
         begin
           stream = @api.get_messages(channel_id, options)
-
-          debug_stream(stream, options, channel_id) if @show_debug == true
-
+          Debug.stream stream, options, channel_id
           show_if_new(stream, options, "channel:#{channel_id}")
           options = save_then_return(stream, options)
           countdown
@@ -123,20 +101,8 @@ 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
-      else
-        pause
-      end
+      Settings.options[:timeline][:show_spinner] == true ? waiting : pause
     end
 
     def clear
@@ -179,10 +145,7 @@ module Ayadn
     end
 
     def waiting
-      interval = Settings.options[:scroll][:timer] * 10
-      interval.times do
-        spin
-      end
+      (Settings.options[:scroll][:timer] * 10).times { spin }
     end
 
     def pause
@@ -226,10 +189,10 @@ module Ayadn
     end
 
     def show(stream, options, niceranks)
-      unless options[:raw]
-        @view.show_posts(stream['data'], options, niceranks)
-      else
+      if options[:raw]
         jj stream
+      else
+        @view.show_posts(stream['data'], options, niceranks)
       end
     end
 

data/lib/ayadn/settings.rb

@@ -212,4 +212,5 @@ module Ayadn
     end
 
   end
+
 end

data/lib/ayadn/status.rb

@@ -247,5 +247,32 @@ module Ayadn
     def self.cache_range
       "\nPlease enter a number of hours between 3 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)
+    end
+    def self.user_404 username
+      "\nUser #{username} doesn't exist. It could be a deleted account.\n".color(:red)
+    end
+    def self.post_404(post_id)
+      "\nImpossible to find #{post_id}. This post may have been deleted.\n".color(:red)
+    end
+    def self.no_alias
+      "\nThis alias doesn't exist.\n\n".color(:red)
+    end
+    def self.no_itunes
+      "\nCanceled: unable to get info from iTunes.\n".color(:red)
+    end
+    def self.pin_username
+      "Please enter your Pinboard username (CTRL+C to cancel): ".color(:green)
+    end
+    def self.pin_password
+      "\nPlease enter your Pinboard password (invisible, CTRL+C to cancel): ".color(:green)
+    end
+    def self.too_long size, max_size
+      "\n\nCanceled: too long. #{max_size} max, #{size - max_size} characters to remove.\n\n\n".color(:red)
+    end
+    def self.no_text
+      "\n\nYou should provide some text.\n\n".color(:red)
+    end
   end
 end