omniauth-vimeo 0.0.1 → 0.0.2

data/Gemfile

@@ -0,0 +1,4 @@
+source 'http://rubygems.org'
+
+# Specify your gem's dependencies in omniauth-flattr.gemspec
+gemspec

data/Rakefile

@@ -0,0 +1,12 @@
+#!/usr/bin/env rake
+require "bundler/gem_tasks"
+require 'rspec/core/rake_task'
+
+desc 'Default: run specs.'
+task :default => :spec
+
+desc "Run specs"
+RSpec::Core::RakeTask.new
+
+desc 'Run specs'
+task :default => :spec

data/lib/omniauth-vimeo/version.rb

@@ -1,5 +1,5 @@
 module Omniauth
   module Vimeo
-    VERSION = "0.0.1"
+    VERSION = "0.0.2"
   end
 end

data/lib/omniauth/strategies/vimeo.rb

@@ -5,36 +5,50 @@ module OmniAuth
   module Strategies
     class Vimeo < OmniAuth::Strategies::OAuth
       option :name, 'vimeo'
-      option :client_options, {:site => 'http://vimeo.com' }
 
-      uid { user['id'] }
+      option :client_options, {
+        :access_token_path => "/oauth/access_token",
+        :authorize_path => "/oauth/authorize",
+        :request_token_path => "/oauth/request_token",
+        :site => "https://vimeo.com"
+      }
+
+      uid { user_info['id'] }
 
       info do
         {
-          'nickname' => user['username'],
-          'name' => user['display_name'],
-          'location' => user['location'],
-          'description' => user['bio'],
-          'image' => user['portraits']['portrait'].select{|h| h['height'] == '300'}.first['_content'],
+          'nickname' => user_info['username'],
+          'name' => user_info['display_name'],
+          'location' => user_info['location'],
+          'description' => user_info['bio'],
+          'image' => user_info['portraits']['portrait'].select{|h| h['height'] == '300'}.first['_content'],
           'urls' => {
-            'website' => user['url'],
-            'vimeo' => user['profileurl']
+            'website' => user_info['url'],
+            'vimeo' => user_info['profileurl']
           }
         }
       end
 
       extra do
-        { 'user_hash' => user }
+        {
+          :raw_info => raw_info
+        }
+      end
+
+      def user_info
+        @user_info ||= raw_info.nil? ? {} : raw_info["person"]
       end
 
-      def user
-        user_hash['person']
+      def raw_info
+        @raw_info ||= MultiJson.load(access_token.get('/api/rest/v2?method=vimeo.people.getInfo&format=json').body)
+      rescue ::Errno::ETIMEDOUT
+        raise ::Timeout::Error
       end
 
-      def user_hash
-        url = "http://vimeo.com/api/rest/v2?method=vimeo.people.getInfo&format=json"
-        @user_hash ||= MultiJson.decode(access_token.get(url).body)
+      def request_phase
+        options[:authorize_params] = {:perms => options[:scope]} if options[:scope]
+        super
       end
     end
   end
-end
+end

data/omniauth-vimeo.gemspec

@@ -6,17 +6,20 @@ Gem::Specification.new do |gem|
   gem.name        = "omniauth-vimeo"
   gem.version     = Omniauth::Vimeo::VERSION
   gem.authors     = ["Benjamin Fritsch"]
-  gem.email       = ["ben@lomography.com"]
-  gem.homepage    = "https://github.com/lomography/omniauth-vimeo"
+  gem.email       = ["beanie@benle.de"]
+  gem.homepage    = "https://github.com/beanieboi/omniauth-vimeo"
   gem.description = %q{OmniAuth strategy for Vimeo}
   gem.summary     = gem.description
 
-  gem.files         = `git ls-files`.split("\n")
-  gem.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
-  gem.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
+  gem.files         = `git ls-files`.split($\)
+  gem.executables   = gem.files.grep(%r{^bin/}).map{ |f| File.basename(f) }
+  gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
   gem.require_paths = ["lib"]
 
+  gem.add_runtime_dependency 'multi_json', '~> 1.3'
   gem.add_runtime_dependency 'omniauth-oauth', '~> 1.0'
+  gem.add_development_dependency "rspec", "~> 2.9"
+  gem.add_development_dependency 'rake', '~> 0.9'
 
   gem.required_rubygems_version = Gem::Requirement.new('>= 1.3.6') if gem.respond_to? :required_rubygems_version=
-end
+end

data/spec/omniauth/strategies/vimeo_spec.rb

@@ -0,0 +1,29 @@
+require 'spec_helper'
+
+describe OmniAuth::Strategies::Vimeo do
+  subject do
+    OmniAuth::Strategies::Vimeo.new({})
+  end
+
+  context "client options" do
+    it 'should have correct name' do
+      subject.options.name.should eq("vimeo")
+    end
+
+    it 'should have correct authorize url' do
+      subject.options.client_options.authorize_path.should eq('/oauth/authorize')
+    end
+
+    it 'should have correct request url' do
+      subject.options.client_options.request_token_path.should eq('/oauth/request_token')
+    end
+
+    it 'should have correct access url' do
+      subject.options.client_options.access_token_path.should eq('/oauth/access_token')
+    end
+
+    it 'should have correct site' do
+      subject.options.client_options.site.should eq("https://vimeo.com")
+    end
+  end
+end

data/spec/spec_helper.rb

@@ -0,0 +1,9 @@
+$:.unshift File.expand_path('..', __FILE__)
+$:.unshift File.expand_path('../../lib', __FILE__)
+require 'rspec'
+require 'omniauth'
+require 'omniauth-vimeo'
+
+RSpec.configure do |config|
+  config.extend  OmniAuth::Test::StrategyMacros, :type => :strategy
+end

metadata

@@ -1,82 +1,101 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: omniauth-vimeo
-version: !ruby/object:Gem::Version 
-  prerelease: false
-  segments: 
-  - 0
-  - 0
-  - 1
-  version: 0.0.1
+version: !ruby/object:Gem::Version
+  version: 0.0.2
+  prerelease: 
 platform: ruby
-authors: 
+authors:
 - Benjamin Fritsch
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-11-08 00:00:00 +01:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
-  name: omniauth-oauth
+date: 2012-05-17 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: multi_json
+  requirement: &70093283939860 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.3'
+  type: :runtime
   prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
-    requirements: 
+  version_requirements: *70093283939860
+- !ruby/object:Gem::Dependency
+  name: omniauth-oauth
+  requirement: &70093283938720 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 1
-        - 0
-        version: "1.0"
+      - !ruby/object:Gem::Version
+        version: '1.0'
   type: :runtime
-  version_requirements: *id001
+  prerelease: false
+  version_requirements: *70093283938720
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: &70093283937180 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '2.9'
+  type: :development
+  prerelease: false
+  version_requirements: *70093283937180
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: &70093283951800 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '0.9'
+  type: :development
+  prerelease: false
+  version_requirements: *70093283951800
 description: OmniAuth strategy for Vimeo
-email: 
-- ben@lomography.com
+email:
+- beanie@benle.de
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - .gitignore
+- Gemfile
 - README.md
+- Rakefile
 - lib/omniauth-vimeo.rb
 - lib/omniauth-vimeo/version.rb
 - lib/omniauth/strategies/vimeo.rb
 - omniauth-vimeo.gemspec
-has_rdoc: true
-homepage: https://github.com/lomography/omniauth-vimeo
+- spec/omniauth/strategies/vimeo_spec.rb
+- spec/spec_helper.rb
+homepage: https://github.com/beanieboi/omniauth-vimeo
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      segments: 
-      - 1
-      - 3
-      - 6
+required_ruby_version: !ruby/object:Gem::Requirement
+  none: false
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
+  none: false
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
       version: 1.3.6
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.3.6
+rubygems_version: 1.8.17
 signing_key: 
 specification_version: 3
 summary: OmniAuth strategy for Vimeo
-test_files: []
-
+test_files:
+- spec/omniauth/strategies/vimeo_spec.rb
+- spec/spec_helper.rb