flickrie 1.1.0 → 1.1.1

data/flickrie.gemspec

@@ -11,7 +11,7 @@ Gem::Specification.new do |gem|
   gem.summary      = gem.description
   gem.homepage     = "https://github.com/janko-m/flickrie"
 
-  gem.files        = `git ls-files`.split($\)
+  gem.files        = Dir["lib/**/*.rb"] + ["flickrie.gemspec", "README.md", "LICENSE"]
   gem.require_path = "lib"
   gem.test_files   = gem.files.grep(%r{^(test|spec|features)/})
 

data/lib/flickrie/version.rb

@@ -1,3 +1,3 @@
 module Flickrie
-  VERSION = "1.1.0"
+  VERSION = "1.1.1"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: flickrie
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.1.1
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2012-05-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday_middleware
-  requirement: &70103345822660 !ruby/object:Gem::Requirement
+  requirement: &70220735818200 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -24,10 +24,10 @@ dependencies:
         version: '0.9'
   type: :runtime
   prerelease: false
-  version_requirements: *70103345822660
+  version_requirements: *70220735818200
 - !ruby/object:Gem::Dependency
   name: faraday
-  requirement: &70103345838840 !ruby/object:Gem::Requirement
+  requirement: &70220735829300 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -38,10 +38,10 @@ dependencies:
         version: '0.9'
   type: :runtime
   prerelease: false
-  version_requirements: *70103345838840
+  version_requirements: *70220735829300
 - !ruby/object:Gem::Dependency
   name: simple_oauth
-  requirement: &70103345835540 !ruby/object:Gem::Requirement
+  requirement: &70220735826040 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -49,10 +49,10 @@ dependencies:
         version: '0.1'
   type: :runtime
   prerelease: false
-  version_requirements: *70103345835540
+  version_requirements: *70220735826040
 - !ruby/object:Gem::Dependency
   name: multi_xml
-  requirement: &70103345831900 !ruby/object:Gem::Requirement
+  requirement: &70220735824540 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -60,10 +60,10 @@ dependencies:
         version: '0.4'
   type: :runtime
   prerelease: false
-  version_requirements: *70103345831900
+  version_requirements: *70220735824540
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70103345841660 !ruby/object:Gem::Requirement
+  requirement: &70220735823100 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -71,10 +71,10 @@ dependencies:
         version: '0.9'
   type: :development
   prerelease: false
-  version_requirements: *70103345841660
+  version_requirements: *70220735823100
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70103345840020 !ruby/object:Gem::Requirement
+  requirement: &70220735877740 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -85,10 +85,10 @@ dependencies:
         version: '3'
   type: :development
   prerelease: false
-  version_requirements: *70103345840020
+  version_requirements: *70220735877740
 - !ruby/object:Gem::Dependency
   name: vcr
-  requirement: &70103345861740 !ruby/object:Gem::Requirement
+  requirement: &70220735874120 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -96,33 +96,23 @@ dependencies:
         version: '2.1'
   type: :development
   prerelease: false
-  version_requirements: *70103345861740
+  version_requirements: *70220735874120
 description: This gem wraps the Flickr API with a nice object-oriented interface.
 email: janko.marohnic@gmail.com
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .travis.yml
-- .yardopts
-- CHANGELOG.md
-- Gemfile
-- LICENSE
-- README.md
-- Rakefile
-- flickrie.gemspec
-- lib/flickrie.rb
 - lib/flickrie/api_methods.rb
 - lib/flickrie/client.rb
 - lib/flickrie/instance.rb
 - lib/flickrie/license.rb
 - lib/flickrie/location.rb
-- lib/flickrie/media.rb
 - lib/flickrie/media/exif.rb
 - lib/flickrie/media/note.rb
 - lib/flickrie/media/tag.rb
 - lib/flickrie/media/visibility.rb
+- lib/flickrie/media.rb
 - lib/flickrie/media_count.rb
 - lib/flickrie/middleware.rb
 - lib/flickrie/oauth.rb
@@ -133,67 +123,10 @@ files:
 - lib/flickrie/user.rb
 - lib/flickrie/version.rb
 - lib/flickrie/video.rb
-- spec/custom_matchers.rb
-- spec/files/photo.bla
-- spec/files/photo.jpg
-- spec/files/video.mov
-- spec/flickrie/api_methods_spec.rb
-- spec/flickrie/error_spec.rb
-- spec/flickrie/instance_spec.rb
-- spec/flickrie/license_spec.rb
-- spec/flickrie/location_spec.rb
-- spec/flickrie/media_count_spec.rb
-- spec/flickrie/media_spec.rb
-- spec/flickrie/oauth_spec.rb
-- spec/flickrie/photo_spec.rb
-- spec/flickrie/set_spec.rb
-- spec/flickrie/upload_client_spec.rb
-- spec/flickrie/user_spec.rb
-- spec/flickrie/video_spec.rb
-- spec/flickrie_spec.rb
-- spec/spec_helper.rb
-- spec/vcr_cassettes/api_methods/people/get_media_from_user.yml
-- spec/vcr_cassettes/api_methods/people/get_public_media_from_user.yml
-- spec/vcr_cassettes/api_methods/photos/add_and_remove_tags.yml
-- spec/vcr_cassettes/api_methods/photos/get_context.yml
-- spec/vcr_cassettes/api_methods/photos/get_counts.yml
-- spec/vcr_cassettes/api_methods/photos/get_exif.yml
-- spec/vcr_cassettes/api_methods/photos/get_favorites.yml
-- spec/vcr_cassettes/api_methods/photos/get_from_contacts.yml
-- spec/vcr_cassettes/api_methods/photos/get_info.yml
-- spec/vcr_cassettes/api_methods/photos/get_public_from_user_contacts.yml
-- spec/vcr_cassettes/api_methods/photos/get_sizes.yml
-- spec/vcr_cassettes/api_methods/photos/search.yml
-- spec/vcr_cassettes/api_methods/photosets/get_media.yml
-- spec/vcr_cassettes/api_methods/upload/replace.yml
-- spec/vcr_cassettes/api_methods/upload/upload.yml
-- spec/vcr_cassettes/api_methods/upload/upload_asynchronously.yml
-- spec/vcr_cassettes/error/a_request_was_made_and_failed/be_raised.yml
-- spec/vcr_cassettes/error/a_request_was_made_and_failed/have_code_attribute_present.yml
-- spec/vcr_cassettes/flickrie/a_new_credential_is_filled_in/reset_the_client.yml
-- spec/vcr_cassettes/instance/client_is_already_initialized/be_able_to_call_API_methods.yml
-- spec/vcr_cassettes/license/get/have_all_attributes_correctly_set.yml
-- spec/vcr_cassettes/media/from_contacts/have_all_attributes_correctly_set.yml
-- spec/vcr_cassettes/media/from_set/have_all_attributes_correctly_set.yml
-- spec/vcr_cassettes/media/from_user/have_all_attributes_correctly_set.yml
-- spec/vcr_cassettes/media/get_context/have_all_attributes_correctly_set.yml
-- spec/vcr_cassettes/media/get_exif/get_exif_correctly.yml
-- spec/vcr_cassettes/media/get_info/have_all_attributes_correctly_set.yml
-- spec/vcr_cassettes/media/public_from_user/have_all_attributes_correctly_set.yml
-- spec/vcr_cassettes/media/search/have_all_attributes_correctly_set.yml
-- spec/vcr_cassettes/media_count/get/have_correctly_set_all_attributes.yml
-- spec/vcr_cassettes/o_auth/incorrect_credentials/raise_exceptions.yml
-- spec/vcr_cassettes/photo/get_info/have_all_attributes_correctly_set.yml
-- spec/vcr_cassettes/photo/get_sizes/have_attributes_correctly_set.yml
-- spec/vcr_cassettes/photo/search/have_all_sizes_available.yml
-- spec/vcr_cassettes/set/from_user/have_all_attributes_correctly_set.yml
-- spec/vcr_cassettes/set/get_info/have_all_attributes_correctly_set.yml
-- spec/vcr_cassettes/upload_client/content_type/pass_the_content_type.yml
-- spec/vcr_cassettes/upload_client/invalid_credentials/raise_errors.yml
-- spec/vcr_cassettes/user/find_by_username_or_email/have_all_attributes_correctly_set.yml
-- spec/vcr_cassettes/user/get_info/have_all_attributes_correctly_set.yml
-- spec/vcr_cassettes/video/get_info/have_all_attributes_correctly_set.yml
-- spec/vcr_cassettes/video/get_sizes/have_all_attributes_correctly_set.yml
+- lib/flickrie.rb
+- flickrie.gemspec
+- README.md
+- LICENSE
 homepage: https://github.com/janko-m/flickrie
 licenses:
 - MIT
@@ -215,72 +148,11 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 4396393932236919457
+      hash: -1628628284167823696
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.11
 signing_key: 
 specification_version: 3
 summary: This gem wraps the Flickr API with a nice object-oriented interface.
-test_files:
-- spec/custom_matchers.rb
-- spec/files/photo.bla
-- spec/files/photo.jpg
-- spec/files/video.mov
-- spec/flickrie/api_methods_spec.rb
-- spec/flickrie/error_spec.rb
-- spec/flickrie/instance_spec.rb
-- spec/flickrie/license_spec.rb
-- spec/flickrie/location_spec.rb
-- spec/flickrie/media_count_spec.rb
-- spec/flickrie/media_spec.rb
-- spec/flickrie/oauth_spec.rb
-- spec/flickrie/photo_spec.rb
-- spec/flickrie/set_spec.rb
-- spec/flickrie/upload_client_spec.rb
-- spec/flickrie/user_spec.rb
-- spec/flickrie/video_spec.rb
-- spec/flickrie_spec.rb
-- spec/spec_helper.rb
-- spec/vcr_cassettes/api_methods/people/get_media_from_user.yml
-- spec/vcr_cassettes/api_methods/people/get_public_media_from_user.yml
-- spec/vcr_cassettes/api_methods/photos/add_and_remove_tags.yml
-- spec/vcr_cassettes/api_methods/photos/get_context.yml
-- spec/vcr_cassettes/api_methods/photos/get_counts.yml
-- spec/vcr_cassettes/api_methods/photos/get_exif.yml
-- spec/vcr_cassettes/api_methods/photos/get_favorites.yml
-- spec/vcr_cassettes/api_methods/photos/get_from_contacts.yml
-- spec/vcr_cassettes/api_methods/photos/get_info.yml
-- spec/vcr_cassettes/api_methods/photos/get_public_from_user_contacts.yml
-- spec/vcr_cassettes/api_methods/photos/get_sizes.yml
-- spec/vcr_cassettes/api_methods/photos/search.yml
-- spec/vcr_cassettes/api_methods/photosets/get_media.yml
-- spec/vcr_cassettes/api_methods/upload/replace.yml
-- spec/vcr_cassettes/api_methods/upload/upload.yml
-- spec/vcr_cassettes/api_methods/upload/upload_asynchronously.yml
-- spec/vcr_cassettes/error/a_request_was_made_and_failed/be_raised.yml
-- spec/vcr_cassettes/error/a_request_was_made_and_failed/have_code_attribute_present.yml
-- spec/vcr_cassettes/flickrie/a_new_credential_is_filled_in/reset_the_client.yml
-- spec/vcr_cassettes/instance/client_is_already_initialized/be_able_to_call_API_methods.yml
-- spec/vcr_cassettes/license/get/have_all_attributes_correctly_set.yml
-- spec/vcr_cassettes/media/from_contacts/have_all_attributes_correctly_set.yml
-- spec/vcr_cassettes/media/from_set/have_all_attributes_correctly_set.yml
-- spec/vcr_cassettes/media/from_user/have_all_attributes_correctly_set.yml
-- spec/vcr_cassettes/media/get_context/have_all_attributes_correctly_set.yml
-- spec/vcr_cassettes/media/get_exif/get_exif_correctly.yml
-- spec/vcr_cassettes/media/get_info/have_all_attributes_correctly_set.yml
-- spec/vcr_cassettes/media/public_from_user/have_all_attributes_correctly_set.yml
-- spec/vcr_cassettes/media/search/have_all_attributes_correctly_set.yml
-- spec/vcr_cassettes/media_count/get/have_correctly_set_all_attributes.yml
-- spec/vcr_cassettes/o_auth/incorrect_credentials/raise_exceptions.yml
-- spec/vcr_cassettes/photo/get_info/have_all_attributes_correctly_set.yml
-- spec/vcr_cassettes/photo/get_sizes/have_attributes_correctly_set.yml
-- spec/vcr_cassettes/photo/search/have_all_sizes_available.yml
-- spec/vcr_cassettes/set/from_user/have_all_attributes_correctly_set.yml
-- spec/vcr_cassettes/set/get_info/have_all_attributes_correctly_set.yml
-- spec/vcr_cassettes/upload_client/content_type/pass_the_content_type.yml
-- spec/vcr_cassettes/upload_client/invalid_credentials/raise_errors.yml
-- spec/vcr_cassettes/user/find_by_username_or_email/have_all_attributes_correctly_set.yml
-- spec/vcr_cassettes/user/get_info/have_all_attributes_correctly_set.yml
-- spec/vcr_cassettes/video/get_info/have_all_attributes_correctly_set.yml
-- spec/vcr_cassettes/video/get_sizes/have_all_attributes_correctly_set.yml
+test_files: []

