twitter_with_auto_pagination 0.8.8 → 0.8.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6d767009c6d195d95d8ef07d1f7dae2d2c7ebe23
-  data.tar.gz: 8a6b624c9ec6ad652aa8613ca8f99f24e20ce368
+  metadata.gz: 1c58523412b513e538fc1b184026dbe03a3c8d66
+  data.tar.gz: 7ec3c80b9615c90a04d01a39b1550afda3d9115d
 SHA512:
-  metadata.gz: 0511c5f3a28c8a2d70a5372bac83c11ee54667928726e4eded3c762a3efc5c31c7bc6d0fc08a75275f0456997342ad37a48079f6960d70b78ca881564220d068
-  data.tar.gz: aa4a35b82774fc8e74c5ea619e68a815ccfdd2700680c686d1bd46042600da9f3a5897371a2a714585f222fa23faeb37f35f321fc4bf8fa59bdb1affdf0456de
+  metadata.gz: 6258c081d6c2745cbc5e917e9f4e39886eca6fb1b8aa2aad9e2f91e6c2a7b77555092a15eba50fc8279223251614e62b3ec4e04c85dc8ae610c29584ee89f837
+  data.tar.gz: fa959db4a3e3eec7e9a43501185d42a1e7f39807ffc7cd9b2177928c92909db660aa00029bf4203f32e1cfd4b708630fb6e509fdf059a5f4ca9317e78f731e5e

data/lib/twitter_with_auto_pagination/rest/uncategorized.rb

@@ -5,77 +5,131 @@ module TwitterWithAutoPagination
     module Uncategorized
       include TwitterWithAutoPagination::REST::Utils
 
-      def usage_stats_wday_series_data(times)
-        wday_count = times.each_with_object((0..6).map { |n| [n, 0] }.to_h) do |time, memo|
-          memo[time.wday] += 1
-        end
-        wday_count.map { |k, v| [I18n.t('date.abbr_day_names')[k], v] }.map do |key, value|
-          {name: key, y: value, drilldown: key}
+      EVERY_DAY = (0..6)
+      WDAY_COUNT = EVERY_DAY.map { |n| [n, 0] }.to_h
+      WDAY_NIL_COUNT = EVERY_DAY.map { |n| [n, nil] }.to_h
+
+      EVERY_HOUR = (0..23)
+      HOUR_COUNT = EVERY_HOUR.map { |n| [n, 0] }.to_h
+      HOUR_NIL_COUNT = EVERY_HOUR.map { |n| [n, nil] }.to_h
+
+      def count_wday(times)
+        times.each_with_object(WDAY_COUNT.dup) { |time, memo| memo[time.wday] += 1 }
+      end
+
+      def count_hour(times)
+        times.each_with_object(HOUR_COUNT.dup) { |time, memo| memo[time.hour] += 1 }
+      end
+
+      # [
+      #   {:name=>"Sun", :y=>111, :drilldown=>"Sun"},
+      #   {:name=>"Mon", :y=>95,  :drilldown=>"Mon"},
+      #   {:name=>"Tue", :y=>72,  :drilldown=>"Tue"},
+      #   {:name=>"Wed", :y=>70,  :drilldown=>"Wed"},
+      #   {:name=>"Thu", :y=>73,  :drilldown=>"Thu"},
+      #   {:name=>"Fri", :y=>81,  :drilldown=>"Fri"},
+      #   {:name=>"Sat", :y=>90,  :drilldown=>"Sat"}
+      # ]
+      def usage_stats_wday_series_data(times, day_names:)
+        count_wday(times).map do |wday, count|
+          {name: day_names[wday], y: count, drilldown: day_names[wday]}
         end
       end
 
-      def usage_stats_wday_drilldown_series(times)
-        hour_count =
-          (0..6).each_with_object((0..6).map { |n| [n, nil] }.to_h) do |wday, wday_memo|
-            wday_memo[wday] =
-              times.select { |t| t.wday == wday }.map { |t| t.hour }.each_with_object((0..23).map { |n| [n, 0] }.to_h) do |hour, hour_memo|
-                hour_memo[hour] += 1
-              end
+      # [
+      #   {
+      #     :name=>"Sun",
+      #     :id=>"Sun",
+      #     :data=> [ ["0", 7], ["1", 12], ... , ["22", 10], ["23", 12] ]
+      #   },
+      #   ...
+      #   {
+      #     :name=>"Mon",
+      #     :id=>"Mon",
+      #     :data=> [ ["0", 22], ["1", 11], ... , ["22", 9], ["23", 14] ]
+      #   }
+      def usage_stats_wday_drilldown_series(times, day_names:)
+        counts =
+          EVERY_DAY.each_with_object(WDAY_NIL_COUNT.dup) do |wday, memo|
+            memo[wday] = count_hour(times.select { |t| t.wday == wday })
           end
-        hour_count.map { |k, v| [I18n.t('date.abbr_day_names')[k], v] }.map do |key, value|
-          {name: key, id: key, data: value.to_a.map{|a| [a[0].to_s, a[1]] }}
+
+        counts.map { |wday, hour_count| [day_names[wday], hour_count] }.map do |wday, hour_count|
+          {name: wday, id: wday, data: hour_count.map { |hour, count| [hour.to_s, count] }}
         end
       end
 
+      # [
+      #   {:name=>"0", :y=>66, :drilldown=>"0"},
+      #   {:name=>"1", :y=>47, :drilldown=>"1"},
+      #   ...
+      #   {:name=>"22", :y=>73, :drilldown=>"22"},
+      #   {:name=>"23", :y=>87, :drilldown=>"23"}
+      # ]
       def usage_stats_hour_series_data(times)
