twitter_with_auto_pagination 0.8.1 → 0.8.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bd60b96ff2d1620518b5f6c8e16799c477b0f76a
-  data.tar.gz: 4352f612659aa199a647eb340d5bc00b32ae4341
+  metadata.gz: 35aa309dc97a81e62812edb59c1fe61c62da69b9
+  data.tar.gz: 9c3a07ab41c467685e144edadda32c3c399b1b47
 SHA512:
-  metadata.gz: 750f168e791c3241961a106946052471b062ea11702e16906f281e9a8673e34b2d32d216be8671229164ff0ad8a51463efd3a21505c1cfdcd006a32b722f6499
-  data.tar.gz: e4fb48382befa9b581f1e2eee34636fcd5d2203af823777b2f69ba96b5d91780935ba1d94bfc33ce0229601efe4b726d392e36107b6f2d91fa90f7a7db21d32a
+  metadata.gz: 55f1e531dc9dbaa174cff7f1a13dbec4a8e6ea85c920b58af0525048efcbbbee3746444790fb3120ea7e24fab647db4e2180a0a218811c0f0cf5421f59ca70b3
+  data.tar.gz: 52859557ffae6a65e7fc4c56900aab1d0dc234a4641a1ed22db744e6a2ea70a1e137de8fcddebb8239fe5a3cdaadde68d267387f5939ce5e111f35d38c6175aa

data/lib/twitter_with_auto_pagination/rest/api.rb

@@ -1,5 +1,6 @@
 require 'twitter_with_auto_pagination/rest/favorites'
 require 'twitter_with_auto_pagination/rest/friends_and_followers'
+require 'twitter_with_auto_pagination/rest/lists'
 require 'twitter_with_auto_pagination/rest/search'
 require 'twitter_with_auto_pagination/rest/timelines'
 require 'twitter_with_auto_pagination/rest/users'
@@ -17,6 +18,7 @@ module TwitterWithAutoPagination
     module API
       include TwitterWithAutoPagination::REST::Favorites
       include TwitterWithAutoPagination::REST::FriendsAndFollowers
+      include TwitterWithAutoPagination::REST::Lists
       include TwitterWithAutoPagination::REST::Search
       include TwitterWithAutoPagination::REST::Timelines
       include TwitterWithAutoPagination::REST::Users

data/lib/twitter_with_auto_pagination/rest/extension/clusters.rb

@@ -6,32 +6,41 @@ module TwitterWithAutoPagination
       module Clusters
         include TwitterWithAutoPagination::REST::Utils
 
-        def clusters_belong_to(text)
+        # @param text [String] user_timeline.map(&:text).join(' ')
+        def clusters_belong_to(text, limit: 10)
           return {} if text.blank?
 
-          exclude_words = JSON.parse(File.read(Rails.configuration.x.constants['cluster_bad_words_path']))
-          special_words = JSON.parse(File.read(Rails.configuration.x.constants['cluster_good_words_path']))
+          if defined?(Rails)
+            exclude_words = JSON.parse(File.read(Rails.configuration.x.constants['cluster_bad_words_path']))
+            special_words = JSON.parse(File.read(Rails.configuration.x.constants['cluster_good_words_path']))
+          else
+            exclude_words = JSON.parse(File.read('./cluster_bad_words.json'))
+            special_words = JSON.parse(File.read('./cluster_good_words.json'))
+          end
+
+          %w(べたら それとも たしかに さそう そんなに ったことある してるの しそうな おやくま ってますか これをやってるよ のせいか).each { |w| exclude_words << w }
+          %w(面白い 可愛い 食べ物 宇多田ヒカル ご飯 面倒 体調悪くなる 空腹 頑張ってない 眼鏡 台風 沖縄 らんま1/2 女の子 怪我 足のむくみ 彼女欲しい 彼氏欲しい 吐き気 注射 海鮮チヂミ 出勤 価格ドットコム 幹事 雑談 パズドラ ビオフェルミン 餃子 お金 まんだらけ 結婚 焼肉 タッチペン).each { |w| special_words << w }
 
           # クラスタ用の単語の出現回数を記録
-          cluster_word_counter =
+          frequency =
             special_words.map { |sw| [sw, text.scan(sw)] }
