ayadn 3.0 → 4.0

data/lib/ayadn/post_object.rb

@@ -0,0 +1,118 @@
+# encoding: utf-8
+module Ayadn
+
+  class PostSourceObject
+
+    attr_reader :input, :link, :name, :client_id
+
+    def initialize hash
+      @input = hash["source"]
+      @link = @input["link"]
+      @name = @input["name"]
+      @client_id = @input["client_id"]
+    end
+  end
+
+  class PostLinkObject
+
+    attr_reader :input, :url, :text, :pos, :len, :amended_len
+
+    def initialize hash
+      @input = hash
+      @url = @input["url"]
+      @text = @input["text"]
+      @pos = @input["pos"]
+      @len = @input["len"]
+      @amended_len = @input["amended_len"]
+    end
+  end
+
+  class PostMentionObject
+
+    attr_reader :input, :is_leading, :pos, :id, :len, :name, :amended_len
+
+    def initialize hash
+      @input = hash
+      @is_leading = @input["is_leading"]
+      @pos = @input["pos"]
+      @id = @input["id"]
+      @len = @input["len"]
+      @name = @input["name"]
+      @amended_len = @input["amended_len"]
+    end
+  end
+
+  class PostHashtagObject
+
+    attr_reader :input, :name, :len, :pos, :amended_len
+
+    def initialize hash
+      @input = hash
+      @name = @input["name"]
+      @len = @input["len"]
+      @pos = @input["pos"]
+      @amended_len = @input["amended_len"]
+    end
+  end
+  
+  class EntitiesObject
+
+    attr_reader :input, :mentions, :hashtags, :links
+
+    def initialize hash
+      @input = hash["entities"].nil? ? {} : hash["entities"]
+      mentions = @input["mentions"].nil? ? [] : @input["mentions"]
+      @mentions = mentions.map { |hash| PostMentionObject.new(hash) }
+      hashtags = @input["hashtags"].nil? ? [] : @input["hashtags"]
+      @hashtags = hashtags.map { |hash| PostHashtagObject.new(hash) }
+      links = @input["links"].nil? ? [] : @input["links"]
+      @links = links.map { |hash| PostLinkObject.new(hash) }
+    end
+  end
+
+  class PostAnnotationObject
+
+    attr_reader :input, :type, :value
+
+    def initialize hash
+      @input = hash
+      @type = @input["type"]
+      @value = @input["value"]
+    end
+  end
+
+	class PostObject # also works for messages
+
+    attr_reader :input, :num_stars, :num_reposts, :num_replies, :text, :created_at, :id, :canonical_url, :machine_only, :you_reposted, :you_starred, :thread_id, :pagination_id, :source, :user, :annotations, :entities, :repost_of, :reply_to, :is_deleted, :channel_id
+    attr_accessor :view
+
+    def initialize hash
+      @input = hash
+      @num_stars = @input["num_stars"]
+      @num_reposts = @input["num_reposts"]
+      @num_replies = @input["num_replies"]
+      @text = @input["text"]
+      @created_at = @input["created_at"]
+      @id = @input["id"]
+      @canonical_url = @input["canonical_url"]
+      @machine_only = @input["machine_only"]
+      @you_reposted = @input["you_reposted"]
+      @you_starred = @input["you_starred"]
+      @thread_id = @input["thread_id"]
+      @pagination_id = @input["pagination_id"]
+      @source = PostSourceObject.new(@input)
+      @entities = EntitiesObject.new(@input)
+      @user = UserObject.new(@input["user"])
+      if !@input["annotations"].nil?
+        @annotations = @input["annotations"].map { |hash| PostAnnotationObject.new(hash) }
+      else
+        @annotations = []
+      end
+      @repost_of = PostObject.new(@input["repost_of"]) if !@input["repost_of"].blank?
+      @reply_to = @input["reply_to"]
+      @is_deleted = @input["is_deleted"]
+      @channel_id = @input["channel_id"]
+    end
+	end
+
+end

data/lib/ayadn/preferences_object.rb

@@ -0,0 +1,290 @@
+# encoding: utf-8
+module Ayadn
+
+  class PreferencesFormatsList
+    attr_accessor :reverse
+    def initialize hash
+      @reverse = hash[:reverse]
+    end
+    def to_h
+      { reverse: @reverse }
+    end
+  end
+
+  class PreferencesFormatsTable
+    attr_accessor :width, :borders
+    def initialize hash
+      @width = hash[:width]
+      @borders = hash[:borders]
+    end
+    def to_h
+      {
+        width: @width,
+        borders: @borders
+      }
+    end
+  end
+
+  class PreferencesFormats
+    attr_accessor :table, :list
+    def initialize hash
+      @table = PreferencesFormatsTable.new(hash[:table])
+      @list = PreferencesFormatsList.new(hash[:list])
+    end
+    def to_h
+      {
+        table: @table.to_h,
+        list: @list.to_h
+      }
+    end
+  end
+
+  class PreferencesCounts
+    attr_accessor :default, :unified, :global, :checkins, :conversations, :photos, :trending, :mentions, :convo, :posts, :messages, :search, :whoreposted, :whostarred, :whatstarred, :files
+    def initialize hash
+      @default = hash[:default]
+      @unified = hash[:unified]
+      @global = hash[:global]
+      @checkins = hash[:checkins]
+      @conversations = hash[:conversations]
+      @photos = hash[:photos]
+      @trending = hash[:trending]
+      @mentions = hash[:mentions]
+      @convo = hash[:convo]
+      @posts = hash[:posts]
+      @messages = hash[:messages]
+      @search = hash[:search]
+      @whoreposted = hash[:whoreposted]
+      @whostarred = hash[:whostarred]
+      @whatstarred = hash[:whatstarred]
+      @files = hash[:files]
+    end
+    def to_h
+      {
+        default: @default,
+        unified: @unified,
+        global: @global,
+        checkins: @checkins,
+        conversations: @conversations,
+        photos: @photos,
+        trending: @trending,
+        mentions: @mentions,
+        convo: @convo,
+        posts: @posts,
+        messages: @messages,
+        search: @search,
+        whoreposted: @whoreposted,
+        whostarred: @whostarred,
+        whatstarred: @whatstarred,
+        files: @files
+      }
+    end
+  end
+
+  class PreferencesMarker
+    attr_accessor :messages
+    def initialize hash
+      @messages = hash[:messages]
+    end
+    def to_h
+      {messages: @messages}
+    end
+  end
+  
+  class PreferencesTimeline
+    attr_accessor :directed, :source, :symbols, :name, :date, :debug, :compact
+    def initialize hash
+      @directed = hash[:directed]
+      @source = hash[:source]
+      @symbols = hash[:symbols]
+      @name = hash[:name]
+      @date = hash[:date]
+      @debug = hash[:debug]
+      @compact = hash[:compact]
+    end
+    def to_h
+      {
+        directed: @directed,
+        source: @source,
+        symbols: @symbols,
+        name: @name,
+        date: @date,
+        debug: @debug,
+        compact: @compact
+      }
+    end
+  end
+
+  class PreferencesChannels
+    attr_accessor :links
+    def initialize hash
+      @links = hash[:links]
+    end
+    def to_h
+      { links: @links }
+    end
+  end
+
+  class PreferencesColors
+    attr_accessor :id, :index, :username, :name, :date, :link, :dots, :hashtags, :mentions, :source, :symbols, :unread, :debug, :excerpt
+    def initialize hash
+      @index = hash[:index]
+      @username = hash[:username]
+      @name = hash[:name]
+      @date = hash[:date]
+      @link = hash[:link]
+      @dots = hash[:dots]
+      @hashtags = hash[:hashtags]
+      @mentions = hash[:mentions]
+      @source = hash[:source]
+      @symbols = hash[:symbols]
+      @unread = hash[:unread]
+      @debug = hash[:debug]
+      @excerpt = hash[:excerpt]
+      @id = hash[:id]
+    end
+    def to_h
+      {
+        id: @id,
+        index: @index,
+        username: @username,
+        name: @name,
+        date: @date,
+        link: @link,
+        dots: @dots,
+        hashtags: @hashtags,
+        mentions: @mentions,
+        source: @source,
+        symbols: @symbols,
+        unread: @unread,
+        debug: @debug,
+        excerpt: @excerpt       
+      }
+    end
+  end
+
+  class PreferencesBackup
+    attr_accessor :posts, :messages, :lists
+    def initialize hash
+      @posts = hash[:posts]
+      @messages = hash[:messages]
+      @lists = hash[:lists]
+    end
+    def to_h
+      {
+        posts: @posts,
+        messages: @messages,
+        lists: @lists
+      }
+    end
+  end
+
+  class PreferencesScroll
+    attr_accessor :spinner, :timer, :date
+    def initialize hash
+      @spinner = hash[:spinner]
+      @timer = hash[:timer]
+      @date = hash[:date]
+    end
+    def to_h
+      {
+        spinner: @spinner,
+        timer: @timer,
+        date: @date
+      }
+    end
+  end
+
+  class PreferencesNicerank
+    attr_accessor :threshold, :filter, :unranked
+    def initialize hash
+      @threshold = hash[:threshold]
+      @filter = hash[:filter]
+      @unranked = hash[:unranked]
+    end
+    def to_h
+      {
+        threshold: @threshold,
+        filter: @filter,
+        unranked: @unranked
+      }
+    end
+  end
+
+  class PreferencesBlacklist
+    attr_accessor :active
+    def initialize hash
+      @active = hash[:active]
+    end
+    def to_h
+      { active: @active }
+    end
+  end
+
+  class Preferences
+    attr_accessor :source_hash, :timeline, :marker, :counts, :formats, :channels, :colors, :backup, :scroll, :nicerank, :nowplaying, :blacklist
+
+    def initialize hash
+      @source_hash = hash
+      @timeline = PreferencesTimeline.new(hash[:timeline])
+      @marker = PreferencesMarker.new(hash[:marker])
+      @counts = PreferencesCounts.new(hash[:counts])
+      @formats = PreferencesFormats.new(hash[:formats])
+      @channels = PreferencesChannels.new(hash[:channels])
+      @colors = PreferencesColors.new(hash[:colors])
+      @backup = PreferencesBackup.new(hash[:backup])
+      @scroll = PreferencesScroll.new(hash[:scroll])
+      @nicerank = PreferencesNicerank.new(hash[:nicerank])
+      @nowplaying = {}
+      @blacklist = PreferencesBlacklist.new(hash[:blacklist])
+    end
+
+    def to_h
+      {
+        timeline: @timeline.to_h,
+        marker: @marker.to_h,
+        counts: @counts.to_h,
+        formats: @formats.to_h,
+        channels: @channels.to_h,
+        colors: @colors.to_h,
+        backup: @backup.to_h,
+        scroll: @scroll.to_h,
+        nicerank: @nicerank.to_h,
+        blacklist: @blacklist.to_h,
+        nowplaying: @nowplaying
+      }
+    end
+
+    def to_table
+      table = Terminal::Table.new do |t|
+        if @formats.table.borders
+          t.style = { :width => @formats.table.width, border_x: '—', border_i: '+', border_y: '|' }
+        else
+          t.style = { :width => @formats.table.width, border_x: ' ', border_i: ' ', border_y: ' ' }
+        end
+        t.title = "Current Ayadn settings".color(:cyan)
+        t.headings = [ "Category".color(:red), "Parameter".color(:red), "Value(s)".color(:red) ]
+        self.to_h.each_with_index do |(k, v), index|
+          v.each do |x,y|
+            t << :separator if index >= 1 && !@timeline.compact
+            unless y.is_a?(Hash)
+              t << [ k.to_s.color(:cyan), x.to_s.color(:yellow), y.to_s.color(:green) ]
+            else
+              y.each do |c|
+                yk = c[0]
+                tempv = c[1].to_s
+                if tempv.size > 10
+                  yv = "#{tempv[0..7]}..."
+                else
+                  yv = tempv
+                end
+                t << [ k.to_s.color(:cyan), x.to_s.color(:yellow), "#{yk} = #{yv}".color(:green) ]
+              end
+            end
+          end
+        end
+      end
+      table
+    end
+  end
+end

