fb_rails 0.6.0 → 0.7.0

data/README.rdoc

@@ -18,6 +18,10 @@ or
   config.facebook.app_id = 'my_app_id'
   config.facebook.secret = 'my_app_secret'
 
+Requests use http by default. To use https, set 'use_ssl' to true:
+
+  config.facebook.use_ssl = true
+
 Getting the user logged in is out of the scope of this gem. That's what
 FBML and the Facebook Javascript API are for. Here's an example:
 
@@ -29,7 +33,7 @@ FBML and the Facebook Javascript API are for. Here's an example:
   <%= fbml 'login-button' %>
 
 
-== API
+== FBRails API
 
 FbRails adds an object called 'fb', which is available to all controllers and views:
 
@@ -41,12 +45,17 @@ Get the Facebook user id for the current user:
 
   fb.uid
 
+Get the Facebook user's access token:
+
+  fb.access_token
+
 Retrieve your Facebook application app_id or secret:
+
   fb.app_id
   fb.secret
 
 
-== Using the Graph
+== Using the Graph API
 
 Make a request to the Facebook Graph:
 
@@ -54,6 +63,7 @@ Make a request to the Facebook Graph:
   my name is <%= result['first_name'] %>
 
 Post to the user's wall:
+
   fb.graph.post 'me/feed', :message => 'I like turtles'
 
 

data/lib/fb_rails/config.rb

@@ -1,6 +1,6 @@
 module FbRails
   class Config
-    class_attribute :app_id, :secret, :user_class_name
+    class_attribute :app_id, :secret, :user_class_name, :use_ssl
 
     class << self
       def user_class

data/lib/fb_rails/fb.rb

@@ -9,7 +9,7 @@ module FbRails
     end
 
     def graph
-      @graph ||= FbRails::Graph.new(connect)
+      @graph ||= FbRails::Graph.new(connect.access_token)
     end
 
     private

data/lib/fb_rails/graph.rb

@@ -7,50 +7,58 @@ module FbRails
   class Graph
     class << self
       def facebook_uri
-        @facebook_uri ||= URI.parse('https://graph.facebook.com')
-      end
-
-      def http
-        Net::HTTP.new(facebook_uri.host, facebook_uri.port).tap do |result|
-          result.use_ssl = true
-          result.verify_mode = OpenSSL::SSL::VERIFY_NONE
+        @facebook_uri ||= begin
+          protocol = FbRails::Config.use_ssl ? 'https': 'http'
+          URI.parse("#{protocol}://graph.facebook.com")
         end
       end
 
-      def get(path, params)
+      def get(path, params = {})
         request(:get, "#{path}?#{build_param_string(params)}")
       end
 
-      def post(path, params)
+      def post(path, params = {})
         request(:post, path, build_param_string(params))
       end
 
-      def request(http_verb, path, *arguments)
-        response = ActiveSupport::Notifications.instrument('request.fb_rails') do |payload|
-          payload[:http_verb]   = http_verb
-          payload[:request_uri] = path
-          http.send(http_verb, path, *arguments)
+      private
+        def request(http_verb, path, *arguments)
+          response = ActiveSupport::Notifications.instrument('request.fb_rails') do |payload|
+            payload[:http_verb]   = http_verb
+            payload[:request_uri] = path
+            http.send(http_verb, path, *arguments)
+          end
+
+          ActiveSupport::JSON.decode(response.body)
         end
 
-        ActiveSupport::JSON.decode(response.body)
-      end
+        def http
+          result = Net::HTTP.new(facebook_uri.host, facebook_uri.port)
+          configure_https(result) if facebook_uri.is_a?(URI::HTTPS)
+          result
+        end
 
-      def build_param_string(params)
-        params.map { |key, value| "#{key}=#{Rack::Utils.escape(value)}" }.join('&')
-      end
+        def build_param_string(params)
+          params.map { |key, value| "#{key}=#{Rack::Utils.escape(value)}" }.join('&')
+        end
+
+        def configure_https(http)
+          http.use_ssl = true
+          http.verify_mode = OpenSSL::SSL::VERIFY_NONE
+        end
     end
 
-    attr_reader :connect
-    def initialize(connect)
-      @connect = connect
+    attr_reader :access_token
+    def initialize(access_token)
+      @access_token = access_token
     end
 
     def post(path, params = {})
-      self.class.post(path, params.merge(:access_token => connect.access_token))
+      self.class.post(path, params.merge(:access_token => access_token))
     end
 
     def get(path, params = {})
-      self.class.get(path, params.merge(:access_token => connect.access_token))
+      self.class.get(path, params.merge(:access_token => access_token))
     end
   end
 end

data/test/graph_test.rb

@@ -1,4 +1,12 @@
 require 'test_helper'
 
 class FbRails::GraphTest < ActiveSupport::TestCase
+  test 'facebook_uri' do
+    FbRails::Config.use_ssl = false
+    assert_equal 'http', FbRails::Graph.facebook_uri.scheme
+
+    FbRails::Config.use_ssl = true
+    FbRails::Graph.instance_variable_set('@facebook_uri', nil)
+    assert_equal 'https', FbRails::Graph.facebook_uri.scheme
+  end
 end

data/test/log_subscriber_test.rb

@@ -16,7 +16,7 @@ class FbRails::LogSubscriberTest < ActiveSupport::TestCase
   end
   
   test 'request notification' do
-    graph = FbRails::Graph.new(FbRails::Connect.new(fb_cookie))
+    graph = FbRails::Graph.new('my_access_token')
     graph.get 'test'
 
     wait

data/test/mock_test.rb

@@ -8,7 +8,7 @@ class FbRails::MockTest < ActiveSupport::TestCase
   end
 
   test 'mock' do
-    graph = FbRails::Graph.new(FbRails::Connect.new(fb_cookie))
+    graph = FbRails::Graph.new('my_access_token')
 
     result = graph.get 'test'
 

metadata

@@ -1,12 +1,8 @@
 --- !ruby/object:Gem::Specification 
 name: fb_rails
 version: !ruby/object:Gem::Version 
-  prerelease: false
-  segments: 
-  - 0
-  - 6
-  - 0
-  version: 0.6.0
+  prerelease: 
+  version: 0.7.0
 platform: ruby
 authors: 
 - Matthew Higgins
@@ -14,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-02-07 00:00:00 -08:00
+date: 2011-02-09 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -25,10 +21,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        segments: 
-        - 3
-        - 0
-        - 0
         version: 3.0.0
   type: :development
   version_requirements: *id001
@@ -83,25 +75,17 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      segments: 
-      - 1
-      - 8
-      - 7
       version: 1.8.7
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      segments: 
-      - 1
-      - 3
-      - 5
       version: 1.3.5
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.5.0
 signing_key: 
 specification_version: 3
 summary: Facebook on Rails