gh 0.2.2 → 0.2.3

data/README.md

@@ -111,6 +111,7 @@ I hope so, we use it in production for [Travis CI](http://travis-ci.org/). The w
 
 ## History
 
+* 2012-04-10: 0.2.3 - better normalization
 * 2012-04-10: 0.2.2 - improved link following
 * 2012-04-10: 0.2.1 - bug fix release
 * 2012-04-10: 0.2.0 - added link following plus bug fixes (mainly encoding issues)

data/lib/gh/normalizer.rb

@@ -48,7 +48,12 @@ module GH
     end
 
     def modify_time(hash, key, value)
-      hash['date'] = Time.at(value).xmlschema if key == 'timestamp'
+      return unless key == 'timestamp'
+      time = Time.at(value)
+    rescue TypeError
+      time = Time.parse(value.to_s)
+    ensure
+      hash['date'] = time.xmlschema if time
     end
 
     def modify_user(hash)
@@ -57,6 +62,15 @@ module GH
 
       hash['committer'] ||= hash['author']    if hash['author']
       hash['author']    ||= hash['committer'] if hash['committer']
+
+      modify_user_fields hash['owner']
+      modify_user_fields hash['user']
+    end
+
+    def modify_user_fields(hash)
+      return unless Hash === hash
+      hash['login'] = hash.delete('name') if hash['name']
+      set_link hash, 'self', "users/#{hash['login']}" unless links(hash).include? 'self'
     end
 
     def modify_url(hash, key, value)
@@ -73,20 +87,20 @@ module GH
 
     def modify_key(key, value = nil)
       case key
-      when 'gravatar_url'         then 'avatar_url'
-      when 'org'                  then 'organization'
-      when 'orgs'                 then 'organizations'
-      when 'username'             then 'login'
-      when 'repo'                 then 'repository'
-      when 'repos'                then modify_key('repositories', value)
-      when /^repos?_(.*)$/        then "repository_#{$1}"
-      when /^(.*)_repo$/          then "#{$1}_repository"
-      when /^(.*)_repos$/         then "#{$1}_repositories"
-      when 'commit', 'commit_id'  then value =~ /^\w{40}$/ ? 'sha' : key
-      when 'comments'             then Numeric === value ? 'comment_count'    : key
-      when 'forks'                then Numeric === value ? 'fork_count'       : key
-      when 'repositories'         then Numeric === value ? 'repository_count' : key
-      when /^(.*)s_count$/        then "#{$1}_count"
+      when 'gravatar_url'               then 'avatar_url'
+      when 'org'                        then 'organization'
+      when 'orgs'                       then 'organizations'
+      when 'username'                   then 'login'
+      when 'repo'                       then 'repository'
+      when 'repos'                      then modify_key('repositories', value)
+      when /^repos?_(.*)$/              then "repository_#{$1}"
+      when /^(.*)_repo$/                then "#{$1}_repository"
+      when /^(.*)_repos$/               then "#{$1}_repositories"
+      when 'commit', 'commit_id', 'id'  then value =~ /^\w{40}$/ ? 'sha' : key
+      when 'comments'                   then Numeric === value ? 'comment_count'    : key
+      when 'forks'                      then Numeric === value ? 'fork_count'       : key
+      when 'repositories'               then Numeric === value ? 'repository_count' : key
+      when /^(.*)s_count$/              then "#{$1}_count"
       else key
       end
     end

data/lib/gh/version.rb

@@ -1,4 +1,4 @@
 module GH
   # Public: Library version.
-  VERSION = "0.2.2"
+  VERSION = "0.2.3"
 end

data/spec/normalizer_spec.rb

@@ -205,6 +205,18 @@ describe GH::Normalizer do
     end
   end
 
+  context 'time' do
+    it 'transforms timestamps stored in "timestamp" to a date in "date"' do
+      normalize 'timestamp' => 1234
+      normalized['date'].should be == Time.at(1234).xmlschema
+    end
+
+    it 'transforms dates stored in "timestamp" to a date in "date"' do
+      normalize 'timestamp' => "2012-04-12T17:29:51+02:00"
+      normalized['date'].should be == Time.parse("2012-04-12T17:29:51+02:00").xmlschema
+    end
+  end
+
   context 'links' do
     it 'generates link entries from link headers' do
       pending

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gh
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.2.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-04-10 00:00:00.000000000 Z
+date: 2012-04-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70323064331020 !ruby/object:Gem::Requirement
+  requirement: &70266152433620 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70323064331020
+  version_requirements: *70266152433620
 - !ruby/object:Gem::Dependency
   name: webmock
-  requirement: &70323064330300 !ruby/object:Gem::Requirement
+  requirement: &70266152433160 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70323064330300
+  version_requirements: *70266152433160
 - !ruby/object:Gem::Dependency
   name: faraday
-  requirement: &70323064329600 !ruby/object:Gem::Requirement
+  requirement: &70266152432640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: '0.7'
   type: :runtime
   prerelease: false
-  version_requirements: *70323064329600
+  version_requirements: *70266152432640
 - !ruby/object:Gem::Dependency
   name: backports
-  requirement: &70323064329040 !ruby/object:Gem::Requirement
+  requirement: &70266152432140 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +54,10 @@ dependencies:
         version: '2.3'
   type: :runtime
   prerelease: false
-  version_requirements: *70323064329040
+  version_requirements: *70266152432140
 - !ruby/object:Gem::Dependency
   name: multi_json
-  requirement: &70323064328540 !ruby/object:Gem::Requirement
+  requirement: &70266152431660 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,7 +65,7 @@ dependencies:
         version: '1.0'
   type: :runtime
   prerelease: false
-  version_requirements: *70323064328540
+  version_requirements: *70266152431660
 description: multi-layer client for the github api v3
 email:
 - konstantin.mailinglists@googlemail.com