active_public_resources 0.2.5 → 0.2.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 50bb4c74f2c87274aaf825004f9b111d32844ba3
-  data.tar.gz: ea0f21d7a62d6a0d205445fcaa20e2bde2dbd78f
+  metadata.gz: 2b3ff207dc356c86315616be0944184327567a53
+  data.tar.gz: 5cc13fc5b7af5cdfad8b9502e6f0b8a84856bc7b
 SHA512:
-  metadata.gz: 6324461f27ba94f8f8c59cb3d857dd54f8232ba6c54994287f8ffad76cb1e67180b1130bc0648a258513c4698f679bf9e524487949970e0e867f13ae6410ffd5
-  data.tar.gz: d49032b26bd2a5eda55afb267e3f1e6d7958b4baca6762ad5fd3fe1c0961e61e6aee1c39d900a0156976f9ae21efa9af74d243e78f632d949cc060473f98c2c7
+  metadata.gz: f3f9d07a7926783c11f89803ec2913333341641e9aba0974861baef5c7eeb44f28dad7d4d5656fc32942e896d29d5312c9165f2da23f23be3e423da923415cb5
+  data.tar.gz: 0a37e389e9519c2b2a5344e387054521d7521e209dc34d3138a36d02b64bb9983d7d2363b40dd978d8dc22a30432a4e30d165dc391a3326bc114253b6a144820

data/Gemfile

@@ -7,7 +7,7 @@ group :test do
   gem 'rspec',       '~> 2.14.1'
   # gem 'rspec-mocks', '~> 2.14.4'
   gem 'vcr'
-  gem 'webmock'
+  gem 'webmock', '~> 3.0.1'
   gem 'simplecov',   '~> 0.8.1', :require => false
   gem 'growl'
   gem 'growl-rspec'
@@ -19,7 +19,7 @@ end
 
 group :development, :test do
   gem 'pry-remote'
-  gem 'pry'
+  gem 'pry-byebug'
 end
 
 gemspec

data/README.md

