ex_twitter 0.2.5 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 72702a9c1b2bb654a8bb4cd89b085bbf06d5d402
-  data.tar.gz: 86a8538416160d8d4c09df7d4230c7ee0b6f75ed
+  metadata.gz: 29d8daa0330612db348fe30bb6b1cbfa6c0885ff
+  data.tar.gz: c602c974e8090a18c2f097aa8e42f0f1d9409f11
 SHA512:
-  metadata.gz: 1bfd7a862ef8db039dd4228423db1959a7faa9363735d34a8af7c55a5c4cee7b9d574ad6aba9f039dbd8795ee477373a80b5ca687ec0f547cb68f52f6d8b5de7
-  data.tar.gz: 537baec7bfa7f0afa697cb698623669b5ca3b0c26d1ab220984c3700ffb9fb517d15ba91e60187b0b119f36f612a995a674f8ee7f8a36012dba52cb5b2d3d7ec
+  metadata.gz: bd36a6d3a5db84ea97bf6340a7191bb73a88cc974f96f2da32be73b3e0a8b289bfac3472af1a39ffc0fe80c085ff5f39ca1e6bc975ddf9c7eb4ba724ca17cc34
+  data.tar.gz: a776361322fb184b4527bc6a9a28ec478911a68d5011afd81a6a5a64f03d9db9b949dff9b561108c4be0e868b8bc7c4c73c98a23193c54a7982647a20d58a547

data/ex_twitter.gemspec

@@ -21,5 +21,5 @@ Gem::Specification.new do |spec|
   spec.require_paths = %w[lib]
   spec.summary = spec.description
   spec.test_files = Dir.glob('spec/**/*')
-  spec.version = '0.2.5'
+  spec.version = '0.3.0'
 end

data/lib/ex_twitter/client.rb

@@ -135,64 +135,5 @@ module ExTwitter
         twitter_addiction_series(times)
       ]
     end
-
-
-    def calc_scores_from_users(users, options)
-      min = options.has_key?(:min) ? options[:min] : 0
-      max = options.has_key?(:max) ? options[:max] : 1000
-      users.each_with_object(Hash.new(0)) { |u, memo| memo[u.id] += 1 }.
-        select { |_k, v| min <= v && v <= max }.
-        sort_by { |_, v| -v }.to_h
-    end
-
-    def calc_scores_from_tweets(tweets, options = {})
-      calc_scores_from_users(tweets.map { |t| t.user }, options)
-    end
-
-    def select_favoriting_from_favs(favs, options = {})
-      return [] if favs.empty?
-      uids = calc_scores_from_tweets(favs)
-      result = uids.map { |uid, score| f = favs.
-        find { |f| f.user.id.to_i == uid.to_i }; Array.new(score, f) }.flatten.map { |f| f.user }
-      (options.has_key?(:uniq) && !options[:uniq]) ? result : result.uniq { |u| u.id }
-    end
-
-    def favoriting(user, options= {})
-      favs = options.has_key?(:favorites) ? options.delete(:favorites) : favorites(user, options)
-      select_favoriting_from_favs(favs, options)
-    rescue => e
-      logger.warn "#{__method__} #{user.inspect} #{e.class} #{e.message}"
-      raise e
-    end
-
-    def favorited_by(user)
-    end
-
-    def close_friends(_uid, options = {})
-      min = options.has_key?(:min) ? options[:min] : 0
-      max = options.has_key?(:max) ? options[:max] : 1000
-      uid_i = _uid.to_i
-      _replying = options.has_key?(:replying) ? options.delete(:replying) : replying(uid_i, options)
-      _replied = options.has_key?(:replied) ? options.delete(:replied) : replied(uid_i, options)
-      _favoriting = options.has_key?(:favoriting) ? options.delete(:favoriting) : favoriting(uid_i, options)
-
-      min_max = {min: min, max: max}
-      _users = _replying + _replied + _favoriting
-      return [] if _users.empty?
-
-      scores = calc_scores_from_users(_users, min_max)
-      replying_scores = calc_scores_from_users(_replying, min_max)
-      replied_scores = calc_scores_from_users(_replied, min_max)
-      favoriting_scores = calc_scores_from_users(_favoriting, min_max)
-
-      scores.keys.map { |uid| _users.find { |u| u.id.to_i == uid.to_i } }.
-        map do |u|
-        u[:score] = scores[u.id]
-        u[:replying_score] = replying_scores[u.id]
-        u[:replied_score] = replied_scores[u.id]
-        u[:favoriting_score] = favoriting_scores[u.id]
-        u
-      end
-    end
   end
 end

data/lib/ex_twitter/existing_api.rb

@@ -68,6 +68,7 @@ module ExTwitter
 
     # use compact, not use sort and uniq
     # specify reduce: false to use tweet for inactive_*
+    # TODO Perhaps `old_users` automatically merges result...
     def users(*args)
       options = args.extract_options!
       options[:reduce] = false
@@ -83,14 +84,11 @@ module ExTwitter
       end
 
       processed_users.sort_by{|p| p[:i] }.map{|p| p[:users] }.flatten.compact
-    rescue => e # debug
-      logger.warn "#{__method__}: #{args.inspect} #{e.class} #{e.message}"
-      raise e
     end
 
     def home_timeline(*args)
       options = {count: 200, include_rts: true, call_limit: 3}.merge(args.extract_options!)
-      fetch_cache_or_call_api(__method__, user.screen_name, options) {
+      fetch_cache_or_call_api(__method__, user.id, options) {
         collect_with_max_id("old_#{__method__}", options)
       }
     end
@@ -105,7 +103,7 @@ module ExTwitter
 
     def mentions_timeline(*args)
       options = {count: 200, include_rts: true, call_limit: 1}.merge(args.extract_options!)
-      fetch_cache_or_call_api(__method__, user.screen_name, options) {
+      fetch_cache_or_call_api(__method__, user.id, options) {
         collect_with_max_id("old_#{__method__}", options)
       }
     end

data/lib/ex_twitter/new_api.rb

@@ -110,11 +110,10 @@ module ExTwitter
       end
     end
 
-    def _extract_screen_names(tweets, options = {})
-      result = tweets.map do |t|
+    def _extract_screen_names(tweets)
+      tweets.map do |t|
         $1 if t.text =~ /^(?:\.)?@(\w+)( |\W)/ # include statuses starts with .
       end.compact
-      (options.has_key?(:uniq) && !options[:uniq]) ? result : result.uniq
     end
 
     # users which specified user is replying
@@ -123,7 +122,7 @@ module ExTwitter
       options = args.extract_options!
       tweets =
         if args.empty?
-          user_timeline(user.screen_name, options)
+          user_timeline(options)
         elsif uid_or_screen_name?(args[0])
           user_timeline(args[0], options)
         elsif args[0].kind_of?(Array) && args[0].all? { |t| t.respond_to?(:text) }
@@ -131,8 +130,14 @@ module ExTwitter
         else
           raise
         end
-      screen_names = _extract_screen_names(tweets, options)
-      users(screen_names, {super_operation: __method__}.merge(options))
+
+      screen_names = _extract_screen_names(tweets)
+      result = users(screen_names, {super_operation: __method__}.merge(options))
+      if options.has_key?(:uniq) && !options[:uniq]
+        screen_names.map { |sn| result.find { |r| r.screen_name == sn } }
+      else
+        result.uniq { |r| r.id }
+      end
     rescue Twitter::Error::NotFound => e
       e.message == 'No user matches for specified terms.' ? [] : (raise e)
     rescue => e
@@ -140,15 +145,14 @@ module ExTwitter
       raise e
     end
 
-    def _extract_uids(tweets, options)
-      result = tweets.map do |t|
+    def _extract_uids(tweets)
+      tweets.map do |t|
         t.user.id.to_i if t.text =~ /^(?:\.)?@(\w+)( |\W)/ # include statuses starts with .
       end.compact
-      (options.has_key?(:uniq) && !options[:uniq]) ? result : result.uniq
     end
 
-    def _extract_users(tweets, uids, options = {})
-      uids.map { |u| tweets.find { |t| t.user.id.to_i == u.to_i } }.map { |t| t.user }
+    def _extract_users(tweets, uids)
+      uids.map { |uid| tweets.find { |t| t.user.id.to_i == uid.to_i } }.map { |t| t.user }.compact
     end
 
     # users which specified user is replied
@@ -156,13 +160,61 @@ module ExTwitter
     def replied(*args)
       options = args.extract_options!
 
-      if args.empty? || (uid_or_screen_name?(args[0]) && authenticating_user?(args[0]))
-        mentions_timeline.uniq { |m| m.user.id }.map { |m| m.user }
+      result =
+        if args.empty? || (uid_or_screen_name?(args[0]) && authenticating_user?(args[0]))
+          mentions_timeline.map { |m| m.user }
+        else
+          searched_result = search('@' + user(args[0]).screen_name, options)
+          uids = _extract_uids(searched_result)
+          _extract_users(searched_result, uids)
+        end
+
+      if options.has_key?(:uniq) && !options[:uniq]
+        result
+      else
+        result.uniq { |r| r.id }
+      end
+    end
+
+    def _count_users_with_two_sided_threshold(users, options)
+      min = options.has_key?(:min) ? options[:min] : 0
+      max = options.has_key?(:max) ? options[:max] : 1000
+      users.each_with_object(Hash.new(0)) { |u, memo| memo[u.id] += 1 }.
+        select { |_k, v| min <= v && v <= max }.
+        sort_by { |_, v| -v }.to_h
+    end
+
+    def _extract_favorite_users(favs, options = {})
+      counted_value = _count_users_with_two_sided_threshold(favs.map { |t| t.user }, options)
+      counted_value.map do |uid, cnt|
+        fav = favs.find { |f| f.user.id.to_i == uid.to_i }
+        Array.new(cnt, fav.user)
+      end.flatten
+    end
+
+    def favoriting(*args)
+      options = args.extract_options!
+
+      favs =
+        if args.empty?
+          favorites(options)
+        elsif uid_or_screen_name?(args[0])
+          favorites(args[0], options)
+        elsif args[0].kind_of?(Array) && args[0].all? { |t| t.respond_to?(:text) }
+          args[0]
+        else
+          raise
+        end
+
+      result = _extract_favorite_users(favs, options)
+      if options.has_key?(:uniq) && !options[:uniq]
+        result
       else
-        searched_result = search('@' + user(args[0]).screen_name, options)
-        uids = _extract_uids(searched_result, options)
-        _extract_users(searched_result, uids, options)
+        result.uniq { |r| r.id }
       end
+    rescue => e
+      logger.warn "#{__method__} #{user.inspect} #{e.class} #{e.message}"
+      raise e
     end
 
     def _extract_inactive_users(users, options = {})
@@ -177,6 +229,45 @@ module ExTwitter
       end
     end
 
+    def favorited_by(*args)
+    end
+
+    def close_friends(*args)
+      options = {uniq: false}.merge(args.extract_options!)
+      min_max = {
+        min: options.has_key?(:min) ? options.delete(:min) : 0,
+        max: options.has_key?(:max) ? options.delete(:max) : 1000
+      }
+
+      _replying, _replied, _favoriting =
+        if args.empty?
+          [replying(options), replied(options), favoriting(options)]
+        elsif uid_or_screen_name?(args[0])
+          [replying(args[0], options), replied(args[0], options), favoriting(args[0], options)]
+        elsif (m_names = %i(replying replied favoriting)).all? { |m_name| args[0].respond_to?(m_name) }
+          m_names.map { |mn| args[0].send(mn) }
+        else
+          raise
+        end
+
+      _users = _replying + _replied + _favoriting
+      return [] if _users.empty?
+
+      scores = _count_users_with_two_sided_threshold(_users, min_max)
+      replying_scores = _count_users_with_two_sided_threshold(_replying, min_max)
+      replied_scores = _count_users_with_two_sided_threshold(_replied, min_max)
+      favoriting_scores = _count_users_with_two_sided_threshold(_favoriting, min_max)
+
+      scores.keys.map { |uid| _users.find { |u| u.id.to_i == uid.to_i } }.
+        map do |u|
+        u[:score] = scores[u.id]
+        u[:replying_score] = replying_scores[u.id]
+        u[:replied_score] = replied_scores[u.id]
+        u[:favoriting_score] = favoriting_scores[u.id]
+        u
+      end
+    end
+
     def inactive_friends(user = nil)
       if user.blank?
         _extract_inactive_users(friends_parallelly, authorized: true)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ex_twitter
 version: !ruby/object:Gem::Version
-  version: 0.2.5
+  version: 0.3.0
 platform: ruby
 authors:
 - Shinohara Teruki