rest-core 0.0.1 → 0.2.0

data/README.md

@@ -29,8 +29,8 @@ for any other REST APIs.
 ## REQUIREMENTS:
 
 * Tested with MRI (official ruby) 1.9.2, 1.8.7, and trunk
-* Tested with Rubinius (rbx) 1.2.3
-* Tested with JRuby 1.6.2
+* Tested with Rubinius (rbx) 1.2
+* Tested with JRuby 1.6
 
 ## INSTALLATION:
 
@@ -38,31 +38,53 @@ for any other REST APIs.
 
 Or if you want development version, put this in Gemfile:
 
-    gem 'rest-core', :git => 'git://github.com/cardinalblue/rest-core.git'
+    gem 'rest-core', :git => 'git://github.com/cardinalblue/rest-core.git',
+                     :submodules => true
 
-## EXAMPLE:
+## Built-in Clients Example:
 
-    RestCore::Builder.client('YourClient') do
+    require 'rest-core'
+
+    RestCore::Twitter.new.statuses('godfat') # get user tweets
+    RestCore::Github.new.get('users/godfat') # get user info
+
+    linkedin = RestCore::Linkedin.new(:consumer_key    => '...',
+                                      :consumer_secret => '...')
+    linkedin.authorize_url!   # copy and paste the URL in browser to authorize
+    linkedin.authorize!('..') # paste your code from browser
+    linkedin.me               # get current user info
+
+    # below is exactly the same as [rest-graph][]
+    require 'rest-core/client/rest-graph'
+    RestGraph.new.get('4')                   # get user info
+
+See [example][] for more complex examples.
+
+[example]: https://github.com/cardinalblue/rest-core/tree/master/example
+
+## Build Your Own Clients Example:
+
+    require 'rest-core'
+
+    YourClient = RestCore::Builder.client do
       use DefaultSite , 'https://api.github.com/users/'
       use JsonDecode  , true
       use CommonLogger, method(:puts)
-      use Cache       , {}, nil
+      use Cache       , {}, 3600
       run RestClient
     end
 
     client = YourClient.new
-    client.get('godfat')
-    client.get('godfat')
+    client.get('godfat') # cache miss
+    client.get('godfat') # cache hit
 
     client.site = 'http://github.com/api/v2/json/user/show/'
-    client.get('godfat')
-    client.get('godfat')
+    client.get('godfat') # cache miss
+    client.get('godfat') # cache hit
 
-See [example][] for more complex examples, and [build-in clients][] for even
-more complex examples.
+See [built-in clients][] for more complex examples.
 
-[example]: https://github.com/cardinalblue/rest-core/tree/master/example
-[build-in clients]: https://github.com/cardinalblue/rest-core/tree/master/lib/rest-core/client
+[built-in clients]: https://github.com/cardinalblue/rest-core/tree/master/lib/rest-core/client
 
 ## LICENSE:
 

data/TODO.md

@@ -7,11 +7,9 @@
 
 ## medium
 
-* namespace issue
 * what about async request? yield callback? coroutine?
 * dependency?
 
 ## low
 
-* config loader
 * test utility

data/example/facebook.rb

@@ -1,145 +1,9 @@
 
-# simple client
+require 'rest-core/client/rest-graph'
 
-require 'rest-core'
+p RestGraph.new.get('4') # get user info
 
-RestCore::Builder.client('Facebook', :data, :app_id, :secret, :old_site) do
-  s = self.class # this is only for ruby 1.8!
-  use s::Timeout       , 10
-
-  use s::DefaultSite   , 'https://graph.facebook.com/'
-  use s::DefaultHeaders, {'Accept'          => 'application/json',
-                          'Accept-Language' => 'en-us'}
-  use s::Oauth2Query   , 'access_token', nil
-
-  use s::CommonLogger  , method(:puts)
-  use s::Cache         , {}, nil
-  use s::ErrorHandler  , lambda{ |env| raise ::Facebook::Error.call(env) }
-  use s::ErrorDetector , lambda{ |env| env[s::RESPONSE_BODY]['error'] ||
-                                       env[s::RESPONSE_BODY]['error_code'] }
-  use s::JsonDecode    , true
-
-  use s::Defaults      , :data     => lambda{{}},
-                         :old_site => 'https://api.facebook.com/'
-
-  run s::RestClient
-end
-
-class Facebook::Error < RuntimeError
-  include RestCore
-
-  attr_reader :error, :url
-  def initialize error, url=''
-    @error, @url = error, url
-    super("#{error.inspect} from #{url}")
-  end
-
-  def self.call env
-    error, url = env[RESPONSE_BODY], Middleware.request_uri(env)
-    new(error, url)
-  end
-end
-
-module Facebook::Client
-  include RestCore
-
-  def oauth_token
-    data['access_token'] || data['oauth_token'] if data.kind_of?(Hash)
-  end
-  def oauth_token=  token
-    data['access_token'] = token if data.kind_of?(Hash)
-  end
-  alias_method :access_token , :oauth_token
-  alias_method :access_token=, :oauth_token=
-
-  def secret_oauth_token ; "#{app_id}|#{secret}"           ; end
-  alias_method :secret_access_token, :secret_oauth_token
-
-  def accept             ; headers['Accept']               ; end
-  def accept=         val; headers['Accept']          = val; end
-  def lang               ; headers['Accept-Language']      ; end
-  def lang=           val; headers['Accept-Language'] = val; end
-
-  def authorized?        ; !!oauth_token                   ; end
-
-  # cookies, app_id, secrect related below
-
-  def parse_fbs! fbs
-    self.data = check_sig_and_return_data(
-      # take out facebook sometimes there but sometimes not quotes in cookies
-      Rack::Utils.parse_query(fbs.to_s.sub(/^"/, '').sub(/"$/, '')))
-  end
-
-  def fbs
-    "#{fbs_without_sig(data).join('&')}&sig=#{calculate_sig(data)}"
-  end
-
-  # facebook's new signed_request...
-
-  def parse_signed_request! request
-    sig_encoded, json_encoded = request.split('.')
-    sig,  json = [sig_encoded, json_encoded].map{ |str|
-      "#{str.tr('-_', '+/')}==".unpack('m').first
-    }
-    self.data = check_sig_and_return_data(
-                  JsonDecode.json_decode(json).merge('sig' => sig)){
-                    Hmac.sha256(secret, json_encoded)
-                  }
-  rescue JsonDecode::ParseError
-    self.data = nil
-  end
-
-  # oauth related
-
-  def authorize_url opts={}
-    url('oauth/authorize',
-        {:client_id => app_id, :access_token => nil}.merge(opts))
-  end
-
-  def authorize! opts={}
-    query = {:client_id => app_id, :client_secret => secret}.merge(opts)
-    self.data = Rack::Utils.parse_query(
-                  request({:auto_decode => false}.merge(opts),
-                          [:get, url('oauth/access_token', query)]))
-  end
-
-  # old rest facebook api, i will definitely love to remove them someday
-
-  def old_rest path, query={}, opts={}, &cb
-    uri = url("method/#{path}", {:format => 'json'}.merge(query),
-              {:site => old_site}.merge(opts))
-    request(opts, [:get, uri], &cb)
-  end
-
-  def secret_old_rest path, query={}, opts={}, &cb
-    old_rest(path, query, {:secret => true}.merge(opts), &cb)
-  end
-
-  def fql code, query={}, opts={}, &cb
-    old_rest('fql.query', {:query => code}.merge(query), opts, &cb)
-  end
-
-  def fql_multi codes, query={}, opts={}, &cb
-    old_rest('fql.multiquery',
-      {:queries => JsonDecode.json_encode(codes)}.merge(query), opts, &cb)
-  end
-
-  protected
-  def check_sig_and_return_data cookies
-    cookies if secret && if block_given?
-                           yield
-                         else
-                           calculate_sig(cookies)
-                         end == cookies['sig']
-  end
-
-  def calculate_sig cookies
-    Digest::MD5.hexdigest(fbs_without_sig(cookies).join + secret)
-  end
-
-  def fbs_without_sig cookies
-    cookies.reject{ |(k, v)| k == 'sig' }.sort.map{ |a| a.join('=') }
-  end
-end
-
-Facebook.send(:include, Facebook::Client)
+facebook = RestGraph.new(:app_id => '...', :secret => '...')
+facebook.authorize_url # copy and paste the URL in browser to authorize
+facebook.authorize!(:redirect_uri => '...', :code => '...')
+p facebook.get('me')

data/example/github.rb

@@ -1,21 +1,4 @@
 
-# simple client
-
 require 'rest-core'
 
-RestCore::Builder.client('Github') do
-  s = self.class # this is only for ruby 1.8!
-  use s::Timeout      , 10
-
-  use s::DefaultSite  , 'https://api.github.com/'
-  use s::Oauth2Query  , 'access_token', nil
-
-  use s::CommonLogger , method(:puts)
-  use s::Cache        , {}, nil
-  use s::ErrorHandler , lambda{|env| raise env[s::RESPONSE_BODY]['message']}
-  use s::ErrorDetector, lambda{|env| env[s::RESPONSE_HEADERS]['status'].
-                                     first !~ /^2/}
-  use s::JsonDecode   , true
-
-  run s::RestClient
-end
+p RestCore::Github.new.get('users/godfat') # get user info

data/example/linkedin.rb

@@ -0,0 +1,8 @@
+
+require 'rest-core'
+
+linkedin = RestCore::Linkedin.new(:consumer_key    => '...',
+                                  :consumer_secret => '...')
+linkedin.authorize_url!   # copy and paste the URL in browser to authorize
+linkedin.authorize!('..') # paste your code from browser
+p linkedin.me             # get current user info

data/example/twitter.rb

@@ -0,0 +1,12 @@
+
+require 'rest-core'
+RestCore::Twitter.new.statuses('godfat') # get user tweets
+
+twitter = RestCore::Twitter.new(:consumer_key    => '...',
+                                :consumer_secret => '...')
+twitter.authorize_url!   # copy and paste the URL in browser to authorize
+twitter.authorize!('..') # paste your code from browser
+p twitter.tweet('hi!')   # tweet for the current user
+
+p twitter.post('statuses/update_with_media.json',
+  :status => 'hi!', 'media[]' => File.open('...'))

data/lib/rest-core.rb

@@ -45,4 +45,9 @@ module RestCore
   # apps
   autoload :Ask           , 'rest-core/app/ask'
   autoload :RestClient    , 'rest-core/app/rest-client'
+
+  # clients
+  autoload :Github        , 'rest-core/client/github'
+  autoload :Twitter       , 'rest-core/client/twitter'
+  autoload :Linkedin      , 'rest-core/client/linkedin'
 end

data/lib/rest-core/builder.rb

@@ -6,16 +6,15 @@ class RestCore::Builder
   include RestCore
   include Wrapper
 
-  def self.client prefix, *attrs, &block
-    new(&block).to_client(prefix, *attrs)
+  def self.client *attrs, &block
+    new(&block).to_client(*attrs)
   end
 
-  def to_client prefix, *attrs
+  def to_client *attrs
     # struct = Struct.new(*members, *attrs) if RUBY_VERSION >= 1.9.2
     struct = Struct.new(*(members + attrs))
     client = Class.new(struct)
     client.send(:include, Client)
-    Object.const_set( prefix , client)
     client.const_set('Struct', struct)
     class << client; attr_reader :builder; end
     client.instance_variable_set(:@builder, self)

data/lib/rest-core/client.rb

@@ -19,13 +19,15 @@ module RestCore::Client
         end
 
         def default_#{name} app=app
-          if app.respond_to?(:#{name})
+          if app.respond_to?(:#{name})      # instance value
             app.#{name}({})
-          elsif app.respond_to?(:wrapped)
-            default_#{name}(app.wrapped) ||
+          elsif app.respond_to?(:wrapped)   # wrapper value
+            default_#{name}(app.wrapped) || # walk into it
             default_#{name}(app.app)
-          elsif app.respond_to?(:app)
+          elsif app.respond_to?(:app)       # walk into next app
             default_#{name}(app.app)
+          elsif self.class.respond_to?("default_#{name}")
+            self.class.default_#{name}       # old class default style
           else
             nil
           end

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

@@ -1,5 +1,7 @@
 
-RestCore::Builder.client('Github') do
+require 'rest-core'
+
+RestCore::Github = RestCore::Builder.client do
   s = self.class # this is only for ruby 1.8!
   use s::Timeout       , 10
 
@@ -8,7 +10,7 @@ RestCore::Builder.client('Github') do
   use s::Oauth2Query   , 'access_token', nil
 
   use s::CommonLogger  , lambda{|obj|obj}
-  use s::Cache         , {}, nil do
+  use s::Cache         , {}, 3600 do
     use s::ErrorHandler , lambda{|env| raise env[s::RESPONSE_BODY]['message']}
     use s::ErrorDetectorHttp
     use s::JsonDecode   , true

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

@@ -1,5 +1,5 @@
 
-RestCore::Builder.client('Linkedin', :data) do
+RestCore::Linkedin = RestCore::Builder.client(:data) do
   s = self.class # this is only for ruby 1.8!
   use s::Timeout       , 10
 
@@ -13,7 +13,7 @@ RestCore::Builder.client('Linkedin', :data) do
 
   use s::CommonLogger  , method(:puts)
 
-  use s::Cache         , {}, nil do
+  use s::Cache         , {}, 3600 do
     use s::ErrorHandler , lambda{|env|
       if (body = env[s::RESPONSE_BODY]).kind_of?(Hash)
         raise body['message']
@@ -31,27 +31,31 @@ RestCore::Builder.client('Linkedin', :data) do
   run s::RestClient
 end
 
-module Linkedin::Client
+module RestCore::Linkedin::Client
   include RestCore
 
   def oauth_token
     data['oauth_token'] if data.kind_of?(Hash)
   end
-  def oauth_token=  token
+  def oauth_token= token
     data['oauth_token'] = token if data.kind_of?(Hash)
   end
   def oauth_token_secret
     data['oauth_token_secret'] if data.kind_of?(Hash)
   end
-  def oauth_token_secret=  secret
+  def oauth_token_secret= secret
     data['oauth_token_secret'] = secret if data.kind_of?(Hash)
   end
 
+  def me queries={}, opts={}
+    get('v1/people/~', queries, opts)
+  end
+
   private
   def set_token query
     self.data = query
   end
 end
 
-Linkedin.send(:include, RestCore::ClientOauth1)
-Linkedin.send(:include, Linkedin::Client)
+RestCore::Linkedin.send(:include, RestCore::ClientOauth1)
+RestCore::Linkedin.send(:include, RestCore::Linkedin::Client)

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

@@ -5,7 +5,7 @@ require 'rest-core/util/hmac'
 # optional gem
 begin; require 'rack'; rescue LoadError; end
 
-RestCore::Builder.client('RestGraph', :data, :app_id, :secret, :old_site) do
+RestGraph = RestCore::Builder.client(:data, :app_id, :secret, :old_site) do
   s = self.class # this is only for ruby 1.8!
   use s::Timeout       , 10
 
@@ -16,7 +16,7 @@ RestCore::Builder.client('RestGraph', :data, :app_id, :secret, :old_site) do
 
   use s::CommonLogger  , lambda{|obj|obj}
 
-  use s::Cache         , {}, nil do
+  use s::Cache         , {}, 3600 do
     use s::ErrorHandler  , lambda{ |env| raise ::RestGraph::Error.call(env) }
     use s::ErrorDetector , lambda{ |env|
       if env[s::RESPONSE_BODY].kind_of?(Hash)

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

@@ -1,9 +1,11 @@
 
-RestCore::Builder.client('Twitter', :data) do
+require 'rest-core'
+
+RestCore::Twitter = RestCore::Builder.client(:data) do
   s = self.class # this is only for ruby 1.8!
   use s::Timeout       , 10
 
-  use s::DefaultSite   , 'https://api.twitter.com/'
+  use s::DefaultSite   , 'https://api.twitter.com/1/'
   use s::DefaultHeaders, {'Accept' => 'application/json'}
 
   use s::Oauth1Header  ,
@@ -11,7 +13,7 @@ RestCore::Builder.client('Twitter', :data) do
 
   use s::CommonLogger  , method(:puts)
 
-  use s::Cache         , {}, nil do
+  use s::Cache         , {}, 3600 do
     use s::ErrorHandler  , lambda{ |env|
       if (body = env[s::RESPONSE_BODY]).kind_of?(Hash)
         raise body['error']
@@ -29,24 +31,29 @@ RestCore::Builder.client('Twitter', :data) do
   run s::RestClient
 end
 
-module Twitter::Client
+module RestCore::Twitter::Client
   include RestCore
 
   def oauth_token
     data['oauth_token'] if data.kind_of?(Hash)
   end
-  def oauth_token=  token
+  def oauth_token= token
     data['oauth_token'] = token if data.kind_of?(Hash)
   end
   def oauth_token_secret
     data['oauth_token_secret'] if data.kind_of?(Hash)
   end
-  def oauth_token_secret=  secret
+  def oauth_token_secret= secret
     data['oauth_token_secret'] = secret if data.kind_of?(Hash)
   end
 
-  def tweet status, opt={}
-    post('1/statuses/update.json', {:status => status}.merge(opt))
+  def tweet status, queries={}, opts={}
+    post('statuses/update.json',
+      {:status => status}.merge(queries), opts)
+  end
+
+  def statuses user, queries={}, opts={}
+    get('statuses/user_timeline.json', {:id => user}.merge(queries), opts)
   end
 
   private
@@ -55,5 +62,5 @@ module Twitter::Client
   end
 end
 
-Twitter.send(:include, RestCore::ClientOauth1)
-Twitter.send(:include,  Twitter::Client)
+RestCore::Twitter.send(:include, RestCore::ClientOauth1)
+RestCore::Twitter.send(:include, RestCore::Twitter::Client)

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

@@ -55,8 +55,16 @@ class RestCore::Oauth1Header
   def base_string env, oauth_params
     method   = env[REQUEST_METHOD].to_s.upcase
     base_uri = env[REQUEST_PATH]
+    # TODO: the detection should be checking if it's
+    # application/x-www-form-urlencoded or not, instead of multipart or not.
+    # but since the Content-Type is generated in app (http client),
+    # we have no idea what it would be here. so simply guessing it...
+    payload  = if multipart?(env)
+                 {}
+               else
+                 reject_blank(env[REQUEST_PAYLOAD] || {})
+               end
     query    = reject_blank(env[REQUEST_QUERY]   || {})
-    payload  = reject_blank(env[REQUEST_PAYLOAD] || {})
     params   = reject_blank(oauth_params.merge(query.merge(payload))).
       to_a.sort.map{ |(k, v)|
         "#{encode(k.to_s)}=#{encode(v.to_s)}"}.join('&')
@@ -68,6 +76,11 @@ class RestCore::Oauth1Header
     [OpenSSL::Random.random_bytes(32)].pack('m').tr("+/=\n", '')
   end
 
+  def multipart? env
+    !!(env[REQUEST_PAYLOAD] &&
+       env[REQUEST_PAYLOAD].find{ |k, v| v.kind_of?(IO) })
+  end
+
   def reject_blank params
     params.reject{ |k, v| v.nil? || v == false ||
                                     (v.respond_to?(:strip) &&

data/lib/rest-core/util/config.rb

@@ -0,0 +1,49 @@
+
+require 'erb'
+require 'yaml'
+
+require 'rest-core'
+
+module RestCore::Config
+  extend self
+
+  DefaultModuleName = 'DefaultAttributes'
+
+  def load_for_rails klass, app=Rails
+    root = File.expand_path(app.root)
+    path = ["#{root}/config/rest-core.yaml", # YAML should use .yaml
+            "#{root}/config/rest-core.yml" ].find{|p| File.exist?(p)}
+    RestCore::Config.load(klass, path, app.env)
+  end
+
+  def load klass, path, env
+    return false if klass.const_defined?(DefaultModuleName)
+    RestCore::Config.load!(klass, path, env)
+  end
+
+  def load! klass, path, env
+    config   = YAML.load(ERB.new(File.read(path)).result(binding))
+    defaults = config[env]
+    return false unless defaults
+    raise ArgumentError.new("#{defaults} is not a hash") unless
+      defaults.kind_of?(Hash)
+
+    mod = if klass.const_defined?(DefaultModuleName)
+            klass.const_get(DefaultModuleName)
+          else
+            m = Module.new
+            klass.send(:extend, m)
+            klass.send(:const_set, DefaultModuleName, m)
+            m
+          end
+
+    mod.module_eval(defaults.inject([]){ |r, (k, v)|
+      # quote strings, leave others free (e.g. false, numbers, etc)
+      r << <<-RUBY
+        def default_#{k}
+          #{v.kind_of?(String) ? "'#{v}'" : v}
+        end
+      RUBY
+    }.join, __FILE__, __LINE__)
+  end
+end

data/lib/rest-core/version.rb

@@ -1,4 +1,4 @@
 
 module RestCore
-  VERSION = '0.0.1'
+  VERSION = '0.2.0'
 end

data/rest-core.gemspec

@@ -2,13 +2,13 @@
 
 Gem::Specification.new do |s|
   s.name = %q{rest-core}
-  s.version = "0.0.1"
+  s.version = "0.2.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = [
   %q{Cardinal Blue},
   %q{Lin Jen-Shin (godfat)}]
-  s.date = %q{2011-08-16}
+  s.date = %q{2011-08-24}
   s.description = %q{A modular Ruby REST client collection/infrastructure.
 
 In this era of web services and mashups, we have seen a blooming of REST
@@ -25,11 +25,6 @@ for any other REST APIs.
 [rest-core]: http://github.com/cardinalblue/rest-core
 [rest-graph]: http://github.com/cardinalblue/rest-graph}
   s.email = [%q{dev (XD) cardinalblue.com}]
-  s.extra_rdoc_files = [
-  %q{CONTRIBUTORS},
-  %q{LICENSE},
-  %q{TODO.md},
-  %q{CONTRIBUTORS}]
   s.files = [
   %q{.gitignore},
   %q{.gitmodules},
@@ -38,12 +33,13 @@ for any other REST APIs.
   %q{Gemfile},
   %q{LICENSE},
   %q{NOTE.md},
-  %q{README},
   %q{README.md},
   %q{Rakefile},
   %q{TODO.md},
   %q{example/facebook.rb},
   %q{example/github.rb},
+  %q{example/linkedin.rb},
+  %q{example/twitter.rb},
   %q{lib/rest-core.rb},
   %q{lib/rest-core/app/ask.rb},
   %q{lib/rest-core/app/rest-client.rb},
@@ -69,55 +65,48 @@ for any other REST APIs.
   %q{lib/rest-core/middleware/oauth1_header.rb},
   %q{lib/rest-core/middleware/oauth2_query.rb},
   %q{lib/rest-core/middleware/timeout.rb},
+  %q{lib/rest-core/util/config.rb},
   %q{lib/rest-core/util/hmac.rb},
   %q{lib/rest-core/version.rb},
   %q{lib/rest-core/wrapper.rb},
-  %q{lib/rest-graph/config_util.rb},
+  %q{pending/test_multi.rb},
+  %q{pending/test_test_util.rb},
   %q{rest-core.gemspec},
   %q{task/.gitignore},
   %q{task/gemgem.rb},
   %q{test/common.rb},
-  %q{test/config/rest-graph.yaml},
-  %q{test/pending/test_load_config.rb},
-  %q{test/pending/test_multi.rb},
-  %q{test/pending/test_test_util.rb},
+  %q{test/config/rest-core.yaml},
   %q{test/test_api.rb},
   %q{test/test_cache.rb},
   %q{test/test_default.rb},
   %q{test/test_error.rb},
   %q{test/test_handler.rb},
+  %q{test/test_load_config.rb},
   %q{test/test_misc.rb},
   %q{test/test_oauth.rb},
   %q{test/test_oauth1_header.rb},
   %q{test/test_old.rb},
   %q{test/test_page.rb},
   %q{test/test_parse.rb},
-  %q{test/test_rest-graph.rb},
   %q{test/test_serialize.rb},
   %q{test/test_timeout.rb}]
   s.homepage = %q{https://github.com/cardinalblue/rest-core}
-  s.rdoc_options = [
-  %q{--main},
-  %q{README}]
   s.require_paths = [%q{lib}]
   s.rubygems_version = %q{1.8.7}
   s.summary = %q{A modular Ruby REST client collection/infrastructure.}
   s.test_files = [
-  %q{test/pending/test_load_config.rb},
-  %q{test/pending/test_multi.rb},
-  %q{test/pending/test_test_util.rb},
   %q{test/test_api.rb},
   %q{test/test_cache.rb},
   %q{test/test_default.rb},
   %q{test/test_error.rb},
   %q{test/test_handler.rb},
+  %q{test/test_load_config.rb},
   %q{test/test_misc.rb},
   %q{test/test_oauth.rb},
   %q{test/test_oauth1_header.rb},
   %q{test/test_old.rb},
   %q{test/test_page.rb},
   %q{test/test_parse.rb},
-  %q{test/test_rest-graph.rb},
   %q{test/test_serialize.rb},
   %q{test/test_timeout.rb}]
 

data/task/gemgem.rb

@@ -12,17 +12,13 @@ module Gemgem
       s.authors     = ['Lin Jen-Shin (godfat)']
       s.email       = ['godfat (XD) godfat.org']
 
-      description   = File.read("#{Gemgem.dir}/README").
+      description   = readme.
                       match(/DESCRIPTION:\n\n(.+?)(?=\n\n[^\n]+:\n)/m)[1].
                       lines.to_a
 
       s.description = description.join
       s.summary     = description.first
 
-      s.extra_rdoc_files = %w[CHANGES    TODO    CONTRIBUTORS LICENSE
-                              CHANGES.md TODO.md CONTRIBUTORS].select{ |f|
-                             File.exist?(f) }
-      s.rdoc_options     = %w[--main README]
       s.rubygems_version = Gem::VERSION
       s.date             = Time.now.strftime('%Y-%m-%d')
       s.files            = gem_files
@@ -34,6 +30,17 @@ module Gemgem
     spec
   end
 
+  def readme
+    path = %w[README.md README].find{ |name|
+      File.exist?("#{Gemgem.dir}/#{name}")
+    }
+    if path
+      File.read(path)
+    else
+      "DESCRIPTION:\n\n \n\nEND:\n"
+    end
+  end
+
   def gem_tag
     "#{spec.name}-#{spec.version}"
   end
@@ -153,7 +160,7 @@ task :test do
   Bacon.extend(Bacon::TestUnitOutput)
   Bacon.summary_on_exit
   $LOAD_PATH.unshift('lib')
-  Dir['test/**/test_*.rb'].each{ |file| load file }
+  Dir['./test/**/test_*.rb'].each{ |file| require file[0..-4] }
 end
 
 desc 'Run tests with shell'

data/test/test_load_config.rb

@@ -0,0 +1,42 @@
+
+if respond_to?(:require_relative, true)
+  require_relative 'common'
+else
+  require File.dirname(__FILE__) + '/common'
+end
+
+require 'rest-core/util/config'
+::Rails = Object.new
+
+describe RestCore::Config do
+
+  before do
+    @klass = RestGraph.dup
+  end
+
+  after do
+    RR.verify
+  end
+
+  def check
+    @klass.default_app_id     .should == 41829
+    @klass.default_secret     .should == 'r41829'.reverse
+    @klass.default_auto_decode.should == false
+    @klass.default_lang       .should == 'zh-tw'
+  end
+
+  should 'honor rails config' do
+    mock(Rails).env { 'test' }
+    mock(Rails).root{ File.dirname(__FILE__) }
+    RestCore::Config.load_for_rails(@klass)
+    check
+  end
+
+  should 'honor config' do
+    RestCore::Config.load(
+      @klass,
+      "#{File.dirname(__FILE__)}/config/rest-core.yaml",
+      'test')
+    check
+  end
+end

data/test/test_oauth1_header.rb

@@ -39,6 +39,19 @@ describe RestCore::Oauth1Header do
       'oauth_version%3D1.0')
   end
 
+  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(
+      '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' \
+      '11%26oauth_consumer_key%3DGDdmIQH6jhtmLUypg82g%26oauth_nonc' \
+      'e%3DQP70eNmVz8jvdPevU3oJD2AfF7R7odC2XJcn4XlZJqk%26oauth_sig' \
+      'nature_method%3DHMAC-SHA1%26oauth_timestamp%3D1272323042%26' \
+      'oauth_version%3D1.0')
+  end
+
   should 'have correct signature' do
     @auth.signature(@env, @oauth_params).should.equal(
       '8wUi7m5HFQy76nowoCThusfgB+Q=')

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rest-core
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -10,11 +10,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-08-16 00:00:00.000000000Z
+date: 2011-08-24 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client
-  requirement: &2153518960 !ruby/object:Gem::Requirement
+  requirement: &2168876060 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -22,10 +22,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2153518960
+  version_requirements: *2168876060
 - !ruby/object:Gem::Dependency
   name: rack
-  requirement: &2153518480 !ruby/object:Gem::Requirement
+  requirement: &2168875580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -33,10 +33,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2153518480
+  version_requirements: *2168875580
 - !ruby/object:Gem::Dependency
   name: yajl-ruby
-  requirement: &2153518000 !ruby/object:Gem::Requirement
+  requirement: &2168875100 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -44,10 +44,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2153518000
+  version_requirements: *2168875100
 - !ruby/object:Gem::Dependency
   name: json
-  requirement: &2153517520 !ruby/object:Gem::Requirement
+  requirement: &2168874620 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -55,10 +55,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2153517520
+  version_requirements: *2168874620
 - !ruby/object:Gem::Dependency
   name: json_pure
-  requirement: &2153517040 !ruby/object:Gem::Requirement
+  requirement: &2168874140 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -66,10 +66,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2153517040
+  version_requirements: *2168874140
 - !ruby/object:Gem::Dependency
   name: ruby-hmac
-  requirement: &2153516560 !ruby/object:Gem::Requirement
+  requirement: &2168873660 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -77,10 +77,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2153516560
+  version_requirements: *2168873660
 - !ruby/object:Gem::Dependency
   name: webmock
-  requirement: &2153516080 !ruby/object:Gem::Requirement
+  requirement: &2168873180 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -88,10 +88,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2153516080
+  version_requirements: *2168873180
 - !ruby/object:Gem::Dependency
   name: bacon
-  requirement: &2153515600 !ruby/object:Gem::Requirement
+  requirement: &2168906220 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -99,10 +99,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2153515600
+  version_requirements: *2168906220
 - !ruby/object:Gem::Dependency
   name: rr
-  requirement: &2153515120 !ruby/object:Gem::Requirement
+  requirement: &2168905740 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -110,10 +110,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2153515120
+  version_requirements: *2168905740
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &2153514640 !ruby/object:Gem::Requirement
+  requirement: &2168905260 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -121,7 +121,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2153514640
+  version_requirements: *2168905260
 description: ! 'A modular Ruby REST client collection/infrastructure.
 
 
@@ -152,10 +152,7 @@ email:
 - dev (XD) cardinalblue.com
 executables: []
 extensions: []
-extra_rdoc_files:
-- CONTRIBUTORS
-- LICENSE
-- TODO.md
+extra_rdoc_files: []
 files:
 - .gitignore
 - .gitmodules
@@ -164,12 +161,13 @@ files:
 - Gemfile
 - LICENSE
 - NOTE.md
-- README
 - README.md
 - Rakefile
 - TODO.md
 - example/facebook.rb
 - example/github.rb
+- example/linkedin.rb
+- example/twitter.rb
 - lib/rest-core.rb
 - lib/rest-core/app/ask.rb
 - lib/rest-core/app/rest-client.rb
@@ -195,38 +193,35 @@ files:
 - lib/rest-core/middleware/oauth1_header.rb
 - lib/rest-core/middleware/oauth2_query.rb
 - lib/rest-core/middleware/timeout.rb
+- lib/rest-core/util/config.rb
 - lib/rest-core/util/hmac.rb
 - lib/rest-core/version.rb
 - lib/rest-core/wrapper.rb
-- lib/rest-graph/config_util.rb
+- pending/test_multi.rb
+- pending/test_test_util.rb
 - rest-core.gemspec
 - task/.gitignore
 - task/gemgem.rb
 - test/common.rb
-- test/config/rest-graph.yaml
-- test/pending/test_load_config.rb
-- test/pending/test_multi.rb
-- test/pending/test_test_util.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/test_oauth1_header.rb
 - test/test_old.rb
 - test/test_page.rb
 - test/test_parse.rb
-- test/test_rest-graph.rb
 - test/test_serialize.rb
 - test/test_timeout.rb
 homepage: https://github.com/cardinalblue/rest-core
 licenses: []
 post_install_message: 
-rdoc_options:
-- --main
-- README
+rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
@@ -248,20 +243,17 @@ signing_key:
 specification_version: 3
 summary: A modular Ruby REST client collection/infrastructure.
 test_files:
-- test/pending/test_load_config.rb
-- test/pending/test_multi.rb
-- test/pending/test_test_util.rb
 - 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/test_oauth1_header.rb
 - test/test_old.rb
 - test/test_page.rb
 - test/test_parse.rb
-- test/test_rest-graph.rb
 - test/test_serialize.rb
 - test/test_timeout.rb

data/README

@@ -1,83 +0,0 @@
-# rest-core [![Build Status](http://travis-ci.org/godfat/rest-core.png)](http://travis-ci.org/godfat/rest-core)
-by Cardinal Blue <http://cardinalblue.com>
-
-## LINKS:
-
-* [github](https://github.com/cardinalblue/rest-core)
-* [rubygems](http://rubygems.org/gems/rest-core)
-* [rdoc](http://rdoc.info/projects/cardinalblue/rest-core)
-* [mailing list](http://groups.google.com/group/rest-core/topics)
-
-## DESCRIPTION:
-
-A modular Ruby REST client collection/infrastructure.
-
-In this era of web services and mashups, we have seen a blooming of REST
-APIs. One might wonder, how do we use these APIs easily and elegantly?
-Since REST is very simple compared to SOAP, it is not hard to build a
-dedicated client ourselves.
-
-We have developed [rest-core][] with composable middlewares to build a
-REST client, based on the effort from [rest-graph][]. In the cases of
-common APIs such as Facebook, Github, and Twitter, developers can simply
-use the built-in dedicated clients provided by rest-core, or do it yourself
-for any other REST APIs.
-
-[rest-core]: http://github.com/cardinalblue/rest-core
-[rest-graph]: http://github.com/cardinalblue/rest-graph
-
-## REQUIREMENTS:
-
-* Tested with MRI (official ruby) 1.9.2, 1.8.7, and trunk
-* Tested with Rubinius (rbx) 1.2.3
-* Tested with JRuby 1.6.2
-
-## INSTALLATION:
-
-    gem install rest-core
-
-Or if you want development version, put this in Gemfile:
-
-    gem 'rest-core', :git => 'git://github.com/cardinalblue/rest-core.git'
-
-## EXAMPLE:
-
-    RestCore::Builder.client('YourClient') do
-      use DefaultSite , 'https://api.github.com/users/'
-      use JsonDecode  , true
-      use CommonLogger, method(:puts)
-      use Cache       , {}, nil
-      run RestClient
-    end
-
-    client = YourClient.new
-    client.get('godfat')
-    client.get('godfat')
-
-    client.site = 'http://github.com/api/v2/json/user/show/'
-    client.get('godfat')
-    client.get('godfat')
-
-See [example][] for more complex examples, and [build-in clients][] for even
-more complex examples.
-
-[example]: https://github.com/cardinalblue/rest-core/tree/master/example
-[build-in clients]: https://github.com/cardinalblue/rest-core/tree/master/lib/rest-core/client
-
-## LICENSE:
-
-  Apache License 2.0
-
-  Copyright (c) 2011, Cardinal Blue
-
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-
-     <http://www.apache.org/licenses/LICENSE-2.0>
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.

data/lib/rest-graph/config_util.rb

@@ -1,43 +0,0 @@
-
-require 'erb'
-require 'yaml'
-
-require 'rest-graph/core'
-
-module RestGraph::ConfigUtil
-  extend self
-
-  def load_config_for_all
-    RestGraph::ConfigUtil.load_config_for_rails if
-      Object.const_defined?(:Rails)
-  end
-
-  def load_config_for_rails app=Rails
-    root = app.root
-    file = ["#{root}/config/rest-graph.yaml", # YAML should use .yaml
-            "#{root}/config/rest-graph.yml"].find{|path| File.exist?(path)}
-    return unless file
-
-    RestGraph::ConfigUtil.load_config(file, Rails.env)
-  end
-
-  def load_config file, env
-    config   = YAML.load(ERB.new(File.read(file)).result(binding))
-    defaults = config[env]
-    return unless defaults
-
-    mod = Module.new
-    mod.module_eval(defaults.inject([]){ |r, (k, v)|
-      # quote strings, leave others free (e.g. false, numbers, etc)
-      r << <<-RUBY
-        def default_#{k}
-          #{v.kind_of?(String) ? "'#{v}'" : v}
-        end
-      RUBY
-    }.join, __FILE__, __LINE__)
-
-    RestGraph.send(:extend, mod)
-  end
-end
-
-RestGraph.send(:extend, RestGraph::ConfigUtil)

data/test/pending/test_load_config.rb

@@ -1,42 +0,0 @@
-
-if respond_to?(:require_relative, true)
-  require_relative 'common'
-else
-  require File.dirname(__FILE__) + '/common'
-end
-
-require 'rest-graph/config_util'
-
-describe RestGraph::ConfigUtil do
-
-  after do
-    RR.verify
-  end
-
-  should 'honor rails config' do
-    ::Rails = Object.new
-    mock(Rails).env { 'test' }.times(2)
-    mock(Rails).root{ File.dirname(__FILE__) }.times(2)
-
-    check = lambda{
-      RestGraph.default_app_id.should ==   41829
-      RestGraph.default_secret.should == 'r41829'.reverse
-      RestGraph.default_auto_decode.should == false
-      RestGraph.default_lang.should        == 'zh-tw'
-    }
-
-    [RestGraph::ConfigUtil, RestGraph].each{ |const|
-      TestHelper.ensure_rollback{
-        const.load_config_for_rails
-        check.call
-      }
-
-      TestHelper.ensure_rollback{
-        const.load_config(
-          "#{File.dirname(__FILE__)}/config/rest-graph.yaml",
-          'test')
-        check.call
-      }
-    }
-  end
-end

data/test/test_rest-graph.rb

@@ -1,10 +0,0 @@
-
-$LOAD_PATH << File.dirname(__FILE__)
-$LOAD_PATH.uniq!
-
-Dir["#{File.dirname(__FILE__)}/*.rb"].each{ |file|
-  next if file == __FILE__
-  next if ARGV.map{ |path| File.expand_path(path)
-                }.include?(File.expand_path(file))
-  require File.basename(file).sub(/\..+$/, '')
-}