rest-core 0.2.3 → 0.3.0.pre.0

data/test/{test_parse.rb → client/facebook/test_parse.rb}

@@ -1,14 +1,10 @@
 
-if respond_to?(:require_relative, true)
-  require_relative 'common'
-else
-  require File.dirname(__FILE__) + '/common'
-end
+require 'rest-core/test'
 
-describe RestGraph do
+describe RestCore::Facebook do
 
   should 'return nil if parse error, but not when call data directly' do
-    rg = RestGraph.new
+    rg = RestCore::Facebook.new
     rg.parse_cookies!({}).should == nil
     rg.data              .should == {}
   end
@@ -17,7 +13,7 @@ describe RestGraph do
     algorithm = 'HMAC-SHA256'
     user      = '{"country"=>"us", "age"=>{"min"=>21}}'
     data      = {'algorithm' => algorithm, 'user' => user}
-    rg        = RestGraph.new(:data => data, :secret => 'secret')
+    rg        = RestCore::Facebook.new(:data => data, :secret => 'secret')
     sig       = rg.send(:calculate_sig, data)
     rg.parse_fbs!("\"#{rg.fbs}\"").should == data.merge('sig' => sig)
   end
@@ -35,7 +31,7 @@ describe RestGraph do
         "__utma=123; __utmz=456.utmcsr=(d)|utmccn=(d)|utmcmd=(n); " \
         "fbs_#{app_id}=#{fbs}"
 
-      rg  = RestGraph.new(:app_id => app_id, :secret => secret)
+      rg  = RestCore::Facebook.new(:app_id => app_id, :secret => secret)
       rg.parse_rack_env!('HTTP_COOKIE' => http_cookie).
                       should.kind_of?(token ? Hash : NilClass)
       rg.access_token.should ==  token
@@ -59,20 +55,20 @@ describe RestGraph do
   end
 
   should 'not pass if there is no secret, prevent from forgery' do
-    rg = RestGraph.new
+    rg = RestCore::Facebook.new
     rg.parse_fbs!('"feed=me&sig=bddd192cf27f22c05f61c8bea24fa4b7"').
       should == nil
   end
 
   should 'parse json correctly' do
-    rg = RestGraph.new
+    rg = RestCore::Facebook.new
 
     rg.parse_json!('bad json')    .should == nil
     rg.parse_json!('{"no":"sig"}').should == nil
     rg.parse_json!('{"feed":"me","sig":"bddd192cf27f22c05f61c8bea24fa4b7"}').
       should == nil
 
-    rg = RestGraph.new(:secret => 'bread')
+    rg = RestCore::Facebook.new(:secret => 'bread')
     rg.parse_json!('{"feed":"me","sig":"20393e7823730308938a86ecf1c88b14"}').
       should == {'feed' => 'me', 'sig' => "20393e7823730308938a86ecf1c88b14"}
     rg.data.empty?.should == false
@@ -90,7 +86,7 @@ describe RestGraph do
     sig = OpenSSL::HMAC.digest('sha256', secret, json_encoded)
     signed_request = "#{encode[sig]}.#{json_encoded}"
 
-    rg = RestGraph.new(:secret => secret)
+    rg = RestCore::Facebook.new(:secret => secret)
     rg.parse_signed_request!(signed_request)
     rg.data['ooh'].should == 'dir'
     rg.data['moo'].should == 'bar'
@@ -108,12 +104,13 @@ describe RestGraph do
   end
 
   should 'generate correct fbs with correct sig' do
-    RestGraph.new(:access_token => 'fake', :secret => 's').fbs.should ==
+    RestCore::Facebook.new(:access_token => 'fake', :secret => 's').fbs.
+      should.eq \
       "access_token=fake&sig=#{Digest::MD5.hexdigest('access_token=fakes')}"
   end
 
   should 'parse fbs from facebook response which lacks sig...' do
-    rg = RestGraph.new(:access_token => 'a', :secret => 'z')
+    rg = RestCore::Facebook.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
@@ -121,7 +118,7 @@ describe RestGraph do
   end
 
   should 'generate correct fbs with additional parameters' do
-    rg = RestGraph.new(:access_token => 'a', :secret => 'z')
+    rg = RestCore::Facebook.new(:access_token => 'a', :secret => 'z')
     rg.data['expires'] = '1234'
     rg.parse_fbs!(rg.fbs).should.kind_of?(Hash)
     rg.access_token      .should == 'a'

data/test/client/facebook/test_serialize.rb

@@ -0,0 +1,42 @@
+
+require 'rest-core/test'
+
+describe RestCore::Facebook do
+  after do
+    WebMock.reset!
+    RR.verify
+  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) && RUBY_ENGINE  == 'ruby' &&
+                                RUBY_VERSION == '1.8.7'
+      engines.pop # REE 1.8.7
+    else
+      engines.pop # MRI 1.8.7
+    end
+
+    engines.each{ |engine|
+      test = lambda{ |obj| engine.load(engine.dump(obj)) }
+        rg = RestCore::Facebook.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
+
+  should 'lighten takes options to change attributes' do
+    RestCore::Facebook.new.lighten(:timeout => 100    ).timeout.should.eq 100
+    RestCore::Facebook.new.lighten(:lang    => 'zh-TW').lang.should.eq 'zh-TW'
+  end
+end

data/test/client/facebook/test_timeout.rb

@@ -0,0 +1,22 @@
+
+require 'rest-core/test'
+
+describe RestCore::Facebook do
+  after do
+    WebMock.reset!
+    RR.verify
+  end
+
+  should 'respect timeout' do
+    stub_request(:get, 'https://graph.facebook.com/me').
+      to_return(:body => '{}')
+    mock.proxy(Timeout).timeout(numeric)
+    RestCore::Facebook.new.get('me').should.eq({})
+  end
+
+  should 'override timeout' do
+    mock(Timeout).timeout(99){ {RestCore::Facebook::RESPONSE_BODY => true} }
+    RestCore::Facebook.new(:timeout => 1).get('me', {}, :timeout => 99).
+      should.eq true
+  end
+end

data/test/test_oauth1_header.rb

@@ -1,9 +1,5 @@
 
-if respond_to?(:require_relative, true)
-  require_relative 'common'
-else
-  require File.dirname(__FILE__) + '/common'
-end
+require 'rest-core/test'
 
 describe RestCore::Oauth1Header do
   before do

metadata

@@ -1,8 +1,8 @@
 --- !ruby/object:Gem::Specification
 name: rest-core
 version: !ruby/object:Gem::Version
-  version: 0.2.3
-  prerelease: 
+  version: 0.3.0.pre.0
+  prerelease: 6
 platform: ruby
 authors:
 - Cardinal Blue
@@ -10,11 +10,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-08-27 00:00:00.000000000Z
+date: 2011-09-02 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client
-  requirement: &2160958860 !ruby/object:Gem::Requirement
+  requirement: &2154406600 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -22,21 +22,21 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2160958860
+  version_requirements: *2154406600
 - !ruby/object:Gem::Dependency
-  name: rack
-  requirement: &2160958380 !ruby/object:Gem::Requirement
+  name: yajl-ruby
+  requirement: &2154405920 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-  type: :runtime
+  type: :development
   prerelease: false
-  version_requirements: *2160958380
+  version_requirements: *2154405920
 - !ruby/object:Gem::Dependency
-  name: yajl-ruby
-  requirement: &2160974260 !ruby/object:Gem::Requirement
+  name: rack
+  requirement: &2154399520 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -44,10 +44,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2160974260
+  version_requirements: *2154399520
 - !ruby/object:Gem::Dependency
   name: json
-  requirement: &2160973780 !ruby/object:Gem::Requirement
+  requirement: &2154398840 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -55,10 +55,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2160973780
+  version_requirements: *2154398840
 - !ruby/object:Gem::Dependency
   name: json_pure
-  requirement: &2160973300 !ruby/object:Gem::Requirement
+  requirement: &2154398100 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -66,10 +66,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2160973300
+  version_requirements: *2154398100
 - !ruby/object:Gem::Dependency
   name: ruby-hmac
-  requirement: &2160972820 !ruby/object:Gem::Requirement
+  requirement: &2154397380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -77,10 +77,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2160972820
+  version_requirements: *2154397380
 - !ruby/object:Gem::Dependency
   name: webmock
-  requirement: &2160972340 !ruby/object:Gem::Requirement
+  requirement: &2154396860 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -88,10 +88,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2160972340
+  version_requirements: *2154396860
 - !ruby/object:Gem::Dependency
   name: bacon
-  requirement: &2160971860 !ruby/object:Gem::Requirement
+  requirement: &2154396080 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -99,10 +99,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2160971860
+  version_requirements: *2154396080
 - !ruby/object:Gem::Dependency
   name: rr
-  requirement: &2160971380 !ruby/object:Gem::Requirement
+  requirement: &2154395380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -110,10 +110,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2160971380
+  version_requirements: *2154395380
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &2160970900 !ruby/object:Gem::Requirement
+  requirement: &2154394440 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -121,7 +121,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2160970900
+  version_requirements: *2154394440
 description: ! 'A modular Ruby REST client collection/infrastructure.
 
 
@@ -168,15 +168,55 @@ files:
 - example/facebook.rb
 - example/github.rb
 - example/linkedin.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
+- 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-core.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
+- example/sinatra/config.ru
 - example/twitter.rb
 - lib/rest-core.rb
 - lib/rest-core/app/ask.rb
 - lib/rest-core/app/rest-client.rb
 - lib/rest-core/builder.rb
 - lib/rest-core/client.rb
+- lib/rest-core/client/facebook.rb
+- lib/rest-core/client/facebook/rails_util.rb
 - lib/rest-core/client/github.rb
 - lib/rest-core/client/linkedin.rb
-- lib/rest-core/client/rest-graph.rb
 - lib/rest-core/client/twitter.rb
 - lib/rest-core/client_oauth1.rb
 - lib/rest-core/event.rb
@@ -194,8 +234,10 @@ files:
 - lib/rest-core/middleware/oauth1_header.rb
 - lib/rest-core/middleware/oauth2_query.rb
 - lib/rest-core/middleware/timeout.rb
+- lib/rest-core/test.rb
 - lib/rest-core/util/config.rb
 - lib/rest-core/util/hmac.rb
+- lib/rest-core/util/vendor.rb
 - lib/rest-core/version.rb
 - lib/rest-core/wrapper.rb
 - pending/test_multi.rb
@@ -203,22 +245,21 @@ files:
 - rest-core.gemspec
 - task/.gitignore
 - task/gemgem.rb
-- test/common.rb
-- test/config/rest-core.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_oauth.rb
+- test/client/facebook/config/rest-core.yaml
+- test/client/facebook/test_api.rb
+- test/client/facebook/test_cache.rb
+- test/client/facebook/test_default.rb
+- test/client/facebook/test_error.rb
+- test/client/facebook/test_handler.rb
+- test/client/facebook/test_load_config.rb
+- test/client/facebook/test_misc.rb
+- test/client/facebook/test_oauth.rb
+- test/client/facebook/test_old.rb
+- test/client/facebook/test_page.rb
+- test/client/facebook/test_parse.rb
+- test/client/facebook/test_serialize.rb
+- test/client/facebook/test_timeout.rb
 - test/test_oauth1_header.rb
-- test/test_old.rb
-- test/test_page.rb
-- test/test_parse.rb
-- test/test_serialize.rb
-- test/test_timeout.rb
 homepage: https://github.com/cardinalblue/rest-core
 licenses: []
 post_install_message: 
@@ -234,27 +275,27 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
-  - - ! '>='
+  - - ! '>'
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.9
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: A modular Ruby REST client collection/infrastructure.
 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_oauth.rb
+- test/client/facebook/test_api.rb
+- test/client/facebook/test_cache.rb
+- test/client/facebook/test_default.rb
+- test/client/facebook/test_error.rb
+- test/client/facebook/test_handler.rb
+- test/client/facebook/test_load_config.rb
+- test/client/facebook/test_misc.rb
+- test/client/facebook/test_oauth.rb
+- test/client/facebook/test_old.rb
+- test/client/facebook/test_page.rb
+- test/client/facebook/test_parse.rb
+- test/client/facebook/test_serialize.rb
+- test/client/facebook/test_timeout.rb
 - test/test_oauth1_header.rb
-- test/test_old.rb
-- test/test_page.rb
-- test/test_parse.rb
-- test/test_serialize.rb
-- test/test_timeout.rb

data/test/config/rest-core.yaml

@@ -1,7 +0,0 @@
-
-test:
-  app_id: 41829
-  secret: <%= 'r41829'.reverse %>
-  auto_decode: false
-  lang: zh-tw
-  auto_authorize_scope: 'publish_stream'

data/test/test_error.rb

@@ -1,66 +0,0 @@
-
-if respond_to?(:require_relative, true)
-  require_relative 'common'
-else
-  require File.dirname(__FILE__) + '/common'
-end
-
-describe RestGraph::Error do
-  after do
-    WebMock.reset!
-    RR.verify
-  end
-
-  should 'have the right ancestors' do
-    RestGraph::Error::AccessToken       .should < RestGraph::Error
-
-    RestGraph::Error::InvalidAccessToken.should <
-      RestGraph::Error::AccessToken
-
-    RestGraph::Error::MissingAccessToken.should <
-      RestGraph::Error::AccessToken
-  end
-
-  def error2env hash
-    {RestCore::RESPONSE_BODY => hash,
-     RestCore::REQUEST_PATH  => '/' ,
-     RestCore::REQUEST_QUERY => {}}
-  end
-
-  should 'parse right' do
-    %w[OAuthInvalidTokenException OAuthException].each{ |type|
-      RestGraph::Error.call(error2env('error' => {'type' => type})).
-        should.kind_of?(RestGraph::Error::InvalidAccessToken)
-    }
-
-    RestGraph::Error.call(error2env('error'=>{'type'=>'QueryParseException',
-                                    'message'=>'An active access token..'})).
-      should.kind_of?(RestGraph::Error::MissingAccessToken)
-
-    RestGraph::Error.call(error2env('error'=>{'type'=>'QueryParseException',
-                                    'message'=>'Oh active access token..'})).
-      should.not.kind_of?(RestGraph::Error::MissingAccessToken)
-
-    RestGraph::Error.call(error2env('error_code' => 190)).
-      should.kind_of?(RestGraph::Error::InvalidAccessToken)
-
-    RestGraph::Error.call(error2env('error_code' => 104)).
-      should.kind_of?(RestGraph::Error::MissingAccessToken)
-
-    RestGraph::Error.call(error2env('error_code' => 999)).
-      should.not.kind_of?(RestGraph::Error::AccessToken)
-
-    error = RestGraph::Error.call(error2env(['not a hash']))
-    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{|env|env})
-    rg.get('me'); rg.get('me')
-    rg.cache.values.should == []
-  end
-end

data/test/test_serialize.rb

@@ -1,44 +0,0 @@
-
-if respond_to?(:require_relative, true)
-  require_relative 'common'
-else
-  require File.dirname(__FILE__) + '/common'
-end
-
-describe RestGraph do
-  after do
-    WebMock.reset!
-    RR.verify
-  end
-
-  should 'be serialized with lighten' do
-    engines = if RUBY_VERSION >= '1.9.2'
-                begin
-                  require 'psych'
-                  YAML::ENGINE.yamler = 'psych' # TODO: probably a bug?
-                  [Marshal, YAML, Psych]
-                rescue LoadError
-                  [Marshal, YAML]
-                end
-              elsif defined?(RUBY_ENGINE) && RUBY_ENGINE == 'rbx'
-                [Marshal]
-              else
-                [YAML]
-              end
-
-    engines.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
-
-  should 'lighten takes options to change attributes' do
-    RestGraph.new.lighten(:timeout => 100    ).timeout.should == 100
-    RestGraph.new.lighten(:lang    => 'zh-TW').lang   .should == 'zh-TW'
-  end
-end

data/test/test_timeout.rb

@@ -1,25 +0,0 @@
-
-if respond_to?(:require_relative, true)
-  require_relative 'common'
-else
-  require File.dirname(__FILE__) + '/common'
-end
-
-describe RestGraph do
-  after do
-    WebMock.reset!
-    RR.verify
-  end
-
-  should 'respect timeout' do
-    stub_request(:get, 'https://graph.facebook.com/me').
-      to_return(:body => '{}')
-    mock.proxy(Timeout).timeout(numeric)
-    RestGraph.new.get('me').should == {}
-  end
-
-  should 'override timeout' do
-    mock(Timeout).timeout(99){ {RestCore::RESPONSE_BODY => true} }
-    RestGraph.new(:timeout => 1).get('me', {}, :timeout => 99).should == true
-  end
-end