rest-more 2.0.4 → 3.0.0

data/test/dropbox/test_api.rb

@@ -4,7 +4,7 @@ require 'rest-more/test'
 describe RC::Dropbox do
   after do
     WebMock.reset!
-    RR.verify
+    Muack.verify
   end
 
   should 'get right' do

data/test/facebook/test_api.rb

@@ -4,13 +4,12 @@ require 'rest-more/test'
 describe RC::Facebook do
   after do
     WebMock.reset!
-    RR.verify
+    Muack.verify
   end
 
   should 'generate correct url' do
-    TestHelper.normalize_url(
     RC::Facebook.new(:access_token => 'awesome').
-      url('path', :query => 'str')).should.eq \
+      url('path', :query => 'str').should.eq \
       'https://graph.facebook.com/path?access_token=awesome&query=str'
   end
 
@@ -18,8 +17,8 @@ describe RC::Facebook do
     stub_request(:get, 'http://nothing.godfat.org/me').with(
       :headers => {'Accept'          => 'text/plain',
                    'Accept-Language' => 'zh-tw',
-                   'Accept-Encoding' => 'gzip, deflate', # this is by ruby
-                   'User-Agent'      => 'Ruby'           # this is by ruby
+                   'Accept-Encoding' => /^gzip, ?deflate$/, # this is by ruby
+                   'User-Agent'      => 'Ruby'              # this is by ruby
                   }).to_return(:body => '{"data": []}')
 
     RC::Facebook.new(:site   => 'http://nothing.godfat.org/',
@@ -32,8 +31,8 @@ describe RC::Facebook do
     stub_request(:get, 'http://example.com/').with(
       :headers => {'Accept'          => 'application/json',
                    'Accept-Language' => 'en-us',
-                   'Accept-Encoding' => 'gzip, deflate', # this is by ruby
-                   'User-Agent'      => 'Ruby',          # this is by ruby
+                   'Accept-Encoding' => /^gzip, ?deflate$/, # this is by ruby
+                   'User-Agent'      => 'Ruby',             # this is by ruby
                    'X-Forwarded-For' => '127.0.0.1',
                   }).to_return(:body => '{"data": []}')
 

data/test/facebook/test_error.rb

@@ -4,7 +4,7 @@ require 'rest-more/test'
 describe RC::Facebook::Error do
   after do
     WebMock.reset!
-    RR.verify
+    Muack.verify
   end
 
   should 'have the right ancestors' do

data/test/facebook/test_handler.rb

@@ -4,7 +4,7 @@ require 'rest-more/test'
 describe RC::Facebook do
   after do
     WebMock.reset!
-    RR.verify
+    Muack.verify
   end
 
   describe 'log method' do
@@ -16,7 +16,7 @@ describe RC::Facebook do
       rg = RC::Facebook.new(:log_method => lambda{ |s| logger << [s] })
       rg.get('me').tap{}
 
-      logger.size.should.eq 3 # Auto + Future + Requested
+      logger.size.should.eq 1
     end
   end
 

data/test/facebook/test_load_config.rb

@@ -10,7 +10,7 @@ describe RC::Config do
   end
 
   after do
-    RR.verify
+    Muack.verify
   end
 
   def check

data/test/facebook/test_misc.rb

@@ -4,7 +4,7 @@ require 'rest-more/test'
 describe RC::Facebook do
   after do
     WebMock.reset!
-    RR.verify
+    Muack.verify
   end
 
   should 'return true in authorized? if there is an access_token' do
@@ -31,30 +31,20 @@ describe RC::Facebook do
     }
   end
 
-  should 'build empty query string' do
-    # TODO: WTF is this trying to test!?
-    rg = RC::Facebook.new
-    rg.dry.call(rg.send(:build_env)){ |res|
-      (res[RC::REQUEST_QUERY] || {}).should.eq({})
-    }
-  end
-
   should 'create access_token in query string' do
     rg = RC::Facebook.new(:access_token => 'token')
     rg.dry.call(rg.send(:build_env)){ |res|
-      # TODO: WTF is this `|| {}` !?
-      (res[RC::REQUEST_QUERY] || {}).should.eq({'access_token' => 'token'})
+      res[RC::REQUEST_QUERY].should.eq({'access_token' => 'token'})
     }
   end
 
   should 'build correct query string' do
     rg = RC::Facebook.new(:access_token => 'token')
-    TestHelper.normalize_url(rg.url('', :message => 'hi!!')).
+    rg.url('', :message => 'hi!!').
       should.eq "#{rg.site}?access_token=token&message=hi%21%21"
 
     rg.access_token = nil
-    TestHelper.normalize_url(rg.url('', :message => 'hi!!',
-                                        :subject => '(&oh&)')).
+    rg.url('', :message => 'hi!!', :subject => '(&oh&)').
       should.eq "#{rg.site}?message=hi%21%21&subject=%28%26oh%26%29"
   end
 

data/test/facebook/test_oauth.rb

@@ -12,7 +12,7 @@ describe RC::Facebook do
   end
 
   should 'return correct oauth url' do
