lib/ayadn/pinboard.rb in ayadn-3.0 vs lib/ayadn/pinboard.rb in ayadn-4.0

@@ -1,35 +1,31 @@
 # encoding: utf-8
 module Ayadn
   class PinBoard
 
-    def initialize
-      @status = Status.new
-    end
-
     def has_credentials_file?
-      File.exist?(Ayadn::Settings.config[:paths][:auth] + '/pinboard.data')
+      File.exist?(Ayadn::Settings.config.paths.auth + '/pinboard.data')
     end
 
-    def ask_credentials
+    def ask_credentials status = Status.new
       begin
-        @status.pin_username
+        status.pin_username
         pin_username = STDIN.gets.chomp()
-        @status.pin_password
+        status.pin_password
         pin_password = STDIN.noecho(&:gets).chomp()
       rescue Interrupt
-        @status.canceled
+        status.canceled
         exit
       rescue => e
-        @status.wtf
+        status.wtf
         Errors.global_error({error: e, caller: caller, data: [pin_username]})
       end
       save_credentials(encode(pin_username, pin_password))
     end
 
     def load_credentials
-      decode(File.read(Ayadn::Settings.config[:paths][:auth] + '/pinboard.data'))
+      decode(File.read(Ayadn::Settings.config.paths.auth + '/pinboard.data'))
     end
 
     def pin(data)
       pinboard = Pinboard::Client.new(:username => data.username, :password => data.password)
       pinboard.add(:url => data.url, :tags => data.tags, :extended => data.text, :description => data.description)
@@ -40,10 +36,10 @@
     def decode(encoded_pinboard_credentials)
       Base64.strict_decode64(encoded_pinboard_credentials[/AyadnPinboard (.*)/, 1]).split(":")
     end
 
     def save_credentials(encoded_pinboard_credentials)
-      File.write(Ayadn::Settings.config[:paths][:auth] + '/pinboard.data', encoded_pinboard_credentials)
+      File.write(Ayadn::Settings.config.paths.auth + '/pinboard.data', encoded_pinboard_credentials)
     end
 
     def encode(username, password)
       "AyadnPinboard #{Base64.strict_encode64([username, password].join(":"))}"
     end