fb_rails 0.4.0 → 0.5.0

data/lib/fb_rails/graph.rb

@@ -9,45 +9,48 @@ module FbRails
       def facebook_uri
         @facebook_uri ||= URI.parse('https://graph.facebook.com')
       end
-    end
-
-    attr_reader :connect
-    def initialize(connect)
-      @connect = connect
-    end
-
-    def post(url, params = {})
-      request(:post, url, params)
-    end
 
-    def get(url, params = {})
-      request(:get, url, params)
-    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
+        end
+      end
 
-    private
-      def request(http_verb, url, params = {})
-        path = build_path(url, params)
+      def request(http_verb, path, params = {})
+        url = build_url(path, params)
 
         response = ActiveSupport::Notifications.instrument('request.fb_rails') do |payload|
           payload[:http_verb]   = http_verb
-          payload[:request_uri] = path
-          http.send(http_verb, path)
+          payload[:request_uri] = url
+          http.send(http_verb, url)
         end
-      
+
         ActiveSupport::JSON.decode(response.body)
       end
 
-      def build_path(url, params)
-        params = params.merge(:access_token => connect.access_token)
+      def build_url(path, params)
         param_string = params.map { |key, value| "#{key}=#{Rack::Utils.escape(value)}" }.join('&')
-        url = "#{url}?#{param_string}"
+        "#{path}?#{param_string}"
       end
+    end
 
-      def http
-        Net::HTTP.new(self.class.facebook_uri.host, self.class.facebook_uri.port).tap do |result|
-          result.use_ssl = true
-          result.verify_mode = OpenSSL::SSL::VERIFY_NONE
-        end
+    attr_reader :connect
+    def initialize(connect)
+      @connect = connect
+    end
+
+    def post(path, params = {})
+      request(:post, path, params)
+    end
+
+    def get(path, params = {})
+      request(:get, path, params)
+    end
+
+    private
+      def request(http_verb, path, params)
+        self.class.request(http_verb, path, params.merge(:access_token => connect.access_token))
       end
   end
 end

data/lib/fb_rails/log_subscriber.rb

@@ -2,11 +2,7 @@ module FbRails
   class LogSubscriber < ActiveSupport::LogSubscriber
     def request(event)
       name = color('FbRails (%.1fms)' % event.duration, CYAN, true)
-      info "  #{name}  #{event.payload[:http_verb].to_s.upcase} #{event.payload[:request_uri]}"
-    end
-
-    def logger
-      Rails.logger
+      info "  #{name} #{event.payload[:http_verb].to_s.upcase} #{event.payload[:request_uri]}"
     end
   end
 end

data/lib/fb_rails/mock.rb

@@ -32,7 +32,7 @@ module FbRails
       end
 
       def find_response(path)
-        path = path.gsub(/\?.*$/, '')
+        path = path.gsub(/\?.*$/, '').gsub(/^\//, '')
         responses[path]
       end
     end
@@ -47,9 +47,8 @@ module FbRails
   end
 
   class Graph
-    private
-      def http
-        @http ||= Mock.new
-      end
+    def self.http
+      @http ||= Mock.new
+    end
   end
 end

data/test/log_subscriber_test.rb

@@ -5,22 +5,22 @@ require 'fb_rails/log_subscriber'
 class FbRails::LogSubscriberTest < ActiveSupport::TestCase
   include ActiveSupport::LogSubscriber::TestHelper
 
-  setup do
+  def setup
+    super
+
     FbRails::Mock.respond_to do |mock|
       mock.add 'test', 'foo' => 'bar'
     end
+
+    FbRails::LogSubscriber.attach_to :fb_rails
   end
   
-  def set_logger(logger)
-    # raise 'set logger'
-    Rails.logger = logger
-  end
-
   test 'request notification' do
     graph = FbRails::Graph.new(FbRails::Connect.new(fb_cookie))
     graph.get 'test'
 
     wait
     assert_equal 1, @logger.logged(:info).size
+    assert_match /FbRails \(\d+.\d+ms\) GET test/, @logger.logged(:info).first
   end
 end

metadata

@@ -4,9 +4,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 0
-  - 4
+  - 5
   - 0
-  version: 0.4.0
+  version: 0.5.0
 platform: ruby
 authors: 
 - Matthew Higgins
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-01-11 00:00:00 -08:00
+date: 2011-01-26 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency