geni 0.0.2 → 0.0.3

data/.gitignore

@@ -3,4 +3,5 @@ Thumbs.db
 .DS_Store
 *.gem
 .rvmrc
-~*
+~*
+test.rb

data/README.md

@@ -11,12 +11,14 @@ This library needs some specs !
 # Example usage
 
     geni = Geni::Client.new({
-      :app_id       => 'XX',
-      :app_secret   => 'XX',
-      :access_token => an_oauth_access_token
+      :app_id     => 'XX',
+      :app_secret => 'XX',
+      :token      => 'XX'
     })
+
+    me = geni.get_profile
     
-    profile = geni.profile('an_id')
+    profile = geni.get_profile('an_id')
     
     puts profile.name
     puts profile.birth_date

data/geni.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{geni}
-  s.version = "0.0.2"
+  s.version = "0.0.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Aurélien Malisart"]
@@ -19,8 +19,8 @@ Gem::Specification.new do |s|
     ".gitignore",
      "README.md",
      "lib/geni.rb",
-     "lib/array.rb",
-     "lib/oauth.rb",
+     "lib/array_hacks.rb",
+     "lib/oauth_hacks.rb",
      "lib/geni/base.rb",
      "lib/geni/client.rb",
      "lib/geni/family.rb",

data/lib/geni.rb

@@ -1,8 +1,7 @@
-require 'oauth'
-require 'array'
+require 'oauth2'
+require 'oauth_hacks'
+require 'array_hacks'
 require 'geni/client'
 require 'geni/base'
 require 'geni/profile'
-require 'geni/family'
-
-puts "OK"
+require 'geni/family'

data/lib/geni/base.rb

@@ -1,7 +1,9 @@
 module Geni
   class Base
+    attr_reader :client
+    
     def initialize(params = {})
-      @access_token = params[:access_token]
+      @client = params[:client]
       params[:attrs].each_pair do |attr, value|
         instance_variable_set("@#{attr}".to_sym, value)
       end

data/lib/geni/client.rb

@@ -1,22 +1,54 @@
 module Geni
   class Client
 
-    SITE = 'https://www.geni.com'
+    SITE              = 'https://www.geni.com'
+    ACCESS_TOKEN_PATH = '/oauth/token'
 
-    attr_reader :app_id, :app_secret, :access_token
+    attr_reader :oauth_client, :access_token
 
     def initialize(params = {})
-      @app_id       = params[:app_id]
-      @app_secret   = params[:app_secret]
-      @access_token = params[:access_token]
+      @oauth_client = OAuth2::Client.new(params[:app_id], params[:app_secret],
+        :site              => SITE,
+        :parse_json        => true,
+        :access_token_path => ACCESS_TOKEN_PATH
+      )
+      
+      @access_token = OAuth2::AccessToken.new(oauth_client, params[:token])
     end
     
-    def profile(id = nil)
-      profile_id = id.nil? ? '' : "-#{id}"
-      Geni::Profile.new({
-        :access_token => @access_token,
-        :attrs        => @access_token.get("/api/profile#{profile_id}")
-      })
+    def get_profile(id_or_ids = nil)
+      if id_or_ids.nil?
+        url = "/api/profile"
+      elsif id_or_ids.kind_of?(Array)
+        if id_or_ids.any?
+          url = "/api/profile-#{id_or_ids.join(',')}"
+        else
+          return []
+        end
+      else
+        url = "/api/profile-#{id_or_ids}"
+      end
+            
+      results = access_token.get(url)
+      results = results['results'] if results.has_key?('results')
+      
+      profiles = [results].flatten.collect do |profile_attrs|
+        Geni::Profile.new({
+          :client => self,
+          :attrs  => profile_attrs
+        })
+      end
+      
+      id_or_ids.kind_of?(Array) ? profiles : profiles.first
+    end
+    
+    class << self
+      def redirect_uri(request)
+        uri = URI.parse(request.url)
+        uri.path = '/callback'
+        uri.query = nil
+        uri.to_s
+      end
     end
   end
 end

data/lib/geni/family.rb

@@ -33,12 +33,7 @@ module Geni
     end
     
     def profiles(nodes)
-      nodes.collect do |node|
-        Geni::Profile.new({
-          :access_token => @access_token,
-          :attrs        => @access_token.get("/api/#{node['id']}")
-        })
-      end
+      client.get_profile(nodes.collect { |node| node['id'].split('-').last })
     end
   end
 end

data/lib/geni/profile.rb

@@ -55,8 +55,8 @@ module Geni
 
     def immediate_family
       @immediate_family ||= Geni::Family.new({
-        :access_token => @access_token,
-        :attrs        => @access_token.get("/api/profile-#{id}/immediate-family")
+        :client => client,
+        :attrs  => client.access_token.get("/api/profile-#{id}/immediate-family")
       })
     end
   end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: geni
 version: !ruby/object:Gem::Version 
-  hash: 27
+  hash: 25
   prerelease: 
   segments: 
   - 0
   - 0
-  - 2
-  version: 0.0.2
+  - 3
+  version: 0.0.3
 platform: ruby
 authors: 
 - "Aur\xC3\xA9lien Malisart"
@@ -62,8 +62,8 @@ files:
 - .gitignore
 - README.md
 - lib/geni.rb
-- lib/array.rb
-- lib/oauth.rb
+- lib/array_hacks.rb
+- lib/oauth_hacks.rb
 - lib/geni/base.rb
 - lib/geni/client.rb
 - lib/geni/family.rb