rest-core 0.3.0.pre.2 → 0.3.0

data/CHANGES.md

@@ -1,15 +1,17 @@
 # rest-core CHANGES
 
-## rest-core 0.3.0 -- ?
+## rest-core 0.3.0 -- 2011-09-03
 
 * [facebook] RestGraph is Facebook now.
 * [facebook] Facebook::RailsUtil is imported from [rest-graph][]
 * [facebook] Use json_decode instead of auto_decode as rest-graph
+* [facebook] No longer calls URI.encode on Facebook broken URL
 * [twitter] Fixed opts in Twitter#tweet
 * [twitter] Introduced Twitter::Error instead of RuntimeError!
 * [twitter] By default log nothing
 * [rest-core] We no longer explicitly depends on Rack
 * [rest-core] Added a shorthand RC to access RestCore
+* [rest-core] Eliminated a lot of warnings
 * [cache] All clients no longer have default hash cache
 * [oauth2_query] Now we always use the term "access_token"
 * [config] Now Config#load and Config#load_for_rails take namespace

data/Gemfile

@@ -3,7 +3,24 @@ source 'http://rubygems.org'
 
 gemspec
 
+gem 'rake'
+gem 'bacon'
+gem 'rr'
+gem 'webmock'
+
+gem 'json'
+gem 'json_pure'
+
+gem 'rack'
+gem 'ruby-hmac'
+
+platforms(:ruby) do
+  gem 'yajl-ruby'
+end
+
+platforms(:jruby) do
+  gem 'jruby-openssl'
+end
+
 gem 'rails', '2.3.14' if ENV['RESTCORE'] == 'rails2'
 gem 'rails', '3.0.9'  if ENV['RESTCORE'] == 'rails3'
-
-gem 'jruby-openssl', :platforms => [:jruby]

data/Rakefile

@@ -15,8 +15,6 @@ task 'gem:spec' do
     # s.executables = [s.name]
 
     %w[rest-client].each{ |g| s.add_runtime_dependency(g) }
-    %w[yajl-ruby rack json json_pure ruby-hmac
-       webmock bacon rr rake].each{ |g| s.add_development_dependency(g) }
 
     s.authors     = ['Cardinal Blue', 'Lin Jen-Shin (godfat)']
     s.email       = ['dev (XD) cardinalblue.com']

data/example/rails2/Gemfile

@@ -4,10 +4,18 @@ source 'http://rubygems.org'
 gem 'rails', '2.3.14'
 
 gem 'rest-client' # for rest-core
-gem 'yajl-ruby'   # for rest-core
 gem 'rest-core', :path => '../../'
 
 group 'test' do
   gem 'rr'
   gem 'webmock'
 end
+
+platforms(:ruby) do
+  gem 'yajl-ruby'
+end
+
+platforms(:jruby) do
+  gem 'json'
+  gem 'jruby-openssl'
+end

data/example/rails3/Gemfile

@@ -4,10 +4,17 @@ source 'http://rubygems.org'
 gem 'rails', '3.0.9'
 
 gem 'rest-client' # for rest-core
-gem 'yajl-ruby'   # for rest-core
 gem 'rest-core', :path => '../../'
 
 group 'test' do
   gem 'rr'
   gem 'webmock'
 end
+
+platforms(:ruby) do
+  gem 'yajl-ruby'
+end
+
+platforms(:jruby) do
+  gem 'jruby-openssl'
+end

data/lib/rest-core/client.rb

@@ -33,8 +33,6 @@ module RestCore::Client
           end
         end
         private :default_#{name}
-
-        self
       RUBY
     }
     # if RUBY_VERSION < '1.9.2'
@@ -42,10 +40,10 @@ module RestCore::Client
       def members
         super.map(&:to_sym)
       end
-      self
     RUBY
     # end
-    accessor = Module.new.module_eval(src.join("\n"), __FILE__, __LINE__)
+    accessor = Module.new
+    accessor.module_eval(src.join("\n"), __FILE__, __LINE__)
     mod.const_set('Accessor', accessor)
     mod.send(:include, accessor)
   end

data/lib/rest-core/client/facebook.rb

@@ -91,7 +91,7 @@ module RestCore::Facebook::Client
 
   def next_page hash, opts={}, &cb
     if hash['paging'].kind_of?(Hash) && hash['paging']['next']
-      request(opts, [:get, URI.encode(hash['paging']['next'])], &cb)
+      request(opts, [:get, hash['paging']['next']], &cb)
     else
       yield(nil) if block_given?
     end
@@ -99,7 +99,7 @@ module RestCore::Facebook::Client
 
   def prev_page hash, opts={}, &cb
     if hash['paging'].kind_of?(Hash) && hash['paging']['previous']
-      request(opts, [:get, URI.encode(hash['paging']['previous'])], &cb)
+      request(opts, [:get, hash['paging']['previous']], &cb)
     else
       yield(nil) if block_given?
     end

data/lib/rest-core/middleware.rb

@@ -27,9 +27,9 @@ module RestCore::Middleware
       def initialize #{para_list}
         #{ivar_list} = #{args_list}
       end
-      self
     RUBY
-    accessor = Module.new.module_eval(src.join("\n"), __FILE__, __LINE__)
+    accessor = Module.new
+    accessor.module_eval(src.join("\n"), __FILE__, __LINE__)
     mod.const_set(:Accessor, accessor)
     mod.send(:include, accessor)
   end

data/lib/rest-core/middleware/defaults.rb

@@ -35,6 +35,12 @@ class RestCore::Defaults
   end
 
   def respond_to? msg
+    # since psych would call respond_to? before setting up
+    # instance variables when restoring ruby objects, we might
+    # be accessing undefined ivars in that case even all ivars are
+    # defined in initialize. we can't avoid this because we can't
+    # use singleton_class (otherwise we can't serialize this)
+    return super unless instance_variable_defined?(:@defaults)
     if (d = defaults({})) && d.key?(msg)
       true
     else

data/lib/rest-core/middleware/oauth1_header.rb

@@ -2,7 +2,7 @@
 require 'rest-core/middleware'
 require 'rest-core/util/hmac'
 
-require 'uri'
+require 'cgi'
 require 'openssl'
 
 class RestCore::Oauth1Header
@@ -44,7 +44,7 @@ class RestCore::Oauth1Header
 
   def attach_signature env, oauth_params
     params = reject_blank(oauth_params)
-    params.merge('oauth_signature' => encode(signature(env, params)))
+    params.merge('oauth_signature' => escape(signature(env, params)))
   end
 
   def signature env, params
@@ -67,9 +67,9 @@ class RestCore::Oauth1Header
     query    = reject_blank(env[REQUEST_QUERY] || {})
     params   = reject_blank(oauth_params.merge(query.merge(payload))).
       to_a.sort.map{ |(k, v)|
-        "#{encode(k.to_s)}=#{encode(v.to_s)}"}.join('&')
+        "#{escape(k.to_s)}=#{escape(v.to_s)}"}.join('&')
 
-    "#{method}&#{encode(base_uri)}&#{encode(params)}"
+    "#{method}&#{escape(base_uri)}&#{escape(params)}"
   end
 
   def nonce
@@ -89,7 +89,7 @@ class RestCore::Oauth1Header
                                      v.strip.empty? == true) }
   end
 
-  def encode string
-    URI.encode(string, /[^a-zA-Z0-9\-\.\_\~]/)
+  def escape string
+    CGI.escape(string).gsub('+', '%20')
   end
 end

data/lib/rest-core/test.rb

@@ -30,4 +30,8 @@ module Kernel
   def eq? rhs
     self == rhs
   end
+
+  def lt? rhs
+    self < rhs
+  end
 end

data/lib/rest-core/version.rb

@@ -1,4 +1,4 @@
 
 module RestCore
-  VERSION = '0.3.0.pre.2'
+  VERSION = '0.3.0'
 end

data/rest-core.gemspec

@@ -2,13 +2,13 @@
 
 Gem::Specification.new do |s|
   s.name = "rest-core"
-  s.version = "0.3.0.pre.2"
+  s.version = "0.3.0"
 
-  s.required_rubygems_version = Gem::Requirement.new("> 1.3.1") if s.respond_to? :required_rubygems_version=
+  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-09-02"
+  s.date = "2011-09-03"
   s.description = "A modular Ruby REST client collection/infrastructure.\n\nIn this era of web services and mashups, we have seen a blooming of REST\nAPIs. One might wonder, how do we use these APIs easily and elegantly?\nSince REST is very simple compared to SOAP, it is not hard to build a\ndedicated client ourselves.\n\nWe have developed [rest-core][] with composable middlewares to build a\nREST client, based on the effort from [rest-graph][]. In the cases of\ncommon APIs such as Facebook, Github, and Twitter, developers can simply\nuse the built-in dedicated clients provided by rest-core, or do it yourself\nfor any other REST APIs.\n\n[rest-core]: http://github.com/cardinalblue/rest-core\n[rest-graph]: http://github.com/cardinalblue/rest-graph"
   s.email = ["dev (XD) cardinalblue.com"]
   s.files = [
@@ -145,37 +145,10 @@ Gem::Specification.new do |s|
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<rest-client>, [">= 0"])
-      s.add_development_dependency(%q<yajl-ruby>, [">= 0"])
-      s.add_development_dependency(%q<rack>, [">= 0"])
-      s.add_development_dependency(%q<json>, [">= 0"])
-      s.add_development_dependency(%q<json_pure>, [">= 0"])
-      s.add_development_dependency(%q<ruby-hmac>, [">= 0"])
-      s.add_development_dependency(%q<webmock>, [">= 0"])
-      s.add_development_dependency(%q<bacon>, [">= 0"])
-      s.add_development_dependency(%q<rr>, [">= 0"])
-      s.add_development_dependency(%q<rake>, [">= 0"])
     else
       s.add_dependency(%q<rest-client>, [">= 0"])
