rest-more 2.0.4 → 3.0.0

data/Rakefile

@@ -1,34 +1,23 @@
-# encoding: utf-8
 
 begin
   require "#{dir = File.dirname(__FILE__)}/task/gemgem"
 rescue LoadError
-  sh "git submodule update --init"
-  exec Gem.ruby, "-S", "rake", *ARGV
+  sh 'git submodule update --init'
+  exec Gem.ruby, '-S', $PROGRAM_NAME, *ARGV
 end
 
-Gemgem.dir = dir
-($LOAD_PATH << File.expand_path("#{Gemgem.dir}/lib" ) <<
-               File.expand_path("#{Gemgem.dir}/rest-core/lib")).uniq!
+$LOAD_PATH.unshift(File.expand_path("#{dir}/rest-core/lib"))
 
-desc 'Generate gemspec'
-task 'gem:spec' do
-  Gemgem.spec = Gemgem.create do |s|
-    require 'rest-more/version'
-    s.name     = 'rest-more'
-    s.version  = RestMore::VERSION
-    s.homepage = 'https://github.com/cardinalblue/rest-more'
+Gemgem.init(dir) do |s|
+  require 'rest-more/version'
+  s.name     = 'rest-more'
+  s.version  = RestMore::VERSION
+  s.homepage = 'https://github.com/godfat/rest-more'
 
-    %w[rest-core].each{ |g| s.add_runtime_dependency(g, '>=2.0.3') }
+  %w[rest-core].each{ |g| s.add_runtime_dependency(g, '>=3.0.0') }
 
-    s.authors  = ['Cardinal Blue', 'Lin Jen-Shin (godfat)']
-    s.email    = ['dev (XD) cardinalblue.com']
-
-    # exclude rest-core
-    s.files.reject!{ |f| f.start_with?('rest-core/') }
-  end
-
-  Gemgem.write
+  # exclude rest-core
+  s.files.reject!{ |f| f.start_with?('rest-core/') }
 end
 
 module Gemgem

data/doc/{tutorial/facebook.md → facebook.md}

@@ -170,4 +170,4 @@
 
     That's it!
 
-15. More information on customizing rest-more and its functions are to be found here: <https://github.com/cardinalblue/rest-more>
+15. More information on customizing rest-more and its functions are to be found here: <https://github.com/godfat/rest-more>

data/example/multi.rb

@@ -2,16 +2,16 @@
 require 'rest-more'
 
 facebook = RC::Facebook.new(:log_method => method(:puts))
-puts "rest-client with threads doing concurrent requests"
+puts "httpclient with threads doing concurrent requests"
 a = [facebook.get('4'), facebook.get('5')]
 puts "It's not blocking... but doing concurrent requests underneath"
 p a.map{ |r| r['name'] } # here we want the values, so it blocks here
 puts "DONE"
 
 puts "callback also works"
-facebook.get('6'){ |r|
+facebook.get('6') do |r|
   p r['name']
-}
+end
 puts "It's not blocking... but doing concurrent requests underneath"
 facebook.wait # we block here to wait for the request done
 puts "DONE"

data/example/rails3/Gemfile

@@ -1,22 +1,32 @@
 
-source 'http://rubygems.org'
+source 'https://rubygems.org/'
 
-gem 'rails', '3.2.13'
+gem 'rails', '3.2.16'
 
-gem 'rest-client' # for rest-core
 gem 'rest-core', :path => '../../rest-core'
 gem 'rest-more', :path => '../../'
 
-group 'test' do
-  gem 'rr'
+group :test do
+  gem 'muack'
   gem 'webmock'
 end
 
-platforms(:ruby) do
+platforms :ruby do
   gem 'yajl-ruby'
-  gem 'psych' # why?
 end
 
-platforms(:jruby) do
+platforms :jruby do
   gem 'jruby-openssl'
 end
+
+platforms :rbx do
+  gem 'rubysl-fiber'      # used in rest-core
+  gem 'rubysl-weakref'    # used in rest-core
+  gem 'rubysl-singleton'  # used in rake
+  gem 'rubysl-rexml'      # used in crack used in webmock
+  gem 'rubysl-bigdecimal' # used in crack used in webmock
+  gem 'rubysl-test-unit'  # used in activesupport
+  gem 'rubysl-enumerator' # used in activesupport
+  gem 'rubysl-benchmark'  # used in activesupport
+  gem 'racc'              # used in journey used in actionpack
+end

data/example/rails3/app/controllers/application_controller.rb

