github-calendar 1.1.0 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fbf50a1eafa4c9bc2d866e025534f0d01ee71ba5
-  data.tar.gz: 4d734ac9bf923934cca3d082f422ba1e01ba1d5e
+  metadata.gz: f05f60b5ed374e073c583e77a0940ffb3ec9710c
+  data.tar.gz: 1edb5b0427f24504e601695832d3de5f68108bd0
 SHA512:
-  metadata.gz: 275737388b653d3f376f3693c1cb504e4aa9777588b8c28253e8c0a2da4f0bedbc3c23111c25672ff5eff9542c77bc0d52973fc9896b65f5176e9ed89b026294
-  data.tar.gz: 1c24863ea5beb5276cf4c11d78952055aebbfca58de6539428acc57f48f4656a42242a51ceb98e841fa5651fc88a8573c93c27fc76295941dfca4d55bb4b8cbe
+  metadata.gz: 4fe87b15a86f10edcb208d177057d0b1d712dfdf95f44a50f2ee64ccb6fe2a2fb63c386edfac9077082870e081ebbba23438258f0173743b76d1a6b26261a465
+  data.tar.gz: 70bff1e4714f51fb1ff4433baca136f11e913cb8658fa791ff779052dc1f1908105605ed9180f3448e0be1bf702742b360c22dcfbb304367697f05bb07162fd8

data/CHANGELOG.md

@@ -1,5 +1,10 @@
 # Changelog
 ## Version 1
+### Version 1.2.0
+* Switch to Curb instead of OpenURI for the `#get_page_source` method, due to possible conflicted `Kernel#open` monkeypatches from Sinatra and OpenURI (#4, ghuls-web#15)
+* Improve reliability of `#get_daily`, `#get_weekly`, and `#get_monthly` by properly using Nokogiri's Element methods.
+* `#get_calendar` no longer gets the initial `g` (containing the entire calendar); just the individual weeks as a NodeSet.
+
 ### Version 1.1.0
 * Bump Ruby to 2.3.0, Nokogiri to 1.6.7.2, and StringUtility to 2.7.1.
 * Improve some redundant regex.

data/lib/github/calendar.rb

@@ -1,4 +1,4 @@
-require 'open-uri'
+require 'curb'
 require 'nokogiri'
 require 'string-utility'
 require_relative 'exceptions'
@@ -42,13 +42,12 @@ module GitHub
       weeks = get_calendar(user)
       ret = {}
       count = 0
-      weeks[1..-1].each do |k|
-        data = 0
-        capture = k.to_s.scan(/data-count="(.*?)"/)
-        capture[1..-1].each do |ints|
-          data += ints[0].to_i
+      weeks.each do |k|
+        week_data = 0
+        k.children.each do |element|
+          week_data += element.attribute('data-count').value.to_i
         end
-        ret[count] = data
+        ret[count] = week_data
         count += 1
       end
       ret
@@ -61,10 +60,10 @@ module GitHub
       weeks = get_calendar(user)
       ret = {}
       count = 0
-      weeks[1..-1].each do |k|
-        capture = k.to_s.scan(/data-count="(.*?)"/)
-        capture[1..-1].each do |i|
-          ret[count] = i[0].to_i
+      weeks.each do |k|
+        k.children.each do |day|
+          val = day.attribute('data-count').value.to_i
+          ret[count] = val
           count += 1
         end
       end
@@ -91,11 +90,11 @@ module GitHub
         '11' => 0,
         '12' => 0
       }
-      weeks[1..-1].each do |k|
-        date = k.to_s.scan(/data-date=".*-(.*?)-/)
-        capture = k.to_s.scan(/data-count="(.*?)"/)
-        capture[1..-1].each do |i|
-          ret[date[0][0]] += i[0].to_i
+      weeks.each do |k|
+        k.children.each do |day|
+          date = day.attribute('data-date').value.split('-')[1]
+          count = day.attribute('data-count').value
+          ret[date] += count.to_i
         end
       end
       ret
@@ -133,7 +132,7 @@ module GitHub
     # @raise [UserNotFoundException] If the user is not found.
     def get_page_source(user)
       begin
-        Nokogiri::HTML(open("https://github.com/#{user}"), &:noblanks)
+        Nokogiri::HTML(Curl.get("https://github.com/#{user}").body_str, &:noblanks)
       rescue OpenURI::HTTPError
         raise GitHub::Exceptions::UserNotFoundException.new(user)
       end
@@ -141,11 +140,11 @@ module GitHub
 
     # Gets the parsed calendar HTML source for the user profile.
     # @param user [String] See #get_total_year
-    # @return [Nokogiri::XML::NodeSet] The NodeSet for all the g's in the calendar. Consider this as an array of all
-    # the weeks. In iteration, you will probably want to skip the first, as it is the total yearly.
+    # @return [Nokogiri::XML::NodeSet] The NodeSet for all the days in the calendar. Consider this as an array of all
+    # the weeks.
     def get_calendar(user)
       source = get_page_source(user)
-      source.css('svg.js-calendar-graph-svg g')
+      source.css('svg.js-calendar-graph-svg g g')
     end
 
     # Gets an average for all the integer values in a hash.

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: github-calendar
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.2.0
 platform: ruby
 authors:
 - Eli Foster
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-16 00:00:00.000000000 Z
+date: 2016-03-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
@@ -38,6 +38,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 2.7.1
+- !ruby/object:Gem::Dependency
+  name: curb
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.9.1
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.9.1
 description: A library that allows for quick HTML parsing of GitHub user profile contribution
   calendars. This project is part of the GitHub User Language Statistics project.
 email: elifosterwy@gmail.com