gh 0.2.3 → 0.2.4

data/README.md

@@ -16,6 +16,7 @@ This will by default use all the middleware that ships with GH, in the following
 * `GH::Cache` - caches the responses (will use Rails cache if in Rails, in-memory cache otherwise)
 * `GH::LazyLoader` - will load missing fields when accessed (handy for dealing with incomplete data without sending to many requests)
 * `GH::LinkFollower` - will add content of hypermedia links as fields (lazyly), allows you to traverse relations
+* `GH::MergeCommit` - adds infos about merge commits to pull request payloads
 
 ## Main Entry Points
 
@@ -88,7 +89,7 @@ end
 That way, you could create a stack with, for instance, an [access token](http://developer.github.com/v3/oauth/):
 
 ``` ruby
-authenticated = GH::DefaultStack token: 'e72e16c7e42f292c6912e7710c838347ae178b4a'
+authenticated = GH::DefaultStack.build token: 'e72e16c7e42f292c6912e7710c838347ae178b4a'
 
 GH.with(authenticated) do
   # ...
@@ -111,7 +112,8 @@ 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-13: 0.2.3 - added support for merge commits
+* 2012-04-12: 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.rb

@@ -7,6 +7,7 @@ module GH
   autoload :Case,         'gh/case'
   autoload :LazyLoader,   'gh/lazy_loader'
   autoload :LinkFollower, 'gh/link_follower'
+  autoload :MergeCommit,  'gh/merge_commit'
   autoload :Normalizer,   'gh/normalizer'
   autoload :Remote,       'gh/remote'
   autoload :Response,     'gh/response'
@@ -34,6 +35,7 @@ module GH
 
   DefaultStack = Stack.new do
     use LinkFollower
+    use MergeCommit
     use LazyLoader
     use Cache
     use Normalizer

data/lib/gh/lazy_loader.rb

@@ -6,9 +6,9 @@ module GH
     wraps GH::Normalizer
     double_dispatch
 
-    def modify_hash(hash)
-      hash = super
-      link = hash['_links'].try(:[], 'self')
+    def modify_hash(hash, loaded = false)
+      hash = super(hash)
+      link = hash['_links'].try(:[], 'self') unless loaded
       setup_lazy_loading(hash, link['href']) if link
       hash
     end
@@ -16,7 +16,7 @@ module GH
     private
 
     def lazy_load(hash, key, link)
-      backend[link]
+      result = modify_hash(backend[link].data, true)
     end
   end
 end

data/lib/gh/link_follower.rb

@@ -13,7 +13,7 @@ module GH
 
     def lazy_load(hash, key)
       link = hash['_links'][key]
-      { key => backend[link['href']] } if link
+      { key => self[link['href']] } if link
     end
   end
 end

data/lib/gh/merge_commit.rb

@@ -0,0 +1,29 @@
+require 'gh'
+
+module GH
+  # Public: ...
+  class MergeCommit < Wrapper
+    wraps GH::Normalizer
+    double_dispatch
+
+    def modify_hash(hash)
+      hash = super
+      setup_lazy_loading(hash) if hash.include? 'mergeable' and hash['mergeable']
+      hash
+    end
+
+    private
+
+    def lazy_load(hash, key)
+      return unless key =~ /^(merge|head)_commit$/
+      link     = hash['_links']['self']['href'].gsub(%r{/pulls/(\d+)$}, '/git/refs/pull/\1')
+      commits  = self[link].map do |data|
+        ref    = data['ref']
+        name   = ref.split('/').last + "_commit"
+        object = data['object'].merge 'ref' => ref
+        [name, object]
+      end
+      Hash[commits]
+    end
+  end
+end

data/lib/gh/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gh
 version: !ruby/object:Gem::Version
-  version: 0.2.3
+  version: 0.2.4
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2012-04-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70266152433620 !ruby/object:Gem::Requirement
+  requirement: &70165430138860 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70266152433620
+  version_requirements: *70165430138860
 - !ruby/object:Gem::Dependency
   name: webmock
-  requirement: &70266152433160 !ruby/object:Gem::Requirement
+  requirement: &70165430138420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70266152433160
+  version_requirements: *70165430138420
 - !ruby/object:Gem::Dependency
   name: faraday
-  requirement: &70266152432640 !ruby/object:Gem::Requirement
+  requirement: &70165430137880 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: '0.7'
   type: :runtime
   prerelease: false
-  version_requirements: *70266152432640
+  version_requirements: *70165430137880
 - !ruby/object:Gem::Dependency
   name: backports
-  requirement: &70266152432140 !ruby/object:Gem::Requirement
+  requirement: &70165430137340 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +54,10 @@ dependencies:
         version: '2.3'
   type: :runtime
   prerelease: false
-  version_requirements: *70266152432140
+  version_requirements: *70165430137340
 - !ruby/object:Gem::Dependency
   name: multi_json
-  requirement: &70266152431660 !ruby/object:Gem::Requirement
+  requirement: &70165430136480 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,7 +65,7 @@ dependencies:
         version: '1.0'
   type: :runtime
   prerelease: false
-  version_requirements: *70266152431660
+  version_requirements: *70165430136480
 description: multi-layer client for the github api v3
 email:
 - konstantin.mailinglists@googlemail.com
@@ -85,6 +85,7 @@ files:
 - lib/gh/faraday.rb
 - lib/gh/lazy_loader.rb
 - lib/gh/link_follower.rb
+- lib/gh/merge_commit.rb
 - lib/gh/normalizer.rb
 - lib/gh/remote.rb
 - lib/gh/response.rb