-    TestHelper.normalize_url(@rg.authorize_url(:redirect_uri => @uri)).
+    @rg.authorize_url(:redirect_uri => @uri).
     should.eq 'https://www.facebook.com/dialog/oauth?' \
               'client_id=29&redirect_uri=http%3A%2F%2Fzzz.tw'
   end

data/test/facebook/test_old.rb

@@ -4,7 +4,7 @@ require 'rest-more/test'
 describe RC::Facebook do
   after do
     WebMock.reset!
-    RR.verify
+    Muack.verify
   end
 
   should 'do fql query with/without access_token' do

data/test/facebook/test_page.rb

@@ -4,7 +4,7 @@ require 'rest-more/test'
 describe RC::Facebook do
   after do
     WebMock.reset!
-    RR.verify
+    Muack.verify
   end
 
   should 'get the next/prev page' do
@@ -26,9 +26,9 @@ describe RC::Facebook do
       kind = "#{type}_page"
       data = {'paging' => {type => 'zzz'}, 'data' => ['z']}
 
-      f.for_pages(data, -1, {}, kind).should == nil
-      f.for_pages(data,  0, {}, kind).should == nil
-      f.for_pages(data,  1, {}, kind).should == data
+      f.for_pages(data, -1, {}, kind).should.eq nil
+      f.for_pages(data,  0, {}, kind).should.eq nil
+      f.for_pages(data,  1, {}, kind).should.eq data
 
       (2..4).each{ |pages|
         # merge data
@@ -49,7 +49,6 @@ describe RC::Facebook do
   end
 
   should 'for_pages with callback' do
-    t = Thread.current
     f = RC::Facebook.new(:site => '', :cache => false)
     %w[next previous].each{ |type|
       kind = "#{type}_page"

data/test/facebook/test_parse.rb

@@ -134,13 +134,6 @@ describe RC::Facebook do
     end
   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' }
-    RC::Hmac.sha256(key, data).should.eq digest
-  end
-
   should 'generate correct fbs with correct sig' do
     RC::Facebook.new(:access_token => 'fake', :secret => 's').fbs.
       should.eq \

data/test/facebook/test_serialize.rb

@@ -4,7 +4,7 @@ require 'rest-more/test'
 describe RC::Facebook do
   after do
     WebMock.reset!
-    RR.verify
+    Muack.verify
   end
 
   should 'be serialized with lighten' do

data/test/facebook/test_timeout.rb

@@ -4,14 +4,14 @@ require 'rest-more/test'
 describe RC::Facebook do
   after do
     WebMock.reset!
-    RR.verify
+    Muack.verify
   end
 
   should 'respect timeout' do
     stub_request(:get, 'https://graph.facebook.com/me').
       to_return(:body => '{}')
-    any_instance_of(RC::Timeout::TimerThread){ |timer|
-      mock.proxy(timer).on_timeout
+    any_instance_of(RC::Timeout::Timer){ |timer|
+      mock(timer).on_timeout
     }
     RC::Facebook.new.get('me').should.eq({})
   end
@@ -19,7 +19,7 @@ describe RC::Facebook do
   should 'override timeout' do
     stub_request(:get, 'https://graph.facebook.com/me').
       to_return(:body => 'true')
-    mock.proxy(RC::Timeout::TimerThread).new(99, is_a(Timeout::Error))
+    mock(RC::Timeout::Timer).new(99, is_a(Timeout::Error))
     RC::Facebook.new(:timeout => 1).get('me', {}, :timeout => 99).
       should.eq true
   end

data/test/instagram/test_api.rb

@@ -0,0 +1,54 @@
+
+require 'rest-more/test'
+
+describe RC::Instagram do
+  after do
+    WebMock.reset!
+  end
+
+  json = <<-JSON
+    {"meta":{"code":200},
+     "data":[{"username":"restmore",
+              "profile_picture":"http://images.ak.instagram.com/profile.jpg",
+              "full_name":"Rest More", "id":"123"}],
+     "access_token":"A"}
+  JSON
+
+  client = RC::Instagram.new(:client_id => 'Z', :client_secret => 'S',
+                             :access_token => 'X')
+
+  should 'have correct authorize url' do
+    client.authorize_url.should.eq \
+      'https://api.instagram.com/oauth/authorize?' \
+      'client_id=Z&response_type=code'
+  end
+
+  should 'authorize! and get the access token' do
+    stub_request(:post, 'https://api.instagram.com/oauth/access_token').
+      with(:body => {'client_id' => 'Z', 'client_secret' => 'S',
+                     'grant_type' => 'authorization_code', 'code' => 'C'}).
+      to_return(:body => json)
+
+    begin
+      client.authorize!(:code => 'C').should.kind_of?(Hash)
+      client.access_token.            should.eq 'A'
+    ensure
+      client.data = nil
+    end
+  end
+
+  should 'retrieve user profile based on username' do
+    stub_request(:get, 'https://api.instagram.com/v1/users/search?' \
+                       'client_id=Z&q=restmore').
+      to_return(:body => json)
+
+    client.get('v1/users/search', :q => 'restmore').should.eq(
+      {'meta' => {'code' => 200},
+       'data' => [{'username' => 'restmore',
+                   'profile_picture' =>
+                      'http://images.ak.instagram.com/profile.jpg',
+                   'full_name' => 'Rest More',
+                   'id' => '123'}],
+       'access_token' => 'A'})
+  end
+end

data/test/twitter/test_api.rb

@@ -4,7 +4,7 @@ require 'rest-more/test'
 describe RC::Twitter do
   after do
     WebMock.reset!
-    RR.verify
+    Muack.verify
   end
 
   should 'get right' do

metadata

@@ -1,44 +1,43 @@
 --- !ruby/object:Gem::Specification
 name: rest-more
 version: !ruby/object:Gem::Version
-  version: 2.0.4
+  version: 3.0.0
 platform: ruby
 authors:
-- Cardinal Blue
 - Lin Jen-Shin (godfat)
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-13 00:00:00.000000000 Z
+date: 2014-05-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-core
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 2.0.3
+        version: 3.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 2.0.3
-description: ! 'Various REST clients such as Facebook and Twitter built with [rest-core][]
+        version: 3.0.0
+description: |-
+  Various REST clients such as Facebook and Twitter built with [rest-core][].
 
-
-  [rest-core]: https://github.com/cardinalblue/rest-core'
+  [rest-core]: https://github.com/godfat/rest-core
 email:
-- dev (XD) cardinalblue.com
+- godfat (XD) godfat.org
 executables:
 - rib-rest-core
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .gitmodules
-- .travis.yml
+- ".gitignore"
+- ".gitmodules"
+- ".travis.yml"
 - CHANGES.md
 - Gemfile
 - LICENSE
@@ -46,7 +45,7 @@ files:
 - Rakefile
 - TODO.md
 - bin/rib-rest-core
-- doc/tutorial/facebook.md
+- doc/facebook.md
 - example/multi.rb
 - example/rails3/Gemfile
 - example/rails3/README
@@ -67,14 +66,15 @@ files:
 - 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
@@ -86,7 +86,7 @@ files:
 - 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
@@ -102,9 +102,11 @@ files:
 - 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
-homepage: https://github.com/cardinalblue/rest-more
-licenses: []
+homepage: https://github.com/godfat/rest-more
+licenses:
+- Apache License 2.0
 metadata: {}
 post_install_message: 
 rdoc_options: []
@@ -112,20 +114,20 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.0
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
-summary: Various REST clients such as Facebook and Twitter built with [rest-core][]
+summary: Various REST clients such as Facebook and Twitter built with [rest-core][].
 test_files:
 - test/dropbox/test_api.rb
 - test/facebook/test_api.rb
@@ -140,4 +142,5 @@ test_files:
 - 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

data/example/rainbows.rb

@@ -1,67 +0,0 @@
-
-worker_processes 4 # assuming four CPU cores
-preload_app      true
-
-Rainbows! do
-  use :EventMachine, :em_client_class => lambda{
-    RainbowsEventMachineThreadPoolClient
-    # or
-    # RainbowsEventMachineFiberSpawnClient
-  }
-  worker_connections        100
-
-  client_max_body_size      20*1024*1024 # 20 megabytes
-  client_header_buffer_size  8*1024      #  8 kilobytes
-end
-
-after_fork{ |_, _|
-  EM.threadpool_size = 32
-  class RainbowsEventMachineThreadPoolClient < Rainbows::EventMachine::Client
-    def app_call input
-      set_comm_inactivity_timeout 0
-      @env[RACK_INPUT] = input
-      @env[REMOTE_ADDR] = @_io.kgio_addr
-      @env[ASYNC_CALLBACK] = method(:write_async_response)
-      @env[ASYNC_CLOSE] = EM::DefaultDeferrable.new
-      @deferred = true
-      EM.defer{
-        status, headers, body = catch(:async) {
-          APP.call(@env.merge!(RACK_DEFAULTS))
-        }
-        if nil == status || -1 == status
-          @deferred = true
-        else
-          @deferred = nil
-          ev_write_response(status, headers, body, @hp.next?)
-        end
-      }
-    end
-  end
-
-  class RainbowsEventMachineFiberSpawnClient < Rainbows::EventMachine::Client
-    def app_call input
-      set_comm_inactivity_timeout 0
-      @env[RACK_INPUT] = input
-      @env[REMOTE_ADDR] = @_io.kgio_addr
-      @env[ASYNC_CALLBACK] = method(:write_async_response)
-      @env[ASYNC_CLOSE] = EM::DefaultDeferrable.new
-      f = Fiber.new{
-        status, headers, body = catch(:async) {
-          APP.call(@env.merge!(RACK_DEFAULTS))
-        }
-        if nil == status || -1 == status
-          @deferred = true
-        else
-          @deferred = nil
-          ev_write_response(status, headers, body, @hp.next?)
-        end
-      }
-      f.resume
-      @deferred = true if f.alive?
-    end
-  end
-}
-
-EM.error_handler{ |e|
-  puts "Error: EM.error_handler: #{e.inspect} #{e.backtrace.inspect}"
-}