fbgraph 1.7.1 → 1.8.0

data/lib/fbgraph/client.rb

@@ -6,8 +6,9 @@ module FBGraph
       
     def initialize(options = {})
       @client_id, @secret_id = options[:client_id] || FBGraph.config[:client_id], options[:secret_id] || FBGraph.config[:secret_id]
-      @facebook_uri = options[:facebook_uri] ||= 'https://graph.facebook.com'
-      @consumer = RestClient::Resource.new(@facebook_uri)
+      @ca_file = options[:ca_file] || FBGraph.config[:ca_file] || default_ca_file
+      @facebook_uri = options[:facebook_uri] || 'https://graph.facebook.com'
+      @consumer = RestClient::Resource.new(@facebook_uri, rest_client_ssl_options)
       @access_token = options.fetch :token, nil
       @auth = OAuth2::AccessToken.new(oauth_client , @access_token)
       return true
@@ -36,8 +37,19 @@ module FBGraph
     end
     
     def oauth_client
-      OAuth2::Client.new(client_id, secret_id, :site => facebook_uri)
+      OAuth2::Client.new(client_id, secret_id, :site => { :url => facebook_uri }, :ssl => oauth_client_ssl_options, :adapter => :typhoeus)
     end
-    
-  end  
+
+    def oauth_client_ssl_options
+      { :ca_file => @ca_file, :verify => OpenSSL::SSL::VERIFY_PEER }
+    end
+
+    def rest_client_ssl_options
+      { :ssl_ca_file => @ca_file, :verify_ssl => OpenSSL::SSL::VERIFY_PEER }
+    end
+
+    def default_ca_file
+      File.join(File.dirname(__FILE__), 'cacert.pem')
+    end
+  end
 end

data/lib/fbgraph.rb

@@ -19,23 +19,28 @@ require 'fbgraph/realtime'
 require 'fbgraph/canvas'
 
 module FBGraph
-  @config = {}
+  @config = nil
 
   class << self
+    def config
+      @config ||= load_config(config_path).freeze
+    end
+    
+    def config_path
+      if defined?(Rails)
+        File.join(Rails.root , 'config' , 'facebook.yml')
+      else
+        'facebook.yml'
+      end
+    end
 
     def load_config(yaml_file)
-      return false unless File.exist?(yaml_file)
+      return {} unless File.exist?(yaml_file)
       cfg = YAML::load(File.open(yaml_file))
       if defined? Rails
         cfg = cfg[Rails.env]
       end
       cfg
     end
-
-    def config
-      return @config if @config.any?
-      load_config(File.join(Rails.root , 'config' , 'facebook.yml')).freeze
-    end
-
   end
 end

data/specs/lib/fbauth/base_spec.rb

@@ -94,7 +94,7 @@ describe FBGraph do
 
           describe 'when params are passed' do
             it 'should request with the path "/123?fields=name,picture"' do
-              uri = "123?fields=name,picture&access_token=token"
+              uri = "123?access_token=token&fields=name,picture"
               @base.find('123')
               @base.params = {:fields => "name,picture"}
               expect_consumer(uri)

data/specs/lib/fbauth/selection_spec.rb

@@ -16,7 +16,7 @@ describe FBGraph do
     describe "when asking for an object's picture" do
       it "should append the access token" do
         @selection.me.picture.should ==
-            "https://graph.facebook.com/me/picture?access_token=#{@token}"
+            "https://graph.facebook.com/me/picture?type=square&access_token=#{@token}"
       end
       
       it "should not append an access token if none is available" do
@@ -25,7 +25,7 @@ describe FBGraph do
         selection = FBGraph::Selection.new(client)                              
 
         selection.me.picture.should ==
-            "https://graph.facebook.com/me/picture"
+            "https://graph.facebook.com/me/picture?type=square"
       end
     end
   end  

data/specs/spec_helper.rb

@@ -6,11 +6,11 @@ require 'redgreen'
 def expect_consumer(uri, result = '')
   consumer = @client.consumer[uri]
   consumer.stub!(:get).and_return(Struct.new(:body).new(result))
-  @client.consumer.stub!(:[]).with(uri).and_return(consumer)  
+  @client.consumer.stub!(:[]).with(uri).and_return(consumer)
 end
 
 def expect_consumer_post(uri, params = {}, result = '')
   rest_client = @client.consumer[uri]
   rest_client.stub!(:post).with(params).and_return(Struct.new(:body).new(result))
-  @client.consumer.stub!(:[]).with(uri).and_return(rest_client)  
+  @client.consumer.stub!(:[]).with(uri).and_return(rest_client)
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: fbgraph
 version: !ruby/object:Gem::Version 
-  hash: 9
+  hash: 55
   prerelease: false
   segments: 
   - 1
-  - 7
-  - 1
-  version: 1.7.1
+  - 8
+  - 0
+  version: 1.8.0
 platform: ruby
 authors: 
 - Nicolas Santa
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-01-27 00:00:00 -03:00
+date: 2011-04-14 00:00:00 -03:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -104,7 +104,7 @@ dependencies:
   type: :runtime
 - !ruby/object:Gem::Dependency 
   prerelease: false
-  name: jeweler
+  name: typhoeus
   version_requirements: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -115,10 +115,10 @@ dependencies:
         - 0
         version: "0"
   requirement: *id007
-  type: :development
+  type: :runtime
 - !ruby/object:Gem::Dependency 
   prerelease: false
-  name: rake
+  name: jeweler
   version_requirements: &id008 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -132,7 +132,7 @@ dependencies:
   type: :development
 - !ruby/object:Gem::Dependency 
   prerelease: false
-  name: bundler
+  name: rake
   version_requirements: &id009 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -146,7 +146,7 @@ dependencies:
   type: :development
 - !ruby/object:Gem::Dependency 
   prerelease: false
-  name: fakeweb
+  name: bundler
   version_requirements: &id010 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -160,7 +160,7 @@ dependencies:
   type: :development
 - !ruby/object:Gem::Dependency 
   prerelease: false
-  name: rspec
+  name: fakeweb
   version_requirements: &id011 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -174,7 +174,7 @@ dependencies:
   type: :development
 - !ruby/object:Gem::Dependency 
   prerelease: false
-  name: rcov
+  name: rspec
   version_requirements: &id012 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -188,7 +188,7 @@ dependencies:
   type: :development
 - !ruby/object:Gem::Dependency 
   prerelease: false
-  name: redgreen
+  name: rcov
   version_requirements: &id013 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -202,7 +202,7 @@ dependencies:
   type: :development
 - !ruby/object:Gem::Dependency 
   prerelease: false
-  name: activesupport
+  name: redgreen
   version_requirements: &id014 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -213,10 +213,10 @@ dependencies:
         - 0
         version: "0"
   requirement: *id014
-  type: :runtime
+  type: :development
 - !ruby/object:Gem::Dependency 
   prerelease: false
-  name: hashie
+  name: activesupport
   version_requirements: &id015 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -230,7 +230,7 @@ dependencies:
   type: :runtime
 - !ruby/object:Gem::Dependency 
   prerelease: false
-  name: oauth2
+  name: hashie
   version_requirements: &id016 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -244,7 +244,7 @@ dependencies:
   type: :runtime
 - !ruby/object:Gem::Dependency 
   prerelease: false
-  name: json
+  name: oauth2
   version_requirements: &id017 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -258,7 +258,7 @@ dependencies:
   type: :runtime
 - !ruby/object:Gem::Dependency 
   prerelease: false
-  name: rest-client
+  name: json
   version_requirements: &id018 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -272,7 +272,7 @@ dependencies:
   type: :runtime
 - !ruby/object:Gem::Dependency 
   prerelease: false
-  name: i18n
+  name: rest-client
   version_requirements: &id019 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -286,7 +286,7 @@ dependencies:
   type: :runtime
 - !ruby/object:Gem::Dependency 
   prerelease: false
-  name: jeweler
+  name: i18n
   version_requirements: &id020 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -297,10 +297,10 @@ dependencies:
         - 0
         version: "0"
   requirement: *id020
-  type: :development
+  type: :runtime
 - !ruby/object:Gem::Dependency 
   prerelease: false
-  name: rake
+  name: typhoeus
   version_requirements: &id021 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -311,10 +311,10 @@ dependencies:
         - 0
         version: "0"
   requirement: *id021
-  type: :development
+  type: :runtime
 - !ruby/object:Gem::Dependency 
   prerelease: false
-  name: bundler
+  name: jeweler
   version_requirements: &id022 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -328,7 +328,7 @@ dependencies:
   type: :development
 - !ruby/object:Gem::Dependency 
   prerelease: false
-  name: fakeweb
+  name: rake
   version_requirements: &id023 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -342,7 +342,7 @@ dependencies:
   type: :development
 - !ruby/object:Gem::Dependency 
   prerelease: false
-  name: rspec
+  name: bundler
   version_requirements: &id024 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -356,7 +356,7 @@ dependencies:
   type: :development
 - !ruby/object:Gem::Dependency 
   prerelease: false
-  name: rcov
+  name: fakeweb
   version_requirements: &id025 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -370,7 +370,7 @@ dependencies:
   type: :development
 - !ruby/object:Gem::Dependency 
   prerelease: false
-  name: redgreen
+  name: rspec
   version_requirements: &id026 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -382,6 +382,34 @@ dependencies:
         version: "0"
   requirement: *id026
   type: :development
+- !ruby/object:Gem::Dependency 
+  prerelease: false
+  name: rcov
+  version_requirements: &id027 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  requirement: *id027
+  type: :development
+- !ruby/object:Gem::Dependency 
+  prerelease: false
+  name: redgreen
+  version_requirements: &id028 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  requirement: *id028
+  type: :development
 description: A Gem for Facebook Open Graph API
 email: nicolas55ar@gmail.com
 executables: []
@@ -400,10 +428,10 @@ files:
 - Rakefile
 - TODO.list
 - VERSION
-- fbgraph.gemspec
 - lib/fbgraph.rb
 - lib/fbgraph/authorization.rb
 - lib/fbgraph/base.rb
+- lib/fbgraph/cacert.pem
 - lib/fbgraph/canvas.rb
 - lib/fbgraph/client.rb
 - lib/fbgraph/realtime.rb

data/fbgraph.gemspec

@@ -1,139 +0,0 @@
-# Generated by jeweler
-# DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
-# -*- encoding: utf-8 -*-
-
-Gem::Specification.new do |s|
-  s.name = %q{fbgraph}
-  s.version = "1.7.1"
-
-  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.authors = ["Nicolas Santa"]
-  s.date = %q{2011-01-27}
-  s.description = %q{A Gem for Facebook Open Graph API}
-  s.email = %q{nicolas55ar@gmail.com}
-  s.extra_rdoc_files = [
-    "README",
-    "README.textile"
-  ]
-  s.files = [
-    ".bundle/config",
-    "Gemfile",
-    "Manifest",
-    "README",
-    "README.textile",
-    "Rakefile",
-    "TODO.list",
-    "VERSION",
-    "fbgraph.gemspec",
-    "lib/fbgraph.rb",
-    "lib/fbgraph/authorization.rb",
-    "lib/fbgraph/base.rb",
-    "lib/fbgraph/canvas.rb",
-    "lib/fbgraph/client.rb",
-    "lib/fbgraph/realtime.rb",
-    "lib/fbgraph/result.rb",
-    "lib/fbgraph/search.rb",
-    "lib/fbgraph/selection.rb",
-    "specs/lib/fbauth/authorization_spec.rb",
-    "specs/lib/fbauth/base_spec.rb",
-    "specs/lib/fbauth/client_spec.rb",
-    "specs/lib/fbauth/realtime_spec.rb",
-    "specs/lib/fbauth/search_spec.rb",
-    "specs/lib/fbauth/selection_spec.rb",
-    "specs/spec_helper.rb"
-  ]
-  s.homepage = %q{http://github.com/nsanta/fbgraph}
-  s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.7}
-  s.summary = %q{A Gem for Facebook Open Graph API}
-
-  if s.respond_to? :specification_version then
-    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
-    s.specification_version = 3
-
-    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<activesupport>, [">= 0"])
-      s.add_runtime_dependency(%q<hashie>, [">= 0"])
-      s.add_runtime_dependency(%q<oauth2>, [">= 0"])
-      s.add_runtime_dependency(%q<json>, [">= 0"])
-      s.add_runtime_dependency(%q<rest-client>, [">= 0"])
-      s.add_runtime_dependency(%q<i18n>, [">= 0"])
-      s.add_development_dependency(%q<jeweler>, [">= 0"])
-      s.add_development_dependency(%q<rake>, [">= 0"])
-      s.add_development_dependency(%q<bundler>, [">= 0"])
-      s.add_development_dependency(%q<fakeweb>, [">= 0"])
-      s.add_development_dependency(%q<rspec>, [">= 0"])
-      s.add_development_dependency(%q<rcov>, [">= 0"])
-      s.add_development_dependency(%q<redgreen>, [">= 0"])
-      s.add_runtime_dependency(%q<activesupport>, [">= 0"])
-      s.add_runtime_dependency(%q<hashie>, [">= 0"])
-      s.add_runtime_dependency(%q<oauth2>, [">= 0"])
-      s.add_runtime_dependency(%q<json>, [">= 0"])
-      s.add_runtime_dependency(%q<rest-client>, [">= 0"])
-      s.add_runtime_dependency(%q<i18n>, [">= 0"])
-      s.add_development_dependency(%q<jeweler>, [">= 0"])
-      s.add_development_dependency(%q<rake>, [">= 0"])
-      s.add_development_dependency(%q<bundler>, [">= 0"])
-      s.add_development_dependency(%q<fakeweb>, [">= 0"])
-      s.add_development_dependency(%q<rspec>, [">= 0"])
-      s.add_development_dependency(%q<rcov>, [">= 0"])
-      s.add_development_dependency(%q<redgreen>, [">= 0"])
-    else
-      s.add_dependency(%q<activesupport>, [">= 0"])
-      s.add_dependency(%q<hashie>, [">= 0"])
-      s.add_dependency(%q<oauth2>, [">= 0"])
-      s.add_dependency(%q<json>, [">= 0"])
-      s.add_dependency(%q<rest-client>, [">= 0"])
-      s.add_dependency(%q<i18n>, [">= 0"])
-      s.add_dependency(%q<jeweler>, [">= 0"])
-      s.add_dependency(%q<rake>, [">= 0"])
-      s.add_dependency(%q<bundler>, [">= 0"])
-      s.add_dependency(%q<fakeweb>, [">= 0"])
-      s.add_dependency(%q<rspec>, [">= 0"])
-      s.add_dependency(%q<rcov>, [">= 0"])
-      s.add_dependency(%q<redgreen>, [">= 0"])
-      s.add_dependency(%q<activesupport>, [">= 0"])
-      s.add_dependency(%q<hashie>, [">= 0"])
-      s.add_dependency(%q<oauth2>, [">= 0"])
-      s.add_dependency(%q<json>, [">= 0"])
-      s.add_dependency(%q<rest-client>, [">= 0"])
-      s.add_dependency(%q<i18n>, [">= 0"])
-      s.add_dependency(%q<jeweler>, [">= 0"])
-      s.add_dependency(%q<rake>, [">= 0"])
-      s.add_dependency(%q<bundler>, [">= 0"])
-      s.add_dependency(%q<fakeweb>, [">= 0"])
-      s.add_dependency(%q<rspec>, [">= 0"])
-      s.add_dependency(%q<rcov>, [">= 0"])
-      s.add_dependency(%q<redgreen>, [">= 0"])
-    end
-  else
-    s.add_dependency(%q<activesupport>, [">= 0"])
-    s.add_dependency(%q<hashie>, [">= 0"])
-    s.add_dependency(%q<oauth2>, [">= 0"])
-    s.add_dependency(%q<json>, [">= 0"])
-    s.add_dependency(%q<rest-client>, [">= 0"])
-    s.add_dependency(%q<i18n>, [">= 0"])
-    s.add_dependency(%q<jeweler>, [">= 0"])
-    s.add_dependency(%q<rake>, [">= 0"])
-    s.add_dependency(%q<bundler>, [">= 0"])
-    s.add_dependency(%q<fakeweb>, [">= 0"])
-    s.add_dependency(%q<rspec>, [">= 0"])
-    s.add_dependency(%q<rcov>, [">= 0"])
-    s.add_dependency(%q<redgreen>, [">= 0"])
-    s.add_dependency(%q<activesupport>, [">= 0"])
-    s.add_dependency(%q<hashie>, [">= 0"])
-    s.add_dependency(%q<oauth2>, [">= 0"])
-    s.add_dependency(%q<json>, [">= 0"])
-    s.add_dependency(%q<rest-client>, [">= 0"])
-    s.add_dependency(%q<i18n>, [">= 0"])
-    s.add_dependency(%q<jeweler>, [">= 0"])
-    s.add_dependency(%q<rake>, [">= 0"])
-    s.add_dependency(%q<bundler>, [">= 0"])
-    s.add_dependency(%q<fakeweb>, [">= 0"])
-    s.add_dependency(%q<rspec>, [">= 0"])
-    s.add_dependency(%q<rcov>, [">= 0"])
-    s.add_dependency(%q<redgreen>, [">= 0"])
-  end
-end
-