omniauth-vimeo 1.0.2 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0a1ca6fb536eb3083346e4e32739614c29eb5176
-  data.tar.gz: bd13e8a1a4a835e5c83a8749301beed41e5570ee
+  metadata.gz: d223d102e7685cd4248fcbd3b5d82033308fd966
+  data.tar.gz: 8ca22cdc93c1b36053114a8532f9c18f25b273a0
 SHA512:
-  metadata.gz: 322cf7013355f7993686641c2af62c65d4293ebeb1e3ffb0498d468337dfa7b2abfa62a3b389023150ea9dba056bf238494adcc6da39d425a9389fcafa8fbdb9
-  data.tar.gz: 419e58e80bbb00f1f62d9f45a1c1991af75ae34a5154c07845cf2e1a4c556be51e411958e21495039ba39df8ce1a46f36f54313be00112f16186a518b0102595
+  metadata.gz: 8276da39d9d593641775f4eff458659c366451acb80e6feb482a9be4acf5511b2e753c3a35b72e6f8e0e5751582ee02511c0a57e1b0a133e7dea23bc223d28d0
+  data.tar.gz: 685bb33b85a1c7b5d09d12ff7eb2f6db1608238c37e3d8e659cdd071de9744238964245ad021e091ce3592503e010bf6087d519146084c44f084dad132267f80

data/.gitignore

@@ -1 +1,2 @@
 .DS_Store
+app/

data/.ruby-version

@@ -1 +1 @@
-2.1.2
+2.2.1

data/.travis.yml

@@ -0,0 +1,11 @@
+language: ruby
+
+script: rspec spec
+
+rvm:
+  - 2.0.0
+  - 2.1.0
+  - 2.2.1
+  - jruby-19mode
+  - rbx-2
+  - ruby-head

data/Changes.md

@@ -0,0 +1,36 @@
+2.0.0 / 2012-06-23
+==================
+- implemented new OAuth2 API
+- add travis.yml to test multiple rubies
+- update readme
+- added changelog
+
+1.0.2 / 2012-06-23
+==================
+- converted specs to expect syntax
+- bump dependencies
+
+1.0.1 / 2013-10-03
+==================
+- split installation and usage section in Readme
+- added section on how to use permissions
+- added license to gemspec
+- rename perms -> permissions
+
+1.0.0 / 2012-06-23
+==================
+- Readme change
+- added Travis
+- added Gemnaium
+
+0.0.2 / 2012-05-17
+==================
+- added Readme
+- added missing multi_json dependency
+- update author info in gemspec
+
+
+0.0.1 / 2011-11-08
+==================
+
+- first working version

data/README.md

@@ -3,7 +3,7 @@
 This is an OmniAuth strategy for authenticating to Vimeo. To
 use it, you'll need to sign up for an OAuth Application ID and Secret
 on the [Vimeo Applications Page](https://developer.vimeo.com/apps).
-You can read more about Vimdeo's oauth over at their [developer page](https://developer.vimeo.com/apis/advanced#oauth)
+You can read more about Vimdeo's OAuth over at their [developer page](https://developer.vimeo.com/api/authentication)
 
 
 ## Installation
@@ -40,9 +40,68 @@ Open the following URL and connect your Vimeo account with your application:
 
     /auth/vimeo
 
+## Sample Auth Hash
+	{
+      "provider"=>"vimeo",
+      "uid"=>5387263,
+      "info"=>{
+        "id"=>5387263,
+        "nickname"=>"beanieboi",
+        "name"=>"beanie",
+        "bio"=>nil,
+        "account"=>"basic",
+        "location"=>nil,
+        "pictures"=>[
+          {
+            "type"=>"portrait",
+            "width"=>30,
+            "height"=>30,
+            "link"=>"https://i.vimeocdn.com/portrait/2249717_30x30.jpg"
+          },
+       	  {
+       	    "type"=>"portrait",
+       	    "width"=>75,
+       	    "height"=>75,
+       	    "link"=>"https://i.vimeocdn.com/portrait/2249717_75x75.jpg"
+       	  },
+          {
+            "type"=>"portrait",
+            "width"=>100,
+            "height"=>100,
+            "link"=>"https://i.vimeocdn.com/portrait/2249717_100x100.jpg"
+          },
+          {
+            "type"=>"portrait",
+            "width"=>300,
+            "height"=>300,
+            "link"=>"https://i.vimeocdn.com/portrait/2249717_300x300.jpg"
+          }
+        ],
+        "websites"=>[],
+        "content_filter"=>[
+          "language",
+          "drugs",
+          "violence",
+          "nudity",
+          "safe",
+          "unrated"
+        ],
+        "created_time"=>"2010-12-03T17:57:33+00:00",
+        "link"=>"https://vimeo.com/beanieboi",
+        "uri"=>"/users/5387263"
+      },
+      "credentials"=>{
+        "token"=>"token",
+        "expires"=>false
+      },
+      "extra"=>{
+        "scope"=>"public private"
+      }
+    }
+
 ## Supported Rubies
 
-OmniAuth Vimeo is tested under 1.8.7, 1.9.2, 1.9.3 and Ruby Enterprise Edition.
+OmniAuth Vimeo is tested under 2.0 and above
 
 [![Build Status](https://secure.travis-ci.org/beanieboi/omniauth-vimeo.png?branch=master)](http://travis-ci.org/beanieboi/omniauth-vimeo)
 
@@ -56,7 +115,7 @@ OmniAuth Vimeo is tested under 1.8.7, 1.9.2, 1.9.3 and Ruby Enterprise Edition.
 
 ## License
 
-Copyright (c) 2011 Benjamin Fritsch.
+Copyright (c) 2015 Benjamin Fritsch.
 
 Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
 

data/lib/omniauth/strategies/vimeo.rb

@@ -1,53 +1,55 @@
-require 'omniauth-oauth'
-require 'multi_json'
+require 'omniauth-oauth2'
 
 module OmniAuth
   module Strategies
-    class Vimeo < OmniAuth::Strategies::OAuth
+    class Vimeo < OmniAuth::Strategies::OAuth2
       option :name, 'vimeo'
 
       option :client_options, {
-        :access_token_path => "/oauth/access_token",
-        :authorize_path => "/oauth/authorize",
-        :request_token_path => "/oauth/request_token",
-        :site => "https://vimeo.com"
+        token_url: "/oauth/access_token",
+        authorize_url: "/oauth/authorize",
+        site: "https://api.vimeo.com"
       }
 
-      uid { user_info['id'] }
+      uid { info['id'] }
 
       info do
         {
-          'nickname' => user_info['username'],
-          'name' => user_info['display_name'],
+          'id' => user_info['uri'].split('/').last.to_i,
+          'nickname' => user_info['link'].split('/').last,
+          'name' => user_info['name'],
+          'bio' => user_info['bio'],
+          'account' => user_info['account'],
           'location' => user_info['location'],
-          'description' => user_info['bio'],
-          'image' => user_info['portraits']['portrait'].select{|h| h['height'] == '300'}.first['_content'],
-          'urls' => {
-            'website' => user_info['url'],
-            'vimeo' => user_info['profileurl']
-          }
-        }
-      end
-
-      extra do
-        {
-          :raw_info => raw_info
+          'pictures' => user_info['pictures'],
+          'websites' => user_info['websites'],
+          'content_filter' => user_info['content_filter'],
+          'created_time' => user_info['created_time'],
+          'link' => user_info['link'],
+          'uri' => user_info['uri'],
         }
       end
 
       def user_info
-        @user_info ||= raw_info.nil? ? {} : raw_info["person"]
+        access_token.params['user']
       end
 
-      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
+      credentials do
+        _credentials = {'token' => access_token.token}
+
+        if access_token.expires? && access_token.refresh_token
+          _credentials = _credentials.merge('refresh_token' => access_token.refresh_token)
+        end
+
+        if access_token.expires?
+          _credentials = _credentials.merge('expires_at' => access_token.expires_at)
+        end
+
+        _credentials.merge!('expires' => access_token.expires?)
       end
 
-      def request_phase
-        options[:authorize_params] = {:permission => options[:scope]} if options[:scope]
-        super
+      extra do
+        { 'scope' => access_token.params['scope'] }
       end
     end
   end

data/lib/omniauth-vimeo/version.rb

@@ -1,5 +1,5 @@
 module Omniauth
   module Vimeo
-    VERSION = "1.0.2"
+    VERSION = "2.0.0"
   end
 end

data/omniauth-vimeo.gemspec

@@ -17,10 +17,9 @@ Gem::Specification.new do |gem|
   gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
   gem.require_paths = ["lib"]
 
-  gem.add_dependency 'multi_json', '~> 1.10'
-  gem.add_dependency 'omniauth-oauth', '~> 1.0'
+  gem.add_dependency 'omniauth-oauth2'
 
-  gem.add_development_dependency "rspec", "~> 3.0"
+  gem.add_development_dependency "rspec", "~> 3"
   gem.add_development_dependency 'rake'
 
   gem.required_rubygems_version = Gem::Requirement.new('>= 1.3.6') if gem.respond_to? :required_rubygems_version=

data/spec/omniauth/strategies/vimeo_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe OmniAuth::Strategies::Vimeo do
+RSpec.describe OmniAuth::Strategies::Vimeo do
   subject do
     OmniAuth::Strategies::Vimeo.new({})
   end
@@ -10,20 +10,16 @@ describe OmniAuth::Strategies::Vimeo do
       expect(subject.options.name).to eq("vimeo")
     end
 
-    it 'should have correct authorize url' do
-      expect(subject.options.client_options.authorize_path).to eq('/oauth/authorize')
-    end
-
-    it 'should have correct request url' do
-      expect(subject.options.client_options.request_token_path).to eq('/oauth/request_token')
+    it 'should have correct token url' do
+      expect(subject.options.client_options.token_url).to eq('/oauth/access_token')
     end
 
-    it 'should have correct access url' do
-      expect(subject.options.client_options.access_token_path).to eq('/oauth/access_token')
+    it 'should have correct authorize url' do
+      expect(subject.options.client_options.authorize_url).to eq('/oauth/authorize')
     end
 
     it 'should have correct site' do
-      expect(subject.options.client_options.site).to eq("https://vimeo.com")
+      expect(subject.options.client_options.site).to eq("https://api.vimeo.com")
     end
   end
 end

data/spec/spec_helper.rb

@@ -4,6 +4,94 @@ require 'rspec'
 require 'omniauth'
 require 'omniauth-vimeo'
 
+# This file was generated by the `rspec --init` command. Conventionally, all
+# specs live under a `spec` directory, which RSpec adds to the `$LOAD_PATH`.
+# The generated `.rspec` file contains `--require spec_helper` which will cause
+# this file to always be loaded, without a need to explicitly require it in any
+# files.
+#
+# Given that it is always loaded, you are encouraged to keep this file as
+# light-weight as possible. Requiring heavyweight dependencies from this file
+# will add to the boot time of your test suite on EVERY test run, even for an
+# individual file that may not need all of that loaded. Instead, consider making
+# a separate helper file that requires the additional dependencies and performs
+# the additional setup, and require it from the spec files that actually need
+# it.
+#
+# The `.rspec` file also contains a few flags that are not defaults but that
+# users commonly want.
+#
+# See http://rubydoc.info/gems/rspec-core/RSpec/Core/Configuration
 RSpec.configure do |config|
   config.extend  OmniAuth::Test::StrategyMacros, :type => :strategy
+
+  # rspec-expectations config goes here. You can use an alternate
+  # assertion/expectation library such as wrong or the stdlib/minitest
+  # assertions if you prefer.
+  config.expect_with :rspec do |expectations|
+    # This option will default to `true` in RSpec 4. It makes the `description`
+    # and `failure_message` of custom matchers include text for helper methods
+    # defined using `chain`, e.g.:
+    #     be_bigger_than(2).and_smaller_than(4).description
+    #     # => "be bigger than 2 and smaller than 4"
+    # ...rather than:
+    #     # => "be bigger than 2"
+    expectations.include_chain_clauses_in_custom_matcher_descriptions = true
+  end
+
+  # rspec-mocks config goes here. You can use an alternate test double
+  # library (such as bogus or mocha) by changing the `mock_with` option here.
+  config.mock_with :rspec do |mocks|
+    # Prevents you from mocking or stubbing a method that does not exist on
+    # a real object. This is generally recommended, and will default to
+    # `true` in RSpec 4.
+    mocks.verify_partial_doubles = true
+  end
+
+# The settings below are suggested to provide a good initial experience
+# with RSpec, but feel free to customize to your heart's content.
+  # These two settings work together to allow you to limit a spec run
+  # to individual examples or groups you care about by tagging them with
+  # `:focus` metadata. When nothing is tagged with `:focus`, all examples
+  # get run.
+  config.filter_run :focus
+  config.run_all_when_everything_filtered = true
+
+  # Limits the available syntax to the non-monkey patched syntax that is
+  # recommended. For more details, see:
+  #   - http://myronmars.to/n/dev-blog/2012/06/rspecs-new-expectation-syntax
+  #   - http://teaisaweso.me/blog/2013/05/27/rspecs-new-message-expectation-syntax/
+  #   - http://myronmars.to/n/dev-blog/2014/05/notable-changes-in-rspec-3#new__config_option_to_disable_rspeccore_monkey_patching
+  config.disable_monkey_patching!
+
+  # This setting enables warnings. It's recommended, but in some cases may
+  # be too noisy due to issues in dependencies.
+  config.warnings = true
+
+  # Many RSpec users commonly either run the entire suite or an individual
+  # file, and it's useful to allow more verbose output when running an
+  # individual spec file.
+  if config.files_to_run.one?
+    # Use the documentation formatter for detailed output,
+    # unless a formatter has already been configured
+    # (e.g. via a command-line flag).
+    config.default_formatter = 'doc'
+  end
+
+  # Print the 10 slowest examples and example groups at the
+  # end of the spec run, to help surface which specs are running
+  # particularly slow.
+  config.profile_examples = 10
+
+  # Run specs in random order to surface order dependencies. If you find an
+  # order dependency and want to debug it, you can fix the order by providing
+  # the seed, which is printed after each run.
+  #     --seed 1234
+  config.order = :random
+
+  # Seed global randomization in this process using the `--seed` CLI option.
+  # Setting this allows you to use `--seed` to deterministically reproduce
+  # test failures related to randomization by passing the same `--seed` value
+  # as the one that triggered the failure.
+  Kernel.srand config.seed
 end

metadata

@@ -1,57 +1,43 @@
 --- !ruby/object:Gem::Specification
 name: omniauth-vimeo
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 2.0.0
 platform: ruby
 authors:
 - Benjamin Fritsch
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-22 00:00:00.000000000 Z
+date: 2015-03-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: multi_json
+  name: omniauth-oauth2
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.10'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.10'
-- !ruby/object:Gem::Dependency
-  name: omniauth-oauth
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '3'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -76,6 +62,8 @@ files:
 - ".gitignore"
 - ".rspec"
 - ".ruby-version"
+- ".travis.yml"
+- Changes.md
 - Gemfile
 - README.md
 - Rakefile
@@ -105,7 +93,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.6
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: OmniAuth strategy for Vimeo