ayadn 1.2.8 → 1.2.9

data/lib/ayadn/switch.rb

@@ -1,6 +1,7 @@
 # encoding: utf-8
 module Ayadn
   class Switch
+
     def list
       home_path = Dir.home + "/ayadn"
       if File.exist?("#{home_path}/accounts.db")
@@ -24,6 +25,7 @@ module Ayadn
         please
       end
     end
+
     def switch(user)
       if user.empty? || user.nil?
         puts "\n\nOops, something went wrong, I couldn't get your username. Please try again.\n\n".color(:red)

data/lib/ayadn/version.rb

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

data/lib/ayadn/view.rb

@@ -23,8 +23,7 @@ module Ayadn
     end
 
     def show_simple_post(post, options)
-      view = build_stream_without_index(post, options, {})
-      puts view
+      puts build_stream_without_index(post, options, {})
     end
 
     def show_posted(resp)
@@ -268,15 +267,21 @@ module Ayadn
       puts "\e[H\e[2J"
     end
 
+    def page msg
+      clear_screen
+      puts msg
+      puts "\n"
+    end
+
+    def big_separator
+      "----------\n\n\n"
+    end
+
     private
 
     def get_broadcast_alias_from_id(event_id)
       al = Databases.get_alias_from_id(event_id)
-      unless al.nil?
-        al
-      else
-        event_id
-      end
+      al.nil? ? event_id : al
     end
 
     def filter_nicerank posts, options
@@ -305,10 +310,7 @@ module Ayadn
 
     def build_stream_with_index(data, options, niceranks) #expects an array
       @view = ""
-      posts = @workers.build_posts(data.reverse, niceranks)
-
-      posts = filter_nicerank(posts, options)
-
+      posts = filter_nicerank(@workers.build_posts(data.reverse, niceranks), options)
       posts.each do |id,content|
         count = "%03d" % content[:count]
         if content[:username] == Settings.config[:identity][:username]
@@ -326,10 +328,7 @@ module Ayadn
 
     def build_stream_without_index(data, options, niceranks) #expects an array
       @view = ""
-      posts = @workers.build_posts(data.reverse, niceranks)
-
-      posts = filter_nicerank(posts, options)
-
+      posts = filter_nicerank(@workers.build_posts(data.reverse, niceranks), options)
       posts.each do |id,content|
         if content[:username] == Settings.config[:identity][:username]
           @view << content[:id].to_s.color(Settings.options[:colors][:id]).inverse + " "

data/lib/ayadn/workers.rb

@@ -5,18 +5,14 @@ module Ayadn
     def build_aliases_list(list)
       table = init_table
       table.title = "List of your channel aliases".color(:cyan) + "".color(:white)
-      list.each do |k,v|
-        table << ["#{k}".color(:green), "#{v}".color(:red)]
-      end
+      list.each {|k,v| table << ["#{k}".color(:green), "#{v}".color(:red)]}
       table
     end
 
     def build_blacklist_list(list)
       table = init_table
       table.title = "Your blacklist".color(:cyan) + "".color(:white)
-      list.each do |k,v|
-        table << ["#{v.capitalize}".color(:green), "#{k}".color(:red)]
-      end
+      list.each {|k,v| table << ["#{v.capitalize}".color(:green), "#{k}".color(:red)]}
       table
     end
 
@@ -44,10 +40,10 @@ module Ayadn
 
     def build_followings_list(list, target) #takes a hash of users with ayadn format
       table = init_table
-      if target == "me"
-        table.title = "List of users you're following".color(:cyan) + "".color(:white)
+      table.title = if target == "me"
+        "List of users you're following".color(:cyan) + "".color(:white)
       else
-        table.title = "List of users ".color(:cyan) + "#{target}".color(:red) + " is following ".color(:cyan) + "".color(:white)
+        "List of users ".color(:cyan) + "#{target}".color(:red) + " is following ".color(:cyan) + "".color(:white)
       end
       users_list = build_users_array(list)
       build_users_list(users_list, table)
@@ -55,27 +51,24 @@ module Ayadn
 
     def build_followers_list(list, target)
       table = init_table
-      if target == "me"
-        table.title = "List of your followers".color(:cyan) + "".color(:white)
+      table.title = if target == "me"
+        "List of your followers".color(:cyan) + "".color(:white)
       else
-        table.title = "List of users following ".color(:cyan) + "#{target}".color(:red) + "".color(:white)
+        "List of users following ".color(:cyan) + "#{target}".color(:red) + "".color(:white)
       end
-      users_list = build_users_array(list)
-      build_users_list(users_list, table)
+      build_users_list(build_users_array(list), table)
     end
 
     def build_muted_list(list)
       table = init_table
       table.title = "List of users you muted".color(:cyan) + "".color(:white)
-      users_list = build_users_array(list)
-      build_users_list(users_list, table)
+      build_users_list(build_users_array(list), table)
     end
 
     def build_blocked_list(list)
       table = init_table
       table.title = "List of users you blocked".color(:cyan) + "".color(:white)
-      users_list = build_users_array(list)
-      build_users_list(users_list, table)
+      build_users_list(build_users_array(list), table)
     end
 
     def build_users_list(list, table)
@@ -146,12 +139,14 @@ module Ayadn
           you_starred: post['you_starred'],
           source_name: source,
           source_link: post['source']['link'],
-          canonical_url: post['canonical_url']
+          canonical_url: post['canonical_url'],
+          tags: hashtags,
+          links: extract_links(post),
+          mentions: mentions,
+          directed_to: mentions.first || false
         }
 
