rest-graph 1.6.0 → 1.7.0

data/test/common.rb

@@ -3,6 +3,9 @@ require 'rubygems' if RUBY_VERSION < '1.9.2'
 require 'rack'     if RUBY_VERSION < '1.9.2' # autoload broken in 1.8?
 require 'rest-graph'
 
+# need to require this before webmock in order to enable mocking in em-http
+require 'em-http-request'
+
 require 'rr'
 require 'webmock'
 require 'bacon'

data/test/test_api.rb

@@ -7,7 +7,7 @@ end
 
 describe RestGraph do
   after do
-    WebMock.reset_webmock
+    WebMock.reset!
     RR.verify
   end
 
@@ -41,12 +41,24 @@ describe RestGraph do
       post('feed/me', :message => 'hi there').should == 'ok'
   end
 
+  should 'use secret_access_token' do
+    stub_request(:get,
+      'https://graph.facebook.com/me?access_token=1|2').
+      to_return(:body => 'ok')
+
+    rg = RestGraph.new(:auto_decode => false, :access_token => 'wrong',
+                       :app_id => '1', :secret => '2')
+    rg.get('me', {}, :secret => true).should == 'ok'
+    rg.url('me', {}, rg.graph_server, :secret => true).should ==
+      'https://graph.facebook.com/me?access_token=1%7C2'
+  end
+
   should 'suppress auto-decode in an api call' do
     stub_request(:get, 'https://graph.facebook.com/woot').
       to_return(:body => 'bad json')
 
     rg = RestGraph.new(:auto_decode => true)
-    rg.get('woot', {}, :suppress_decode => true).should == 'bad json'
+    rg.get('woot', {}, :auto_decode => false).should == 'bad json'
     rg.auto_decode.should == true
   end
 

data/test/test_cache.rb

@@ -7,7 +7,7 @@ end
 
 describe RestGraph do
   after do
-    WebMock.reset_webmock
+    WebMock.reset!
     RR.verify
   end
 

data/test/test_error.rb

@@ -7,7 +7,7 @@ end
 
 describe RestGraph::Error do
   after do
-    WebMock.reset_webmock
+    WebMock.reset!
     RR.verify
   end
 

data/test/test_handler.rb

@@ -7,7 +7,7 @@ end
 
 describe RestGraph do
   after do
-    WebMock.reset_webmock
+    WebMock.reset!
     RR.verify
   end
 

data/test/test_misc.rb

@@ -7,7 +7,7 @@ end
 
 describe RestGraph do
   after do
-    WebMock.reset_webmock
+    WebMock.reset!
     RR.verify
   end
 

data/test/test_multi.rb

@@ -5,12 +5,9 @@ else
   require File.dirname(__FILE__) + '/common'
 end
 
-require 'em-http-request'
-load 'webmock/http_lib_adapters/em_http_request.rb'
-
 describe 'RestGraph#multi' do
   after do
-    WebMock.reset_webmock
+    WebMock.reset!
     RR.verify
   end
 

data/test/test_oauth.rb

@@ -12,7 +12,7 @@ describe RestGraph do
   end
 
   after do
-    WebMock.reset_webmock
+    WebMock.reset!
   end
 
   should 'return correct oauth url' do

data/test/test_old.rb

@@ -7,7 +7,7 @@ end
 
 describe RestGraph do
   after do
-    WebMock.reset_webmock
+    WebMock.reset!
     RR.verify
   end
 
@@ -54,7 +54,7 @@ describe RestGraph do
       'https://api.facebook.com/method/notes.create?format=json').
       to_return(:body => body)
 
-    RestGraph.new.old_rest('notes.create', {}, :suppress_decode => true).
+    RestGraph.new.old_rest('notes.create', {}, :auto_decode => false).
       should == body
   end
 
@@ -71,17 +71,6 @@ describe RestGraph do
       first['access_token'].should == 'bogus'
   end
 
-  should 'broken json' do
-    stub_request(:get,
-      'https://api.facebook.com/method/admin.getAppProperties?' \
-      'access_token=123%7Cs&format=json&properties=app_id'
-    ).to_return(:body => '"{\"app_id\":\"123\"}"')
-
-    RestGraph.new(:app_id => '123', :secret => 's').
-      secret_old_rest('admin.getAppProperties', :properties => 'app_id').
-      should == {'app_id' => '123'}
-  end
-
   should 'use an secret access_token' do
     stub_request(:get,
       'https://api.facebook.com/method/admin.getAppProperties?' \
@@ -92,15 +81,4 @@ describe RestGraph do
       secret_old_rest('admin.getAppProperties', :properties => 'app_id').
       should == {'app_id' => '123'}
   end
-
-  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'
-    ).to_return(:body => '"{\"app_id\":\"123\"}"')
-
-    RestGraph.new(:app_id => '123', :secret => 's', :strict => true).
-      secret_old_rest('admin.getAppProperties', :properties => 'app_id').
-      should == '{"app_id":"123"}'
-  end
 end

data/test/test_page.rb

@@ -7,7 +7,7 @@ end
 
 describe RestGraph do
   after do
-    WebMock.reset_webmock
+    WebMock.reset!
     RR.verify
   end
 

data/test/test_serialize.rb

@@ -7,7 +7,7 @@ end
 
 describe RestGraph do
   after do
-    WebMock.reset_webmock
+    WebMock.reset!
     RR.verify
   end
 

metadata

@@ -4,9 +4,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 1
-  - 6
+  - 7
   - 0
-  version: 1.6.0
+  version: 1.7.0
 platform: ruby
 authors: 
 - Cardinal Blue
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-11-19 00:00:00 +08:00
+date: 2010-12-30 00:00:00 +08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -179,8 +179,8 @@ dependencies:
         segments: 
         - 3
         - 5
-        - 1
-        version: 3.5.1
+        - 4
+        version: 3.5.4
   type: :development
   version_requirements: *id011
 description: A super simple Facebook Open Graph API client
@@ -190,7 +190,6 @@ executables: []
 extensions: []
 
 extra_rdoc_files: 
-- .specification
 - CHANGES
 - CONTRIBUTORS
 - Gemfile
@@ -200,7 +199,6 @@ extra_rdoc_files:
 - TODO
 - rest-graph.gemspec
 files: 
-- .specification
 - CHANGES
 - CONTRIBUTORS
 - Gemfile
@@ -234,6 +232,7 @@ files:
 - 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/rails_util.rb
 - lib/rest-graph/test_util.rb

data/.specification

@@ -1,309 +0,0 @@
---- !ruby/object:Gem::Specification 
-name: rest-graph
-version: !ruby/object:Gem::Version 
-  prerelease: false
-  segments: 
-  - 1
-  - 6
-  - 0
-  version: 1.6.0
-platform: ruby
-authors: 
-- Cardinal Blue
-- "Lin Jen-Shin (aka godfat \xE7\x9C\x9F\xE5\xB8\xB8)"
-autorequire: 
-bindir: bin
-cert_chain: []
-
-date: 2010-11-19 00:00:00 +08:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
-  name: rest-client
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 1
-        - 6
-        - 1
-        version: 1.6.1
-  type: :development
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  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: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 1
-        - 2
-        - 1
-        version: 1.2.1
-  type: :development
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: yajl-ruby
-  prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        - 7
-        - 8
-        version: 0.7.8
-  type: :development
-  version_requirements: *id004
-- !ruby/object:Gem::Dependency 
-  name: json
-  prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 1
-        - 4
-        - 6
-        version: 1.4.6
-  type: :development
-  version_requirements: *id005
-- !ruby/object:Gem::Dependency 
-  name: json_pure
-  prerelease: false
-  requirement: &id006 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 1
-        - 4
-        - 6
-        version: 1.4.6
-  type: :development
-  version_requirements: *id006
-- !ruby/object:Gem::Dependency 
-  name: ruby-hmac
-  prerelease: false
-  requirement: &id007 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        - 4
-        - 0
-        version: 0.4.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 
-  name: webmock
-  prerelease: false
-  requirement: &id009 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 1
-        - 6
-        - 1
-        version: 1.6.1
-  type: :development
-  version_requirements: *id009
-- !ruby/object:Gem::Dependency 
-  name: bacon
-  prerelease: false
-  requirement: &id010 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 1
-        - 1
-        - 0
-        version: 1.1.0
-  type: :development
-  version_requirements: *id010
-- !ruby/object:Gem::Dependency 
-  name: bones
-  prerelease: false
-  requirement: &id011 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 3
-        - 5
-        - 1
-        version: 3.5.1
-  type: :development
-  version_requirements: *id011
-description: A super simple Facebook Open Graph API client
-email: dev (XD) cardinalblue.com
-executables: []
-
-extensions: []
-
-extra_rdoc_files: 
-- .specification
-- CHANGES
-- CONTRIBUTORS
-- Gemfile
-- Gemfile.lock
-- LICENSE
-- README
-- TODO
-- rest-graph.gemspec
-files: 
-- .specification
-- CHANGES
-- CONTRIBUTORS
-- Gemfile
-- Gemfile.lock
-- LICENSE
-- README
-- 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
-- example/rails2/config/boot.rb
-- example/rails2/config/environment.rb
-- example/rails2/config/environments/development.rb
-- example/rails2/config/environments/production.rb
-- example/rails2/config/environments/test.rb
-- 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/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
-- init.rb
-- lib/rest-graph.rb
-- 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
-- test/config/rest-graph.yaml
-- test/test_api.rb
-- test/test_cache.rb
-- test/test_default.rb
-- test/test_error.rb
-- 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: []
-
-post_install_message: 
-rdoc_options: 
-- --main
-- README.rdoc
-require_paths: 
-- lib
-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 
-  none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      segments: 
-      - 0
-      version: "0"
-requirements: []
-
-rubyforge_project: rest-graph
-rubygems_version: 1.3.7
-signing_key: 
-specification_version: 3
-summary: A super simple Facebook Open Graph API client
-test_files: 
-- test/test_api.rb
-- test/test_cache.rb
-- test/test_default.rb
-- test/test_error.rb
-- 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