-        hour_count = times.each_with_object((0..23).map { |n| [n, 0] }.to_h) do |time, memo|
-          memo[time.hour] += 1
-        end
-        hour_count.map do |key, value|
-          {name: key.to_s, y: value, drilldown: key.to_s}
+        count_hour(times).map do |hour, count|
+          {name: hour.to_s, y: count, drilldown: hour.to_s}
         end
       end
 
-      def usage_stats_hour_drilldown_series(times)
-        wday_count =
-          (0..23).each_with_object((0..23).map { |n| [n, nil] }.to_h) do |hour, hour_memo|
-            hour_memo[hour] =
-              times.select { |t| t.hour == hour }.map { |t| t.wday }.each_with_object((0..6).map { |n| [n, 0] }.to_h) do |wday, wday_memo|
-                wday_memo[wday] += 1
-              end
+      # [
+      #   {:name=>"0", :id=>"0", :data=>[["Sun", 7], ["Mon", 22], ["Tue", 8], ["Wed", 9], ["Thu", 9], ["Fri", 6], ["Sat", 5]]},
+      #   {:name=>"1", :id=>"1", :data=>[["Sun", 12], ["Mon", 11], ["Tue", 5], ["Wed", 5], ["Thu", 0], ["Fri", 8], ["Sat", 6]]},
+      #   ...
+      # ]
+      def usage_stats_hour_drilldown_series(times, day_names:)
+        counts =
+          EVERY_HOUR.each_with_object(HOUR_NIL_COUNT.dup) do |hour, memo|
+            memo[hour] = count_wday(times.select { |t| t.hour == hour })
           end
-        wday_count.map do |key, value|
-          {name: key.to_s, id: key.to_s, data: value.to_a.map{|a| [I18n.t('date.abbr_day_names')[a[0]], a[1]] }}
+
+        counts.map do |hour, wday_count|
+          {name: hour.to_s, id: hour.to_s, data: wday_count.map { |wday, count| [day_names[wday], count] }}
         end
       end
 
-      def twitter_addiction_series(times)
-        five_mins = 5.minutes
-        wday_expended_seconds =
-          (0..6).each_with_object((0..6).map { |n| [n, nil] }.to_h) do |wday, wday_memo|
+      # [
+      #   {:name=>"Sun", :y=>14.778310502283107},
+      #   {:name=>"Mon", :y=>12.273439878234399},
+      #   {:name=>"Tue", :y=>10.110578386605784},
+      #   {:name=>"Wed", :y=>9.843683409436835},
+      #   {:name=>"Thu", :y=>10.547945205479452},
+      #   {:name=>"Fri", :y=>10.61773211567732},
+      #   {:name=>"Sat", :y=>12.115753424657534}
+      # ]
+      def twitter_addiction_series(times, day_names:)
+        max_duration = 5.minutes
+        wday_count =
+          EVERY_DAY.each_with_object(WDAY_NIL_COUNT.dup) do |wday, memo|
             target_times = times.select { |t| t.wday == wday }
-            wday_memo[wday] = target_times.empty? ? nil : target_times.each_cons(2).map {|a, b| (a - b) < five_mins ? a - b : five_mins }.sum
+            memo[wday] =
+              if target_times.empty?
+                nil
+              else
+                target_times.each_cons(2).map { |newer, older| (newer - older) < max_duration ? newer - older : max_duration }.sum
+              end
           end
-        days = times.map{|t| t.to_date.to_s(:long) }.uniq.size
-        weeks = (days > 7) ? days / 7.0 : 1.0
-        wday_expended_seconds.map { |k, v| [I18n.t('date.abbr_day_names')[k], (v.nil? ? nil : v / weeks / 60)] }.map do |key, value|
-          {name: key, y: value}
+        days = times.map { |t| t.to_date.to_s(:long) }.uniq.size
+        weeks = [days / 7.0, 1.0].max
+        wday_count.map do |wday, seconds|
+          {name: day_names[wday], y: (seconds.nil? ? nil : seconds / weeks / 60)}
         end
       end
 
       def usage_stats(user, options = {})
         n_days_ago = options.has_key?(:days) ? options[:days].days.ago : 100.years.ago
         tweets = options.has_key?(:tweets) ? options.delete(:tweets) : user_timeline(user)
+        day_names = options.has_key?(:day_names) ? options.delete(:day_names) : %w(Sun Mon Tue Wed Thu Fri Sat)
         times =
           # TODO Use user specific time zone
           tweets.map { |t| ActiveSupport::TimeZone['Tokyo'].parse(t.created_at.to_s) }.
             select { |t| t > n_days_ago }
         [
-          usage_stats_wday_series_data(times),
-          usage_stats_wday_drilldown_series(times),
+          usage_stats_wday_series_data(times, day_names: day_names),
+          usage_stats_wday_drilldown_series(times, day_names: day_names),
           usage_stats_hour_series_data(times),
-          usage_stats_hour_drilldown_series(times),
-          twitter_addiction_series(times)
+          usage_stats_hour_drilldown_series(times, day_names: day_names),
+          twitter_addiction_series(times, day_names: day_names)
         ]
       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.8.8'
+  spec.version = '0.8.9'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: twitter_with_auto_pagination
 version: !ruby/object:Gem::Version
-  version: 0.8.8
+  version: 0.8.9
 platform: ruby
 authors:
 - Shinohara Teruki