purdie 0.0.10 → 0.0.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f7c06826645ecad1b7d8a52a703ea4b654a67fd6
-  data.tar.gz: 9a254bbbd7487741fbc7c13adae35e5730f6574c
+  metadata.gz: e4e6e972e93cf8cdd2ec9d9eeef1b617445d7a20
+  data.tar.gz: 44a7bb6b0d4030f7a27a03fe85f827df4b1d4942
 SHA512:
-  metadata.gz: 8ba2d9e0d257920bf1e3df1aa62bea58d1b55b36a032f79378e0a48dfc7c3e899a4e4957822990d83b88cf73f998e403dd6e25d62fff31950e65d0ef519a535c
-  data.tar.gz: 7ee9dfe27711152f798b11e91b7babeedfd70ddae964ef6f9fba63e0454d51f27ff08d6a06618cb240a3a1bd1c2aaa590248a2245b19e360fe6a39fb9aeb0cd7
+  metadata.gz: bbc8b0189d139240c47f2916cbdced45818c7b7c9480e2c4e22bbf45876953eea012bf040b06276585c4a6b507c6437dc08560b49c789e281aaa0efee9b5bf00
+  data.tar.gz: 096c577dad0b09883efbfded82434faac5f6034066e98e1a221d6b94d10fa2bd229f1764ee89be8e8709f360d0a61107f6c63a4bd1dc1eb0c4510de84069363b

data/README.md

@@ -45,7 +45,7 @@ You need to create a *_sources* directory in your Jekyll project, containing fil
 
 (you can alternatively specify a source file on the command line with the `-f` flag).
 
-You also need a *.env* file with API keys in it:
+You also need a *.env* file with the relevant credentials in it:
 
     FLICKR_API_KEY: this_a_key
     FLICKR_SECRET: this_a_secret
@@ -55,7 +55,7 @@ You also need a *.env* file with API keys in it:
 
     VIMEO_BEARER_TOKEN: this_is_bearer_token
 
-(get those keys from [Flickr](https://www.flickr.com/services/apps/create/apply), [SoundCloud](http://soundcloud.com/you/apps/new) and [Vimeo](https://developer.vimeo.com/apps/new))
+(get those things from [Flickr](https://www.flickr.com/services/apps/create/apply), [SoundCloud](http://soundcloud.com/you/apps/new) and [Vimeo](https://developer.vimeo.com/apps/new))
 
 And then you can run
 

data/lib/purdie/ingester.rb

@@ -34,13 +34,6 @@ module Purdie
 
         @size = specific_config['size'] if specific_config['size']
       end
-
-
-      # Can I do something like
-      # @config['services'][Purdie.basename self].each do |c|
-      #   @#{c} = c
-      # end
-      # ?
     end
 
     def ingest url

data/lib/purdie/services/flickr.rb

@@ -1,6 +1,5 @@
 require 'purdie'
-
-Dotenv.load
+require 'flickraw-cached'
 
 FlickRaw.api_key = ENV['FLICKR_API_KEY']
 FlickRaw.shared_secret = ENV['FLICKR_SECRET']

data/lib/purdie/services/soundcloud.rb

@@ -1,6 +1,5 @@
 require 'purdie'
-
-Dotenv.load
+require 'soundcloud'
 
 module Purdie
   module Services
@@ -24,15 +23,15 @@ module Purdie
         results
       end
 
-      def self.matcher
-        'soundcloud.com'
-      end
-
       def self.resolve_set url
         client = ::SoundCloud.new client_id: ENV['SOUNDCLOUD_CLIENT_ID']
         client.get('/resolve', url: url).tracks.
           map { |track| track['permalink_url'] }
       end
+
+      def self.matcher
+        'soundcloud.com'
+      end
     end
   end
 end

data/lib/purdie/services/vimeo.rb

@@ -5,21 +5,10 @@ module Purdie
     class Vimeo
       include Purdie::Ingester
 
-      def configure
-        @host = 'https://api.vimeo.com'
-        super
-      end
-
       def get url
         @id = Purdie.get_id url
-
-        target = "#{@host}/videos/#{@id}"
-        headers = {
-          'Authorization' => "bearer #{ENV['VIMEO_BEARER_TOKEN']}",
-          'Accept' => 'application/json'
-        }
-        response = HTTParty.get target, headers: headers
-
+        target = "#{Vimeo.host}/videos/#{@id}"
+        response = HTTParty.get target, headers: Vimeo.headers
         JSON.parse response.body
       end
 
@@ -34,10 +23,27 @@ module Purdie
 
         results
       end
-        
+
+      def self.headers
+        {
+          'Authorization' => "bearer #{ENV['VIMEO_BEARER_TOKEN']}",
+          'Accept' => 'application/json'
+        }
+      end
+
+      def self.resolve_set url
+        target = "#{Vimeo.host}/albums/#{Purdie.get_id url}/videos/"
+        set = JSON.parse (HTTParty.get target, headers: Vimeo.headers).body
+        set['data'].map { |video| video['link'] }
+      end
+
       def self.matcher
         'vimeo.com'
       end
+
+      def self.host
+        'https://api.vimeo.com'
+      end
     end
   end
 end

data/lib/purdie/services/youtube.rb

@@ -1,5 +1,4 @@
 require 'purdie'
-require 'cgi'
 require 'google/api_client'
 
 module Purdie

data/lib/purdie/version.rb

@@ -1,3 +1,3 @@
 module Purdie
-  VERSION = "0.0.10"
+  VERSION = "0.0.11"
 end

data/lib/purdie.rb

@@ -3,8 +3,7 @@ require 'yaml'
 require 'deep_merge'
 require 'httparty'
 require 'dotenv'
-require 'soundcloud'
-require 'flickraw-cached'
+require 'cgi'
 require 'active_support/inflector'
 
 require 'purdie/version'
@@ -18,3 +17,5 @@ require 'purdie/services/soundcloud'
 require 'purdie/services/flickr'
 require 'purdie/services/vimeo'
 require 'purdie/services/youtube'
+
+Dotenv.load

data/spec/services/vimeo_spec.rb

@@ -22,6 +22,19 @@ license_url: http://creativecommons.org/licenses/by-nc-sa/3.0/
 "
         )
       end
+
+      context 'resolve an album' do
+        it 'resolves an album from a URL' do
+          # We're going to call this a set for consistency
+          set = Vimeo.resolve_set 'https://vimeo.com/album/3296736'
+          expect(set.count).to eq 3
+          expect(set).to eq [
+            'https://vimeo.com/rawfunkmaharishi/safetyonboard',
+            'https://vimeo.com/rawfunkmaharishi/trappedinhawaii',
+            'https://vimeo.com/rawfunkmaharishi/discotheque-metamorphosis'
+          ]
+        end
+      end
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: purdie
 version: !ruby/object:Gem::Version
-  version: 0.0.10
+  version: 0.0.11
 platform: ruby
 authors:
 - pikesley
@@ -311,7 +311,6 @@ files:
 - _data/flickr.yaml
 - _data/soundcloud.yaml
 - bin/purdie
-- cruft.rb
 - features/bad-url.feature
 - features/comments.feature
 - features/flickr-album.feature
@@ -356,7 +355,6 @@ files:
 - lib/purdie/services/youtube.rb
 - lib/purdie/source_list.rb
 - lib/purdie/version.rb
-- list
 - purdie.gemspec
 - spec/config_spec.rb
 - spec/helpers_spec.rb
@@ -387,7 +385,6 @@ files:
 - spec/vcr/Purdie_SourceList/resolve_sets/resolves_a_Flickr_set.yml
 - spec/vcr/Purdie_SourceList/resolve_sets/resolves_a_SoundCloud_set.yml
 - spec/vcr/Purdie_SourceList/resolves_a_Flickr_set.yml
-- wtf.log
 homepage: ''
 licenses:
 - MIT

data/cruft.rb

@@ -1,10 +0,0 @@
-require 'active_support/inflector'
-
-class Thing
-  def hello
-    puts "I am a #{self.class.name}"
-  end
-end
-
-t = "Thing".constantize.new
-t.hello

data/list

@@ -1 +0,0 @@
-https://soundcloud.com/rawfunkmaharishi/bernard

data/wtf.log

@@ -1 +0,0 @@
-16252009191