rest-more 1.0.2 → 2.0.0

data/test/facebook/test_error.rb

@@ -57,8 +57,8 @@ describe RC::Facebook::Error do
     stub_request(:get, 'https://graph.facebook.com/me').
       to_return(:body => '{"error":"wrong"}').times(2)
 
-    rg = RC::Facebook.new(:cache         => {},
-                                :error_handler => lambda{|env|env})
+    rg = RC::Facebook.new(:cache => {},
+                          :error_handler => lambda{|env|env})
     rg.get('me'); rg.get('me')
     rg.cache.values.should.eq []
   end

data/test/facebook/test_handler.rb

@@ -14,9 +14,9 @@ describe RC::Facebook do
 
       logger = []
       rg = RC::Facebook.new(:log_method => lambda{ |s| logger << [s] })
-      rg.get('me')
+      rg.get('me').tap{}
 
-      logger.size.should.eq 2
+      logger.size.should.eq 3 # Auto + Future + Requested
     end
   end
 
@@ -24,7 +24,7 @@ describe RC::Facebook do
     before do
       @id    = lambda{ |env| env }
       @error = '{"error":{"type":"Exception","message":"(#2500)"}}'
-      @error_hash = RC::JsonDecode.json_decode(@error)
+      @error_hash = RC::Json.decode(@error)
 
       stub_request(:get, 'https://graph.facebook.com/me').
         to_return(:body => @error)
@@ -37,7 +37,7 @@ describe RC::Facebook do
 
     should 'raise ::RC::Facebook::Error in default error_handler' do
       begin
-        RC::Facebook.new.get('me')
+        RC::Facebook.new.get('me').tap{}
       rescue ::RC::Facebook::Error => e
         e.error  .should.eq @error_hash
         e.message.should.eq \
@@ -56,7 +56,7 @@ describe RC::Facebook do
     before do
       @id             = lambda{ |env| env }
       @fql_error      = '{"error_code":603,"error_msg":"Unknown table: bad"}'
-      @fql_error_hash = RC::JsonDecode.json_decode(@fql_error)
+      @fql_error_hash = RC::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?" \
@@ -72,7 +72,7 @@ describe RC::Facebook do
 
     should 'raise ::RC::Facebook::Error in default error_handler' do
       begin
-        RC::Facebook.new.fql(@bad_fql_query)
+        RC::Facebook.new.fql(@bad_fql_query).tap{}
       rescue ::RC::Facebook::Error => e
         e.error  .should.eq @fql_error_hash
         e.message.should.start_with?(

data/test/facebook/test_load_config.rb

@@ -14,10 +14,10 @@ describe RC::Config do
   end
 
   def check
-    @klass.default_app_id     .should.eq 41829
-    @klass.default_secret     .should.eq 'r41829'.reverse
-    @klass.default_json_decode.should.eq false
-    @klass.default_lang       .should.eq 'zh-tw'
+    @klass.default_app_id       .should.eq 41829
+    @klass.default_secret       .should.eq 'r41829'.reverse
+    @klass.default_json_response.should.eq false
+    @klass.default_lang         .should.eq 'zh-tw'
   end
 
   should 'honor rails config' do

data/test/facebook/test_misc.rb

@@ -59,19 +59,19 @@ describe RC::Facebook do
   end
 
   should 'auto decode json' do
-    rg = RC::Facebook.new(:json_decode => true)
+    rg = RC::Facebook.new(:json_response => true)
     stub_request(:get, rg.site).to_return(:body => '[]')
     rg.get('').should.eq []
   end
 
   should 'not auto decode json' do
-    rg = RC::Facebook.new(:json_decode => false)
+    rg = RC::Facebook.new(:json_response => false)
     stub_request(:get, rg.site).to_return(:body => '[]')
     rg.get('').should.eq '[]'
   end
 
   should 'give attributes' do
-    RC::Facebook.new(:json_decode => false).attributes.
+    RC::Facebook.new(:json_response => false).attributes.
       keys.map(&:to_s).sort.should.eq \
       RC::Facebook.members.map(&:to_s).sort
   end

data/test/facebook/test_old.rb

@@ -44,40 +44,6 @@ describe RC::Facebook do
     RC::Facebook.new.fql_multi(:f0 => f0, :f1 => f1).should.eq []
   end
 
-  should 'cache fake post in fql' do
-    query = 'select name from user where uid = 4'
-    body  = '[{"name":"Mark Zuckerberg"}]'
-    stub_request(:post,
-      'https://api.facebook.com/method/fql.query?format=json').
-      with(:body => {:query => query}).
-      to_return(:body => body)
-
-    RC::Facebook.new(:cache => (cache = {})).
-      fql(query, {}, :post => true).
-      first['name']   .should.eq 'Mark Zuckerberg'
-    cache.size        .should.eq 1
-    cache.values.first.should.eq body
-
-    WebMock.reset! # should hit the cache
-
-    RC::Facebook.new(:cache => cache).fql(query, {}, :post => true).
-      first['name']   .should.eq 'Mark Zuckerberg'
-    cache.size        .should.eq 1
-    cache.values.first.should.eq body
-
-    # query changed
-    should.raise(WebMock::NetConnectNotAllowedError) do
-      RC::Facebook.new(:cache => cache).
-        fql(query.upcase, {}, :post => true)
-    end
-
-    # cache should work for normal get
-    RC::Facebook.new(:cache => cache).fql(query).
-      first['name']   .should.eq 'Mark Zuckerberg'
-    cache.size        .should.eq 1
-    cache.values.first.should.eq body
-  end
-
   should 'do facebook old rest api' do
     body = 'hate facebook inconsistent'
     stub_request(:get,
@@ -85,7 +51,7 @@ describe RC::Facebook do
       to_return(:body => body)
 
     RC::Facebook.new.
-      old_rest('notes.create', {}, :json_decode => false).should.eq body
+      old_rest('notes.create', {}, :json_response => false).should.eq body
   end
 
   should 'exchange sessions for access token' do
@@ -95,8 +61,7 @@ describe RC::Facebook do
               'sessions=bad%20bed').
       to_return(:body => '[{"access_token":"bogus"}]')
 
-    RC::Facebook.new(:app_id => 'id',
-                           :secret => 'di').
+    RC::Facebook.new(:app_id => 'id', :secret => 'di').
       exchange_sessions(:sessions => 'bad bed').
       first['access_token'].should.eq 'bogus'
   end

data/test/facebook/test_page.rb

@@ -8,75 +8,76 @@ describe RC::Facebook do
   end
 
   should 'get the next/prev page' do
-    rg = RC::Facebook.new(:site => '', :cache => false)
+    f = RC::Facebook.new(:site => '', :cache => false)
     %w[next previous].each{ |type|
       kind = "#{type}_page"
-      rg.send(kind, {})              .should.eq nil
-      rg.send(kind, {'paging' => []}).should.eq nil
-      rg.send(kind, {'paging' => {}}).should.eq nil
+      f.send(kind, {})              .should.eq nil
+      f.send(kind, {'paging' => []}).should.eq nil
+      f.send(kind, {'paging' => {}}).should.eq nil
 
       stub_request(:get, 'zzz').to_return(:body => '["ok"]')
-      rg.send(kind, {'paging' => {type => 'zzz'}}).should.eq ['ok']
+      f.send(kind, {'paging' => {type => 'zzz'}}).should.eq ['ok']
     }
   end
 
   should 'merge all pages into one' do
-    rg = RC::Facebook.new(:site => '', :cache => false)
+    f = RC::Facebook.new(:site => '', :cache => false)
     %w[next previous].each{ |type|
       kind = "#{type}_page"
       data = {'paging' => {type => 'zzz'}, 'data' => ['z']}
 
-      rg.for_pages(data, -1, {}, kind).should == nil
-      rg.for_pages(data,  0, {}, kind).should == nil
-      rg.for_pages(data,  1, {}, kind).should == data
+      f.for_pages(data, -1, {}, kind).should == nil
+      f.for_pages(data,  0, {}, kind).should == nil
+      f.for_pages(data,  1, {}, kind).should == data
 
       (2..4).each{ |pages|
         # merge data
         stub_request(:get, 'zzz').to_return(:body => '{"data":["y"]}')
-        rg.for_pages(data, pages, {}, kind).should.eq({'data' => %w[z y]})
+        f.for_pages(data, pages, {}, kind).should.eq({'data' => %w[z y]})
 
         # this data cannot be merged
         stub_request(:get, 'zzz').to_return(:body => '{"data":"y"}')
-        rg.for_pages(data, pages, {}, kind).should.eq({'data' => %w[z]})
+        f.for_pages(data, pages, {}, kind).should.eq({'data' => %w[z]})
       }
 
       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.eq({'data' => %w[z y x]})
+      f.for_pages(data, 3, {}, kind).should.eq({'data' => %w[z y x]})
     }
   end
 
   should 'for_pages with callback' do
-    rg = RC::Facebook.new(:site => '', :cache => false)
+    t = Thread.current
+    f = RC::Facebook.new(:site => '', :cache => false)
     %w[next previous].each{ |type|
       kind = "#{type}_page"
       data = {'paging' => {type => 'zzz'}, 'data' => ['z']}
 
       # invalid pages or just the page itself
-      rg.for_pages(data, -1, {}, kind){ |r| r.should.eq  nil }.should.eq rg
-      rg.for_pages(data,  0, {}, kind){ |r| r.should.eq  nil }.should.eq rg
+      f.for_pages(data, -1, {}, kind){ |r| r.should.eq nil }.should.eq f
+      f.for_pages(data,  0, {}, kind){ |r| r.should.eq nil }.should.eq f
       a = []
-      rg.for_pages(data,  1, {}, kind){ |r| a << r           }.should.eq rg
+      f.for_pages(data,  1, {}, kind){ |r| a << r          }.should.eq f
       a.should.eq [data, nil]
 
       (2..4).each{ |pages|
         # merge data
         stub_request(:get, 'zzz').to_return(:body => '{"data":["y"]}')
         expects = [data, {'data' => %w[y]}, nil]
-        rg.for_pages(data, pages, {}, kind){ |r|
+        f.for_pages(data, pages, {}, kind){ |r|
           r.should.eq expects.shift
-        }.should.eq rg
-        expects.empty?.should.eq true
+        }
+        f.wait until expects.empty?
 
         # this data cannot be merged
         stub_request(:get, 'zzz').to_return(:body => '{"data":"y"}')
         expects = [data, {'data' => 'y'}, nil]
-        rg.for_pages(data, pages, {}, kind){ |r|
+        f.for_pages(data, pages, {}, kind){ |r|
           r.should.eq expects.shift
-        }.should.eq rg
-        expects.empty?.should.eq true
+        }
+        f.wait until expects.empty?
       }
 
       stub_request(:get, 'zzz').to_return(:body =>
@@ -85,9 +86,10 @@ describe RC::Facebook do
 
       expects = [data, {'data' => %w[y], 'paging' => {type => 'yyy'}},
                        {'data' => %w[x]}, nil]
-      rg.for_pages(data, 3, {}, kind){ |r|
+      f.for_pages(data, 3, {}, kind){ |r|
         r.should.eq expects.shift
-      }.should.eq rg
+      }
+      f.wait until expects.empty?
     }
   end
 end

data/test/facebook/test_parse.rb

@@ -82,7 +82,7 @@ describe RC::Facebook do
     end
 
     def setup_sr secret, data, sig=nil
-      json_encoded = encode(RC::JsonDecode.json_encode(data))
+      json_encoded = encode(RC::Json.encode(data))
       sig ||= OpenSSL::HMAC.digest('sha256', secret, json_encoded)
       "#{encode(sig)}.#{json_encoded}"
     end

data/test/facebook/test_serialize.rb

@@ -8,26 +8,10 @@ describe RC::Facebook do
   end
 
   should 'be serialized with lighten' do
-    engines = begin
-                require 'psych'
-                YAML::ENGINE.yamler = 'psych' # TODO: probably a bug?
-                [Psych, YAML, Marshal]
-              rescue LoadError
-                [YAML, Marshal]
-              end
-
-    # sorry, it is marshal in 1.8 is broken
-    if defined?(RUBY_ENGINE)
-      if RUBY_ENGINE  == 'ruby' && RUBY_VERSION == '1.8.7'
-        engines.pop # REE 1.8.7
-      end
-    else
-      engines.pop # MRI 1.8.7
-    end
-
-    engines.each{ |engine|
+    require 'yaml'
+    [YAML, Marshal].each{ |engine|
       test = lambda{ |obj| engine.load(engine.dump(obj)) }
-        rg = RC::Facebook.new(:log_handler => lambda{})
+        rg = RC::Facebook.new(:error_handler => lambda{})
       lambda{ test[rg] }.should.raise(TypeError)
       test[rg.lighten].should.eq rg.lighten
       lambda{ test[rg] }.should.raise(TypeError)

data/test/facebook/test_timeout.rb

@@ -10,12 +10,16 @@ describe RC::Facebook do
   should 'respect timeout' do
     stub_request(:get, 'https://graph.facebook.com/me').
       to_return(:body => '{}')
-    mock.proxy(Timeout).timeout(numeric)
+    any_instance_of(RC::Timeout::TimerThread){ |timer|
+      mock.proxy(timer).on_timeout
+    }
     RC::Facebook.new.get('me').should.eq({})
   end
 
   should 'override timeout' do
-    mock(Timeout).timeout(99){ {RC::Facebook::RESPONSE_BODY => true} }
+    stub_request(:get, 'https://graph.facebook.com/me').
+      to_return(:body => 'true')
+    mock.proxy(RC::Timeout::TimerThread).new(99, is_a(Timeout::Error))
     RC::Facebook.new(:timeout => 1).get('me', {}, :timeout => 99).
       should.eq true
   end

data/test/twitter/test_api.rb

@@ -20,7 +20,7 @@ describe RC::Twitter do
       :body => '{}', :status => status)
 
     lambda{
-      RC::Twitter.new.delete('123')
+      RC::Twitter.new.delete('123').tap{}
     }.should.raise(klass)
 
     WebMock.reset!

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rest-more
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 2.0.0
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-07-13 00:00:00.000000000 Z
+date: 2012-10-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-core
@@ -19,7 +19,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: 2.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -27,7 +27,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: 2.0.0
 description: ! 'Various REST clients such as Facebook and Twitter built with [rest-core][]
 
 
@@ -49,34 +49,8 @@ files:
 - Rakefile
 - TODO.md
 - bin/rib-rest-core
-- doc/ToC.md
-- doc/dependency.md
-- doc/design.md
-- doc/rest-graph.md
 - doc/tutorial/facebook.md
-- example/async.rb
-- example/facebook.rb
 - example/multi.rb
-- example/rails2/Gemfile
-- 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
-- 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/preinitializer.rb
-- example/rails2/config/rest-core.yaml
-- example/rails2/config/routes.rb
-- example/rails2/log
-- 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/README
 - example/rails3/Rakefile
@@ -99,8 +73,6 @@ files:
 - example/rainbows.rb
 - example/simple.rb
 - example/sinatra/config.ru
-- lib/rest-core/client/bing.rb
-- lib/rest-core/client/bing/rails_util.rb
 - lib/rest-core/client/dropbox.rb
 - lib/rest-core/client/facebook.rb
 - lib/rest-core/client/facebook/rails_util.rb
@@ -108,8 +80,6 @@ files:
 - lib/rest-core/client/github/rails_util.rb
 - lib/rest-core/client/linkedin.rb
 - lib/rest-core/client/linkedin/rails_util.rb
-- lib/rest-core/client/mixi.rb
-- lib/rest-core/client/mixi/rails_util.rb
 - lib/rest-core/client/twitter.rb
 - lib/rest-core/client/twitter/rails_util.rb
 - lib/rest-core/util/config.rb
@@ -119,11 +89,11 @@ files:
 - lib/rest-more/version.rb
 - lib/rib/app/rest-core.rb
 - rest-more.gemspec
-- test/bing/test_api.rb
+- task/.gitignore
+- task/gemgem.rb
 - test/dropbox/test_api.rb
 - test/facebook/config/rest-core.yaml
 - test/facebook/test_api.rb
-- test/facebook/test_cache.rb
 - test/facebook/test_default.rb
 - test/facebook/test_error.rb
 - test/facebook/test_handler.rb
@@ -135,7 +105,6 @@ files:
 - test/facebook/test_parse.rb
 - test/facebook/test_serialize.rb
 - test/facebook/test_timeout.rb
-- test/mixi/test_api.rb
 - test/twitter/test_api.rb
 homepage: https://github.com/cardinalblue/rest-more
 licenses: []
@@ -162,10 +131,8 @@ signing_key:
 specification_version: 3
 summary: Various REST clients such as Facebook and Twitter built with [rest-core][]
 test_files:
-- test/bing/test_api.rb
 - test/dropbox/test_api.rb
 - test/facebook/test_api.rb
-- test/facebook/test_cache.rb
 - test/facebook/test_default.rb
 - test/facebook/test_error.rb
 - test/facebook/test_handler.rb
@@ -177,6 +144,5 @@ test_files:
 - test/facebook/test_parse.rb
 - test/facebook/test_serialize.rb
 - test/facebook/test_timeout.rb
-- test/mixi/test_api.rb
 - test/twitter/test_api.rb
 has_rdoc: