github_api 0.4.3 → 0.4.4

data/README.md

@@ -141,13 +141,19 @@ or organisation name, allow you to switch the way the data is returned to you, f
 
 ```ruby
 @github = Github.new
-@github.git_data.tree 'peter-murach', 'github', 'c18647b75d72f19c1e0cc8af031e5d833b7f12ea' # => gets a tree
+@github.git_data.tree 'peter-murach', 'github', 'c18647b75d72f19c1e0cc8af031e5d833b7f12ea'
+# => gets a tree
 
-@github.git_data.tree 'peter-murach', 'github', 'c18647b75d72f19c1e0cc8af031e5d833b7f12ea', :recursive => true # => gets a whole tree recursively
+@github.git_data.tree 'peter-murach', 'github', 'c18647b75d72f19c1e0cc8af031e5d833b7f12ea', :recursive => true
+# => gets a whole tree recursively
+```
 
 by passing a block you can iterate over the file tree
 
-@github.git_data.tree 'peter-murach', 'github', 'c18647b75d72f19c1e0cc8af031e5d833b7f12ea', :recursive => true do |file|
+```ruby
+@github.git_data.tree 'peter-murach', 'github', 'c18647b75d72f19c1e0cc8af031e5d833b7f12ea',
+  :recursive => true do |file|
+
   puts file.path
 end
 ```
@@ -210,7 +216,7 @@ end
 or
 
 Github.new(:oauth_token => YOUR_OAUTH_TOKEN)
