ayadn 2.0.12 → 2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 838837a525197748fc18b25d93d90228061aa2e3
-  data.tar.gz: f62380908cbfdca3083ee7b04c581e8aa6e65198
+  metadata.gz: 9f91b217c6c170cfcc4cb0bfb47be2b881463054
+  data.tar.gz: cdc82c5ddcda7512c6195be5abc219e28935c17b
 SHA512:
-  metadata.gz: d35b5e8556aae6c3b0e45d1b0df5661caf6e8fdc70cd38e72809a51b99b15c812b388353469e1fb5438355583581a81a23289fc67ee1b367b8c8388619cc3858
-  data.tar.gz: 7c9e60bbc4adfe40dc63c57f5876a47229ad2f7c86d140a1d9f045b8f0d180b7f377355e68999e7955e4bd94e33b176ac03ca89a8a645a9bc381a111dd292092
+  metadata.gz: 1e59fafb75249a6a9bc64be41c434ef0a4311ab7f0181011c5c4283dcb2abcb27d36bab6d985bb00a7d0d219d1172287186f0e4c5d317eea577c029d58591352
+  data.tar.gz: d6919bab279e3b739ac73a6c2259859eb9bc774b8fa4329debaf04eb209119645864c27fb51ff23bae0ca6976b64e7643a802b07de9a99639bbf3a33ef555ff6

data/CHANGELOG.md

@@ -1,3 +1,10 @@
+## 2.1 - 2015-08-29 - 'Electric Boogaloo'
+
+- Fix: crash when scrolling Global with NiceRank
+- Fix: crash when using list sort option posts/day
+- Fix: rare crash if user has no name
+- Deprecated: sort lists using posts/day
+
 ## 2.0.12 - 2015-05-10 - 'Agent Carter'
 
 - Fix: Youtube/Vimeo integration if video not found or unauthorized

data/README.md

@@ -84,7 +84,7 @@ Feedback and/or contributions are very welcomed!
 
 Examples on Mac OS X, with iTerm2 + Solarized theme.
 
-![followers list](https://www.dropbox.com/s/es0o4sq7w05y2ps/ayadn200followerslistsmall.png?dl=1)
+![followers list](https://www.evernote.com/shard/s89/sh/fddc2f8e-78f0-4dde-974b-bf724f643d7f/419854929e27b5b3/res/522b6cd4-2e0f-4528-bc94-ea4a61de54a7/skitch.png)
 
 ![mentions stream in classic view](http://dl.dropboxusercontent.com/s/16d7u5wjsd3un1j/ayadn200mentions.png)
 

data/doc/02-install.md

@@ -20,30 +20,30 @@ Install Ayadn, authorize your account: done.
 
 If you need to install Ruby it's better to use something like RVM or RBENV. You can of course use the Ruby shipped with your system but it will require root privileges and is not recommended.
 
-## MIGRATE
+## WINDOWS
 
-The database format has changed between 1.x and 2.x: if you already have one or several authorized accounts, Ayadn will ask you to run the `migrate` command once per account. You only have to do this once.
+Ayadn also works on Windows because it's pure Ruby, but some Gems it depends upon require some effort to be installed with some Windows versions ("amalgalite", notably). And you will need an ANSI compatible console (ConEmu, Console2, etc) and Ruby 2.0.0+ 32bits via RubyInstaller and its DevKit (or a cygwin equivalent). 
 
-You can also start with a fresh configuration: just delete your `~/ayadn` folder before authorizing a new user with Ayadn 2.x.
+## MIGRATE
 
-## WINDOWS
+If you have an old Ayadn 1.x install that you want to keep using with Ayadn 2.x, Ayadn 2.x will ask you to run the `migrate` command (once) for this account.
 
-Ayadn also works on Windows because it's pure Ruby, but some Gems it depends upon require some effort to be installed with some Windows versions ("amalgalite", notably). And you will need an ANSI compatible console (ConEmu, Console2, etc) + Ruby 2.0.0 32bits via RubyInstaller and its DevKit (or a cygwin equivalent). 
+Otherwise it's better to start with a fresh configuration: just delete your old 1.0 `~/ayadn` folder before authorizing the user again with Ayadn 2.x.
 
 ## DEPENDENCIES
 
 Ayadn depends upon these Gems:
 
-        amalgalite
-        fast_cache
-        pinboard
-        rainbow
-        rest-client
-        spotlite
-        terminal-table
-        thor
-        tvdb_party
-        unicode_utils
-        daybreak
-
-The "daybreak" dependency is only needed for 1.x to 2.x migrations. As this migration is optional and Ayadn 1.x is deprecated, this dependency will be removed in future versions.
+        amalgalite (SQLite)
+        fast_cache (in-memory caching)
+        pinboard (export to Pinboard)
+        rainbow (text UI utilities)
+        rest-client (networking)
+        spotlite (IMDb access)
+        terminal-table (text UI utilities)
+        thor (commands and options parsing)
+        tvdb_party (TVDb access)
+        unicode_utils (text utilities)
+        daybreak (Ruby data store)
+
+*Note: the "daybreak" dependency is only needed for 1.x to 2.x migrations. As this migration is optional and Ayadn 1.x is deprecated, this dependency will be removed in future versions.*

data/doc/03-first-steps.md

@@ -24,7 +24,7 @@ You can then switch between accounts:
 
 `ayadn switch @ericd` 
 
-or 
+Shortcut: 
 
 `ayadn -@ ericd`  
 
@@ -32,7 +32,7 @@ You can also unauthorize a user with or without deleting its folders:
 
 `ayadn unauthorize @ericd`
 
-or
+Shortcut: 
 
 `ayadn -UA -D @ericd`
 

data/doc/04-options.md

@@ -2,7 +2,7 @@
 
 Note: options are only described once in this manual (in the first example for 'Streams', 'Timeline'). 
 
-**However, options are available for mosts of streams!** 
+However, **these options are available for most streams!** 
 
 They're described only once to ensure this documentation keeps being readable.
 

data/doc/05-streams.md

@@ -144,7 +144,7 @@ Set it permanently 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).
+*Tip: you may want to change colors to create visual marks between posts if you choose the compact view by default, i.e. setting the whole header to the same color (post id, username, name, etc).*
 
 # GLOBAL
 
@@ -215,7 +215,7 @@ You can get your own mentions stream by using *me* instead of *@username*:
 
 `ayadn -m me`
 
-Don't forget that like most streams, Mentions is *scrollable*: very convenient to know at a glance if we got something new from our friends!
+Like most streams, Mentions is *scrollable*: very convenient to know at a glance if we got something new from our friends!
 
 # POSTS
 

data/doc/06-post.md

@@ -10,11 +10,11 @@ Simple and fast way to post a short sentence/word to App.net.
 
 You have to put your text between single quotes if you're using punctuation:
 
-`ayadn -P 'Hello from Ayadn, guys!'`
+`ayadn -P 'Hello from Ayadn!'`
 
 *But remember you can't use any quote character inside the quotes...*
 
-**So you should rather use the _write_ method for posting.**
+**So you should rather use the _WRITE_ method for posting.**
 
 # WRITE
 
@@ -28,25 +28,25 @@ Multi-line post to App.net.
 
 It will show you a prompt where you can type anything, including special characters and Markdown links.
 
-Hit ENTER to create line breaks. 
+Hit `ENTER` to create line breaks. 
 
-Hit ENTER, SPACE, ENTER to create paragraphs compatible with all clients.
-
-Cancel your post with CTRC-C or send it with CTRL-D.
+Send your post with `CTRL-D`, or cancel with `CTRC-C`.
 
 Just type a @username at the beginning of your post if you want to mention a specific user, as you would in any other App.net client.  
 
+*Tip: hit `ENTER`, `SPACE`, `ENTER` to create paragraphs compatible with all App.net clients.*
+
 # AUTO POST
 
 Auto post every line of input.
 
 `ayadn auto`
 
-In this mode, each line you type (each time you hit ENTER!) is automatically posted to ADN.
+In this mode, each line you type (each time you hit `ENTER`!) is automatically posted to ADN.
 
 You can type anything, including special characters and Markdown links, and of course mention anyone: the only thing you can't do from this mode is _replying_ to a post in a thread.
 
-Hit CTRL+C to exit this mode at any moment.  
+Hit `CTRL+C` to exit this mode at any moment.  
 
 # REPLY
 
@@ -60,7 +60,7 @@ Reply to a specific post.
 
 `ayadn -R 23362460`
 
-Ayadn will then show you the *write* prompt.
+Ayadn will then show you the *WRITE* prompt.
 
 If you reply to a post containing multiple mentions, your text will be inserted between the leading mention and the other ones.
 
@@ -91,7 +91,7 @@ Send a private message to a specific user.
 
 `ayadn pm @ericd`
 
-Ayadn will then show you the *write* prompt.
+Ayadn will then show you the *WRITE* prompt.
 
 By default, Ayadn will mark this private messages channel as read once the message has been sent.
 
@@ -111,7 +111,7 @@ Send a message to an App.net CHANNEL.
 
 `ayadn -C 46217`
 
-Ayadn will then show you the *write* prompt.
+Ayadn will then show you the *WRITE* prompt.
 
 By default, Ayadn will mark this channel as read once the message has been sent.
 
@@ -163,7 +163,7 @@ ayadn -R 23362460 -Y https://www.youtube.com/watch?v=Ei8CFin00PY
 ayadn pm @ericd -Y https://www.youtube.com/watch?v=Ei8CFin00PY
 ```
 
-Unfortunately, very few App.net clients treat video embedding properly. So I would advise to include the video URL in the text body anyway, for better compatibility.
+*Note: unfortunately, very few App.net clients treat video embedding properly. So I would advise to include the video URL in the text body anyway, for better compatibility.*
 
 # EMBED MOVIE POSTER
 

data/doc/07-actions.md

@@ -172,7 +172,7 @@ Download a file from your App.net storage (any file posted with any ADN client).
 
 Export a post's url, text and link(s) to your Pinboard account and add optional tags.
 
-`ayadn pin 22790201 Ayadn Ruby dev`
+`ayadn pin 22790201`
 
 `ayadn pin 26874913 duel swords france history`
 

data/doc/08-listings.md

@@ -18,10 +18,6 @@ Sort the list by name:
 
 `ayadn -fwr -n me`
 
-Sort the list by posts/day:
-
-`ayadn -fwr -d me`
-
 Sort the list by total posts:
 
 `ayadn -fwr -p me`
@@ -64,10 +60,6 @@ Sort the list by name:
 
 `ayadn -fwg -n me`
 
-Sort the list by posts/day:
-
-`ayadn -fwg -d me`
-
 Sort the list by total posts:
 
 `ayadn -fwg -p me`
@@ -182,10 +174,6 @@ Sort the list by name:
 
 `ayadn -mtd -n`
 
-Sort the list by posts/day:
-
-`ayadn -mtd -d`
-
 Sort the list by total posts:
 
 `ayadn -mtd -p`
@@ -220,10 +208,6 @@ Sort the list by name:
 
 `ayadn -bkd -n`
 
-Sort the list by posts/day:
-
-`ayadn -bkd -d`
-
 Sort the list by total posts:
 
 `ayadn -bkd -p`
@@ -278,7 +262,7 @@ You can permanently reverse the ADN default list order with a `set` command:
 
 You can change the width of the lists table if the default size doesn't fit well in your terminal:
 
-`ayadn set formats table width 80`
+`ayadn set formats table width 70`
 
 (min: 60, max: 90, default: 75)
 

data/doc/09-accounts.md

@@ -14,7 +14,7 @@ After your successful login, you will be redirected to the Ayadn authorization p
 
 Copy the code (token) you will find there and paste it into Ayadn: a new user will be created and automatically logged in.  
 
-*Note: authorizing an already authorized user updates the old content with the new content: token, name, etc.*
+*Note that authorizing an already authorized user updates the meta informations: token, name, etc.*
 
 # SWITCH
 
@@ -24,7 +24,7 @@ Switch between your authorized accounts.
 
 `ayadn switch ericd`
 
-Alternative syntax:
+Shortcut:
 
 `ayadn -@ ericd`
 
@@ -40,8 +40,10 @@ Unauthorize an Ayadn user account.
 
 `ayadn unauthorize @ericd`
 
+Shortcut:
+
 `ayadn -UA ericd`
 
-You can specify the `--delete` (`-D`) option to force delete the account folders:
+You can specify the `--delete` (`-D`) option to force delete the account folders (recommended):
 
 `ayadn -UA -D @ericd`

data/doc/10-nicerank.md

@@ -46,7 +46,7 @@ Any user with a NiceRank smaller than this value will be ignored in the Global s
 
 (default: 2.1)
 
-## Desactivate NiceRank
+## Deactivate NiceRank
 
 NiceRank is enabled by default on new Ayadn installations, but can be disabled if needed:
 

data/doc/13-bookmark.md

@@ -6,13 +6,13 @@ Usage:
 
 `ayadn mark add 30594331`
 
-`ayadn mark add 30594331 convo title`
+`ayadn mark add 30594331 interesting convo`
 
 `ayadn mark list`
 
 `ayadn mark delete 30594331`
 
-`ayadn mark rename 30594331 'other name'`
+`ayadn mark rename 30594331 'interesting convo about stuff'`
 
 ## ADD
 

data/doc/15-nowplaying.md

@@ -12,7 +12,9 @@ OS X only.
 
 Ayadn will grab information from your running iTunes, format it, insert the *#nowplaying* hashtag then ask for your confirmation before posting it.
 
-It will also grab a link to the album and the album artwork from the iTunes Store (you can prevent this behavior by adding the `--no_url` option (short: `-n`).
+It will also grab a link to the album and the album artwork from the iTunes Store (you can prevent this behavior by adding the `--no_url` option (short: `-n`)).
+
+*Note: __nowplaying__ doesn't work with the curated Apple Music playlists such as 'For You', 'New' and 'Radio'.*
 
 ## Last.fm
 
@@ -20,11 +22,11 @@ It will also grab a link to the album and the album artwork from the iTunes Stor
 
 `ayadn -NP -l`
 
-Ayadn will grab information from your Last.fm account, format it, insert the *#nowplaying* hashtag then ask for your confirmation before posting it.
+Ayadn will grab information from your Last.fm account (you will be prompted for your Last.fm username), format the information, insert the *#nowplaying* hashtag then ask for your confirmation before posting it.
 
 It will also grab a link to the album and the album artwork from the iTunes Store (you can prevent this behavior by adding the `--no_url` option (short: `-n`).
 
-*Note: the Last.fm feed may take some time to be updated. If it doesn't reflect your recent history, please wait a few minutes.*
+*Note: Last.fm does not always update their feed immediately. If __nowplaying__ doesn't reflect your recent history, please wait for a few minutes.*
 
 ## Deezer
 
@@ -32,11 +34,11 @@ It will also grab a link to the album and the album artwork from the iTunes Stor
 
 `ayadn -NP -d`
 
-Ayadn will grab information from your Deezer account (you will be prompted to authorize Ayadn for Deezer the first time you launch this command), format it, insert the *#nowplaying* hashtag then ask for your confirmation before posting it.
+Ayadn will grab information from your Deezer account (you will be prompted to authorize Ayadn for Deezer the first time you launch this command), format the information, insert the *#nowplaying* hashtag then ask for your confirmation before posting it.
 
 It will also grab a link to the album and the album artwork from the iTunes Store (you can prevent this behavior by adding the `--no_url` option (short: `-n`).
 
-*Note: Deezer will update the recent history list only after a song has been played to its end.*
+*Note: Deezer only updates the recent history list if a song has been played to its end.*
 
 ## Options
 

data/doc/18-contact.md

@@ -2,7 +2,7 @@
 
 [@ericd](http://app.net/ericd)
 
-[email](eric@aya.io)
+[email](mailto:eric@aya.io)
 
 [@ayadn](http://app.net/ayadn)
 
@@ -33,4 +33,4 @@ I can't keep up and update the list, of course, there's too many of you awesome
 [@nguarracino](http://app.net/nguarracino)
 [@schmidt_fu](http://app.net/schmidt_fu)
 
-See also the Ayadn CHANGELOG file...
+See also the Ayadn CHANGELOG file for specific contributions.

data/lib/ayadn/app.rb

@@ -191,7 +191,6 @@ module Ayadn
     option :reverse, aliases: "-r", type: :boolean, desc: "Reverses the list original order"
     option :username, aliases: "-u", type: :boolean, desc: "Sort the list by: username"
     option :name, aliases: "-n", type: :boolean, desc: "Sort the list by: name"
-    option :posts_day, aliases: "-d", type: :boolean, desc: "Sort the list by: posts/day"
     option :posts, aliases: "-p", type: :boolean, desc: "Sort the list by: total posts"
     option :date, aliases: "-t", type: :boolean, desc: "Sort the list by: date (only with 'lastposts' option)"
     option :compact, aliases: "-k", type: :boolean, desc: "Force the view to be compact if not already"
@@ -209,7 +208,6 @@ module Ayadn
     option :reverse, aliases: "-r", type: :boolean, desc: "Reverses the list original order"
     option :username, aliases: "-u", type: :boolean, desc: "Sort the list by: username"
     option :name, aliases: "-n", type: :boolean, desc: "Sort the list by: name"
-    option :posts_day, aliases: "-d", type: :boolean, desc: "Sort the list by: posts/day"
     option :posts, aliases: "-p", type: :boolean, desc: "Sort the list by: total posts"
     option :compact, aliases: "-k", type: :boolean, desc: "Force the view to be compact if not already"
     option :cache, type: :boolean, desc: "Cache the results"
@@ -225,7 +223,6 @@ module Ayadn
     option :reverse, aliases: "-r", type: :boolean, desc: "Reverses the list original order"
     option :username, aliases: "-u", type: :boolean, desc: "Sort the list by: username"
     option :name, aliases: "-n", type: :boolean, desc: "Sort the list by: name"
-    option :posts_day, aliases: "-d", type: :boolean, desc: "Sort the list by: posts/day"
     option :posts, aliases: "-p", type: :boolean, desc: "Sort the list by: total posts"
     option :compact, aliases: "-k", type: :boolean, desc: "Force the view to be compact if not already"
     option :cache, type: :boolean, desc: "Cache the results"
@@ -241,7 +238,6 @@ module Ayadn
     option :reverse, aliases: "-r", type: :boolean, desc: "Reverses the list original order"
     option :username, aliases: "-u", type: :boolean, desc: "Sort the list by: username"
     option :name, aliases: "-n", type: :boolean, desc: "Sort the list by: name"
-    option :posts_day, aliases: "-d", type: :boolean, desc: "Sort the list by: posts/day"
     option :posts, aliases: "-p", type: :boolean, desc: "Sort the list by: total posts"
     option :compact, aliases: "-k", type: :boolean, desc: "Force the view to be compact if not already"
     option :cache, type: :boolean, desc: "Cache the results"

data/lib/ayadn/nicerank.rb

@@ -17,84 +17,72 @@ module Ayadn
     # Get NR response
     # Fetch IDs from store
     # if absent, decode + save to dic + cache in store
-    # if present, save to dic from store (and count hits for debug)
+    # if present, save to dic from store (and count hits for debug) 
     def get_ranks stream
-      user_ids, niceranks = [], {}
-      stream['data'].each do |post|
-        id = post['user']['id']
-        user_ids << id if @store[id].nil?
-      end
-      user_ids.uniq!
-      got = CNX.get "#{@url}#{user_ids.join(',')}&show_details=Y" unless user_ids.empty?
-      if got.nil? || got == ""
-        parsed = {'meta' => {'code' => 404}, 'data' => []}
-      else
-
-        begin
-          parsed = JSON.parse(got)
-        rescue JSON::ParserError => e
-          parsed = {'meta' => {'code' => 404}, 'data' => []}
+      begin
+        user_ids, niceranks = [], {}
+        stream['data'].each do |post|
+          id = post['user']['id']
+          user_ids << id if @store[id].nil?
         end
-
-      end
-      parsed['data'].each do |obj|
-        res = @store[obj['user_id']]
-        if res.nil?
-          obj['account']['is_human'] == true ? is_human = 1 : is_human = 0
-          obj['account']['real_person'] == true ? real_person = 1 : real_person = 0
-          content = {
-            username: obj['user']['username'],
-            rank: obj['rank'],
-            is_human: is_human,
-            real_person: real_person
-          }
-          @store[obj['user_id']] = content
-          niceranks[obj['user_id']] = content
+        user_ids.uniq!
+        got = CNX.get "#{@url}#{user_ids.join(',')}" unless user_ids.empty?
+        if got.nil? || got == ""
+          parsed = {'meta' => {'code' => 404}, 'data' => []}
         else
-          @hits += 1
-          niceranks[obj['user_id']] = res
-        end
 
-      end
+          begin
+            parsed = JSON.parse(got)
+          rescue
+            parsed = {'meta' => {'code' => 404}, 'data' => []}
+          end
 
-      @posts += stream['data'].size
-      @ids += user_ids.size
+          unless parsed['data'].is_a?(Array)
+            parsed = {'meta' => {'code' => 404}, 'data' => []}
+          end
 
-      if Settings.options[:timeline][:debug] == true
-        deb = "\n"
-        deb << "+ NICERANK\n"
-        deb << "* t#{Time.now.to_i}\n"
-        deb << "Posts:\t\t#{stream['data'].size}\n"
-        deb << "Requested NR:\t#{user_ids.size}\n"
-        deb << "* TOTALS\n"
-        deb << "Posts:\t\t#{@posts}\n"
-        deb << "Fetched ranks:\t#{@ids}\n"
-        deb << "DB hits:\t#{@hits}\n"
-        deb << "Uniques:\t#{@store.count}\n"
-        deb << "\n"
-        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}"
-        Logs.rec.debug "NICERANK/CACHED IDS: #{@store.count}"
-      end
+        end
+        parsed['data'].each do |obj|
+          res = @store[obj['user_id']]
+          if res.nil?
+            obj['is_human'] == true ? is_human = 1 : is_human = 0
+            content = {
+              rank: obj['rank'],
+              is_human: is_human
+            }
+            @store[obj['user_id']] = content
+            niceranks[obj['user_id']] = content
+          else
+            @hits += 1
+            niceranks[obj['user_id']] = res
+          end
+        end
 
-      return niceranks
-    end
 
-    # This is for user info, no scrolling: no need to cache
-    def get_posts_day ids
-      resp = JSON.parse(CNX.get("#{@url}#{ids.join(',')}&show_details=Y"))
-      if resp.nil? || resp['meta']['code'] != 200
-        []
-      else
-        resp['data'].map do |obj|
-          pday = obj['user']['posts_day'] == -1 ? 0 : obj['user']['posts_day']
-          {
-            id: obj['user_id'],
-            posts_day:pday.round(2)
-          }
+        @posts += stream['data'].size
+        @ids += user_ids.size
+
+        if Settings.options[:timeline][:debug] == true
+          deb = "\n"
+          deb << "+ NICERANK\n"
+          deb << "* t#{Time.now.to_i}\n"
+          deb << "Posts:\t\t#{stream['data'].size}\n"
+          deb << "Requested NR:\t#{user_ids.size}\n"
+          deb << "* TOTALS\n"
+          deb << "Posts:\t\t#{@posts}\n"
+          deb << "Fetched ranks:\t#{@ids}\n"
+          deb << "DB hits:\t#{@hits}\n"
+          deb << "Uniques:\t#{@store.count}\n"
+          deb << "\n"
+          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}"
+          Logs.rec.debug "NICERANK/CACHED IDS: #{@store.count}"
         end
+        return niceranks
+      rescue => e
+        Errors.global_error({error: e, caller: caller, data: [user_ids, niceranks, parsed]})
       end
     end
 
@@ -108,7 +96,7 @@ module Ayadn
         blocs << ids.shift(200)
       end
       blocs.each do |bloc|
-        got = CNX.get("#{@url}#{bloc.join(',')}&show_details=Y")
+        got = CNX.get("#{@url}#{bloc.join(',')}")
         if got.nil? || got.empty?
           ranks << [{}]
         else

data/lib/ayadn/nowplaying.rb

@@ -88,7 +88,7 @@ module Ayadn
         @status.fetching_from('iTunes')
         itunes = get_itunes_track_infos()
         itunes.each do |el|
-          if el.length == 0
+          if el.nil? || el.length == 0
             @status.empty_fields
             exit
           end
@@ -96,7 +96,7 @@ module Ayadn
         post_itunes(options, itunes)
       rescue => e
         @status.wtf
-        Errors.global_error({error: e, caller: caller, data: [itunes, store, options]})
+        Errors.global_error({error: e, caller: caller, data: [itunes, options]})
       end
     end
 

data/lib/ayadn/version.rb

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

data/lib/ayadn/view.rb

@@ -71,7 +71,7 @@ module Ayadn
         if options[:username]
           bucket.sort_by! { |obj| obj[1] }
         elsif options[:name]
-          bucket.sort_by! { |obj| obj[2].downcase }
+          bucket.sort_by! { |obj| obj[2] }
         elsif options[:posts]
           bucket.sort_by! { |obj| [obj[5], obj[1]] }.reverse!
         elsif options[:date]
@@ -97,7 +97,7 @@ module Ayadn
           hashtags = @workers.extract_hashtags(obj[6])
           text = @workers.colorize_text(obj[6]["text"], mentions, hashtags)
           total = "(#{obj[5]} posts)"
-          name = obj[2].nil? ? "(no name)" : obj[2]
+          name = obj[2] == "" ? "(no name)" : obj[2]
           colored_total = total.color(Settings.options[:colors][:link])
           colored_name = name.color(Settings.options[:colors][:name])
           colored_date = date.color(Settings.options[:colors][:date])
@@ -218,14 +218,14 @@ module Ayadn
       view << "#{padding}Posts\t\t\t".color(:cyan) + content['counts']['posts'].to_s.color(Settings.options[:colors][:excerpt])
 
 
-      unless show_ranks == false
-        # this is ok for one user, but do not call this in a loop
-        # do call them all at once instead if many
-        ranks = NiceRank.new.get_posts_day([content['id'].to_i])
-        unless ranks.empty?
-          view << "#{padding}Posts/day\t\t".color(:cyan) + ranks[0][:posts_day].to_s.color(Settings.options[:colors][:excerpt])
-        end
-      end
+      # unless show_ranks == false
+      #   # this is ok for one user, but do not call this in a loop
+      #   # do call them all at once instead if many
+      #   ranks = NiceRank.new.get_posts_day([content['id'].to_i])
+      #   unless ranks.empty?
+      #     view << "#{padding}Posts/day\t\t".color(:cyan) + ranks[0][:posts_day].to_s.color(Settings.options[:colors][:excerpt])
+      #   end
+      # end
 
       view << "#{padding}Following\t\t".color(:cyan) + content['counts']['following'].to_s.color(Settings.options[:colors][:excerpt])
       view << "\nFollowers\t\t".color(:cyan) + content['counts']['followers'].to_s.color(Settings.options[:colors][:excerpt])
@@ -514,7 +514,6 @@ module Ayadn
             unless content[:nicerank] == false
               next if content[:nicerank] < Settings.options[:nicerank][:threshold]
               next if content[:is_human] == 0
-              next if content[:real_person] == 0
             end
             filtered[id] = content
           end

data/lib/ayadn/workers.rb

@@ -111,43 +111,21 @@ module Ayadn
       users = at(list.map {|obj| obj[:username]})
       ids = list.map {|obj| obj[:id].to_i}
       ranks = NiceRank.new.from_ids(ids)
-      indexed_ranks = {}
-      ranks.each do |r|
-        if r.empty?
-          indexed_ranks = false
-          break
-        else
-          indexed_ranks[r['user_id']] = r
-        end
-      end
-      table << ['USERNAME'.color(:red), 'NAME'.color(:red), 'POSTS'.color(:red), 'POSTS/DAY'.color(:red)]
+      table << ['USERNAME'.color(:red), 'NAME'.color(:red), 'POSTS'.color(:red)]
       table << :separator
       arr = []
       if options[:username]
         list.sort_by! { |obj| obj[:username] }
       elsif options[:name]
-        list.sort_by! { |obj| obj[:name].downcase }
+        list.sort_by! { |obj| obj[:name].nil? ? "(no name)" : obj[:name].downcase }
       elsif options[:posts]
         list.sort_by! { |obj| [obj[:posts], obj[:username]] }
       end
       list.each do |obj|
         obj[:name] = "" if obj[:name].nil?
-        unless indexed_ranks == false
-          details = indexed_ranks[obj[:id].to_i]
-          if details['user']['posts_day'] == -1
-            posts_day = 'ignored'
-          else
-            posts_day = details['user']['posts_day'].round(2).to_s
-          end
-        else
-          posts_day = 'unknown'
-        end
         obj[:username].length > 23 ? username = "#{obj[:username][0..20]}..." : username = obj[:username]
         obj[:name].length > 23 ? name = "#{obj[:name][0..20]}..." : name = obj[:name]
-        arr << [ "@#{username} ".color(Settings.options[:colors][:username]), "#{name.to_s.force_encoding('UTF-8')}", obj[:posts], posts_day ]
-      end
-      if options[:posts_day]
-        arr.sort_by! { |obj| obj[3].to_f }
+        arr << [ "@#{username} ".color(Settings.options[:colors][:username]), "#{name.to_s.force_encoding('UTF-8')}", obj[:posts] ]
       end
       if options[:reverse]
         arr.reverse!
@@ -172,8 +150,8 @@ module Ayadn
         unless Settings.global[:force] == true
           if Settings.options[:blacklist][:active] == true
             if Databases.is_in_blacklist?('client', post['source']['name'].downcase)
-              Debug.skipped({source: post['source']['name']})
-              next
+                Debug.skipped({source: post['source']['name']})
+                next
             end
           end
         end
@@ -231,11 +209,9 @@ module Ayadn
         if niceranks[post['user']['id'].to_i]
           rank = niceranks[post['user']['id'].to_i][:rank]
           is_human = niceranks[post['user']['id'].to_i][:is_human]
-          real_person = niceranks[post['user']['id'].to_i][:real_person]
         else
           rank = false
           is_human = 'unknown'
-          real_person = 'unknown'
         end
 
         if post['user'].has_key?('name')
@@ -255,7 +231,6 @@ module Ayadn
           user_id: post['user']['id'].to_i,
           nicerank: rank,
           is_human: is_human,
-          real_person: real_person,
           handle: "@#{post['user']['username']}",
           type: post['user']['type'],
           date: parsed_time(post['created_at']),

data/spec/mock/nicerank.json

@@ -1 +1 @@
-{"meta":{"code":200,"more":false},"data":[{"user_id":69904,"rank":3.816259,"is_human":true,"user":{"username":"ericd","account_age":513,"following":277,"followers":261,"posts":5933,"stars":345,"posts_day":11.5653,"days_idle":0},"account":{"has_avatar":true,"has_bio":true,"has_cover":true,"is_verified":true,"is_human":true,"real_person":true},"stats":{"robo_posts":6,"post_count":294,"conversations":229,"links":36,"mentions":232,"questions":25}}]}
+{"meta":{"code":200,"more":false},"data":[{"user_id":69904,"rank":3.816259,"is_human":true}]}

data/spec/unit/nicerank_spec.rb

@@ -97,24 +97,14 @@ describe Ayadn::NiceRank do
   let(:rest) {Ayadn::CNX}
   # let(:nicerank) { JSON.parse(File.read("spec/mock/nicerank.json")) }
 
-  describe "#get_posts_day" do
-    before do
-      rest.stub(:get).and_return(File.read("spec/mock/nicerank.json"))
-    end
-    it "get posts/day for a user" do
-      expect(rest).to receive(:get).with("http://api.nice.social/user/nicerank?ids=69904&show_details=Y")
-      x = Ayadn::NiceRank.new.get_posts_day(['69904'])
-      expect(x).to eq [{:id=>69904, :posts_day=>11.57}]
-    end
-  end
   describe "#from_ids" do
     before do
       rest.stub(:get).and_return(File.read("spec/mock/nicerank.json"))
     end
     it "get niceranks from user ids" do
-      expect(rest).to receive(:get).with("http://api.nice.social/user/nicerank?ids=69904&show_details=Y")
+      expect(rest).to receive(:get).with("http://api.nice.social/user/nicerank?ids=69904")
       x = Ayadn::NiceRank.new.from_ids(['69904'])
-      expect(x).to eq [{"user_id"=>69904,"rank"=>3.816259,"is_human"=>true,"user"=> {"username"=>"ericd","account_age"=>513,"following"=>277,"followers"=>261,"posts"=>5933,"stars"=>345,"posts_day"=>11.5653,"days_idle"=>0},"account"=> {"has_avatar"=>true,"has_bio"=>true,"has_cover"=>true,"is_verified"=>true,"is_human"=>true,"real_person"=>true},"stats"=>{"robo_posts"=>6,"post_count"=>294,"conversations"=>229,"links"=>36,"mentions"=>232,"questions"=>25}}]
+      expect(x).to eq [{"user_id"=>69904,"rank"=>3.816259,"is_human"=>true}]
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ayadn
 version: !ruby/object:Gem::Version
-  version: 2.0.12
+  version: '2.1'
 platform: ruby
 authors:
 - Eric Dejonckheere
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-10 00:00:00.000000000 Z
+date: 2015-08-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor