flickrie 1.6.0 → 1.6.1

data/lib/flickrie/oauth.rb

@@ -11,10 +11,10 @@ module Flickrie
         Faraday.new(params) do |b|
           b.use Middleware::Retry
           b.use FaradayMiddleware::OAuth,
-            :consumer_key => Flickrie.api_key,
-            :consumer_secret => Flickrie.shared_secret,
-            :token => request_token.to_a.first,
-            :token_secret => request_token.to_a.last
+            consumer_key: Flickrie.api_key,
+            consumer_secret: Flickrie.shared_secret,
+            token: request_token.to_a.first,
+            token_secret: request_token.to_a.last
 
           b.use Middleware::ParseOAuthParams
           b.use Middleware::OAuthCheck
@@ -25,10 +25,10 @@ module Flickrie
 
       def self.params
         {
-          :url => URL,
-          :request => {
-            :open_timeout => Flickrie.open_timeout || DEFAULTS[:open_timeout],
-            :timeout => Flickrie.timeout || DEFAULTS[:timeout]
+          url: URL,
+          request: {
+            open_timeout: Flickrie.open_timeout || DEFAULTS[:open_timeout],
+            timeout: Flickrie.timeout || DEFAULTS[:timeout]
           }
         }
       end
@@ -73,7 +73,7 @@ module Flickrie
         require 'uri'
         url = URI.parse(URL)
         url.path += '/authorize'
-        query_params = {:oauth_token => token}.merge(params)
+        query_params = {oauth_token: token}.merge(params)
         url.query = query_params.map { |k,v| "#{k}=#{v}" }.join('&')
         url.to_s
       end

data/lib/flickrie/objects/comment.rb

@@ -0,0 +1,35 @@
+module Flickrie
+  class Comment
+    # @!parse attr_reader :id, :author, :created_at,
+    #   :permalink, :content, :photo, :video
+
+    # @return [String]
+    def id() @hash["id"] end
+
+    # @return [Flickrie::User]
+    def author() @author ||= User.new(@hash["author"], @api_caller) end
+
+    # @return [Time]
+    def created_at() Time.at(Integer(@hash["datecreate"])) rescue nil end
+
+    # @return [String]
+    def permalink() @hash["permalink"] end
+
+    # @return [String]
+    def content() @hash["_content"] end
+
+    # @return [Flickrie::Photo]
+    def photo() @photo ||= Photo.new({"id" => @hash["photo_id"]}, @api_caller) end
+    # @return [Flickrie::Video]
+    def video() @video ||= Video.new({"id" => @hash["photo_id"]}, @api_caller) end
+
+    def to_s
+      content
+    end
+
+    def initialize(hash, api_caller)
+      @hash = hash
+      @api_caller = api_caller
+    end
+  end
+end

data/lib/flickrie/objects/media.rb

@@ -42,8 +42,8 @@ module Flickrie
     #
     #     photo.exif.get('Model') # => 'Canon PowerShot G12'
     #
-    #     photo.exif.get('X-Resolution', :data => 'raw')   # => '180'
-    #     photo.exif.get('X-Resolution', :data => 'clean') # => '180 dpi'
+    #     photo.exif.get('X-Resolution', data: 'raw')   # => '180'
+    #     photo.exif.get('X-Resolution', data: 'clean') # => '180 dpi'
     #     photo.exif.get('X-Resolution')                   # => '180 dpi'
     #
     # @return [Flickrie::Media::Exif]
@@ -60,7 +60,7 @@ module Flickrie
     def geo_permissions() Visibility.new(@hash['geoperms']) rescue nil end
 
     # @return [Array<Flickrie::Media::Tag>]
-    def tags() @hash['tags'].map { |info| Tag.new(info, @api_caller) }     rescue nil end
+    def tags() @hash['tags'].map { |h| Tag.new(h, @api_caller) } rescue nil end
     # @return [Array<Flickrie::Media::Tag>]
     def machine_tags() tags.select { |tag| tag.machine_tag? } rescue nil end
 
@@ -68,18 +68,18 @@ module Flickrie
     def license() License.new(@hash['license']) rescue nil end
 
     # @return [Time]
-    def posted_at()   Time.at(Integer(@hash['dates']['posted']))           rescue nil end
+    def posted_at() Time.at(Integer(@hash['dates']['posted'])) rescue nil end
     # @return [Time]
-    def uploaded_at() Time.at(Integer(@hash['dates']['uploaded']))         rescue nil end
+    def uploaded_at() Time.at(Integer(@hash['dates']['uploaded'])) rescue nil end
     # @return [Time]
-    def updated_at()  Time.at(Integer(@hash['dates']['lastupdate']))       rescue nil end
+    def updated_at() Time.at(Integer(@hash['dates']['lastupdate'])) rescue nil end
     # @return [Time]
-    def taken_at()    DateTime.parse(@hash['dates']['taken']).to_time      rescue nil end
+    def taken_at() DateTime.parse(@hash['dates']['taken']).to_time rescue nil end
     # @return [Fixnum]
     def taken_at_granularity() Integer(@hash['dates']['takengranularity']) rescue nil end
 
     # @return [Flickrie::User]
-    def owner() User.new(@hash['owner'], @api_caller) if @hash['owner'] end
+    def owner() @user ||= User.new(@hash['owner'], @api_caller) if @hash['owner'] end
 
     # @return [Fixnum]
     def safety_level() Integer(@hash['safety_level']) rescue nil end

data/lib/flickrie/objects/media/exif.rb

@@ -7,8 +7,8 @@ module Flickrie
       #
       #     photo.exif.get('Model') # => 'Canon PowerShot G12'
       #
-      #     photo.exif.get('X-Resolution', :data => 'raw')   # => '180'
-      #     photo.exif.get('X-Resolution', :data => 'clean') # => '180 dpi'
+      #     photo.exif.get('X-Resolution', data: 'raw')   # => '180'
+      #     photo.exif.get('X-Resolution', data: 'clean') # => '180 dpi'
       #     photo.exif.get('X-Resolution')                   # => '180 dpi'
       #
       #

data/lib/flickrie/objects/media_context.rb

@@ -8,7 +8,7 @@ module Flickrie
     attr_reader :next
 
     def initialize(hash, api_caller)
-      count = hash['count']['_content'].to_i
+      count = hash['count'].to_i
       previous = hash['prevphoto']['id'].to_i > 0 ? Media.new(hash['prevphoto'], api_caller) : nil
       next_ = hash['nextphoto']['id'].to_i > 0 ? Media.new(hash['nextphoto'], api_caller) : nil
       @count, @previous, @next = count, previous, next_

data/lib/flickrie/objects/user.rb

@@ -109,7 +109,8 @@ module Flickrie
     # @return [Boolean]
     def pro?() Integer(@hash['ispro']) == 1 rescue nil end
 
-    # Returns the upload status of the user.
+    # Returns the upload status of the user (obtained by calling
+    # Flickrie.get_upload_status).
     #
     # @return [Flickrie::User::UploadStatus]
     def upload_status() UploadStatus.new(@hash['upload_status']) rescue nil end

data/lib/flickrie/upload_client.rb

@@ -5,20 +5,13 @@ module Flickrie
     def upload(media, params = {})
       file = get_file(media, params[:content_type])
       title = file.original_filename.match(/\.\w{3,4}$/).pre_match
-      post "upload", {
-        :photo => file,
-        :title => title
-      }.merge(params)
+      post "upload", {photo: file, title: title}.merge(params)
     end
 
     def replace(media, media_id, params = {})
       file = get_file(media, params[:content_type])
       title = file.original_filename.match(/\.\w{3,4}$/).pre_match
-      post "replace", {
-        :photo => file,
-        :photo_id => media_id,
-        :title => title
-      }.merge(params)
+      post "replace", {photo: file, photo_id: media_id, title: title}.merge(params)
     end
 
     private
@@ -66,7 +59,7 @@ module Flickrie
       content_type = CONTENT_TYPES.find { |k,v| k.include?(extension) }.last
 
     rescue NoMethodError
-      raise Error, "Don't know the content type for this extension (#{extension})"
+      raise Error, "Content type for this extension (#{extension}) is not known"
     end
   end
 end

data/lib/flickrie/version.rb

@@ -1,3 +1,3 @@
 module Flickrie
-  VERSION = "1.6.0"
+  VERSION = "1.6.1"
 end

metadata

@@ -1,160 +1,143 @@
 --- !ruby/object:Gem::Specification
 name: flickrie
 version: !ruby/object:Gem::Version
-  version: 1.6.0
-  prerelease: 
+  version: 1.6.1
 platform: ruby
 authors:
 - Janko Marohnić
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-07-20 00:00:00.000000000 Z
+date: 2014-08-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday_middleware
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.8.7
-    - - <
+    - - "<"
       - !ruby/object:Gem::Version
         version: '0.9'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.8.7
-    - - <
+    - - "<"
       - !ruby/object:Gem::Version
         version: '0.9'
 - !ruby/object:Gem::Dependency
   name: faraday
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.7.6
-    - - <
+    - - "<"
       - !ruby/object:Gem::Version
         version: '0.9'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.7.6
-    - - <
+    - - "<"
       - !ruby/object:Gem::Version
         version: '0.9'
 - !ruby/object:Gem::Dependency
   name: simple_oauth
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.1'
 - !ruby/object:Gem::Dependency
   name: multi_xml
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.4'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.9'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.9'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '2.10'
-    - - <
+    - - "<"
       - !ruby/object:Gem::Version
         version: '3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '2.10'
-    - - <
+    - - "<"
       - !ruby/object:Gem::Version
         version: '3'
 - !ruby/object:Gem::Dependency
   name: vcr
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.1'
 description: This gem wraps the Flickr API with a nice object-oriented interface.
@@ -163,62 +146,65 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".yardopts"
+- LICENSE
+- README.md
+- lib/flickrie.rb
 - lib/flickrie/api_methods.rb
 - lib/flickrie/base58.rb
 - lib/flickrie/callable.rb
 - lib/flickrie/client.rb
+- lib/flickrie/client/methods.rb
 - lib/flickrie/collection.rb
 - lib/flickrie/core_ext.rb
+- lib/flickrie/deprecatable.rb
+- lib/flickrie/flickr_api_methods.rb
 - lib/flickrie/instance.rb
+- lib/flickrie/middleware.rb
 - lib/flickrie/middleware/fix_flickr_data.rb
 - lib/flickrie/middleware/retry.rb
-- lib/flickrie/middleware.rb
 - lib/flickrie/oauth.rb
+- lib/flickrie/objects/comment.rb
 - lib/flickrie/objects/license.rb
 - lib/flickrie/objects/location.rb
+- lib/flickrie/objects/media.rb
 - lib/flickrie/objects/media/exif.rb
 - lib/flickrie/objects/media/note.rb
 - lib/flickrie/objects/media/tag.rb
 - lib/flickrie/objects/media/visibility.rb
-- lib/flickrie/objects/media.rb
 - lib/flickrie/objects/media_context.rb
 - lib/flickrie/objects/media_count.rb
 - lib/flickrie/objects/photo.rb
 - lib/flickrie/objects/set.rb
 - lib/flickrie/objects/ticket.rb
-- lib/flickrie/objects/user/upload_status.rb
 - lib/flickrie/objects/user.rb
+- lib/flickrie/objects/user/upload_status.rb
 - lib/flickrie/objects/video.rb
 - lib/flickrie/upload_client.rb
 - lib/flickrie/version.rb
-- lib/flickrie.rb
-- README.md
-- LICENSE
-- .yardopts
 homepage: http://janko-m.github.com/flickrie/
 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'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 2.2.2
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: This gem wraps the Flickr API with a nice object-oriented interface.
 test_files: []
 has_rdoc: