rest-more 3.3.0 → 3.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8b39d49bb082449d7cc14d9c296b5b11b464eefe
-  data.tar.gz: c329a58ec85fea8020a2e72b0461da6df5d48651
+  metadata.gz: 8d94a93481cb47814a0fe9e40aa939c0511b8972
+  data.tar.gz: 3e51315c98ffe426c74e37e6d3384d60e7a0563a
 SHA512:
-  metadata.gz: 6f390c57bc49b63ba559056cc1b51d2ca32484a1d5100354084ef89d740b53138029260311b9a8bbb70c644eec70ea53d3fdc3b82e96b75d8852d1376b0e01ad
-  data.tar.gz: 94171dcccda4f3e7821da7b009e0ab776b97f115dc0d294656e93fc6b83b1bc7a1557eeb8fb1f61b243d6b7729ab7b73adf848b2ad5faafc43c2c38711a5c723
+  metadata.gz: 2c5c2ccbaff604f3272cb7db82620635a92772f6f7350059e3bff697044ca3bd4e6cca1e7a23600ebfbdb9070d19ba449aa0f5cca31148a55161f196774cae57
+  data.tar.gz: fd1fa8e8c101fca082a8a59584ea85bc740c8d09c276ce04a156299626c0d65cdebc69bf652d0c3246ce73a3d7c7fad1676ea1d5d753cf137d9c013b18250226

data/CHANGES.md

@@ -1,5 +1,16 @@
 # CHANGES
 
+## rest-more 3.3.1 -- 2014-10-08
+
+* Made `RC::Facebook#authorize_url` accepts the second argument as the option.
+  #5 khoa nguyen (@khoan)
+
+* The same fix applied to `RC::Facebook#authorize!`. #5 khoa nguyen (@khoan)
+
+* `RC::Github` now accepts `:client_id`, `:client_secret` as options, and
+  `RC::Github#authorize_url` and `RC::Github#authorize!` and
+  `RC::Github#authorized?` are now implemented. Lin Jen-Shin (@godfat)
+
 ## rest-more 3.3.0 -- 2014-08-25
 
 * Adopted rest-core 3.3.0

data/README.md

@@ -14,7 +14,6 @@ talk is in Mandarin.
 * [github](https://github.com/godfat/rest-more)
 * [rubygems](https://rubygems.org/gems/rest-more)
 * [rdoc](http://rdoc.info/projects/godfat/rest-more)
-* [mailing list](http://groups.google.com/group/rest-core/topics)
 
 ## DESCRIPTION:
 

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

@@ -214,15 +214,15 @@ module RestCore::Facebook::Client
 
   # oauth related
 
-  def authorize_url opts={}
+  def authorize_url query={}, opts={}
     url('dialog/oauth',
-        {:client_id => app_id, :access_token => nil}.merge(opts),
-         :site => 'https://www.facebook.com/')
+        {:client_id => app_id, :access_token => nil}.merge(query),
+        {:site => 'https://www.facebook.com/'}.merge(opts))
   end
 
-  def authorize! opts={}
-    payload = {:client_id => app_id, :client_secret => secret}.merge(opts)
-    args = ['oauth/access_token', payload, {},
+  def authorize! payload={}, opts={}
+    p = {:client_id => app_id, :client_secret => secret}.merge(payload)
+    args = ['oauth/access_token', p, {},
             {:json_response => false}.merge(opts)]
 
     if block_given?

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

@@ -3,7 +3,7 @@ require 'rest-core'
 
 # http://developer.github.com/v3/
 module RestCore
-  Github = Builder.client do
+  Github = Builder.client(:client_id, :client_secret, :data) do
     use Timeout       , 10
 
     use DefaultSite   , 'https://api.github.com/'
@@ -28,6 +28,37 @@ module RestCore::Github::Client
     get('user', query, opts, &cb)
   end
 
+  def access_token
+    data['access_token']
+  end
+
+  def access_token= token
+    data['access_token'] = token
+  end
+
+  def authorize_url query={}, opts={}
+    url('https://github.com/login/oauth/authorize',
+        {:client_id => client_id}.merge(query),
+        {:access_token => false}.merge(opts))
+  end
+
+  def authorize! payload={}, query={}, opts={}
+    p = {:client_id => client_id, :client_secret => client_secret}.
+         merge(payload)
+    args = ['https://github.com/login/oauth/access_token',
+            p, query, {:access_token => false}.merge(opts)]
+
+    if block_given?
+      post(*args){ |r| yield(self.data = r) }
+    else
+      self.data = post(*args)
+    end
+  end
+
+  def authorized?
+    !!access_token
+  end
+
   def all path, query={}, opts={}
     q = {:per_page => MAX_PER_PAGE}.merge(query)
     r = get(path, q, opts.merge(RESPONSE_KEY => PROMISE)).then{ |response|
@@ -47,6 +78,10 @@ module RestCore::Github::Client
   end
 
   private
+  def default_data
+    {}
+  end
+
   def page_range response
     from = (parse_current_page(response) || 1).to_i + 1
     to   = (parse_last_page(response) || from - 1).to_i

data/lib/rest-more/version.rb

@@ -1,4 +1,4 @@
 
 module RestMore
-  VERSION = '3.3.0'
+  VERSION = '3.3.1'
 end

data/rest-more.gemspec

@@ -1,14 +1,14 @@
 # -*- encoding: utf-8 -*-
-# stub: rest-more 3.3.0 ruby lib
+# stub: rest-more 3.3.1 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "rest-more"
-  s.version = "3.3.0"
+  s.version = "3.3.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib"]
   s.authors = ["Lin Jen-Shin (godfat)"]
-  s.date = "2014-08-25"
+  s.date = "2014-10-08"
   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"]
@@ -83,7 +83,7 @@ Gem::Specification.new do |s|
   "test/twitter/test_twitter.rb"]
   s.homepage = "https://github.com/godfat/rest-more"
   s.licenses = ["Apache License 2.0"]
-  s.rubygems_version = "2.4.1"
+  s.rubygems_version = "2.4.2"
   s.summary = "Various REST clients such as Facebook and Twitter built with [rest-core][]."
   s.test_files = [
   "test/dropbox/test_dropbox.rb",

data/test/facebook/test_oauth.rb

@@ -13,8 +13,13 @@ describe RC::Facebook do
 
   would 'return correct oauth url' do
     @rg.authorize_url(:redirect_uri => @uri).
-    should.eq 'https://www.facebook.com/dialog/oauth?' \
-              'client_id=29&redirect_uri=http%3A%2F%2Fzzz.tw'
+      should.eq 'https://www.facebook.com/dialog/oauth?' \
+                'client_id=29&redirect_uri=http%3A%2F%2Fzzz.tw'
+  end
+
+  would 'change the site for authorize_url' do
+    @rg.authorize_url({}, :site => 'https://example.com/').
+      should.eq 'https://example.com/dialog/oauth?client_id=29'
   end
 
   would 'do authorizing and parse result and save it in data' do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rest-more
 version: !ruby/object:Gem::Version
-  version: 3.3.0
+  version: 3.3.1
 platform: ruby
 authors:
 - Lin Jen-Shin (godfat)
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-25 00:00:00.000000000 Z
+date: 2014-10-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-core
@@ -123,7 +123,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.1
+rubygems_version: 2.4.2
 signing_key: 
 specification_version: 4
 summary: Various REST clients such as Facebook and Twitter built with [rest-core][].