twitter_friendly 0.2.1 → 0.3.0

data/lib/twitter_friendly/rest/tweets.rb

@@ -4,9 +4,18 @@ module TwitterFriendly
 
       MAX_IDS_PER_REQUEST = 100
 
+      # @return [Hash]
+      #
+      # @overload retweeters_ids(tweet, options = {})
+      #
+      # @param user [Integer, String] A Twitter user ID or screen name.
+      #
+      # @option options [Integer] :count The number of tweets to return per page, up to a maximum of 5000.
       def retweeters_ids(*args)
-        args << {count: MAX_IDS_PER_REQUEST}.merge(args.extract_options!)
-        fetch_resources_with_cursor(__method__, args)
+        # このメソッドではページングができない
+        options = {count: MAX_IDS_PER_REQUEST}.merge(args.extract_options!)
+        push_operations(options, __method__)
+        fetch_resources_with_cursor(__method__, args[0], options)
       end
     end
   end

data/lib/twitter_friendly/rest/users.rb

@@ -2,29 +2,67 @@ module TwitterFriendly
   module REST
     module Users
       def verify_credentials(options = {})
-        @twitter.send(__method__, {skip_status: true}.merge(options))&.to_hash
+        @twitter.verify_credentials({skip_status: true}.merge(options))&.to_hash
       end
 
-      def user?(*args)
-        @twitter.send(__method__, *args)
+      def user?(user, options = {})
+        @twitter.user?(user, options)
       end
 
       def user(*args)
-        @twitter.send(__method__, *args)&.to_hash
+        @twitter.user(*args)&.to_hash
       end
 
       MAX_USERS_PER_REQUEST = 100
 
       def users(values, options = {})
         if values.size <= MAX_USERS_PER_REQUEST
-          @twitter.send(__method__, values, options)&.compact&.map(&:to_hash)
+          key = CacheKey.gen(__method__, values, options.merge(hash: credentials_hash))
+
+          @cache.fetch(key, args: [__method__, options]) do
+            Instrumenter.perform_request(args: [__method__, super_operation: options[:super_operation]]) do
+              @twitter.send(__method__, values, options.except(:parallel, :super_operation, :recursive))&.compact&.map(&:to_hash)
+            end
+          end
         else
+          options[:recursive] = true
           _users(values, options)
         end
       end
 
       def blocked_ids(*args)
-        @twitter.send(__method__, *args)&.attrs&.fetch(:ids)
+        @twitter.blocked_ids(*args)&.attrs&.fetch(:ids)
+      end
+
+      module Instrumenter
+
+        module_function
+
+        # 他のメソッドと違い再帰的に呼ばれるため、全体をキャッシュすると、すべてを再帰的にキャッシュしてしまう。
+        # それを防ぐために、特別にここでキャッシュの処理を登録している。
+
+        def perform_request(options, &block)
+          payload = {operation: 'request', args: options[:args]}
+          ::ActiveSupport::Notifications.instrument('request.twitter_friendly', payload) { yield(payload) }
+        end
+      end
+
+      module Caching
+        %i(
+          users
+        ).each do |name|
+          define_method(name) do |*args, &block|
+            options = args.extract_options!
+            do_request = Proc.new { options.empty? ? super(*args, &block) : super(*args, options, &block) }
+
+            if options[:recursive]
+              do_request.call
+            else
+              TwitterFriendly::CachingAndLogging::Instrumenter.start_processing(name, options)
+              TwitterFriendly::CachingAndLogging::Instrumenter.complete_processing(name, options, &do_request)
+            end
+          end
+        end
       end
 
       private
@@ -40,7 +78,7 @@ module TwitterFriendly
           end.flatten
         else
           values.each_slice(MAX_USERS_PER_REQUEST).map do |targets|
-            @twitter.send(:users, targets, options)
+            users(targets, options)
           end
         end&.flatten&.compact&.map(&:to_hash)
       end

data/lib/twitter_friendly/rest/utils.rb

@@ -6,6 +6,12 @@ module TwitterFriendly
       def credentials_hash
         Digest::MD5.hexdigest(access_token + access_token_secret + consumer_key + consumer_secret)
       end
+
+      def push_operations(options, operation)
+        options[:super_operation] = [] unless options[:super_operation]
+        options[:super_operation] = [options[:super_operation]] unless options[:super_operation].is_a?(Array)
+        options[:super_operation].prepend operation
+      end
     end
   end
 end

data/lib/twitter_friendly/utils.rb

@@ -1,6 +1,19 @@
 module TwitterFriendly
-  class Utils
-    class << self
+  module Utils
+    def uid_or_screen_name?(object)
+      raise NotImplementedError.new("You must implement ##{__method__}.")
+      object.kind_of?(String) || object.kind_of?(Integer)
+    end
+
+    def authenticating_user?(target)
+      raise NotImplementedError.new("You must implement ##{__method__}.")
+      user.id.to_i == user(target).id.to_i
+    end
+
+    def authorized_user?(target)
+      raise NotImplementedError.new("You must implement ##{__method__}.")
+      target_user = user(target)
+      !target_user.protected? || friendship?(user.id.to_i, target_user.id.to_i)
     end
   end
 end

data/lib/twitter_friendly/version.rb

@@ -1,3 +1,3 @@
 module TwitterFriendly
-  VERSION = "0.2.1"
+  VERSION = "0.3.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: twitter_friendly
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.3.0
 platform: ruby
 authors:
 - ts-3156
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-01-08 00:00:00.000000000 Z
+date: 2019-01-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -180,7 +180,7 @@ files:
 - lib/twitter_friendly.rb
 - lib/twitter_friendly/cache.rb
 - lib/twitter_friendly/cache_key.rb
-- lib/twitter_friendly/caching.rb
+- lib/twitter_friendly/caching_and_logging.rb
 - lib/twitter_friendly/client.rb
 - lib/twitter_friendly/log_subscriber.rb
 - lib/twitter_friendly/logger.rb
@@ -188,6 +188,8 @@ files:
 - lib/twitter_friendly/rest/api.rb
 - lib/twitter_friendly/rest/base.rb
 - lib/twitter_friendly/rest/collector.rb
+- lib/twitter_friendly/rest/extension/clusters.rb
+- lib/twitter_friendly/rest/extension/timelines.rb
 - lib/twitter_friendly/rest/favorites.rb
 - lib/twitter_friendly/rest/friends_and_followers.rb
 - lib/twitter_friendly/rest/lists.rb

data/lib/twitter_friendly/caching.rb

@@ -1,86 +0,0 @@
-module TwitterFriendly
-  module Caching
-    %i(
-      verify_credentials
-      user?
-      user
-      users
-      blocked_ids
-      friendship?
-    ).each do |name|
-      define_method(name) do |*args|
-        options = args.extract_options!
-        Instrumenter.start_processing(name, options)
-
-        Instrumenter.complete_processing(name, options) do
-          do_request =
-              Proc.new {Instrumenter.perform_request(name, options) {options.empty? ? super(*args) : super(*args, options)}}
-
-          if Utils.cache_disabled?(options)
-            do_request.call
-          else
-            user = (name == :friendship?) ? args[0, 2] : args[0]
-            @cache.fetch(name, user, options.merge(args: [name, options], hash: credentials_hash), &do_request)
-          end
-        end
-      end
-    end
-
-    # これらのメソッドは、内部で呼ぶメソッドをキャッシュするため、
-    # 全体をキャッシュすることはない。
-    %i(
-      friend_ids
-      follower_ids
-      friends
-      followers
-      friend_ids_and_follower_ids
-      friends_and_followers
-      search
-      favorites
-      home_timeline
-      user_timeline
-      mentions_timeline
-      memberships
-      list_members
-      retweeters_ids
-    ).each do |name|
-      define_method(name) do |*args|
-        options = args.extract_options!
-        Instrumenter.start_processing(name, options)
-
-        Instrumenter.complete_processing(name, options) do
-          options.empty? ? super(*args) : super(*args, options)
-        end
-      end
-    end
-
-    module Instrumenter
-
-      module_function
-
-      def start_processing(operation, options)
-        payload = {operation: operation}.merge(options)
-        ::ActiveSupport::Notifications.instrument('start_processing.twitter_friendly', payload) {}
-      end
-
-      def complete_processing(operation, options)
-        payload = {operation: operation}.merge(options)
-        ::ActiveSupport::Notifications.instrument('complete_processing.twitter_friendly', payload) { yield(payload) }
-      end
-
-      def perform_request(caller, options, &block)
-        payload = {operation: 'request', args: [caller, options]}
-        ::ActiveSupport::Notifications.instrument('request.twitter_friendly', payload) { yield(payload) }
-      end
-    end
-
-    module Utils
-
-      module_function
-
-      def cache_disabled?(options)
-        options.is_a?(Hash) && options.has_key?(:cache) && !options[:cache]
-      end
-    end
-  end
-end