ayadn 1.5.1 → 1.6.0

data/lib/ayadn/version.rb

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

data/lib/ayadn/view.rb

@@ -17,6 +17,13 @@ module Ayadn
       puts resp unless resp == ""
     end
 
+    def if_raw what, options
+      if options[:raw]
+        show_raw(what, options)
+        exit
+      end
+    end
+
     def show_raw(stream, options = {})
       #puts stream.to_json
       jj stream
@@ -259,7 +266,7 @@ module Ayadn
         end
         unless ch.recent_message.nil?
           unless ch.recent_message['text'].nil?
-            view << "Most recent message (#{Workers.new.parsed_time(ch.recent_message['created_at'])}): ".color(:cyan)
+            view << "Most recent message (#{@workers.parsed_time(ch.recent_message['created_at'])}): ".color(:cyan)
             view << "\n"
             view << "---\n#{ch.recent_message['text']}\n---"
           end
@@ -276,6 +283,28 @@ module Ayadn
       puts view
     end
 
+    def render(stream, options = {}, niceranks = {})
+      unless options[:raw]
+        get(stream['data'], options, niceranks)
+      else
+        show_raw(stream)
+      end
+    end
+
+    def get(stream, options = {}, niceranks = {})
+      clear_screen()
+      if options[:index]
+        show_posts_with_index(stream, options, niceranks)
+      else
+        show_posts(stream, options, niceranks)
+      end
+    end
+
+    def get_simple_view(stream)
+      clear_screen()
+      show_simple_stream(stream)
+    end
+
     def clear_screen
       puts "\e[H\e[2J"
     end
@@ -286,6 +315,62 @@ module Ayadn
       puts "\n"
     end
 
+    def winsize
+      IO.console.winsize
+    end
+
+    def show_links(links)
+      links.each {|l| puts "#{l}\n".color(Settings.options[:colors][:link])}
+    end
+
+    def all_hashtag_links(stream, hashtag)
+      clear_screen()
+      puts "Links from posts containing hashtag '##{hashtag}': \n".color(:cyan)
+      show_links(@workers.links_from_posts(stream))
+    end
+
+    def all_search_links(stream, words)
+      clear_screen()
+      puts "Links from posts containing word(s) '#{words}': \n".color(:cyan)
+      show_links(@workers.links_from_posts(stream))
+    end
+
+    def all_stars_links(stream)
+      clear_screen()
+      puts "Links from your starred posts: \n".color(:cyan)
+      show_links(@workers.links_from_posts(stream))
+    end
+
+    def infos(stream, token)
+      clear_screen()
+      show_userinfos(stream, token, true)
+    end
+
+    def downloading(options = {})
+      unless options[:raw]
+        clear_screen()
+        print Status.downloading
+      end
+    end
+
+    def list(what, list, target)
+      clear_screen()
+      case what
+      when :whoreposted
+        show_list_reposted(list, target)
+      when :whostarred
+        show_list_starred(list, target)
+      when :followings
+        show_list_followings(list, target)
+      when :followers
+        show_list_followers(list, target)
+      when :muted
+        show_list_muted(list)
+      when :blocked
+        show_list_blocked(list)
+      end
+    end
+
     def big_separator
       "----------\n\n\n"
     end

data/lib/ayadn/workers.rb

@@ -81,7 +81,7 @@ module Ayadn
     end
 
     def build_users_list(list, table)
-      users = Workers.at(list.map {|obj| obj[:username]})
+      users = at(list.map {|obj| obj[:username]})
       ids = list.map {|obj| obj[:id].to_i}
       ranks = NiceRank.new.from_ids(ids)
       indexed_ranks = {}
@@ -302,7 +302,7 @@ module Ayadn
       "#{string[0...10]} #{string[11...19]}"
     end
 
-    def self.at usernames
+    def at usernames #TODO: consolidate
       usernames.map do |user|
         if user == 'me'
           'me'
@@ -314,7 +314,52 @@ module Ayadn
       end
     end
 
-    def self.add_arobase_if_missing(username) # expects an array of username(s), works on the first one and outputs a string
+    def get_original_id(post_id, resp)
+      if resp['data']['repost_of']
+        puts Status.redirecting
+        id = resp['data']['repost_of']['id']
+        Errors.repost(post_id, id)
+        return id
+      else
+        return post_id
+      end
+    end
+
+    def get_channel_id_from_alias(channel_id)
+      unless channel_id.is_integer?
+        orig = channel_id
+        channel_id = Databases.get_channel_id(orig)
+        if channel_id.nil?
+          Errors.warn("Alias '#{orig}' doesn't exist.")
+          puts Status.no_alias
+          exit
+        end
+      end
+      channel_id
+    end
+
+    def length_of_index
+      Databases.get_index_length
+    end
+
+    def get_post_from_index id
+      Databases.get_post_from_index id
+    end
+
+    def get_real_post_id post_id
+      id = post_id.to_i
+      if id > 0 && id <= length_of_index
+        resp = get_post_from_index(id)
+        post_id = resp[:id]
+      end
+      post_id
+    end
+
+    def add_arobase username
+      add_arobase_if_missing(username)
+    end
+
+    def add_arobase_if_missing(username) # expects an array of username(s), works on the first one and outputs a string
       unless username.first == "me"
         username = username.first.chars
         username.unshift("@") unless username.first == "@"
@@ -324,26 +369,25 @@ module Ayadn
       username.join
     end
 
-    def self.add_arobases_to_usernames args
-      args.map! do |username|
+    def add_arobases_to_usernames args #TODO: replace
+      args.map do |username|
         if username == 'me'
-          self.who_am_i
+          who_am_i
         else
           temp = username.chars
           temp.unshift("@") unless temp.first == "@"
           temp.join
         end
       end
-      args
     end
 
-    def self.who_am_i
+    def who_am_i
       db = Databases.init(Dir.home + "/ayadn/accounts.db")
       active = db['ACTIVE']
       db[active][:handle]
     end
 
-    def self.remove_arobase_if_present args
+    def remove_arobase_if_present args
       args.map! do |username|
         temp = username.chars
         temp.shift if temp.first == "@"
@@ -352,7 +396,7 @@ module Ayadn
       args
     end
 
-    def self.extract_users(resp)
+    def extract_users(resp)
       users_hash = {}
       resp['data'].each do |item|
         users_hash[item['id']] = [item['username'], item['name'], item['you_follow'], item['follows_you']]
@@ -424,6 +468,20 @@ module Ayadn
       sentences.join("\n")
     end
 
+    def links_from_posts(stream)
+      links = []
+      stream['data'].each do |post|
+        extract_links(post).each {|l| links << l}
+      end
+      links.uniq!
+      links
+    end
+
+    def all_but_me usernames
+      arr = usernames.select {|user| user != 'me'}
+      at(arr)
+    end
+
     private
 
     def def_str(word, reg_split)
@@ -444,11 +502,9 @@ module Ayadn
     end
 
     def build_users_array(list)
-      users_list = []
-      list.each do |key, value|
-        users_list << {:username => value[0], :name => value[1], :you_follow => value[2], :follows_you => value[3], :id => key}
+      list.map do |key, value|
+        {:username => value[0], :name => value[1], :you_follow => value[2], :follows_you => value[3], :id => key}
       end
-      users_list
     end
 
     def extract_checkins(post)

data/spec/unit/view_spec.rb

@@ -100,20 +100,4 @@ describe Ayadn::View do
     end
   end
 
-  # let(:followers) { JSON.parse(File.read("spec/mock/fwr_@ayadn.json")) }
-
-  # describe "#show_list_followers" do
-  #   it "outputs the list of followers" do
-  #     list = Ayadn::Workers.extract_users(followers[0])
-  #     printed = capture_stdout do
-  #       Ayadn::View.new.show_list_followers(list, '@ayadn')
-  #     end
-  #     expect(printed).to include "@ericd"
-  #     expect(printed).to include "Nicolas Maumont"
-  #   end
-  # end
-
-
-
-
 end

data/spec/unit/workers_spec.rb

@@ -17,6 +17,7 @@ describe Ayadn::Workers do
     Ayadn::Logs.stub(:rec).and_return("logged")
     Ayadn::Databases.stub(:blacklist).and_return("blacklist")
     Ayadn::Databases.stub(:users).and_return("users")
+    @workers = Ayadn::Workers.new
   end
 
   let(:data) { JSON.parse(File.read("spec/mock/stream.json")) }
@@ -25,7 +26,7 @@ describe Ayadn::Workers do
 
   describe "#build_posts" do
     it "builds posts hash from stream" do
-      posts = Ayadn::Workers.new.build_posts(data['data'])
+      posts = @workers.build_posts(data['data'])
       expect(posts.length).to eq 10
       expect(posts[23187363][:name]).to eq 'App.net Staff'
       expect(posts[23184500][:username]).to eq 'wired'
@@ -44,7 +45,7 @@ describe Ayadn::Workers do
       expect(posts[23187443].length).to eq 33
     end
     it "gets oembed link from checkins post" do
-      posts = Ayadn::Workers.new.build_posts(checkins['data'])
+      posts = @workers.build_posts(checkins['data'])
       expect(posts[27101186][:links]).to eq ["https://photos.app.net/27101186/1"]
       expect(posts[27080492][:links]).to eq ["http://sprintr.co/27080492"]
       expect(posts[27073989][:links]).to eq ["http://pic.favd.net/27073989", "https://photos.app.net/27073989/1"]
@@ -53,21 +54,21 @@ describe Ayadn::Workers do
 
   describe "#extract_hashtags" do
     it "extracts hashtags" do
-      tags = Ayadn::Workers.new.extract_hashtags(data['data'][0])
+      tags = @workers.extract_hashtags(data['data'][0])
       expect(tags).to eq ['photography']
     end
   end
 
   describe "#extract_links" do
     it "extracts links" do
-      links = Ayadn::Workers.new.extract_links(data['data'][0])
+      links = @workers.extract_links(data['data'][0])
       expect(links).to eq ['http://feed.500px.com/~r/500px-best/~3/c2tMPEJVf6I/61517259']
     end
   end
 
   describe "#extract_checkins" do
     it "extracts checkins" do
-      posts = Ayadn::Workers.new.build_posts(checkins['data'])
+      posts = @workers.build_posts(checkins['data'])
       expect(posts.length).to eq 10
       expect(posts[27101186][:has_checkins]).to be true
       expect(posts[27101186][:checkins][:name]).to eq "Hobbs State Park"
@@ -86,7 +87,7 @@ describe Ayadn::Workers do
   # describe "#build_followers_list" do
   #   it 'builds the followers table list' do
   #     printed = capture_stdout do
-  #       puts Ayadn::Workers.new.build_followers_list(list, "@test")
+  #       puts @workers.build_followers_list(list, "@test")
   #     end
   #     expect(printed).to include "@test"
   #     expect(printed).to include "@bond"
@@ -97,7 +98,7 @@ describe Ayadn::Workers do
   # describe "#build_followings_list" do
   #   it 'builds the followings table list' do
   #     printed = capture_stdout do
-  #       puts Ayadn::Workers.new.build_followings_list(list, "@test")
+  #       puts @workers.build_followings_list(list, "@test")
   #     end
   #     #expect(printed).to include "+~~~~"
   #     expect(printed).to include "@test"
@@ -109,7 +110,7 @@ describe Ayadn::Workers do
   # describe "#build_muted_list" do
   #   it 'builds the muted table list' do
   #     printed = capture_stdout do
-  #       puts Ayadn::Workers.new.build_muted_list(list)
+  #       puts @workers.build_muted_list(list)
   #     end
   #     #expect(printed).to include "+----"
   #     expect(printed).to include "@bond"
@@ -120,7 +121,7 @@ describe Ayadn::Workers do
   # describe "#build_blocked_list" do
   #   it 'builds the blocked table list' do
   #     printed = capture_stdout do
-  #       puts Ayadn::Workers.new.build_blocked_list(list)
+  #       puts @workers.build_blocked_list(list)
   #     end
   #     #expect(printed).to include "+----"
   #     expect(printed).to include "@bond"
@@ -128,19 +129,19 @@ describe Ayadn::Workers do
   #   end
   # end
 
-  describe ".add_arobase_if_missing" do
+  describe "#add_arobase_if_missing" do
     it 'adds @ to username' do
-      expect(Ayadn::Workers.add_arobase_if_missing(["user"])).to eq "@user"
+      expect(@workers.add_arobase_if_missing(["user"])).to eq "@user"
     end
     it 'does nothing to @username' do
