ayadn 1.1.3 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 75a5a7fbde96a935ba9615c876c9a218309011b4
-  data.tar.gz: 5393c466010698aad630ff249882e181acd437b0
+  metadata.gz: 4779d6542900526f73e85eeacb33e0473027c1b6
+  data.tar.gz: 96819f77d6f435a0b4e2268c9a860abfa1eba24e
 SHA512:
-  metadata.gz: 556f017fe92fcef40812aeddc39b21b6f92ad60f4f02750da86e8c48feeebfc72ce3562adff10de5f052ab6a75bbf4731bb6b6263824a292eb575bebd7b599da
-  data.tar.gz: 5a6e6e0787fdb6051367362d043f5656e11efe329e169ee2ee77e11dd56950a9b698a89c83d46c9a54dc09bbc2c47294471e30d54e354e3b8f1ff0fde6098e4e
+  metadata.gz: ed28a4ad43ddcd1434fb39982e39c42b70eba503c9bd8f83eebe84b047df048a8706e006845a174914495ad9fbe4bdeffd65413fac47b03720797d82a9ddb5bd
+  data.tar.gz: f1bbc610a629b57a5e132bbb726cab40313bc04d1367a600813d140a464ffdbe43e36d9c03519ee6996520324dfbe8d4e81ce258f05bc1f989a1a1fd495f01ab

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+# 1.2.0 - 'Jason'
+
+- @matigo's NiceRank filter for the Global stream
+
 # 1.1.3 - 'Kevin'
 
 - Bookmark a conversation

data/README.md

@@ -17,7 +17,7 @@ Ayadn is configurable: colors, timelines, durations, aliases, etc.
 
 You can also specify many options, like show the raw JSON instead of the formatted response, show only a number of most recents posts, show only new posts, etc.
 
-There's also exclusive features, like the Blacklist: feed this mini database with usernames, client names or hashtags and Ayadn will never show you any post containing any of these elements.
+There's also two exclusive antispam and filtering features: a blacklist, and Jason Irwin's NiceRank.
 
 Last but not least: Ayadn supports multiple ADN accounts! Authorize as many accounts as you wish and simply switch between them with a keystroke.  
 

data/lib/ayadn/action.rb

@@ -42,14 +42,17 @@ module Ayadn
       end
     end
 
-    def global(options)
+    def global(settings)
       begin
+        options = settings.dup
+        options[:filter] = true
         doing(options)
         stream = @api.get_global(options)
+        niceranks = @api.get_niceranks stream
         (no_new_posts unless Databases.has_new?(stream, 'global')) if options[:new]
         Databases.save_max_id(stream)
-        render_view(stream, options)
-        Scroll.new(@api, @view).global(options) if options[:scroll]
+        render_view(stream, options, niceranks)
+        Scroll.new(@api, @view).global(options, niceranks) if options[:scroll]
       rescue => e
         Errors.global_error("action/global", options, e)
       ensure
@@ -1075,10 +1078,9 @@ module Ayadn
       post_id
     end
 
-    def render_view(data, options = {})
+    def render_view(data, options = {}, niceranks = {})
       unless options[:raw]
-        #@view.clear_screen
-        get_view(data['data'], options)
+        get_view(data['data'], options, niceranks)
       else
         @view.show_raw(data)
       end
@@ -1095,12 +1097,12 @@ module Ayadn
       response['data']
     end
 
-    def get_view(stream, options = {})
+    def get_view(stream, options = {}, niceranks = {})
       @view.clear_screen
       if options[:index]
-        @view.show_posts_with_index(stream, options)
+        @view.show_posts_with_index(stream, options, niceranks)
       else
-        @view.show_posts(stream, options)
+        @view.show_posts(stream, options, niceranks)
       end
     end
 

data/lib/ayadn/api.rb

@@ -200,6 +200,24 @@ module Ayadn
       end
     end
 
+    def get_niceranks stream
+      ranks, user_ids, table, niceranks = [], [], {}, {}
+      stream['data'].each do |post|
+        user_ids << post['user']['id'].to_i
+        table[post['user']['id'].to_i] = post['user']['username']
+      end
+      user_ids.uniq!
+      resp = JSON.parse(CNX.get "http://api.search-adn.net/user/nicerank?ids=#{user_ids.join(',')}")
+      return {} if resp['meta']['code'] != 200
+      resp['data'].each do |obj|
+        niceranks[obj['user_id']] = {
+          username: table[obj['user_id']],
+          rank: obj['rank']
+        }
+      end
+      niceranks
+    end
+
     def get_channels
       options = {:count => 200, :recent_message => 1, :annotations => 1, :before_id => nil}
       get_parsed_response(Endpoints.new.channels(options))

data/lib/ayadn/app.rb

@@ -448,8 +448,7 @@ module Ayadn
       puts "\nAYADN\n".color(:red)
       puts "Version:\t".color(:cyan) + "#{VERSION}\n".color(:green)
       puts "Changelog:\t".color(:cyan) + "https://github.com/ericdke/na/blob/master/CHANGELOG.md\n".color(:yellow)
-      puts "Readme:\t\t".color(:cyan) + "https://github.com/ericdke/na/blob/master/README.md".color(:yellow)
-      puts "Manual:\t\t".color(:cyan) + "https://github.com/ericdke/na/blob/master/MANUAL.md".color(:yellow)
+      puts "Docs:\t\t".color(:cyan) + "http://ayadn-app.net/doc/".color(:yellow)
       puts "\n"
     end
 

data/lib/ayadn/cnx.rb

@@ -2,6 +2,22 @@
 module Ayadn
   class CNX
 
+    def self.get url
+      begin
+        RestClient.get(url) do |response, request, result|
+          response
+        end
+      rescue SocketError => e
+        puts "\nConnection error.".color(:red)
+        Errors.global_error("cnx.rb/get", url, e)
+      rescue SystemCallError => e
+        puts "\nConnection error.".color(:red)
+        Errors.global_error("cnx.rb/get", url, e)
+      rescue => e
+        Errors.global_error("cnx.rb/get", url, e)
+      end
+    end
+
     def self.get_response_from(url)
       begin
         RestClient.get(url) do |response, request, result| #, :verify_ssl => OpenSSL::SSL::VERIFY_NONE

data/lib/ayadn/descriptions.rb

@@ -109,6 +109,8 @@ module Ayadn
       Show only new posts:
 
       ayadn -gl -n
+
+      See `ayadn set` for the NiceRank filter.
       \n\n
       USAGE
     end
@@ -804,6 +806,20 @@ module Ayadn
       \n\n
       USAGE
     end
+    def self.set_nicerank
+      <<-USAGE
+      Set NiceRank values.
+
+      Examples:
+
+      ayadn set nicerank filter true
+
+      ayadn set nicerank filter_unranked true
+
+      ayadn set timeline show_nicerank true
+      \n\n
+      USAGE
+    end
     def self.set_defaults
       <<-USAGE
       Sets back the configuration to default values.

data/lib/ayadn/scroll.rb

@@ -7,23 +7,32 @@ module Ayadn
       @view = view
     end
 
-    def method_missing(meth, options)
+    def method_missing(meth, options, niceranks = {})
       case meth.to_s
       when 'trending', 'photos', 'checkins', 'replies', 'global', 'unified'
-        scroll_it(meth.to_s, options)
+        scroll_it(meth.to_s, options, niceranks)
       else
         super
       end
     end
 
-    def scroll_it(target, options)
+    def scroll_it(target, options, niceranks)
       options = check_raw(options)
       orig_target = target
       loop do
         begin
           stream = get(target, options)
+          if options[:filter] == true
+            unless stream['data'].empty?
+              niceranks = @api.get_niceranks stream
+            else
+             niceranks = {}
+            end
+          else
+            niceranks = {}
+          end
           target = "explore:#{target}" if explore?(target)
-          show_if_new(stream, options, target)
+          show_if_new(stream, options, target, niceranks)
           target = orig_target if target =~ /explore/
           options = save_then_return(stream, options)
           pause
@@ -125,33 +134,45 @@ module Ayadn
       sleep Settings.options[:scroll][:timer]
     end
 
-    def show_if_new(stream, options, target)
-      show(stream, options) if Databases.has_new?(stream, target)
+    def show_if_new(stream, options, target, niceranks = {})
+      show(stream, options, niceranks) if Databases.has_new?(stream, target)
     end
 
     def save_then_return(stream, options)
       unless stream['meta']['max_id'].nil?
         Databases.save_max_id(stream)
-        return options_hash(stream)
+        return options_hash(stream, options)
       end
       options
     end
 
     def check_raw(options)
       if options[:raw]
-        {count: 200, since_id: nil, raw: true, scroll: true}
+        if options[:filter] == true
+          {count: 200, since_id: nil, raw: true, scroll: true, filter: true}
+        else
+          {count: 200, since_id: nil, raw: true, scroll: true}
+        end
       else
-        {count: 200, since_id: nil, scroll: true}
+        if options[:filter] == true
+          {count: 200, since_id: nil, scroll: true, filter: true}
+        else
+          {count: 200, since_id: nil, scroll: true}
+        end
       end
     end
 
-    def options_hash(stream)
-      {:count => 50, :since_id => stream['meta']['max_id'], scroll: true}
+    def options_hash(stream, options)
+      if options[:filter] == true
+        {:count => 50, :since_id => stream['meta']['max_id'], scroll: true, filter: true}
+      else
+        {:count => 50, :since_id => stream['meta']['max_id'], scroll: true}
+      end
     end
 
-    def show(stream, options)
+    def show(stream, options, niceranks)
       unless options[:raw]
-        @view.show_posts(stream['data'], options)
+        @view.show_posts(stream['data'], options, niceranks)
       else
         jj stream
       end

data/lib/ayadn/set.rb

@@ -15,6 +15,19 @@ module Ayadn
       scroll_config.save
     end
 
+    desc "nicerank ITEM VALUE", "Set NiceRank filter values"
+    long_desc Descriptions.set_nicerank
+    def nicerank *args
+      nicerank_config = SetNiceRank.new
+      if args[0]
+        nicerank_config.send(args[0], args[1])
+      else
+        abort(Status.error_missing_parameters)
+      end
+      nicerank_config.log(args)
+      nicerank_config.save
+    end
+
     desc "timeline ITEM TRUE/FALSE", "Set ITEM to be activated or not"
     long_desc Descriptions.set_timeline
     def timeline(*args)
@@ -141,6 +154,42 @@ module Ayadn
     end
   end
 
+  class SetNiceRank
+    def initialize
+      Settings.load_config
+      Settings.get_token
+      Settings.init_config
+      Logs.create_logger
+      unless Settings.options[:nicerank]
+        Settings.options[:nicerank] = {
+          threshold: 2.1,
+          filter: false,
+          filter_unranked: false
+        }
+      end
+      unless Settings.options[:colors][:nicerank]
+        Settings.options[:colors][:nicerank] = :cyan
+      end
+    end
+    def log(args)
+      x = "New value for '#{args[0]}' in 'NiceRank' => #{args[1]}"
+      puts "\n#{x}\n".color(:cyan)
+      Logs.rec.info x
+    end
+    def save
+      Settings.save_config
+    end
+    def filter value
+      Settings.options[:nicerank][:filter] = Validators.boolean(value)
+    end
+    def filter_unranked value
+      Settings.options[:nicerank][:filter_unranked] = Validators.boolean(value)
+    end
+    def threshold value
+      Settings.options[:nicerank][:threshold] = value.to_f
+    end
+  end
+
   class SetBackup
     def initialize
       Settings.load_config
@@ -314,6 +363,19 @@ module Ayadn
     def show_date(value)
       Settings.options[:timeline][:show_date] = value
     end
+    def show_nicerank value
+      unless Settings.options[:nicerank]
+        Settings.options[:nicerank] = {
+          threshold: 2.1,
+          filter: false,
+          filter_unranked: false
+        }
+      end
+      unless Settings.options[:colors][:nicerank]
+        Settings.options[:colors][:nicerank] = :cyan
+      end
+      Settings.options[:timeline][:show_nicerank] = value
+    end
   end
 
   class SetColor

data/lib/ayadn/settings.rb

@@ -151,7 +151,8 @@ module Ayadn
           show_source: true,
           show_symbols: true,
           show_real_name: true,
-          show_date: true
+          show_date: true,
+          show_nicerank: false
         },
         counts: {
           default: 50,
@@ -187,7 +188,8 @@ module Ayadn
           hashtags: :cyan,
           mentions: :red,
           source: :cyan,
-          symbols: :green
+          symbols: :green,
+          nicerank: :cyan
         },
         backup: {
           auto_save_sent_posts: false,
@@ -196,6 +198,11 @@ module Ayadn
         },
         scroll: {
           timer: 3
+        },
+        nicerank: {
+          threshold: 2.1,
+          filter: false,
+          filter_unranked: false
         }
       }
     end

data/lib/ayadn/status.rb

@@ -221,7 +221,7 @@ module Ayadn
       "\nSomething wrong happened. :(\n\n".color(:red)
     end
     def self.redirecting
-      "\nPost is a repost. Redirecting...\n\n".color(:cyan)
+      "\nPost is a repost. Redirecting...\n".color(:cyan)
     end
     def self.nobody_reposted
       "\nNobody reposted this post.\n\n".color(:red)

data/lib/ayadn/version.rb

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

data/lib/ayadn/view.rb

@@ -6,14 +6,14 @@ module Ayadn
       @workers = Workers.new
     end
 
-    def show_posts_with_index(data, options)
-      posts, view = build_stream_with_index(data, options)
+    def show_posts_with_index(data, options, niceranks = {})
+      posts, view = build_stream_with_index(data, options, niceranks)
       puts view
       Databases.save_indexed_posts(posts)
     end
 
-    def show_posts(data, options)
-      puts build_stream_without_index(data, options)
+    def show_posts(data, options, niceranks = {})
+      puts build_stream_without_index(data, options, niceranks)
     end
 
     def show_raw(stream)
@@ -22,7 +22,7 @@ module Ayadn
     end
 
     def show_simple_post(post, options)
-      view = build_stream_without_index(post, options)
+      view = build_stream_without_index(post, options, {})
       puts view
     end
 
@@ -276,9 +276,31 @@ module Ayadn
       end
     end
 
-    def build_stream_with_index(data, options) #expects an array
+    def filter_nicerank posts, options
+      if options[:filter] == true # only if this option is true in Action (only global for now)
+        unless Settings.options[:nicerank].nil? #in case config file not initialized
+          if Settings.options[:nicerank][:filter] == true
+            filtered = {}
+            posts.each do |id,content|
+              (next if content[:nicerank] == false) if Settings.options[:nicerank][:filter_unranked] == true
+              next if content[:nicerank] < Settings.options[:nicerank][:threshold]
+              filtered[id] = content
+            end
+            return filtered
+          end
+          return posts
+        end
+        return posts
+      end
+      return posts
+    end
+
+    def build_stream_with_index(data, options, niceranks) #expects an array
       @view = ""
-      posts = @workers.build_posts(data.reverse)
+      posts = @workers.build_posts(data.reverse, niceranks)
+
+      posts = filter_nicerank posts, options
+
       posts.each do |id,content|
         count = "%03d" % content[:count]
         if content[:username] == Settings.config[:identity][:username]
@@ -294,9 +316,12 @@ module Ayadn
       return posts, @view
     end
 
-    def build_stream_without_index(data, options) #expects an array
+    def build_stream_without_index(data, options, niceranks) #expects an array
       @view = ""
-      posts = @workers.build_posts(data.reverse)
+      posts = @workers.build_posts(data.reverse, niceranks)
+
+      posts = filter_nicerank posts, options
+
       posts.each do |id,content|
         if content[:username] == Settings.config[:identity][:username]
           @view << content[:id].to_s.color(Settings.options[:colors][:id]).inverse + " "
@@ -428,6 +453,12 @@ module Ayadn
         header << " "
         header << content[:name].color(Settings.options[:colors][:name])
       end
+
+      if Settings.options[:timeline][:show_nicerank] && content[:nicerank] && Settings.options[:nicerank][:filter]
+        header << " "
+        header << "[#{content[:nicerank]}]".color(Settings.options[:colors][:nicerank])
+      end
+
       if Settings.options[:timeline][:show_date]
         header << " "
         header << content[:date].color(Settings.options[:colors][:date])

data/lib/ayadn/workers.rb

@@ -90,7 +90,7 @@ module Ayadn
       table
     end
 
-    def build_posts(data)
+    def build_posts(data, niceranks = {})
       # builds a hash of hashes, each hash is a normalized post with post id as a key
       posts = {}
 
@@ -115,6 +115,12 @@ module Ayadn
         end
         next if @skip
 
+        if niceranks[post['user']['id'].to_i]
+          rank = niceranks[post['user']['id'].to_i][:rank]
+        else
+          rank = false
+        end
+
         if post['user'].has_key?('name')
           name = post['user']['name'].to_s.force_encoding("UTF-8")
         else
@@ -129,6 +135,8 @@ module Ayadn
           name: name,
           thread_id: post['thread_id'],
           username: post['user']['username'],
+          user_id: post['user']['id'].to_i,
+          nicerank: rank,
           handle: "@#{post['user']['username']}",
           type: post['user']['type'],
           date: parsed_time(post['created_at']),

data/spec/unit/view_spec.rb

@@ -75,7 +75,7 @@ describe Ayadn::View do
   describe "#show_posts_with_index" do
     it 'outputs the indexed stream' do
       printed = capture_stdout do
-        Ayadn::View.new.show_posts_with_index(stream['data'], {})
+        Ayadn::View.new.show_posts_with_index(stream['data'], {}, {})
       end
       expect(printed).to include "001"
       expect(printed).to include "Backer of the Day"

data/spec/unit/workers_spec.rb

@@ -41,7 +41,7 @@ describe Ayadn::Workers do
       expect(posts[23187443][:has_checkins]).to be false
       expect(posts[23187443][:mentions]).to eq []
       expect(posts[23187443][:checkins]).to be_empty
-      expect(posts[23187443].length).to eq 29
+      expect(posts[23187443].length).to eq 31
     end
     it "gets oembed link from checkins post" do
       posts = Ayadn::Workers.new.build_posts(checkins['data'])

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ayadn
 version: !ruby/object:Gem::Version
-  version: 1.1.3
+  version: 1.2.0
 platform: ruby
 authors:
 - Eric Dejonckheere
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-17 00:00:00.000000000 Z
+date: 2014-05-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor