flickr_authentication 0.0.2 → 0.0.3

checksums.yaml

@@ -0,0 +1,15 @@
+---
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    OWMwZmU0MzA1MmIzNmY1NzA4ZTMzNzAzNjVjYjY2MDc0NGU3M2MzOA==
+  data.tar.gz: !binary |-
+    NGU3NzE5N2I5NGNhNzhjMDEwYjhlMDQyMTRiMTFhMjcyZTRlODJhYQ==
+SHA512:
+  metadata.gz: !binary |-
+    MTQxZmMxYjk5NWM4OWJjNDUyYmYwODcxZDA2YjBmZWQzNzU2N2QxYWYxMjM4
+    MDNkODdkZWViZGE0YTA3YTcwNDNkY2MzYTNkZmMwOTU0MWI0OTljMzc0M2M2
+    YWEyNzQ4MGViYTE1Mzk5NWNmYTFmODYzMjM0MDJkZGIxMjQ4MTU=
+  data.tar.gz: !binary |-
+    ZGI5OWM5MmM1MzA5ZDhjYTBmNDNjMDBhNzk3YWRjNDhhNTBiYWM3OTI2NTVk
+    ZTQ0MGUyZWJkYWViMjk5MTU1OTlkZWIwOTIwYTI3YTFlMGE3ZTNkYmNjOGYy
+    ZmVkZDAwZjZhMDdmNjFmM2Y1MzY3ZTg1ZWRjNzljZDAxODY4NzQ=

data/flickr_authentication.gemspec

@@ -19,8 +19,9 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   spec.add_dependency('launchy',  '0.4.0')
-  spec.add_dependency('flickraw', '0.8.4')
+  spec.add_dependency('flickraw', '0.9.8')
 
   spec.add_development_dependency "bundler", "~> 1.3"
   spec.add_development_dependency "rake"
+  spec.add_development_dependency "pry"
 end

data/lib/flickr_authentication.rb

@@ -20,28 +20,41 @@ class FlickrAuthentication
     if File.exists?(auth_file)
       puts "authenticating with #{auth_file}"
       data = YAML.load_file(auth_file)
-      auth = flickr.auth.checkToken :auth_token => data["api_token"]
+
+      flickr.access_token   = data['access_token']
+      flickr.access_secret  = data['access_secret']
+
+      begin
+        flickr.test.login
+      rescue Exception => e
+        puts "There are bad credentials in #{@auth_file}. Delete it and try again."
+      end
+
     else
-      frob      = flickr.auth.getFrob
-      auth_url  = FlickRaw.auth_url :frob => frob, :perms => "write"
+      token    = flickr.get_request_token
+      auth_url = flickr.get_authorize_url(token['oauth_token'], :perms => 'write')
 
       puts " "
       puts "opening your browser..."
       sleep 1
-      puts "Come back and press Enter when you are finished"
+      puts "Come back and press enter the given number when you are finished"
       sleep 2
       Launchy.open(auth_url)
 
-      STDIN.getc
-
-      # Authentication
-      auth  = flickr.auth.getToken :frob => frob
-      login = flickr.test.login
+      verify = gets.strip
 
-      puts auth.token
-      data              = {}
-      data["api_token"] = auth.token
-      File.open(auth_file, "w"){|f| YAML.dump(data, f) }
+      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}"
+        # Write the YML File
+        data = {}
+        data["access_token"]  = flickr.access_token
+        data["access_secret"] = flickr.access_secret
+        File.open(auth_file, "w"){|f| YAML.dump(data, f) }
+      rescue FlickRaw::FailedResponse => e
+        puts "Authentication failed : #{e.msg}"
+      end
     end
 
     flickr #return the flickr object

data/lib/flickr_authentication/version.rb

@@ -1,3 +1,3 @@
 class FlickrAuthentication
-  VERSION = "0.0.2"
+  VERSION = "0.0.3"
 end

metadata

@@ -1,20 +1,18 @@
 --- !ruby/object:Gem::Specification
 name: flickr_authentication
 version: !ruby/object:Gem::Version
-  version: 0.0.2
-  prerelease: 
+  version: 0.0.3
 platform: ruby
 authors:
 - Stephen Schor
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-23 00:00:00.000000000 Z
+date: 2014-07-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: launchy
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
@@ -22,7 +20,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
@@ -30,23 +27,20 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: flickraw
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.8.4
+        version: 0.9.8
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.8.4
+        version: 0.9.8
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -54,7 +48,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -62,7 +55,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -70,7 +62,20 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: pry
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -94,27 +99,26 @@ files:
 homepage: https://github.com/nodanaonlyzuul/flickr_authentication
 licenses:
 - MIT
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 2.2.2
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: A library that simplifies the authentication and storing of credentials for
   applicartions that use the Flickr API
 test_files: []