dailymotion 0.5.0 → 0.6.0

data/.travis.yml

@@ -0,0 +1,5 @@
+language: ruby
+rvm:
+  - 1.8.7
+  - 1.9.2
+  - 1.9.3

data/LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2012 slainer68
+Copyright (c) 2012 Nicolas Blanco.
 
 MIT License
 
@@ -19,4 +19,4 @@ MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
 NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
 LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
 OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

data/README.md

@@ -1,7 +1,11 @@
-# Dailymotion
+# Dailymotion [![Build Status](https://secure.travis-ci.org/slainer68/dailymotion.png?branch=master)][travis] [![Dependency Status](https://gemnasium.com/slainer68/dailymotion.png?travis)][gemnasium]
+[travis]: http://travis-ci.org/slainer68/dailymotion
+[gemnasium]: https://gemnasium.com/slainer68/dailymotion
 
 Ruby bindings for the [Dailymotion Graph API](http://www.dailymotion.com/doc/api/graph-api.html).
 
+Note : this gem is unofficial and is not endorsed in any way by Dailymotion.
+
 To authenticate your users with Dailymotion, I suggest you to use my [Omniauth Dailymotion Strategy](https://github.com/slainer68/omniauth-dailymotion).
 
 ## Installation
@@ -22,7 +26,7 @@ Or install it yourself as:
 
 Get the list of the authenticated user videos:
 
-    daily_api = Dailymotion::API.new("API_TOKEN")
+    daily_api = Dailymotion::API.new(token: "API_TOKEN")
     resp = daily_api.get_connections("user", "me", "videos")
 
     resp.body
@@ -43,6 +47,13 @@ Then post the video to Dailymotion :
 
     req = daily_api.post_video(uploaded_file_url)
 
+## Refresh the access token
+
+NOTE : in order to refresh the access token, you need to initialize or populate the options hash with client_id, client_secret and refresh_token.
+
+    daily_api = Dailymotion::API.new(client_id: "12345678", client_secret: "pipomolo", refresh_token: "blablabla")
+    daily_api.refresh_token!
+
 ## Contributing
 
 1. Fork it

data/lib/dailymotion/api.rb

@@ -1,17 +1,34 @@
 module Dailymotion
   class API
-    attr_accessor :token, :faraday
+    API_BASE_URL = 'https://api.dailymotion.com'
+    attr_accessor :options
+    attr_reader :faraday, :faraday_post
 
-    def initialize(token)
-      @token = token
-      @faraday = Faraday.new(:url => 'https://api.dailymotion.com') do |builder|
-        builder.use Dailymotion::FaradayMiddleware::OAuth2, @token
+    def initialize(opts = {})
+      @options = opts
+
+      set_faradays
+    end
+
+    def set_faradays
+      @faraday = Faraday.new(:url => API_BASE_URL) do |builder|
+        builder.use Dailymotion::FaradayMiddleware::OAuth2, @options[:token]
         builder.use Faraday::Response::Logger
         builder.adapter Faraday.default_adapter
 
         builder.use ::FaradayMiddleware::Mashify
         builder.use ::FaradayMiddleware::ParseJson
       end
+
+      @faraday_post = Faraday.new do |builder|
+        builder.use Faraday::Request::Multipart
+        builder.use Faraday::Request::UrlEncoded
+
+        builder.adapter Faraday.default_adapter
+
+        builder.use ::FaradayMiddleware::Mashify
+        builder.use ::FaradayMiddleware::ParseJson
+      end
     end
 
     def get_object(object, id, params = {})
@@ -41,19 +58,18 @@ module Dailymotion
     end
 
     def upload_file(filepath, url)
-      faraday = Faraday.new do |builder|
-        builder.use Faraday::Request::Multipart
-        builder.use Faraday::Request::UrlEncoded
+      payload = { :file => Faraday::UploadIO.new(filepath, "application/octet-stream") }
 
-        builder.adapter Faraday.default_adapter
+      @faraday_post.post url, payload
+    end
 
-        builder.use ::FaradayMiddleware::Mashify
-        builder.use ::FaradayMiddleware::ParseJson
-      end
+    def refresh_token!
+      raise StandardError, "client_id, client_secret and refresh_token in options hash are mandatory" unless options[:client_id] && options[:client_secret] && options[:refresh_token]
 
-      payload = { :file => Faraday::UploadIO.new(filepath, "application/octet-stream") }
+      refresh_request = @faraday_post.post "#{API_BASE_URL}/oauth/token", { grant_type: "refresh_token", client_id: @options[:client_id], client_secret: @options[:client_secret], refresh_token: @options[:refresh_token] }
+      @options[:token] = refresh_request.body.access_token
 
-      faraday.post url, payload
+      set_faradays
     end
   end
 end

data/lib/dailymotion/version.rb

@@ -1,3 +1,3 @@
 module Dailymotion
-  VERSION = "0.5.0"
+  VERSION = "0.6.0"
 end

data/spec/dailymotion/api_spec.rb

@@ -3,14 +3,14 @@ require "dailymotion"
 require "pry"
 
 describe Dailymotion::API do
-  it "should be initialized with a token" do
-    @api = Dailymotion::API.new("ABCD")
+  it "should be initialized with an options hash" do
+    @api = Dailymotion::API.new(token: "ABCD")
 
-    @api.token.should eq("ABCD")
+    @api.options[:token].should eq("ABCD")
   end
 
   describe "with a token" do
-    subject { Dailymotion::API.new("ABCD") }
+    subject { Dailymotion::API.new(token: "ABCD") }
 
     describe "#get_object" do
       it "should get object" do
@@ -63,4 +63,25 @@ describe Dailymotion::API do
       end
     end
   end
+
+  describe "#refresh_token!" do
+    it "should fail if client_id, client_secret or refresh_token are not set" do
+      @api = Dailymotion::API.new(token: "ABCD")
+
+      expect { @api.refresh_token! }.to raise_error(StandardError)
+    end
+
+    describe "with all options" do
+      it "should refresh the token" do
+        @api = Dailymotion::API.new(client_id: "pipo", client_secret: "molo", refresh_token: "ahah")
+
+        response_mock = mock(:faraday, body: Hashie::Mash.new(access_token: "new_token"))
+        @api.faraday_post.should_receive(:post).and_return(response_mock)
+        @api.should_receive(:set_faradays).once
+
+        @api.refresh_token!
+        @api.options[:token].should eq("new_token")
+      end
+    end
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dailymotion
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.6.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-05-24 00:00:00.000000000 Z
+date: 2012-06-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
-  requirement: &70301321405600 !ruby/object:Gem::Requirement
+  requirement: &70181320256340 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70301321405600
+  version_requirements: *70181320256340
 - !ruby/object:Gem::Dependency
   name: hashie
-  requirement: &70301321386620 !ruby/object:Gem::Requirement
+  requirement: &70181320255920 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70301321386620
+  version_requirements: *70181320255920
 - !ruby/object:Gem::Dependency
   name: faraday_middleware
-  requirement: &70301321380480 !ruby/object:Gem::Requirement
+  requirement: &70181320271820 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70301321380480
+  version_requirements: *70181320271820
 - !ruby/object:Gem::Dependency
   name: pry
-  requirement: &70301321375040 !ruby/object:Gem::Requirement
+  requirement: &70181320271400 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70301321375040
+  version_requirements: *70181320271400
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70301321369620 !ruby/object:Gem::Requirement
+  requirement: &70181320270980 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70301321369620
+  version_requirements: *70181320270980
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70301321358420 !ruby/object:Gem::Requirement
+  requirement: &70181320270480 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -76,7 +76,7 @@ dependencies:
         version: 2.10.0
   type: :development
   prerelease: false
-  version_requirements: *70301321358420
+  version_requirements: *70181320270480
 description: Dailymotion Open Graph API for Ruby
 email:
 - slainer68@gmail.com
@@ -85,6 +85,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - .gitignore
+- .travis.yml
 - Gemfile
 - LICENSE
 - README.md
@@ -108,12 +109,18 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: 981270364239254124
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: 981270364239254124
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.11
@@ -123,4 +130,3 @@ summary: Dailymotion Open Graph API for Ruby
 test_files:
 - spec/dailymotion/api_spec.rb
 - spec/spec_helper.rb
-has_rdoc: