ghee 0.11.16 → 0.12.16

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d4632fb35cf000d7f6fe844d1d8672297502a29a
-  data.tar.gz: 979de725a3fac62e7af4cc5794d1f65f7d6a0abd
+  metadata.gz: 2c51e8b1e6c08b70499f35de0a23cae8b63e1a6e
+  data.tar.gz: 049da506b9d66e381fadfe141b50bd1eccafb4ba
 SHA512:
-  metadata.gz: f8fe541f0d64025037aa127a329fdcc165be9001fc5e918fe27e5c99e592969f42f97468bc7027922c1735ae4e7d2c5286e0f17ec2577d195d83b7e9b377c238
-  data.tar.gz: e811288c74181163b8f67f3c9f4e62edf69e21d42af1f587aae98f292ee6aabd73ca7f33b7a733cc9fa9e7f0a2aab3d1dfb398c2d6fb87f753f479dc94c57d61
+  metadata.gz: c9ed847d603f4afdfb209baeae64510b42507caaf5d9a663089d3d702e66aec9f80049884e8cc54a050dd1b38df1da5617a6fb672b2ee735490cab6941771e14
+  data.tar.gz: 2e2204ba0e54d1c497e9f66cb03f09ba00e8b2c8c7b0bdb694b3e300ecc9e518b965ff9d754f42386d5addadbf7b46e8e10ac07b6be981c2cb3e3f684934374a

data/.ruby-version

@@ -1 +1 @@
-2.1.2
+2.1.5

data/lib/ghee/api/orgs.rb

@@ -10,6 +10,12 @@ class Ghee
     #
     module Orgs
 
+      module Memberships
+        class MembershipsProxy < ::Ghee::ResourceProxy
+          accept_header "application/vnd.github.moondragon+json"
+        end
+      end
+
       # Orgs::Teams module handles all of the Github Organization Teams
       # API endpoints
       #
@@ -41,9 +47,9 @@ class Ghee
         class Proxy < ::Ghee::ResourceProxy
           include Ghee::CUD
 
-          def members(name=nil)
+          def members(name=nil, &block)
             prefix = name ? "#{path_prefix}/members/#{name}" : "#{path_prefix}/members"
-            Ghee::API::Orgs::Teams::Members::Proxy.new(connection, prefix)
+            Ghee::API::Orgs::Teams::Members::Proxy.new(connection, prefix, name, &block)
           end
 
         end
@@ -59,20 +65,19 @@ class Ghee
         #
         # Returns json
         #
-        def teams(number=nil,params={})
-          params = number if number.is_a?Hash
+        def teams(number=nil, &block)
           prefix = (!number.is_a?(Hash) and number) ? "./teams/#{number}" : "#{path_prefix}/teams"
-          Ghee::API::Orgs::Teams::Proxy.new(connection, prefix, params)
+          Ghee::API::Orgs::Teams::Proxy.new(connection, prefix, number, &block)
         end
 
         # Repos for a orgs
         #
         # Returns json
         #
-        def repos(name=nil,params={})
+        def repos(name=nil, &block)
           params = name if name.is_a?Hash
           prefix = (!name.is_a?(Hash) and name) ? "./repos/#{self["login"]}/#{name}" : "#{path_prefix}/repos"
-          Ghee::API::Repos::Proxy.new(connection,prefix,params)
+          Ghee::API::Repos::Proxy.new(connection,prefix,name, &block)
         end
 
         # User Membership for an org
@@ -82,7 +87,7 @@ class Ghee
 
         def memberships(user, &block)
           prefix = "#{path_prefix}/memberships/#{user}"
-          Proxy.new(connection, prefix, nil, &block)
+          Ghee::API::Orgs::Memberships::MembershipsProxy.new(connection, prefix, nil, &block)
         end
       end
 
@@ -91,7 +96,7 @@ class Ghee
       # Returns json
       #
       def team(number, params={})
-        prefix = "/teams/#{number}" 
+        prefix = "./teams/#{number}" 
         Ghee::API::Orgs::Teams::Proxy.new(connection, prefix, params)
       end
 
@@ -102,10 +107,9 @@ class Ghee
       #
       # Returns json
       #
-      def orgs(name=nil, params={})
-        params = name if name.is_a?Hash
+      def orgs(name=nil, &block)
         prefix = (!name.is_a?(Hash) and name) ? "./orgs/#{name}" : "user/orgs"
