gitnetworkitis 0.2.0 → 0.4.0

data/Gemfile

@@ -2,14 +2,15 @@ source "http://rubygems.org"
 # Add dependencies required to use your gem here.
 # Example:
 #   gem "activesupport", ">= 2.3.5"
-gem "httparty"
+gem "httparty", ">= 0.8.1"
 
 # Add dependencies to develop your gem here.
 # Include everything needed to run rake, tests, features, etc.
 group :development do
-  gem "rspec", "~> 2.1.0"
-  gem "bundler", "~> 1.0.0"
-  gem "jeweler", "~> 1.5.1"
-  gem "rcov", ">= 0"
+  gem "rspec", "~> 2.8.0"
+  gem "bundler"#, "~> 1.0.0"
+  gem "jeweler"#, "~> 1.5.1"
+  #gem "rcov", ">= 0"
   gem "fakeweb"
+  gem "vcr", "~> 2.0.1"
 end

data/Gemfile.lock

@@ -1,34 +1,40 @@
 GEM
   remote: http://rubygems.org/
   specs:
-    crack (0.1.8)
-    diff-lcs (1.1.2)
+    diff-lcs (1.1.3)
     fakeweb (1.3.0)
     git (1.2.5)
-    httparty (0.6.1)
-      crack (= 0.1.8)
-    jeweler (1.5.1)
-      bundler (~> 1.0.0)
+    httparty (0.8.2)
+      multi_json
+      multi_xml
+    jeweler (1.8.3)
+      bundler (~> 1.0)
       git (>= 1.2.5)
       rake
-    rake (0.8.7)
-    rcov (0.9.9)
-    rspec (2.1.0)
-      rspec-core (~> 2.1.0)
-      rspec-expectations (~> 2.1.0)
-      rspec-mocks (~> 2.1.0)
-    rspec-core (2.1.0)
-    rspec-expectations (2.1.0)
+      rdoc
+    json (1.6.6)
+    multi_json (1.3.2)
+    multi_xml (0.4.4)
+    rake (0.9.2.2)
+    rdoc (3.12)
+      json (~> 1.4)
+    rspec (2.8.0)
+      rspec-core (~> 2.8.0)
+      rspec-expectations (~> 2.8.0)
+      rspec-mocks (~> 2.8.0)
+    rspec-core (2.8.0)
+    rspec-expectations (2.8.0)
       diff-lcs (~> 1.1.2)
-    rspec-mocks (2.1.0)
+    rspec-mocks (2.8.0)
+    vcr (2.0.1)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  bundler (~> 1.0.0)
+  bundler
   fakeweb
-  httparty
-  jeweler (~> 1.5.1)
-  rcov
-  rspec (~> 2.1.0)
+  httparty (>= 0.8.1)
+  jeweler
+  rspec (~> 2.8.0)
+  vcr (~> 2.0.1)

data/VERSION

@@ -1 +1 @@
-0.2.0
+0.4.0

data/get_token.rb

@@ -0,0 +1,40 @@
+require 'rubygems'
+require 'sinatra'
+require 'oauth2' # ~> 0.5.0
+require 'json'
+
+def client
+  OAuth2::Client.new('CLIENT ID', 'SECRET',
+                     :ssl => {:ca_file => '/etc/ssl/ca-bundle.pem'},
+                     :site => 'https://api.github.com',
+                     :authorize_url => 'https://github.com/login/oauth/authorize',
+                     :token_url => 'https://github.com/login/oauth/access_token')
+end
+
+get "/" do
+  %(<p>Update the <code>#new_client</code> method in the sinatra app and <a href="/auth/github">try to authorize</a>.</p>)
+end
+
+get '/auth/github' do
+  url = client.auth_code.authorize_url(:redirect_uri => redirect_uri, :scope => 'user')
+  puts "Redirecting to URL: #{url.inspect}"
+  redirect url
+end
+
+get '/auth/github/callback' do
+  puts params[:code]
+  begin
+    access_token = client.auth_code.get_token(params[:code], :redirect_uri => redirect_uri)
+    user = JSON.parse(access_token.get('/user').body)
+    "<p>Your OAuth access token: #{access_token.token}</p><p>Your extended profile data:\n#{user.inspect}</p>"
+  rescue OAuth2::Error => e
+    %(<p>Outdated ?code=#{params[:code]}:</p><p>#{$!}</p><p><a href="/auth/github">Retry</a></p>)
+  end
+end
+
+def redirect_uri(path = '/auth/github/callback', query = nil)
+  uri = URI.parse(request.url)
+  uri.path  = path
+  uri.query = query
+  uri.to_s
+end

data/gitnetworkitis.gemspec

@@ -4,14 +4,14 @@
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
-  s.name = %q{gitnetworkitis}
-  s.version = "0.2.0"
+  s.name = "gitnetworkitis"
+  s.version = "0.4.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Julian Coutu"]
-  s.date = %q{2011-05-26}
-  s.description = %q{Git API Gem utilizing the Network API}
-  s.email = %q{jcoutu@phaseiiicreations.com}
+  s.date = "2012-04-20"
+  s.description = "Git API Gem utilizing the Network API"
+  s.email = "jcoutu@phaseiiicreations.com"
   s.extra_rdoc_files = [
     "LICENSE.txt",
     "README.rdoc"
@@ -26,102 +26,67 @@ Gem::Specification.new do |s|
     "README.rdoc",
     "Rakefile",
     "VERSION",
+    "get_token.rb",
     "gitnetworkitis-0.1.0.gem",
     "gitnetworkitis.gemspec",
     "lib/gitnetworkitis.rb",
     "lib/gitnetworkitis/base.rb",
+    "lib/gitnetworkitis/batch_response.rb",
     "lib/gitnetworkitis/branch.rb",
     "lib/gitnetworkitis/commit.rb",
-    "lib/gitnetworkitis/network_data.rb",
-    "lib/gitnetworkitis/network_meta.rb",
+    "lib/gitnetworkitis/commit_getter.rb",
+    "lib/gitnetworkitis/getter.rb",
+    "lib/gitnetworkitis/json_helper.rb",
     "lib/gitnetworkitis/repository.rb",
     "spec/base_spec.rb",
     "spec/branch_spec.rb",
-    "spec/commit_spec.rb",
+    "spec/getter_spec.rb",
+    "spec/github_config.yml.example",
     "spec/gitnetworkitis_spec.rb",
-    "spec/network_data_spec.rb",
-    "spec/network_meta_spec.rb",
     "spec/repository_spec.rb",
-    "spec/responses/branch_pages/turingstudio_loupe_51ac36280d2dfe16c37b66ef344859c9c714c8e1?page=0.json",
-    "spec/responses/branch_pages/turingstudio_loupe_51ac36280d2dfe16c37b66ef344859c9c714c8e1?page=1.json",
-    "spec/responses/branch_pages/turingstudio_loupe_51ac36280d2dfe16c37b66ef344859c9c714c8e1?page=2.json",
-    "spec/responses/branch_pages/turingstudio_loupe_51ac36280d2dfe16c37b66ef344859c9c714c8e1?page=3.json",
-    "spec/responses/branch_pages/turingstudio_loupe_51ac36280d2dfe16c37b66ef344859c9c714c8e1?page=4.json",
-    "spec/responses/branch_pages/turingstudio_loupe_51ac36280d2dfe16c37b66ef344859c9c714c8e1?page=5.json",
-    "spec/responses/branch_pages/turingstudio_loupe_bec7b23dc57b14d89fa2829e8c32a108a18e7248?page=0.json",
-    "spec/responses/branch_pages/turingstudio_loupe_bec7b23dc57b14d89fa2829e8c32a108a18e7248?page=1.json",
-    "spec/responses/branch_pages/turingstudio_loupe_bec7b23dc57b14d89fa2829e8c32a108a18e7248?page=2.json",
-    "spec/responses/branch_pages/turingstudio_loupe_bec7b23dc57b14d89fa2829e8c32a108a18e7248?page=3.json",
-    "spec/responses/branch_pages/turingstudio_loupe_bec7b23dc57b14d89fa2829e8c32a108a18e7248?page=4.json",
-    "spec/responses/branch_pages/turingstudio_loupe_c3aeb61e37f94bbb67c4f14b52c23b8e54d30d0e?page=0.json",
-    "spec/responses/branch_pages/turingstudio_loupe_c3aeb61e37f94bbb67c4f14b52c23b8e54d30d0e?page=1.json",
-    "spec/responses/branch_pages/turingstudio_loupe_c3aeb61e37f94bbb67c4f14b52c23b8e54d30d0e?page=2.json",
-    "spec/responses/branch_pages/turingstudio_loupe_c3aeb61e37f94bbb67c4f14b52c23b8e54d30d0e?page=3.json",
-    "spec/responses/branch_pages/turingstudio_loupe_c3aeb61e37f94bbb67c4f14b52c23b8e54d30d0e?page=4.json",
-    "spec/responses/girlambition/0-500.json",
-    "spec/responses/girlambition/1002-1502.json",
-    "spec/responses/girlambition/1503-2003.json",
-    "spec/responses/girlambition/2004-2504.json",
-    "spec/responses/girlambition/2505-3005.json",
-    "spec/responses/girlambition/3006-3506.json",
-    "spec/responses/girlambition/3507-4007.json",
-    "spec/responses/girlambition/4008-4508.json",
-    "spec/responses/girlambition/4509-4999.json",
-    "spec/responses/girlambition/501-1001.json",
-    "spec/responses/girlambition/repos_show_turingstudio_website-girlambition_branches.json",
-    "spec/responses/girlambition/turingstudio_website-girlambition_network_meta.json",
-    "spec/responses/loupe/repos_show_turingstudio_loupe.json",
-    "spec/responses/loupe/repos_show_turingstudio_loupe_branches.json",
-    "spec/responses/loupe/turingstudio_loupe_068161e2c05a6b8029a7eb410dd27b1dfa531338?start=1&end=5.json",
-    "spec/responses/loupe/turingstudio_loupe_068161e2c05a6b8029a7eb410dd27b1dfa531338?start=130.json",
-    "spec/responses/loupe/turingstudio_loupe_branch.json",
-    "spec/responses/loupe/turingstudio_loupe_network_data.json",
-    "spec/responses/loupe/turingstudio_loupe_network_meta.json",
-    "spec/responses/repos_show_jcoutu.json",
-    "spec/responses/repos_watched_jcoutu.json",
-    "spec/spec_helper.rb"
+    "spec/spec_helper.rb",
+    "spec/support/vcr_setup.rb",
+    "spec/vcr_cassettes/all_branches.json",
+    "spec/vcr_cassettes/all_repos.json",
+    "spec/vcr_cassettes/bad_creds.json",
+    "spec/vcr_cassettes/find_repo.json",
+    "spec/vcr_cassettes/spec-branch-1_commits.json",
+    "spec/vcr_cassettes/spec-branch-1_since_date.json",
+    "spec/vcr_cassettes/spec-branch-1_since_sha.json",
+    "spec/vcr_cassettes/spec-branch-2_commits.json",
+    "spec/vcr_cassettes/spec-branch-3_commits.json"
   ]
-  s.homepage = %q{http://github.com/jcoutu/gitnetworkitis}
+  s.homepage = "http://github.com/jcoutu/gitnetworkitis"
   s.licenses = ["MIT"]
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.5.2}
-  s.summary = %q{Git API Gem utilizing the Network API}
-  s.test_files = [
-    "spec/base_spec.rb",
-    "spec/branch_spec.rb",
-    "spec/commit_spec.rb",
-    "spec/gitnetworkitis_spec.rb",
-    "spec/network_data_spec.rb",
-    "spec/network_meta_spec.rb",
-    "spec/repository_spec.rb",
-    "spec/spec_helper.rb"
-  ]
+  s.rubygems_version = "1.8.15"
+  s.summary = "Git API Gem utilizing the Network API"
 
   if s.respond_to? :specification_version then
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<httparty>, [">= 0"])
-      s.add_development_dependency(%q<rspec>, ["~> 2.1.0"])
-      s.add_development_dependency(%q<bundler>, ["~> 1.0.0"])
-      s.add_development_dependency(%q<jeweler>, ["~> 1.5.1"])
-      s.add_development_dependency(%q<rcov>, [">= 0"])
+      s.add_runtime_dependency(%q<httparty>, [">= 0.8.1"])
+      s.add_development_dependency(%q<rspec>, ["~> 2.8.0"])
+      s.add_development_dependency(%q<bundler>, [">= 0"])
+      s.add_development_dependency(%q<jeweler>, [">= 0"])
       s.add_development_dependency(%q<fakeweb>, [">= 0"])
