odnoklassniki 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fa32a6ad3f01eeb19c56f001b06a75ba7564610d
-  data.tar.gz: 888fdd5cacb10c743b680d5858df65a98d6830ff
+  metadata.gz: 2b3a824e8027e9e9d9ba740492920481a3310b1b
+  data.tar.gz: fe9adca08f39d5d97e7eab6b432ee0d41a98c5cf
 SHA512:
-  metadata.gz: d3f1963e9c51d82be4760e9c7ac58795e40a5c39262b62755df9221216b2299d7d3aa07e88065f31640e6da82a987da2a475968744186dc4da0913debda505c7
-  data.tar.gz: 18876b13cbc7e90b6038f78ad528ae100733555a870fb904d18c772b5d1e5c8d1a841d7f48c72efd517ba2cf7e640a5880b04ceaddf6170fa033a014450e817a
+  metadata.gz: 24f487fbb1cbacf25299394843fda7dba17555f0ca40ed46ff718d36d061226ec525e69cb17178eca4f730b35e6d4bdd9f779930a6929310c8ff01144ab77c21
+  data.tar.gz: 0294159377a0adf28f714b91f9c2eebee75799e4ef1c8a1ab0d874edc2c8a116dc8bfc6dbd3c63f355410bbafa2b9b7f4f55a5cb5fcbb06cb56c12e0a794fc1a

data/README.md

@@ -1,11 +1,15 @@
 # Odnoklassniki
 [![Build Status](https://travis-ci.org/gazay/odnoklassniki.svg)](http://travis-ci.org/gazay/odnoklassniki) [![CodeClimate](https://d3s6mut3hikguw.cloudfront.net/github/gazay/odnoklassniki/badges/gpa.svg)](https://codeclimate.com/github/gazay/odnoklassniki)
 
-Ruby wrapper for Odnoklassniki API
+**Odnoklassniki** is a Ruby wrapper for the [Odnoklassniki social network API](http://apiok.ru/).
 
-Right now it is a simple wrapper on get and post requests to Odnoklassniki api.
+At the moment, it is just a simple wrapper for GET and POST requests for Odnoklassniki API.
 
-This gem widely used in [Amplifr](https://amplifr.com) and currently being developed
+This gem is widely used by [Amplifr](https://amplifr.com/?utm_source=odnoklassniki-gem) social media management tool and is currently under development.
+
+<a href="https://amplifr.com/?utm_source=odnoklassniki-gem">
+<img src="https://amplifr.com/logo.png" alt="Amplifr" width="162" height="162">
+</a>
 
 <a href="https://evilmartians.com/?utm_source=odnoklassniki-gem">
 <img src="https://evilmartians.com/badges/sponsored-by-evil-martians.svg" alt="Sponsored by Evil Martians" width="236" height="54">
@@ -13,17 +17,27 @@ This gem widely used in [Amplifr](https://amplifr.com) and currently being devel
 
 ## Installation
 
+You can install the gem via RubyGems:
+
+```
+gem install odnoklassniki
 ```
-    gem install odnoklassniki
+
+Or by using Bundler: put
+
+```ruby
+gem 'odnoklassniki'
 ```
 
+in your `Gemfile`.
+
 ## Usage
 
-To use odnoklassniki api methods you should have [VALUABLE ACCESS](http://dev.odnoklassniki.ru/wiki/pages/viewpage.action?pageId=12878032) to odnoklassniki.
+To use Odnoklassniki API methods you should have "[VALUABLE ACCESS](http://apiok.ru/wiki/display/api/Authorization+OAuth+2.0)" to Odnoklassniki.
 
 ### Configuration
 
-You can create global configuration for your application. Create initializer `config/initializers/ok_api.rb`:
+When using the gem with a Ruby on Rails application, you can configure Odnoklassniki globally by creating an initializer: `config/initializers/ok_api.rb`
 
 ```ruby
 Odnoklassniki.configure do |c|
@@ -33,17 +47,17 @@ Odnoklassniki.configure do |c|
 end
 ```
 
-Or you can create config object and feed it to `Odnoklassniki` module:
+Or you can create a `Config` object and feed it to the `Odnoklassniki` module:
 
 ```ruby
 config = Odnoklassniki::Config.configure do |c|
-  ...
+  # ...
 end
 
 Odnoklassniki.config = config
 ```
 
-Also, when you create new `Odnoklassniki::Client` you can pass all needed (or missed on configuration step) options right there:
+Also, when creating a new `Odnoklassniki::Client`, you can pass along all required (or missing from the configuration step) options right there:
 
 ```ruby
 Odnoklassniki::Client.new(access_token: 'your token', client_id: 'your client id')
@@ -54,22 +68,22 @@ Odnoklassniki::Client.new(access_token: 'your token', client_id: 'your client id
 ```ruby
 client = Odnoklassniki::Client.new(access_token: token)
 
-new_token = client.refresh_token! # This method will be called automaticaly just once
-                                  # for each client before performing request
+new_token = client.refresh_token! # This method will be called automatically just once
+                                  # for each client before performing the request
 
 client.get('friends.get')
 client.get('friends/get')
 client.get('api/friends/get')
 client.get('/api/friends/get')
-# All get requests above identical
+# NOTE: All GET requests above are identical!
 
 client.post('mediatopic.post', type: 'USER_STATUS', attachment: attachment)
 ```
 
-### Error handling
+### Error Handling
 
-Most of errors from Odnoklassniki API retruned in success response (with status code 200).
-So there is a wrapper for it in this gem:
+Unfortunately, most errors from Odnoklassniki API are returned within a _success_ response (200 HTTP status code).
+So, there is a wrapper just for that in this gem:
 
 ```ruby
 begin
@@ -79,8 +93,9 @@ rescue Odnoklassniki::Error::ClientError => e
 end
 ```
 
-Also there are bunch of client/server error classes which structure was gratefully copied and adopted from
-@sferik's twitter gem. They can be useful when Odnoklassniki API wasn't reached or when some other issue occured.
+Also there is a bunch of client/server error classes whose structure was gratefully copied and adopted from
+[@sferik](https://github.com/sferik)'s [twitter](https://github.com/sferik/twitter) gem.
+They can be useful in case when Odnoklassniki API wasn't reached at all or when some other issue has occured.
 
 ## TODO
 
@@ -99,8 +114,8 @@ Also there are bunch of client/server error classes which structure was grateful
 
 * @gazay
 
-Special thanks to @Strech, @igas.
+Special thanks to [@strech](https://github.com/strech), [@igas](https://github.com/igas).
 
 ## License
 
-The MIT License
+[The MIT License](https://github.com/gazay/odnoklassniki/blob/master/LICENSE)

data/lib/odnoklassniki/client.rb

@@ -11,12 +11,12 @@ module Odnoklassniki
       @refreshed = false
     end
 
-    def get(method, params={})
-      request_method(:get, method, params)
+    def get(method, params={}, &block)
+      request_method(:get, method, params, block)
     end
 
-    def post(method, params={})
-      request_method(:post, method, params)
+    def post(method, params={}, &block)
+      request_method(:post, method, params, block)
     end
 
     def refresh_token!
@@ -53,9 +53,11 @@ module Odnoklassniki
       }
     end
 
-    def request_method(http_method, method, params)
+    def request_method(http_method, method, params, block)
       method, params = fallback(method) if method.is_a?(Hash)
-      request.send(http_method, method_path(method), params)
+      response = request.send(http_method, method_path(method), params)
+      response = block.call response if block
+      response
     end
 
     def request

data/lib/odnoklassniki/request.rb

@@ -40,7 +40,11 @@ module Odnoklassniki
     def respond(response)
       parsed_body = \
         begin
-          MultiJson.load(response.body)
+          if response.body.nil? || response.body == ''
+            return response.body
+          else
+            MultiJson.load(response.body)
+          end
         rescue MultiJson::DecodeError
           #Есть случаи отдачи кривого JSON от одноклассников
           gsubed = response.body.

data/lib/odnoklassniki/rest/mediatopic.rb

@@ -0,0 +1,13 @@
+module Odnoklassniki
+  module REST
+    class Mediatopic
+
+      attr_accessor :client
+
+      def initialize(client)
+        @client = client
+      end
+
+    end
+  end
+end

data/lib/odnoklassniki/rest/mediatopic/content.rb

@@ -0,0 +1,97 @@
+module Odnoklassniki
+  module REST
+    class Mediatopic
+      class Content
+        VIDEO_LINK_PATTERN = /youtu\.?be|vimeo/.freeze
+        AUDIO_LINK_PATTERN = /soundcloud|snd\.cc/.freeze
+        EMBEDABLE_LINK_PATTERN = /#{VIDEO_LINK_PATTERN}|#{AUDIO_LINK_PATTERN}/.freeze
+        TEXT_TYPE = 'text'.freeze
+        LINK_TYPE = 'link'.freeze
+        PHOTO_TYPE = 'photo'.freeze
+
+        attr_accessor :options
+
+        # Options:
+        # text: string with message to OK (default: '')
+        # images: Array of File           (default: [])
+        # account_type: :group/:personal  (default: :personal)
+        def initialize(options={})
+          @options = Odnoklassniki::Utils._symbolize_kyes(options)
+        end
+
+        def message
+          @message ||= {
+            type: TEXT_TYPE,
+            text: (text || '')
+          }
+        end
+
+        def link
+          @link ||= \
+            external_url.blank? ? nil : {type: LINK_TYPE, url: external_url}
+        end
+
+        def images
+          @images ||= [uploaded_images].compact
+        end
+
+        private
+
+        def image_id_key
+          @image_id_key ||= options[:account_type] == :group ? :id : :photoId
+        end
+
+        def uploaded_images
+          return if options[:images].blank?
+
+          photos = options[:images].map do |photo|
+            {image_id_key => photoalbum.upload(photo)}
+          end
+
+          {type: PHOTO_TYPE, list: photos}
+        end
+
+        def photoalbum
+          @photoalbum ||= Photoalbum.new(account)
+        end
+
+        def has_single_embedable_link?
+          has_single_link? && embedable_url?(urls[0])
+        end
+
+        def has_single_link?
+          urls.count == 1
+        end
+
+        def text
+          @text ||= options[:text]
+        end
+
+        def urls
+          @urls ||= ::Twitter::Extractor.extract_urls(text)
+        end
+
+        def embedable_url?(url)
+          url =~ EMBEDABLE_LINK_PATTERN
+        end
+
+        def external_url
+          return unless resource.external_url?
+          return resource.external_url unless shorten_links?
+
+          @publication.links.where(original_url: resource.external_url)
+            .first_or_create.short_or_generate
+        end
+
+        def _symbalize_keys(hash)
+          symbolized = {}
+          hash.each do |k, v|
+            symbolized[k.to_sym] = v
+          end
+          hash
+        end
+
+      end
+    end
+  end
+end

data/lib/odnoklassniki/rest/mediatopic/photoalbum.rb

@@ -0,0 +1,117 @@
+require 'net/http'
+require 'net/http/post/multipart'
+require 'http_uploader'
+
+require_relative '../odnoklassniki'
+
+module Odnoklassniki
+  module REST
+    class Mediatopic
+      class Photoalbum
+
+        GET_ALBUMS_METHOD = 'photos.getAlbums'
+        CREATE_ALBUM_METHOD = 'photos.createAlbum'
+        GET_ALBUM_UPLOAD_URL_METHOD = 'photosV2.getUploadUrl'
+        COMMIT_PHOTO_METHOD = 'photosV2.commit'
+
+        ALBUM_NAME = 'apiok'
+        ALBUM_CREATION_OPTIONS = {
+          title: ALBUM_NAME,
+          description: 'Album for uploads from odnoklassniki api gem',
+          type: 'public'
+        }
+
+        attr_accessor :params
+
+        # Options:
+        # account: { id:   Identifier for account in OK,
+        #            type: :group/:personal }
+        # client: Client for specified account
+        def initialize(options)
+          @options = Odnoklassniki::Utils._symbolize_keys(options)
+          @account = @options[:account]
+          @api = @options[:client]
+        end
+
+        def upload(photo)
+          upload_photoalbum_photo(photo)
+        end
+
+        private
+
+        Error = Class.new(StandardError)
+        FindingError = Class.new(Error)
+        CreationError = Class.new(Error)
+        UploadingError = Class.new(Error)
+
+        def upload_photoalbum_photo(photo)
+          upload_response = ::HttpUploader.new(photoalbum_upload_url)
+            .upload(photo.to_io,
+                    photo.basename,
+                    query_param: :pic1, content_type: photo.content_type)
+
+          unless Net::HTTPSuccess === upload_response
+            raise UploadingError, "Failed to upload file. Reason: #{upload_response.body}"
+          end
+
+          photo_id, photo_attributes = JSON.parse(upload_response.body)
+            .try(:[], 'photos').try(:flatten)
+
+          if photo_id.blank? || photo_attributes.blank?
+            raise UploadingError, "Broken upload response. Response: #{upload_response.body}"
+          end
+
+          if @account[:type] == :personal
+            commit_uploaded_photo(photo_id, photo_attributes['token'])
+          else
+            photo_attributes['token']
+          end
+        end
+
+        def photoalbum
+          @photoalbum ||= begin
+            params = {method: GET_ALBUMS_METHOD}
+            params.merge!(gid: @account[:id]) if @account[:type] == :group
+
+            @api.get(params).try(:[], 'albums').to_a
+              .find { |album| album['title'] == ALBUM_NAME }
+          rescue API::Error
+            raise FindingError
+          end
+        end
+
+        def create_photoalbum
+          return photoalbum['aid'] if photoalbum.present?
+
+          params = {method: CREATE_ALBUM_METHOD}.merge!(ALBUM_CREATION_OPTIONS)
+          params.merge!(gid: @account[:id]) if @account[:type] == :group
+
+          @api.get(params)
+        rescue API::Error
+          raise CreationError
+        end
+
+        def photoalbum_upload_url
+          params = {method: GET_ALBUM_UPLOAD_URL_METHOD}
+
+          if @account[:type] == :group
+            params.merge!(gid: @account[:id])
+          else
+            params.merge!(aid: create_photoalbum)
+          end
+
+          @api.get(params) { |json| URI.parse json['upload_url'] }
+        end
+
+        def commit_uploaded_photo(photo_id, photo_token)
+          params = {method: COMMIT_PHOTO_METHOD, photo_id: photo_id, token: photo_token}
+          @api.get(params) do |commit_response|
+            commit_response['photos'][0]['assigned_photo_id']
+          end
+        end
+
+      end # class Photoalbum
+    end # class Odnoklassniki
+  end # module Content
+end # module Social
+

data/lib/odnoklassniki/rest/user.rb

@@ -0,0 +1,18 @@
+module Odnoklassniki
+  module REST
+    class User
+
+      attr_accessor :client
+
+      def initialize(client)
+        @client = client
+      end
+
+      def current_user(fields=[])
+        options = fields.empty? ? {} : fiels.join(',')
+        client.get('users.getCurrentUser', options)
+      end
+
+    end
+  end
+end

data/lib/odnoklassniki/utils.rb

@@ -0,0 +1,18 @@
+module Odnoklassniki
+  module Utils
+
+    class << self
+
+      def _symbolize_keys(hash)
+        symbolized = {}
+        hash.each do |k, v|
+          v = _symbolize_keys(v) if v.is_a?(Hash)
+          symbolized[k.to_sym] = v
+        end
+        symbolized
+      end
+
+    end
+
+  end
+end

data/lib/odnoklassniki/version.rb

@@ -1,3 +1,3 @@
 module Odnoklassniki
-  VERSION = '0.0.1'
+  VERSION = '0.0.2'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: odnoklassniki
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - gazay
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-04 00:00:00.000000000 Z
+date: 2016-06-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
@@ -215,6 +215,11 @@ files:
 - lib/odnoklassniki/connection.rb
 - lib/odnoklassniki/error.rb
 - lib/odnoklassniki/request.rb
+- lib/odnoklassniki/rest/mediatopic.rb
+- lib/odnoklassniki/rest/mediatopic/content.rb
+- lib/odnoklassniki/rest/mediatopic/photoalbum.rb
+- lib/odnoklassniki/rest/user.rb
+- lib/odnoklassniki/utils.rb
 - lib/odnoklassniki/version.rb
 - odnoklassniki.gemspec
 - test/lib/odnoklassniki/client_test.rb
@@ -248,7 +253,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: odnoklassniki
-rubygems_version: 2.2.2
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Ruby wrapper for Odnoklassniki API