-        values[:tags] = hashtags
-
-        values[:links] = extract_links(post)
+        values[:checkins], values[:has_checkins] = extract_checkins(post)
 
         if post['repost_of']
           values[:is_repost] = true
@@ -194,10 +189,6 @@ module Ayadn
           values[:num_reposts] = 0
         end
 
-        values[:mentions] = mentions
-        values[:directed_to] = mentions.first || false
-        values[:checkins], values[:has_checkins] = extract_checkins(post)
-
         posts[post['id'].to_i] = values
 
       end
@@ -225,12 +216,14 @@ module Ayadn
     end
 
     def build_channels(data, options = {})
-      channels = []
-      data.each { |ch| channels << ch }
       bucket = []
-      puts "Downloading new channels and unknown users ids.\nThis is a one time operation, ids are being recorded in a database.\n\nPlease wait, it could take a while if you have many channels...".color(:cyan) unless options[:channels]
+      if options[:channels]
+        puts "Downloading list of channels and their users credentials.\n\nPlease wait, it could take a while if there are many results and users...".color(:cyan)
+      else
+        puts "Downloading new channels and unknown users ids.\nThis is a one time operation, ids are being recorded in a database.\n\nPlease wait, it could take a while if you have many channels...".color(:cyan)
+      end
       chan = Struct.new(:id, :num_messages, :subscribers, :type, :owner, :annotations, :readers, :editors, :writers, :you_subscribed, :unread, :recent_message_id, :recent_message)
-      channels.each do |ch|
+      data.each do |ch|
         unless ch['writers']['user_ids'].empty?
           usernames = []
           ch['writers']['user_ids'].each do |id|
@@ -315,27 +308,33 @@ module Ayadn
       reg_tag = '#([[:alpha:]0-9_]{1,255})(?![\w+])'
       reg_mention = '@([A-Za-z0-9_]{1,20})(?![\w+])'
       reg_sentence = '^.+[\r\n]*'
-      handles = Array.new
+      handles, words, sentences = [], [], []
       mentions.each {|username| handles << "@#{username}"}
-      words = Array.new
-      sentences = Array.new
       hashtag_color = Settings.options[:colors][:hashtags]
       mention_color = Settings.options[:colors][:mentions]
       text.scan(/#{reg_sentence}/) do |sentence|
         sentence.split(' ').each do |word|
+
+          word_chars = word.chars
+          sanitized, word = [], []
+          word_chars.each do |ch|
+            if UnicodeUtils.general_category(ch) == :Other_Symbol
+              sanitized << "#{ch} "
+            else
+              sanitized << ch
+            end
+          end
+          word = sanitized.join
+
           if word =~ /#\w+/
             slices = word.split('#')
             has_h = false
             slices.each do |tag|
-              bit = tag.downcase.scan(/[[:alpha:]0-9_]/).join('')
-              if hashtags.include? bit
-                has_h = true
-              end
+              has_h = true if hashtags.include?(tag.downcase.scan(/[[:alpha:]0-9_]/).join(''))
             end
             if has_h == true
               if slices.length > 1
-                word = slices.join('#')
-                words << word.gsub(/#{reg_tag}/, '#\1'.color(hashtag_color))
+                words << slices.join('#').gsub(/#{reg_tag}/, '#\1'.color(hashtag_color))
               else
                 words << word.gsub(/#{reg_tag}/, '#\1'.color(hashtag_color))
               end
@@ -343,12 +342,21 @@ module Ayadn
               words << word
             end
           elsif word =~ /@\w+/
-            @str = def_str(word, reg_split)
-            if handles.include?(@str.downcase)
-              words << word.gsub(/#{reg_mention}/, '@\1'.color(mention_color))
-            else
-              words << word
+            enc = []
+            warr = word.split(' ')
+            warr.each do |w|
+              @str = def_str(w, reg_split)
+              if handles.include?(@str.downcase)
+                if warr.length == 1
+                  enc << w.gsub(/#{reg_mention}/, '@\1'.color(mention_color))
+                else
+                  enc << " #{w.gsub(/#{reg_mention}/, '@\1'.color(mention_color))}"
+                end
+              else
+                enc << w
+              end
             end
+            words << enc.join
           else
             words << word
           end

data/lib/ayadn.rb

@@ -1,7 +1,7 @@
 # encoding: utf-8
 require_relative 'ayadn/version'
 
-%w{rest_client json thor rainbow/ext/string terminal-table yaml logger daybreak fileutils io/console}.each { |r| require "#{r}" }
+%w{rest_client json thor rainbow/ext/string terminal-table yaml logger daybreak fileutils io/console unicode_utils/char_type}.each { |r| require "#{r}" }
 
 # winPlatforms = ['mswin', 'mingw', 'mingw_18', 'mingw_19', 'mingw_20', 'mingw32']
 # case Gem::Platform.local.os

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ayadn
 version: !ruby/object:Gem::Version
-  version: 1.2.8
+  version: 1.2.9
 platform: ruby
 authors:
 - Eric Dejonckheere
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-27 00:00:00.000000000 Z
+date: 2014-05-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -209,6 +209,7 @@ files:
 - lib/ayadn/blacklist.rb
 - lib/ayadn/cnx.rb
 - lib/ayadn/databases.rb
+- lib/ayadn/debug.rb
 - lib/ayadn/descriptions.rb
 - lib/ayadn/endpoints.rb
 - lib/ayadn/errors.rb