githubstats 1.2.0 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 73a4589f2413428f9fc4f99a83b71f384d044c87
-  data.tar.gz: 8e6227b109a3661f9660e3e61dd1b42470ce39f8
+  metadata.gz: 18eb056e846349fdd755a7724f69c8040a037070
+  data.tar.gz: ece0a53aa1a7941694120ffd26fc9ddbe0b4a0ce
 SHA512:
-  metadata.gz: a885d8710bdb00b7cdc23236f9e2cee904d80d979408b2e254019b1d3aaaca83b591e083ef0fac9ed38c14c423d86c45cc6e3747563b0d6f4a6bc55ec94af9cd
-  data.tar.gz: 765be9c077cbca2218213bd922138371b802dd827d3d71f7ee9fd47fef8026e4fa1e153dcc41c87be4658beab2b2c75b8b6616ce448cc6b3b64a74c1f4b1ce30
+  metadata.gz: 86677eae394cae76f19d9064d3451b14b8a914ae2d4a3447b8f6dbd8f71f42cb2cc0baef6e30f90e37f8bfff3d34bc118afa274266c8f118ce27b4c8980dd07e
+  data.tar.gz: 92a2b5adab28a47d958213824a38340d0540b684f1ca81e1be12282cb7e66344a7506b4e7eb8a690295512d41dff2020878e39c19621c44c1edae5b7dbd3f75a

data/.circle-ruby

