flickr.rb 1.1.2 → 1.2.0

data/test/flickr_test.rb

@@ -16,6 +16,21 @@ class TestFlickr < Test::Unit::TestCase
     assert_equal 'some_shared_secret', flickr.instance_variable_get(:@shared_secret)
   end
 
+  def test_should_instantiate_new_flickr_with_ssl_verify_enabled_by_default
+    Flickr.any_instance.stubs(:login)
+    flickr = Flickr.new('some_api_key')
+    assert_equal true, flickr.instance_variable_get(:@verify_ssl)
+  end
+
+  def test_should_instantiate_new_flickr_with_ssl_options
+    Flickr.any_instance.stubs(:login)
+    flickr = Flickr.new(:api_key => 'some_api_key',  :verify_ssl => false, :ca_file => 'a/path/to/cert.pem')
+
+    assert_equal 'some_api_key', flickr.api_key
+    assert_equal false, flickr.instance_variable_get(:@verify_ssl)
+    assert_equal 'a/path/to/cert.pem', flickr.instance_variable_get(:@ca_file)
+  end
+
   def test_should_instantiate_new_flickr_client_on_new_api
     flickr = Flickr.new(:api_key => 'some_api_key', :shared_secret => 'some_shared_secret', 'foo' => 'bar')
 
@@ -181,7 +196,7 @@ class TestFlickr < Test::Unit::TestCase
   def test_should_generate_login_url
     f = flickr_client
     f.expects(:signature_from).with('api_key' => 'some_api_key', 'perms' => 'write').returns('validsignature')
-    assert_equal 'http://flickr.com/services/auth/?api_key=some_api_key&perms=write&api_sig=validsignature', f.login_url('write')
+    assert_equal 'https://flickr.com/services/auth/?api_key=some_api_key&perms=write&api_sig=validsignature', f.login_url('write')
   end
 
   def test_should_get_token_from_frob

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: flickr.rb
 version: !ruby/object:Gem::Version
-  version: 1.1.2
+  version: 1.2.0
 platform: ruby
 authors:
 - Scott Raymond, Patrick Plattes, Rafal Piekarski
 autorequire: flickr.rb
 bindir: bin
 cert_chain: []
-date: 2014-04-17 00:00:00.000000000 Z
+date: 2014-05-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: xml-simple
@@ -89,13 +89,6 @@ files:
 - rdoc/Flickr/Photoset.html
 - rdoc/Flickr/User.html
 - rdoc/Flickr.html
-- rdoc/fonts/Lato-Light.ttf
-- rdoc/fonts/Lato-LightItalic.ttf
-- rdoc/fonts/Lato-Regular.ttf
-- rdoc/fonts/Lato-RegularItalic.ttf
-- rdoc/fonts/SourceCodePro-Bold.ttf
-- rdoc/fonts/SourceCodePro-Regular.ttf
-- rdoc/fonts.css
 - rdoc/images/add.png
 - rdoc/images/arrow_up.png
 - rdoc/images/brick.png
@@ -129,9 +122,9 @@ files:
 - rdoc/js/search_index.js
 - rdoc/js/searcher.js
 - rdoc/rdoc.css
-- rdoc/README_txt.html
+- rdoc/README_md.html
 - rdoc/table_of_contents.html
-- README.txt
+- README.md
 - test/flickr_test.rb
 - TODO
 homepage: http://github.com/RaVbaker/flickr/

data/README.txt

@@ -1,92 +0,0 @@
-= flickr
-
-http://github.com/RaVbaker/flickr
-
-== DESCRIPTION:
-
-An insanely easy interface to the Flickr photo-sharing service. By Scott Raymond. (& updated May 2008 by Chris Taggart, http://pushrod.wordpress.com & updated May 2010 by Rafal Piekarski)
-
-== FEATURES/PROBLEMS:
-
-The flickr gem (famously featured in a RubyonRails screencast) had broken with Flickr's new authentication scheme and updated API.
-This has now been largely corrected, though not all current API calls are supported yet.
-
-== SYNOPSIS:
-
-  require 'flickr'
-  flickr = Flickr.new('some_flickr_api_key')    # create a flickr client (get an API key from http://api.flickr.com/services/api/)
-  user = flickr.users('sco@scottraymond.net')   # lookup a user
-  user.name                                     # get the user's name
-  user.location                                 # and location
-  user.photos                                   # grab their collection of Photo objects...
-  user.groups                                   # ...the groups they're in...
-  user.contacts                                 # ...their contacts...
-  user.favorites                                # ...favorite photos...
-  user.photosets                                # ...their photo sets...
-  user.tags                                     # ...their tags...
-  user.popular_tags							  							# ...and their popular tags
-  recentphotos = flickr.photos                  # get the 100 most recent public photos
-  photo = recentphotos.first                    # or very most recent one
-  photo.url                                     # see its URL,
-  photo.title                                   # title,
-  photo.description                             # and description,
-  photo.owner                                   # and its owner.
-  File.open(photo.filename, 'w') do |file|
-    file.puts p.file                            # save the photo to a local file
-  end
-  flickr.photos.each do |p|                     # get the last 100 public photos...
-    File.open(p.filename, 'w') do |f|
-      f.puts p.file('Square')                   # ...and save a local copy of their square thumbnail
-    end
-  end                              
-
-== REQUIREMENTS:
-
-* Xmlsimple gem
-
-== INSTALL:
-
-  sudo gem install flickr.rb
-  
-* Gem homepage: http://rubygems.org/gems/flickr.rb
-
-== CONFIGURING:
-
-If you want to use this gem/plugin with Rails you can create configuration file in /config directory with specified api connection settings. For example:
-
-  development:
-    api_key: SomeLongApiKey
-    shared_secret: secret!
-    auth_token: authSecretToken
-  
-  beta:
-    api_key: SomeLongApiKeyBeta
-    shared_secret: secretBeta!
-    auth_token: authSecretTokenBeta
-    
-  
-
-== LICENSE:
-
-(The MIT License)
-
-Copyright (c) 2005-2010 Scott Raymond, Patrick Plattes, Chris Taggart, Rafal Piekarski
-
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of this software and associated documentation files (the
-'Software'), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sublicense, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
-
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED 'AS IS', WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
-CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
-TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
-SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

data/rdoc/fonts.css

@@ -1,167 +0,0 @@
-/*
- * Copyright 2010, 2012 Adobe Systems Incorporated (http://www.adobe.com/),
- * with Reserved Font Name "Source". All Rights Reserved. Source is a
- * trademark of Adobe Systems Incorporated in the United States and/or other
- * countries.
- *
- * This Font Software is licensed under the SIL Open Font License, Version
- * 1.1.
- *
- * This license is copied below, and is also available with a FAQ at:
- * http://scripts.sil.org/OFL
- */
-
-@font-face {
-  font-family: "Source Code Pro";
-  font-style: normal;
-  font-weight: 400;
-  src: local("Source Code Pro"),
-       local("SourceCodePro-Regular"),
-       url("fonts/SourceCodePro-Regular.ttf") format("truetype");
-}
-
-@font-face {
-  font-family: "Source Code Pro";
-  font-style: normal;
-  font-weight: 700;
-  src: local("Source Code Pro Bold"),
-       local("SourceCodePro-Bold"),
-       url("fonts/SourceCodePro-Bold.ttf") format("truetype");
-}
-
-/*
- * Copyright (c) 2010, Łukasz Dziedzic (dziedzic@typoland.com),
- * with Reserved Font Name Lato.
- *
- * This Font Software is licensed under the SIL Open Font License, Version
- * 1.1.
- *
- * This license is copied below, and is also available with a FAQ at:
- * http://scripts.sil.org/OFL
- */
-
-@font-face {
-  font-family: "Lato";
-  font-style: normal;
-  font-weight: 300;
-  src: local("Lato Light"),
-       local("Lato-Light"),
-       url("fonts/Lato-Light.ttf") format("truetype");
-}
-
-@font-face {
-  font-family: "Lato";
-  font-style: italic;
-  font-weight: 300;
-  src: local("Lato Light Italic"),
-       local("Lato-LightItalic"),
-       url("fonts/Lato-LightItalic.ttf") format("truetype");
-}
-
-@font-face {
-  font-family: "Lato";
-  font-style: normal;
-  font-weight: 700;
-  src: local("Lato Regular"),
-       local("Lato-Regular"),
-       url("fonts/Lato-Regular.ttf") format("truetype");
-}
-
-@font-face {
-  font-family: "Lato";
-  font-style: italic;
-  font-weight: 700;
-  src: local("Lato Italic"),
-       local("Lato-Italic"),
-       url("fonts/Lato-RegularItalic.ttf") format("truetype");
-}
-
-/*
- * -----------------------------------------------------------
- * SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007
- * -----------------------------------------------------------
- *
- * PREAMBLE
- * The goals of the Open Font License (OFL) are to stimulate worldwide
- * development of collaborative font projects, to support the font creation
- * efforts of academic and linguistic communities, and to provide a free and
- * open framework in which fonts may be shared and improved in partnership
- * with others.
- *
- * The OFL allows the licensed fonts to be used, studied, modified and
- * redistributed freely as long as they are not sold by themselves. The
- * fonts, including any derivative works, can be bundled, embedded,
- * redistributed and/or sold with any software provided that any reserved
- * names are not used by derivative works. The fonts and derivatives,
- * however, cannot be released under any other type of license. The
- * requirement for fonts to remain under this license does not apply
- * to any document created using the fonts or their derivatives.
- *
- * DEFINITIONS
- * "Font Software" refers to the set of files released by the Copyright
- * Holder(s) under this license and clearly marked as such. This may
- * include source files, build scripts and documentation.
- *
- * "Reserved Font Name" refers to any names specified as such after the
- * copyright statement(s).
- *
- * "Original Version" refers to the collection of Font Software components as
- * distributed by the Copyright Holder(s).
- *
- * "Modified Version" refers to any derivative made by adding to, deleting,
- * or substituting -- in part or in whole -- any of the components of the
- * Original Version, by changing formats or by porting the Font Software to a
- * new environment.
- *
- * "Author" refers to any designer, engineer, programmer, technical
- * writer or other person who contributed to the Font Software.
- *
- * PERMISSION & CONDITIONS
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of the Font Software, to use, study, copy, merge, embed, modify,
- * redistribute, and sell modified and unmodified copies of the Font
- * Software, subject to the following conditions:
- *
- * 1) Neither the Font Software nor any of its individual components,
- * in Original or Modified Versions, may be sold by itself.
- *
- * 2) Original or Modified Versions of the Font Software may be bundled,
- * redistributed and/or sold with any software, provided that each copy
- * contains the above copyright notice and this license. These can be
- * included either as stand-alone text files, human-readable headers or
- * in the appropriate machine-readable metadata fields within text or
- * binary files as long as those fields can be easily viewed by the user.
- *
- * 3) No Modified Version of the Font Software may use the Reserved Font
- * Name(s) unless explicit written permission is granted by the corresponding
- * Copyright Holder. This restriction only applies to the primary font name as
- * presented to the users.
- *
- * 4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font
- * Software shall not be used to promote, endorse or advertise any
- * Modified Version, except to acknowledge the contribution(s) of the
- * Copyright Holder(s) and the Author(s) or with their explicit written
- * permission.
- *
- * 5) The Font Software, modified or unmodified, in part or in whole,
- * must be distributed entirely under this license, and must not be
- * distributed under any other license. The requirement for fonts to
- * remain under this license does not apply to any document created
- * using the Font Software.
- *
- * TERMINATION
- * This license becomes null and void if any of the above conditions are
- * not met.
- *
- * DISCLAIMER
- * THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
- * OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE
- * COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
- * INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL
- * DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
- * FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM
- * OTHER DEALINGS IN THE FONT SOFTWARE.
- */
-