data/lib/ayadn/profile.rb

@@ -6,7 +6,7 @@ module Ayadn
 
     def initialize options
       if options.empty?
-        @status.profile_options
+        Status.new.profile_options
         exit
       end
       @options = options
@@ -27,7 +27,7 @@ module Ayadn
         writer = Post.new
         input = writer.compose()
         @text = input.join("\n")
-        writer.post_size_error(@text) if writer.post_size_ok?(@text) == false
+        writer.post_size_error(@text) if !writer.post_size_ok?(@text)
       end
     end
 

data/lib/ayadn/scroll.rb

@@ -10,70 +10,59 @@ module Ayadn
       at_exit { @view.show_cursor }
     end
 
-    def method_missing(meth, options)
-      case meth.to_s
-      when 'trending', 'photos', 'checkins', 'replies', 'global', 'unified'
-        scroll_it(meth.to_s, options)
+    def method_missing(meth, *args)
+      options = if args.size > 1
+        args[1]
+      else
+        args[0]
+      end
+      case meth
+      when :trending, :photos, :checkins, :replies, :global, :unified
+        scroll_explore_stream(meth.to_s, options)
+      when :mentions, :posts
+        scroll_user_stream(args[0], meth.to_s, options)
       else
         super
       end
     end
 
-    def scroll_it(target, options)
-      Settings.global[:scrolling] = true
+    def scroll_explore_stream target, options
+      Settings.global.scrolling = true
       options = check_raw(options)
       orig_target = target
       @nr = NiceRank.new
       loop do
         begin
-          stream = get(target, options)
-          stream['data'].empty? ? niceranks = {} : niceranks = @nr.get_ranks(stream)
-          Debug.stream stream, options, target
+          stream_object = StreamObject.new(get(target, options))
+          stream_object.posts.empty? ? niceranks = {} : niceranks = @nr.get_ranks(stream_object)
+          Debug.stream stream_object, options, target          
           target = "explore:#{target}" if explore?(target) # explore but not global
-          clear() if Settings.options[:scroll][:spinner] == true
-          show_if_new(stream, options, target, niceranks)
+          clear() if Settings.options.scroll.spinner
+          show_if_new(stream_object, options, target, niceranks)          
           target = orig_target if target =~ /explore/
-          options = save_then_return(stream, options, target)
-          countdown
-          print "..." if Settings.options[:scroll][:spinner] == true
-        rescue Interrupt
-          canceled
-        end
-      end
-    end
-
-    def mentions(username, options)
-      Settings.global[:scrolling] = true
-      options = check_raw(options)
-      id = @api.get_user(username)['data']['id']
-      loop do
-        begin
-          stream = @api.get_mentions(username, options)
-          Debug.stream stream, options, username
-          clear() if Settings.options[:scroll][:spinner] == true
-          show_if_new(stream, options, "mentions:#{id}")
-          options = save_then_return(stream, options, "mentions:#{id}")
+          options = save_then_return(stream_object, options, target)
           countdown
-          print "..." if Settings.options[:scroll][:spinner] == true
+          print "..." if Settings.options.scroll.spinner
         rescue Interrupt
           canceled
         end
       end
     end
 
-    def posts(username, options)
-      Settings.global[:scrolling] = true
+    def scroll_user_stream username, type, options
+      Settings.global.scrolling = true
       options = check_raw(options)
-      id = @api.get_user(username)['data']['id']
+      id = @api.get_user(username)['data']['id'] 
       loop do
         begin
-          stream = @api.get_posts(username, options)
-          Debug.stream stream, options, username
-          clear() if Settings.options[:scroll][:spinner] == true
-          show_if_new(stream, options, "posts:#{id}")
-          options = save_then_return(stream, options, "posts:#{id}")
+          stream = @api.send("get_#{type}".to_sym, username, options)
+          stream_object = StreamObject.new(stream)
+          Debug.stream stream_object, options, username
+          clear() if Settings.options.scroll.spinner
+          show_if_new(stream_object, options, "#{type}:#{id}")
+          options = save_then_return(stream_object, options, "#{type}:#{id}")
           countdown
-          print "..." if Settings.options[:scroll][:spinner] == true
+          print "..." if Settings.options.scroll.spinner
         rescue Interrupt
           canceled
         end
@@ -81,17 +70,18 @@ module Ayadn
     end
 
     def convo(post_id, options)
-      Settings.global[:scrolling] = true
+      Settings.global.scrolling = true
       options = check_raw(options)
       loop do
         begin
           stream = @api.get_convo(post_id, options)
-          Debug.stream stream, options, post_id
-          clear() if Settings.options[:scroll][:spinner] == true
-          show_if_new(stream, options, "replies:#{post_id}")
-          options = save_then_return(stream, options, "replies:#{post_id}")
+          stream_object = StreamObject.new(stream)
+          Debug.stream stream_object, options, post_id
+          clear() if Settings.options.scroll.spinner
+          show_if_new(stream_object, options, "replies:#{post_id}")
+          options = save_then_return(stream_object, options, "replies:#{post_id}")
           countdown
-          print "..." if Settings.options[:scroll][:spinner] == true
+          print "..." if Settings.options.scroll.spinner
         rescue Interrupt
           canceled
         end
@@ -99,26 +89,27 @@ module Ayadn
     end
 
     def messages(channel_id, options)
-      Settings.global[:scrolling] = true
+      Settings.global.scrolling = true
       options = check_raw(options)
       loop do
         begin
           stream = @api.get_messages(channel_id, options)
-          Debug.stream stream, options, channel_id
-          clear() if Settings.options[:scroll][:spinner] == true
-          show_if_new(stream, options, "channel:#{channel_id}")
-          if Settings.options[:marker][:messages] == true
-            unless resp['meta']['max_id'].nil?
-              marked = @api.update_marker("channel:#{channel_id}", stream['meta']['max_id'])
+          stream_object = StreamObject.new(stream)
+          Debug.stream stream_object, options, channel_id
+          clear() if Settings.options.scroll.spinner
+          show_if_new(stream_object, options, "channel:#{channel_id}")
+          if Settings.options.marker.messages
+            unless stream_object.meta.max_id.nil?
+              marked = @api.update_marker("channel:#{channel_id}", stream_object.meta.max_id)
               updated = JSON.parse(marked)
               if updated['meta']['code'] != 200
                 Errors.warn "couldn't update channel #{channel_id} as read"
               end
             end
           end
-          options = save_then_return(stream, options, "channel:#{channel_id}")
+          options = save_then_return(stream_object, options, "channel:#{channel_id}")
           countdown
-          print "..." if Settings.options[:scroll][:spinner] == true
+          print "..." if Settings.options.scroll.spinner
         rescue Interrupt
           canceled
         end
@@ -128,7 +119,7 @@ module Ayadn
     private
 
     def countdown
-      Settings.options[:scroll][:spinner] == true ? waiting : pause
+      Settings.options.scroll.spinner ? waiting : pause
     end
 
     def clear
@@ -171,11 +162,11 @@ module Ayadn
     end
 
     def waiting
-      (Settings.options[:scroll][:timer] * 10).times { spin }
+      (Settings.options.scroll.timer * 10).times { spin }
     end
 
     def pause
-      sleep Settings.options[:scroll][:timer]
+      sleep Settings.options.scroll.timer
     end
 
     def show_if_new(stream, options, target, niceranks = {})
@@ -183,7 +174,7 @@ module Ayadn
     end
 
     def save_then_return(stream, options, name = 'unknown')
-      unless stream['meta']['max_id'].nil?
+      unless stream.meta.max_id.nil?
         Databases.save_max_id(stream, name)
         return options_hash(stream, options)
       end
@@ -192,13 +183,13 @@ module Ayadn
 
     def check_raw(options)
       if options[:raw]
-        if options[:filter] == true
+        if options[:filter]
           {count: 200, since_id: nil, raw: true, scroll: true, filter: true}
         else
           {count: 200, since_id: nil, raw: true, scroll: true}
         end
       else
-        if options[:filter] == true
+        if options[:filter]
           {count: 200, since_id: nil, scroll: true, filter: true}
         else
           {count: 200, since_id: nil, scroll: true}
@@ -207,18 +198,18 @@ module Ayadn
     end
 
     def options_hash(stream, options)
-      if options[:filter] == true
-        {:count => 50, :since_id => stream['meta']['max_id'], scroll: true, filter: true}
+      if options[:filter]
+        {:count => 50, :since_id => stream.meta.max_id, scroll: true, filter: true}
       else
-        {:count => 50, :since_id => stream['meta']['max_id'], scroll: true}
+        {:count => 50, :since_id => stream.meta.max_id, scroll: true}
       end
     end
 
     def show(stream, options, niceranks)
       if options[:raw]
-        jj stream
+        jj stream.input
       else
-        @view.show_posts(stream['data'], options, niceranks)
+        @view.show_posts(stream, options, niceranks)
       end
     end