-      expect(Ayadn::Workers.add_arobase_if_missing(["@user"])).to eq "@user"
+      expect(@workers.add_arobase_if_missing(["@user"])).to eq "@user"
     end
   end
 
-  describe ".remove_arobase_if_present" do
+  describe "#remove_arobase_if_present" do
     it "removes @ from username" do
-      expect(Ayadn::Workers.remove_arobase_if_present(["@user"])).to eq ["user"]
-      expect(Ayadn::Workers.remove_arobase_if_present(["user"])).to eq ["user"]
+      expect(@workers.remove_arobase_if_present(["@user"])).to eq ["user"]
+      expect(@workers.remove_arobase_if_present(["user"])).to eq ["user"]
     end
   end
 
@@ -148,7 +149,7 @@ describe Ayadn::Workers do
     it "colorizes mentions and hashtags" do
       text = regex_post['data']['text']
       mentions = regex_post['data']['entities']['mentions']
-      expect(Ayadn::Workers.new.colorize_text(text, mentions, ['false', 'true', 'test', 'regex'])).to eq "\e[36m#test\e[0m \e[36m#regex\e[0m\n@aya_tests's \e[36m#true\e[0m\n(@aya_tests) \e[36m#true\e[0m\n@AyA_TeSts \e[36m#true\e[0m\n@aya_test \e[36m#false\e[0m\naya@aya_tests.yolo \e[36m#false\e[0m\n-@aya_tests:ohai! \e[36m#true\e[0m\ntext,@aya_tests,txt \e[36m#true\e[0m"
+      expect(@workers.colorize_text(text, mentions, ['false', 'true', 'test', 'regex'])).to eq "\e[36m#test\e[0m \e[36m#regex\e[0m\n@aya_tests's \e[36m#true\e[0m\n(@aya_tests) \e[36m#true\e[0m\n@AyA_TeSts \e[36m#true\e[0m\n@aya_test \e[36m#false\e[0m\naya@aya_tests.yolo \e[36m#false\e[0m\n-@aya_tests:ohai! \e[36m#true\e[0m\ntext,@aya_tests,txt \e[36m#true\e[0m"
     end
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ayadn
 version: !ruby/object:Gem::Version
-  version: 1.5.1
+  version: 1.6.0
 platform: ruby
 authors:
 - Eric Dejonckheere
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-25 00:00:00.000000000 Z
+date: 2014-08-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -108,6 +108,34 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.4'
+- !ruby/object:Gem::Dependency
+  name: spotlite
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.8'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.8'
+- !ruby/object:Gem::Dependency
+  name: tvdb_party
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.7'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.7'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -229,9 +257,11 @@ files:
 - doc/13-bookmark.md
 - doc/14-set.md
 - doc/15-nowplaying.md
-- doc/16-contact.md
-- doc/17-shortcuts.md
-- doc/18-examples.md
+- doc/16-movie.md
+- doc/17-tvshow.md
+- doc/18-contact.md
+- doc/19-examples.md
+- doc/shortcuts.md
 - lib/ayadn.rb
 - lib/ayadn/action.rb
 - lib/ayadn/alias.rb
@@ -239,6 +269,7 @@ files:
 - lib/ayadn/app.rb
 - lib/ayadn/authorize.rb
 - lib/ayadn/blacklist.rb
+- lib/ayadn/check.rb
 - lib/ayadn/cnx.rb
 - lib/ayadn/databases.rb
 - lib/ayadn/debug.rb
@@ -250,13 +281,18 @@ files:
 - lib/ayadn/logs.rb
 - lib/ayadn/mark.rb
 - lib/ayadn/nicerank.rb
+- lib/ayadn/nowplaying.rb
+- lib/ayadn/nowwatching.rb
 - lib/ayadn/pinboard.rb
 - lib/ayadn/post.rb
 - lib/ayadn/scroll.rb
+- lib/ayadn/search.rb
 - lib/ayadn/set.rb
 - lib/ayadn/settings.rb
 - lib/ayadn/status.rb
+- lib/ayadn/stream.rb
 - lib/ayadn/switch.rb
+- lib/ayadn/tvshow.rb
 - lib/ayadn/version.rb
 - lib/ayadn/view.rb
 - lib/ayadn/workers.rb