mailru-api 0.5.0 → 0.5.2

data/lib/mailru-api.rb

@@ -81,7 +81,7 @@ module MailRU
     end
 
     def audio
-      DSL.new(self.clone, 'audio') do
+      DSL.new(self, 'audio') do
         api 'get'
         api 'link'
         api 'search'
@@ -89,13 +89,13 @@ module MailRU
     end
 
     def events
-      DSL.new(self.clone, 'events') do
+      DSL.new(self, 'events') do
         api 'getNewCount'
       end
     end
 
     def friends
-      DSL.new(self.clone, 'friends') do
+      DSL.new(self, 'friends') do
         api 'get'
         api 'getAppUsers'
         api 'getInvitationsCount'
@@ -127,13 +127,13 @@ module MailRU
 
     def mobile
       DSL.new(self, 'mobile') do
-        api 'getCanvas'
+        api 'getCanvas', :get, Request::Secure::No
       end
     end
 
     def notifications
       DSL.new(self, 'notifications') do
-        api 'send'
+        api 'send', :get, Request::Secure::Yes
       end
     end
 

data/lib/mailru-api/dsl.rb

@@ -11,11 +11,11 @@ module MailRU
         end
       end
 
-      def api name, method = :get
+      def api name, method = :get, secure = Request::Secure::Any
         self.class.send(:define_method, underscore(name)) do |params = {}|
-          return GetRequest.new(@api, "#{@group}.#{name}", params).get if method == :get
-          return PostRequest.new(@api, "#{@group}.#{name}", params).post if method == :post
-          raise Error.create(0, 'Internal Error: HTTP method must be GET or POST!')
+          return GetRequest.new(@api, "#{@group}.#{name}", params, secure).get if method == :get
+          return PostRequest.new(@api, "#{@group}.#{name}", params, secure).post if method == :post
+          raise Error.create(0, 'HTTP method must be GET or POST!')
         end
       end
 

data/lib/mailru-api/error.rb

@@ -25,7 +25,7 @@ module MailRU
           when 200 then PermissionDeniedError.new(code, description)
           when 202 then AccessToObjectDeniedError.new(code, description)
           when 501 then IncorrectImageError.new(code, description)
-          else Error.new(code, description)
+          else Error.new(code, "Internal Error: #{description}")
         end
       end
     end

data/lib/mailru-api/request.rb

@@ -30,13 +30,34 @@ module MailRU
       end
 
       def use_c2s?
-        @api.private_key and (@secure == Secure::No or @secure == Secure::Any)
+        @api.private_key and (@secure == Secure::No or @secure == Secure::Any) and @api.uid
       end
 
       def signature
         return s2s_signature if use_s2s?
         return c2s_signature if use_c2s?
-        ''
+
+        if @secure == Secure::Yes and @api.secret_key.nil?
+          raise Error.create(0, 'secret_key must be specified for secure requests.')
+        end
+
+        if @secure == Secure::No and @api.private_key.nil?
+          raise Error.create(0, 'private_key must be specified for non secure requests.')
+        end
+
+        if @secure == Secure::Any and @api.secret_key.nil? and @api.private_key.nil?
+          raise Error.create(0, 'secret_key or private_key must be specified.')
+        end
+
+        if @secure == Secure::No and @api.uid.nil?
+          raise Error.create(0, 'uid must be specified for non secure requests.')
+        end
+
+        if @secure == Secure::Any and @api.secret_key.nil? and @api.uid.nil?
+          raise Error.create(0, 'uid must be specified for non secure requests.')
+        end
+
+        raise Error.create(0, 'unknown error.')
       end
 
       def c2s_signature

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mailru-api
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.5.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,9 +9,9 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-01 00:00:00.000000000 Z
+date: 2013-09-22 00:00:00.000000000 Z
 dependencies: []
-description: MailRU API for Ruby
+description: Ruby @Mail.RU API
 email: demin.alexey@inbox.ru
 executables: []
 extensions: []
@@ -21,7 +21,7 @@ files:
 - lib/mailru-api/error.rb
 - lib/mailru-api/request.rb
 - lib/mailru-api/dsl.rb
-homepage: ''
+homepage: https://github.com/ademin/mailru-api
 licenses:
 - MIT
 post_install_message: 
@@ -45,6 +45,6 @@ rubyforge_project:
 rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
-summary: MailRU API for Ruby
+summary: Ruby @Mail.RU API
 test_files: []
 has_rdoc: