github-api-client 0.1.1.2 → 0.1.1.3

data/db/migrate/001_create_users.rb

@@ -1,7 +1,7 @@
 class CreateUsers < ActiveRecord::Migration
   def self.up
     create_table :users, :force => true do |t|
-      %w(login token type name company location blog email language).each do |attr|
+      %w(login token type name company location blog email language permission).each do |attr|
         t.string attr
       end
       

data/lib/core_ext/habtm.rb

@@ -0,0 +1,7 @@
+class ActiveRecord::Associations::HasAndBelongsToManyAssociation
+  # Short alias for if exists then create
+  # @param [ActiveRecord::Base] object An object to check if exists and create
+  def find_or_create(object)
+    self << object unless exists?(object)
+  end
+end

data/lib/github_api.rb

@@ -1,5 +1,5 @@
 #!/usr/bin/ruby
-$: << './github_api' << './lib/github_api'
+#$: << '../'
 
 require 'rubygems'
 gem 'github-api-client'
@@ -8,6 +8,7 @@ require 'uri'
 require 'yaml'
 require 'singleton'
 require 'active_record'
+require 'core_ext/habtm'
 
 # General placeholder for all of the GitHub API sweets
 module GitHub
@@ -28,9 +29,9 @@ end
 
 GitHub::Config.setup
 
-require 'base'
-require 'user'
-require 'browser'
+require 'github_api/base'
+require 'github_api/user'
+require 'github_api/browser'
 require 'rainbow'
 
 

data/lib/github_api/base.rb

@@ -33,11 +33,11 @@ module GitHub
     # @param [Hash] attributes GitHub API retrieved attributes to be parsed
     # @return [Hash] parsed attributes, fully compatibile with local db
     def self.parse_attributes(attributes)
-      {:name => :login, :username => :login, :fullname => :name, :followers => :followers_count, :repos => :public_repo_count, :created => :nil}.each do |k, v|
+      {:name => :login, :username => :login, :fullname => :name, :followers => :followers_count, :repos => :public_repo_count, :created => :nil, :permission => :nil}.each do |k, v|
         unless v == :nil
-          attributes[v] = attributes[k.to_s]
+          attributes[v.to_sym] = attributes[k.to_sym]
         end
-        attributes.delete k.to_s
+        attributes.delete k.to_sym
       end
       attributes
     end

data/lib/github_api/user.rb

@@ -2,13 +2,14 @@ module GitHub
   # Basic model, stores retrieved user and his associations
   class User < ActiveRecord::Base
     has_and_belongs_to_many :followers, :foreign_key => 'follower_id', :association_foreign_key => 'following_id', :join_table => 'followings', :class_name => 'User'
-    has_and_belongs_to_many :following, :foreign_key => 'following_id', :association_foreign_key => 'follower_id', :join_table => 'followings', :class_name => 'User'
+    has_and_belongs_to_many :followings, :foreign_key => 'following_id', :association_foreign_key => 'follower_id', :join_table => 'followings', :class_name => 'User'
     
     # Fetches info about current_user from GitHub
     # GitHub::User.new.build(:login => 'asd', :token => 'token').get #=> GitHub::User
     # @return [GitHub::User] Chainable self object after syncing attributes with GitHub
     def get
-      self.update_attributes YAML::load(GitHub::Browser.get("/user/show/#{self.login}"))['user']
+      self.update_attributes YAML::load(
+          GitHub::Browser.get("/user/show/#{self.login}"))['user']
       self
     end
     
@@ -63,17 +64,15 @@ module GitHub
     private 
     def get_followers
       users = YAML::load(GitHub::Browser.get "/user/show/#{login}/followers")['users']
-      
-      ids = []
       i = 1
       users.each do |user|
         puts "#{users.length.to_s} / #{i.to_s} - Fetching followers"
         i = i + 1
         u = GitHub::User.find_or_create_by_login(user)
-        ids << u.id
+        self.followers.find_or_create u
+        # Realized it was stupid as it's a bi-directional relation :D
+        #u.followings.find_or_create self
       end
-      
-      self.follower_ids = ids
       self
     end
     

metadata

@@ -6,8 +6,8 @@ version: !ruby/object:Gem::Version
   - 0
   - 1
   - 1
-  - 2
-  version: 0.1.1.2
+  - 3
+  version: 0.1.1.3
 platform: ruby
 authors: 
 - "Jakub Oko\xC5\x84ski"
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-11-29 00:00:00 +01:00
+date: 2010-11-30 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -77,6 +77,7 @@ files:
 - lib/github_api/user.rb
 - db/migrate/002_create_followings.rb
 - db/migrate/001_create_users.rb
+- lib/core_ext/habtm.rb
 has_rdoc: false
 homepage: http://github.com/farnoy/github-api-client
 licenses: []