flickr-objects 0.2.0 → 0.3.0

metadata

@@ -1,52 +1,46 @@
 --- !ruby/object:Gem::Specification
 name: flickr-objects
 version: !ruby/object:Gem::Version
-  version: 0.2.0
-  prerelease: 
+  version: 0.3.0
 platform: ruby
 authors:
-- Janko Marohnić
+- Janko Marohnić
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-07 00:00:00.000000000 Z
+date: 2013-10-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 0.7.6
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 0.7.6
 - !ruby/object:Gem::Dependency
   name: faraday_middleware
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0.8'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0.8'
 - !ruby/object:Gem::Dependency
   name: simple_oauth
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -54,7 +48,6 @@ dependencies:
   type: :runtime
   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: multi_xml
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -70,7 +62,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -78,115 +69,115 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '2'
 - !ruby/object:Gem::Dependency
   name: vcr
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '2'
 - !ruby/object:Gem::Dependency
-  name: rack-test
+  name: activesupport
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3'
 - !ruby/object:Gem::Dependency
-  name: activesupport
+  name: will_paginate
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '3'
 - !ruby/object:Gem::Dependency
-  name: will_paginate
+  name: kaminari
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
-        version: '3'
+        version: '0.14'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
-        version: '3'
+        version: '0.14'
 - !ruby/object:Gem::Dependency
-  name: kaminari
+  name: capybara
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
-        version: '0.14'
+        version: '2.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
-        version: '0.14'
+        version: '2.1'
+- !ruby/object:Gem::Dependency
+  name: selenium-webdriver
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: 2.35.1
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: 2.35.1
 description: This gem is an object-oriented wrapper for the Flickr API.
 email:
 - janko.marohnic@gmail.com
@@ -196,84 +187,79 @@ extra_rdoc_files: []
 files:
 - README.md
 - LICENSE
-- lib/flickr/api/api_methods/flickr.rb
-- lib/flickr/api/api_methods/person.rb
-- lib/flickr/api/api_methods/photo.rb
-- lib/flickr/api/api_methods/set.rb
-- lib/flickr/api/api_methods/upload_ticket.rb
-- lib/flickr/api/flickr.rb
+- lib/flickr/api/abstract/params_processor.rb
+- lib/flickr/api/abstract.rb
+- lib/flickr/api/general.rb
 - lib/flickr/api/person.rb
 - lib/flickr/api/photo.rb
 - lib/flickr/api/set.rb
 - lib/flickr/api/upload_ticket.rb
 - lib/flickr/api.rb
-- lib/flickr/api_caller.rb
-- lib/flickr/client/methods_client.rb
-- lib/flickr/client/upload_client.rb
+- lib/flickr/attributes.rb
+- lib/flickr/base_converter.rb
+- lib/flickr/client/data.rb
+- lib/flickr/client/oauth.rb
+- lib/flickr/client/upload.rb
 - lib/flickr/client.rb
 - lib/flickr/configuration.rb
-- lib/flickr/errors.rb
-- lib/flickr/helpers/base_58.rb
-- lib/flickr/helpers/boolean.rb
-- lib/flickr/helpers/core_ext.rb
+- lib/flickr/error.rb
 - lib/flickr/middleware.rb
 - lib/flickr/oauth.rb
-- lib/flickr/object/attribute/converter.rb
-- lib/flickr/object/attribute/finder.rb
-- lib/flickr/object/attribute.rb
+- lib/flickr/object/attribute_locations/list.rb
+- lib/flickr/object/attribute_locations/location.rb
+- lib/flickr/object/attribute_locations/permissions.rb
+- lib/flickr/object/attribute_locations/person/upload_status.rb
+- lib/flickr/object/attribute_locations/person.rb
+- lib/flickr/object/attribute_locations/photo/exif.rb
+- lib/flickr/object/attribute_locations/photo/note.rb
+- lib/flickr/object/attribute_locations/photo/tag.rb
+- lib/flickr/object/attribute_locations/photo.rb
+- lib/flickr/object/attribute_locations/set.rb
+- lib/flickr/object/attribute_locations/upload_ticket.rb
+- lib/flickr/object/attribute_locations/visibility.rb
+- lib/flickr/object/list/kaminari.rb
+- lib/flickr/object/list/normal.rb
+- lib/flickr/object/list/will_paginate.rb
+- lib/flickr/object/list.rb
+- lib/flickr/object/location.rb
+- lib/flickr/object/permissions.rb
+- lib/flickr/object/person/upload_status.rb
+- lib/flickr/object/person.rb
+- lib/flickr/object/photo/exif.rb
+- lib/flickr/object/photo/note.rb
+- lib/flickr/object/photo/size.rb
+- lib/flickr/object/photo/tag.rb
+- lib/flickr/object/photo.rb
+- lib/flickr/object/set.rb
+- lib/flickr/object/upload_ticket.rb
+- lib/flickr/object/visibility.rb
 - lib/flickr/object.rb
-- lib/flickr/objects/attribute_values/list.rb
-- lib/flickr/objects/attribute_values/location.rb
-- lib/flickr/objects/attribute_values/note.rb
-- lib/flickr/objects/attribute_values/permissions.rb
-- lib/flickr/objects/attribute_values/person/upload_status.rb
-- lib/flickr/objects/attribute_values/person.rb
-- lib/flickr/objects/attribute_values/photo.rb
-- lib/flickr/objects/attribute_values/set.rb
-- lib/flickr/objects/attribute_values/tag.rb
-- lib/flickr/objects/attribute_values/upload_ticket.rb
-- lib/flickr/objects/attribute_values/visibility.rb
-- lib/flickr/objects/list.rb
-- lib/flickr/objects/location.rb
-- lib/flickr/objects/note.rb
-- lib/flickr/objects/permissions.rb
-- lib/flickr/objects/person/upload_status.rb
-- lib/flickr/objects/person.rb
-- lib/flickr/objects/photo.rb
-- lib/flickr/objects/set.rb
-- lib/flickr/objects/tag.rb
-- lib/flickr/objects/upload_ticket.rb
-- lib/flickr/objects/visibility.rb
-- lib/flickr/objects.rb
+- lib/flickr/sanitized_file.rb
 - lib/flickr/version.rb
 - lib/flickr-objects.rb
 - lib/flickr.rb
-homepage: http://janko-m.github.com/flickr-objects/
+homepage: http://janko-m.github.com/flickr-objects
 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: 1.9.2
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -3989441013380527644
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 2.1.0
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: This gem is an object-oriented wrapper for the Flickr API.
 test_files: []

data/lib/flickr/api/api_methods/flickr.rb

@@ -1,5 +0,0 @@
-class Flickr
-  api_method :test_login,           "flickr.test.login"
-  api_method :test_echo,            "flickr.test.echo"
-  api_method :test_null,            "flickr.test.null"
-end

data/lib/flickr/api/api_methods/person.rb

@@ -1,14 +0,0 @@
-class Flickr
-  class Person < Object
-    class_api_method :find_by_email,     "flickr.people.findByEmail"
-    class_api_method :find_by_username,  "flickr.people.findByUsername"
-    class_api_method :get_upload_status, "flickr.people.getUploadStatus"
-
-    instance_api_method :get_info!,                       "flickr.people.getInfo"
-    instance_api_method :get_photos,                      "flickr.people.getPhotos"
-    instance_api_method :get_photos_of,                   "flickr.people.getPhotosOf"
-    instance_api_method :get_public_photos,               "flickr.people.getPublicPhotos"
-    instance_api_method :get_public_photos_from_contacts, "flickr.photos.getContactsPublicPhotos"
-    instance_api_method :get_sets,                        "flickr.photosets.getList"
-  end
-end

data/lib/flickr/api/api_methods/photo.rb

@@ -1,26 +0,0 @@
-class Flickr
-  class Photo < Object
-    class_api_method :get_from_contacts,    "flickr.photos.getContactsPhotos"
-    class_api_method :search,               "flickr.photos.search"
-    class_api_method :delete,               "flickr.photos.delete"
-    class_api_method :get_not_in_set,       "flickr.photos.getNotInSet"
-    class_api_method :get_recent,           "flickr.photos.getRecent"
-    class_api_method :get_untagged,         "flickr.photos.getUntagged"
-    class_api_method :get_with_geo_data,    "flickr.photos.getWithGeoData"
-    class_api_method :get_without_geo_data, "flickr.photos.getWithoutGeoData"
-    class_api_method :get_recently_updated, "flickr.photos.RecentlyUpdated"
-
-    instance_api_method :add_tags,         "flickr.photos.addTags"
-    instance_api_method :delete,           "flickr.photos.delete"
-    instance_api_method :get_info!,        "flickr.photos.getInfo"
-    instance_api_method :get_sizes!,       "flickr.photos.getSizes"
-    instance_api_method :get_favorites,    "flickr.photos.getFavorites"
-    instance_api_method :remove_tag,       "flickr.photos.removeTag"
-    instance_api_method :set_content_type, "flickr.photos.setContentType", aliases: [:content_type=]
-    instance_api_method :set_tags,         "flickr.photos.setTags",        aliases: [:tags=]
-    instance_api_method :set_dates,        "flickr.photos.setDates"
-    instance_api_method :set_meta,         "flickr.photos.setMeta"
-    instance_api_method :set_permissions,  "flickr.photos.setPerms"
-    instance_api_method :set_safety_level, "flickr.photos.setSafetyLevel"
-  end
-end

data/lib/flickr/api/api_methods/set.rb

@@ -1,18 +0,0 @@
-class Flickr
-  class Set < Object
-    class_api_method :create, "flickr.photosets.create"
-    class_api_method :delete, "flickr.photosets.delete"
-    class_api_method :order,  "flickr.photosets.orderSets"
-
-    instance_api_method :add_photo,         "flickr.photosets.addPhoto"
-    instance_api_method :delete,            "flickr.photosets.delete"
-    instance_api_method :edit_photos,       "flickr.photosets.editPhotos"
-    instance_api_method :get_info!,         "flickr.photosets.getInfo"
-    instance_api_method :get_photos,        "flickr.photosets.getPhotos"
-    instance_api_method :remove_photos,     "flickr.photosets.removePhotos"
-    instance_api_method :remove_photo,      "flickr.photosets.removePhoto"
-    instance_api_method :edit_meta,         "flickr.photosets.editMeta"
-    instance_api_method :reorder_photos,    "flickr.photosets.reorderPhotos"
-    instance_api_method :set_primary_photo, "flickr.photosets.setPrimaryPhoto", aliases: [:primary_photo=]
-  end
-end

data/lib/flickr/api/api_methods/upload_ticket.rb

@@ -1,5 +0,0 @@
-class Flickr
-  class UploadTicket < Object
-    class_api_method :check, "flickr.photos.upload.checkTickets"
-  end
-end

data/lib/flickr/api/flickr.rb

@@ -1,35 +0,0 @@
-require_relative "api_methods/flickr"
-
-class Flickr
-  api_methods = proc do
-    def upload(photo, params = {})
-      response = upload_client.upload(photo, params)
-      params[:async] == 1 ? response["ticketid"] : response["photoid"]
-    end
-
-    def replace(photo, id, params = {})
-      response = upload_client.replace(photo, id, params)
-      params[:async] == 1 ? response["ticketid"] : response["photoid"]
-    end
-
-    def check_upload_tickets(tickets, params = {})
-      Flickr.deprecation_warn "`Flickr.check_upload_tickets` is deprecated. Use `Flickr.upload_tickets.check` instead."
-      upload_tickets.check(tickets, params)
-    end
-
-    def test_login(params = {})
-      client.get f(__method__), params
-    end
-
-    def test_echo(params = {})
-      client.get f(__method__), params
-    end
-
-    def test_null(params = {})
-      client.get f(__method__), params
-    end
-  end
-
-  instance_eval(&api_methods)
-  class_eval(&api_methods)
-end

data/lib/flickr/api_caller.rb

@@ -1,98 +0,0 @@
-class Flickr
-  module ApiCaller
-
-    def self.included(base)
-      base.send(:include, ClientMethods) unless base == Flickr
-      base.send(:include, ApiMethods)
-      base.send(:include, ParamsFixingMethods)
-    end
-
-    module ClientMethods
-      def self.included(base)
-        base.send(:include, Methods)
-        base.send(:extend,  Methods)
-      end
-
-      module Methods
-        attr_reader :client
-      end
-    end
-
-    module ApiMethods
-      def self.included(base)
-        base.send(:include, InstanceMethods)
-        base.send(:extend, ClassMethods)
-      end
-
-      module ClassMethods
-        def instance_api_method(method, flickr_method, options = {})
-          [method, *options[:aliases]].each do |method|
-            Flickr.api_methods[flickr_method] << "#{self.name}##{method}"
-          end
-        end
-
-        def class_api_method(method, flickr_method, options = {})
-          [method, *options[:aliases]].each do |method|
-            Flickr.api_methods[flickr_method] << "#{self.name}.#{method}"
-          end
-        end
-
-        def api_method(*args)
-          instance_api_method(*args)
-          class_api_method(*args)
-        end
-
-        def f(method_name)
-          resolve_flickr_method("#{self.name}.#{method_name}")
-        end
-
-        def resolve_flickr_method(full_method_name)
-          pair = Flickr.api_methods.find { |key, value| value.include?(full_method_name) }
-          pair.first
-
-        rescue NoMethodError
-          raise "method #{full_method_name} is not registered"
-        end
-      end
-
-      module InstanceMethods
-        def f(method_name)
-          self.class.resolve_flickr_method("#{self.class.name}##{method_name}")
-        end
-      end
-    end
-
-    module ParamsFixingMethods
-      def self.included(base)
-        base.send(:include, Methods)
-        base.send(:extend,  Methods)
-      end
-
-      module Methods
-        def handle_extras(params)
-          include_sizes(params)
-        end
-
-        def include_sizes(params)
-          return params if params[:sizes].nil?
-
-          abbrs = case params[:sizes]
-                  when :all
-                    Photo::SIZES.values
-                  else
-                    params[:sizes].map { |size| Photo::SIZES[size] }
-                  end
-          urls = abbrs.map { |abbr| "url_#{abbr}" }.join(",")
-          include_in_extras(params, urls)
-        end
-
-        def include_in_extras(params, things)
-          params.dup.tap do |params|
-            params[:extras] = [params[:extras], things].compact.join(",")
-          end
-        end
-      end
-    end
-
-  end
-end

data/lib/flickr/client/methods_client.rb

@@ -1,22 +0,0 @@
-class Flickr
-  class MethodsClient < Client
-    def initialize(access_token)
-      super(access_token)
-    end
-
-    [:get, :post].each do |http_method|
-      define_method(http_method) do |flickr_method, params = {}|
-        response = super("rest") do |req|
-          req.params[:method] = flickr_method
-          req.params.update(params)
-        end
-
-        response.body
-      end
-    end
-
-    def parser
-      FaradayMiddleware::ParseJson
-    end
-  end
-end

data/lib/flickr/client/upload_client.rb

@@ -1,62 +0,0 @@
-class Flickr
-  class UploadClient < Client
-    def initialize(access_token)
-      super(access_token) do |builder|
-        builder.use Faraday::Request::Multipart
-      end
-    end
-
-    def upload(photo, params = {})
-      response = post "upload", {photo: get_file(photo)}.merge(params)
-      response.body
-    end
-
-    def replace(photo, id, params = {})
-      response = post "replace", {photo: get_file(photo), photo_id: id}.merge(params)
-      response.body
-    end
-
-    def parser
-      FaradayMiddleware::ParseXml
-    end
-
-    private
-
-    def get_file(object)
-      file, content_type, file_path =
-        if object.is_a?(String)
-          [File.open(object), determine_content_type(object), object]
-        elsif object.class.name == "ActionDispatch::Http::UploadedFile"
-          [object, object.content_type, object.tempfile]
-        elsif object.respond_to?(:read) and object.respond_to?(:path)
-          [object, (object.respond_to?(:content_type) && object.content_type) || determine_content_type(object.path), object.path]
-        elsif object.is_a?(Hash) && defined?(Sinatra)
-          [object[:tempfile], object[:type], object[:tempfile].path]
-        else
-          raise Error, "invalid file format"
-        end
-
-      Faraday::UploadIO.new(file, content_type, file_path)
-    end
-
-    def determine_content_type(path)
-      extension = File.extname(path)
-      array = CONTENT_TYPES.keys.find { |array| array.include?(extension) }
-
-      if array
-        CONTENT_TYPES[array]
-      else
-        raise Error, "content type for #{extension} is not known"
-      end
-    end
-
-    CONTENT_TYPES = {
-      %w[.jpg .jpeg .jpe .jif .jfif .jfi] => 'image/jpeg',
-      %w[.gif]                            => 'image/gif',
-      %w[.png]                            => 'image/png',
-      %w[.svg .svgz]                      => 'image/svg+xml',
-      %w[.tiff .tif]                      => 'image/tiff',
-      %w[.ico]                            => 'image/vnd.microsoft.icon',
-    }
-  end
-end

data/lib/flickr/errors.rb

@@ -1,19 +0,0 @@
-class Flickr
-  class Error < StandardError
-  end
-
-  class OAuthError < Error
-  end
-
-  class ApiError < Error
-    attr_reader :code
-
-    def initialize(message, code = nil)
-      super(message)
-      @code = code.to_i
-    end
-  end
-
-  class TimeoutError < Error
-  end
-end