rest-graph 1.7.0 → 1.8.0

data/test/test_api.rb

@@ -33,6 +33,22 @@ describe RestGraph do
                   :accept => 'text/plain').get('me').should == {'data' => []}
   end
 
+  should 'pass custom headers' do
+    stub_request(:get, 'http://example.com/').with(
+      :headers => {'Accept'          => 'text/javascript',
+                   'Accept-Language' => 'en-us',
+                   'Accept-Encoding' => 'gzip, deflate', # this is by ruby
+                   'X-Forwarded-For' => '127.0.0.1',
+                  }.merge(RUBY_VERSION < '1.9.2' ?
+                  {} :
+                  {'User-Agent'      => 'Ruby'})).       # this is by ruby
+      to_return(:body => '{"data": []}')
+
+    RestGraph.new.request({:headers => {'X-Forwarded-For' => '127.0.0.1'}},
+                          [:get, 'http://example.com']).
+      should == {'data' => []}
+  end
+
   should 'post right' do
     stub_request(:post, 'https://graph.facebook.com/feed/me').
       with(:body => 'message=hi%20there').to_return(:body => 'ok')

data/test/test_cache.rb

@@ -11,14 +11,34 @@ describe RestGraph do
     RR.verify
   end
 
-  should 'enable cache if passing cache' do
-    url, body = "https://graph.facebook.com/cache", '{"message":"ok"}'
-    stub_request(:get, url).to_return(:body => body).times(1)
-
-    cache = {}
-    rg = RestGraph.new(:cache => cache, :auto_decode => false)
-    3.times{ rg.get('cache').should == body }
-    cache.should == {rg.send(:cache_key, url) => body}
+  describe 'cache' do
+    before do
+      @url, @body = "https://graph.facebook.com/cache", '{"message":"ok"}'
+      @cache = {}
+      @rg = RestGraph.new(:cache => @cache, :auto_decode => false)
+      stub_request(:get, @url).to_return(:body => @body).times(1)
+    end
+
+    should 'enable cache if passing cache' do
+      3.times{ @rg.get('cache').should == @body }
+      @cache.should == {@rg.send(:cache_key, @url) => @body}
+    end
+
+    should 'respect expires_in' do
+      mock(@cache).method(:store){ mock!.arity{ -3 } }
+      mock(@cache).store(@rg.send(:cache_key, @url), @body, :expires_in => 3)
+      @rg.get('cache', {}, :expires_in => 3).should == @body
+    end
+
+    should 'update cache if there is cache option set to false' do
+      @rg.get('cache')                     .should == @body
+      stub_request(:get, @url).to_return(:body => @body.reverse).times(2)
+      @rg.get('cache')                     .should == @body
+      @rg.get('cache', {}, :cache => false).should == @body.reverse
+      @rg.get('cache')                     .should == @body.reverse
+      @rg.cache = nil
+      @rg.get('cache', {}, :cache => false).should == @body.reverse
+    end
   end
 
   should 'not cache post/put/delete' do

data/test/test_error.rb

@@ -48,4 +48,13 @@ describe RestGraph::Error do
     error.should.not.kind_of?(RestGraph::Error::AccessToken)
     error.should    .kind_of?(RestGraph::Error)
   end
+
+  should 'nuke cache upon errors' do
+    stub_request(:get, 'https://graph.facebook.com/me').
+      to_return(:body => '{"error":"wrong"}').times(2)
+
+    rg = RestGraph.new(:cache => {}, :error_handler => lambda{|e,u|})
+    rg.get('me'); rg.get('me')
+    rg.cache.values.should == [nil]
+  end
 end

data/test/test_facebook.rb

@@ -0,0 +1,36 @@
+
+if respond_to?(:require_relative, true)
+  require_relative 'common'
+else
+  require File.dirname(__FILE__) + '/common'
+end
+
+require 'rest-graph/facebook_util'
+
+describe RestGraph::FacebookUtil do
+  after do
+    RR.verify
+  end
+
+  before do
+    @res = [{'publish_stream' => 1, 'email' => 0}]
+  end
+
+  should 'fix_permission' do
+    RestGraph.new.fix_permissions(@res).should == %w[publish_stream]
+  end
+
+  should 'fix_fql_multi' do
+    RestGraph.new.fix_fql_multi([{'name'=>'a', 'fql_result_set'=> @res}]).
+      should == {'a' => @res}
+  end
+
+  should 'permissions' do
+    mock(rg = RestGraph.new).fql(
+      rg.permissions_fql(1234,
+      RestGraph::FacebookUtil::PERMISSIONS), {}, :secret => true
+    ){ @res }
+
+    rg.permissions(1234).should == %w[publish_stream]
+  end
+end

data/test/test_load_config.rb

@@ -5,9 +5,9 @@ else
   require File.dirname(__FILE__) + '/common'
 end
 
-require 'rest-graph/load_config'
+require 'rest-graph/config_util'
 
-describe RestGraph::LoadConfig do
+describe RestGraph::ConfigUtil do
 
   after do
     RR.verify
@@ -15,8 +15,8 @@ describe RestGraph::LoadConfig do
 
   should 'honor rails config' do
     ::Rails = Object.new
-    mock(Rails).env { 'test' }
-    mock(Rails).root{ File.dirname(__FILE__) }
+    mock(Rails).env { 'test' }.times(2)
+    mock(Rails).root{ File.dirname(__FILE__) }.times(2)
 
     check = lambda{
       RestGraph.default_app_id.should ==   41829
@@ -25,16 +25,18 @@ describe RestGraph::LoadConfig do
       RestGraph.default_lang.should        == 'zh-tw'
     }
 
-    TestHelper.ensure_rollback{
-      RestGraph::LoadConfig.load_if_rails!
-      check
-    }
-
-    TestHelper.ensure_rollback{
-      RestGraph::LoadConfig.load_config!(
-        "#{File.dirname(__FILE__)}/config/rest-graph.yaml",
-        'test')
-      check
+    [RestGraph::ConfigUtil, RestGraph].each{ |const|
+      TestHelper.ensure_rollback{
+        const.load_config_for_rails
+        check.call
+      }
+
+      TestHelper.ensure_rollback{
+        const.load_config(
+          "#{File.dirname(__FILE__)}/config/rest-graph.yaml",
+          'test')
+        check.call
+      }
     }
   end
 end

data/test/test_misc.rb

@@ -53,13 +53,13 @@ describe RestGraph do
   end
 
   should 'auto decode json' do
-    RestGraph.new(:auto_decode => true).send(:post_request, '[]').
-      should == []
+    RestGraph.new(:auto_decode => true).
+      send(:post_request, '[]', '', {}).should == []
   end
 
   should 'not auto decode json' do
-    RestGraph.new(:auto_decode => false).send(:post_request, '[]').
-      should == '[]'
+    RestGraph.new(:auto_decode => false).
+      send(:post_request, '[]', '', {}).should == '[]'
   end
 
   should 'give better inspect string' do

data/test/test_parse.rb

@@ -58,7 +58,7 @@ describe RestGraph do
   should 'parse json correctly' do
     rg = RestGraph.new
 
-    rg.parse_json!('bad json').should == nil
+    rg.parse_json!('bad json')    .should == nil
     rg.parse_json!('{"no":"sig"}').should == nil
     rg.parse_json!('{"feed":"me","sig":"bddd192cf27f22c05f61c8bea24fa4b7"}').
       should == nil
@@ -66,6 +66,9 @@ describe RestGraph do
     rg = RestGraph.new(:secret => 'bread')
     rg.parse_json!('{"feed":"me","sig":"20393e7823730308938a86ecf1c88b14"}').
       should == {'feed' => 'me', 'sig' => "20393e7823730308938a86ecf1c88b14"}
+    rg.data.empty?.should == false
+    rg.parse_json!('bad json')
+    rg.data.empty?.should == true
   end
 
   should 'parse signed_request' do
@@ -85,13 +88,14 @@ describe RestGraph do
 
     signed_request = "#{encode[sig[0..-4]+'bad']}.#{json_encoded}"
     rg.parse_signed_request!(signed_request).should == nil
+    rg.data                                 .should == {}
   end
 
   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)
+    digest = OpenSSL::HMAC.digest('sha256', key, data)
+    mock(OpenSSL::HMAC).digest('sha256', key, data){ raise 'boom' }
+    RestGraph.hmac_sha256(key, data).should == digest
   end
 
   should 'generate correct fbs with correct sig' do
@@ -102,7 +106,9 @@ describe RestGraph 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.data.empty?.should == false
     rg.parse_fbs!(rg.fbs.sub(/sig\=\w+/, 'sig=abc')).should == nil
+    rg.data.empty?.should == true
   end
 
   should 'generate correct fbs with additional parameters' do

metadata

@@ -1,218 +1,162 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: rest-graph
-version: !ruby/object:Gem::Version 
-  prerelease: false
-  segments: 
-  - 1
-  - 7
-  - 0
-  version: 1.7.0
+version: !ruby/object:Gem::Version
+  version: 1.8.0
+  prerelease: 
 platform: ruby
-authors: 
+authors:
 - Cardinal Blue
-- "Lin Jen-Shin (aka godfat \xE7\x9C\x9F\xE5\xB8\xB8)"
+- Lin Jen-Shin (godfat)
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2010-12-30 00:00:00 +08:00
+date: 2011-03-08 00:00:00.000000000 +08:00
 default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+dependencies:
+- !ruby/object:Gem::Dependency
   name: rest-client
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: &2153148340 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 1
-        - 6
-        - 1
-        version: 1.6.1
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: em-http-request
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: *2153148340
+- !ruby/object:Gem::Dependency
+  name: em-http-request
+  requirement: &2153314520 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        - 2
-        - 15
-        version: 0.2.15
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: rack
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: *2153314520
+- !ruby/object:Gem::Dependency
+  name: rack
+  requirement: &2153544440 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 1
-        - 2
-        - 1
-        version: 1.2.1
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: yajl-ruby
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  version_requirements: *2153544440
+- !ruby/object:Gem::Dependency
+  name: yajl-ruby
+  requirement: &2153635780 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        - 7
-        - 8
-        version: 0.7.8
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id004
-- !ruby/object:Gem::Dependency 
-  name: json
   prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  version_requirements: *2153635780
+- !ruby/object:Gem::Dependency
+  name: json
+  requirement: &2153767440 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 1
-        - 4
-        - 6
-        version: 1.4.6
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id005
-- !ruby/object:Gem::Dependency 
-  name: json_pure
   prerelease: false
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  version_requirements: *2153767440
+- !ruby/object:Gem::Dependency
+  name: json_pure
+  requirement: &2153853200 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 1
-        - 4
-        - 6
-        version: 1.4.6
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id006
-- !ruby/object:Gem::Dependency 
-  name: ruby-hmac
   prerelease: false
-  requirement: &id007 !ruby/object:Gem::Requirement 
+  version_requirements: *2153853200
+- !ruby/object:Gem::Dependency
+  name: ruby-hmac
+  requirement: &2153871880 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        - 4
-        - 0
-        version: 0.4.0
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id007
-- !ruby/object:Gem::Dependency 
-  name: rr
   prerelease: false
-  requirement: &id008 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 1
-        - 0
-        - 2
-        version: 1.0.2
-  type: :development
-  version_requirements: *id008
-- !ruby/object:Gem::Dependency 
+  version_requirements: *2153871880
+- !ruby/object:Gem::Dependency
   name: webmock
-  prerelease: false
-  requirement: &id009 !ruby/object:Gem::Requirement 
+  requirement: &2153926200 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 1
-        - 6
-        - 1
-        version: 1.6.1
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id009
-- !ruby/object:Gem::Dependency 
-  name: bacon
   prerelease: false
-  requirement: &id010 !ruby/object:Gem::Requirement 
+  version_requirements: *2153926200
+- !ruby/object:Gem::Dependency
+  name: bacon
+  requirement: &2154367340 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 1
-        - 1
-        - 0
-        version: 1.1.0
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id010
-- !ruby/object:Gem::Dependency 
-  name: bones
   prerelease: false
-  requirement: &id011 !ruby/object:Gem::Requirement 
+  version_requirements: *2154367340
+- !ruby/object:Gem::Dependency
+  name: rr
+  requirement: &2154734360 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 3
-        - 5
-        - 4
-        version: 3.5.4
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id011
-description: A super simple Facebook Open Graph API client
-email: dev (XD) cardinalblue.com
+  prerelease: false
+  version_requirements: *2154734360
+description: A lightweight Facebook Graph API client
+email:
+- dev (XD) cardinalblue.com
 executables: []
-
 extensions: []