-        Proxy.new(connection, prefix, params)
+        Proxy.new(connection, prefix, name, &block)
       end
     end
   end

data/lib/ghee/api/users.rb

@@ -5,6 +5,20 @@ class Ghee
   #
   module API
 
+    module Membership
+      class MembershipProxy < ::Ghee::ResourceProxy
+        def admin?
+          self['role'] == "admin"
+        end
+        def active?
+          self['state'] == 'active'
+        end
+        def activate!
+          connection.patch(path_prefix, {state: "active"}).body
+        end
+      end
+    end
+
     # The Users module handles all of the Github User
     # API endpoints
     #
@@ -19,17 +33,17 @@ class Ghee
         # enables defining methods on the proxy object
         #
         class Proxy < ::Ghee::ResourceProxy
-
           #Org membership for the user
           #
           #State: string to limit scope to either active or 
           #pending
           #
           #Returns json
-          def orgs(state, &block)
-            params = state ? {state: state} : {}
-            connection.get("#{path_prefix}/orgs", params, &block)
+          def org(name, &block)
+            prefix = "#{path_prefix}/#{name}"
+            Ghee::API::Membership::MembershipProxy.new(connection, prefix, nil, &block)
           end
+
         end
       end
 
@@ -71,9 +85,9 @@ class Ghee
         end
 
         # Returns a Memberships Proxy 
-        def memberships
-          prefix = "#{path_prefix}/memberships"
-          Ghee::API::Users::Memberships::Proxy.new(connection, prefix)
+        def memberships(params={state: "active"}, &block)
+          prefix = "#{path_prefix}/memberships/orgs"
+          Ghee::API::Users::Memberships::Proxy.new(connection, prefix, params, &block)
         end
       end
 
@@ -81,8 +95,8 @@ class Ghee
       #
       # Returns json
       #
-      def user
-        Proxy.new(connection, './user')
+      def user(&block)
+        Proxy.new(connection, './user', nil, &block)
       end
 
       # Get a single user

data/lib/ghee/resource_proxy.rb

@@ -8,7 +8,7 @@ class Ghee
   class ResourceProxy
 
     # Undefine methods that might get in the way
-    instance_methods.each { |m| undef_method m unless m =~ /^__|instance_eval|instance_variable_get|object_id|respond_to/ }
+    instance_methods.each { |m| undef_method m unless m =~ /^__|instance_eval|instance_variable_get|object_id|respond_to|class/ }
 
     include Ghee::CUD
 
@@ -18,139 +18,147 @@ class Ghee
     # Expose pagination data
     attr_reader :current_page, :total, :pagination
 
-    # Instantiates proxy with the connection
-    # and path_prefix
-    #
-    # connection - Ghee::Connection object
-    # path_prefix - String
-    #
-    def initialize(connection, path_prefix, params = {}, &block)
-      params = {} if !params.is_a?Hash
-      @connection, @path_prefix, @params = connection, URI.escape(path_prefix), params
-      @block = block if block
-      subject if block
+    def self.accept_header(header)
+      define_method "accept_type" do
+        return @_accept_type ||= "#{header}"
+      end
     end
 
-    # Method_missing takes any message passed
-    # to the ResourceProxy and sends it to the
-    # real object
-    #
-    # message - Message object
-    # args* - Arguements passed
-    #
-    def method_missing(message, *args, &block)
-      subject.send(message, *args, &block)
-    end
+  # Instantiates proxy with the connection
+  # and path_prefix
+  #
+  # connection - Ghee::Connection object
+  # path_prefix - String
+  #
+  def initialize(connection, path_prefix, params = {}, &block)
+    params = {} if !params.is_a?Hash
+    @connection, @path_prefix, @params = connection, URI.escape(path_prefix), params
+    @block = block if block
+    subject if block
+  end
 