data/.gitignore

@@ -1,10 +0,0 @@
-TODO.md
-Gemfile.lock
-pkg/
-wiki/
-doc/
-.DS_Store
-api_methods.md
-.bundle/
-.rspec
-.yardoc/

data/.travis.yml

@@ -1,4 +0,0 @@
-language: ruby
-rvm:
-  - 1.9.2
-  - 1.9.3

data/.yardopts

@@ -1,11 +0,0 @@
---charset    utf-8
---readme     README.md
---markup     markdown
---title      "Flickrie documentation"
---exclude    "lib/flickrie/middleware.rb"
---exclude    "lib/flickrie/client.rb"
---exclude    "lib/flickrie/upload_client.rb"
---tag        api_method:"Flickr API method"
---tag        comment
---hide-tag   comment
---no-private

data/CHANGELOG.md

@@ -1,139 +0,0 @@
-# Flickrie changelog
-
-## Version 1.0.3
-
-- Before `Flickrie::User` had only the `#public_photos` method, now, I
-  just added the missing `#public_videos`, `#public_media`, `#photos`,
-  `#videos` and `#media`.
-
-- Fixed Flickr's bug with mixing up the width and the height of a photo
-  (not only in the API, but also on their website).
-
-## Version 1.0.2
-
-- Fix some mistakes in the documentation
-
-## Version 1.0.1
-
-- Transfered the documentation to YARD. [Documentation](http://rubydoc.info/gems/flickrie/)
-
-## Version 1.0.0
-
-### Changes that are backwards compatible
-
-- Fixed content type not being passed to the file you're uploading
-   if you specified it directly.
-
-- The request will now be retried once more if it timeouts
-
-- In authentication:
-** you can now call `request_token.authorize_url` instead of `request_token.get_authorization_url`.
-** you can now call `request_token.get_access_token(code)` instead of `Flickrie::OAuth.get_access_token(code, request_token)`.
-** you also get the infomation about the user who just authenticated,
-    which you can then access with `access_token.user_info`
-    (it's a Hash with keys `:fullname`, `:user_nsid` and `:username`)
-
-- When calling `Flickrie.get_photos_counts`, the `Flickrie::MediaCount`
-  now also has attributes `#time_interval` (alias for `#date_range`),
-  `#from` and `#to`.
-
-### Changes that are NOT backwards compatible
-
-- If you're passing in the content type of the file you're uploading,
-  the parameter is now called `:content_type`, not `:mime_type`.
-
-- If there is a problem in obtaining the access token, `Flickrie::Error`
-  is now raised, instead of `Flickrie::OAuth::Error`.
-
-- When you're calling `request_token.get_authorization_url`, if you want to
-  specifiy permissions, you now have to pass the `:perms` option,
-  instead of `:permissions`. In this way you can pass any parameter,
-  and it will be appended to the URL (in case Flickr adds a new parameter).
-
-- When you have a `Flickrie::User` instance, the
-  `Flickrie::User#time_zone` now returns a struct with `#label` and
-  `#offset` attributes (before it returned a `Hash` with those keys).
-
-- When you call `Flickrie.get_media_context`, the result is now a
-  struct with attributes `#count`, `#previous`, `#next`.
-
-## Version 0.7.3
-
-- Covered "flickr.people.getPhotos" (I released it as a patch because
-  it's important).
-
-## Version 0.7.2
-
-- Specified versions of dependencies and Ruby accurately.
-
-## Version 0.7.1
-
-- Fixed an oauth bug.
-- Added `#hash` method to photos, sets etc. which you can call to get the
-  raw data (in Ruby hash). This is useful if I accidentally left something out,
-  or if Flickr added something new that I didn't cover yet, that you can
-  still get to the data. `#[]` reads from the same hash.
-
-## Version 0.7.0
-
-- Covered `flickr.photos.getFavorites` and `flickr.test.login`.
-- Bug fixes (especially regarding the `Flickr::Instance`).
-
-## Version 0.6.1
-
-- `Flickrie::Media::Ticket` is now called just `Flickrie::Ticket`.
-
-## Version 0.6.0
-
-- You can access the raw response hash with square brackets, if you notice I
-  didn't cover some part of it with methods. So, for example, after calling
-  `Flickrie.get_photo_info`, you can get the photo ID by calling `photo['id']`.
-
-- When `Flickrie::Error` is raised, you can now access its `#code`
-  attribute. This makes better error handling, because error code
-  is (supposed to be) unique, unlike the error message.
-
-## Version 0.5.2
-
-- The gem now also works with Faraday 0.7 (I apologize for not
-  making Faraday >= 0.8 a dependency before).
-
-## Version 0.5.1
-
-- Fixed a documentation error.
-
-## Version 0.5.0
-
-- Covered `flickr.photos.getCounts`.
-- Covered `flickr.photos.getExif`.
-
-## Version 0.4.1
-
-- Handle file uploads for Rails and Sinatra smarter (see [this wiki](https://github.com/janko-m/flickrie/wiki/Some-tips.md), tip #7)
-
-## Version 0.4.0
-
-- Covered `flickr.photos.getContactsPhotos`.
-- Covered `flickr.photos.getContactsPublicPhotos`.
-- Covered `flickr.photos.getContext`.
-- Implemented uploading photos.
-- Covered `flickr.photos.upload.checkTickets`.
-
-## Version 0.3.2
-
-- Enabled passing params to `Flickrie::Set#photos`.
-
-## Version 0.3.1
-
-- Fixed an error when accessing tags from photos fetched through
-  certain API calls.
-
-## Version 0.3.0
-
-- The proper error is now raised on wrong access tokens.
-- Implemented a better way of using access tokens, using `Flickrie::Instance.new(access_token, access_secret)`
-  (see [this wiki](https://github.com/janko-m/flickrie/wiki/Authentication-in-web-applications) for an example).
-
-## Version 0.2.2
-
-- Removed `addressable` gem as a dependency.

data/Gemfile

@@ -1,9 +0,0 @@
-source :rubygems
-
-gemspec
-
-# You can run `bundle [install] --without extras` if you don't want to install them
-group :extras do
-  gem "debugger"
-  gem "pry"
-end

data/Rakefile

@@ -1,60 +0,0 @@
-require 'bundler'
-Bundler::GemHelper.install_tasks
-
-task :default => :spec
-
-desc "Run the specs (use spec:name to run a single spec)"
-task :spec do |task, args|
-  system "rspec -Ispec"
-end
-
-Dir["spec/flickrie/*_spec.rb"].each do |spec|
-  task_name = File.basename(spec)[/.+(?=_spec\.rb)/]
-  task :"spec:#{task_name}" do
-    system "rspec -Ispec #{spec}"
-  end
-end
-
-desc "Open the console with credentials (API key, secret etc.) already filled in"
-task :console do
-  File.open("credentials.rb", "w") do |f|
-    f.write <<-CREDENTIALS
-      Flickrie.api_key = ENV['FLICKR_API_KEY']
-      Flickrie.shared_secret = ENV['FLICKR_SHARED_SECRET']
-      Flickrie.access_token = ENV['FLICKR_ACCESS_TOKEN']
-      Flickrie.access_secret = ENV['FLICKR_ACCESS_SECRET']
-    CREDENTIALS
-  end
-  begin
-    require 'pry'
-    system "pry --require 'flickrie' --require './credentials'"
-  rescue LoadError
-    system "irb -r 'flickrie' -r './credentials'"
-  end
-  FileUtils.remove_file "credentials.rb"
-end
-
-# copied from Rails
-begin
-  require 'rails/source_annotation_extractor'
-
-  desc "Enumerate all annotations (use notes:optimize, :fixme, :todo for focus)"
-  task :notes do
-    SourceAnnotationExtractor.enumerate "OPTIMIZE|FIXME|TODO", :tag => true
-  end
-
-  namespace :notes do
-    ["OPTIMIZE", "FIXME", "TODO"].each do |annotation|
-      # desc "Enumerate all #{annotation} annotations"
-      task annotation.downcase.intern do
-        SourceAnnotationExtractor.enumerate annotation
-      end
-    end
-
-    desc "Enumerate a custom annotation, specify with ANNOTATION=CUSTOM"
-    task :custom do
-      SourceAnnotationExtractor.enumerate ENV['ANNOTATION']
-    end
-  end
-rescue LoadError
-end

data/spec/custom_matchers.rb

@@ -1,51 +0,0 @@
-RSpec::Matchers.define :correspond_to do |hash_or_value|
-  match { |object| test_recursively(object, hash_or_value) }
-
-  def test_recursively(object, hash_or_value)
-    if hash_or_value.is_a?(Hash)
-      iterate(object, hash_or_value) do |actual, expected|
-        actual.should == expected
-      end
-    else
-      object.should eq(hash_or_value)
-    end
-  end
-
-  def iterate(object, the_rest, &block)
-    the_rest.each do |key, value|
-      if value.is_a?(Hash)
-        iterate(object.send(key), value, &block)
-      else
-        yield [object.send(key), value]
-      end
-    end
-  end
-
-  failure_message_for_should do |actual|
-    "expected: #{expected.first}\n got: #{actual}\n"
-  end
-end
-
-RSpec::Matchers.define :be_a_number do
-  match { |object| object.instance_of?(Fixnum) }
-end
-
-RSpec::Matchers.define :be_a_boolean do
-  match { |object| object == true or object == false }
-end
-
-RSpec::Matchers.define :be_a_media do
-  match do |object|
-    object.instance_of?(Flickrie::Photo) \
-      or
-    object.instance_of?(Flickrie::Video)
-  end
-end
-
-RSpec::Matchers.define :be_a_photo do
-  match { |object| object.instance_of?(Flickrie::Photo) }
-end
-
-RSpec::Matchers.define :be_a_video do
-  match { |object| object.instance_of?(Flickrie::Video) }
-end