fbrails 0.0.2 → 0.0.3

data/README

@@ -9,12 +9,14 @@ auth = Fbrails::Auth.new(app_id,app_secret,app_url)
 auth.redirect_url # get a redirect page to server-flow authorization
 
 token = auth.token(code) # getting token from code which send back from facebook
+# => {:token => "TOKEN", :expires => "TIME_WHEN_EXPIRES"}
 
+Fbrails::Auth.token_valid?(token) # return true of false
+OR
+Fbrails::Auth.token_valid?(token,expire_time) # return true of false
 
 
 
 @graph = Fbrails::Graph.new(token)
 
-@graph.token_valid? # return true of false
-
 @graph.me # return hash with your info or false

data/fbrails.gemspec

@@ -6,7 +6,7 @@ require "fbrails/version"
 Gem::Specification.new do |s|
   s.name        = "fbrails"
   s.version     = Fbrails::VERSION
-  s.authors     = ["Dmitry Gruzd"]
+  s.authors     = ["Dmitry Gruzd", "Vitaly Mineev"]
   s.email       = ["donotsendhere@gmail.com"]
   s.homepage    = ""
   s.summary     = %q{Small gem for auth & getting info from facebook}

data/lib/fbrails/version.rb

@@ -1,3 +1,3 @@
 module Fbrails
-  VERSION = "0.0.2"
+  VERSION = "0.0.3"
 end

data/lib/fbrails.rb

@@ -3,6 +3,9 @@ require 'net/https'
 require 'json'
 module Fbrails
 
+class FailedToGet < StandardError
+end
+
 
   class Auth 
     def initialize(app_id, secret, app_url)
@@ -13,13 +16,34 @@ module Fbrails
   
     def token(code)
       url = "https://graph.facebook.com/oauth/access_token?client_id=#{@app_id}&redirect_uri=#{@app_url}&client_secret=#{@secret}&code=#{code}"
-      resp = self.get(url)
+      resp = Fbrails.get(url,true)
       if resp.include?("access_token=")
-        token = resp.body.gsub(/access_token=/, "").gsub(/&expires=\d+/,"")
+        hash = Hash.new
+        expire = resp.scan(/\d+/).last.to_i 
+        hash[:expires] = Time.new + expire 
+        hash[:token] = resp.gsub(/access_token=/, "").gsub(/&expires=\d+/,"")
+        return hash
       else
         nil
       end
     end 
+    
+    def self.token_valid?(token,expires = false)
+      if expires != false && expires < Time.new
+        return false
+      end
+
+      url = "https://graph.facebook.com/me/?access_token=#{token}"
+      result = Fbrails.get(url)
+      if result == false
+        return false
+      elsif result.has_key?("id")
+        return true
+      else
+        return nil
+      end
+        
+    end
 
     def redirect_url
       if !@app_id.blank? && !@app_url.blank?
@@ -36,18 +60,6 @@ end
     end
 
 
-    def token_valid?
-      url = "https://graph.facebook.com/me/?access_token=#{@token}"
-      result = Fbrails.get(url)
-      if result == false
-        return false
-      elsif result.has_key?("id")
-        return true
-      else
-        return nil
-      end
-        
-    end
 
     def me
       url = "https://graph.facebook.com/me/?access_token=#{@token}"
@@ -56,16 +68,20 @@ end
   end
   
   
-  def self.get(url)
+  def self.get(url,raw = false)
     uri = URI.parse(url)
     http = Net::HTTP.new(uri.host,uri.port)
     http.use_ssl = true
     http.verify_mode = OpenSSL::SSL::VERIFY_NONE
     request = Net::HTTP::Get.new(uri.request_uri)
     resp = http.request(request)
+    if raw
+      return resp.body
+    end
+
     result = JSON.parse(resp.body)
     if result.has_key?("error")
-      return false
+      raise FailedToGet, "Failed to get, probably token expired"
     else
       return result
     end

metadata

@@ -1,15 +1,16 @@
 --- !ruby/object:Gem::Specification
 name: fbrails
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
   prerelease: 
 platform: ruby
 authors:
 - Dmitry Gruzd
+- Vitaly Mineev
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-10-02 00:00:00.000000000Z
+date: 2011-10-03 00:00:00.000000000Z
 dependencies: []
 description: Small gem for auth & getting info from facebook
 email: