duwanis-rubyku 0.0.2 → 0.0.3

data/lib/rubyku.rb

@@ -1,22 +1,15 @@
-$:.unshift(File.dirname(__FILE__)) unless
-  $:.include?(File.dirname(__FILE__)) || $:.include?(File.expand_path(File.dirname(__FILE__)))
-
 # Just to make our requires at the top of the gem a little easier.
 require 'pathname'
-module Kernel
-  def __DIR__
-    Pathname(__FILE__).dirname.expand_path
-  end
-end 
+$:.unshift(Pathname(__FILE__).dirname.expand_path)
 
 require 'net/http'
 require 'logger'
+require 'rubygems'
+require 'json'
 #rubyku requires
-require __DIR__ + 'rubyku/settings'
-require __DIR__ + 'rubyku/user'
-require __DIR__ + 'rubyku/credentials'
-require __DIR__ + 'rubyku/version'
-
-# The basic Rubyku exception.
-class RubykuError < RuntimeError
-end
+require 'rubyku/settings'
+require 'rubyku/errors'
+require 'rubyku/user'
+require 'rubyku/credentials'
+require 'rubyku/version'
+require 'rubyku/request'

data/lib/rubyku/credentials.rb

@@ -32,6 +32,13 @@ module Rubyku
       @api_key
     end
     
+    ##
+    # returns the Jaiku-specified authentication string to attach
+    # to all requests (GETS) against the API.
+    def request_string
+      "?user=%s&personal_key=%s" % [self.username, self.api_key]
+    end
+    
     class << self
       
       ##
@@ -97,7 +104,5 @@ module Rubyku
     end #end class << self
     
   end #end class
-  
-  class InvalidCredentialsError < RuntimeError
-  end
+
 end

data/lib/rubyku/errors.rb

@@ -0,0 +1,11 @@
+module Rubyku
+  # The basic Rubyku exception.
+  class Error < RuntimeError
+  end
+  
+  class UserNotFoundError < Error
+  end
+  
+  class InvalidCredentialsError < Error
+  end
+end

data/lib/rubyku/request.rb

@@ -0,0 +1,20 @@
+module Rubyku
+
+  class Request
+    class << self
+    
+      def retrieve_json_object(url_path, jaiku_credentials)
+        url_path += jaiku_credentials.request_string
+
+        url = URI.parse(url_path)
+        req = Net::HTTP::Get.new(url.path)
+        res = Net::HTTP::Proxy(Rubyku::Settings.proxy_url, Rubyku::Settings.proxy_port) \
+                  .start(url.host, url.port) {|http|
+                                                http.request(req)
+                                             }
+        JSON(res.body)
+      end
+    end
+  end
+  
+end

data/lib/rubyku/settings.rb

@@ -21,7 +21,7 @@ module Rubyku
 end
 
 #initialize the default logger
-Rubyku::Settings.logger= Logger.new(__DIR__ + '../logs/rubyku.log')
+Rubyku::Settings.logger= Logger.new('../logs/rubyku.log')
 Rubyku::Settings.logger.sev_threshold = Logger::INFO #DON'T set this line to DEBUG.
 # Do that in your own code if you want. Rubyku spews user information and such on DEBUG
 # And so it would be a very bad idea for DEBUG to make it into the gem.

data/lib/rubyku/user.rb

@@ -26,7 +26,9 @@ module Rubyku
     #   to the Jaiku servers.
     #
     def contacts(jaiku_credentials=Rubyku::Settings.jaiku_credentials)
+      log = Rubyku::Settings.logger
       unless @contacts
+        log.info("contacts for user #{@username} requested - attempting to fetch.")
         @contacts = User.fetchContacts(@username, jaiku_credentials)
       end
       
@@ -52,13 +54,23 @@ module Rubyku
       #   to the Jaiku servers.      
       # 
       def fetch(username,jaiku_credentials=Rubyku::Settings.jaiku_credentials)  
+        req_url = "http://%s.jaiku.com/json" % username
+        json = Rubyku::Request.retrieve_json_object(req_url, jaiku_credentials)
+        build_user_from_json(json)
+      end
+      
+      def build_user_from_json(json)
+        user = Rubyku::User.new
+        user.nick= json['nick']
+        user.first_name= json['first_name']
+        user.last_name= json['last_name']
+        user.jaiku_url = json['url']
+        user.avatar_url = json['avatar']
+        user.contacts = json['contacts'] ? json['contacts'].map { |u| build_user_from_json(u)} : nil
         
+        user
       end
     end
-    
-      
-  end
-  
-  class UserNotFoundError < RuntimeError
+   
   end
 end

data/lib/rubyku/version.rb

@@ -2,7 +2,7 @@ module Rubyku #:nodoc:
   module VERSION #:nodoc:
     MAJOR = 0
     MINOR = 0
-    TINY  = 2
+    TINY  = 3
 
     STRING = [MAJOR, MINOR, TINY].join('.')
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: duwanis-rubyku
 version: !ruby/object:Gem::Version 
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors: 
 - Tommy Morgan
@@ -11,8 +11,16 @@ cert_chain: []
 
 date: 2008-05-29 00:00:00 -07:00
 default_executable: 
-dependencies: []
-
+dependencies: 
+- !ruby/object:Gem::Dependency 
+  name: json
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">"
+      - !ruby/object:Gem::Version 
+        version: 1.0.0
+    version: 
 description: Rubyku is a library for accessing the public Jaiku API from a Ruby application.
 email: tommy.morgan@gmail.com
 executables: []
@@ -31,6 +39,8 @@ files:
 - lib/rubyku/credentials.rb
 - lib/rubyku/settings.rb
 - lib/rubyku/user.rb
+- lib/rubyku/errors.rb
+- lib/rubyku/request.rb
 - test/test_helper.rb
 - test/test_rubyku.rb
 has_rdoc: true