purdie 0.0.4 → 0.0.5

data/lib/purdie/cli.rb

@@ -9,8 +9,12 @@ module Purdie
     map %w(-v --version) => :version
 
     desc 'fetch', 'Fetch the data'
+    method_option :source_file,
+                  :aliases => '-f',
+                  :desc => 'Specify source file to process'
     def fetch
       b = Bernard.new
+      b.source_file options[:source_file] if options[:source_file]
       b.fetch
     end
   end

data/lib/purdie/config.rb

@@ -3,10 +3,10 @@ require 'purdie'
 module Purdie
   class Config
     def initialize
-      @conf = YAML.load File.read File.join(File.dirname(__FILE__), '..', '..', 'config/defaults.yaml')
+      @conf = YAML.load File.read File.join(File.dirname(__FILE__), '..', '..', '_config/defaults.yaml')
 
-      if File.exists? 'config/purdie.yaml'
-        y = YAML.load File.read 'config/purdie.yaml'
+      if File.exists? '_config/purdie.yaml'
+        y = YAML.load File.read '_config/purdie.yaml'
         @conf.deep_merge! y
       end
     end

data/lib/purdie/services/flickr.rb

@@ -21,7 +21,7 @@ module Purdie
         flickr.photos.getInfo(photo_id: id)
       end
 
-      def refine url
+      def distill url
         photo = get_photo url
         results = {}
 

data/lib/purdie/services/soundcloud.rb

@@ -23,7 +23,7 @@ module Purdie
         end[0]
       end
 
-      def refine url
+      def distill url
         track = get_track url
         results = {}
         results['title'] = track['title']

data/lib/purdie/services/vimeo.rb

@@ -24,7 +24,7 @@ module Purdie
         JSON.parse response.body
       end
 
-      def refine url
+      def distill url
         video = get_video url
         results = {}
 

data/lib/purdie/version.rb

@@ -1,3 +1,3 @@
 module Purdie
-  VERSION = "0.0.4"
+  VERSION = "0.0.5"
 end

data/spec/services/flickr_spec.rb

@@ -7,8 +7,8 @@ module Purdie
         @f = Flickr.new Config.new
       end
 
-      it 'refines data for a regular photo', :vcr do
-        expect(@f.refine 'https://www.flickr.com/photos/rawfunkmaharishi/15631479625/').to eq({
+      it 'distills data for a regular photo', :vcr do
+        expect(@f.distill 'https://www.flickr.com/photos/rawfunkmaharishi/15631479625/').to eq({
           "title"=>"The Comedy, October 2014",
           "date"=>"2014-10-22",
           "photo_page"=>"https://www.flickr.com/photos/rawfunkmaharishi/15631479625/",
@@ -19,8 +19,8 @@ module Purdie
         })
       end
 
-      it 'refines data for a photo without a specific photographer tag', :vcr do
-        expect(@f.refine 'https://www.flickr.com/photos/cluttercup/15950875724/').to eq ({
+      it 'distills data for a photo without a specific photographer tag', :vcr do
+        expect(@f.distill 'https://www.flickr.com/photos/cluttercup/15950875724/').to eq ({
           "title"=>"Raw Funk Maharishi",
           "date"=>"2015-02-18",
           "photo_page"=>"https://www.flickr.com/photos/cluttercup/15950875724/",
@@ -32,7 +32,7 @@ module Purdie
       end
 
       it 'falls back to the default photographer name', :vcr do
-        expect(@f.refine('https://www.flickr.com/photos/pikesley/16649739916/')['photographer']).to eq 'pikesley'
+        expect(@f.distill('https://www.flickr.com/photos/pikesley/16649739916/')['photographer']).to eq 'pikesley'
       end
     end
   end

data/spec/services/soundcloud_spec.rb

@@ -11,15 +11,15 @@ module Purdie
         expect(@sc.all_tracks).to be_a Array
       end
 
-      it 'extracts a track' do
+      it 'extracts a track', :vcr do
         track = @sc.get_track 'https://soundcloud.com/rawfunkmaharishi/hexaflexagon-1'
         expect(track).to be_a Hash
         expect(track['id']). to eq 193008299
       end
 
-      it 'refines the data' do
-        refined = @sc.refine 'https://soundcloud.com/rawfunkmaharishi/hexaflexagon-1'
-        expect(refined).to eq({
+      it 'distills the data', :vcr do
+        distilld = @sc.distill 'https://soundcloud.com/rawfunkmaharishi/hexaflexagon-1'
+        expect(distilld).to eq({
           "title"=>"Hexaflexagon",
           "id"=>193008299,
           "location"=>"Islington Academy",
@@ -27,6 +27,18 @@ module Purdie
           "license"=>"Attribution-NonCommercial-ShareAlike",
           "license_url"=>"http://creativecommons.org/licenses/by-nc-sa/4.0/"})
       end
+
+      it 'deals with a troublesome bawbag', :vcr do
+        distilld = @sc.distill 'https://soundcloud.com/rawfunkmaharishi/bernard'
+        expect(distilld).to eq({
+          "title"=>"Bernard",
+          "id"=>192841052,
+          "location"=>"Islington Academy",
+          "date"=>"2015-02-18",
+          "license"=>"Attribution-NonCommercial-ShareAlike",
+          "license_url"=>"http://creativecommons.org/licenses/by-nc-sa/4.0/"
+          })
+      end
     end
   end
 end

data/spec/services/vimeo_spec.rb

@@ -11,8 +11,8 @@ module Purdie
         expect(@v.get_video 'https://vimeo.com/117102891').to be_a Hash
       end
 
-      it 'refines a video', :vcr do
-        expect(@v.refine 'https://vimeo.com/117102891').to eq({
+      it 'distills a video', :vcr do
+        expect(@v.distill 'https://vimeo.com/117102891').to eq({
           "title"=>"Bernard",
           "id"=>117102891,
           "license"=>"Attribution-NonCommercial-ShareAlike",

data/spec/spec_helper.rb

@@ -16,11 +16,13 @@ RSpec.configure do |config|
   config.order = :random
 
   config.before :each do
-    FileUtils.cp File.join(File.dirname(__FILE__), '..', 'features/support/fixtures/config/purdie.yaml'),
-      File.join(File.dirname(__FILE__), '..', 'config/purdie.yaml')
+    FileUtils.cp File.join(File.dirname(__FILE__), '..', 'features/support/fixtures/_config/purdie.yaml'),
+      File.join(File.dirname(__FILE__), '..', '_config/purdie.yaml')
+    FileUtils.mkdir_p File.join(File.dirname(__FILE__), '..', '_sources')
   end
 
   config.after :each do
-    FileUtils.rm File.join(File.dirname(__FILE__), '..', 'config/purdie.yaml')
+    FileUtils.rm File.join(File.dirname(__FILE__), '..', '_config/purdie.yaml')
+    FileUtils.rmdir File.join(File.dirname(__FILE__), '..', '_sources')
   end
 end

data/spec/vcr/Purdie_Services_Flickr/distills_data_for_a_photo_without_a_specific_photographer_tag.yml

@@ -0,0 +1,123 @@
+---
+http_interactions:
+- request:
+    method: post
+    uri: https://api.flickr.com/services/rest/
+    body:
+      encoding: US-ASCII
+      string: photo_id=15950875724&method=flickr.photos.getInfo&format=json&nojsoncallback=1
+    headers:
+      Accept-Encoding:
+      - gzip;q=1.0,deflate;q=0.6,identity;q=0.3
+      Accept:
+      - "*/*"
+      User-Agent:
+      - FlickRaw/0.9.8
+      Authorization:
+      - OAuth realm="https://api.flickr.com/services/rest/", oauth_consumer_key="<FLICKR_API_KEY>",
+        oauth_nonce="zeLROUaoZ6bzHPl1DdzMUvDMPR3YjSprpYdFxtfoklU%3D", oauth_signature="<FLICKR_SECRET>%26",
+        oauth_signature_method="PLAINTEXT", oauth_timestamp="1425416099", oauth_token="",
+        oauth_version="1.0"
+      Content-Type:
+      - application/x-www-form-urlencoded
+  response:
+    status:
+      code: 200
+      message: OK
+    headers:
+      Date:
+      - Tue, 03 Mar 2015 20:54:59 GMT
+      Content-Type:
+      - application/json
+      Content-Length:
+      - '543'
+      P3p:
+      - policyref="http://info.yahoo.com/w3c/p3p.xml", CP="CAO DSP COR CUR ADM DEV
+        TAI PSA PSD IVAi IVDi CONi TELo OTPi OUR DELi SAMi OTRi UNRi PUBi IND PHY
+        ONL UNI PUR FIN COM NAV INT DEM CNT STA POL HEA PRE LOC GOV"
+      Cache-Control:
+      - private
+      X-Served-By:
+      - www22.flickr.bf1.yahoo.com
+      Vary:
+      - Accept-Encoding
+      Age:
+      - '0'
+      Via:
+      - http/1.1 fts115.flickr.bf1.yahoo.com (ApacheTrafficServer/4.0.2 [cMsSf ]),
+        http/1.1 r19.ycpi.ir2.yahoo.net (ApacheTrafficServer [cMsSf ])
+      Server:
+      - ATS
+      Connection:
+      - keep-alive
+    body:
+      encoding: ASCII-8BIT
+      string: '{"photo":{"id":"15950875724","secret":"23d58be214","server":"7398","farm":8,"dateuploaded":"1424289792","isfavorite":0,"license":"2","safety_level":"0","rotation":0,"originalsecret":"24a89b0cfe","originalformat":"jpg","owner":{"nsid":"54115632@N00","username":"cluttercup","realname":"Jane
+        Dickson","location":"London, UK","iconserver":"7338","iconfarm":8,"path_alias":"cluttercup"},"title":{"_content":""},"description":{"_content":""},"visibility":{"ispublic":1,"isfriend":0,"isfamily":0},"dates":{"posted":"1424289792","taken":"2015-02-18
+        16:56:20","takengranularity":"0","takenunknown":"0","lastupdate":"1424289832"},"views":"37","editability":{"cancomment":0,"canaddmeta":0},"publiceditability":{"cancomment":1,"canaddmeta":0},"usage":{"candownload":1,"canblog":0,"canprint":0,"canshare":1},"comments":{"_content":"0"},"notes":{"note":[]},"people":{"haspeople":0},"tags":{"tag":[]},"urls":{"url":[{"type":"photopage","_content":"https:\/\/www.flickr.com\/photos\/cluttercup\/15950875724\/"}]},"media":"photo"},"stat":"ok"}'
+    http_version: 
+  recorded_at: Tue, 03 Mar 2015 20:54:59 GMT
+- request:
+    method: post
+    uri: https://api.flickr.com/services/rest/
+    body:
+      encoding: US-ASCII
+      string: method=flickr.photos.licenses.getInfo&format=json&nojsoncallback=1
+    headers:
+      Accept-Encoding:
+      - gzip;q=1.0,deflate;q=0.6,identity;q=0.3
+      Accept:
+      - "*/*"
+      User-Agent:
+      - FlickRaw/0.9.8
+      Authorization:
+      - OAuth realm="https://api.flickr.com/services/rest/", oauth_consumer_key="<FLICKR_API_KEY>",
+        oauth_nonce="VY2qScign6PYW0Ro7fZX%2BkSmyRBQKejSHNZR%2B5rYl3I%3D", oauth_signature="<FLICKR_SECRET>%26",
+        oauth_signature_method="PLAINTEXT", oauth_timestamp="1425416099", oauth_token="",
+        oauth_version="1.0"
+      Content-Type:
+      - application/x-www-form-urlencoded
+  response:
+    status:
+      code: 200
+      message: OK
+    headers:
+      Date:
+      - Tue, 03 Mar 2015 20:55:00 GMT
+      Content-Type:
+      - application/json
+      Content-Length:
+      - '314'
+      P3p:
+      - policyref="http://info.yahoo.com/w3c/p3p.xml", CP="CAO DSP COR CUR ADM DEV
+        TAI PSA PSD IVAi IVDi CONi TELo OTPi OUR DELi SAMi OTRi UNRi PUBi IND PHY
+        ONL UNI PUR FIN COM NAV INT DEM CNT STA POL HEA PRE LOC GOV"
+      Cache-Control:
+      - private
+      X-Served-By:
+      - www252.flickr.bf1.yahoo.com
+      Vary:
+      - Accept-Encoding
+      Age:
+      - '2'
+      Via:
+      - http/1.1 fts123.flickr.bf1.yahoo.com (ApacheTrafficServer/4.0.2 [cMsSf ]),
+        http/1.1 r17.ycpi.ams.yahoo.net (ApacheTrafficServer [cMsSf ])
+      Server:
+      - ATS
+      Connection:
+      - keep-alive
+    body:
+      encoding: ASCII-8BIT
+      string: '{"licenses":{"license":[{"id":"0","name":"All Rights Reserved","url":""},{"id":"4","name":"Attribution
+        License","url":"https:\/\/creativecommons.org\/licenses\/by\/2.0\/"},{"id":"6","name":"Attribution-NoDerivs
+        License","url":"https:\/\/creativecommons.org\/licenses\/by-nd\/2.0\/"},{"id":"3","name":"Attribution-NonCommercial-NoDerivs
+        License","url":"https:\/\/creativecommons.org\/licenses\/by-nc-nd\/2.0\/"},{"id":"2","name":"Attribution-NonCommercial
+        License","url":"https:\/\/creativecommons.org\/licenses\/by-nc\/2.0\/"},{"id":"1","name":"Attribution-NonCommercial-ShareAlike
+        License","url":"https:\/\/creativecommons.org\/licenses\/by-nc-sa\/2.0\/"},{"id":"5","name":"Attribution-ShareAlike
+        License","url":"https:\/\/creativecommons.org\/licenses\/by-sa\/2.0\/"},{"id":"7","name":"No
+        known copyright restrictions","url":"https:\/\/www.flickr.com\/commons\/usage\/"},{"id":"8","name":"United
+        States Government Work","url":"http:\/\/www.usa.gov\/copyright.shtml"}]},"stat":"ok"}'
+    http_version: 
+  recorded_at: Tue, 03 Mar 2015 20:55:00 GMT
+recorded_with: VCR 2.9.3

data/spec/vcr/Purdie_Services_Flickr/distills_data_for_a_regular_photo.yml

@@ -0,0 +1,125 @@
+---
+http_interactions:
+- request:
+    method: post
+    uri: https://api.flickr.com/services/rest/
+    body:
+      encoding: US-ASCII
+      string: photo_id=15631479625&method=flickr.photos.getInfo&format=json&nojsoncallback=1
+    headers:
+      Accept-Encoding:
+      - gzip;q=1.0,deflate;q=0.6,identity;q=0.3
+      Accept:
+      - "*/*"
+      User-Agent:
+      - FlickRaw/0.9.8
+      Authorization:
+      - OAuth realm="https://api.flickr.com/services/rest/", oauth_consumer_key="<FLICKR_API_KEY>",
+        oauth_nonce="VVYdZIrfyfpFHuMOqg2BA%2Bisgir1ml4%2B%2FFFmDO3gr14%3D", oauth_signature="<FLICKR_SECRET>%26",
+        oauth_signature_method="PLAINTEXT", oauth_timestamp="1425416098", oauth_token="",
+        oauth_version="1.0"
+      Content-Type:
+      - application/x-www-form-urlencoded
+  response:
+    status:
+      code: 200
+      message: OK
+    headers:
+      Date:
+      - Tue, 03 Mar 2015 20:54:58 GMT
+      Content-Type:
+      - application/json
+      Content-Length:
+      - '665'
+      P3p:
+      - policyref="http://info.yahoo.com/w3c/p3p.xml", CP="CAO DSP COR CUR ADM DEV
+        TAI PSA PSD IVAi IVDi CONi TELo OTPi OUR DELi SAMi OTRi UNRi PUBi IND PHY
+        ONL UNI PUR FIN COM NAV INT DEM CNT STA POL HEA PRE LOC GOV"
+      Cache-Control:
+      - private
+      X-Served-By:
+      - www319.flickr.bf1.yahoo.com
+      Vary:
+      - Accept-Encoding
+      Age:
+      - '0'
+      Via:
+      - http/1.1 fts113.flickr.bf1.yahoo.com (ApacheTrafficServer/4.0.2 [cMsSf ]),
+        http/1.1 r07.ycpi.ams.yahoo.net (ApacheTrafficServer [cMsSf ])
+      Server:
+      - ATS
+      Connection:
+      - keep-alive
+    body:
+      encoding: ASCII-8BIT
+      string: '{"photo":{"id":"15631479625","secret":"b6168ee903","server":"3933","farm":4,"dateuploaded":"1414326010","isfavorite":0,"license":"1","safety_level":"0","rotation":0,"originalsecret":"3191340cdb","originalformat":"jpg","owner":{"nsid":"128943844@N06","username":"rawfunkmaharishi","realname":"Raw
+        Funk Maharishi","location":"","iconserver":"3933","iconfarm":4,"path_alias":"rawfunkmaharishi"},"title":{"_content":"The
+        Comedy, October 2014"},"description":{"_content":""},"visibility":{"ispublic":1,"isfriend":0,"isfamily":0},"dates":{"posted":"1414326010","taken":"2014-10-22
+        15:54:24","takengranularity":"0","takenunknown":"0","lastupdate":"1416111853"},"views":"92","editability":{"cancomment":0,"canaddmeta":0},"publiceditability":{"cancomment":1,"canaddmeta":0},"usage":{"candownload":1,"canblog":0,"canprint":0,"canshare":1},"comments":{"_content":"0"},"notes":{"note":[]},"people":{"haspeople":0},"tags":{"tag":[{"id":"128898522-15631479625-1422028","author":"128943844@N06","authorname":"rawfunkmaharishi","raw":"the
+        comedy","_content":"thecomedy","machine_tag":0},{"id":"128898522-15631479625-17975","author":"128943844@N06","authorname":"rawfunkmaharishi","raw":"gigs","_content":"gigs","machine_tag":0},{"id":"128898522-15631479625-228989594","author":"128943844@N06","authorname":"rawfunkmaharishi","raw":"photographer:kim","_content":"photographerkim","machine_tag":0}]},"urls":{"url":[{"type":"photopage","_content":"https:\/\/www.flickr.com\/photos\/rawfunkmaharishi\/15631479625\/"}]},"media":"photo"},"stat":"ok"}'
+    http_version: 
+  recorded_at: Tue, 03 Mar 2015 20:54:58 GMT
+- request:
+    method: post
+    uri: https://api.flickr.com/services/rest/
+    body:
+      encoding: US-ASCII
+      string: method=flickr.photos.licenses.getInfo&format=json&nojsoncallback=1
+    headers:
+      Accept-Encoding:
+      - gzip;q=1.0,deflate;q=0.6,identity;q=0.3
+      Accept:
+      - "*/*"
+      User-Agent:
+      - FlickRaw/0.9.8
+      Authorization:
+      - OAuth realm="https://api.flickr.com/services/rest/", oauth_consumer_key="<FLICKR_API_KEY>",
+        oauth_nonce="POoToL2%2BHBEVSE1Lt50VRY9qCMAlqvJ9oJpBo9JAzZE%3D", oauth_signature="<FLICKR_SECRET>%26",
+        oauth_signature_method="PLAINTEXT", oauth_timestamp="1425416098", oauth_token="",
+        oauth_version="1.0"
+      Content-Type:
+      - application/x-www-form-urlencoded
+  response:
+    status:
+      code: 200
+      message: OK
+    headers:
+      Date:
+      - Tue, 03 Mar 2015 20:54:59 GMT
+      Content-Type:
+      - application/json
+      Content-Length:
+      - '314'
+      P3p:
+      - policyref="http://info.yahoo.com/w3c/p3p.xml", CP="CAO DSP COR CUR ADM DEV
+        TAI PSA PSD IVAi IVDi CONi TELo OTPi OUR DELi SAMi OTRi UNRi PUBi IND PHY
+        ONL UNI PUR FIN COM NAV INT DEM CNT STA POL HEA PRE LOC GOV"
+      Cache-Control:
+      - private
+      X-Served-By:
+      - www295.flickr.bf1.yahoo.com
+      Vary:
+      - Accept-Encoding
+      Age:
+      - '0'
+      Via:
+      - http/1.1 fts122.flickr.bf1.yahoo.com (ApacheTrafficServer/4.0.2 [cMsSf ]),
+        http/1.1 r19.ycpi.ir2.yahoo.net (ApacheTrafficServer [cMsSf ])
+      Server:
+      - ATS
+      Connection:
+      - keep-alive
+    body:
+      encoding: ASCII-8BIT
+      string: '{"licenses":{"license":[{"id":"0","name":"All Rights Reserved","url":""},{"id":"4","name":"Attribution
+        License","url":"https:\/\/creativecommons.org\/licenses\/by\/2.0\/"},{"id":"6","name":"Attribution-NoDerivs
+        License","url":"https:\/\/creativecommons.org\/licenses\/by-nd\/2.0\/"},{"id":"3","name":"Attribution-NonCommercial-NoDerivs
+        License","url":"https:\/\/creativecommons.org\/licenses\/by-nc-nd\/2.0\/"},{"id":"2","name":"Attribution-NonCommercial
+        License","url":"https:\/\/creativecommons.org\/licenses\/by-nc\/2.0\/"},{"id":"1","name":"Attribution-NonCommercial-ShareAlike
+        License","url":"https:\/\/creativecommons.org\/licenses\/by-nc-sa\/2.0\/"},{"id":"5","name":"Attribution-ShareAlike
+        License","url":"https:\/\/creativecommons.org\/licenses\/by-sa\/2.0\/"},{"id":"7","name":"No
+        known copyright restrictions","url":"https:\/\/www.flickr.com\/commons\/usage\/"},{"id":"8","name":"United
+        States Government Work","url":"http:\/\/www.usa.gov\/copyright.shtml"}]},"stat":"ok"}'
+    http_version: 
+  recorded_at: Tue, 03 Mar 2015 20:54:59 GMT
+recorded_with: VCR 2.9.3