-
-extra_rdoc_files: 
+extra_rdoc_files:
 - CHANGES
 - CONTRIBUTORS
-- Gemfile
-- Gemfile.lock
 - LICENSE
-- README
 - TODO
-- rest-graph.gemspec
-files: 
+files:
+- .gitignore
 - CHANGES
 - CONTRIBUTORS
 - Gemfile
-- Gemfile.lock
 - LICENSE
 - README
-- README.rdoc
+- README.md
 - Rakefile
 - TODO
+- doc/ToC.md
+- doc/dependency.md
+- doc/design.md
+- doc/rails.md
+- doc/test.md
+- doc/tutorial.md
 - example/multi/config.ru
 - example/multi/rainbows.rb
+- example/rails2/Gemfile
+- example/rails2/Gemfile.lock
 - example/rails2/README
 - example/rails2/Rakefile
 - example/rails2/app/controllers/application_controller.rb
+- example/rails2/app/views/application/helper.html.erb
 - example/rails2/config/boot.rb
 - example/rails2/config/environment.rb
 - example/rails2/config/environments/development.rb
@@ -221,29 +165,50 @@ files:
 - example/rails2/config/initializers/cookie_verification_secret.rb
 - example/rails2/config/initializers/new_rails_defaults.rb
 - example/rails2/config/initializers/session_store.rb
+- example/rails2/config/preinitializer.rb
 - example/rails2/config/rest-graph.yaml
 - example/rails2/config/routes.rb
 - example/rails2/log
-- example/rails2/script/console
-- example/rails2/script/server
 - example/rails2/test/functional/application_controller_test.rb
 - example/rails2/test/test_helper.rb
 - example/rails2/test/unit/rails_util_test.rb
+- example/rails3/Gemfile
+- example/rails3/Gemfile.lock
+- example/rails3/Rakefile
+- example/rails3/app/controllers/application_controller.rb
+- example/rails3/app/views/application/helper.html.erb
+- example/rails3/config.ru
+- example/rails3/config/application.rb
+- example/rails3/config/environment.rb
+- example/rails3/config/environments/development.rb
+- example/rails3/config/environments/production.rb
+- example/rails3/config/environments/test.rb
+- example/rails3/config/initializers/secret_token.rb
+- example/rails3/config/initializers/session_store.rb
+- example/rails3/config/rest-graph.yaml
+- example/rails3/config/routes.rb
+- example/rails3/test/functional/application_controller_test.rb
+- example/rails3/test/test_helper.rb
+- example/rails3/test/unit/rails_util_test.rb
 - init.rb
 - lib/rest-graph.rb
 - lib/rest-graph/auto_load.rb
 - lib/rest-graph/autoload.rb
-- lib/rest-graph/load_config.rb
+- lib/rest-graph/config_util.rb
+- lib/rest-graph/core.rb
+- lib/rest-graph/facebook_util.rb
 - lib/rest-graph/rails_util.rb
 - lib/rest-graph/test_util.rb
 - lib/rest-graph/version.rb
 - rest-graph.gemspec
+- task/gemgem.rb
 - test/common.rb
 - test/config/rest-graph.yaml
 - test/test_api.rb
 - test/test_cache.rb
 - test/test_default.rb
 - test/test_error.rb
+- test/test_facebook.rb
 - test/test_handler.rb
 - test/test_load_config.rb
 - test/test_misc.rb
@@ -257,43 +222,38 @@ files:
 - test/test_test_util.rb
 - test/test_timeout.rb
 has_rdoc: true
-homepage: http://github.com/cardinalblue/rest-graph
+homepage: http://github.com/godfat/
 licenses: []
-
 post_install_message: 
-rdoc_options: 
+rdoc_options:
 - --main
-- README.rdoc
-require_paths: 
+- README
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
-rubyforge_project: rest-graph
-rubygems_version: 1.3.7
+rubyforge_project: 
+rubygems_version: 1.6.1
 signing_key: 
 specification_version: 3
-summary: A super simple Facebook Open Graph API client
-test_files: 
+summary: A lightweight Facebook Graph API client
+test_files:
 - test/test_api.rb
 - test/test_cache.rb
 - test/test_default.rb
 - test/test_error.rb
+- test/test_facebook.rb
 - test/test_handler.rb
 - test/test_load_config.rb
 - test/test_misc.rb