@@ -0,0 +1,3 @@
+2.3.1
+2.2.5
+2.1.10

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+# 1.3.0 / 2016-09-14
+
+* [FEATURE] Re-adds support for streak lookups longer than 366 days from GitHub, now that they've brought back older commit info
+
 # 1.2.0 / 2016-05-19
 
 * [BUGFIX] Remove support for streak lookup longer than 366 days from GitHub, since they removed display of longer streaks. :(

data/circle.yml

@@ -1,12 +1,6 @@
 dependencies:
   override:
-    - 'rvm-exec 1.9.3-p551 bundle install'
-    - 'rvm-exec 2.0.0-p645 bundle install'
-    - 'rvm-exec 2.1.6 bundle install'
-    - 'rvm-exec 2.2.2 bundle install'
+  - 'for i in $(cat .circle-ruby) ; do rvm-exec $i bundle install || exit 1 ; done'
 test:
   override:
-    - 'rvm-exec 1.9.3-p551 bundle exec rake'
-    - 'rvm-exec 2.0.0-p645 bundle exec rake'
-    - 'rvm-exec 2.1.6 bundle exec rake'
-    - 'rvm-exec 2.2.2 bundle exec rake'
+  - 'for i in $(cat .circle-ruby) ; do rvm-exec $i bundle exec rake || exit 1 ; done'

data/githubstats.gemspec

@@ -22,9 +22,9 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency 'nokogiri', '~> 1.6.5'
 
   s.add_development_dependency 'timecop', '~> 0.8.0'
-  s.add_development_dependency 'rubocop', '~> 0.40.0'
-  s.add_development_dependency 'rake', '~> 11.1.0'
+  s.add_development_dependency 'rubocop', '~> 0.42.0'
+  s.add_development_dependency 'rake', '~> 11.2.0'
   s.add_development_dependency 'codecov', '~> 0.1.1'
-  s.add_development_dependency 'rspec', '~> 3.4.0'
-  s.add_development_dependency 'fuubar', '~> 2.0.0'
+  s.add_development_dependency 'rspec', '~> 3.5.0'
+  s.add_development_dependency 'fuubar', '~> 2.2.0'
 end

data/lib/githubstats.rb

@@ -2,6 +2,8 @@
 require 'curb'
 require 'json'
 require 'nokogiri'
+require 'date'
+require 'basiccache'
 
 ##
 # Rugged is used if available to look up the user's Github username
@@ -36,6 +38,8 @@ module GithubStats
   ##
   # User object
   class User
+    include MethodCacher
+
     attr_reader :name, :url, :data, :last_updated
 
     ##
@@ -46,6 +50,8 @@ module GithubStats
       @name = params[:name] || guess_user
       @url = (params[:url] || DEFAULT_URL) % @name
       @last_updated = nil
+      enable_caching [:streak, :longest_streak, :streaks, :real_streak,
+                      :real_streak_start]
     end
 
     ##
@@ -56,6 +62,29 @@ module GithubStats
     end
     alias inspect to_s
 
+    ##
+    # Set a custom streaks value that takes into account GitHub,
+    # which makes available streak data for longer than a year
+
+    def streak
+      return [] if streaks.empty?
+      streaks.last.last.date >= Date.today - 1 ? streaks.last : []
+    end
+
+    def streaks
+      naive = data.streaks
+      return naive if naive.last.size < 365
+      [real_streak]
+    end
+
+    ##
+    # Set a custom longest_streak to account for the overriden streak
+
+    def longest_streak
+      return data.longest_streak if data.longest_streak.size < 365
+      streak
+    end
+
     ##
     # Lazy loader for data
 
@@ -67,7 +96,7 @@ module GithubStats
     ##
     # Adjust respond_to? to properly respond with patched method_missing
 
-    def respond_to?(method, include_private = false)
+    def respond_to_missing?(method, include_private = false)
       load_data if @last_updated.nil?
       super || @data.respond_to?(method, include_private)
     end
@@ -91,11 +120,31 @@ module GithubStats
       @last_updated = DateTime.now
     end
 
+    ##
+    # Set a custom longest_streak that takes into account GitHub,
+    # which reports full length but only gives data for a year
+
+    def real_streak_start(chart_start)
+      res = GithubStats::Data.new download(chart_start.strftime('%Y-%m-%d'))
+      last_streak_start = res.streaks.last.first.date
+      new_chart_start = res.raw.first.date
+      return last_streak_start unless last_streak_start == new_chart_start
+      real_streak_start(new_chart_start)
+    end
+
+    def real_streak
+      existing = data.streaks.last
+      first_date = existing.first.date
+      extra_size = (first_date - real_streak_start(first_date))
+      [-1] * extra_size + existing
+    end
+
     ##
     # Downloads new data from Github
 
-    def download
-      svg = Curl::Easy.perform(@url).body_str
+    def download(from = nil)
+      url = from ? @url + "?from=#{from}" : @url
+      svg = Curl::Easy.perform(url).body_str
       html = Nokogiri::HTML(svg)
       html.css('.day').map do |x|
         x.attributes.values_at('data-date', 'data-count').map(&:value)

data/lib/githubstats/data.rb

@@ -67,7 +67,7 @@ module GithubStats
 
     def streaks
       streaks = @raw.each_with_object(Array.new(1, [])) do |point, acc|
-        point.score == 0 ? acc << [] : acc.last << point
+        point.score.zero? ? acc << [] : acc.last << point
       end
       streaks.reject!(&:empty?)
       streaks
@@ -124,7 +124,7 @@ module GithubStats
     # They only consider the first 3 or 1, based on the mean and max of the set
 
     def gh_outliers
-      outliers.take((6 > max.score - mean || 15 > max.score) ? 1 : 3)
+      outliers.take(6 > max.score - mean || 15 > max.score ? 1 : 3)
     end
 
     ##

data/lib/githubstats/version.rb

@@ -2,5 +2,5 @@
 ##
 # Define the version
 module GithubStats
-  VERSION = '1.2.0'.freeze
+  VERSION = '1.3.0'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: githubstats
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.3.0
 platform: ruby
 authors:
 - Les Aker
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-19 00:00:00.000000000 Z
+date: 2016-09-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: curb
@@ -72,28 +72,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.40.0
+        version: 0.42.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.40.0
+        version: 0.42.0
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 11.1.0
+        version: 11.2.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 11.1.0
+        version: 11.2.0
 - !ruby/object:Gem::Dependency
   name: codecov
   requirement: !ruby/object:Gem::Requirement
@@ -114,28 +114,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.4.0
+        version: 3.5.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.4.0
+        version: 3.5.0
 - !ruby/object:Gem::Dependency
   name: fuubar
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.0.0
+        version: 2.2.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.0.0
+        version: 2.2.0
 description: Pulls the statistics from Github's user contribution chart and provides
   an interface for analyzing that data
 email: me@lesaker.org
@@ -144,6 +144,7 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
+- ".circle-ruby"
 - ".gitignore"
 - ".prospectus"
 - ".rspec"