mailru-api 0.5.2 → 0.6.0

data/lib/mailru-api/dsl.rb

@@ -22,8 +22,7 @@ module MailRU
       private
 
       def underscore s
-        s.gsub(/::/, '/').
-          gsub(/([A-Z]+)([A-Z][a-z])/,'\1_\2').
+        s.gsub(/([A-Z]+)([A-Z][a-z])/,'\1_\2').
           gsub(/([a-z\d])([A-Z])/,'\1_\2').
           tr("-", "_").
           downcase

data/lib/mailru-api/error.rb

@@ -14,7 +14,7 @@ module MailRU
 
       def self.create(code, description)
         case code
-          when 1 then UnknwonError.new(code, description)
+          when 1 then UnknownError.new(code, description)
           when 2 then UnknownMethodCalledError.new(code, description)
           when 3 then MethodIsDeprecatedError.new(code, description)
           when 100 then InvalidParameterError.new(code, description)

data/lib/mailru-api/request.rb

@@ -36,44 +36,25 @@ module MailRU
       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
-        Digest::MD5.hexdigest(@api.uid + parameters.sort.join + @api.private_key)
+      def s2s_signature
+        Digest::MD5.hexdigest(parameters.sort.join + (@api.secret_key || ''))
       end
 
-      def s2s_signature
-        Digest::MD5.hexdigest(parameters.sort.join + @api.secret_key)
+      def c2s_signature
+        Digest::MD5.hexdigest((@api.uid || '')+ parameters.sort.join + (@api.private_key || ''))
       end
 
       def parameters
-        params = {app_id: @api.app_id, method: @method}
+        params = {}
+        params.merge!({app_id: @api.app_id}) if @api.app_id
+        params.merge!({method: @method}) if @method
         params.merge!({session_key: @api.session_key}) if @api.session_key
         params.merge!({format: @api.format}) if @api.format
-        params.merge!(@method_params) if @method_params
+        params.merge!({uid: @api.uid}) if @api.uid
         params.merge!({secure: 1}) if use_s2s?
+        params.merge!(@method_params) if @method_params
 
         params.to_a.map{|p| p.join('=')}
       end
@@ -86,10 +67,7 @@ module MailRU
 
           error = response if response.name == 'error'
           if error
-            raise Error.create(
-              error.elements['error_code'].text,
-              error.elements['error_msg'].text
-            )
+            raise Error.create(Integer(error.elements['error_code'].text), error.elements['error_msg'].text)
           end
         else
           response = JSON.parse(response)
@@ -106,7 +84,7 @@ module MailRU
     end
 
     class GetRequest < Request   
-      def get        
+      def get
         request = URI.escape(PATH + '?' + parameters.push("sig=#{signature}").join('&'))
         handle_response(Net::HTTP.get(URI(request)))
       end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mailru-api
 version: !ruby/object:Gem::Version
-  version: 0.5.2
+  version: 0.6.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-22 00:00:00.000000000 Z
+date: 2013-09-24 00:00:00.000000000 Z
 dependencies: []
 description: Ruby @Mail.RU API
 email: demin.alexey@inbox.ru
@@ -33,7 +33,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.9.3
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: