yandex-api-fotki 1.0.0 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: aee299768c5b7267a58060a46da1fdc3dd3f48e3
-  data.tar.gz: 2a5d500310cbe31825942626aad39d080c9181bb
+  metadata.gz: 48c767dca5abac75599d785fececa5673efc1b7c
+  data.tar.gz: d36bd7b446643ce8d1c153a587d9eaa1b158ec1a
 SHA512:
-  metadata.gz: c2ad9e34b57e4d9d7617a9cf83bcd46a5e6143cc952b9d4d0bf70b3c9f69eb4eb0413429466ec92729b5a9fd1e2a3a40a6080dac326e9e23967a96d23aeaa397
-  data.tar.gz: fd9fab21b806ad41f6f1ebf2aff014642bd1a6203b0dd51e00d92594f49e2fab630ef0d797acddd6094140b875d575a975ca9dbe88fd34a77f4ab0f601334121
+  metadata.gz: 69b7f2cfd65a68c1fd9ee237ee1a011b86c0ff12e99164964814205ea458151e4c60312ccc64089fe7e3d6786ad68a3e3945306040ee8830ee52b62f7f479b62
+  data.tar.gz: 4c6686e6df1641c081c0133f8a45d94477187843f7c2c570e7e31e3a919212d32b996bb107f5a149dd40b66cad98fd422b6c5a5c31c2fae7841993f892dd1532

data/lib/yandex/api/fotki.rb

@@ -1,11 +1,17 @@
 require 'rest-client'
 require 'active_support/core_ext/hash/conversions'
 
-require 'yandex/api/fotki/version'
+require_relative 'fotki/version'
+require_relative 'fotki/me'
+require_relative 'fotki/albums'
+require_relative 'fotki/album'
+require_relative 'fotki/photos'
+require_relative 'fotki/photo'
 
 module Yandex
   module API
     module Fotki
+      API_HOST = 'http://api-fotki.yandex.ru'
       class RuntimeError < RuntimeError ; end
       #
       # Main method for authentification
@@ -16,9 +22,9 @@ module Yandex
       # @see https://tech.yandex.ru/oauth/doc/dg/reference/web-client-docpage/
       #
       def self.oauth(oauth_code)
-        return self unless @api_urls.nil?
+        return self if !@api_urls.nil? && @oauth_code === oauth_code
         @oauth_code = oauth_code