@@ -188,14 +188,12 @@ A driver in this context is a ruby class which performs requests and returns a r
 
 To use the Vimeo API, you must have credentials already. This requires a Vimeo app to
 be registered. You can do it at [https://developer.vimeo.com/apps](https://developer.vimeo.com/apps).
-There are 4 params which are necessary to perform the requests:
+There are two params which are necessary to perform the requests:
 
 | Name                | Required? | Description
 | ------------------- |:---------:| -------------
 | consumer_key        |    Yes    | Vimeo API Client ID
 | consumer_secret     |    Yes    | Vimeo API Client Secret
-| access_token        |    Yes    | Vimeo API OAuth Access Token
-| access_token_secret |    Yes    | Vimeo API OAuth Access Token Secret
 
 #### Return Types
 
@@ -204,22 +202,20 @@ Vimeo returns **Iframe** and **URL** return types.
 #### Example:
 
 ```ruby
-criteria = APR::RequestCriteria.new( query: "education" )
+criteria = APR::RequestCriteria.new(query: "education")
 
 vimeo = APR::Drivers::Vimeo.new(
   :consumer_key        => 'VIMEO_CONSUMER_KEY',
-  :consumer_secret     => 'VIMEO_CONSUMER_SECRET',
-  :access_token        => 'VIMEO_ACCESS_TOKEN',
-  :access_token_secret => 'VIMEO_ACCESS_TOKEN_SECRET'
+  :consumer_secret     => 'VIMEO_CONSUMER_SECRET'
 )
 
-results = vimeo.perform_request( criteria )
+results = vimeo.perform_request(criteria)
 results.items.length          # => 25
 results.total_items           # => 145063
 results.next_criteria         # => #<ActivePublicResources::RequestCriteria:0x007fa48392d388 @query="education", @page=2, @per_page=25>
 results.items.first.title     # => "Kynect 'education'"
 
-more_results = vimeo.perform_request( results.next_criteria )
+more_results = vimeo.perform_request(results.next_criteria)
 # ...
 ```
 

data/active_public_resources.gemspec

@@ -21,9 +21,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency "activesupport", ">= 4.0.0"
   spec.add_dependency "activemodel", ">= 4.0.0"
   spec.add_dependency "iso8601", "~> 0.8.6"
-
-  # Drivers
-  spec.add_dependency "vimeo", "~> 1.5.3"
+  spec.add_dependency "httparty", "~> 0.15.6"
 
   spec.add_development_dependency "bundler", "~> 1.3"
 end

data/active_public_resources_config.yml.example

@@ -1,8 +1,6 @@
 vimeo:
   consumer_key: VIMEO_CONSUMER_KEY
   consumer_secret: VIMEO_CONSUMER_SECRET
-  access_token: VIMEO_ACCESS_TOKEN
-  access_token_secret: VIMEO_ACCESS_TOKEN_SECRET
 youtube:
 schooltube:
 khan_academy:

data/lib/active_public_resources/drivers/vimeo.rb

@@ -1,4 +1,5 @@
-require 'vimeo'
+require_relative '../oauth/vimeo.rb'
+require 'httparty'
 
 module ActivePublicResources
   module Drivers
@@ -18,18 +19,13 @@ module ActivePublicResources
       # @param [Hash] config_options the options which the vimeo gem requires
       # @option config_options [String] :consumer_key        Vimeo consumer key (required)
       # @option config_options [String] :consumer_secret     Vimeo consumer secret (required)
-      # @option config_options [String] :access_token        Vimeo access token (required)
-      # @option config_options [String] :access_token_secret Vimeo access token secret (required)
       def initialize(config_options={})
-        validate_options(config_options,
-          [:consumer_key, :consumer_secret, :access_token, :access_token_secret])
-
-        @client = ::Vimeo::Advanced::Video.new(
+        validate_options(config_options, [:consumer_key, :consumer_secret])
+        @client = ActivePublicResources::OAuth::Vimeo.new(
           config_options[:consumer_key],
-          config_options[:consumer_secret],
-          token: config_options[:access_token],
-          secret: config_options[:access_token_secret]
+          config_options[:consumer_secret]
         )
+        @access_token = @client.get_access_token
       end
 
       # Perform search request to Vimeo with search criteria
@@ -84,16 +80,23 @@ module ActivePublicResources
         request_criteria.validate_presence!([:query])
         raise StandardError.new("driver has not been initialized properly") unless @client
 
-        results = @client.search(request_criteria.query, {
-          :page           => request_criteria.page || 1,
-          :per_page       => request_criteria.per_page || 25,
-          :full_response  => 1,
-          :sort           => request_criteria.sort || "relevant",
-          :user_id        => nil,
-          :content_filter => request_criteria.content_filter || 'safe'
-        })
+        results = HTTParty.get('https://api.vimeo.com/videos',
+          query: {
+            query: request_criteria.query,
+            page: request_criteria.page || 1,
+            per_page: request_criteria.per_page || 25,
+            sort: 'relevant',
+            filter: 'content_rating',
+            filter_content_rating: 'safe'
+          },
+          headers: { "Authorization" => "Bearer #{@access_token}" }
+        )
 
-        return parse_results(request_criteria, results)
+        return parse_results(request_criteria, JSON.parse(results)) unless results.code == 401
+        if !@client.verify_token?(@access_token)
+          @access_token = @client.get_access_token
+          perform_request(request_criteria) if !@access_token.blank?
+        end
       end
 
     private
@@ -126,15 +129,16 @@ module ActivePublicResources
         @driver_response = DriverResponse.new(
           :criteria      => request_criteria,
           :next_criteria => next_criteria(request_criteria, results),
-          :total_items   => results['videos']['total'].to_i,
-          :items         => results['videos']['video'].map { |data| parse_video(data) }
+          :total_items   => results['total'].to_i,
+          :items         => results['data'].map { |data| parse_video(data) }
         )
       end
 
       def next_criteria(request_criteria, results)
-        page     = results['videos']['page'].to_i
-        per_page = results['videos']['perpage'].to_i
-        total    = results['videos']['total'].to_i
+        total = results['total'].to_i
+        page = results['page'].to_i
+        per_page = results['per_page'].to_i
+
         if ((page * per_page) < total)
           return RequestCriteria.new({
             :query    => request_criteria.query,
@@ -146,18 +150,18 @@ module ActivePublicResources
 
       def parse_video(data)
         video = ActivePublicResources::ResponseTypes::Video.new
-        video.id            = data['id']
-        video.title         = data['title']
-        video.description   = data['description']
-        video.thumbnail_url = data['thumbnails']['thumbnail'][0]['_content']
-        video.url           = data['urls']['url'][0]['_content']
-        video.embed_url     = "https://player.vimeo.com/video/#{data['id']}"
+        video.id            = "#{data['uri']}".gsub(/[^\d]/, '').to_i
+        video.title         = data['name']
+        video.description   = data['description'] || "No description found"
+        video.thumbnail_url = data['pictures']['sizes'][0]['link']
+        video.url           = data['link']
+        video.embed_url     = "https://player.vimeo.com/video/#{video.id}"
         video.duration      = data['duration'].to_i
-        video.num_views     = data['number_of_plays'].to_i
-        video.num_likes     = data['number_of_likes'].to_i
-        video.num_comments  = data['number_of_comments'].to_i
-        video.created_date  = Date.parse(data['upload_date'])
-        video.username      = data['owner']['display_name']
+        video.num_views     = data['stats']['plays'].to_i
+        video.num_likes     = data['metadata']['connections']['likes']['total'].to_i
+        video.num_comments  = data['metadata']['connections']['comments']['total'].to_i
+        video.created_date  = Date.parse(data['created_time'])
+        video.username      = data['user']['name']
         video.width         = 640
         video.height        = 360
 
@@ -172,13 +176,12 @@ module ActivePublicResources
         video.return_types << APR::ReturnTypes::Iframe.new(
           :driver => DRIVER_NAME,
           :remote_id => video.id,
-          :url    => "https://player.vimeo.com/video/#{data['id']}",
+          :url    => "https://player.vimeo.com/video/#{video.id}",
           :text   => video.title,
           :title  => video.title,
           :width  => 640,
           :height => 360
         )
-
         video
       end
 

data/lib/active_public_resources/oauth/vimeo.rb

@@ -0,0 +1,35 @@
+require 'httparty'
+require 'base64'
+
+module ActivePublicResources
+  module OAuth
+    class Vimeo
+      attr_reader :token
+
+      AUTHORIZE_URL = 'https://api.vimeo.com/oauth/authorize/client'
+      VERIFY_URL = 'https://api.vimeo.com/oauth/verify'
+
+      def initialize(consumer_key, consumer_secret)
+        @token = Base64.urlsafe_encode64("#{consumer_key}:#{consumer_secret}")
+      end
+
+      def get_access_token
+        response = HTTParty.post(
+          AUTHORIZE_URL,
+          body: { grant_type: 'client_credentials' },
+          headers: { "Authorization" => "Basic #{@token}" }
+        )
+        response['access_token']
+      end
+
+      def verify_token?(token)
+        response = HTTParty.get(
+          VERIFY_URL,
+          headers: { "Authorization" => "Bearer #{token}" }
+        )
+        response.code == 200
+      end
+
+    end
+  end
+end

data/lib/active_public_resources/version.rb

@@ -1,3 +1,3 @@
 module ActivePublicResources
-  VERSION = "0.2.5"
+  VERSION = "0.2.6"
 end

data/spec/lib/active_public_resources/drivers/vimeo_spec.rb

@@ -3,16 +3,16 @@ require 'spec_helper'
 describe APR::Drivers::Vimeo do
 
   let(:driver) { APR::Drivers::Vimeo.new(config_data[:vimeo]) }
-  
+
   describe ".initialize" do
-    it "should throw error when intializing without proper config options" do
+    it "should throw error when initializing without proper config options" do
       expect {
         APR::Drivers::Vimeo.new
       }.to raise_error(ArgumentError)
     end
 
     it "should build a vimeo client on initialize" do
-      driver.client.should be_an_instance_of(::Vimeo::Advanced::Video)
+      driver.client.should be_an_instance_of(APR::OAuth::Vimeo)
     end
   end
 
@@ -71,5 +71,5 @@ describe APR::Drivers::Vimeo do
       item.height.should eq(360)
     end
   end
-  
+
 end

data/spec/lib/active_public_resources/oauth/vimeo_spec.rb

@@ -0,0 +1,43 @@
+require 'spec_helper'
+require 'base64'
+require 'securerandom'
+
+describe APR::OAuth::Vimeo do
+
+  let(:client) { APR::OAuth::Vimeo.new(consumer_key, consumer_secret) }
+  let(:consumer_key) { 'key' }
+  let(:consumer_secret) { 'secret' }
+  let(:token) { Base64.urlsafe_encode64("#{consumer_key}:#{consumer_secret}") }
+  let(:access_token) { "#{SecureRandom.uuid}" }
+
+  describe ".initialize" do
+    it "should build a base64 encoded token" do
+      expect(client.token).to eq token
+    end
+  end
+
+  describe "#get_access_token" do
+    let(:response) { { "access_token" => access_token } }
+
+    it "should generate an access token" do
+      allow(HTTParty).to receive(:post) { response }
+      expect(client.get_access_token).to eq access_token
+    end
+  end
+
+  describe "#verify_token?" do
+    let(:response_ok) { double(:code => 200) }
+    let(:response_unauthorized) { double(:code => 401) }
+
+    it "should return 200 if token is verified" do
+      allow(HTTParty).to receive(:get) { response_ok }
+      expect(client.verify_token?(token)).to eq true
+    end
+
+    it "should return 401 if token is unauthorized" do
+      allow(HTTParty).to receive(:get) { response_unauthorized }
+      expect(client.verify_token?(token)).to eq false
+    end
+  end
+
+end

data/spec/spec_helper.rb

@@ -10,9 +10,11 @@ rescue LoadError => e
 end
 
 require 'active_public_resources'
+require 'webmock/rspec'
 require 'vcr'
 require 'pry'
 
+
 def config_data
   yaml_path = File.join(ActivePublicResources.root, 'active_public_resources_config.yml')
   unless File.exist? yaml_path

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: active_public_resources
 version: !ruby/object:Gem::Version
-  version: 0.2.5
+  version: 0.2.6
 platform: ruby
 authors:
 - Eric Berry
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-04-10 00:00:00.000000000 Z
+date: 2017-08-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -53,19 +53,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 0.8.6
 - !ruby/object:Gem::Dependency
-  name: vimeo
+  name: httparty
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.5.3
+        version: 0.15.6
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.5.3
+        version: 0.15.6
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -108,6 +108,7 @@ files:
 - lib/active_public_resources/drivers/schooltube.rb
 - lib/active_public_resources/drivers/vimeo.rb
 - lib/active_public_resources/drivers/youtube.rb
+- lib/active_public_resources/oauth/vimeo.rb
 - lib/active_public_resources/request_criteria.rb
 - lib/active_public_resources/response_types/exercise.rb
 - lib/active_public_resources/response_types/folder.rb
@@ -129,6 +130,7 @@ files:
 - spec/lib/active_public_resources/drivers/vimeo_spec.rb
 - spec/lib/active_public_resources/drivers/youtube_spec.rb
 - spec/lib/active_public_resources/live_client_spec.rb
+- spec/lib/active_public_resources/oauth/vimeo_spec.rb
 - spec/lib/active_public_resources/request_criteria_spec.rb
 - spec/spec_helper.rb
 - spec/vcr/active_public_resources/client/khan_academy_should_traverse_folders.yml
@@ -186,6 +188,7 @@ test_files:
 - spec/lib/active_public_resources/drivers/vimeo_spec.rb
 - spec/lib/active_public_resources/drivers/youtube_spec.rb
 - spec/lib/active_public_resources/live_client_spec.rb
+- spec/lib/active_public_resources/oauth/vimeo_spec.rb
 - spec/lib/active_public_resources/request_criteria_spec.rb
 - spec/spec_helper.rb
 - spec/vcr/active_public_resources/client/khan_academy_should_traverse_folders.yml