rest-graph 1.4.5 → 1.4.6

data/test/common.rb

@@ -7,6 +7,9 @@ require 'rr'
 require 'webmock'
 require 'bacon'
 
+# for testing lighten (serialization)
+require 'yaml'
+
 include RR::Adapters::RRMethods
 include WebMock
 WebMock.disable_net_connect!

data/test/test_access_token.rb

@@ -0,0 +1,26 @@
+
+if respond_to?(:require_relative, true)
+  require_relative 'common'
+else
+  require File.dirname(__FILE__) + '/common'
+end
+
+describe RestGraph do
+  after do
+    reset_webmock
+    RR.verify
+  end
+
+  it 'would return true in authorized? if there is an access_token' do
+    RestGraph.new(:access_token => '1').authorized?.should == true
+    RestGraph.new(:access_token => nil).authorized?.should == false
+  end
+
+  it 'would treat oauth_token as access_token as well' do
+    rg = RestGraph.new
+    hate_facebook = 'why the hell two different name?'
+    rg.data['oauth_token'] = hate_facebook
+    rg.authorized?.should == true
+    rg.access_token       == hate_facebook
+  end
+end

data/test/{test_rest-graph.rb → test_api.rb}

@@ -11,39 +11,11 @@ describe RestGraph do
     RR.verify
   end
 
-  it 'would build correct headers' do
-    rg = RestGraph.new(:accept => 'text/html',
-                       :lang   => 'zh-tw')
-    rg.send(:build_headers).should == {'Accept'          => 'text/html',
-                                       'Accept-Language' => 'zh-tw'}
-  end
-
-  it 'would build empty query string' do
-    RestGraph.new.send(:build_query_string).should == ''
-  end
-
-  it 'would create access_token in query string' do
-    RestGraph.new(:access_token => 'token').send(:build_query_string).
-      should == '?access_token=token'
-  end
-
-  it 'would build correct query string' do
-    TestHelper.normalize_query(
-    RestGraph.new(:access_token => 'token').send(:build_query_string,
-                                                 :message => 'hi!!')).
-      should == '?access_token=token&message=hi%21%21'
-
-    TestHelper.normalize_query(
-    RestGraph.new.send(:build_query_string, :message => 'hi!!',
-                                            :subject => '(&oh&)')).
-      should == '?message=hi%21%21&subject=%28%26oh%26%29'
-  end
-
   it 'would generate correct url' do
     TestHelper.normalize_url(
-    RestGraph.new(:access_token => 'awesome').url('path', :query => 'string')).
+    RestGraph.new(:access_token => 'awesome').url('path', :query => 'str')).
       should ==
-        'https://graph.facebook.com/path?access_token=awesome&query=string'
+        'https://graph.facebook.com/path?access_token=awesome&query=str'
   end
 
   it 'would request to correct server' do
@@ -69,16 +41,6 @@ describe RestGraph do
       post('feed/me', :message => 'hi there').should == 'ok'
   end
 
-  it 'would auto decode json' do
-    RestGraph.new(:auto_decode => true).send(:post_request, '[]').
-      should == []
-  end
-
-  it 'would not auto decode json' do
-    RestGraph.new(:auto_decode => false).send(:post_request, '[]').
-      should == '[]'
-  end
-
   it 'could suppress auto-decode in an api call' do
     stub_request(:get, 'https://graph.facebook.com/woot').
       to_return(:body => 'bad json')
@@ -106,36 +68,10 @@ describe RestGraph do
     }
   end
 
-  it 'would return true in authorized? if there is an access_token' do
-    RestGraph.new(:access_token => '1').authorized?.should == true
-    RestGraph.new(:access_token => nil).authorized?.should == false
-  end
-
   it 'would convert query to string' do
     mock(o = Object.new).to_s{ 'i am mock' }
     stub_request(:get, "https://graph.facebook.com/search?q=i%20am%20mock").
       to_return(:body => 'ok')
     RestGraph.new(:auto_decode => false).get('search', :q => o).should == 'ok'
   end
-
-  it 'would enable cache if passing cache' do
-    url, body = "https://graph.facebook.com/cache", '{"message":"ok"}'
-    stub_request(:get, url).to_return(:body => body)
-
-    cache = {}
-    rg = RestGraph.new(:cache => cache, :auto_decode => false)
-    3.times{
-      rg.get('cache').should == body
-      reset_webmock
-    }
-    cache.should == {rg.send(:cache_key, url) => body}
-  end
-
-  it 'would treat oauth_token as access_token as well' do
-    rg = RestGraph.new
-    hate_facebook = 'why the hell two different name?'
-    rg.data['oauth_token'] = hate_facebook
-    rg.authorized?.should == true
-    rg.access_token       == hate_facebook
-  end
 end

data/test/test_cache.rb

@@ -0,0 +1,41 @@
+
+if respond_to?(:require_relative, true)
+  require_relative 'common'
+else
+  require File.dirname(__FILE__) + '/common'
+end
+
+describe RestGraph do
+  after do
+    reset_webmock
+    RR.verify
+  end
+
+  it 'would 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}
+  end
+
+  it 'would not cache post/put/delete' do
+    [:put, :post, :delete].each{ |meth|
+      url, body = "https://graph.facebook.com/cache", '{"message":"ok"}'
+      stub_request(meth, url).to_return(:body => body).times(3)
+
+      cache = {}
+      rg = RestGraph.new(:cache => cache)
+      3.times{
+        if meth == :delete
+          rg.send(meth, 'cache').should == {'message' => 'ok'}
+        else
+          rg.send(meth, 'cache', 'payload').should == {'message' => 'ok'}
+        end
+      }
+      cache.should == {}
+    }
+  end
+end

data/test/test_handler.rb

@@ -5,8 +5,6 @@ else
   require File.dirname(__FILE__) + '/common'
 end
 
-require 'json'
-
 describe RestGraph do
   after do
     reset_webmock
@@ -34,7 +32,7 @@ describe RestGraph do
     before do
       @id    = lambda{ |obj| obj }
       @error = '{"error":{"type":"Exception","message":"(#2500)"}}'
-      @error_hash = JSON.parse(@error)
+      @error_hash = RestGraph.json_decode(@error)
 
       stub_request(:get, 'https://graph.facebook.com/me').
         to_return(:body => @error)
@@ -63,7 +61,7 @@ describe RestGraph do
     before do
       @id             = lambda{ |obj| obj }
       @fql_error      = '{"error_code":603,"error_msg":"Unknown table: bad"}'
-      @fql_error_hash = JSON.parse(@fql_error)
+      @fql_error_hash = RestGraph.json_decode(@fql_error)
 
       @bad_fql_query  = 'SELECT name FROM bad_table WHERE uid="12345"'
       bad_fql_request = "https://api.facebook.com/method/fql.query?" \

data/test/test_misc.rb

@@ -0,0 +1,51 @@
+
+if respond_to?(:require_relative, true)
+  require_relative 'common'
+else
+  require File.dirname(__FILE__) + '/common'
+end
+
+describe RestGraph do
+  after do
+    reset_webmock
+    RR.verify
+  end
+
+  it 'would build correct headers' do
+    rg = RestGraph.new(:accept => 'text/html',
+                       :lang   => 'zh-tw')
+    rg.send(:build_headers).should == {'Accept'          => 'text/html',
+                                       'Accept-Language' => 'zh-tw'}
+  end
+
+  it 'would build empty query string' do
+    RestGraph.new.send(:build_query_string).should == ''
+  end
+
+  it 'would create access_token in query string' do
+    RestGraph.new(:access_token => 'token').send(:build_query_string).
+      should == '?access_token=token'
+  end
+
+  it 'would build correct query string' do
+    TestHelper.normalize_query(
+    RestGraph.new(:access_token => 'token').send(:build_query_string,
+                                                 :message => 'hi!!')).
+      should == '?access_token=token&message=hi%21%21'
+
+    TestHelper.normalize_query(
+    RestGraph.new.send(:build_query_string, :message => 'hi!!',
+                                            :subject => '(&oh&)')).
+      should == '?message=hi%21%21&subject=%28%26oh%26%29'
+  end
+
+  it 'would auto decode json' do
+    RestGraph.new(:auto_decode => true).send(:post_request, '[]').
+      should == []
+  end
+
+  it 'would not auto decode json' do
+    RestGraph.new(:auto_decode => false).send(:post_request, '[]').
+      should == '[]'
+  end
+end

data/test/test_old.rb

@@ -45,19 +45,7 @@ describe RestGraph do
     }
 
     stub_multi.call
-
-    queries = {:f0 => f0, :f1 => f1}
-    RestGraph.new.fql_multi(queries).should == []
-
-    # FIXME: didn't work
-    # mock(queries).respond_to?(:json){ false }
-    # mock.proxy(queries).inject
-    def queries.respond_to? msg
-      msg == :to_json ? false : super(msg)
-    end
-
-    stub_multi.call
-    RestGraph.new.fql_multi(queries).should == []
+    RestGraph.new.fql_multi(:f0 => f0, :f1 => f1).should == []
   end
 
   it 'would do facebook old rest api' do

data/test/test_parse.rb

@@ -70,7 +70,7 @@ describe RestGraph do
 
   it 'would parse signed_request' do
     secret = 'aloha'
-    json   = {'ooh' => 'dir', 'moo' => 'bar'}.to_json
+    json   = RestGraph.json_encode('ooh' => 'dir', 'moo' => 'bar')
     encode = lambda{ |str|
       [str].pack('m').tr("\n=", '').tr('+/', '-_')
     }

data/test/test_serialize.rb

@@ -0,0 +1,26 @@
+
+if respond_to?(:require_relative, true)
+  require_relative 'common'
+else
+  require File.dirname(__FILE__) + '/common'
+end
+
+describe RestGraph do
+  after do
+    reset_webmock
+    RR.verify
+  end
+
+  it 'could be serialized with lighten' do
+    marshal = RUBY_VERSION >= '1.9' ? Marshal : nil
+    [YAML, marshal].compact.each{ |engine|
+      test = lambda{ |obj| engine.load(engine.dump(obj)) }
+        rg = RestGraph.new(:log_handler => lambda{})
+      lambda{ test[rg] }.should.raise(TypeError)
+      test[rg.lighten].should == rg.lighten
+      lambda{ test[rg] }.should.raise(TypeError)
+      rg.lighten!
+      test[rg.lighten].should == rg
+    }
+  end
+end

metadata

@@ -1,13 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: rest-graph
 version: !ruby/object:Gem::Version 
-  hash: 13
   prerelease: false
   segments: 
   - 1
   - 4
-  - 5
-  version: 1.4.5
+  - 6
+  version: 1.4.6
 platform: ruby
 authors: 
 - Cardinal Blue
@@ -16,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-08-07 00:00:00 +08:00
+date: 2010-09-01 00:00:00 +08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -27,111 +26,134 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 15
         segments: 
         - 1
         - 6
-        - 0
-        version: 1.6.0
+        - 1
+        version: 1.6.1
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
-  name: json
+  name: yajl-ruby
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 1
+        segments: 
+        - 0
+        - 7
+        - 7
+        version: 0.7.7
+  type: :development
+  version_requirements: *id002
+- !ruby/object:Gem::Dependency 
+  name: json
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
         segments: 
         - 1
         - 4
-        - 3
-        version: 1.4.3
+        - 6
+        version: 1.4.6
   type: :development
-  version_requirements: *id002
+  version_requirements: *id003
+- !ruby/object:Gem::Dependency 
+  name: json_pure
+  prerelease: false
+  requirement: &id004 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 1
+        - 4
+        - 6
+        version: 1.4.6
+  type: :development
+  version_requirements: *id004
 - !ruby/object:Gem::Dependency 
   name: rack
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 29
         segments: 
         - 1
         - 2
         - 1
         version: 1.2.1
   type: :development
-  version_requirements: *id003
+  version_requirements: *id005
 - !ruby/object:Gem::Dependency 
   name: rr
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 33
         segments: 
+        - 1
+        - 0
         - 0
-        - 10
-        - 11
-        version: 0.10.11
+        version: 1.0.0
   type: :development
-  version_requirements: *id004
+  version_requirements: *id006
 - !ruby/object:Gem::Dependency 
   name: webmock
   prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  requirement: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 29
         segments: 
         - 1
         - 3
-        - 3
-        version: 1.3.3
+        - 4
+        version: 1.3.4
   type: :development
-  version_requirements: *id005
+  version_requirements: *id007
 - !ruby/object:Gem::Dependency 
   name: bacon
   prerelease: false
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  requirement: &id008 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 19
         segments: 
         - 1
         - 1
         - 0
         version: 1.1.0
   type: :development
-  version_requirements: *id006
+  version_requirements: *id008
 - !ruby/object:Gem::Dependency 
   name: bones
   prerelease: false
-  requirement: &id007 !ruby/object:Gem::Requirement 
+  requirement: &id009 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 25
         segments: 
         - 3
         - 4
         - 7
         version: 3.4.7
   type: :development
-  version_requirements: *id007
-description: " A super simple Facebook Open Graph API client"
+  version_requirements: *id009
+description: A super simple Facebook Open Graph API client
 email: dev (XD) cardinalblue.com
 executables: []
 
@@ -139,19 +161,16 @@ extensions: []
 
 extra_rdoc_files: 
 - CHANGES
+- CONTRIBUTORS
 - Gemfile
 - Gemfile.lock
 - LICENSE
 - README
 - TODO
-- example/rails/README
-- example/rails/config/rest-graph.yaml
-- example/rails/log
-- example/rails/script/console
-- example/rails/script/server
 - rest-graph.gemspec
 files: 
 - CHANGES
+- CONTRIBUTORS
 - Gemfile
 - Gemfile.lock
 - LICENSE
@@ -187,13 +206,17 @@ files:
 - rest-graph.gemspec
 - test/common.rb
 - test/config/rest-graph.yaml
+- test/test_access_token.rb
+- test/test_api.rb
+- test/test_cache.rb
 - test/test_default.rb
 - test/test_handler.rb
 - test/test_load_config.rb
+- test/test_misc.rb
 - test/test_oauth.rb
 - test/test_old.rb
 - test/test_parse.rb
-- test/test_rest-graph.rb
+- test/test_serialize.rb
 has_rdoc: true
 homepage: http://github.com/cardinalblue/rest-graph
 licenses: []
@@ -209,7 +232,6 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
       segments: 
       - 0
       version: "0"
@@ -218,7 +240,6 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
       segments: 
       - 0
       version: "0"
@@ -230,10 +251,14 @@ signing_key:
 specification_version: 3
 summary: A super simple Facebook Open Graph API client
 test_files: 
+- test/test_access_token.rb
+- test/test_api.rb
+- test/test_cache.rb
 - test/test_default.rb
 - test/test_handler.rb
 - test/test_load_config.rb
+- test/test_misc.rb
 - test/test_oauth.rb
 - test/test_old.rb
 - test/test_parse.rb
-- test/test_rest-graph.rb
+- test/test_serialize.rb