-    # Raw is the raw response from the faraday
-    # Use this if you need access to status codes
-    # or header values
-    #
-    def raw
-      connection.get(path_prefix){|req| req.params.merge!params }
+  # Method_missing takes any message passed
+  # to the ResourceProxy and sends it to the
+  # real object
+  #
+  # message - Message object
+  # args* - Arguements passed
+  #
+  def method_missing(message, *args, &block)
+    subject.send(message, *args, &block)
+  end
+
+  # Raw is the raw response from the faraday
+  # Use this if you need access to status codes
+  # or header values
+  #
+  def raw
+    connection.get(path_prefix){|req| req.params.merge!params }
+  end
+
+  # Subject is the response body parsed
+  # as json
+  #
+  # Returns json
+  #
+  def subject
+    @subject ||= connection.get(path_prefix) do |req| 
+      req.params.merge!params 
+      req.headers["Accept"] = accept_type if self.respond_to? :accept_type
+      @block.call(req)if @block
+    end.body
+  end
+
+  # Paginate is a helper method to handle
+  # request pagination to the github api
+  #
+  # options - Hash containing pagination params
+  # eg; 
+  #     :per_page => 100, :page => 1
+  #
+  # Returns self
+  #
+  def paginate(options)
+    @current_page = options.fetch(:page) {raise ArgumentError, ":page parameter required"}
+    per_page = options.delete(:per_page) || 30
+    response = connection.get do |req|
+      req.url path_prefix, :per_page => per_page, :page => current_page
+      req.params.merge! params
     end
 
-    # Subject is the response body parsed
-    # as json
-    #
-    # Returns json
-    #
-    def subject
-      @subject ||= connection.get(path_prefix) do |req| 
-        req.params.merge!params 
-        @block.call(req)if @block
-      end.body
+    if @subject.nil?
+      @subject = response.body
+    else
+      @subject = @subject.concat response.body
     end
 
-    # Paginate is a helper method to handle
-    # request pagination to the github api
-    #
-    # options - Hash containing pagination params
-    # eg; 
-    #     :per_page => 100, :page => 1
-    #
-    # Returns self
-    #
-    def paginate(options)
-      @current_page = options.fetch(:page) {raise ArgumentError, ":page parameter required"}
-      per_page = options.delete(:per_page) || 30
-      response = connection.get do |req|
-        req.url path_prefix, :per_page => per_page, :page => current_page
-        req.params.merge! params
-      end
+    parse_link_header response.headers.delete("link")
 
-      if @subject.nil?
-        @subject = response.body
-      else
-        @subject = @subject.concat response.body
-      end
-
-      parse_link_header response.headers.delete("link")
+    return self      
+  end
 
-      return self      
-    end
+  def all
+    return self if pagination && next_page.nil?
 
-    def all
-      return self if pagination && next_page.nil?
+    self.paginate :per_page => 100, :page => next_page || 1
 
-      self.paginate :per_page => 100, :page => next_page || 1
+    self.all
+  end
 
-      self.all
+  def all_parallel
+    connection = @connection.parallel_connection
+    headers = connection.head(path_prefix) do |req|
+      req.params.merge! params.merge(:per_page => 100)
     end
-
-    def all_parallel
-      connection = @connection.parallel_connection
-      headers = connection.head(path_prefix) do |req|
-        req.params.merge! params.merge(:per_page => 100)
-      end
-      pages = pagination_data headers.headers.delete("link")
-      requests = []
-      connection.in_parallel do
-        pages[:pages].to_i.times do |i|
-          requests << connection.get(path_prefix) do |req|
-            req.params.merge! params.merge(:per_page => 100, :page => i + 1)
-          end
+    pages = pagination_data headers.headers.delete("link")
+    requests = []
+    connection.in_parallel do
+      pages[:pages].to_i.times do |i|
+        requests << connection.get(path_prefix) do |req|
+          req.params.merge! params.merge(:per_page => 100, :page => i + 1)
         end
       end
-      requests.inject([]) do |results, page| 
-        results.concat(page.body)
-      end
     end
+    requests.inject([]) do |results, page| 
+      results.concat(page.body)
+    end
+  end
 
-    # Generate first_page, last_page, next_page, prev_page convienence methods
-    %w{ next prev first last }.each do |term|
-      define_method "#{term}_page" do
-        pagination ? pagination[term.to_sym] ? pagination[term.to_sym][:page] : nil : nil
-      end
+  # Generate first_page, last_page, next_page, prev_page convienence methods
+  %w{ next prev first last }.each do |term|
+    define_method "#{term}_page" do
+      pagination ? pagination[term.to_sym] ? pagination[term.to_sym][:page] : nil : nil
     end
+  end
 
-    private 
+  def build_prefix(first_argument, endpoint)
+    (!first_argument.is_a?(Hash) && !first_argument.nil?) ? 
+      File.join(path_prefix, "/#{endpoint}/#{first_argument}") : File.join(path_prefix, "/#{endpoint}")
+  end
 
-    def pagination_data(header)
-      parse_link_header header
-      { pages: @pagination[:last][:page] }
-    end
+  private 
 
-    def build_prefix(first_argument, endpoint)
-      (!first_argument.is_a?(Hash) and first_argument) ? 
-        "#{path_prefix}/#{endpoint}/#{first_argument}" : "#{path_prefix}/#{endpoint}"
-    end
+  def pagination_data(header)
+    parse_link_header header
+    { pages: @pagination[:last][:page] }
+  end
 
-    def parse_link_header(header)
-      return @total = subject.size, @pagination = {} if header.nil?
-      require 'cgi'
-      pattern = /<(.*)>;\s+rel="(.*)"/
-        matches = {}
-      header.split(',').each do |m|
-        match = pattern.match m
-        uri = URI.parse(match[1])
-        uri_params = CGI.parse(uri.query)
-        page = uri_params["page"].first.to_i
-        per_page = uri_params["per_page"] ? uri_params["per_page"].first.to_i : 30
-        matches[match[2].to_sym] = {:link => match[1], :page => page, :per_page => per_page}
-      end
-      @pagination = matches
-    end
 
+  def parse_link_header(header)
+    return @total = subject.size, @pagination = {} if header.nil?
+    require 'cgi'
+    pattern = /<(.*)>;\s+rel="(.*)"/
+    matches = {}
+    header.split(',').each do |m|
+      match = pattern.match m
+      uri = URI.parse(match[1])
+      uri_params = CGI.parse(uri.query)
+      page = uri_params["page"].first.to_i
+      per_page = uri_params["per_page"] ? uri_params["per_page"].first.to_i : 30
+      matches[match[2].to_sym] = {:link => match[1], :page => page, :per_page => per_page}
+    end
+    @pagination = matches
   end
+
+end
 end

data/lib/ghee/version.rb

@@ -1,4 +1,4 @@
 # encoding: UTF-8
 class Ghee
-  VERSION = "0.11.16"
+  VERSION = "0.12.16"
 end

data/spec/ghee/api/orgs_spec.rb

@@ -29,6 +29,15 @@ describe Ghee::API::Orgs do
       end
     end
 
+    describe "#memberships" do
+      it "should return a membership" do
+        VCR.use_cassette "orgs(login).memberships(user)" do
+          membership = subject.orgs(GH_ORG).memberships(GH_USER)
+          membership["state"].should == "active"
+        end
+      end
+    end
+
     describe "#repos" do
       it "should return a list of repos" do
         VCR.use_cassette "orgs(login).repos" do

data/spec/ghee/api/users_spec.rb

@@ -3,6 +3,23 @@ require 'spec_helper'
 describe Ghee::API::Users do
   subject { Ghee.new(GH_AUTH) }
 
+  describe "#memberships" do
+    it "should return a list of memberships" do
+      VCR.use_cassette('user.memberships') do
+        memberships = subject.user.memberships
+        memberships.size.should > 0
+      end
+    end
+    it "should return a single membership" do
+      VCR.use_cassette('user.memberships.org(org)') do
+        memberships = subject.user.memberships.org(GH_ORG)
+        memberships['state'].should == 'active'
+        memberships.active?.should be_true
+        memberships.admin?.should be_true
+      end
+    end
+  end
+
   describe "#user" do
     it "should return authenticated user" do
       VCR.use_cassette('user') do

data/spec/ghee/resource_proxy_spec.rb

@@ -199,6 +199,15 @@ describe Ghee::ResourceProxy do
     end
   end
 
+  describe "#build_prefix" do
+    it 'should not append the prefix if hash' do
+      subject.build_prefix({}, "bar").should == "/foo/bar"
+    end
+    it 'should append the prefix if param is not a hash' do
+      subject.build_prefix("baz", "bar").should == "/foo/bar/baz"
+    end
+  end
+
   describe "#method_missing" do
     it "should pass message and args to target" do
       subject.upcase.should == "BAR!"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ghee
 version: !ruby/object:Gem::Version
-  version: 0.11.16
+  version: 0.12.16
 platform: ruby
 authors:
 - Ryan Rauh
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-14 00:00:00.000000000 Z
+date: 2015-03-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday