rest-more 0.7.1 → 0.7.2

data/lib/rest-more.rb

@@ -4,10 +4,11 @@ require 'rest-core'
 module RestCore
   autoload :Config  , 'rest-core/util/config'
 
+  autoload :Bing    , 'rest-core/client/bing'
+  autoload :Facebook, 'rest-core/client/facebook'
+  autoload :Flurry  , 'rest-core/client/flurry'
   autoload :Github  , 'rest-core/client/github'
-  autoload :Twitter , 'rest-core/client/twitter'
   autoload :Linkedin, 'rest-core/client/linkedin'
-  autoload :Facebook, 'rest-core/client/facebook'
   autoload :Mixi    , 'rest-core/client/mixi'
-  autoload :Flurry  , 'rest-core/client/flurry'
+  autoload :Twitter , 'rest-core/client/twitter'
 end

data/lib/rest-more/version.rb

@@ -1,4 +1,4 @@
 
 module RestMore
-  VERSION = '0.7.1'
+  VERSION = '0.7.2'
 end

data/lib/rib/app/rest-core.rb

@@ -0,0 +1,15 @@
+
+require 'rest-core'
+
+module Rib; end
+module Rib::RestCore
+  Rib::Shell.use(self)
+  def self.load
+    Rib.shell.config[:binding] =
+      ::RestCore::Universal.new.instance_eval{binding}
+  end
+
+  def prompt
+    "rest-core#{super}"
+  end
+end

data/rest-more.gemspec

@@ -2,15 +2,16 @@
 
 Gem::Specification.new do |s|
   s.name = "rest-more"
-  s.version = "0.7.1"
+  s.version = "0.7.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = [
   "Cardinal Blue",
   "Lin Jen-Shin (godfat)"]
-  s.date = "2011-10-31"
+  s.date = "2011-11-05"
   s.description = "Various REST clients such as Facebook and Twitter built with [rest-core][]\n\n[rest-core]: https://github.com/cardinalblue/rest-core"
   s.email = ["dev (XD) cardinalblue.com"]
+  s.executables = ["rib-rest-core"]
   s.files = [
   ".gitignore",
   ".gitmodules",
@@ -21,6 +22,7 @@ Gem::Specification.new do |s|
   "README.md",
   "Rakefile",
   "TODO.md",
+  "bin/rib-rest-core",
   "example/rails2/Gemfile",
   "example/rails2/README",
   "example/rails2/Rakefile",
@@ -61,24 +63,30 @@ Gem::Specification.new do |s|
   "example/rails3/test/test_helper.rb",
   "example/rails3/test/unit/rails_util_test.rb",
   "example/sinatra/config.ru",
+  "lib/rest-core/client/bing.rb",
+  "lib/rest-core/client/bing/rails_util.rb",
   "lib/rest-core/client/facebook.rb",
   "lib/rest-core/client/facebook/rails_util.rb",
   "lib/rest-core/client/flurry.rb",
   "lib/rest-core/client/flurry/rails_util.rb",
   "lib/rest-core/client/github.rb",
+  "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/simple.rb",
+  "lib/rest-core/client/mixi/rails_util.rb",
   "lib/rest-core/client/twitter.rb",
-  "lib/rest-core/client/universal.rb",
+  "lib/rest-core/client/twitter/rails_util.rb",
   "lib/rest-core/util/config.rb",
   "lib/rest-core/util/rails_util_util.rb",
   "lib/rest-more.rb",
   "lib/rest-more/test.rb",
   "lib/rest-more/version.rb",
+  "lib/rib/app/rest-core.rb",
   "rest-more.gemspec",
   "task/.gitignore",
   "task/gemgem.rb",
+  "test/client/bing/test_api.rb",
   "test/client/facebook/config/rest-core.yaml",
   "test/client/facebook/test_api.rb",
   "test/client/facebook/test_cache.rb",
@@ -101,6 +109,7 @@ Gem::Specification.new do |s|
   s.rubygems_version = "1.8.11"
   s.summary = "Various REST clients such as Facebook and Twitter built with [rest-core][]"
   s.test_files = [
+  "test/client/bing/test_api.rb",
   "test/client/facebook/test_api.rb",
   "test/client/facebook/test_cache.rb",
   "test/client/facebook/test_default.rb",

data/test/client/bing/test_api.rb

@@ -0,0 +1,34 @@
+
+require 'rest-more/test'
+
+describe RC::Bing do
+  after do
+    WebMock.reset!
+    RR.verify
+  end
+
+  def stub_with body, query={}
+    stub_request(:get, 'http://api.bing.net/json.aspx').
+      with(:query => {'JsonType' => 'raw', 'Version' => '2.2'}.merge(query)).
+      to_return(:body => body)
+  end
+
+  should 'get right' do
+    stub_with('{"status":"OK"}')
+    RC::Bing.new.get('').should.eq({'status' => 'OK'})
+  end
+
+  should 'be able to set AppId' do
+    RC::Bing.new(:AppId => 'QQ').AppId.should.eq 'QQ'
+  end
+
+  should 'use AppId for requests' do
+    stub_with('{}', 'AppId' => 'zz')
+    RC::Bing.new(:AppId => 'zz').get('').should.eq({})
+  end
+
+  should 'raise correct error' do
+    stub_with('{"SearchResponse":{"Errors":[{"Code":2003}]}}')
+    lambda{RC::Bing.new.get('')}.should.raise(RC::Bing::Error::NoAccess)
+  end
+end

data/test/client/facebook/test_api.rb

@@ -1,7 +1,7 @@
 
 require 'rest-more/test'
 
-describe RestCore::Facebook do
+describe RC::Facebook do
   after do
     WebMock.reset!
     RR.verify
@@ -9,7 +9,7 @@ describe RestCore::Facebook do
 
   should 'generate correct url' do
     TestHelper.normalize_url(
-    RestCore::Facebook.new(:access_token => 'awesome').
+    RC::Facebook.new(:access_token => 'awesome').
       url('path', :query => 'str')).should.eq \
       'https://graph.facebook.com/path?access_token=awesome&query=str'
   end
@@ -24,10 +24,10 @@ describe RestCore::Facebook do
                   {'User-Agent'      => 'Ruby'})).       # this is by ruby
       to_return(:body => '{"data": []}')
 
-    RestCore::Facebook.new(:site   => 'http://nothing.godfat.org/',
-                           :lang   => 'zh-tw',
-                           :accept => 'text/plain').
-                           get('me').should.eq({'data' => []})
+    RC::Facebook.new(:site   => 'http://nothing.godfat.org/',
+                     :lang   => 'zh-tw',
+                     :accept => 'text/plain').
+                     get('me').should.eq({'data' => []})
   end
 
   should 'pass custom headers' do
@@ -41,7 +41,7 @@ describe RestCore::Facebook do
                   {'User-Agent'      => 'Ruby'})).       # this is by ruby
       to_return(:body => '{"data": []}')
 
-    RestCore::Facebook.new.get('http://example.com', {},
+    RC::Facebook.new.get('http://example.com', {},
       {:headers => {'X-Forwarded-For' => '127.0.0.1'}} ).
       should.eq({'data' => []})
   end
@@ -50,7 +50,7 @@ describe RestCore::Facebook do
     stub_request(:post, 'https://graph.facebook.com/feed/me').
       with(:body => 'message=hi%20there').to_return(:body => 'ok')
 
-    RestCore::Facebook.new(:json_decode => false).
+    RC::Facebook.new(:json_decode => false).
       post('feed/me', :message => 'hi there').should == 'ok'
   end
 
@@ -59,7 +59,7 @@ describe RestCore::Facebook do
       'https://graph.facebook.com/me?access_token=1|2').
       to_return(:body => 'ok')
 
