fb_rails 1.1.2 → 1.2.0

data/lib/fb_rails.rb

@@ -1,3 +1,5 @@
+require 'rails/all'
+
 module FbRails
   extend ActiveSupport::Autoload
 
@@ -11,4 +13,5 @@ module FbRails
   autoload :TestHelper
 end
 
+require 'fb_rails/errors'
 require 'fb_rails/engine'

data/lib/fb_rails/errors.rb

@@ -0,0 +1,14 @@
+module FbRails
+  class GraphError < StandardError
+    def initialize(message)
+      @message = message
+    end
+    def to_s; @message ;end
+  end
+
+  class TimeoutError < GraphError
+  end
+
+  class ResponseError < GraphError
+  end
+end

data/lib/fb_rails/graph.rb

@@ -4,13 +4,6 @@ require 'uri'
 require 'fb_rails/log_subscriber'
 
 module FbRails
-  class TimeoutError < StandardError
-    def initialize(message)
-      @message = message
-    end
-    def to_s; @message ;end
-  end
-
   class Graph
     class << self
       def facebook_uri
@@ -38,7 +31,11 @@ module FbRails
 
         def json_request(http_verb, path, *arguments)
           response = request(http_verb, path, *arguments)
-          ActiveSupport::JSON.decode(response.body)
+          begin
+            ActiveSupport::JSON.decode(response.body)
+          rescue => e
+            raise ResponseError.new(e.message)
+          end
         end
 
         def http

data/test/error_test.rb

@@ -0,0 +1,7 @@
+require 'test_helper'
+
+class FbRails::ErrorTest < ActiveSupport::TestCase
+  test 'to_s' do
+    assert_equal 'hello', FbRails::GraphError.new('hello').to_s
+  end
+end

data/test/graph_test.rb

@@ -14,4 +14,13 @@ class FbRails::GraphTest < ActiveSupport::TestCase
       FbRails::Graph.get 'foo'
     end
   end
+
+  test 'rescue response error' do
+    http = stub(get: stub(body: "false"))
+    FbRails::Graph.expects(:http).returns(http)
+
+    assert_raise FbRails::ResponseError do
+      FbRails::Graph.get 'foo'
+    end
+  end
 end

data/test/test_helper.rb

@@ -1,10 +1,7 @@
 require 'rubygems'
 require 'bundler/setup'
-
+Bundler.require(:default, :test)
 require 'test/unit'
-require 'rails/all'
-require 'fb_rails'
-require 'mocha'
 
 require 'sample/user'
 require 'sample/test_controller'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fb_rails
 version: !ruby/object:Gem::Version
-  version: 1.1.2
+  version: 1.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-09-22 00:00:00.000000000Z
+date: 2011-12-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &70118718756760 !ruby/object:Gem::Requirement
+  requirement: &70111865339960 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,7 +21,18 @@ dependencies:
         version: 3.0.0
   type: :development
   prerelease: false
-  version_requirements: *70118718756760
+  version_requirements: *70111865339960
+- !ruby/object:Gem::Dependency
+  name: fakeweb
+  requirement: &70111865339500 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: *70111865339500
 description: A Rails 3 gem for the latest facebook API
 email: developer@matthewhiggins.com
 executables: []
@@ -36,6 +47,7 @@ files:
 - lib/fb_rails/connect.rb
 - lib/fb_rails/cookie.rb
 - lib/fb_rails/engine.rb
+- lib/fb_rails/errors.rb
 - lib/fb_rails/fb.rb
 - lib/fb_rails/graph.rb
 - lib/fb_rails/integration/action_controller.rb
@@ -48,6 +60,7 @@ files:
 - test/config_test.rb
 - test/connect_test.rb
 - test/cookie_test.rb
+- test/error_test.rb
 - test/fb_test.rb
 - test/graph_test.rb
 - test/helpers/action_controller_test.rb