-Github.new(:basic_auth => 'login:password)
+Github.new(:basic_auth => 'login:password')
 ```
 
 All parameters can be overwirtten as per method call. By passing parameters hash...

data/features/cassettes/gists/comments/all.yml

@@ -0,0 +1,121 @@
+--- 
+- !ruby/struct:VCR::HTTPInteraction 
+  request: !ruby/struct:VCR::Request 
+    method: :get
+    uri: https://api.github.com:443/gists/999390/comments
+    body: 
+    headers: 
+      accept-encoding: 
+      - gzip;q=1.0,deflate;q=0.6,identity;q=0.3
+  response: !ruby/struct:VCR::Response 
+    status: !ruby/struct:VCR::ResponseStatus 
+      code: 200
+      message: OK
+    headers: 
+      server: 
+      - nginx/1.0.4
+      date: 
+      - Sun, 05 Feb 2012 12:59:01 GMT
+      content-type: 
+      - application/json; charset=utf-8
+      transfer-encoding: 
+      - chunked
+      connection: 
+      - keep-alive
+      status: 
+      - 200 OK
+      x-ratelimit-limit: 
+      - "5000"
+      etag: 
+      - "\"505353f9d67f512676a7f199e6cd34db\""
+      x-ratelimit-remaining: 
+      - "4997"
+      content-encoding: 
+      - gzip
+    body: !binary |
+      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
+      7wwy/en9+ut/AVz6QpKlNAAA
+
+    http_version: "1.1"

data/features/cassettes/gists/comments/first.yml

@@ -0,0 +1,46 @@
+--- 
+- !ruby/struct:VCR::HTTPInteraction 
+  request: !ruby/struct:VCR::Request 
+    method: :get
+    uri: https://api.github.com:443/gists/comments/33469
+    body: 
+    headers: 
+      accept-encoding: 
+      - gzip;q=1.0,deflate;q=0.6,identity;q=0.3
+  response: !ruby/struct:VCR::Response 
+    status: !ruby/struct:VCR::ResponseStatus 
+      code: 200
+      message: OK
+    headers: 
+      server: 
+      - nginx/1.0.4
+      date: 
+      - Sun, 05 Feb 2012 12:59:01 GMT
+      content-type: 
+      - application/json; charset=utf-8
+      transfer-encoding: 
+      - chunked
+      connection: 
+      - keep-alive
+      status: 
+      - 200 OK
+      x-ratelimit-limit: 
+      - "5000"
+      etag: 
+      - "\"612aa3594782fab47ab767da9f377a8c\""
+      x-ratelimit-remaining: 
+      - "4996"
+      content-encoding: 
+      - gzip
+    body: !binary |
+      H4sIAAAAAAAAA4VSy27cMAz8FcJAb+vX2smuDRQ5FAjSe5BDLwElUbZgWRIk
+      ua0T5N8jO91ie2luA4kznCH5mi1eZ302xuhCX5boVDGoOC6s4HYuBxViKBOa
+      ySTQNO1tlx0yZsWaSE/kV+DW6gNoa6cAWk0EcSTwNNBvCoBGgMM47v+LSw+e
+      YFJaKzOAIy+tn9FwKuDbSHwCu0S4WLmy4Tg6X4rV2JxpFV/IQ2ICI8PHGf20
+      qSEIJSX5ZBQwOOIRrLzusZsJHDUylURWyGG0vyD1X2GTDiAsfAdDJMAaeCA/
+      2eUOUtzFCYwknjGm0MeqrvPqJm/qx/q2P970TfNjqwnks/71/+PcikK5p0mU
+      weNPjOiflUi6TNatrLqT5GdG7flUdazFTiIxLpF3MhG0HZRJpReBP/R/NxiI
+      L56Ki/i+xo/C8rMWd+Lr3zs4tueCCpxwRlUYiiWGQDFcHceX472acaCQwKXb
+      Nc7rtiqcGZLxLeCpObf12wfe7+iQcU+fzPXtHbPbLeKgAgAA
+
+    http_version: "1.1"

data/features/gists/comments.feature

@@ -0,0 +1,25 @@
+Feature: Accessing Gists Comments API
+  In order to interact with github gist comments
+  GithubAPI gem
+  Should return the expected results depending on passed parameters
+
+  Background:
+    Given I have "Github::Gists" instance
+
+  Scenario: Lists comments on a gist
+    When I am looking for "comments" with the following params:
+      | gist_id |
+      | 999390  |
+      And I make request within a cassette named "gists/comments/all"
+    Then the response should be "200"
+      And the response type should be "JSON"
+      And the response should have 18 items
+
+  Scenario: Gets a single gist's comment
+    When I am looking for "comment" with the following params:
+      | comment_id |
+      | 33469      |
+    And I make request within a cassette named "gists/comments/first"
+    Then the response should be "200"
+      And the response type should be "JSON"
+      And the response should not be empty

data/features/step_definitions/common_steps.rb

@@ -17,3 +17,7 @@ end
 Then /^the response should have (\d+) items$/ do |size|
   @response.size.should eql size.to_i
 end
+
+Then /^the response should not be empty$/ do
+  @response.should_not be_empty
+end

data/lib/github_api.rb

@@ -59,6 +59,7 @@ module Github
 
   autoload_all 'github_api',
     :API          => 'api',
+    :ApiFactory   => 'api_factory',
     :Client       => 'client',
     :Repos        => 'repos',
     :Request      => 'request',
@@ -78,6 +79,8 @@ module Github
     :Authorizations => 'authorizations',
     :PageLinks    => 'page_links',
     :PageIterator => 'page_iterator',
-    :PagedRequest => 'paged_request'
+    :PagedRequest => 'paged_request',
+    :Validation   => 'validation',
+    :Filter       => 'filter'
 
 end # Github

data/lib/github_api/api.rb

@@ -2,12 +2,14 @@
 
 require 'github_api/configuration'
 require 'github_api/connection'
+require 'github_api/validation'
 require 'github_api/request'
 require 'github_api/mime_type'
 require 'github_api/core_ext/hash'
 require 'github_api/core_ext/array'
 require 'github_api/compatibility'
 require 'github_api/api/actions'
+require 'github_api/api_factory'
 
 module Github
 
@@ -17,12 +19,8 @@ module Github
     include MimeType
     include Connection
     include Request
-
-    VALID_API_KEYS = [
-      'page',
-      'per_page',
-      'jsonp_callback'
-    ]
+    include Validation
+    include Filter
 
     attr_reader *Configuration::VALID_OPTIONS_KEYS
     attr_accessor *VALID_API_KEYS
@@ -69,14 +67,6 @@ module Github
       Github.api_client = self
     end
 
-    # Passes configuration options to instantiated class
-    def _create_instance(klass, options)
-      options.symbolize_keys!
-      instance = klass.send :new, options
-      Github.api_client = instance
-      instance
-    end
-
     # Responds to attribute query or attribute clear
     def method_missing(method, *args, &block) # :nodoc:
       case method.to_s
@@ -89,23 +79,6 @@ module Github
       end
     end
 
-    def _validate_inputs(required, provided) # :nodoc:
-      required.all? do |key|
-        provided.has_deep_key? key
-      end
-    end
-
-    def _validate_presence_of(*params) # :nodoc:
-      params.each do |param|
-        raise ArgumentError, "parameter cannot be nil" if param.nil?
-      end
-    end
-
-    def _validate_user_repo_params(user_name, repo_name) # :nodoc:
-      raise ArgumentError, "[user] parameter cannot be nil" if user_name.nil?
-      raise ArgumentError, "[repo] parameter cannot be nil" if repo_name.nil?
-    end
-
     def _update_user_repo_params(user_name, repo_name=nil) # :nodoc:
       self.user = user_name || self.user
       self.repo = repo_name || self.repo
@@ -119,45 +92,6 @@ module Github
       { 'user' => self.user, 'repo' => self.repo }.merge!(params)
     end
 
-    # Turns any keys from nested hashes including nested arrays into strings
-    def _normalize_params_keys(params)  #  :nodoc:
-      case params
-      when Hash
-        params.keys.each do |k|
-          params[k.to_s] = params.delete(k)
-          _normalize_params_keys(params[k.to_s])
-        end
-      when Array
-        params.map! do |el|
-          _normalize_params_keys(el)
-        end
-      else
-        params.to_s
-      end
-      return params
-    end
-
-    # Removes any keys from nested hashes that don't match predefiend keys
-    def _filter_params_keys(keys, params)  # :nodoc:
-      case params
-      when Hash
-        params.keys.each do |k, v|
-          unless (keys.include?(k) or VALID_API_KEYS.include?(k))
-            params.delete(k)
-          else
-            _filter_params_keys(keys, params[k])
-          end
-        end
-      when Array
-        params.map! do |el|
-          _filter_params_keys(keys, el)
-        end
-      else
-        params
-      end
-      return params
-    end
-
     def _hash_traverse(hash, &block)
       hash.each do |key, val|
         block.call(key)
@@ -175,18 +109,6 @@ module Github
       return hash
     end
 
-    # Ensures that hash values contain predefined values
-    def _validate_params_values(options, params)  # :nodoc:
-      params.each do |k, v|
-        next unless options.keys.include?(k)
-        if options[k].is_a?(Array) && !options[k].include?(params[k])
-          raise ArgumentError, "Wrong value for #{k}, allowed: #{options[k].join(', ')}"
-        elsif options[k].is_a?(Regexp) && !(options[k] =~ params[k])
-          raise ArgumentError, "String does not match the parameter value."
-        end
-      end
-    end
-
     def _merge_mime_type(resource, params) # :nodoc:
 #       params['resource'] = resource
 #       params['mime_type'] = params['mime_type'] || :raw

data/lib/github_api/api/actions.rb

@@ -18,8 +18,8 @@ module Github
 
     def api_methods_in(klass)
       puts "---"
-      (klass.send(:instance_methods, false) - ['actions']).sort.each do |rest_met|
-        puts "|--> #{rest_met}"
+      (klass.send(:instance_methods, false) - ['actions']).sort.each do |method|
+        puts "|--> #{method}"
       end
       klass.included_modules.each do |mod|
         if mod.to_s =~ /#{klass}/
@@ -34,5 +34,17 @@ module Github
       nil
     end
 
+    def append_arguments(method)
+      _method = self.method(method)
+      if _method.arity == 0
+        args = "()"
+      elsif _method.arity > 0
+        args = "(few)"
+      else
+        args = "(else)"
+      end
+      args
+    end
+
   end # API
 end # Github

data/lib/github_api/api_factory.rb

@@ -0,0 +1,24 @@
+# encoding: utf-8
+
+require 'github_api/core_ext/hash'
+
+module Github
+  class ApiFactory
+
+    # Instantiates a new github api object
+    def self.new(klass, options={})
+      return _create_instance(klass, options) if klass
+      raise ArgumentError, 'must provied klass to be instantiated'
+    end
+
+  private
+
+    # Passes configuration options to instantiated class
+    def self._create_instance(klass, options)
+      options.symbolize_keys!
+      instance = Github.const_get(klass.to_sym).new options
+      Github.api_client = instance
+      instance
+    end
+  end
+end # Github

data/lib/github_api/client.rb

@@ -4,51 +4,51 @@ module Github
   class Client < API
 
     def gists(options = {})
-      @gists ||= _create_instance Github::Gists, options
+      @gists ||= ApiFactory.new 'Gists', options
     end
 
     # The Git Database API gives you access to read and write raw Git objects
     # to your Git database on GitHub and to list and update your references
     # (branch heads and tags).
     def git_data(options = {})
-      @git_data ||= _create_instance Github::GitData, options
+      @git_data ||= ApiFactory.new 'GitData', options
     end
     alias :git :git_data
 
     def issues(options = {})
-      @issues ||= _create_instance Github::Issues, options
+      @issues ||= ApiFactory.new 'Issues', options
     end
 
     def orgs(options = {})
-      @orgs ||= _create_instance Github::Orgs, options
+      @orgs ||= ApiFactory.new 'Orgs', options
     end
     alias :organizations :orgs
 
     def pull_requests(options = {})
-      @pull_requests ||= _create_instance Github::PullRequests, options
+      @pull_requests ||= ApiFactory.new 'PullRequests', options
     end
 
     def repos(options = {})
-      @repos ||= _create_instance Github::Repos, options
+      @repos ||= ApiFactory.new 'Repos', options
     end
     alias :repositories :repos
 
     # Many of the resources on the users API provide a shortcut for getting 
     # information about the currently authenticated user.
     def users(options = {})
-      @users ||= _create_instance Github::Users, options
+      @users ||= ApiFactory.new 'Users', options
     end
 
     # This is a read-only API to the GitHub events.
     # These events power the various activity streams on the site.
     def events(options = {})
-      @events ||= _create_instance Github::Events, options
+      @events ||= ApiFactory.new 'Events', options
     end
 
     # An API for users to manage their own tokens. You can only access your own
     # tokens, and only through Basic Authentication.
     def oauth(options = {})
-      @oauth ||= _create_instance Github::Authorizations, options
+      @oauth ||= ApiFactory.new 'Authorizations', options
     end
 
   end # Client