rest-graph 1.5.0 → 1.6.0

data/test/test_oauth.rb

@@ -12,16 +12,16 @@ describe RestGraph do
   end
 
   after do
-    reset_webmock
+    WebMock.reset_webmock
   end
 
-  it 'would return correct oauth url' do
+  should 'return correct oauth url' do
     TestHelper.normalize_url(@rg.authorize_url(:redirect_uri => @uri)).
     should == 'https://graph.facebook.com/oauth/authorize?' \
               'client_id=29&redirect_uri=http%3A%2F%2Fzzz.tw'
   end
 
-  it 'would do authorizing and parse result and save it in data' do
+  should 'do authorizing and parse result and save it in data' do
     stub_request(:get, 'https://graph.facebook.com/oauth/access_token?' \
                        'client_id=29&client_secret=18&code=zzz&'        \
                        'redirect_uri=http%3A%2F%2Fzzz.tw').
@@ -34,7 +34,7 @@ describe RestGraph do
     @rg.data.should == result
   end
 
-  it 'would not append access_token in authorize_url even presented' do
+  should 'not append access_token in authorize_url even presented' do
     RestGraph.new(:access_token => 'do not use me').authorize_url.
       should == 'https://graph.facebook.com/oauth/authorize'
   end

data/test/test_old.rb

@@ -7,11 +7,11 @@ end
 
 describe RestGraph do
   after do
-    reset_webmock
+    WebMock.reset_webmock
     RR.verify
   end
 
-  it 'would do fql query with/without access_token' do
+  should 'do fql query with/without access_token' do
     fql = 'SELECT name FROM likes where id="123"'
     query = "format=json&query=#{CGI.escape(fql)}"
     stub_request(:get, "https://api.facebook.com/method/fql.query?#{query}").
@@ -27,7 +27,7 @@ describe RestGraph do
     RestGraph.new(:access_token => token).fql(fql).should == []
   end
 
-  it 'would do fql.mutilquery correctly' do
+  should 'do fql.mutilquery correctly' do
     f0 = 'SELECT display_name FROM application WHERE app_id="233082465238"'
     f1 = 'SELECT display_name FROM application WHERE app_id="110225210740"'
     f0q, f1q = "\"#{f0.gsub('"', '\\"')}\"", "\"#{f1.gsub('"', '\\"')}\""
@@ -48,7 +48,7 @@ describe RestGraph do
     RestGraph.new.fql_multi(:f0 => f0, :f1 => f1).should == []
   end
 
-  it 'would do facebook old rest api' do
+  should 'do facebook old rest api' do
     body = 'hate facebook inconsistent'
     stub_request(:get,
       'https://api.facebook.com/method/notes.create?format=json').
@@ -58,7 +58,7 @@ describe RestGraph do
       should == body
   end
 
-  it 'would exchange sessions for access token' do
+  should 'exchange sessions for access token' do
     stub_request(:post,
       'https://graph.facebook.com/oauth/exchange_sessions?'     \
               'type=client_cred&client_id=id&client_secret=di&' \
@@ -71,7 +71,7 @@ describe RestGraph do
       first['access_token'].should == 'bogus'
   end
 
-  it 'returns broken json' do
+  should 'broken json' do
     stub_request(:get,
       'https://api.facebook.com/method/admin.getAppProperties?' \
       'access_token=123%7Cs&format=json&properties=app_id'
@@ -82,7 +82,7 @@ describe RestGraph do
       should == {'app_id' => '123'}
   end
 
-  it 'uses an secret access_token' do
+  should 'use an secret access_token' do
     stub_request(:get,
       'https://api.facebook.com/method/admin.getAppProperties?' \
       'access_token=123%7Cs&format=json&properties=app_id'
@@ -93,7 +93,7 @@ describe RestGraph do
       should == {'app_id' => '123'}
   end
 
-  it 'would not parse twice in strict mode' do
+  should 'not parse twice in strict mode' do
     stub_request(:get,
       'https://api.facebook.com/method/admin.getAppProperties?' \
       'access_token=123%7Cs&format=json&properties=app_id'

data/test/test_page.rb

@@ -7,11 +7,11 @@ end
 
 describe RestGraph do
   after do
-    reset_webmock
+    WebMock.reset_webmock
     RR.verify
   end
 
-  it 'would get the next/prev page' do
+  should 'get the next/prev page' do
     rg = RestGraph.new
     %w[next previous].each{ |type|
       kind = "#{type}_page"
@@ -19,12 +19,12 @@ describe RestGraph do
       rg.send(kind, {'paging' => []}).should == nil
       rg.send(kind, {'paging' => {}}).should == nil
 
-      mock(rg).request(:get, 'zzz', {}){ 'ok' }
-      rg.send(kind, {'paging' => {type => 'zzz'}}).should == 'ok'
+      stub_request(:get, 'zzz').to_return(:body => '["ok"]')
+      rg.send(kind, {'paging' => {type => 'zzz'}}).should == ['ok']
     }
   end
 
-  it 'would merge all pages into one' do
+  should 'merge all pages into one' do
     rg = RestGraph.new
     %w[next previous].each{ |type|
       kind = "#{type}_page"
@@ -32,23 +32,79 @@ describe RestGraph do
 
       # invalid pages or just the page itself
       (-1..1).each{ |page|
-        rg.for_pages(data, page, kind).should == data
+        rg.for_pages(data, page, {}, kind).should == data
       }
 
       (2..4).each{ |pages|
         # merge data
-        mock(rg).request(:get, 'zzz', {}){ {'data' => ['y']} }
-        rg.for_pages(data, pages, kind).should == {'data' => %w[z y]}
+        stub_request(:get, 'zzz').to_return(:body => '{"data":["y"]}')
+        rg.for_pages(data, pages, {}, kind).should == {'data' => %w[z y]}
 
         # this data cannot be merged
-        mock(rg).request(:get, 'zzz', {}){ {'data' => 'y'} }
-        rg.for_pages(data, pages, kind).should == {'data' => %w[z]}
+        stub_request(:get, 'zzz').to_return(:body => '{"data":"y"}')
+        rg.for_pages(data, pages, {}, kind).should == {'data' => %w[z]}
       }
 
-      mock(rg).request(:get, 'zzz', {}){ {'paging' => {type => 'yyy'},
-                                          'data' => ['y']} }
-      mock(rg).request(:get, 'yyy', {}){ {'data' => ['x']} }
-      rg.for_pages(data, 3, kind).should == {'data' => %w[z y x]}
+      stub_request(:get, 'zzz').to_return(:body =>
+        '{"paging":{"'+type+'":"yyy"},"data":["y"]}')
+      stub_request(:get, 'yyy').to_return(:body => '{"data":["x"]}')
+
+      rg.for_pages(data, 3, {}, kind).should == {'data' => %w[z y x]}
+    }
+  end
+
+  should 'for_pages with callback' do
+    rg = RestGraph.new
+    %w[next previous].each{ |type|
+      kind = "#{type}_page"
+      data = {'paging' => {type => 'zzz'}, 'data' => ['z']}
+
+      # invalid pages or just the page itself
+      nils = 0
+      ranges = -1..1
+      ranges.each{ |page|
+        rg.for_pages(data, page, {}, kind){ |r|
+          if r
+            r.should == data
+          else
+            nils += 1
+          end
+        }.should == data
+      }
+      nils.should == ranges.to_a.size
+
+      (2..4).each{ |pages|
+        # merge data
+        stub_request(:get, 'zzz').to_return(:body => '{"data":["y"]}')
+        expects = [{'data' => %w[y]}, nil]
+        rg.for_pages(data, pages, {}, kind){ |r|
+          r.should == expects.shift
+        }.should == {'data' => %w[z y]}
+        expects.empty?.should == true
+
+        # this data cannot be merged
+        stub_request(:get, 'zzz').to_return(:body => '{"data":"y"}')
+        expects = [{'data' => 'y'}, nil]
+        rg.for_pages(data, pages, {}, kind){ |r|
+          r.should == expects.shift
+        }.should == {'data' => %w[z]}
+        expects.empty?.should == true
+      }
+
+      stub_request(:get, 'zzz').to_return(:body =>
+        '{"paging":{"'+type+'":"yyy"},"data":["y"]}')
+      stub_request(:get, 'yyy').to_return(:body => '{"data":["x"]}')
+
+      expects = [{'data' => %w[y]}, {'data' => %w[x]}, nil]
+      rg.for_pages(data, 3, {}, kind){ |rr|
+        if rr
+          r = rr.dup
+          r.delete('paging')
+        else
+          r = rr
+        end
+        r.should == expects.shift
+      }.should == {'data' => %w[z y x]}
     }
   end
 end

data/test/test_parse.rb

@@ -7,13 +7,13 @@ end
 
 describe RestGraph do
 
-  it 'would return nil if parse error, but not when call data directly' do
+  should 'return nil if parse error, but not when call data directly' do
     rg = RestGraph.new
     rg.parse_cookies!({}).should == nil
     rg.data              .should == {}
   end
 
-  it 'would extract correct access_token or fail checking sig' do
+  should 'extract correct access_token or fail checking sig' do
     access_token = '1|2-5|f.'
     app_id       = '1829'
     secret       = app_id.reverse
@@ -49,13 +49,13 @@ describe RestGraph do
     check.call(nil, "\"#{fbs}\"")
   end
 
-  it 'would not pass if there is no secret, prevent from forgery' do
+  should 'not pass if there is no secret, prevent from forgery' do
     rg = RestGraph.new
     rg.parse_fbs!('"feed=me&sig=bddd192cf27f22c05f61c8bea24fa4b7"').
       should == nil
   end
 
-  it 'would parse json correctly' do
+  should 'parse json correctly' do
     rg = RestGraph.new
 
     rg.parse_json!('bad json').should == nil
@@ -68,7 +68,7 @@ describe RestGraph do
       should == {'feed' => 'me', 'sig' => "20393e7823730308938a86ecf1c88b14"}
   end
 
-  it 'would parse signed_request' do
+  should 'parse signed_request' do
     secret = 'aloha'
     json   = RestGraph.json_encode('ooh' => 'dir', 'moo' => 'bar')
     encode = lambda{ |str|
@@ -87,25 +87,25 @@ describe RestGraph do
     rg.parse_signed_request!(signed_request).should == nil
   end
 
-  it 'would fallback to ruby-hmac if Digest.new raise an runtime error' do
+  should 'fallback to ruby-hmac if Digest.new raise an runtime error' do
     key, data = 'top', 'secret'
     mock(OpenSSL::Digest::Digest).new('sha256'){ raise 'boom' }
     RestGraph.hmac_sha256(key, data).should ==
       OpenSSL::HMAC.digest('sha256', key, data)
   end
 
-  it 'would generate correct fbs with correct sig' do
+  should 'generate correct fbs with correct sig' do
     RestGraph.new(:access_token => 'fake', :secret => 's').fbs.should ==
       "access_token=fake&sig=#{Digest::MD5.hexdigest('access_token=fakes')}"
   end
 
-  it 'could parse fbs from facebook response which lacks sig...' do
+  should 'parse fbs from facebook response which lacks sig...' do
     rg = RestGraph.new(:access_token => 'a', :secret => 'z')
     rg.parse_fbs!(rg.fbs)                           .should.kind_of?(Hash)
     rg.parse_fbs!(rg.fbs.sub(/sig\=\w+/, 'sig=abc')).should == nil
   end
 
-  it 'could generate correct fbs with additional parameters' do
+  should 'generate correct fbs with additional parameters' do
     rg = RestGraph.new(:access_token => 'a', :secret => 'z')
     rg.data['expires'] = '1234'
     rg.parse_fbs!(rg.fbs)                           .should.kind_of?(Hash)

data/test/test_serialize.rb

@@ -7,13 +7,22 @@ end
 
 describe RestGraph do
   after do
-    reset_webmock
+    WebMock.reset_webmock
     RR.verify
   end
 
-  it 'could be serialized with lighten' do
-    marshal = RUBY_VERSION >= '1.9' ? Marshal : nil
-    [YAML, marshal].compact.each{ |engine|
+  should 'be serialized with lighten' do
+    engines = if RUBY_VERSION >= '1.9.2'
+                require 'psych'
+                YAML::ENGINE.yamler = 'syck' # TODO: probably a bug?
+                [Marshal, YAML, Psych]
+              elsif defined?(RUBY_ENGINE) && RUBY_ENGINE == 'rbx'
+                [Marshal]
+              else
+                [YAML]
+              end
+
+    engines.each{ |engine|
       test = lambda{ |obj| engine.load(engine.dump(obj)) }
         rg = RestGraph.new(:log_handler => lambda{})
       lambda{ test[rg] }.should.raise(TypeError)

data/test/test_test_util.rb

@@ -0,0 +1,74 @@
+
+if respond_to?(:require_relative, true)
+  require_relative 'common'
+else
+  require File.dirname(__FILE__) + '/common'
+end
+
+require 'rest-graph/test_util'
+
+describe RestGraph::TestUtil do
+  before do
+    RestGraph::TestUtil.setup
+  end
+
+  after do
+    RestGraph::TestUtil.teardown
+  end
+
+  should 'stub requests and store result and teardown do cleanup' do
+    RestGraph.new.get('me')        .should == {'data' => []}
+    RestGraph::TestUtil.history    .should ==
+      [[:get, "https://graph.facebook.com/me", nil]]
+
+    RestGraph::TestUtil.teardown
+
+    RestGraph::TestUtil.history.should == []
+    begin
+      RestGraph.new.get('me')
+    rescue => e
+      e.should.kind_of?(WebMock::NetConnectNotAllowedError)
+    end
+  end
+
+  should 'have default response' do
+    default = {'meta' => []}
+    RestGraph::TestUtil.default_response = default
+    RestGraph.new.get('me')     .should == default
+  end
+
+  should 'have default data' do
+    rg = RestGraph.new
+    rg.data['uid']           .should == '1234'
+    RestGraph::TestUtil.default_data  = {'uid' => '4321'}
+    rg.data['uid']           .should == '4321'
+    RestGraph.new.data['uid'].should == '4321'
+  end
+
+  should 'be easy to stub data' do
+    response = {'data' => 'me'}
+    RestGraph::TestUtil.get('me'){ response }
+    RestGraph.new.get('me').should == response
+    RestGraph.new.get('he').should == RestGraph::TestUtil.default_response
+  end
+
+  should 'emulate login' do
+    RestGraph::TestUtil.login(1829)
+    rg = RestGraph.new
+    rg.data['uid'].should == '1829'
+    rg.authorized?.should == true
+    rg.get('me').should == RestGraph::TestUtil.user('1829')
+  end
+
+  should 'reset before login' do
+    RestGraph::TestUtil.login(1234).login(1829)
+    rg = RestGraph.new
+    rg.data['uid'].should == '1829'
+    rg.authorized?.should == true
+    rg.get('me').should == RestGraph::TestUtil.user('1829')
+    RestGraph::TestUtil.login(1234)
+    rg.data['uid'].should == '1234'
+    rg.authorized?.should == true
+    rg.get('me').should == RestGraph::TestUtil.user('1234')
+  end
+end

data/test/test_timeout.rb

@@ -0,0 +1,20 @@
+
+if respond_to?(:require_relative, true)
+  require_relative 'common'
+else
+  require File.dirname(__FILE__) + '/common'
+end
+
+describe RestGraph do
+  should 'respect timeout' do
+    stub_request(:get, 'https://graph.facebook.com/me').to_return(
+      lambda{ |r| sleep(0.05); '{}' })
+    e = nil
+    begin
+      RestGraph.new(:timeout => 0.01).get('me')
+      nil.should == 'timeout must be thrown'
+    rescue Timeout::Error => e
+    end
+    e.should.kind_of?(Timeout::Error)
+  end
+end

metadata

@@ -4,9 +4,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 1
-  - 5
+  - 6
   - 0
-  version: 1.5.0
+  version: 1.6.0
 platform: ruby
 authors: 
 - Cardinal Blue
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-10-11 00:00:00 +08:00
+date: 2010-11-19 00:00:00 +08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -31,12 +31,27 @@ dependencies:
         - 6
         - 1
         version: 1.6.1
-  type: :runtime
+  type: :development
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
-  name: rack
+  name: em-http-request
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        - 2
+        - 15
+        version: 0.2.15
+  type: :development
+  version_requirements: *id002
+- !ruby/object:Gem::Dependency 
+  name: rack
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -47,11 +62,11 @@ dependencies:
         - 1
         version: 1.2.1
   type: :development
-  version_requirements: *id002
+  version_requirements: *id003
 - !ruby/object:Gem::Dependency 
   name: yajl-ruby
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -62,11 +77,11 @@ dependencies:
         - 8
         version: 0.7.8
   type: :development
-  version_requirements: *id003
+  version_requirements: *id004
 - !ruby/object:Gem::Dependency 
   name: json
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -77,11 +92,11 @@ dependencies:
         - 6
         version: 1.4.6
   type: :development
-  version_requirements: *id004
+  version_requirements: *id005
 - !ruby/object:Gem::Dependency 
   name: json_pure
   prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -92,11 +107,11 @@ dependencies:
         - 6
         version: 1.4.6
   type: :development
-  version_requirements: *id005
+  version_requirements: *id006
 - !ruby/object:Gem::Dependency 
   name: ruby-hmac
   prerelease: false
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  requirement: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -107,11 +122,11 @@ dependencies:
         - 0
         version: 0.4.0
   type: :development
-  version_requirements: *id006
+  version_requirements: *id007
 - !ruby/object:Gem::Dependency 
   name: rr
   prerelease: false
-  requirement: &id007 !ruby/object:Gem::Requirement 
+  requirement: &id008 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -119,29 +134,29 @@ dependencies:
         segments: 
         - 1
         - 0
-        - 0
-        version: 1.0.0
+        - 2
+        version: 1.0.2
   type: :development
-  version_requirements: *id007
+  version_requirements: *id008
 - !ruby/object:Gem::Dependency 
   name: webmock
   prerelease: false
-  requirement: &id008 !ruby/object:Gem::Requirement 
+  requirement: &id009 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
         segments: 
         - 1
-        - 3
-        - 5
-        version: 1.3.5
+        - 6
+        - 1
+        version: 1.6.1
   type: :development
-  version_requirements: *id008
+  version_requirements: *id009
 - !ruby/object:Gem::Dependency 
   name: bacon
   prerelease: false
-  requirement: &id009 !ruby/object:Gem::Requirement 
+  requirement: &id010 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -152,22 +167,22 @@ dependencies:
         - 0
         version: 1.1.0
   type: :development
-  version_requirements: *id009
+  version_requirements: *id010
 - !ruby/object:Gem::Dependency 
   name: bones
   prerelease: false
-  requirement: &id010 !ruby/object:Gem::Requirement 
+  requirement: &id011 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
         segments: 
         - 3
-        - 4
-        - 7
-        version: 3.4.7
+        - 5
+        - 1
+        version: 3.5.1
   type: :development
-  version_requirements: *id010
+  version_requirements: *id011
 description: A super simple Facebook Open Graph API client
 email: dev (XD) cardinalblue.com
 executables: []
@@ -175,6 +190,7 @@ executables: []
 extensions: []
 
 extra_rdoc_files: 
+- .specification
 - CHANGES
 - CONTRIBUTORS
 - Gemfile
@@ -184,6 +200,7 @@ extra_rdoc_files:
 - TODO
 - rest-graph.gemspec
 files: 
+- .specification
 - CHANGES
 - CONTRIBUTORS
 - Gemfile
@@ -193,6 +210,8 @@ files:
 - README.rdoc
 - Rakefile
 - TODO
+- example/multi/config.ru
+- example/multi/rainbows.rb
 - example/rails2/README
 - example/rails2/Rakefile
 - example/rails2/app/controllers/application_controller.rb
@@ -217,6 +236,7 @@ files:
 - lib/rest-graph/auto_load.rb
 - lib/rest-graph/load_config.rb
 - lib/rest-graph/rails_util.rb
+- lib/rest-graph/test_util.rb
 - lib/rest-graph/version.rb
 - rest-graph.gemspec
 - test/common.rb
@@ -228,12 +248,15 @@ files:
 - test/test_handler.rb
 - test/test_load_config.rb
 - test/test_misc.rb
+- test/test_multi.rb
 - test/test_oauth.rb
 - test/test_old.rb
 - test/test_page.rb
 - test/test_parse.rb
 - test/test_rest-graph.rb
 - test/test_serialize.rb
+- test/test_test_util.rb
+- test/test_timeout.rb
 has_rdoc: true
 homepage: http://github.com/cardinalblue/rest-graph
 licenses: []
@@ -275,9 +298,12 @@ test_files:
 - test/test_handler.rb
 - test/test_load_config.rb
 - test/test_misc.rb
+- test/test_multi.rb
 - test/test_oauth.rb
 - test/test_old.rb
 - test/test_page.rb
 - test/test_parse.rb
 - test/test_rest-graph.rb
 - test/test_serialize.rb
+- test/test_test_util.rb
+- test/test_timeout.rb