@@ -41,11 +41,8 @@ class ApplicationController < ActionController::Base
     url = rc_facebook.url('cache')
     rc_facebook.get('cache').tap{}
     rc_facebook.get('cache').tap{}
-    key = RC::Cache.new(nil, nil, nil).cache_key(
-      rc_facebook.dry.call(
-        RC::REQUEST_METHOD => :get,
-        RC::REQUEST_PATH   => rc_facebook.url('cache'),
-        &RC::Middleware.id))
+    res = rc_facebook.request_full(RC::REQUEST_PATH => url)
+    key = RC::Cache.new(nil, nil, nil).cache_key(res)
     render :text => Rails.cache.read(key)
   end
 

data/example/rails3/config/application.rb

@@ -15,7 +15,7 @@ module Rails3
 
     logger = Logger.new($stdout)
     logger.level = Logger::INFO
-    config.logger = logger
+    config.logger = logger if $DEBUG
 
     # Configure sensitive parameters which will be filtered from the log file.
     config.filter_parameters += [:password]

data/example/rails3/test/functional/application_controller_test.rb

@@ -1,14 +1,7 @@
 
 require 'test_helper'
-require 'webmock'
-require 'rr'
-
-WebMock.disable_net_connect!
 
 class ApplicationControllerTest < ActionController::TestCase
-  include WebMock::API
-  include RR::Adapters::TestUnit
-
   def setup
     body = rand(2) == 0 ? '{"error":{"type":"OAuthException"}}' :
                           '{"error_code":104}'
@@ -17,11 +10,6 @@ class ApplicationControllerTest < ActionController::TestCase
       to_return(:body => body)
   end
 
-  def teardown
-    RR.verify
-    WebMock.reset!
-  end
-
   def assert_url expected
     assert_equal(expected, normalize_url(assigns(:rc_facebook_authorize_url)))
     if @response.status == 200 # js redirect

data/example/rails3/test/test_helper.rb

@@ -1,13 +1,20 @@
 
 ENV["RAILS_ENV"] = "test"
 require File.expand_path('../../config/environment', __FILE__)
-begin
-  require 'rails/test_help'
-rescue LoadError # for rails2
-  require 'test_help'
-end
+require 'rails/test_help'
+require 'webmock'
+WebMock.disable_net_connect!
+require 'muack'
 
 class ActiveSupport::TestCase
+  include WebMock::API
+  include Muack::API
+
+  teardown do
+    WebMock.reset!
+    Muack.verify
+  end
+
   def normalize_query query, amp='&'
     '?' + query[1..-1].split(amp).sort.join(amp)
   end

data/example/rails3/test/unit/rails_util_test.rb

@@ -1,10 +1,7 @@
 
 require 'test_helper'
-require 'rr'
 
 class RailsUtilTest < ActiveSupport::TestCase
-  include RR::Adapters::TestUnit
-
   def setup_mock url
     @controller = Class.new do
       def self.helper      dummy   ; end
@@ -12,9 +9,7 @@ class RailsUtilTest < ActiveSupport::TestCase
       include RestCore::Facebook::RailsUtil
     end.new
     mock(@controller).rc_facebook_in_canvas?{ false }
-    mock(@controller).request{
-      mock(Object.new).url{ url }
-    }
+    mock(@controller).request{ mock.url{ url }.object }
   end
 
   def test_rest_graph_normalized_request_uri_0

data/example/simple.rb

@@ -1,8 +1,8 @@
 
 require 'rest-more'
 
-p RC::Twitter.new.statuses('_cardinalblue').first # get user tweets
+p RC::Twitter.new.statuses('godfat').first # get user tweets
 puts
-p RC::Github.new.get('users/cardinalblue')        # get user info
+p RC::Github.new.get('users/godfat')       # get user info
 puts
 p RC::Facebook.new.get('4') # get user info

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

@@ -0,0 +1,50 @@
+
+require 'rest-core'
+
+# https://www.firebase.com/docs/security/custom-login.html
+# https://www.firebase.com/docs/rest-api.html
+module RestCore
+  Firebase = Builder.client(:d, :secret, :auth) do
+    use Timeout       , 10
+
+    use DefaultSite   , 'https://SampleChat.firebaseIO-demo.com/'
+    use DefaultHeaders, {'Accept' => 'application/json'}
+    use DefaultQuery  , nil
+
+    use CommonLogger  , nil
+    use Cache         , nil, 600 do
+      use ErrorHandler, lambda{ |env|
+        RuntimeError.new(env[RESPONSE_BODY]['message'])}
+      use ErrorDetectorHttp
+      use JsonResponse, true
+    end
+  end
+end
+
+module RestCore::Firebase::Client
+  include RestCore
+
+  def generate_auth opts={}
+    header = {:typ => 'JWT', :alg => 'HS256'}
+    claims = {:v => 0, :iat => Time.now.to_i, :d => d}.merge(opts)
+    # http://tools.ietf.org/html/draft-ietf-jose-json-web-signature-26
+    input = [header, claims].map{ |d| base64url(Json.encode(d)) }.join('.')
+    # http://tools.ietf.org/html/draft-ietf-oauth-json-web-token-20
+    "#{input}.#{base64url(Hmac.sha256(secret, input))}"
+  end
+
+  def request env, key=RESPONSE_BODY, app=app
+    super(env.merge(REQUEST_PATH    => "#{env[REQUEST_PATH]}.json",
+                    REQUEST_PAYLOAD => Json.encode(env[REQUEST_PAYLOAD])),
+          key, app)
+  end
+
+  private
+  def base64url str; [str].pack('m').tr('+/', '-_'); end
+  def default_query; {:auth => auth}; end
+  def default_auth ; generate_auth  ; end
+end
+
+class RestCore::Firebase
+  include RestCore::Firebase::Client
+end

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

@@ -0,0 +1,59 @@
+
+require 'rest-core'
+
+# http://instagram.com/developer/
+module RestCore
+  Instagram = Builder.client(:client_id, :client_secret, :data) do
+    use Timeout       , 10
+
+    use DefaultSite   , 'https://api.instagram.com/'
+    use DefaultHeaders, {'Accept' => 'application/json'}
+    use DefaultQuery  , nil
+    use Oauth2Query   , nil
+
+    use CommonLogger  , nil
+    use Cache         , nil, 600 do
+      use ErrorHandler, lambda{ |env| RuntimeError.new(env[RESPONSE_BODY])}
+      use ErrorDetectorHttp
+      use JsonResponse, true
+    end
+  end
+end
+
+module RestCore::Instagram::Client
+  include RestCore
+
+  def me query={}, opts={}
+    get('v1/users/self', query, opts)
+  end
+
+  def access_token
+    data['access_token']
+  end
+
+  def access_token= token
+    data['access_token'] = token
+  end
+
+  def authorize_url query={}, opts={}
+    url('oauth/authorize', {:access_token  => false,
+                            :response_type => 'code'}.merge(query), opts)
+  end
+
+  def authorize! payload={}, opts={}
+    p = {:client_id  => client_id, :client_secret => client_secret,
+         :grant_type => 'authorization_code'                      }.
+         merge(payload)
+
+    self.data = post('oauth/access_token', p, {:access_token => false,
+                                               :client_id    => false}, opts)
+  end
+
+  private
+  def default_data ;                        {}; end
+  def default_query; {:client_id => client_id}; end
+end
+
+class RestCore::Instagram
+  include RestCore::Instagram::Client
+end

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

@@ -30,10 +30,6 @@ module RestCore::Linkedin::Client
   def me query={}, opts={}
     get('v1/people/~', query, opts)
   end
-
-  def authorize_url
-    url(authorize_path, :oauth_token => oauth_token, :format => false)
-  end
 end
 
 class RestCore::Linkedin

data/lib/rest-more.rb

@@ -2,11 +2,13 @@
 require 'rest-core'
 
 module RestCore
-  autoload :Config  , 'rest-core/util/config'
+  autoload :Config   , 'rest-core/util/config'
 
-  autoload :Dropbox , 'rest-core/client/dropbox'
-  autoload :Facebook, 'rest-core/client/facebook'
-  autoload :Github  , 'rest-core/client/github'
-  autoload :Linkedin, 'rest-core/client/linkedin'
-  autoload :Twitter , 'rest-core/client/twitter'
+  autoload :Dropbox  , 'rest-core/client/dropbox'
+  autoload :Facebook , 'rest-core/client/facebook'
+  autoload :Firebase , 'rest-core/client/firebase'
+  autoload :Github   , 'rest-core/client/github'
+  autoload :Instagram, 'rest-core/client/instagram'
+  autoload :Linkedin , 'rest-core/client/linkedin'
+  autoload :Twitter  , 'rest-core/client/twitter'
 end

data/lib/rest-more/test.rb

@@ -1,14 +1,3 @@
 
 require 'rest-core/test'
 require 'rest-more'
-
-module TestHelper
-  module_function
-  def normalize_query query
-    '?' + query[1..-1].split('&').sort.join('&')
-  end
-
-  def normalize_url url
-    url.sub(/\?.+/){ |query| TestHelper.normalize_query(query) }
-  end
-end

data/lib/rest-more/version.rb

@@ -1,4 +1,4 @@
 
 module RestMore
-  VERSION = '2.0.4'
+  VERSION = '3.0.0'
 end

data/rest-more.gemspec

@@ -1,16 +1,16 @@
 # -*- encoding: utf-8 -*-
+# stub: rest-more 3.0.0 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "rest-more"
-  s.version = "2.0.4"
+  s.version = "3.0.0"
 
   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 = "2013-04-13"
-  s.description = "Various REST clients such as Facebook and Twitter built with [rest-core][]\n\n[rest-core]: https://github.com/cardinalblue/rest-core"
-  s.email = ["dev (XD) cardinalblue.com"]
+  s.require_paths = ["lib"]
+  s.authors = ["Lin Jen-Shin (godfat)"]
+  s.date = "2014-05-04"
+  s.description = "Various REST clients such as Facebook and Twitter built with [rest-core][].\n\n[rest-core]: https://github.com/godfat/rest-core"
+  s.email = ["godfat (XD) godfat.org"]
   s.executables = ["rib-rest-core"]
   s.files = [
   ".gitignore",
@@ -23,7 +23,7 @@ Gem::Specification.new do |s|
   "Rakefile",
   "TODO.md",
   "bin/rib-rest-core",
-  "doc/tutorial/facebook.md",
+  "doc/facebook.md",
   "example/multi.rb",
   "example/rails3/Gemfile",
   "example/rails3/README",
@@ -44,14 +44,15 @@ Gem::Specification.new do |s|
   "example/rails3/test/functional/application_controller_test.rb",
   "example/rails3/test/test_helper.rb",
   "example/rails3/test/unit/rails_util_test.rb",
-  "example/rainbows.rb",
   "example/simple.rb",
   "example/sinatra/config.ru",
   "lib/rest-core/client/dropbox.rb",
   "lib/rest-core/client/facebook.rb",
   "lib/rest-core/client/facebook/rails_util.rb",
+  "lib/rest-core/client/firebase.rb",
   "lib/rest-core/client/github.rb",
   "lib/rest-core/client/github/rails_util.rb",
+  "lib/rest-core/client/instagram.rb",
   "lib/rest-core/client/linkedin.rb",
   "lib/rest-core/client/linkedin/rails_util.rb",
   "lib/rest-core/client/twitter.rb",
@@ -63,7 +64,7 @@ Gem::Specification.new do |s|
   "lib/rest-more/version.rb",
   "lib/rib/app/rest-core.rb",
   "rest-more.gemspec",
-  "task/.gitignore",
+  "task/README.md",
   "task/gemgem.rb",
   "test/dropbox/test_api.rb",
   "test/facebook/config/rest-core.yaml",
@@ -79,11 +80,12 @@ Gem::Specification.new do |s|
   "test/facebook/test_parse.rb",
   "test/facebook/test_serialize.rb",
   "test/facebook/test_timeout.rb",
+  "test/instagram/test_api.rb",
   "test/twitter/test_api.rb"]
-  s.homepage = "https://github.com/cardinalblue/rest-more"
-  s.require_paths = ["lib"]
-  s.rubygems_version = "2.0.0"
-  s.summary = "Various REST clients such as Facebook and Twitter built with [rest-core][]"
+  s.homepage = "https://github.com/godfat/rest-more"
+  s.licenses = ["Apache License 2.0"]
+  s.rubygems_version = "2.2.2"
+  s.summary = "Various REST clients such as Facebook and Twitter built with [rest-core][]."
   s.test_files = [
   "test/dropbox/test_api.rb",
   "test/facebook/test_api.rb",
@@ -98,17 +100,18 @@ Gem::Specification.new do |s|
   "test/facebook/test_parse.rb",
   "test/facebook/test_serialize.rb",
   "test/facebook/test_timeout.rb",
+  "test/instagram/test_api.rb",
   "test/twitter/test_api.rb"]
 
   if s.respond_to? :specification_version then
     s.specification_version = 4
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<rest-core>, [">= 2.0.3"])
+      s.add_runtime_dependency(%q<rest-core>, [">= 3.0.0"])
     else
-      s.add_dependency(%q<rest-core>, [">= 2.0.3"])
+      s.add_dependency(%q<rest-core>, [">= 3.0.0"])
     end
   else
-    s.add_dependency(%q<rest-core>, [">= 2.0.3"])
+    s.add_dependency(%q<rest-core>, [">= 3.0.0"])
   end
 end