ayadn 1.2.7 → 1.2.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4da689dcf2f0af0a1f79e9a36812f21224a5dc4d
-  data.tar.gz: 2b8142d137821e710c2347f34e9ef04517f85bc8
+  metadata.gz: a05ff15391beac67e7ee90c71472a52902a98018
+  data.tar.gz: bdb58c558b8e16a55e5d1d60db39c4bf3f26a6b4
 SHA512:
-  metadata.gz: 0e25eb614812f284648dc494fcd36c5ab9850e2e298fa1ef25307474f2e9d041b8307d333cef286a5b3d5540d80dc5937accde52f748eb0c77b34e9bd93e889a
-  data.tar.gz: 3c9da18ff39c2652a977a89b651b9bb08f7e6e3dd9823d2870c7fe5d86f61c3dfdc2a23d504cd46570fdff84edc1a63f115e86c9190819664d9ab5e125491bce
+  metadata.gz: 7158eb289115d85c4dfbb31e7f32de9f268f82f418cf188e6c1f38ea545117fc4cdd0f18d96aeb7b37414fa2fada0191b13bb0fdc062ddafa2d250a83d6a18ff
+  data.tar.gz: f71e3a75b986786b21810b399c4975bd337a614e6eec9ada372c7f0b09ae47c247c4d015e9f1a7cb6a675d3b6ab4dea1c38bd0e8d166fbc0e5bb30a3ee949b90

data/CHANGELOG.md

@@ -1,6 +1,15 @@
+# 1.2.8 - 'Hans'
+
+- No more Ruby 1.9.3
+- Search for users: returns a detailed view of users containing word(s) in their bio/description
+- Search for annotations: returns posts containing a specific annotation
+- Search for channels containing word(s) in their description
+- Search for words in messages (PMs)
+- Better display of the starred and replied_to symbols
+
 # 1.2.7 - 'Roman'
 
-- Fix the bug in Switch
+- Conform remove_arobase in Switch
 
 # 1.2.6 - 'Saket'
 

data/ayadn.gemspec

@@ -20,22 +20,22 @@ Gem::Specification.new do |spec|
   spec.executables   = %w{ayadn}
   spec.require_paths = ["lib"]
 
-  spec.required_ruby_version = '>= 1.9.3'
+  spec.required_ruby_version = '>= 2.0.0'
 
-  spec.add_dependency "thor", ">= 0.18"
-  spec.add_dependency "rest-client", ">= 1.6"
-  spec.add_dependency "rainbow", ">= 2.0"
-  spec.add_dependency "terminal-table", ">= 1.4"
-  spec.add_dependency "daybreak", ">= 0.3"
+  spec.add_dependency "thor", "~> 0.18"
+  spec.add_dependency "rest-client", "~> 1.6"
+  spec.add_dependency "rainbow", "~> 2.0"
+  spec.add_dependency "terminal-table", "~> 1.4"
+  spec.add_dependency "daybreak", "~> 0.3"
   spec.add_dependency "pinboard"
 
-  spec.add_development_dependency "bundler", ">= 1.5"
-  spec.add_development_dependency "rake", ">= 10.1"
-  spec.add_development_dependency "rspec", ">= 2.14"
-  spec.add_development_dependency "rb-fsevent", ">= 0.9"
-  spec.add_development_dependency "guard-rspec", ">= 4.2"
+  spec.add_development_dependency "bundler", "~> 1.5"
+  spec.add_development_dependency "rake", "~> 10.1"
+  spec.add_development_dependency "rspec", "~> 2.14"
+  spec.add_development_dependency "rb-fsevent", "~> 0.9"
+  spec.add_development_dependency "guard-rspec", "~> 4.2"
   spec.add_development_dependency "coveralls"
-  #spec.add_development_dependency "fakefs", ">= 0.5"
+  #spec.add_development_dependency "fakefs", "~> 0.5"
 
   spec.post_install_message = "Thank you for installing Ayadn!"
 end

data/lib/ayadn/action.rb

@@ -439,12 +439,38 @@ module Ayadn
     def search(words, options)
       begin
         doing(options)
-        stream = @api.get_search(words, options)
+        stream = if options[:users]
+          @api.search_users words, options
+        elsif options[:annotations]
+          @api.search_annotations words, options
+        elsif options[:channels]
+          splitted = splitter_all words
+          @api.search_channels splitted.join(','), options
+        elsif options[:messages]
+          words = words.split(',')
+          channel_id = get_channel_id_from_alias(words[0])
+          words.shift
+          splitted = splitter_all words.join(' ')
+          @api.search_messages channel_id, splitted.join(','), options
+        else
+          splitted = splitter_all words
+          @api.get_search splitted.join(','), options
+        end
         no_data('search') if stream['data'].empty?
-        if options[:extract]
-          view_all_search_links(stream, words)
+        if options[:users]
+          stream['data'].sort_by! {|obj| obj['counts']['followers']}
+          stream['data'].each do |obj|
+            puts "----------\n\n\n"
+            @view.show_userinfos(obj, nil)
+          end
+        elsif options[:channels]
+          @view.show_channels stream, options
         else
-          render_view(stream, options)
+          if options[:extract]
+            view_all_search_links(stream, words)
+          else
+            render_view(stream, options)
+          end
         end
       rescue => e
         Errors.global_error("action/search", [words, options], e)
@@ -904,6 +930,10 @@ module Ayadn
 
     private
 
+    def splitter_all words
+      [words].collect {|w| w.split(' ')}
+    end
+
     def get_original_id(post_id, resp)
       if resp['data']['repost_of']
         puts Status.redirecting

data/lib/ayadn/api.rb

@@ -89,6 +89,22 @@ module Ayadn
       get_parsed_response(Endpoints.new.search(words, options))
     end
 
+    def search_users words, options
+      get_parsed_response(Endpoints.new.search_users(words, options))
+    end
+
+    def search_annotations words, options
+      get_parsed_response(Endpoints.new.search_annotations(words, options))
+    end
+
+    def search_channels words, options
+      get_parsed_response(Endpoints.new.search_channels(words, options))
+    end
+
+    def search_messages channel_id, words, options
+      get_parsed_response(Endpoints.new.search_messages(channel_id, words, options))
+    end
+
     def get_followings(username)
       build_list(username, :followings)
     end

data/lib/ayadn/app.rb

@@ -194,6 +194,10 @@ module Ayadn
     option :index, aliases: "-i", type: :boolean, desc: Descriptions.options_index
     option :raw, aliases: "-x", type: :boolean, desc: Descriptions.options_raw
     option :extract, aliases: "-e", type: :boolean, desc: Descriptions.options_extract
+    option :messages, type: :boolean, desc: 'Search for WORD(S) in messages, including PMs.'
+    option :users, type: :boolean, desc: 'Search for App.net users by searching WORD(S) in their bio/description.'
+    option :channels, type: :boolean, desc: 'Search for App.net channels by searching WORD(S) in their description.'
+    option :annotations, type: :boolean, desc: 'Search for posts containing a specific App.net annotation.'
     def search(*words)
       Action.new.search(words.join(","), options)
     end

data/lib/ayadn/descriptions.rb

@@ -410,23 +410,61 @@ module Ayadn
       <<-USAGE
       Show recents posts containing WORD(S).
 
-      Basic usage:
+      # Basic usage
 
       ayadn search screenshot iterm
 
-      ayadn -s screenshot iterm
+      ayadn search screenshot iterm
 
       Retrieves only 5 posts:
 
-      ayadn -s -c5 screenshot iterm
+      ayadn search -c5 screenshot iterm
 
       Shows index instead of post numbers:
 
-      ayadn -s -i screenshot iterm
+      ayadn search -i screenshot iterm
 
       Shows index and retrieves 30 posts:
 
-      ayadn -s -i -c30 screenshot iterm
+      ayadn search -i -c30 screenshot iterm
+
+      # Advanced usage
+
+      ## Messages
+
+      Search for WORD(S) in messages, including PMs.
+
+      You have to specify a channel id (or an alias).
+
+      Usage:
+
+      ayadn search --messages 33642 ipad movies
+
+      ayadn search --messages my_alias ipad movies
+
+      ## Users
+
+      Search for App.net users by searching WORD(S) in their bio/description.
+
+      Usage:
+
+      ayadn search --users anime
+
+      ## Channels
+
+      Search for App.net channels by searching WORD(S) in their description.
+
+      Usage:
+
+      ayadn search --channels movies
+
+      ## Annotations
+
+      Search for posts containing a specific App.net annotation.
+
+      Usage:
+
+      ayadn search --annotations net.app.core.crosspost
       \n\n
       USAGE
     end

data/lib/ayadn/endpoints.rb

@@ -163,6 +163,38 @@ module Ayadn
       "#{@posts_url}search?text=#{words}&access_token=#{Settings.user_token}#{@options_list}"
     end
 
+    def search_users words, options
+      if options[:count]
+        @options_list = API.build_query(options)
+      else
+        @options_list = API.build_query({count: Settings.options[:counts][:search]})
+      end
+      "#{@users_url}search?q=#{words}&access_token=#{Settings.user_token}#{@options_list}"
+    end
+
+    def search_annotations anno, options
+      if options[:count]
+        @options_list = API.build_query(options)
+      else
+        @options_list = API.build_query({count: Settings.options[:counts][:search]})
+      end
+      "#{@posts_url}search?annotation_types=#{anno}&access_token=#{Settings.user_token}#{@options_list}"
+    end
+
+    def search_messages channel_id, words, options
+      if options[:count]
+        @options_list = API.build_query(options)
+      else
+        @options_list = API.build_query({count: Settings.options[:counts][:search]})
+      end
+      "#{@channels_url}messages/search?query=#{words}&channel_ids=#{channel_id}&access_token=#{Settings.user_token}#{@options_list}"
+    end
+
+    def search_channels words, options
+        @options_list = API.build_query({count: Settings.options[:counts][:search]})
+      "#{@channels_url}search?q=#{words}&order=popularity&access_token=#{Settings.user_token}#{@options_list}"
+    end
+
     def user(username)
       "#{@users_url}#{username}?access_token=#{Settings.user_token}&include_user_annotations=1"
     end

data/lib/ayadn/post.rb

@@ -1,3 +1,4 @@
+# encoding: utf-8
 module Ayadn
   class Post
 

data/lib/ayadn/status.rb

@@ -14,10 +14,10 @@ module Ayadn
       "Posting to ADN...\n\n".inverse
     end
     def self.deleting_post(post_id)
-      "\nDeleting post #{post_id}".inverse
+      "\nDeleting post #{post_id}\n".inverse
     end
     def self.deleting_message(message_id)
-      "\nDeleting message #{message_id}".inverse
+      "\nDeleting message #{message_id}\n".inverse
     end
     def self.unfollowing(username)
       "\nUnfollowing #{username}".inverse

data/lib/ayadn/version.rb

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

data/lib/ayadn/view.rb

@@ -182,9 +182,9 @@ module Ayadn
 
     end
 
-    def show_channels(resp)
+    def show_channels(resp, options = {})
       view = ""
-      bucket = @workers.build_channels(resp['data'])
+      bucket = @workers.build_channels(resp['data'], options)
       bucket.reverse.each do |ch|
         view << "\n"
         ch_alias = false
@@ -211,9 +211,11 @@ module Ayadn
           # + (#{ch.owner['name']}) if ch.owner['name']
           view << "\n"
         end
-        view << "Writers: ".color(:cyan)
-        view << "#{ch.writers}".color(Settings.options[:colors][:name])
-        view << "\n"
+        unless options[:channels] # unless the request comes from Search
+          view << "Writers: ".color(:cyan)
+          view << "#{ch.writers}".color(Settings.options[:colors][:name])
+          view << "\n"
+        end
         view << "Type: ".color(:cyan)
         view << "#{ch.type}".color(Settings.options[:colors][:id])
         view << "\n"
@@ -258,7 +260,7 @@ module Ayadn
         end
         view << "\n\n"
       end
-      view << "\nYour account is currently linked to #{bucket.length} channels.\n\n".color(:green)
+      view << "\nYour account is currently linked to #{bucket.length} channels.\n\n".color(:green) unless options[:channels]
       puts view
     end
 
@@ -460,7 +462,7 @@ module Ayadn
         header << content[:name].color(Settings.options[:colors][:name])
       end
 
-      if Settings.options[:timeline][:show_nicerank] && content[:nicerank]
+      if Settings.options[:timeline][:show_nicerank] == true && content[:nicerank]
         if Settings.options[:nicerank][:filter] == true
           header << " "
           header << "[#{content[:nicerank]}]".color(Settings.options[:colors][:nicerank])
@@ -478,8 +480,8 @@ module Ayadn
       if Settings.options[:timeline][:show_symbols]
         header << " <".color(Settings.options[:colors][:symbols]) if content[:is_reply]
         header << " #{content[:num_stars]}*".color(Settings.options[:colors][:symbols]) if content[:is_starred]
-        header << " >".color(Settings.options[:colors][:symbols]) if content[:num_replies] > 0
         header << " #{content[:num_reposts]}x".color(Settings.options[:colors][:symbols]) if content[:num_reposts] > 0
+        header << " >".color(Settings.options[:colors][:symbols]) if content[:num_replies] > 0
       end
       header << "\n"
     end

data/lib/ayadn/workers.rb

@@ -224,11 +224,11 @@ module Ayadn
       tags
     end
 
-    def build_channels(data)
+    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)
+      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]
       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|
         unless ch['writers']['user_ids'].empty?
@@ -294,9 +294,9 @@ module Ayadn
 
     def self.remove_arobase_if_present args
       args.map! do |username|
-        username = username.chars
-        username.shift if username.first == "@"
-        username.join
+        temp = username.chars
+        temp.shift if temp.first == "@"
+        temp.join
       end
       args
     end

data/spec/unit/workers_spec.rb

@@ -140,8 +140,8 @@ describe Ayadn::Workers 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(Ayadn::Workers.remove_arobase_if_present(["@user"])).to eq ["user"]
+      expect(Ayadn::Workers.remove_arobase_if_present(["user"])).to eq ["user"]
     end
   end
 

metadata

@@ -1,83 +1,83 @@
 --- !ruby/object:Gem::Specification
 name: ayadn
 version: !ruby/object:Gem::Version
-  version: 1.2.7
+  version: 1.2.8
 platform: ruby
 authors:
 - Eric Dejonckheere
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-26 00:00:00.000000000 Z
+date: 2014-05-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.18'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.18'
 - !ruby/object:Gem::Dependency
   name: rest-client
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.6'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.6'
 - !ruby/object:Gem::Dependency
   name: rainbow
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.0'
 - !ruby/object:Gem::Dependency
   name: terminal-table
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.4'
 - !ruby/object:Gem::Dependency
   name: daybreak
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.3'
 - !ruby/object:Gem::Dependency
@@ -98,70 +98,70 @@ dependencies:
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.5'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.5'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '10.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '10.1'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.14'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.14'
 - !ruby/object:Gem::Dependency
   name: rb-fsevent
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.9'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.9'
 - !ruby/object:Gem::Dependency
   name: guard-rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '4.2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '4.2'
 - !ruby/object:Gem::Dependency
@@ -267,7 +267,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 1.9.3
+      version: 2.0.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="