+      s.add_development_dependency(%q<vcr>, ["~> 2.0.1"])
     else
-      s.add_dependency(%q<httparty>, [">= 0"])
-      s.add_dependency(%q<rspec>, ["~> 2.1.0"])
-      s.add_dependency(%q<bundler>, ["~> 1.0.0"])
-      s.add_dependency(%q<jeweler>, ["~> 1.5.1"])
-      s.add_dependency(%q<rcov>, [">= 0"])
+      s.add_dependency(%q<httparty>, [">= 0.8.1"])
+      s.add_dependency(%q<rspec>, ["~> 2.8.0"])
+      s.add_dependency(%q<bundler>, [">= 0"])
+      s.add_dependency(%q<jeweler>, [">= 0"])
       s.add_dependency(%q<fakeweb>, [">= 0"])
+      s.add_dependency(%q<vcr>, ["~> 2.0.1"])
     end
   else
-    s.add_dependency(%q<httparty>, [">= 0"])
-    s.add_dependency(%q<rspec>, ["~> 2.1.0"])
-    s.add_dependency(%q<bundler>, ["~> 1.0.0"])
-    s.add_dependency(%q<jeweler>, ["~> 1.5.1"])
-    s.add_dependency(%q<rcov>, [">= 0"])
+    s.add_dependency(%q<httparty>, [">= 0.8.1"])
+    s.add_dependency(%q<rspec>, ["~> 2.8.0"])
+    s.add_dependency(%q<bundler>, [">= 0"])
+    s.add_dependency(%q<jeweler>, [">= 0"])
     s.add_dependency(%q<fakeweb>, [">= 0"])
+    s.add_dependency(%q<vcr>, ["~> 2.0.1"])
   end
 end
 

data/lib/gitnetworkitis/base.rb

@@ -1,51 +1,21 @@
 module GitNetworkitis
   class Base
-    include HTTParty
-    attr_accessor :username, :token
+    include JSONHelper
+    attr_accessor :token
 
-    def initialize(username, token, options={})
-      @username = username
+    # token is an oauth2 token
+    def initialize(token, options={})
       @token = token
-      self.class.basic_auth "#{username}/token", token
       options.each do |key, value|
         method = "#{key}="
         self.send(method, value) if respond_to? method
       end
     end
 
-    def get url
-      ret = self.class.get(url)
-      if ret.response.code == "200"
-        return ret
-      else
-        raise "Unable to find Github Repository"
-      end
-    end
-
-    def parse_json json
-      begin
-        return JSON.parse(escape_json(json))
-      rescue => e
-        raise "Unable to parse JSON result" #{e.message}
-      end
-    end
-
-
-    private
-    def parse_attributes(json, object)
-      json.each do |key, value|
-        method = "#{key}="
-        if object.respond_to? method
-          object.send(method, value) 
-        end
-      end
-      object
-    end
-
-    #This is for parsing bad json returned from github
-    def escape_json(json)
-      json.gsub(/(....\[31m)./, '')
-      end
-
+    # see Getter for options
+    def get(url, options={})
+      opts = {access_token: token}.merge options
+      Getter.new(url, opts).get
     end
-  end
+  end
+end

data/lib/gitnetworkitis/batch_response.rb

@@ -0,0 +1,24 @@
+module GitNetworkitis
+  # This class serves as a sort of proxy for HTTParty::Response. When a
+  # Base#batched_get is performed, a BatchResponse object is returned,
+  # with a #body made up of the concatenation of its responses'. This
+  # way, paged responses (like for commits) can appear as a single
+  # response body to the code that handles it. This is necessary
+  # because HTTParty::Response has no setter on its #body attribute,
+  # and sets it directly from its #response on #initialize.
+  class BatchResponse
+
+    attr_reader :responses, :body
+
+    def initialize responses
+      @responses = responses
+
+      # Since we're combining response bodies, we have a series of JSON
+      # arrays that need to be joined (hence the gsub).
+      @body = responses.map {|r| r.body.to_s }.
+                        join('').
+                        gsub(/\]\[/, ', ')
+    end
+
+  end
+end

data/lib/gitnetworkitis/branch.rb

@@ -1,42 +1,21 @@
 module GitNetworkitis
   class Branch < Base
-    base_uri 'https://github.com/api/v2/json/'
-
-    attr_accessor :name, :id, :owner, :repo
+    attr_accessor :commit, :name, :owner, :repo
 
     #Retrieves all branches based on a specific repo.
     def find_all(options={})
-      if options.has_key?(:owner) & options.has_key?(:repo) 
-        resp = get("/repos/show/#{options[:owner]}/#{options[:repo]}/branches")
-        json_result = parse_json(escape_json(resp.body.to_s))
-        result = Array.new
-        json_result["branches"].each do |branch|
-          result.push Branch.new(self.username, self.token, {:name =>branch[0], :id => branch[1], :owner => options[:owner], :repo => options[:repo]})
+      if options.has_key?(:owner) & options.has_key?(:repo)
+        resp = get("/repos/#{options[:owner]}/#{options[:repo]}/branches")
+        parse_json(escape_json(resp.body.to_s)).inject([]) do |branches, branch|
+          branches << parse_attributes(branch, Branch.new(token, :owner => options[:owner], :repo => options[:repo]))
         end
-        return result
       end
     end
 
-
-    #Loops pages and returns all commits specific to a branch
-    def commits
-      pages = true
-      counter = 0
-      result = Array.new
-      while pages do
-        resp = self.get("/commits/list/#{self.owner}/#{self.repo}/#{self.id}?page=#{counter}")
-        json_result = parse_json(escape_json(resp.body.to_s))
-        if !json_result.has_key?("error")
-          json_result["commits"].each do |commit|
-            temp_commit = parse_attributes(commit, Commit.new(self.username, self.token))
-            result.push temp_commit
-          end
-        else
-          pages = false
-        end
-        counter = counter+1
-      end
-      result
+    def commits(options={})
+      opts = {access_token: token, per_page: 100, batch: true}.merge options
+      CommitGetter.new("/repos/#{owner}/#{repo}/commits?sha=#{commit['sha']}", opts).get
     end
+
   end
-end
+end

data/lib/gitnetworkitis/commit.rb

@@ -1,8 +1,5 @@
 module GitNetworkitis
   class Commit < Base
-    base_uri 'https://github.com/'
-
-    attr_accessor :parents, :author, :time, :id, :date, :gravatar, :space, :message, :login
-
+    attr_accessor :sha, :url, :author, :committer, :message, :tree, :parents
   end
-end
+end

data/lib/gitnetworkitis/commit_getter.rb

@@ -0,0 +1,50 @@
+module GitNetworkitis
+  #NOTE tested via the Branch specs
+  class CommitGetter < Getter
+    def get
+      if local_options[:since]
+        since_commits
+      else
+        response = super
+        build_commits response
+      end
+    end
+
+    private
+
+    def since_commits
+      since_date = DateTime.parse local_options[:since]
+      batched_since_commits {|c| c.committer['date'] }
+    rescue ArgumentError => e
+      batched_since_commits &:sha
+    end
+
+    def batched_since_commits &block
+      links = {next: url}
+      results = []
+      while links[:next] do
+        self.url = links[:next]
+        resp = single_get
+        staged_commits = build_commits resp
+        since_index = staged_commits.find_index {|c| yield(c) == local_options[:since] }
+        if since_index
+          results += staged_commits.first(since_index)
+          links = {}
+        else
+          results << staged_commits
+          links = build_links_from_headers resp.headers['link']
+        end
+      end
+      results
+    end
+
+    def build_commits(response)
+      parse_json(escape_json(response.body.to_s)).inject([]) do |commits, commit|
+        commit_attrs = commit['commit'].merge('sha' => commit['sha'], 'parents' => commit['parents'])
+        parsed_commit = parse_attributes(commit_attrs, Commit.new(query_options[:access_token]))
+        commits << parsed_commit
+      end
+    end
+
+  end
+end

data/lib/gitnetworkitis/getter.rb

@@ -0,0 +1,64 @@
+module GitNetworkitis
+  class Getter
+    include HTTParty
+    include JSONHelper
+    base_uri 'https://api.github.com'
+
+    attr_accessor :url, :local_options, :query_options
+
+    LOCAL_KEYS = [:batch, :since, :branch]
+
+    def initialize(url, options={})
+      @url = url
+      scrub_local_options options
+      @query_options = options
+    end
+
+    def get
+      local_options[:batch] ? batched_get : single_get
+    end
+
+    private
+    def scrub_local_options(options={})
+      @local_options = LOCAL_KEYS.inject({}) {|opts, key| opts[key] = options.delete(key); opts }
+      @local_options[:batch] = true unless @local_options[:since].nil?
+    end
+
+    def single_get(use_query_options=true)
+      ret = use_query_options ? Getter.get(url, query: query_options) : Getter.get(url)
+      if ret.response.code == "200"
+        return ret
+      else
+        raise "Unable to find Github Repository"
+      end
+    end
+
+    def batched_get
+      resps = []
+      links = {next: url}
+      first_batch = true
+      while links[:next] do
+        self.url = links[:next]
+        resp = single_get first_batch
+        resps << resp
+        first_batch = false
+        links = build_links_from_headers resp.headers['link']
+      end
+      BatchResponse.new resps
+    end
+
+    # see the json files in spec/vcr_cassettes for examples of what the link headers look like
+    def build_links_from_headers(headers)
+      return {} if headers.nil?
+
+      links = headers.split(',')
+      links.inject({}) do |rel, link|
+        l = link.strip.split(';')
+        next_link = l.first[1...-1]  # [1...-1] because the actual link is enclosed within '<' '>' tags
+        rel_command = l.last.strip.match(/rel=\"(.*)\"/).captures.first.to_sym  # e.g. "rel=\"next\"" #=> :next
+        rel.tap {|r| r[rel_command] = next_link }
+      end
+    end
+
+  end
+end

data/lib/gitnetworkitis/json_helper.rb

@@ -0,0 +1,24 @@
+module GitNetworkitis
+  module JSONHelper
+    def parse_json(json)
+      return JSON.parse(escape_json(json))
+    rescue => e
+      raise "Unable to parse JSON result" #{e.message}
+    end
+
+    #This is for parsing bad json returned from github
+    def escape_json(json)
+      json.gsub(/(....\[31m)./, '')
+    end
+
+    def parse_attributes(json, object)
+      json.each do |key, value|
+        method = "#{key}="
+        if object.respond_to? method
+          object.send(method, value)
+        end
+      end
+      object
+    end
+  end
+end

data/lib/gitnetworkitis/repository.rb

@@ -1,44 +1,25 @@
 module GitNetworkitis
   class Repository < Base
-    base_uri 'https://github.com/api/v2/json/'
+    attr_accessor :watchers, :homepage, :has_downloads, :forks, :url, :has_wiki, :size, :private
+    attr_accessor :owner, :name, :description, :open_issues
 
-    attr_accessor :description, :has_wiki, :url, :forks, :open_issues, :forks, :name, :homepage, :watchers, :owner, :private, :pledgie, :size, :has_downloads
-
-    def find_all_watched
-      result = Array.new
-      unless !self.username && !self.token
-        resp = get("/repos/watched/#{self.username}")
-        json_result = self.parse_json(resp.body.to_s)
-        json_result["repositories"].each do |repo|
-          result.push parse_attributes(repo, Repository.new(self.username, self.token))
-        end
-      end
-      return result
-    end
-
-    def find_all_owned
-      result = Array.new
-      unless !self.username && !self.token
-        resp = get("/repos/show/#{self.username}")
-        json_result = parse_json(resp.body.to_s)
-        json_result["repositories"].each do |repo|
-          result.push parse_attributes(repo, Repository.new(self.username, self.token))
-        end
+    #TODO use options to handle the optional filter params that github v3 supports
+    def find_all(options={})
+      resp = get("/user/repos", type: (options[:type] || 'all'))
+      parse_json(resp.body.to_s).inject([]) do |repos, repo|
+        repos << parse_attributes(repo, Repository.new(token))
       end
-      return result
     end
 
     def find(options={})
-      result = Array.new
-      if options.has_key?(:owner) & options.has_key?(:repo) 
-        resp = get("/repos/show/#{options[:owner]}/#{options[:repo]}")
-        json_result = parse_json(resp.body.to_s)
-        parse_attributes(json_result["repository"], Repository.new(self.username, self.token))
+      if options.has_key?(:owner) & options.has_key?(:repo)
+        resp = get("/repos/#{options[:owner]}/#{options[:repo]}")
+        parse_attributes(parse_json(resp.body.to_s), Repository.new(token))
       end
     end
 
     def remote_id
-        return "#{self.owner}/#{self.name}"
+      return "#{self.owner['login']}/#{self.name}"
     end
 
   end

data/lib/gitnetworkitis.rb

@@ -1,11 +1,16 @@
 require 'httparty'
 require 'json'
 
-# GitNetworkitis stuff
-# By sorting them we ensure that api and base are loaded first on all sane operating systems
-Dir[File.join(File.dirname(__FILE__), "gitnetworkitis/*.rb")].sort.each { |f| require f }
+['gitnetworkitis/json_helper',
+ 'gitnetworkitis/base',
+ 'gitnetworkitis/commit',
+ 'gitnetworkitis/repository',
+ 'gitnetworkitis/branch',
+ 'gitnetworkitis/getter',
+ 'gitnetworkitis/commit_getter',
+ 'gitnetworkitis/batch_response'].each {|f| require File.join(File.dirname(__FILE__), f) }
 
 module GitNetworkitis
 
-  
-end
+
+end