flickraw 0.9.7 → 0.9.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 851e439d2bb948eb0ecbd3a6b2804fe830ead230
-  data.tar.gz: 377698252b1f918e76e2f5872828e5d19e0d3f90
+  metadata.gz: bc6ebd96bb86d75cb32adff22f3e2110405c9d53
+  data.tar.gz: c00d50468c5b8aa775bd0a9145d590c83fc4365a
 SHA512:
-  metadata.gz: acb89952f574296b48e1e1e6415a47baa21c4ec7ebcfbe00a3a96b54ba5a3c2acc326f23f78cd426a1f5f01df6fbd1e7960c8c0966b71e98b2fc622e2f50f752
-  data.tar.gz: 3a21201017f86c5a626bdb0d843e1f0005972c137495f9ce8ef622890c955b531f96d303497e8f3230b2c72f469e9757090ef533a634a49ef44d0428a250fb9c
+  metadata.gz: 6e600b2afe460bc96a670a0a20d7a1815cca53af6091191884f65177a843ee2d534f7a5eb1bbe965579643411f3f27dcbed1e8d26f3b4075011006d9c8b882bf
+  data.tar.gz: e784c567318a3483d5ae9c31f17aa5ca5fb8433caae3361f9c5bcd7e74664821bc5e99a2156e045eba809baeb6d5a9403078395398630b56636bd9caf36c075c

data/README.rdoc

@@ -111,8 +111,10 @@ If you need to have several users authenticated at the same time in your applica
 
 == Secure endpoints
 
+https endpoints are used by default. If you want to use unencrypted endpoints :
+
   require 'flickraw'
-  FlickRaw.secure = true
+  FlickRaw.secure = false
 
 == Flickr URL Helpers
 
@@ -121,32 +123,32 @@ There are some helpers to build flickr urls :
 === url, url_m, url_s, url_t, url_b, url_z, url_q, url_n, url_c, url_o
 
   info = flickr.photos.getInfo(:photo_id => "3839885270")
-  FlickRaw.url_b(info) # => "http://farm3.static.flickr.com/2485/3839885270_6fb8b54e06_b.jpg"
+  FlickRaw.url_b(info) # => "https://farm3.static.flickr.com/2485/3839885270_6fb8b54e06_b.jpg"
 
 === url_profile
 
   info = flickr.photos.getInfo(:photo_id => "3839885270")
-  FlickRaw.url_profile(info) # => "http://www.flickr.com/people/41650587@N02/"
+  FlickRaw.url_profile(info) # => "https://www.flickr.com/people/41650587@N02/"
 
 === url_photopage
 
   info = flickr.photos.getInfo(:photo_id => "3839885270")
-  FlickRaw.url_photopage(info) # => "http://www.flickr.com/photos/41650587@N02/3839885270"
+  FlickRaw.url_photopage(info) # => "https://www.flickr.com/photos/41650587@N02/3839885270"
 
 === url_photoset, url_photosets
 
   info = flickr.photos.getInfo(:photo_id => "3839885270")
-  FlickRaw.url_photosets(info) # => "http://www.flickr.com/photos/41650587@N02/sets/"
+  FlickRaw.url_photosets(info) # => "https://www.flickr.com/photos/41650587@N02/sets/"
 
 === url_short, url_short_m, url_short_s, url_short_t
 
   info = flickr.photos.getInfo(:photo_id => "3839885270")
-  FlickRaw.url_short(info) # => "http://flic.kr/p/6Rjq7s"
+  FlickRaw.url_short(info) # => "https://flic.kr/p/6Rjq7s"
 
 === url_photostream
 
   info = flickr.photos.getInfo(:photo_id => "3839885270")
-  FlickRaw.url_photostream(info) # => "http://www.flickr.com/photos/41650587@N02/"
+  FlickRaw.url_photostream(info) # => "https://www.flickr.com/photos/41650587@N02/"
 
 
 See the _examples_ directory to find more examples.

data/examples/web_oauth.rb

@@ -46,7 +46,6 @@ def callback
 
   # Attach the tokens to your flickr instance - you can now make authenticated calls with the flickr object
   flickr.access_token = oauth_token
-  flickr.access_secret =[oauth_token_secret
-
+  flickr.access_secret = oauth_token_secret
 end
 

data/lib/flickraw.rb

@@ -6,8 +6,10 @@ require 'flickraw/response'
 require 'flickraw/api'
 
 module FlickRaw
-  VERSION='0.9.7'
+  VERSION='0.9.8'
   USER_AGENT = "FlickRaw/#{VERSION}"
+  
+  self.secure = true
 end
 
 # Use this to access the flickr API easily. You can type directly the flickr requests as they are described on the flickr website.

data/lib/flickraw/api.rb

@@ -1,7 +1,7 @@
 module FlickRaw
   END_POINT='http://api.flickr.com/services'.freeze
   END_POINT2='http://www.flickr.com/services'.freeze
-  END_POINT_SECURE='https://secure.flickr.com/services'.freeze
+  END_POINT_SECURE='https://api.flickr.com/services'.freeze
   
   FLICKR_OAUTH_REQUEST_TOKEN=(END_POINT2 + '/oauth/request_token').freeze
   FLICKR_OAUTH_AUTHORIZE=(END_POINT2 + '/oauth/authorize').freeze
@@ -19,10 +19,10 @@ module FlickRaw
   UPLOAD_PATH_SECURE=(END_POINT_SECURE + '/upload/').freeze
   REPLACE_PATH_SECURE=(END_POINT_SECURE + '/replace/').freeze
 
-  PHOTO_SOURCE_URL='http://farm%s.staticflickr.com/%s/%s_%s%s.%s'.freeze
-  URL_PROFILE='http://www.flickr.com/people/'.freeze
-  URL_PHOTOSTREAM='http://www.flickr.com/photos/'.freeze
-  URL_SHORT='http://flic.kr/p/'.freeze
+  PHOTO_SOURCE_URL='https://farm%s.staticflickr.com/%s/%s_%s%s.%s'.freeze
+  URL_PROFILE='https://www.flickr.com/people/'.freeze
+  URL_PHOTOSTREAM='https://www.flickr.com/photos/'.freeze
+  URL_SHORT='https://flic.kr/p/'.freeze
 
   class FlickrAppNotConfigured < Error; end
 

data/lib/flickraw/oauth.rb

@@ -37,14 +37,14 @@ module FlickRaw
       def sign_rsa_sha1(method, url, params, token_secret, consumer_secret)
         text = signature_base_string(method, url, params)
         key = OpenSSL::PKey::RSA.new(consumer_secret)
-        digest = OpenSSL::Digest::Digest.new("sha1")
+        digest = OpenSSL::Digest::SHA1.new
         [key.sign(digest, text)].pack('m0').gsub(/\n$/,'')
       end
             
       def sign_hmac_sha1(method, url, params, token_secret, consumer_secret)
         text = signature_base_string(method, url, params)
         key = escape(consumer_secret) + "&" + escape(token_secret)
-        digest = OpenSSL::Digest::Digest.new("sha1")
+        digest = OpenSSL::Digest::SHA1.new
         [OpenSSL::HMAC.digest(digest, key, text)].pack('m0').gsub(/\n$/,'')
       end
     

data/test/helper.rb

@@ -5,7 +5,7 @@ require 'flickraw'
 
 FlickRaw.api_key = ENV['FLICKRAW_API_KEY']
 FlickRaw.shared_secret = ENV['FLICKRAW_SHARED_SECRET']
-#FlickRaw.secure = true
+#FlickRaw.secure = false
 
 flickr.access_token = ENV['FLICKRAW_ACCESS_TOKEN']
 flickr.access_secret = ENV['FLICKRAW_ACCESS_SECRET']

data/test/test.rb

@@ -290,9 +290,9 @@ class Basic < Test::Unit::TestCase
     user = flickr.people.getInfo :user_id => "41650587@N02"
     people user
     assert_equal "Flickraw", user.realname
-    assert_equal "http://www.flickr.com/photos/41650587@N02/", user.photosurl
-    assert_equal "http://www.flickr.com/people/41650587@N02/", user.profileurl
-    assert_equal "http://m.flickr.com/photostream.gne?id=41630239", user.mobileurl
+    assert_equal "https://www.flickr.com/photos/41650587@N02/", user.photosurl
+    assert_equal "https://www.flickr.com/people/41650587@N02/", user.profileurl
+    assert_equal "https://m.flickr.com/photostream.gne?id=41630239", user.mobileurl
     assert_equal 0, user.ispro
   end
   
@@ -342,7 +342,7 @@ class Basic < Test::Unit::TestCase
   
   def test_photos_getSizes
     info = flickr.photos.getSizes :photo_id => "3839885270"
-    assert_equal "http://www.flickr.com/photos/41650587@N02/3839885270/sizes/l/", info.find {|f| f.label == "Large"}.url
+    assert_equal "https://www.flickr.com/photos/41650587@N02/3839885270/sizes/l/", info.find {|f| f.label == "Large"}.url
     if FlickRaw.secure
       source = "https://farm3.staticflickr.com/2485/3839885270_6fb8b54e06_b.jpg"
     else
@@ -365,7 +365,7 @@ class Basic < Test::Unit::TestCase
     assert_equal "41630239-3839885270-72157621986549875", comments[0].id
     assert_equal "41650587@N02", comments[0].author
     assert_equal "ruby_flickraw", comments[0].authorname
-    assert_equal "http://www.flickr.com/photos/41650587@N02/3839885270/#comment72157621986549875", comments[0].permalink
+    assert_equal "https://www.flickr.com/photos/41650587@N02/3839885270/#comment72157621986549875", comments[0].permalink
     assert_equal "This is a cute cat !", comments[0].to_s
   end
   
@@ -387,29 +387,29 @@ class Basic < Test::Unit::TestCase
   def test_urls_getGroup
     info = flickr.urls.getGroup :group_id => "51035612836@N01"
     assert_equal "51035612836@N01", info.nsid
-    assert_equal "http://www.flickr.com/groups/api/", info.url
+    assert_equal "https://www.flickr.com/groups/api/", info.url
   end
   
   def test_urls_getUserPhotos
     info = flickr.urls.getUserPhotos :user_id => "41650587@N02"
     assert_equal "41650587@N02", info.nsid
-    assert_equal "http://www.flickr.com/photos/41650587@N02/", info.url
+    assert_equal "https://www.flickr.com/photos/41650587@N02/", info.url
   end
   
   def test_urls_getUserProfile
     info = flickr.urls.getUserProfile :user_id => "41650587@N02"
     assert_equal "41650587@N02", info.nsid
-    assert_equal "http://www.flickr.com/people/41650587@N02/", info.url
+    assert_equal "https://www.flickr.com/people/41650587@N02/", info.url
   end
   
   def test_urls_lookupGroup
-    info = flickr.urls.lookupGroup :url => "http://www.flickr.com/groups/api/"
+    info = flickr.urls.lookupGroup :url => "https://www.flickr.com/groups/api/"
     assert_equal "51035612836@N01", info.id
     assert_equal "Flickr API", info.groupname
   end
   
   def test_urls_lookupUser
-    info = flickr.urls.lookupUser :url => "http://www.flickr.com/photos/41650587@N02/"
+    info = flickr.urls.lookupUser :url => "https://www.flickr.com/photos/41650587@N02/"
     assert_equal "41650587@N02", info.id
     assert_equal "ruby_flickraw", info.username
   end
@@ -418,21 +418,21 @@ class Basic < Test::Unit::TestCase
     id = "3839885270"
     info = flickr.photos.getInfo(:photo_id => id)
 
-    assert_equal "http://farm3.staticflickr.com/2485/3839885270_6fb8b54e06.jpg", FlickRaw.url(info)
-    assert_equal "http://farm3.staticflickr.com/2485/3839885270_6fb8b54e06_m.jpg", FlickRaw.url_m(info)
-    assert_equal "http://farm3.staticflickr.com/2485/3839885270_6fb8b54e06_s.jpg", FlickRaw.url_s(info)
-    assert_equal "http://farm3.staticflickr.com/2485/3839885270_6fb8b54e06_t.jpg", FlickRaw.url_t(info)
-    assert_equal "http://farm3.staticflickr.com/2485/3839885270_6fb8b54e06_b.jpg", FlickRaw.url_b(info)
-    assert_equal "http://farm3.staticflickr.com/2485/3839885270_6fb8b54e06_z.jpg", FlickRaw.url_z(info)
-    assert_equal "http://farm3.staticflickr.com/2485/3839885270_6fb8b54e06_q.jpg", FlickRaw.url_q(info)
-    assert_equal "http://farm3.staticflickr.com/2485/3839885270_6fb8b54e06_n.jpg", FlickRaw.url_n(info)
-    assert_equal "http://farm3.staticflickr.com/2485/3839885270_6fb8b54e06_c.jpg", FlickRaw.url_c(info)
+    assert_equal "https://farm3.staticflickr.com/2485/3839885270_6fb8b54e06.jpg", FlickRaw.url(info)
+    assert_equal "https://farm3.staticflickr.com/2485/3839885270_6fb8b54e06_m.jpg", FlickRaw.url_m(info)
+    assert_equal "https://farm3.staticflickr.com/2485/3839885270_6fb8b54e06_s.jpg", FlickRaw.url_s(info)
+    assert_equal "https://farm3.staticflickr.com/2485/3839885270_6fb8b54e06_t.jpg", FlickRaw.url_t(info)
+    assert_equal "https://farm3.staticflickr.com/2485/3839885270_6fb8b54e06_b.jpg", FlickRaw.url_b(info)
+    assert_equal "https://farm3.staticflickr.com/2485/3839885270_6fb8b54e06_z.jpg", FlickRaw.url_z(info)
+    assert_equal "https://farm3.staticflickr.com/2485/3839885270_6fb8b54e06_q.jpg", FlickRaw.url_q(info)
+    assert_equal "https://farm3.staticflickr.com/2485/3839885270_6fb8b54e06_n.jpg", FlickRaw.url_n(info)
+    assert_equal "https://farm3.staticflickr.com/2485/3839885270_6fb8b54e06_c.jpg", FlickRaw.url_c(info)
 
-    assert_equal "http://www.flickr.com/people/41650587@N02/", FlickRaw.url_profile(info)
-    assert_equal "http://www.flickr.com/photos/41650587@N02/", FlickRaw.url_photostream(info)
-    assert_equal "http://www.flickr.com/photos/41650587@N02/3839885270", FlickRaw.url_photopage(info)
-    assert_equal "http://www.flickr.com/photos/41650587@N02/sets/", FlickRaw.url_photosets(info)
-    assert_equal "http://flic.kr/p/6Rjq7s", FlickRaw.url_short(info)
+    assert_equal "https://www.flickr.com/people/41650587@N02/", FlickRaw.url_profile(info)
+    assert_equal "https://www.flickr.com/photos/41650587@N02/", FlickRaw.url_photostream(info)
+    assert_equal "https://www.flickr.com/photos/41650587@N02/3839885270", FlickRaw.url_photopage(info)
+    assert_equal "https://www.flickr.com/photos/41650587@N02/sets/", FlickRaw.url_photosets(info)
+    assert_equal "https://flic.kr/p/6Rjq7s", FlickRaw.url_short(info)
   end
 
   def test_url_escape

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: flickraw
 version: !ruby/object:Gem::Version
-  version: 0.9.7
+  version: 0.9.8
 platform: ruby
 authors:
 - Mael Clerambault
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-28 00:00:00.000000000 Z
+date: 2014-04-06 00:00:00.000000000 Z
 dependencies: []
 description: 
 email: mael@clerambault.fr
@@ -16,25 +16,25 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- LICENSE
+- README.rdoc
 - examples/auth.rb
 - examples/interestingness.rb
 - examples/search.rb
 - examples/sinatra.rb
 - examples/upload.rb
 - examples/web_oauth.rb
-- test/helper.rb
-- test/test_upload.rb
-- test/test.rb
-- lib/flickraw/request.rb
+- flickraw_rdoc.rb
+- lib/flickraw.rb
 - lib/flickraw/api.rb
 - lib/flickraw/error.rb
 - lib/flickraw/oauth.rb
+- lib/flickraw/request.rb
 - lib/flickraw/response.rb
-- lib/flickraw.rb
-- flickraw_rdoc.rb
-- LICENSE
-- README.rdoc
 - rakefile
+- test/helper.rb
+- test/test.rb
+- test/test_upload.rb
 homepage: http://hanklords.github.com/flickraw/
 licenses:
 - MIT
@@ -55,7 +55,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Flickr library with a syntax close to the syntax described on http://www.flickr.com/services/api