-      s.add_dependency(%q<yajl-ruby>, [">= 0"])
-      s.add_dependency(%q<rack>, [">= 0"])
-      s.add_dependency(%q<json>, [">= 0"])
-      s.add_dependency(%q<json_pure>, [">= 0"])
-      s.add_dependency(%q<ruby-hmac>, [">= 0"])
-      s.add_dependency(%q<webmock>, [">= 0"])
-      s.add_dependency(%q<bacon>, [">= 0"])
-      s.add_dependency(%q<rr>, [">= 0"])
-      s.add_dependency(%q<rake>, [">= 0"])
     end
   else
     s.add_dependency(%q<rest-client>, [">= 0"])
-    s.add_dependency(%q<yajl-ruby>, [">= 0"])
-    s.add_dependency(%q<rack>, [">= 0"])
-    s.add_dependency(%q<json>, [">= 0"])
-    s.add_dependency(%q<json_pure>, [">= 0"])
-    s.add_dependency(%q<ruby-hmac>, [">= 0"])
-    s.add_dependency(%q<webmock>, [">= 0"])
-    s.add_dependency(%q<bacon>, [">= 0"])
-    s.add_dependency(%q<rr>, [">= 0"])
-    s.add_dependency(%q<rake>, [">= 0"])
   end
 end

data/test/client/facebook/test_api.rb

@@ -62,10 +62,10 @@ describe RestCore::Facebook do
     rg = RestCore::Facebook.new(
       :json_decode => false, :access_token => 'wrong',
       :app_id => '1', :secret => '2')
-    rg.get('me', {}, :secret => true).should == 'ok'
-    rg.url('me', {}, :secret => true).should ==
+    rg.get('me', {}, :secret => true).should.eq 'ok'
+    rg.url('me', {}, :secret => true).should.eq \
       'https://graph.facebook.com/me?access_token=1%7C2'
-    rg.url('me', {}, :secret => true, :site => '/').should ==
+    rg.url('me', {}, :secret => true, :site => '/').should.eq \
       '/me?access_token=1%7C2'
   end
 
@@ -74,7 +74,7 @@ describe RestCore::Facebook do
       to_return(:body => 'bad json')
 
     rg = RestCore::Facebook.new(:json_decode => true)
-    rg.get('woot', {}, :json_decode => false).should == 'bad json'
+    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 == []
+      RestCore::Facebook.new.delete('123').should.eq []
     }
   end
 

data/test/client/facebook/test_cache.rb

@@ -17,24 +17,24 @@ describe RestCore::Facebook do
     end
 
     should 'enable cache if passing cache' do
-      3.times{ @rg.get('cache').should == @body }
-      @cache.should == {@cache_key => @body}
+      3.times{ @rg.get('cache').should.eq @body }
+      @cache.should.eq({@cache_key => @body})
     end
 
     should 'respect expires_in' do
       mock(@cache).method(:store){ mock!.arity{ -3 } }
       mock(@cache).store(@cache_key, @body, :expires_in => 3)
-      @rg.get('cache', {}, :expires_in => 3).should == @body
+      @rg.get('cache', {}, :expires_in => 3).should.eq @body
     end
 
     should 'update cache if there is cache option set to false' do
-      @rg.get('cache')                     .should == @body
+      @rg.get('cache')                     .should.eq @body
       stub_request(:get, @url).to_return(:body => @body.reverse).times(2)
-      @rg.get('cache')                     .should == @body
-      @rg.get('cache', {}, :cache => false).should == @body.reverse
-      @rg.get('cache')                     .should == @body.reverse
+      @rg.get('cache')                     .should.eq @body
+      @rg.get('cache', {}, :cache => false).should.eq @body.reverse
+      @rg.get('cache')                     .should.eq @body.reverse
       @rg.cache = nil
-      @rg.get('cache', {}, :cache => false).should == @body.reverse
+      @rg.get('cache', {}, :cache => false).should.eq @body.reverse
     end
   end
 
@@ -47,12 +47,12 @@ describe RestCore::Facebook do
       rg = RestCore::Facebook.new(:cache => cache)
       3.times{
         if meth == :delete
-          rg.send(meth, 'cache').should == {'message' => 'ok'}
+          rg.send(meth, 'cache').should.eq({'message' => 'ok'})
         else
-          rg.send(meth, 'cache', 'payload').should == {'message' => 'ok'}
+          rg.send(meth, 'cache', 'payload').should.eq({'message' => 'ok'})
         end
       }
-      cache.should == {}
+      cache.should.eq({})
     }
   end
 end

data/test/client/facebook/test_default.rb

@@ -18,6 +18,6 @@ describe RestCore::Facebook do
       end
     end)
 
-    klass.new.app_id.should == '1829'
+    klass.new.app_id.should.eq('1829')
   end
 end

data/test/client/facebook/test_error.rb

@@ -8,12 +8,12 @@ describe RestCore::Facebook::Error do
   end
 
   should 'have the right ancestors' do
-    RestCore::Facebook::Error::AccessToken.should < RestCore::Facebook::Error
+    RestCore::Facebook::Error::AccessToken.should.lt RestCore::Facebook::Error
 
-    RestCore::Facebook::Error::InvalidAccessToken.should <
+    RestCore::Facebook::Error::InvalidAccessToken.should.lt \
       RestCore::Facebook::Error::AccessToken
 
-    RestCore::Facebook::Error::MissingAccessToken.should <
+    RestCore::Facebook::Error::MissingAccessToken.should.lt \
       RestCore::Facebook::Error::AccessToken
   end
 
@@ -60,6 +60,6 @@ describe RestCore::Facebook::Error do
     rg = RestCore::Facebook.new(:cache         => {},
                                 :error_handler => lambda{|env|env})
     rg.get('me'); rg.get('me')
-    rg.cache.values.should == []
+    rg.cache.values.should.eq []
   end
 end

data/test/client/facebook/test_handler.rb

@@ -16,7 +16,7 @@ describe RestCore::Facebook do
       rg = RestCore::Facebook.new(:log_method => lambda{ |s| logger << [s] })
       rg.get('me')
 
-      logger.size.should == 1
+      logger.size.should.eq 1
     end
   end
 
@@ -39,8 +39,8 @@ describe RestCore::Facebook do
       begin
         RestCore::Facebook.new.get('me')
       rescue ::RestCore::Facebook::Error => e
-        e.error  .should == @error_hash
-        e.message.should ==
+        e.error  .should.eq @error_hash
+        e.message.should.eq \
           "#{@error_hash.inspect} from https://graph.facebook.com/me"
       end
     end
@@ -67,14 +67,14 @@ describe RestCore::Facebook do
 
     should 'call error_handler if error occurred' do
       RestCore::Facebook.new(:error_handler => @id).fql(@bad_fql_query).
-        should == @fql_error_hash
+        should.eq @fql_error_hash
     end
 
     should 'raise ::RestCore::Facebook::Error in default error_handler' do
       begin
         RestCore::Facebook.new.fql(@bad_fql_query)
       rescue ::RestCore::Facebook::Error => e
-        e.error  .should == @fql_error_hash
+        e.error  .should.eq @fql_error_hash
         e.message.should.start_with?(
           "#{@fql_error_hash.inspect} from "          \
           "https://api.facebook.com/method/fql.query?")

data/test/client/facebook/test_load_config.rb

@@ -15,10 +15,10 @@ describe RestCore::Config do
   end
 
   def check
-    @klass.default_app_id     .should == 41829
-    @klass.default_secret     .should == 'r41829'.reverse
-    @klass.default_json_decode.should == false
-    @klass.default_lang       .should == 'zh-tw'
+    @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'
   end
 
   should 'honor rails config' do

data/test/client/facebook/test_misc.rb

@@ -8,16 +8,16 @@ describe RestCore::Facebook do
   end
 
   should 'return true in authorized? if there is an access_token' do
-    RestCore::Facebook.new(:access_token => '1').authorized?.should == true
-    RestCore::Facebook.new(:access_token => nil).authorized?.should == false
+    RestCore::Facebook.new(:access_token => '1').authorized?.should.eq true
+    RestCore::Facebook.new(:access_token => nil).authorized?.should.eq false
   end
 
   should 'treat oauth_token as access_token as well' do
     rg = RestCore::Facebook.new
     hate_facebook = 'why the hell two different name?'
     rg.data['oauth_token'] = hate_facebook
-    rg.authorized?.should == true
-    rg.access_token       == hate_facebook
+    rg.authorized?.should.eq true
+    rg.access_token.should.eq hate_facebook
   end
 
   should 'build correct headers' do
@@ -25,43 +25,43 @@ describe RestCore::Facebook do
                                 :lang   => 'zh-tw')
 
     headers = rg.ask.call(rg.send(:build_env))[RestCore::REQUEST_HEADERS]
-    headers['Accept'         ].should == 'text/html'
-    headers['Accept-Language'].should == 'zh-tw'
+    headers['Accept'         ].should.eq 'text/html'
+    headers['Accept-Language'].should.eq 'zh-tw'
   end
 
   should 'build empty query string' do
     rg = RestCore::Facebook.new
     (rg.ask.call(rg.send(:build_env))[RestCore::REQUEST_QUERY] || {}).
-      should == {}
+      should.eq({})
   end
 
   should 'create access_token in query string' do
     rg = RestCore::Facebook.new(:access_token => 'token')
     (rg.ask.call(rg.send(:build_env))[RestCore::REQUEST_QUERY] || {}).
-      should == {'access_token' => 'token'}
+      should.eq({'access_token' => 'token'})
   end
 
   should 'build correct query string' do
     rg = RestCore::Facebook.new(:access_token => 'token')
     TestHelper.normalize_url(rg.url('', :message => 'hi!!')).
-      should == "#{rg.site}?access_token=token&message=hi%21%21"
+      should.eq "#{rg.site}?access_token=token&message=hi%21%21"
 
     rg.access_token = nil
     TestHelper.normalize_url(rg.url('', :message => 'hi!!',
                                         :subject => '(&oh&)')).
-      should == "#{rg.site}?message=hi%21%21&subject=%28%26oh%26%29"
+      should.eq "#{rg.site}?message=hi%21%21&subject=%28%26oh%26%29"
   end
 
   should 'auto decode json' do
     rg = RestCore::Facebook.new(:json_decode => true)
     stub_request(:get, rg.site).to_return(:body => '[]')
-    rg.get('').should ==  []
+    rg.get('').should.eq []
   end
 
   should 'not auto decode json' do
     rg = RestCore::Facebook.new(:json_decode => false)
     stub_request(:get, rg.site).to_return(:body => '[]')
-    rg.get('').should == '[]'
+    rg.get('').should.eq '[]'
   end
 
   should 'give attributes' do

data/test/client/facebook/test_oauth.rb

@@ -13,7 +13,7 @@ describe RestCore::Facebook do
 
   should 'return correct oauth url' do
     TestHelper.normalize_url(@rg.authorize_url(:redirect_uri => @uri)).
-    should == 'https://graph.facebook.com/oauth/authorize?' \
+    should.eq 'https://graph.facebook.com/oauth/authorize?' \
               'client_id=29&redirect_uri=http%3A%2F%2Fzzz.tw'
   end
 
@@ -26,13 +26,13 @@ describe RestCore::Facebook do
     result = {'access_token' => 'baken', 'expires' => '2918'}
 
     @rg.authorize!(:redirect_uri => @uri, :code => 'zzz').
-             should == result
-    @rg.data.should == result
+             should.eq result
+    @rg.data.should.eq result
   end
 
   should 'not append access_token in authorize_url even presented' do
     RestCore::Facebook.new(:access_token => 'do not use me').authorize_url.
-      should == 'https://graph.facebook.com/oauth/authorize'
+      should.eq 'https://graph.facebook.com/oauth/authorize'
   end
 
 end

data/test/client/facebook/test_old.rb

@@ -13,14 +13,14 @@ describe RestCore::Facebook do
     stub_request(:get, "https://api.facebook.com/method/fql.query?#{query}").
       to_return(:body => '[]')
 
-    RestCore::Facebook.new.fql(fql).should == []
+    RestCore::Facebook.new.fql(fql).should.eq []
 
     token = 'token'.reverse
     stub_request(:get, "https://api.facebook.com/method/fql.query?#{query}" \
       "&access_token=#{token}").
       to_return(:body => '[]')
 
-    RestCore::Facebook.new(:access_token => token).fql(fql).should == []
+    RestCore::Facebook.new(:access_token => token).fql(fql).should.eq []
   end
 
   should 'do fql.mutilquery correctly' do
@@ -41,7 +41,7 @@ describe RestCore::Facebook do
     }
 
     stub_multi.call
-    RestCore::Facebook.new.fql_multi(:f0 => f0, :f1 => f1).should == []
+    RestCore::Facebook.new.fql_multi(:f0 => f0, :f1 => f1).should.eq []
   end
 
   should 'cache fake post in fql' do
@@ -54,16 +54,16 @@ describe RestCore::Facebook do
 
     RestCore::Facebook.new(:cache => (cache = {})).
       fql(query, {}, :post => true).
-      first['name']   .should == 'Mark Zuckerberg'
-    cache.size        .should == 1
-    cache.values.first.should == body
+      first['name']   .should.eq 'Mark Zuckerberg'
+    cache.size        .should.eq 1
+    cache.values.first.should.eq body
 
     WebMock.reset! # should hit the cache
 
     RestCore::Facebook.new(:cache => cache).fql(query, {}, :post => true).
-      first['name']   .should == 'Mark Zuckerberg'
-    cache.size        .should == 1
-    cache.values.first.should == body
+      first['name']   .should.eq 'Mark Zuckerberg'
+    cache.size        .should.eq 1
+    cache.values.first.should.eq body
 
     # query changed
     should.raise(WebMock::NetConnectNotAllowedError) do
@@ -73,9 +73,9 @@ describe RestCore::Facebook do
 
     # cache should work for normal get
     RestCore::Facebook.new(:cache => cache).fql(query).
-      first['name']   .should == 'Mark Zuckerberg'
-    cache.size        .should == 1
-    cache.values.first.should == body
+      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
@@ -98,7 +98,7 @@ describe RestCore::Facebook do
     RestCore::Facebook.new(:app_id => 'id',
                            :secret => 'di').
       exchange_sessions(:sessions => 'bad bed').
-      first['access_token'].should == 'bogus'
+      first['access_token'].should.eq 'bogus'
   end
 
   should 'use an secret access_token' do
@@ -109,6 +109,6 @@ describe RestCore::Facebook do
 
     RestCore::Facebook.new(:app_id => '123', :secret => 's').
       secret_old_rest('admin.getAppProperties', :properties => 'app_id').
-      should == {'app_id' => '123'}
+      should.eq({'app_id' => '123'})
   end
 end

data/test/client/facebook/test_page.rb

@@ -11,12 +11,12 @@ describe RestCore::Facebook do
     rg = RestCore::Facebook.new(:site => '', :cache => false)
     %w[next previous].each{ |type|
       kind = "#{type}_page"
-      rg.send(kind, {})              .should == nil
-      rg.send(kind, {'paging' => []}).should == nil
-      rg.send(kind, {'paging' => {}}).should == nil
+      rg.send(kind, {})              .should.eq nil
+      rg.send(kind, {'paging' => []}).should.eq nil
+      rg.send(kind, {'paging' => {}}).should.eq nil
 
       stub_request(:get, 'zzz').to_return(:body => '["ok"]')
-      rg.send(kind, {'paging' => {type => 'zzz'}}).should == ['ok']
+      rg.send(kind, {'paging' => {type => 'zzz'}}).should.eq ['ok']
     }
   end
 
@@ -34,18 +34,18 @@ describe RestCore::Facebook do
       (2..4).each{ |pages|
         # merge data
         stub_request(:get, 'zzz').to_return(:body => '{"data":["y"]}')
-        rg.for_pages(data, pages, {}, kind).should == {'data' => %w[z y]}
+        rg.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 == {'data' => %w[z]}
+        rg.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 == {'data' => %w[z y x]}
+      rg.for_pages(data, 3, {}, kind).should.eq({'data' => %w[z y x]})
     }
   end
 
@@ -61,30 +61,30 @@ describe RestCore::Facebook do
       ranges.each{ |page|
         rg.for_pages(data, page, {}, kind){ |r|
           if r
-            r.should == data
+            r.should.eq data
           else
             nils += 1
           end
-        }.should == data
+        }.should.eq data
       }
-      nils.should == ranges.to_a.size
+      nils.should.eq ranges.to_a.size
 
       (2..4).each{ |pages|
         # merge data
         stub_request(:get, 'zzz').to_return(:body => '{"data":["y"]}')
         expects = [{'data' => %w[y]}, nil]
         rg.for_pages(data, pages, {}, kind){ |r|
-          r.should == expects.shift
-        }.should == {'data' => %w[z y]}
-        expects.empty?.should == true
+          r.should.eq expects.shift
+        }.should.eq({'data' => %w[z y]})
+        expects.empty?.should.eq true
 
         # this data cannot be merged
         stub_request(:get, 'zzz').to_return(:body => '{"data":"y"}')
         expects = [{'data' => 'y'}, nil]
         rg.for_pages(data, pages, {}, kind){ |r|
-          r.should == expects.shift
-        }.should == {'data' => %w[z]}
-        expects.empty?.should == true
+          r.should.eq expects.shift
+        }.should.eq({'data' => %w[z]})
+        expects.empty?.should.eq true
       }
 
       stub_request(:get, 'zzz').to_return(:body =>
@@ -99,8 +99,8 @@ describe RestCore::Facebook do
         else
           r = rr
         end
-        r.should == expects.shift
-      }.should == {'data' => %w[z y x]}
+        r.should.eq expects.shift
+      }.should.eq({'data' => %w[z y x]})
     }
   end
 end

data/test/client/facebook/test_parse.rb

@@ -5,8 +5,8 @@ describe RestCore::Facebook do
 
   should 'return nil if parse error, but not when call data directly' do
     rg = RestCore::Facebook.new
-    rg.parse_cookies!({}).should == nil
-    rg.data              .should == {}
+    rg.parse_cookies!({}).should.eq nil
+    rg.data              .should.eq({})
   end
 
   should 'parse if fbs contains json as well' do
@@ -15,7 +15,7 @@ describe RestCore::Facebook do
     data      = {'algorithm' => algorithm, 'user' => user}
     rg        = RestCore::Facebook.new(:data => data, :secret => 'secret')
     sig       = rg.send(:calculate_sig, data)
-    rg.parse_fbs!("\"#{rg.fbs}\"").should == data.merge('sig' => sig)
+    rg.parse_fbs!("\"#{rg.fbs}\"").should.eq data.merge('sig' => sig)
   end
 
   should 'extract correct access_token or fail checking sig' do
@@ -26,26 +26,26 @@ describe RestCore::Facebook do
     fbs          = "access_token=#{CGI.escape(access_token)}&expires=0&" \
                    "secret=abc&session_key=def-456&sig=#{sig}&uid=3"
 
-    check = lambda{ |token, fbs|
+    check = lambda{ |token, fbs1|
       http_cookie =
         "__utma=123; __utmz=456.utmcsr=(d)|utmccn=(d)|utmcmd=(n); " \
-        "fbs_#{app_id}=#{fbs}"
+        "fbs_#{app_id}=#{fbs1}"
 
       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
+      rg.access_token.should.eq token
 
-      rg.parse_rack_env!('HTTP_COOKIE' => nil).should == nil
-      rg.data.should == {}
+      rg.parse_rack_env!('HTTP_COOKIE' => nil).should.eq nil
+      rg.data.should.eq({})
 
-      rg.parse_cookies!({"fbs_#{app_id}" => fbs}).
+      rg.parse_cookies!({"fbs_#{app_id}" => fbs1}).
                       should.kind_of?(token ? Hash : NilClass)
-      rg.access_token.should ==  token
+      rg.access_token.should.eq token
 
-      rg.parse_fbs!(fbs).
+      rg.parse_fbs!(fbs1).
                       should.kind_of?(token ? Hash : NilClass)
-      rg.access_token.should ==  token
+      rg.access_token.should.eq token
     }
     check.call(access_token, fbs)
     check.call(access_token, "\"#{fbs}\"")
@@ -57,23 +57,23 @@ describe RestCore::Facebook do
   should 'not pass if there is no secret, prevent from forgery' do
     rg = RestCore::Facebook.new
     rg.parse_fbs!('"feed=me&sig=bddd192cf27f22c05f61c8bea24fa4b7"').
-      should == nil
+      should.eq nil
   end
 
   should 'parse json correctly' do
     rg = RestCore::Facebook.new
 
-    rg.parse_json!('bad json')    .should == nil
-    rg.parse_json!('{"no":"sig"}').should == nil
+    rg.parse_json!('bad json')    .should.eq nil
+    rg.parse_json!('{"no":"sig"}').should.eq nil
     rg.parse_json!('{"feed":"me","sig":"bddd192cf27f22c05f61c8bea24fa4b7"}').
-      should == nil
+      should.eq nil
 
     rg = RestCore::Facebook.new(:secret => 'bread')
     rg.parse_json!('{"feed":"me","sig":"20393e7823730308938a86ecf1c88b14"}').
-      should == {'feed' => 'me', 'sig' => "20393e7823730308938a86ecf1c88b14"}
-    rg.data.empty?.should == false
+      should.eq({'feed' => 'me', 'sig' => "20393e7823730308938a86ecf1c88b14"})
+    rg.data.empty?.should.eq false
     rg.parse_json!('bad json')
-    rg.data.empty?.should == true
+    rg.data.empty?.should.eq true
   end
 
   should 'parse signed_request' do
@@ -88,19 +88,19 @@ describe RestCore::Facebook do
 
     rg = RestCore::Facebook.new(:secret => secret)
     rg.parse_signed_request!(signed_request)
-    rg.data['ooh'].should == 'dir'
-    rg.data['moo'].should == 'bar'
+    rg.data['ooh'].should.eq 'dir'
+    rg.data['moo'].should.eq 'bar'
 
     signed_request = "#{encode[sig[0..-4]+'bad']}.#{json_encoded}"
-    rg.parse_signed_request!(signed_request).should == nil
-    rg.data                                 .should == {}
+    rg.parse_signed_request!(signed_request).should.eq nil
+    rg.data                                 .should.eq({})
   end
 
   should 'fallback to ruby-hmac if Digest.new raise an runtime error' do
     key, data = 'top', 'secret'
     digest = OpenSSL::HMAC.digest('sha256', key, data)
     mock(OpenSSL::HMAC).digest('sha256', key, data){ raise 'boom' }
-    RestCore::Hmac.sha256(key, data).should == digest
+    RestCore::Hmac.sha256(key, data).should.eq digest
   end
 
   should 'generate correct fbs with correct sig' do
@@ -112,17 +112,17 @@ describe RestCore::Facebook do
   should 'parse fbs from facebook response which lacks sig...' do
     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
-    rg.data.empty?.should == true
+    rg.data.empty?.should.eq false
+    rg.parse_fbs!(rg.fbs.sub(/sig\=\w+/, 'sig=abc')).should.eq nil
+    rg.data.empty?.should.eq true
   end
 
   should 'generate correct fbs with additional parameters' do
     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'
-    rg.data['expires']   .should == '1234'
+    rg.access_token      .should.eq 'a'
+    rg.data['expires']   .should.eq '1234'
   end
 
 end

data/test/client/facebook/test_serialize.rb

@@ -17,9 +17,10 @@ describe RestCore::Facebook do
               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
+    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
@@ -28,10 +29,10 @@ describe RestCore::Facebook do
       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
+      test[rg.lighten].should.eq rg.lighten
       lambda{ test[rg] }.should.raise(TypeError)
       rg.lighten!
-      test[rg.lighten].should == rg
+      test[rg.lighten].should.eq rg
     }
   end
 

data/test/test_oauth1_header.rb

@@ -25,7 +25,7 @@ describe RestCore::Oauth1Header do
   end
 
   should 'have correct base_string' do
-    @auth.base_string(@env, @oauth_params).should.equal(
+    @auth.base_string(@env, @oauth_params).should.eq(
       'POST&https%3A%2F%2Fapi.twitter.com%2Foauth%2Frequest_token&' \
       'oauth_callback%3Dhttp%253A%252F%252Flocalhost%253A3005%252F' \
       'the_dance%252Fprocess_callback%253Fservice_provider_id%253D' \
@@ -38,7 +38,7 @@ describe RestCore::Oauth1Header do
   should 'not use payload in multipart request for base_string' do
     @env = @env.merge(RestCore::REQUEST_PAYLOAD =>
                         {'file' => File.open(__FILE__)})
-    @auth.base_string(@env, @oauth_params).should.equal(
+    @auth.base_string(@env, @oauth_params).should.eq(
       'POST&https%3A%2F%2Fapi.twitter.com%2Foauth%2Frequest_token&' \
       'oauth_callback%3Dhttp%253A%252F%252Flocalhost%253A3005%252F' \
       'the_dance%252Fprocess_callback%253Fservice_provider_id%253D' \
@@ -49,7 +49,7 @@ describe RestCore::Oauth1Header do
   end
 
   should 'have correct signature' do
-    @auth.signature(@env, @oauth_params).should.equal(
+    @auth.signature(@env, @oauth_params).should.eq(
       '8wUi7m5HFQy76nowoCThusfgB+Q=')
   end
 end

metadata

@@ -1,8 +1,8 @@
 --- !ruby/object:Gem::Specification
 name: rest-core
 version: !ruby/object:Gem::Version
-  version: 0.3.0.pre.2
-  prerelease: 6
+  version: 0.3.0
+  prerelease: 
 platform: ruby
 authors:
 - Cardinal Blue
@@ -10,11 +10,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-09-02 00:00:00.000000000Z
+date: 2011-09-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client
-  requirement: &2157314400 !ruby/object:Gem::Requirement
+  requirement: &2164656700 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -22,106 +22,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2157314400
-- !ruby/object:Gem::Dependency
-  name: yajl-ruby
-  requirement: &2157313900 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: *2157313900
-- !ruby/object:Gem::Dependency
-  name: rack
-  requirement: &2157313240 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: *2157313240
-- !ruby/object:Gem::Dependency
-  name: json
-  requirement: &2157312760 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: *2157312760
-- !ruby/object:Gem::Dependency
-  name: json_pure
-  requirement: &2157312220 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: *2157312220
-- !ruby/object:Gem::Dependency
-  name: ruby-hmac
-  requirement: &2157298280 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: *2157298280
-- !ruby/object:Gem::Dependency
-  name: webmock
-  requirement: &2157297200 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: *2157297200
-- !ruby/object:Gem::Dependency
-  name: bacon
-  requirement: &2157296380 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: *2157296380
-- !ruby/object:Gem::Dependency
-  name: rr
-  requirement: &2157295440 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: *2157295440
-- !ruby/object:Gem::Dependency
-  name: rake
-  requirement: &2157294480 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: *2157294480
+  version_requirements: *2164656700
 description: ! 'A modular Ruby REST client collection/infrastructure.
 
 
@@ -276,9 +177,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
-  - - ! '>'
+  - - ! '>='
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.10