-              .delete_if { |item| item[1].empty? }
-              .each_with_object(Hash.new(1)) { |item, memo| memo[item[0]] = item[1].size }
+              .delete_if { |_, matched| matched.empty? }
+              .each_with_object(Hash.new(0)) { |(word, matched), memo| memo[word] = matched.size }
 
           # 同一文字種の繰り返しを見付ける。漢字の繰り返し、ひらがなの繰り返し、カタカナの繰り返し、など
-          text.scan(/[一-龠〆ヵヶ々]+|[ぁ-んー～]+|[ァ-ヴー～]+|[ａ-ｚＡ-Ｚ０-９]+|[、。！!？?]+/).
+          text.scan(/[一-龠〆ヵヶ々]+|[ぁ-んー～]+|[ァ-ヴー～]+|[ａ-ｚA-ZＡ-Ｚ０-９]+|[、。！!？?]+/).
 
             # 複数回繰り返される文字を除去
             map { |w| w.remove /[？！?!。、ｗ]|(ー{2,})/ }.
 
-            # 文字数の少なすぎる単語、ひらがなだけの単語、除外単語を除去する
-            delete_if { |w| w.length <= 1 || (w.length <= 2 && w =~ /^[ぁ-んー～]+$/) || exclude_words.include?(w) }.
+            # 文字数の少なすぎる単語、除外単語を除去する
+            delete_if { |w| w.length <= 2 || exclude_words.include?(w) }.
 
             # 出現回数を記録
-            each { |w| cluster_word_counter[w] += 1 }
+            each { |w| frequency[w] += 1 }
 
           # 複数個以上見付かった単語のみを残し、出現頻度順にソート
-          cluster_word_counter.select { |_, v| v > 3 }.sort_by { |_, v| -v }.to_h
+          frequency.select { |_, v| 2 < v }.sort_by { |_, v| -v }.slice(0, limit).to_h
         end
 
         def clusters_assigned_to

data/lib/twitter_with_auto_pagination/rest/lists.rb

@@ -0,0 +1,19 @@
+require 'twitter_with_auto_pagination/rest/utils'
+
+module TwitterWithAutoPagination
+  module REST
+    module Lists
+      include TwitterWithAutoPagination::REST::Utils
+
+      def memberships(*args)
+        options = {count: 1000, cursor: -1}.merge(args.extract_options!)
+        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_cursor(method(__method__).super_method, *args, options)
+          end
+        end
+      end
+    end
+  end
+end

data/lib/twitter_with_auto_pagination/rest/utils.rb

@@ -103,7 +103,7 @@ module TwitterWithAutoPagination
       def collect_with_cursor(method_obj, *args)
         options = args.extract_options!
         last_response = call_api(method_obj, *args, options).attrs
-        return_data = (last_response[:users] || last_response[:ids])
+        return_data = (last_response[:users] || last_response[:ids] || last_response[:lists])
 
         while (next_cursor = last_response[:next_cursor]) && next_cursor != 0
           options[:cursor] = next_cursor
@@ -152,10 +152,6 @@ module TwitterWithAutoPagination
         "#{method_name}#{delim}#{identifier}"
       end
 
-      def namespaced_key(method_name, user, options = {})
-        file_cache_key(method_name, user, options)
-      end
-
       CODER = JSON
 
       def encode(obj)
@@ -179,7 +175,7 @@ module TwitterWithAutoPagination
       end
 
       def fetch_cache_or_call_api(method_name, user, options = {})
-        key = namespaced_key(method_name, user, options)
+        key = file_cache_key(method_name, user, options)
 
         fetch_result =
           if options[:cache] == :read

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.8.1'
+  spec.version = '0.8.2'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: twitter_with_auto_pagination
 version: !ruby/object:Gem::Version
-  version: 0.8.1
+  version: 0.8.2
 platform: ruby
 authors:
 - Shinohara Teruki
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-07-23 00:00:00.000000000 Z
+date: 2016-10-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: twitter
@@ -101,6 +101,7 @@ files:
 - lib/twitter_with_auto_pagination/rest/extension/users.rb
 - lib/twitter_with_auto_pagination/rest/favorites.rb
 - lib/twitter_with_auto_pagination/rest/friends_and_followers.rb
+- lib/twitter_with_auto_pagination/rest/lists.rb
 - lib/twitter_with_auto_pagination/rest/search.rb
 - lib/twitter_with_auto_pagination/rest/timelines.rb
 - lib/twitter_with_auto_pagination/rest/uncategorized.rb