-        me = RestClient.get('http://api-fotki.yandex.ru/api/me/',
+        me = RestClient.get("#{API_HOST}/api/me/",
                              Fotki.oauth_hash)
         @api_urls = Me.new(me)
         self
@@ -66,126 +72,6 @@ module Yandex
         Photos
       end
       #
-      # Class Me is wrapper for user service document
-      #
-      # @see https://tech.yandex.ru/fotki/doc/operations-ref/service-document-get-docpage/
-      #
-      class Me
-        attr_reader :album, :photo, :tag
-        #
-        # Parse response from Fotki.oauth
-        #
-        # @param [RestClient::Response] response
-        #
-        def initialize(response)
-          # Nokogiri::XML(me).xpath("/app:service/app:workspace/app:collection[@id='album-list']/@href").text
-          collention = Fotki.xml_to_hash(response)['service']['workspace']['collection'].map{ |i| { i['id'] => i['href'] }}.inject(:merge)
-          @album = collention['album-list']
-          @photo = collention['photo-list']
-          @tag = collention['tag-list']
-        end
-      end
-      #
-      # Class Albums is wrapper for albums listing
-      #
-      class Albums
-        #
-        # List user albums
-        #
-        # @param [Hash] options
-        # @option options [String] sort updated or rupdated or published or rpublished
-        # @option options [Integer] offset Not implemented
-        # @option options [Integer] limit 100 is max
-        #
-        # @return [Hash] Hash of Fotki::Album were keys is id of album
-        # @see https://tech.yandex.ru/fotki/doc/operations-ref/albums-collection-get-docpage/
-        #
-        def self.list(options = {})
-          options[:sort] ||= 'updated'
-          options[:offset] ||= 0
-          options[:limit] ||= 10
-
-          return @list_cache if !@list_cache.nil? && options === @list_options_cache
-
-          @list_options_cache = options
-
-          list = RestClient.get("#{Fotki.api_urls.album}#{options[:sort]}/?limit=#{options[:limit]}", Fotki.oauth_hash)
-
-          @list_cache = Fotki.xml_to_hash(list)['feed']['entry']
-          @list_cache = @list_cache.map { |i|
-            album = Album.new(i)
-            { album.id => album }
-          }.inject(:merge)
-        end
-      end
-      #
-      # Class Album is wrapper for single album
-      #
-      class Album
-        attr_reader :id, :title, :link
-        #
-        # <description>
-        #
-        # @param [Hash] hash Hash from {Fotki::Albums.list} response
-        #
-        def initialize(hash)
-          @id = parse_id(hash['id'])
-          @title = hash['title']
-          @link = hash['link'].map{ |i| { i['rel'] => i['href'] } }.inject(:merge)
-        end
-
-        private
-          def parse_id(string)
-            string.split(':').last.to_i
-          end
-      end
-
-      #
-      # Class Photos provides photos collections
-      #
-      class Photos
-        #
-        # Uploading photo
-        #
-        # @param [Hash] hash
-        #
-        # == Required
-        # @option hash [File] :image IO stream of file. For example +File.new('tmp/file.png')+ or +open('\h\ttp://site.com/image.png')+
-        # == Optional
-        # @option hash [String] :title Title of image
-        # @option hash [String] :summary Description of image
-        # @option hash [Integer] :album Id of album to upload
-        # @option hash [String] :access public, friends or private
-        # @see https://tech.yandex.ru/fotki/doc/concepts/add-photo-docpage/#multipart-format
-        #
-        # @return [Fotki::Photo] Instance of Photo class
-        #
-        def self.upload(hash)
-          raise Fotki::RuntimeError, ':image is required' unless hash[:image]
-          response = RestClient.post(Fotki.api_urls.photo, hash, Fotki.oauth_hash)
-          Photo.new(response)
-        end
-      end
-      #
-      # Class Photo is wrapper for single photo
-      #
-      # @see https://tech.yandex.ru/fotki/doc/operations-ref/photo-get-docpage/
-      #
-      class Photo
-        attr_reader :id, :links
-        #
-        # Photo initialize
-        #
-        # @param [RestClient::Response] response
-        #
-        def initialize(response)
-          entry = Fotki.xml_to_hash(response)['entry']
-          @id = entry['id'].split(':').last.to_i
-          @links = entry['img'].map{ |i| { i['size'] => i } }.inject(:merge)
-          # puts JSON.pretty_generate(entry)
-        end
-      end
-      #
       # XML parser wrapper. Because I'm not sure if it be persistent.
       #
       # @param [String] xml XML input

data/lib/yandex/api/fotki/album.rb

@@ -0,0 +1,24 @@
+module Yandex
+  module API
+    module Fotki
+      class Album
+        attr_reader :id, :title, :link
+        #
+        # <description>
+        #
+        # @param [Hash] options Hash from {Fotki::Albums.list} response
+        #
+        def initialize(options)
+          @id = parse_id(options['id'])
+          @title = options['title']
+          @link = options['link'].map{ |i| { i['rel'] => i['href'] } }.inject(:merge)
+        end
+
+        private
+          def parse_id(string)
+            string.split(':').last.to_i
+          end
+      end
+    end
+  end
+end

data/lib/yandex/api/fotki/albums.rb

@@ -0,0 +1,36 @@
+module Yandex
+  module API
+    module Fotki
+      class Albums
+        #
+        # List user albums
+        #
+        # @param [Hash] options
+        # @option options [String] sort updated or rupdated or published or rpublished
+        # @option options [Integer] offset Not implemented
+        # @option options [Integer] limit 100 is max
+        #
+        # @return [Hash] Hash of Fotki::Album were keys is id of album
+        # @see https://tech.yandex.ru/fotki/doc/operations-ref/albums-collection-get-docpage/
+        #
+        def self.list(options = {})
+          options[:sort] ||= 'updated'
+          options[:offset] ||= 0
+          options[:limit] ||= 10
+
+          return @list_cache if !@list_cache.nil? && options === @list_options_cache
+
+          @list_options_cache = options
+
+          list = RestClient.get("#{Fotki.api_urls.album}#{options[:sort]}/?limit=#{options[:limit]}", Fotki.oauth_hash)
+
+          @list_cache = Fotki.xml_to_hash(list)['feed']['entry']
+          @list_cache = @list_cache.map { |i|
+            album = Album.new(i)
+            { album.id => album }
+          }.inject(:merge)
+        end
+      end
+    end
+  end
+end

data/lib/yandex/api/fotki/me.rb

@@ -0,0 +1,26 @@
+module Yandex
+  module API
+    module Fotki
+      #
+      # Class Me is wrapper for user service document
+      #
+      # @see https://tech.yandex.ru/fotki/doc/operations-ref/service-document-get-docpage/
+      #
+      class Me
+        attr_reader :album, :photo, :tag
+        #
+        # Parse response from Fotki.oauth
+        #
+        # @param [RestClient::Response] response
+        #
+        def initialize(response)
+          # Nokogiri::XML(me).xpath("/app:service/app:workspace/app:collection[@id='album-list']/@href").text
+          collention = Fotki.xml_to_hash(response)['service']['workspace']['collection'].map{ |i| { i['id'] => i['href'] }}.inject(:merge)
+          @album = collention['album-list']
+          @photo = collention['photo-list']
+          @tag = collention['tag-list']
+        end
+      end
+    end
+  end
+end

data/lib/yandex/api/fotki/photo.rb

@@ -0,0 +1,25 @@
+module Yandex
+  module API
+    module Fotki
+      #
+      # Class Photo is wrapper for single photo
+      #
+      # @see https://tech.yandex.ru/fotki/doc/operations-ref/photo-get-docpage/
+      #
+      class Photo
+        attr_reader :id, :links
+        #
+        # Photo initialize
+        #
+        # @param [RestClient::Response] response
+        #
+        def initialize(response)
+          entry = Fotki.xml_to_hash(response)['entry']
+          @id = entry['id'].split(':').last.to_i
+          @links = entry['img'].map{ |i| { i['size'] => i } }.inject(:merge)
+          # puts JSON.pretty_generate(entry)
+        end
+      end
+    end
+  end
+end

data/lib/yandex/api/fotki/photos.rb

@@ -0,0 +1,48 @@
+module Yandex
+  module API
+    module Fotki
+      class Photos
+        #
+        # Uploading photo
+        #
+        # @param [Hash] options
+        #
+        # == Required
+        # @option options [File] :image IO stream of file. For example +File.new('tmp/file.png')+ or +open('\h\ttp://site.com/image.png')+
+        # == Optional
+        # @option options [String] :title Title of image
+        # @option options [String] :summary Description of image
+        # @option options [Integer] :album Id of album to upload
+        # @option options [String] :access public, friends or private
+        # @see https://tech.yandex.ru/fotki/doc/concepts/add-photo-docpage/#multipart-format
+        #
+        # @return [Fotki::Photo] Instance of Photo class
+        #
+        def self.upload(options)
+          raise Fotki::RuntimeError, ':image is required' unless options[:image]
+          response = RestClient.post(Fotki.api_urls.photo, options, Fotki.oauth_hash)
+          Photo.new(response)
+        end
+        #
+        # Get info about photo
+        #
+        # @param [Hash] options
+        #
+        # == Required
+        # @option options [String] :user Owner of photo
+        # @option options [String] :id Photo id
+        #
+        # @return [Fotki::Photo] Instance of Photo class
+        #
+        def self.get(options)
+          raise Fotki::RuntimeError, ':user is required' unless options[:user]
+          raise Fotki::RuntimeError, ':id is required' unless options[:id]
+          url = "#{API_HOST}/api/users/#{options[:user]}/photo/#{options[:id].to_s}/"
+          headers = options.except(:user, :id).merge(Fotki.oauth_hash)
+          response = RestClient.get(url, headers)
+          Photo.new(response)
+        end
+      end
+    end
+  end
+end

data/lib/yandex/api/fotki/version.rb

@@ -1,7 +1,7 @@
 module Yandex
   module API
     module Fotki
-      VERSION = '1.0.0'
+      VERSION = '1.1.0'
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: yandex-api-fotki
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.0
 platform: ruby
 authors:
 - github.com/1v
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-11-09 00:00:00.000000000 Z
+date: 2016-11-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -128,6 +128,11 @@ files:
 - bin/setup
 - lib/yandex-api-fotki.rb
 - lib/yandex/api/fotki.rb
+- lib/yandex/api/fotki/album.rb
+- lib/yandex/api/fotki/albums.rb
+- lib/yandex/api/fotki/me.rb
+- lib/yandex/api/fotki/photo.rb
+- lib/yandex/api/fotki/photos.rb
 - lib/yandex/api/fotki/version.rb
 - yandex-api-fotki.gemspec
 homepage: https://github.com/1v/yandex-api-fotki