-    rg = RestCore::Facebook.new(
+    rg = RC::Facebook.new(
       :json_decode => false, :access_token => 'wrong',
       :app_id => '1', :secret => '2')
     rg.get('me', {}, :secret => true).should.eq 'ok'
@@ -73,7 +73,7 @@ describe RestCore::Facebook do
     stub_request(:get, 'https://graph.facebook.com/woot').
       to_return(:body => 'bad json')
 
-    rg = RestCore::Facebook.new(:json_decode => true)
+    rg = RC::Facebook.new(:json_decode => true)
     rg.get('woot', {}, :json_decode => false).should.eq 'bad json'
     rg.json_decode.should == true
   end
@@ -83,7 +83,7 @@ describe RestCore::Facebook do
       stub_request(:delete, 'https://graph.facebook.com/123').to_return(
         :body => '[]', :status => status)
 
-      RestCore::Facebook.new.delete('123').should.eq []
+      RC::Facebook.new.delete('123').should.eq []
     }
   end
 
@@ -91,7 +91,7 @@ describe RestCore::Facebook do
     stub(o = Object.new).to_s{ 'i am mock' }
     stub_request(:get, "https://graph.facebook.com/search?q=i%20am%20mock").
       to_return(:body => 'ok')
-    RestCore::Facebook.new(:json_decode => false).
+    RC::Facebook.new(:json_decode => false).
       get('search', :q => o).should.eq 'ok'
   end
 end

data/test/client/facebook/test_cache.rb

@@ -1,7 +1,7 @@
 
 require 'rest-more/test'
 
-describe RestCore::Facebook do
+describe RC::Facebook do
   after do
     WebMock.reset!
     RR.verify
@@ -12,7 +12,7 @@ describe RestCore::Facebook do
       @url, @body = "https://graph.facebook.com/cache", '{"message":"ok"}'
       @cache_key  = Digest::MD5.hexdigest(@url)
       @cache = {}
-      @rg = RestCore::Facebook.new(:cache => @cache, :json_decode => false)
+      @rg = RC::Facebook.new(:cache => @cache, :json_decode => false)
       stub_request(:get, @url).to_return(:body => @body).times(1)
     end
 
@@ -44,7 +44,7 @@ describe RestCore::Facebook do
       stub_request(meth, url).to_return(:body => body).times(3)
 
       cache = {}
-      rg = RestCore::Facebook.new(:cache => cache)
+      rg = RC::Facebook.new(:cache => cache)
       3.times{
         if meth == :delete
           rg.send(meth, 'cache').should.eq({'message' => 'ok'})

data/test/client/facebook/test_default.rb

@@ -1,17 +1,17 @@
 
 require 'rest-more/test'
 
-describe RestCore::Facebook do
+describe RC::Facebook do
   should 'honor default attributes' do
-    RestCore::Facebook.members.reject{ |name|
+    RC::Facebook.members.reject{ |name|
       name.to_s =~ /method$|handler$|detector$/ }.each{ |name|
-        RestCore::Facebook.new.send(name).should ==
-        RestCore::Facebook.new.send("default_#{name}")
+        RC::Facebook.new.send(name).should ==
+        RC::Facebook.new.send("default_#{name}")
     }
   end
 
   should 'use module to override default attributes' do
-    klass = RestCore::Facebook.dup
+    klass = RC::Facebook.dup
     klass.send(:include, Module.new do
       def default_app_id
         '1829'

data/test/client/facebook/test_error.rb

@@ -1,63 +1,63 @@
 
 require 'rest-more/test'
 
-describe RestCore::Facebook::Error do
+describe RC::Facebook::Error do
   after do
     WebMock.reset!
     RR.verify
   end
 
   should 'have the right ancestors' do
-    RestCore::Facebook::Error::AccessToken.should.lt RestCore::Facebook::Error
+    RC::Facebook::Error::AccessToken.should.lt RC::Facebook::Error
 
-    RestCore::Facebook::Error::InvalidAccessToken.should.lt \
-      RestCore::Facebook::Error::AccessToken
+    RC::Facebook::Error::InvalidAccessToken.should.lt \
+      RC::Facebook::Error::AccessToken
 
-    RestCore::Facebook::Error::MissingAccessToken.should.lt \
-      RestCore::Facebook::Error::AccessToken
+    RC::Facebook::Error::MissingAccessToken.should.lt \
+      RC::Facebook::Error::AccessToken
   end
 
   def error2env hash
-    {RestCore::RESPONSE_BODY => hash,
-     RestCore::REQUEST_PATH  => '/' ,
-     RestCore::REQUEST_QUERY => {}}
+    {RC::RESPONSE_BODY => hash,
+     RC::REQUEST_PATH  => '/' ,
+     RC::REQUEST_QUERY => {}}
   end
 
   should 'parse right' do
     %w[OAuthInvalidTokenException OAuthException].each{ |type|
-      RestCore::Facebook::Error.call(error2env('error' => {'type' => type})).
-        should.kind_of?(RestCore::Facebook::Error::InvalidAccessToken)
+      RC::Facebook::Error.call(error2env('error' => {'type' => type})).
+        should.kind_of?(RC::Facebook::Error::InvalidAccessToken)
     }
 
-    RestCore::Facebook::Error.call(
+    RC::Facebook::Error.call(
       error2env('error'=>{'type'   =>'QueryParseException',
                           'message'=>'An active access token..'})).
-      should.kind_of?(RestCore::Facebook::Error::MissingAccessToken)
+      should.kind_of?(RC::Facebook::Error::MissingAccessToken)
 
-    RestCore::Facebook::Error.call(
+    RC::Facebook::Error.call(
       error2env('error'=>{'type'   =>'QueryParseException',
                           'message'=>'Oh active access token..'})).
-      should.not.kind_of?(RestCore::Facebook::Error::MissingAccessToken)
+      should.not.kind_of?(RC::Facebook::Error::MissingAccessToken)
 
-    RestCore::Facebook::Error.call(error2env('error_code' => 190)).
-      should.kind_of?(RestCore::Facebook::Error::InvalidAccessToken)
+    RC::Facebook::Error.call(error2env('error_code' => 190)).
+      should.kind_of?(RC::Facebook::Error::InvalidAccessToken)
 
-    RestCore::Facebook::Error.call(error2env('error_code' => 104)).
-      should.kind_of?(RestCore::Facebook::Error::MissingAccessToken)
+    RC::Facebook::Error.call(error2env('error_code' => 104)).
+      should.kind_of?(RC::Facebook::Error::MissingAccessToken)
 
-    RestCore::Facebook::Error.call(error2env('error_code' => 999)).
-      should.not.kind_of?(RestCore::Facebook::Error::AccessToken)
+    RC::Facebook::Error.call(error2env('error_code' => 999)).
+      should.not.kind_of?(RC::Facebook::Error::AccessToken)
 
-    error = RestCore::Facebook::Error.call(error2env(['not a hash']))
-    error.should.not.kind_of?(RestCore::Facebook::Error::AccessToken)
-    error.should    .kind_of?(RestCore::Facebook::Error)
+    error = RC::Facebook::Error.call(error2env(['not a hash']))
+    error.should.not.kind_of?(RC::Facebook::Error::AccessToken)
+    error.should    .kind_of?(RC::Facebook::Error)
   end
 
   should 'nuke cache upon errors' do
     stub_request(:get, 'https://graph.facebook.com/me').
       to_return(:body => '{"error":"wrong"}').times(2)
 
-    rg = RestCore::Facebook.new(:cache         => {},
+    rg = RC::Facebook.new(:cache         => {},
                                 :error_handler => lambda{|env|env})
     rg.get('me'); rg.get('me')
     rg.cache.values.should.eq []

data/test/client/facebook/test_handler.rb

@@ -1,7 +1,7 @@
 
 require 'rest-more/test'
 
-describe RestCore::Facebook do
+describe RC::Facebook do
   after do
     WebMock.reset!
     RR.verify
@@ -13,7 +13,7 @@ describe RestCore::Facebook do
         to_return(:body => '{}')
 
       logger = []
-      rg = RestCore::Facebook.new(:log_method => lambda{ |s| logger << [s] })
+      rg = RC::Facebook.new(:log_method => lambda{ |s| logger << [s] })
       rg.get('me')
 
       logger.size.should.eq 1
@@ -24,21 +24,21 @@ describe RestCore::Facebook do
     before do
       @id    = lambda{ |env| env }
       @error = '{"error":{"type":"Exception","message":"(#2500)"}}'
-      @error_hash = RestCore::JsonDecode.json_decode(@error)
+      @error_hash = RC::JsonDecode.json_decode(@error)
 
       stub_request(:get, 'https://graph.facebook.com/me').
         to_return(:body => @error)
     end
 
     should 'call error_handler if error occurred' do
-      RestCore::Facebook.new(:error_handler => @id).get('me').
+      RC::Facebook.new(:error_handler => @id).get('me').
         should.eq @error_hash
     end
 
-    should 'raise ::RestCore::Facebook::Error in default error_handler' do
+    should 'raise ::RC::Facebook::Error in default error_handler' do
       begin
-        RestCore::Facebook.new.get('me')
-      rescue ::RestCore::Facebook::Error => e
+        RC::Facebook.new.get('me')
+      rescue ::RC::Facebook::Error => e
         e.error  .should.eq @error_hash
         e.message.should.eq \
           "#{@error_hash.inspect} from https://graph.facebook.com/me"
@@ -56,7 +56,7 @@ describe RestCore::Facebook do
     before do
       @id             = lambda{ |env| env }
       @fql_error      = '{"error_code":603,"error_msg":"Unknown table: bad"}'
-      @fql_error_hash = RestCore::JsonDecode.json_decode(@fql_error)
+      @fql_error_hash = RC::JsonDecode.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?" \
@@ -66,14 +66,14 @@ describe RestCore::Facebook do
     end
 
     should 'call error_handler if error occurred' do
-      RestCore::Facebook.new(:error_handler => @id).fql(@bad_fql_query).
+      RC::Facebook.new(:error_handler => @id).fql(@bad_fql_query).
         should.eq @fql_error_hash
     end
 
-    should 'raise ::RestCore::Facebook::Error in default error_handler' do
+    should 'raise ::RC::Facebook::Error in default error_handler' do
       begin
-        RestCore::Facebook.new.fql(@bad_fql_query)
-      rescue ::RestCore::Facebook::Error => e
+        RC::Facebook.new.fql(@bad_fql_query)
+      rescue ::RC::Facebook::Error => e
         e.error  .should.eq @fql_error_hash
         e.message.should.start_with?(
           "#{@fql_error_hash.inspect} from "          \

data/test/client/facebook/test_load_config.rb

@@ -3,10 +3,10 @@ require 'rest-more/test'
 
 require 'rest-core/util/config'
 
-describe RestCore::Config do
+describe RC::Config do
 
   before do
-    @klass = RestCore::Facebook.dup
+    @klass = RC::Facebook.dup
   end
 
   after do
@@ -24,12 +24,12 @@ describe RestCore::Config do
     app = Object.new
     mock(app).env { 'test' }
     mock(app).root{ File.dirname(__FILE__) }
-    RestCore::Config.load_for_rails(@klass, 'facebook', app)
+    RC::Config.load_for_rails(@klass, 'facebook', app)
     check
   end
 
   should 'honor config' do
-    RestCore::Config.load(
+    RC::Config.load(
       @klass,
       "#{File.dirname(__FILE__)}/config/rest-core.yaml",
       'test',