image_puller 0.2.2 → 0.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f4d6f8b3aa69adcf0996129eaf61997b38c572a8790a28b073b9b57ed443a4cf
-  data.tar.gz: 89bc1c0fcacaf36278147e4a99500b89b318efc2b5103fc107ab05254f80e387
+  metadata.gz: 43694ba97ed29f91330b6e2396ff9013816b9fadb71ec2d2a00fe54fe5b7c43e
+  data.tar.gz: c703cdbbb9457de204130270dd367dfa8ff00dd438c87bec7d6986171d1a970b
 SHA512:
-  metadata.gz: afabc83d0bd69cd3ca1ee343a792e94d3f968c4373efec8c754a1075a7521518b11ee4ed387ce690a0f72bf92a9bd0bc37ab171a3a2bb9053303f0cd5ead9236
-  data.tar.gz: 7258cc5690096c4bab21ee6a76e087cf1ece5cc0874dbdf69d4d6a985e948a44621bcfac22143d1618a5ee0b408ef122f5fc7963fd8254d030cd50efab54b04e
+  metadata.gz: f3bdfe322a634d52c0ed34c725beda608b3ac83d3503e06e1a7185e4e907cff66ab213d63687c91be55036400a7d592d3ad3965ac670efcc99c8cdcd6d66c732
+  data.tar.gz: 2ffeb991a57bbdd511afe7d1e7b988c780af4034e7c082b3c12542bdac0e6ea265b9ce95a61026835ce7894dbb7619a02d13e70d20219a2055b6f6957fcd0c23

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    image_puller (0.2.2)
+    image_puller (0.2.3)
       activesupport (~> 5.2)
       flickraw
       ruby-progressbar (~> 1.10)

data/image_puller.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |spec|
   spec.name          = 'image_puller'
-  spec.version       =  '0.2.2'
+  spec.version       =  '0.2.3'
   spec.authors       = ['Nick Longmore']
   spec.email         = ['neeko99@gmail.com']
   spec.summary       = 'Pulls all images from Flickr under photostreams '

data/lib/flickr/authenticator.rb

@@ -1,46 +1,51 @@
 module Flickr
   class Authenticator
 
-    def flickr
-      @flickr ||= get_tokens
-    end
+    class << self
 
-    def get_tokens
-      flickr = FlickRaw::Flickr.new(api_key: ENV['FLICKR_API_KEY'], shared_secret: ENV['FLICKR_SHARED_SECRET'])
+      def authenticate(should_retry = true)
+        flickr = FlickRaw::Flickr.new(api_key: ENV['FLICKR_API_KEY'], shared_secret: ENV['FLICKR_SHARED_SECRET'])
 
-      if File.exist? 'authkey.json'
-        auth_key = JSON.parse(File.read('authkey.json'))
+        if File.exist? 'authkey.json'
+          auth_key = JSON.parse(File.read('authkey.json'))
 
-        flickr.access_token = auth_key['access_token']
-        flickr.access_secret = auth_key['secret']
-      end
+          flickr.access_token = auth_key['access_token']
+          flickr.access_secret = auth_key['secret']
+        end
+
+        begin
+          flickr.test.login
+        rescue StandardError => e
+          raise unless should_retry
+
+          oauth(flickr)
+          # retry
+          authenticate(false)
+        end
 
-      begin
-        flickr.test.login
         flickr
-      rescue  FlickRaw::FailedResponse => e
-        authenticate
-        # retry
-        get_tokens
       end
-    end
 
-    def authenticate
-      token = flickr.get_request_token
-      auth_url = flickr.get_authorize_url(token['oauth_token'], :perms => 'delete')
+      private
 
-      puts "Open this url in your browser to complete the authentication process : #{auth_url}"
-      puts "Copy here the number given when you complete the process."
-      verify = gets.strip
+      def oauth(flickr)
 
-      begin
-        flickr.get_access_token(token['oauth_token'], token['oauth_token_secret'], verify)
-        login = flickr.test.login
-        puts "You are now authenticated as #{login.username} with token #{flickr.access_token} and secret #{flickr.access_secret}"
-        File.write('authkey.json', { access_token: flickr.access_token, secret: flickr.access_secret }.to_json)
-        flickr
-      rescue FlickRaw::FailedResponse => e
-        puts "Authentication failed : #{e.msg}"
+        token = flickr.get_request_token
+        auth_url = flickr.get_authorize_url(token['oauth_token'], :perms => 'delete')
+
+        puts "Open this url in your browser to complete the authentication process : #{auth_url}"
+        puts 'Copy here the number given when you complete the process.'
+        verify = STDIN.gets.strip
+
+        begin
+          flickr.get_access_token(token['oauth_token'], token['oauth_token_secret'], verify)
+          login = flickr.test.login
+          puts "You are now authenticated as #{login.username} with token #{flickr.access_token} and secret #{flickr.access_secret}"
+          File.write('authkey.json', { access_token: flickr.access_token, secret: flickr.access_secret }.to_json)
+          flickr
+        rescue FlickRaw::FailedResponse => e
+          puts "Authentication failed : #{e.msg}"
+        end
       end
     end
   end

data/lib/strategies/flickr.rb

@@ -8,8 +8,8 @@ module Strategy
       def exec
         return puts 'Missing Requirements for Flickr Download please see documentation' unless has_requirements?
 
-        auth = ::Flickr::Authenticator.new
-        downloader = ::Flickr::Downloader.new(auth.flickr)
+        auth = ::Flickr::Authenticator.authenticate
+        downloader = ::Flickr::Downloader.new(auth)
 
         downloader.download
       end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: image_puller
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.2.3
 platform: ruby
 authors:
 - Nick Longmore
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-03-16 00:00:00.000000000 Z
+date: 2020-03-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pry-byebug