ayadn 1.7.4 → 1.7.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c26bb80eb4bb55ac2d2cfe880d8d0c0de1a11095
-  data.tar.gz: 9ba0314b825df65ce3c9aad1d2e7409bb602bde1
+  metadata.gz: b101f2949d37db133dd7f1955d95aec8fac1424c
+  data.tar.gz: 32222443d4c962edaf8fbbb2658bb9716284c55c
 SHA512:
-  metadata.gz: 0bc03fa598ae9666acdaaf1f871c89ded15e61e9cbad4e5d0b1309cf51eb6fc74fde836bf826780492ea8bfc020c0436c45ea3035aa32f29478ba55f5d597cc2
-  data.tar.gz: 176e6a11ca6871ebff6c6eee4bebe0dc446d8d0a69b66dbec04a2d7b679edbcecf076878c68142dd9b1d4a05e7ee084e964df4f7a079998364c5fa9e351200b4
+  metadata.gz: 26014e72af700bcecee4792546ca015ca9efdb8083042b3bf2498cc940ef11501917d946f7d30f149b3b19ce2a88f027d7270b8741b298e8660a5be85cd6c62c
+  data.tar.gz: 74d280a4461e5f78ec746e4506b23cd433f3338a118a960324b7849b6d92c12b1e6e3d28523ff1ec2fc372273813c39c706b099897e1af563ef8440862aca838

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+# 1.7.5 (2014-10-20) - 'Cirrus'
+
+- New: option to display a compact view for the timeline
+- Fix: character count in reply with Markdown links
+
 # 1.7.4 (2014-09-21) - 'Elton'
 
 - Fix: nowplaying (show artwork)

data/doc/05-streams.md

@@ -115,6 +115,16 @@ Differences will occur due to ADN policy:
 
 - Other streams, search, tags: temporarily disables the Blacklist databases
 
+### COMPACT
+
+Removes the line-breaks when possible, and forces the view to be "compact".
+
+Set it with:
+
+`ayadn set timeline compact true`
+
+You may want to change colors to create visual marks between posts if you choose the compact view, i.e. putting the all header in the same color (post id, username, name, etc).
+
 
 # GLOBAL
 

data/lib/ayadn/action.rb

@@ -379,7 +379,11 @@ module Ayadn
           Errors.repost(post_id, resp['repost_of']['id'])
           @view.show_simple_post([resp['repost_of']], options)
         end
-        puts "AUTHOR:\n".inverse
+        if Settings.options[:timeline][:compact] == true
+          puts "\nAUTHOR:\n".inverse
+        else
+          puts "AUTHOR:\n".inverse
+        end
         if response['data']['username'] == Settings.config[:identity][:username]
           @view.show_userinfos(stream, @api.get_token_info['data'], true)
         else

data/lib/ayadn/errors.rb

@@ -3,7 +3,7 @@ module Ayadn
   class Errors
 
     def self.global_error(args)
-      abort(Status.wtf) if Logs.nil?
+      abort(Status.wtf) if Logs.nil? || Logs.rec.nil?
       Logs.rec.error "--BEGIN--"
       Logs.rec.error "CAUSE: #{args[:error]}"
       Logs.rec.debug "DATA: #{args[:data]}"

data/lib/ayadn/post.rb

@@ -106,6 +106,10 @@ module Ayadn
     end
 
     def post_size(post) # works on a string
+      words = post.split(" ")
+      result = []
+      words.each { |word| result << get_markdown_text(word) }
+      post = result.join(" ")
       size, max_size = post.length, Settings.config[:post_max_length]
       if size < 1
         abort(error_text_empty)

data/lib/ayadn/set.rb

@@ -431,7 +431,7 @@ module Ayadn
       @input = meth.to_s
       @output = validate(options)
       case @input
-      when 'directed', 'html', 'show_source', 'show_symbols', 'show_real_name', 'show_date', 'show_spinner', 'show_debug'
+      when 'directed', 'html', 'show_source', 'show_symbols', 'show_real_name', 'show_date', 'show_spinner', 'show_debug', 'compact'
         Settings.options[:timeline][meth.to_sym] = @output
       when 'deleted', 'annotations'
         abort(Status.not_mutable)

data/lib/ayadn/settings.rb

@@ -99,6 +99,7 @@ module Ayadn
           conf[:movie] = {hashtag: 'nowwatching'} if conf[:movie].nil?
           conf[:tvshow] = {hashtag: 'nowwatching'} if conf[:tvshow].nil?
           conf[:formats][:list] = {reverse: true} if conf[:formats][:list].nil?
+          conf[:timeline][:compact] = false if conf[:timeline][:compact].nil?
 
           @options = conf
           self.write_config_file(config_file, @options)
@@ -174,7 +175,8 @@ module Ayadn
           show_real_name: true,
           show_date: true,
           show_spinner: true,
