ayadn 3.0 → 4.0

data/lib/ayadn/filtered_post_object.rb

@@ -0,0 +1,11 @@
+# encoding: utf-8
+module Ayadn
+  class FilteredPost
+
+  	attr_accessor :input, :is_human, :name, :count, :id, :thread_id, :username, :user_id, :nicerank, :handle, :type, :date, :date_short, :you_starred, :source_name, :source_link, :canonical_url, :tags, :links, :mentions, :directed_to, :checkins, :has_checkins, :is_repost, :repost_of, :original_poster, :raw_text, :text, :is_starred, :num_stars, :num_replies, :is_reply, :reply_to, :num_reposts
+
+  	def initialize post
+  		@input = post
+  	end
+  end
+end

data/lib/ayadn/ids.rb

@@ -3,9 +3,6 @@ module Ayadn
   class Settings
     CLIENT_ID = "hFsCGArAjgJkYBHTHbZnUvzTmL4vaLHL"
   end
-  class TvShow
-    TVDB_API_KEY = 'E874ACBC542CAA53'
-  end
   class Endpoints
     CALLBACK_URL = "http://aya.io/ayadn/auth.html"
   end

data/lib/ayadn/logs.rb

@@ -7,13 +7,13 @@ module Ayadn
     end
 
     def self.create_logger
-      @rec = Logger.new(Settings.config[:paths][:log] + "/ayadn.log", 'monthly')
+      @rec = Logger.new(Settings.config.paths.log + "/ayadn.log", 'monthly')
       @rec.formatter = proc do |severity, datetime, progname, msg|
-        "#{datetime} (#{Settings.config[:version]}) #{severity} * #{msg}\n"
+        "#{datetime} (#{Settings.config.version}) #{severity} * #{msg}\n"
       end
-      @nr = Logger.new(Settings.config[:paths][:log] + "/nicerank.log", 'monthly')
+      @nr = Logger.new(Settings.config.paths.log + "/nicerank.log", 'monthly')
       @nr.formatter = proc do |severity, datetime, progname, msg|
-        "#{datetime} (#{Settings.config[:version]}) #{severity} * #{msg}\n"
+        "#{datetime} (#{Settings.config.version}) #{severity} * #{msg}\n"
       end
     end
 

data/lib/ayadn/mark.rb

@@ -10,6 +10,7 @@ module Ayadn
       begin
         init
         status = Status.new
+        workers = Workers.new(status)
         unless args.empty?
           double = args.dup
           post_id, convo_title = double.shift, double.join(' ')
@@ -17,41 +18,42 @@ module Ayadn
           status.wrong_arguments
           exit
         end
-        Check.new.bad_post_id(post_id)
+        Check.new(status).bad_post_id(post_id)
         if options[:force]
-          Settings.global[:force] = true
+          Settings.global.force = true
         else
-          post_id = Workers.new.get_real_post_id(post_id)
+          post_id = workers.get_real_post_id(post_id)
         end
         convo_title = post_id if convo_title == ''
-        api, workers, view = API.new, Workers.new, View.new
+        api, workers, view = API.new, workers, View.new(status, workers)
         users, bucket = [], []
         view.clear_screen
         status.info(:connected, "analyzing conversation", :yellow)
         resp = api.get_convo(post_id, options)
-        posts = workers.build_posts(resp['data'].reverse)
-        posts.each do |id, post|
-          users << "#{post[:original_poster]}"
-          post[:mentions].each {|mention| users << "#{mention}"}
+        stream_object = StreamObject.new(resp)
+        posts = workers.build_posts(stream_object.posts.reverse)
+        posts.each do |post|
+          users << "#{post.original_poster}"
+          post.mentions.each {|mention| users << "#{mention}"}
           bucket << post
         end
         users.uniq!
         now = Time.now.to_s
         bookmark = {
           'id' => post_id,
-          'root_id' => bucket[0][:id],
-          'last_id' => (bucket.last)[:id],
+          'root_id' => bucket[0].id,
+          'last_id' => bucket.last.id,
           'title' => convo_title,
-          'first_date' => bucket[0][:date],
-          'last_date' => (bucket.last)[:date],
+          'first_date' => bucket[0].date,
+          'last_date' => bucket.last.date,
           'mark_date' => now[0..18],
-          'first_poster' => bucket[0][:original_poster],
-          'last_poster' => (bucket.last)[:username],
+          'first_poster' => bucket[0].original_poster,
+          'last_poster' => bucket.last.username,
           'users' => users,
           'size' => bucket.length,
-          'url' => bucket[0][:canonical_url],
-          'root_text' => bucket[0][:raw_text],
-          'root_colorized_text' => bucket[0][:text]
+          'url' => bucket[0].canonical_url,
+          'root_text' => bucket[0].raw_text,
+          'root_colorized_text' => bucket[0].text
         }
         view.clear_screen
         status.info(:done, "bookmarked conversation:", :green)
@@ -114,17 +116,18 @@ module Ayadn
       begin
         init
         status = Status.new
+        workers = Workers.new(status)
         if args.empty?
           status.wrong_arguments
           exit
         else
           post_id = args[0]
         end
-        Check.new.bad_post_id(post_id)
+        Check.new(status).bad_post_id(post_id)
         if options[:force]
-          Settings.global[:force] = true
+          Settings.global.force = true
         else
-          post_id = Workers.new.get_real_post_id(post_id)
+          post_id = workers.get_real_post_id(post_id)
         end
         Databases.delete_bookmark post_id
         status.done
@@ -140,17 +143,18 @@ module Ayadn
       begin
         init
         status = Status.new
+        workers = Workers.new(status)
         unless args.empty? || args[1].nil?
           arguments = args.dup
           post_id = arguments.shift
         else
           abort Status.wrong_arguments
         end
-        Check.new.bad_post_id(post_id)
+        Check.new(status).bad_post_id(post_id)
         if options[:force]
-          Settings.global[:force] = true
+          Settings.global.force = true
         else
-          post_id = Workers.new.get_real_post_id(post_id)
+          post_id = workers.get_real_post_id(post_id)
         end
         Databases.rename_bookmark post_id, arguments.join(" ")
         status.done
@@ -164,25 +168,25 @@ module Ayadn
     def make_entry content
       entry = ""
       entry << "Post id:".color(:cyan)
-      entry << "\t#{content['id']}\n".color(Settings.options[:colors][:username])
+      entry << "\t#{content['id']}\n".color(Settings.options.colors.username)
       unless content['title'].is_integer?
         entry << "Title:".color(:cyan)
-        entry << "\t\t#{content['title']}\n".color(Settings.options[:colors][:id])
+        entry << "\t\t#{content['title']}\n".color(Settings.options.colors.id)
       end
       entry << "Date:".color(:cyan)
-      entry << "\t\t#{content['first_date']}\n".color(Settings.options[:colors][:date])
+      entry << "\t\t#{content['first_date']}\n".color(Settings.options.colors.date)
       # entry << "Bookmarked:".color(:cyan)
-      # entry << "\t#{content['mark_date']}\n".color(Settings.options[:colors][:date])
+      # entry << "\t#{content['mark_date']}\n".color(Settings.options.colors.date)
       entry << "Posts:".color(:cyan)
-      entry << "\t\t#{content['size']}\n".color(Settings.options[:colors][:name])
+      entry << "\t\t#{content['size']}\n".color(Settings.options.colors.name)
       entry << "Posters:".color(:cyan)
       posters = []
       content['users'].each {|mention| posters << "@#{mention}"}
-      entry << "\t#{posters.join(', ')}\n".color(Settings.options[:colors][:mentions])
+      entry << "\t#{posters.join(', ')}\n".color(Settings.options.colors.mentions)
       # entry << "First:\t\t@#{content['first_poster']}\n"
       # entry << "Last:\t\t@#{content['last_poster']}\n"
       entry << "Link:".color(:cyan)
-      entry << "\t\t#{content['url']}\n".color(Settings.options[:colors][:link])
+      entry << "\t\t#{content['url']}\n".color(Settings.options.colors.link)
       entry << "Beginning:".color(:cyan)
       text = content['root_text'].gsub(/[\r\n]/, ' ')
       if text.length <= 60

data/lib/ayadn/nicerank.rb

@@ -23,8 +23,8 @@ module Ayadn
     def get_ranks stream
       begin
         user_ids, niceranks = [], {}
-        stream['data'].each do |post|
-          id = post['user']['id']
+        stream.posts.each do |post|
+          id = post.user.id
           user_ids << id if @store[id].nil?
         end
         user_ids.uniq!
@@ -47,7 +47,7 @@ module Ayadn
         parsed['data'].each do |obj|
           res = @store[obj['user_id']]
           if res.nil?
-            obj['is_human'] == true ? is_human = 1 : is_human = 0
+            obj['is_human'] ? is_human = 1 : is_human = 0
             content = {
               rank: obj['rank'],
               is_human: is_human
@@ -61,14 +61,14 @@ module Ayadn
         end
 
 
-        @posts += stream['data'].size
+        @posts += stream.posts.size
         @ids += user_ids.size
 
-        if Settings.options[:timeline][:debug] == true
+        if Settings.options.timeline.debug
           deb = "\n"
           deb << "+ NICERANK\n"
           deb << "* t#{Time.now.to_i}\n"
-          deb << "Posts:\t\t#{stream['data'].size}\n"
+          deb << "Posts:\t\t#{stream.posts.size}\n"
           deb << "Requested NR:\t#{user_ids.size}\n"
           deb << "* TOTALS\n"
           deb << "Posts:\t\t#{@posts}\n"
@@ -76,7 +76,7 @@ module Ayadn
           deb << "DB hits:\t#{@hits}\n"
           deb << "Uniques:\t#{@store.count}\n"
           deb << "\n"
-          puts deb.color(Settings.options[:colors][:debug])
+          puts deb.color(Settings.options.colors.debug)
           Logs.rec.debug "NICERANK/POSTS: #{@posts}"
           Logs.rec.debug "NICERANK/NR CALLS: #{@ids}"
           Logs.rec.debug "NICERANK/CACHE HITS: #{@hits}"

data/lib/ayadn/nowplaying.rb

@@ -3,13 +3,7 @@ module Ayadn
 
   class NowPlaying
 
-    # Warning
-    # comment next line
     require_relative "ids"
-    # uncomment next line and insert your own codes
-    # AFFILIATE_SUFFIX = ""
-    # DEEZER_APP_ID = ""
-    # DEEZER_AUTH_URL = ""
 
     begin
       require 'rss'
@@ -19,11 +13,12 @@ module Ayadn
       exit
     end
 
-    def initialize api, view, workers, options = {}
+    def initialize api, view, workers, status, options = {}
       @api = api
       @view = view
       @workers = workers
-      @status = Status.new
+      @status = status
+      # @status = Status.new
       unless options[:hashtag]
         @hashtag = "#nowplaying"
       else
@@ -88,7 +83,7 @@ module Ayadn
 
     def itunes options
       begin
-        unless Settings.config[:platform] =~ /darwin/
+        unless Settings.config.platform =~ /darwin/
           @status.error_only_osx
           exit
         end
@@ -141,8 +136,8 @@ module Ayadn
         unless options[:no_url] || store.nil?
           text_to_post += "\n \n[iTunes Store](#{store['link']})"
         end
-        poster = Post.new
-        poster.post_size_error(text_to_post) if poster.post_size_ok?(text_to_post) == false
+        poster = Post.new(@status)
+        poster.post_size_error(text_to_post) if !poster.post_size_ok?(text_to_post)
         @view.clear_screen
         @status.writing
         show_nowplaying("\n#{before}", options, store)
@@ -189,7 +184,7 @@ module Ayadn
           visible: visible
         }
         resp = poster.post(dic)
-        FileOps.save_post(resp) if Settings.options[:backup][:posts]
+        FileOps.save_post(resp) if Settings.options.backup.posts
         @view.show_posted(resp)
       rescue => e
         @status.wtf
@@ -245,10 +240,6 @@ module Ayadn
 
     def get_itunes_store url, artist, track
       results = JSON.load(CNX.download(URI.escape(url)))['results']
-
-      #
-      # require 'pp'; pp results; exit
-      # 
       
       unless results.nil?
 
@@ -266,10 +257,6 @@ module Ayadn
           candidates << e if e['artistName'].downcase == artist.downcase
         end
 
-        #
-        # require "pp";pp candidates; exit
-        #
-
         candidate = if candidates.empty?
           results[0]
         else
@@ -309,10 +296,9 @@ module Ayadn
     end
 
     def show_nowplaying(text, options, store)
-      # @status.to_be_posted
       thor = Thor::Shell::Basic.new
       text.split("\n").each do |line|
-        thor.say_status(nil, line.color(Settings.options[:colors][:excerpt]))
+        thor.say_status(nil, line.color(Settings.options.colors.excerpt))
       end
       puts "\n"
       unless options['no_url'] || store['code'] != 200

data/lib/ayadn/pinboard.rb

@@ -2,32 +2,28 @@
 module Ayadn
   class PinBoard
 
-    def initialize
-      @status = Status.new
-    end
-
     def has_credentials_file?
-      File.exist?(Ayadn::Settings.config[:paths][:auth] + '/pinboard.data')
+      File.exist?(Ayadn::Settings.config.paths.auth + '/pinboard.data')
     end
 
-    def ask_credentials
+    def ask_credentials status = Status.new
       begin
-        @status.pin_username
+        status.pin_username
         pin_username = STDIN.gets.chomp()
-        @status.pin_password
+        status.pin_password
         pin_password = STDIN.noecho(&:gets).chomp()
       rescue Interrupt
-        @status.canceled
+        status.canceled
         exit
       rescue => e
-        @status.wtf
+        status.wtf
         Errors.global_error({error: e, caller: caller, data: [pin_username]})
       end
       save_credentials(encode(pin_username, pin_password))
     end
 
     def load_credentials
-      decode(File.read(Ayadn::Settings.config[:paths][:auth] + '/pinboard.data'))
+      decode(File.read(Ayadn::Settings.config.paths.auth + '/pinboard.data'))
     end
 
     def pin(data)
@@ -42,7 +38,7 @@ module Ayadn
     end
 
     def save_credentials(encoded_pinboard_credentials)
-      File.write(Ayadn::Settings.config[:paths][:auth] + '/pinboard.data', encoded_pinboard_credentials)
+      File.write(Ayadn::Settings.config.paths.auth + '/pinboard.data', encoded_pinboard_credentials)
     end
 
     def encode(username, password)

data/lib/ayadn/post.rb

@@ -4,8 +4,9 @@ module Ayadn
 
     require_relative "annotations"
 
-    def initialize
-      @status = Status.new
+    def initialize status = Status.new
+      @status = status
+      @markdown_link_regex = /\[([^\]]+)\]\(([^)]+)\)/
     end
 
     def post(dic)
@@ -13,16 +14,16 @@ module Ayadn
     end
 
     def reply(dic)
-      replied_to = dic[:reply_to].values[0]
-      reply = replied_to[:handle].dup
+      replied_to = dic[:reply_to]
+      reply = replied_to.handle.dup
       reply << " #{dic[:text]}"
-      replied_to[:mentions].uniq!
-      replied_to[:mentions].each do |m|
-        next if m == replied_to[:username]
-        next if m == Settings.config[:identity][:username]
+      replied_to.mentions.uniq!
+      replied_to.mentions.each do |m|
+        next if m == replied_to.username
+        next if m == Settings.config.identity.username
         reply << " @#{m}"
       end
-      post_size_error(reply) if post_size_ok?(reply) == false
+      post_size_error(reply) if !post_size_ok?(reply)
       dic[:text] = reply
       dic[:reply_to] = dic[:id]
       send_content(Endpoints.new.posts_url, payload_reply(dic))
@@ -87,10 +88,9 @@ module Ayadn
     def auto_readline
       loop do
         begin
-          #while buffer = Readline.readline("#{Settings.config[:identity][:handle]} >> ".color(:red))
           while buffer = Readline.readline(">> ".color(:red))
             resp = post({text: buffer})
-            FileOps.save_post(resp) if Settings.options[:backup][:posts]
+            FileOps.save_post(resp) if Settings.options.backup.posts
             @status.done
           end
         rescue Interrupt
@@ -116,25 +116,25 @@ module Ayadn
 
     def post_size_ok?(post) # works on a string, returns boolean
       text = keep_text_from_markdown_links(post)
-      size, max_size = text.length, Settings.config[:post_max_length]
+      size, max_size = text.length, Settings.config.post_max_length
       (size >= 1 && size <= max_size)
     end
 
     def message_size_ok?(message) # works on a string, returns boolean
       text = keep_text_from_markdown_links(message)
-      size, max_size = text.length, Settings.config[:message_max_length]
+      size, max_size = text.length, Settings.config.message_max_length
       (size >= 1 && size <= max_size)
     end
 
     def post_size_error(post)
       text = keep_text_from_markdown_links(post)
-      size, max_size = text.length, Settings.config[:post_max_length]
+      size, max_size = text.length, Settings.config.post_max_length
       bad_text_size(post, size, max_size)
     end
 
     def message_size_error(message)
       text = keep_text_from_markdown_links(message)
-      size, max_size = text.length, Settings.config[:message_max_length]
+      size, max_size = text.length, Settings.config.message_max_length
       bad_text_size(message, size, max_size)
     end
 
@@ -151,12 +151,12 @@ module Ayadn
     end
 
     def keep_text_from_markdown_links(str)
-      str.gsub(/\[([^\]]+)\]\(([^)]+)\)/, '\1')
+      str.gsub(@markdown_link_regex, '\1')
     end
 
     def markdown_extract(str)
-        result = str.gsub(/\[([^\]]+)\]\(([^)]+)\)/, '\1|||\2')
-        result.split('|||') #=> [text, link]
+      result = str.gsub(@markdown_link_regex, '\1|||\2')
+      result.split('|||') #=> [text, link]
     end
 
     def error_text_empty