github-api-client 0.2.5 → 0.2.6

data/VERSION

@@ -1 +1 @@
-0.2.5
+0.2.6

data/bin/api-browser.rb

@@ -1,5 +1,7 @@
 #!/usr/bin/env ruby
 
+$:.unshift File.expand_path('../lib', File.dirname(__FILE__))
+
 require 'github-api-client'
 
 puts GitHub::Config::Version
@@ -14,6 +16,7 @@ else # launches all-features code
   # Performance tests
   GitHub::Organization.get('rails').fetch(:repositories).repositories
   GitHub::Repo.get('parndt/hub').parent.fetch(:self, :watchers).watchers
+  GitHub::Repo.get('rails/rails', :organization).fetch(:self)
   GitHub::User.get('kneath').fetch(:followers, :followings)
   GitHub::User.get('schacon').fetch(:organizations).organizations
   GitHub::Organization.get('github').fetch(:members, :repositories).members

data/db/migrate/003_create_repos.rb

@@ -5,16 +5,18 @@ class CreateRepos < ActiveRecord::Migration
         t.string attr
       end
       
-      %w(owner parent organization).each do |attr|
+      %w(parent).each do |attr|
         t.references attr
       end
       
+      t.references :owner, :polymorphic => true
+      
       # TODO: organization temporarily a string, only when there's no organization model
       %w(size score).each do |attr|
         t.integer attr
       end
       
-      %w(has_downloads b_fork b_org deleted locked has_wiki private open_issues has_issues).each do |attr|
+      %w(has_downloads b_fork deleted locked has_wiki private open_issues has_issues).each do |attr|
         t.boolean attr
       end
       

data/features/step_definitions/fetching_steps.rb

@@ -1,5 +1,5 @@
 Before do
-  %w(Repo User).each do |attr|
+  %w(Repo User Organization).each do |attr|
     GitHub.const_get(attr).delete_all
   end
 end

data/lib/github-api-client/base.rb

@@ -45,9 +45,10 @@ module GitHub
       hash = case resource
         when :user_get then {:public_repo_count => :nil, :public_gist_count => :nil, :created => :nil, :permission => :nil, :followers_count => :nil, :following_count => :nil}
         when :user_search then {:name => :login, :username => :login, :fullname => :name, :followers => :nil, :repos => :nil, :created => :nil, :permission => :nil}
-        when :repo_get then {:fork => :b_fork, :watchers => nil, :owner => :owner_login, :organization => :organization_login, :forks => nil, :followers_count => nil, :forks_count => nil}
+        when :repo_get then {:fork => :b_fork, :watchers => nil, :owner => :owner_login, :forks => nil, :followers_count => nil, :forks_count => nil}
         when :org_get then {:public_gist_count => nil, :public_repo_count => nil, :following_count => :nil, :followers_count => :nil}
         when :org_repo_index then {:owner => nil, :open_issues => nil, :has_issues => nil, :watchers => nil, :forks => nil, :fork => :b_fork, :gravatar_id => nil, :organization => :organization_login}
+        when :org_repo_get then {:owner => nil, :open_issues => nil, :has_issues => nil, :watchers => nil, :forks => nil, :fork => :b_fork, :gravatar_id => nil, :organization => :organization_login}
       end
       # Provides abstraction layer between YAML :keys and 'keys' returned by Hub
       symbolized_resources = [:repo_get, :org_repo_index, :org_repo_get]

data/lib/github-api-client/organization.rb

@@ -1,7 +1,7 @@
 module GitHub
   class Organization < ActiveRecord::Base
     has_and_belongs_to_many :members, :class_name => 'GitHub::User', :join_table => 'organizations_members'
-    has_many :repositories, :class_name => 'GitHub::Repo'
+    has_many :repositories, :class_name => 'GitHub::Repo', :as => :owner
     
     def get
       self.update_attributes(

data/lib/github-api-client/repo.rb

@@ -1,24 +1,36 @@
 module GitHub
   class Repo < ActiveRecord::Base
-    belongs_to :owner, :class_name => 'GitHub::User'
-    belongs_to :organization, :class_name => 'GitHub::Organization'
+    belongs_to :owner, :polymorphic => true
     belongs_to :parent, :class_name => 'GitHub::Repo'
     has_and_belongs_to_many :watchers, :class_name => 'GitHub::User', :join_table => 'repo_watchings', :foreign_key => 'repo_id', :association_foreign_key => 'watcher_id'
     
     def get
-      self.update_attributes GitHub::Base.parse_attributes(:repo_get, 
+      parser = case self.owner_type
+        when 'GitHub::User'
+          :repo_get
+        when 'GitHub::Organization'
+          :org_repo_get
+      end
+      self.update_attributes GitHub::Base.parse_attributes(parser, 
         YAML::load(
           GitHub::Browser.get("/repos/show/#{self.permalink}"))['repository'])
       self
     end
     
-    def self.get(information)
+    def self.get(information, o_type = :user)
       #FIXME: permalink column must be present, comparing url's is surely not the most efficient way for the db
-      conditions = {:name => information.split('/').last, :owner_id => GitHub::User.find_or_create_by_login(information.split('/').first).id}
+      conditions = {:name => information.split('/').last}
+      if o_type == :user
+        conditions.merge! :owner_id => GitHub::User.find_or_create_by_login(information.split('/').first).id, :owner_type => 'GitHub::User'
+      else
+        conditions.merge! :owner_id => GitHub::Organization.find_or_create_by_login(information.split('/').first).id, :owner_type => 'GitHub::Organization'
+      end
       if r = GitHub::Repo.where(conditions).first
         r.get
       else
         r = GitHub::Repo.new(conditions).get
+        p r.parent
+        r
       end
     end
     
@@ -52,29 +64,27 @@ module GitHub
     public
     def owner_login=(user)
       if user
-        self.b_org = false
         self.owner = GitHub::User.find_or_create_by_login(user)
       end
     end
     
     def organization_login=(organization)
       if organization
-        self.b_org = true
-        self.organization = Organization.find_or_create_by_login(organization)
+        self.owner = Organization.find_or_create_by_login(organization)
       end
     end
     
     def parent=(permalink)
+      #FIXME: parent repo does not allow organization to be owner ATM
       owner = GitHub::User.find_or_create_by_login permalink.split('/').first
       name = permalink.split('/').last
-      repo = GitHub::Repo.where(:owner_id => owner.id, :name => name).first
-      repo ||= GitHub::Repo.create(:owner_id => owner.id, :name => name)
+      repo = GitHub::Repo.where(:owner_id => owner.id, :owner_type => 'GitHub::Repo', :name => name).first
+      repo ||= GitHub::Repo.create(:owner => owner, :name => name)
       self.parent_id = repo.id
     end
     
     def permalink
-      o = owner.presence || organization.presence
-      "#{o.login}/#{name}"
+      "#{owner.login}/#{name}"
     end
     
     # For future, when sql will be find_or_create_by_permalink

data/lib/github-api-client/user.rb

@@ -3,7 +3,7 @@ module GitHub
   class User < ActiveRecord::Base
     has_and_belongs_to_many :followers, :foreign_key => 'follower_id', :association_foreign_key => 'following_id', :join_table => 'user_followings', :class_name => 'User'
     has_and_belongs_to_many :followings, :foreign_key => 'following_id', :association_foreign_key => 'follower_id', :join_table => 'user_followings', :class_name => 'User'
-    has_many :repos, :class_name => 'GitHub::Repo', :foreign_key => 'owner_id'
+    has_many :repos, :class_name => 'GitHub::Repo', :as => :owner
     
     # FIXME: Does GitHub allow a user to have multiple organizations?
     has_and_belongs_to_many :organizations, :join_table => 'organizations_members'

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 2
-  - 5
-  version: 0.2.5
+  - 6
+  version: 0.2.6
 platform: ruby
 authors: 
 - "Jakub Oko\xC5\x84ski"
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-12-26 00:00:00 +01:00
+date: 2011-01-07 00:00:00 +01:00
 default_executable: api-browser.rb
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -219,7 +219,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: -2220678579085750639
+      hash: 4308347029260914289
       segments: 
       - 0
       version: "0"