-          show_debug: false
+          show_debug: false,
+          compact: false
         },
         counts: {
           default: 50,

data/lib/ayadn/stream.rb

@@ -14,11 +14,16 @@ module Ayadn
       options = settings.dup
       options[:filter] = nicerank_true()
       @view.downloading(options)
-      stream = @api.get_global(options)
-      Settings.options[:force] == true ? niceranks = {} : niceranks = NiceRank.new.get_ranks(stream)
-      Check.no_new_posts(stream, options, 'global')
-      Databases.save_max_id(stream, 'global') unless stream['meta']['max_id'].nil?
-      @view.render(stream, options, niceranks)
+      unless options[:scroll]
+        stream = @api.get_global(options)
+        Settings.options[:force] == true ? niceranks = {} : niceranks = NiceRank.new.get_ranks(stream)
+        Check.no_new_posts(stream, options, 'global')
+        Databases.save_max_id(stream, 'global') unless stream['meta']['max_id'].nil?
+        @view.render(stream, options, niceranks)
+      end
+      if Settings.options[:timeline][:compact] == true && options[:scroll] == true
+        @view.clear_screen()
+      end
       Scroll.new(@api, @view).global(options) if options[:scroll]
     end
 
@@ -39,10 +44,15 @@ module Ayadn
     def stream meth, options, target
       Settings.options[:force] = true if options[:force]
       @view.downloading(options)
-      stream = @api.send("get_#{meth}".to_sym, options)
-      Check.no_new_posts(stream, options, target)
-      Databases.save_max_id(stream)
-      @view.render(stream, options)
+      unless options[:scroll]
+        stream = @api.send("get_#{meth}".to_sym, options)
+        Check.no_new_posts(stream, options, target)
+        Databases.save_max_id(stream)
+        @view.render(stream, options)
+      end
+      if Settings.options[:timeline][:compact] == true && options[:scroll] == true
+        @view.clear_screen()
+      end
       Scroll.new(@api, @view).send(meth, options) if options[:scroll]
     end
 
@@ -52,13 +62,18 @@ module Ayadn
       Check.no_username(username)
       username = @workers.add_arobase(username)
       @view.downloading(options)
-      stream = @api.get_mentions(username, options)
-      Check.no_user(stream, username)
-      Databases.save_max_id(stream)
-      Check.no_data(stream, 'mentions')
-      options = options.dup
-      options[:in_mentions] = true
-      @view.render(stream, options)
+      unless options[:scroll]
+        stream = @api.get_mentions(username, options)
+        Check.no_user(stream, username)
+        Databases.save_max_id(stream)
+        Check.no_data(stream, 'mentions')
+        options = options.dup
+        options[:in_mentions] = true
+        @view.render(stream, options)
+      end
+      if Settings.options[:timeline][:compact] == true && options[:scroll] == true
+        @view.clear_screen()
+      end
       Scroll.new(@api, @view).mentions(username, options) if options[:scroll]
     end
 

data/lib/ayadn/version.rb

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

data/lib/ayadn/view.rb

@@ -551,12 +551,12 @@ module Ayadn
     def build_content(content)
       view = ""
       view << build_header(content)
-      view << "\n"
+      view << "\n" unless Settings.options[:timeline][:compact] == true
       view << content[:text]
-      view << "\n"
+      view << "\n" unless Settings.options[:timeline][:compact] == true
       if content[:has_checkins]
         view << build_checkins(content)
-        view << "\n"
+        view << "\n" unless Settings.options[:timeline][:compact] == true
       end
       unless content[:links].empty?
         view << "\n"
@@ -565,7 +565,15 @@ module Ayadn
           view << "\n"
         end
       end
-      view << "\n\n"
+      if Settings.options[:timeline][:compact] == true
+        if content[:links].empty?
+          view << "\n"
+        else
+          view
+        end
+      else
+        view << "\n\n"
+      end
     end
 
     def build_header(content)
@@ -598,8 +606,12 @@ module Ayadn
       else
         num_dots = 10
       end
-      hd = (".".color(Settings.options[:colors][:dots])) * num_dots
-      hd << "\n"
+      if Settings.options[:timeline][:compact] == true
+        hd = "\n"
+      else
+        hd = (".".color(Settings.options[:colors][:dots])) * num_dots
+        hd << "\n"
+      end
       formatted = { header: hd }
       content[:checkins].each do |key, val|
           formatted[key] = val

data/lib/ayadn/workers.rb

@@ -113,7 +113,9 @@ module Ayadn
         else
           table << [ "@#{username} ".color(Settings.options[:colors][:username]), "", posts_day ]
         end
-        table << :separator unless index + 1 == list.length
+        if index + 1 != list.length && Settings.options[:timeline][:compact] == false
+          table << :separator
+        end
       end
       table
     end
@@ -472,7 +474,12 @@ module Ayadn
         sentences << words.join(' ')
         words = Array.new
       end
-      sentences.join("\n")
+      if Settings.options[:timeline][:compact] == true
+        without_linebreaks = sentences.keep_if { |s| s != "" }
+        without_linebreaks.join("\n")
+      else
+        sentences.join("\n")
+      end
     end
 
     def links_from_posts(stream)

data/spec/unit/workers_spec.rb

@@ -11,6 +11,7 @@ describe Ayadn::Workers do
           mentions: :red,
           username: :green
         },
+        timeline: {compact: false},
         formats: {table: {width: 75}, list: {reverse: true}}
       })
     Ayadn::Logs.stub(:rec).and_return("logged")

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ayadn
 version: !ruby/object:Gem::Version
-  version: 1.7.4
+  version: 1.7.5
 platform: ruby
 authors:
 - Eric Dejonckheere
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-21 00:00:00.000000000 Z
+date: 2014-10-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor