twitter_with_auto_pagination 0.7.1 → 0.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d24f8c1ce5b6fe5c34dc42d1fe724eda13cb0114
-  data.tar.gz: 9529ac4a7d18219ee4c0feb3468389680059747c
+  metadata.gz: 842345d2afa01f05557856bde019188e1ffe7183
+  data.tar.gz: ea0998abb411f7c0668ed9dbdff054fde3ef7c9a
 SHA512:
-  metadata.gz: 450c6bd08a72b983d3662a6382b14ae378013b7b01717b7993292c64f2c6dbe46d92b6a87cff58e962c1eb47f23f64f63fa8ed6ef2d686b07d62272ca1e200dd
-  data.tar.gz: d3d1c1addec1379d50d1363deedffe7b1ffc049e510ba09a321858af96e9da2e734721929b1b0c02665d4bd407b3d6b20e989b55b41fa528a5572c359b516347
+  metadata.gz: f8cff32cee7e020cb481428a24acf78b325464b4064ede0e71066681bd7bec297b305f0c0b7c6ffa2bfb99aaf410db23fb299eed5841ccc2c9b4fea6c4b5bd58
+  data.tar.gz: beb7cc9f6678583ce5ba52b6c33f4d1a4d0ff0643a883d30dcee9db105a3caef0a7e8a994ccabd24c63525d5ea47a8fb51f69bc5f7c940a0d17469e71efbcc59

data/lib/twitter_with_auto_pagination/rest/favorites.rb

@@ -11,7 +11,7 @@ module TwitterWithAutoPagination
         args[0] = verify_credentials.id if args.empty?
         instrument(__method__, nil, options) do
           fetch_cache_or_call_api(__method__, args[0], options) do
-            collect_with_max_id(method(__method__).super_method, *args, options)
+            collect_with_max_id(method(__method__).super_method, *args, options).map { |s| s.attrs }
           end
         end
       end

data/lib/twitter_with_auto_pagination/rest/friends_and_followers.rb

@@ -46,11 +46,10 @@ module TwitterWithAutoPagination
 
       def _friends_serially(*args)
         options = {count: 200, include_user_entities: true, cursor: -1}.merge(args.extract_options!)
-        options[:reduce] = false unless options.has_key?(:reduce)
         args[0] = verify_credentials.id if args.empty?
         instrument(__method__, nil, options) do
           fetch_cache_or_call_api(:friends, args[0], options) do
-            collect_with_cursor(method(:friends).super_method, *args, options)
+            collect_with_cursor(method(:friends).super_method, *args, options).map { |u| u.to_hash }
           end
         end
       end
@@ -74,11 +73,10 @@ module TwitterWithAutoPagination
 
       def _followers_serially(*args)
         options = {count: 200, include_user_entities: true, cursor: -1}.merge(args.extract_options!)
-        options[:reduce] = false unless options.has_key?(:reduce)
         args[0] = verify_credentials.id if args.empty?
         instrument(__method__, nil, options) do
           fetch_cache_or_call_api(:followers, args[0], options) do
-            collect_with_cursor(method(:followers).super_method, *args, options)
+            collect_with_cursor(method(:followers).super_method, *args, options).map { |u| u.to_hash }
           end
         end
       end

data/lib/twitter_with_auto_pagination/rest/search.rb

@@ -7,10 +7,9 @@ module TwitterWithAutoPagination
 
       def search(*args)
         options = {count: 100, result_type: :recent, call_limit: 1}.merge(args.extract_options!)
-        options[:reduce] = false
         instrument(__method__, nil, options) do
           fetch_cache_or_call_api(__method__, args[0], options) do
-            collect_with_max_id(method(__method__).super_method, *args, options) { |response| response.attrs[:statuses] }
+            collect_with_max_id(method(__method__).super_method, *args, options) { |response| response.attrs[:statuses] }.map { |s| s.to_hash }
           end
         end
       end

data/lib/twitter_with_auto_pagination/rest/timelines.rb

@@ -9,7 +9,7 @@ module TwitterWithAutoPagination
         options = {count: 200, include_rts: true, call_limit: 3}.merge(args.extract_options!)
         instrument(__method__, nil, options) do
           fetch_cache_or_call_api(__method__, verify_credentials.id, options) do
-            collect_with_max_id(method(__method__).super_method, options)
+            collect_with_max_id(method(__method__).super_method, options).map { |s| s.attrs }
           end
         end
       end
@@ -19,7 +19,7 @@ module TwitterWithAutoPagination
         args[0] = verify_credentials.id if args.empty?
         instrument(__method__, nil, options) do
           fetch_cache_or_call_api(__method__, args[0], options) do
-            collect_with_max_id(method(__method__).super_method, *args, options)
+            collect_with_max_id(method(__method__).super_method, *args, options).map { |s| s.attrs }
           end
         end
       end
@@ -28,7 +28,7 @@ module TwitterWithAutoPagination
         options = {count: 200, include_rts: true, call_limit: 1}.merge(args.extract_options!)
         instrument(__method__, nil, options) do
           fetch_cache_or_call_api(__method__, verify_credentials.id, options) do
-            collect_with_max_id(method(__method__).super_method, options)
+            collect_with_max_id(method(__method__).super_method, options).map { |s| s.attrs }
           end
         end
       end

data/lib/twitter_with_auto_pagination/rest/users.rb

@@ -10,7 +10,7 @@ module TwitterWithAutoPagination
         options = {skip_status: true}.merge(args.extract_options!)
         instrument(__method__, nil, options) do
           fetch_cache_or_call_api(__method__, args) do
-            call_api(method(__method__).super_method, *args, options)
+            call_api(method(__method__).super_method, *args, options).to_hash
           end
         end
       end
@@ -30,7 +30,7 @@ module TwitterWithAutoPagination
         args[0] = verify_credentials.id if args.empty?
         instrument(__method__, nil, options) do
           fetch_cache_or_call_api(__method__, args[0], options) do
-            call_api(method(__method__).super_method, *args, options)
+            call_api(method(__method__).super_method, *args, options).to_hash
           end
         end
       end
@@ -48,7 +48,7 @@ module TwitterWithAutoPagination
         instrument(__method__, nil, options) do
           Parallel.each_with_index(users_per_workers, in_threads: thread_size) do |users_per_worker, i|
             _users = fetch_cache_or_call_api(__method__, users_per_worker, options) do
-              call_api(method(__method__).super_method, users_per_worker, options)
+              call_api(method(__method__).super_method, users_per_worker, options).map { |u| u.to_hash }
             end
 
             processed_users << {i: i, users: _users}

data/lib/twitter_with_auto_pagination/rest/utils.rb

@@ -132,7 +132,8 @@ module TwitterWithAutoPagination
                   "#{options[:super_operation]}-ids#{delim}#{Digest::MD5.hexdigest(user.join(','))}"
                 when user.kind_of?(Array) && user.first.kind_of?(String)
                   "#{options[:super_operation]}-sns#{delim}#{Digest::MD5.hexdigest(user.join(','))}"
-                else raise "#{method_name.inspect} #{user.inspect}"
+                else
+                  raise "#{method_name.inspect} #{user.inspect}"
               end
             when user.kind_of?(Integer)
               "id#{delim}#{user.to_s}"
@@ -144,7 +145,8 @@ module TwitterWithAutoPagination
               "sn#{delim}#{user}"
             when user.kind_of?(Twitter::User)
               "user#{delim}#{user.id.to_s}"
-            else raise "#{method_name.inspect} #{user.inspect}"
+            else
+              raise "#{method_name.inspect} #{user.inspect}"
           end
 
         "#{method_name}#{delim}#{identifier}"
@@ -154,132 +156,25 @@ module TwitterWithAutoPagination
         file_cache_key(method_name, user, options)
       end
 
-      PROFILE_SAVE_KEYS = %i(
-          id
-          name
-          screen_name
-          location
-          description
-          url
-          protected
-          followers_count
-          friends_count
-          listed_count
-          favourites_count
-          utc_offset
-          time_zone
-          geo_enabled
-          verified
-          statuses_count
-          lang
-          status
-          profile_image_url_https
-          profile_banner_url
-          profile_link_color
-          suspended
-          verified
-          entities
-          created_at
-        )
+      CODER = JSON
 
-      STATUS_SAVE_KEYS = %i(
-        created_at
-        id
-        text
-        source
-        truncated
-        coordinates
-        place
-        entities
-        user
-        contributors
-        is_quote_status
-        retweet_count
-        favorite_count
-        favorited
-        retweeted
-        possibly_sensitive
-        lang
-      )
-
-      # encode
-      def encode_json(obj, caller_name, options = {})
-        options[:reduce] = true unless options.has_key?(:reduce)
-        case caller_name
-          when :user_timeline, :home_timeline, :mentions_timeline, :favorites # Twitter::Tweet
-            JSON.pretty_generate(obj.map { |o| o.attrs })
-
-          when :search # Hash
-            data =
-              if options[:reduce]
-                obj.map { |o| o.to_hash.slice(*STATUS_SAVE_KEYS) }
-              else
-                obj.map { |o| o.to_hash }
-              end
-            JSON.pretty_generate(data)
-
-          when :friends, :followers # Hash
-            data =
-              if options[:reduce]
-                obj.map { |o| o.to_hash.slice(*PROFILE_SAVE_KEYS) }
-              else
-                obj.map { |o| o.to_hash }
-              end
-            JSON.pretty_generate(data)
-
-          when :friend_ids, :follower_ids # Integer
-            JSON.pretty_generate(obj)
-
-          when :verify_credentials # Twitter::User
-            JSON.pretty_generate(obj.to_hash.slice(*PROFILE_SAVE_KEYS))
-
-          when :user # Twitter::User
-            JSON.pretty_generate(obj.to_hash.slice(*PROFILE_SAVE_KEYS))
-
-          when :users, :friends_parallelly, :followers_parallelly # Twitter::User
-            data =
-              if options[:reduce]
-                obj.map { |o| o.to_hash.slice(*PROFILE_SAVE_KEYS) }
-              else
-                obj.map { |o| o.to_hash }
-              end
-            JSON.pretty_generate(data)
-
-          when :user? # true or false
-            obj
-
-          when :friendship? # true or false
-            obj
+      def encode(obj)
+        obj.in?([true, false]) ? obj : CODER.dump(obj)
+      end
 
-          else
-            raise "#{__method__}: caller=#{caller_name} key=#{options[:key]} obj=#{obj.inspect}"
-        end
+      def decode(str)
+        obj = str.kind_of?(String) ? CODER.load(str) : str
+        _to_mash(obj)
       end
 
-      # decode
-      def decode_json(json_str, caller_name, options = {})
-        obj = json_str.kind_of?(String) ? JSON.parse(json_str) : json_str
+      def _to_mash(obj)
         case
-          when obj.nil?
-            obj
-
-          when obj.kind_of?(Array) && obj.first.kind_of?(Hash)
-            obj.map { |o| Hashie::Mash.new(o) }
-
-          when obj.kind_of?(Array) && obj.first.kind_of?(Integer)
-            obj
-
+          when obj.kind_of?(Array)
+            obj.map { |o| _to_mash(o) }
           when obj.kind_of?(Hash)
-            Hashie::Mash.new(obj)
-
-          when obj === true || obj === false
-            obj
-
-          when obj.kind_of?(Array) && obj.empty?
-            obj
-
+            Hashie::Mash.new(obj.map { |k, v| [k, _to_mash(v)] }.to_h)
           else
-            raise "#{__method__}: caller=#{caller_name} key=#{options[:key]} obj=#{obj.inspect}"
+            obj
         end
       end
 
@@ -292,11 +187,11 @@ module TwitterWithAutoPagination
           else
             cache.fetch(key, expires_in: 1.hour, race_condition_ttl: 5.minutes) do
               block_result = yield
-              instrument('serialize', key, caller: method_name) { encode_json(block_result, method_name, options) }
+              instrument('serialize', key, caller: method_name) { encode(block_result) }
             end
           end
 
-        instrument('deserialize', key, caller: method_name) { decode_json(fetch_result, method_name, options) }
+        instrument('deserialize', key, caller: method_name) { decode(fetch_result) }
       end
     end
   end

data/twitter_with_auto_pagination.gemspec

@@ -22,5 +22,5 @@ Gem::Specification.new do |spec|
   spec.required_ruby_version = '>= 2.3'
   spec.summary = spec.description
   spec.test_files = Dir.glob('spec/**/*')
-  spec.version = '0.7.1'
+  spec.version = '0.8.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: twitter_with_auto_pagination
 version: !ruby/object:Gem::Version
-  version: 0.7.1
+  version: 0.8.0
 platform: ruby
 authors:
 - Shinohara Teruki
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-07-06 00:00:00.000000000 Z
+date: 2016-07-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: twitter