mailru-api 0.4.2 → 0.5.0

data/lib/mailru-api.rb

@@ -2,16 +2,7 @@
 
 require 'mailru-api/error'
 require 'mailru-api/request'
-require 'mailru-api/audio'
-require 'mailru-api/events'
-require 'mailru-api/friends'
-require 'mailru-api/guestbook'
-require 'mailru-api/mail'
-require 'mailru-api/mobile'
-require 'mailru-api/notifications'
-require 'mailru-api/photos'
-require 'mailru-api/stream'
-require 'mailru-api/users'
+require 'mailru-api/dsl'
 
 module MailRU
   class APIConfiguration
@@ -90,47 +81,90 @@ module MailRU
     end
 
     def audio
-      return Audio.new(self)
+      DSL.new(self.clone, 'audio') do
+        api 'get'
+        api 'link'
+        api 'search'
+      end
     end
 
     def events
-      return Events.new(self)
+      DSL.new(self.clone, 'events') do
+        api 'getNewCount'
+      end
     end
 
     def friends
-      return Friends.new(self)
+      DSL.new(self.clone, 'friends') do
+        api 'get'
+        api 'getAppUsers'
+        api 'getInvitationsCount'
+        api 'getOnline'
+      end
     end
 
     def guestbook
-      return Guestbook.new(self)
+      DSL.new(self, 'guestbook') do
+        api 'get'
+        api 'post', :post
+      end
     end
 
     def mail
-      return Mail.new(self)
+      DSL.new(self, 'mail') do
+        api 'getUnreadCount'
+      end
     end
 
     def messages
-      return Messages.new(self)
+      DSL.new(self, 'messages') do
+        api 'getThread'
+        api 'getThreadsList'
+        api 'getUnreadCount'
+        api 'post', :post
+      end
     end
 
     def mobile
-      return Mobile.new(self)
+      DSL.new(self, 'mobile') do
+        api 'getCanvas'
+      end
     end
 
     def notifications
-      return Notifications.new(self)
+      DSL.new(self, 'notifications') do
+        api 'send'
+      end
     end
 
     def photos
-      return Photos.new(self)
+      DSL.new(self, 'photos')  do
+        api 'createAlbum'
+        api 'get'
+        api 'getAlbums'
+        api 'upload', :post
+      end
     end
 
     def stream
-      return Stream.new(self)
+      DSL.new(self, 'stream') do
+        api 'comment'
+        api 'get'
+        api 'getByAuthor'
+        api 'like'
+        api 'post', :post
+        api 'share', :post
+        api 'unlike'
+      end
     end
 
     def users
-      return Users.new(self)
+      DSL.new(self, 'users') do
+        api 'getBalance'
+        api 'getInfo'
+        api 'hasAppPermission'
+        api 'isAppUser'
+      end
     end
   end
 end

data/lib/mailru-api/dsl.rb

@@ -0,0 +1,33 @@
+#:encoding: utf-8
+
+module MailRU
+  class API
+    class DSL
+      def initialize api, group,  &block
+        @api = api
+        @group = group
+        if block_given?
+          instance_eval(&block)
+        end
+      end
+
+      def api name, method = :get
+        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!')
+        end
+      end
+
+      private
+
+      def underscore s
+        s.gsub(/::/, '/').
+          gsub(/([A-Z]+)([A-Z][a-z])/,'\1_\2').
+          gsub(/([a-z\d])([A-Z])/,'\1_\2').
+          tr("-", "_").
+          downcase
+      end
+    end
+  end
+end

data/lib/mailru-api/error.rb

@@ -6,6 +6,8 @@ module MailRU
       attr_accessor :code, :description
 
       def initialize code, description
+        super("#{code}, #{description}")
+
         @code = Integer(code)
         @description = description
       end

data/lib/mailru-api/request.rb

@@ -65,7 +65,7 @@ module MailRU
 
           error = response if response.name == 'error'
           if error
-            raise MailRU::API::Error.create(
+            raise Error.create(
               error.elements['error_code'].text,
               error.elements['error_msg'].text
             )
@@ -75,7 +75,7 @@ module MailRU
           if response.is_a?(Hash)
             error = response['error']
             if error
-              raise MailRU::API::Error.create(error['error_code'], error['error_msg'])
+              raise Error.create(error['error_code'], error['error_msg'])
             end
           end
         end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mailru-api
 version: !ruby/object:Gem::Version
-  version: 0.4.2
+  version: 0.5.0
   prerelease: 
 platform: ruby
 authors:
@@ -18,19 +18,9 @@ extensions: []
 extra_rdoc_files: []
 files:
 - lib/mailru-api.rb
-- lib/mailru-api/audio.rb
 - lib/mailru-api/error.rb
-- lib/mailru-api/events.rb
-- lib/mailru-api/friends.rb
-- lib/mailru-api/guestbook.rb
-- lib/mailru-api/mail.rb
-- lib/mailru-api/messages.rb
-- lib/mailru-api/mobile.rb
-- lib/mailru-api/notifications.rb
-- lib/mailru-api/photos.rb
 - lib/mailru-api/request.rb
-- lib/mailru-api/stream.rb
-- lib/mailru-api/users.rb
+- lib/mailru-api/dsl.rb
 homepage: ''
 licenses:
 - MIT

data/lib/mailru-api/audio.rb

@@ -1,23 +0,0 @@
-#:encoding: utf-8
-
-module MailRU
-  class API
-    class Audio
-      def initialize api
-        @api = api
-      end
-
-      def get params = {}
-        GetRequest.new(@api, 'audio.get', params).get
-      end
-
-      def link params = {}
-        GetRequest.new(@api, 'audio.link', params).get
-      end
-
-      def search params = {}
-        GetRequest.new(@api, 'audio.search', params).get
-      end
-    end
-  end
-end

data/lib/mailru-api/events.rb

@@ -1,15 +0,0 @@
-#:encoding: utf-8
-
-module MailRU
-  class API
-    class Events
-      def initialize api
-        @api = api
-      end
-
-      def get_new_count
-        GetRequest.new(@api, 'events.getNewCount', {}).get
-      end
-    end
-  end
-end

data/lib/mailru-api/friends.rb

@@ -1,31 +0,0 @@
-#:encoding: utf-8
-
-module MailRU
-  class API
-    class Friends
-      RETURN_OBJECTS = 1
-      RETURN_UIDS = 0
-
-      def initialize api
-        @api = api
-      end
-
-      def get params = {}
-        GetRequest.new(@api, 'friends.get', params).get
-      end
-
-      def get_app_users params = {}
-        GetRequest.new(@api, 'friends.getAppUsers', params).get
-      end
-
-      def get_invitations_count params = {}
-        GetRequest.new(@api, 'friends.getInvitationsCount', params).get
-      end
-
-      def get_online params = {}
-        GetRequest.new(@api, 'friends.getOnline', params).get
-      end
-    end
-  end
-end
-

data/lib/mailru-api/guestbook.rb

@@ -1,19 +0,0 @@
-#:encoding: utf-8
-
-module MailRU
-  class API
-    class Guestbook
-      def initialize api
-        @api = api
-      end
-
-      def get params = {}
-        GetRequest.new(@api, 'guestbook.get', params).get
-      end
-
-      def post params = {}
-        PostRequest.new(@api, 'guestbook.post', params).post
-      end
-    end
-  end
-end

data/lib/mailru-api/mail.rb

@@ -1,15 +0,0 @@
-#:encoding: utf-8
-
-module MailRU
-  class API
-    class Mail
-      def initialize api
-        @api = api
-      end
-
-      def get_unread_count params = {}
-        GetRequest.new(@api, 'mail.getUnreadCount', params).get
-      end
-    end
-  end
-end

data/lib/mailru-api/messages.rb

@@ -1,23 +0,0 @@
-#:encoding: utf-8
-
-module MyMailRU
-  class API
-    class Messages
-      def get_thread params = {}
-        GetRequest.new(@api, 'messages.getThread', params).get
-      end
-
-      def get_threads_list params = {}
-        GetRequest.new(@api, 'messages.getThreadsList', params).get
-      end
-
-      def get_unread_count params = {}
-        GetRequest.new(@api, 'messages.getUnreadCount', params).get
-      end
-
-      def post params = {}
-        PostRequest.new(@api, 'messages.post', params).post
-      end
-    end
-  end
-end

data/lib/mailru-api/mobile.rb

@@ -1,18 +0,0 @@
-#:encoding: utf-8
-
-module MailRU
-  class API
-    class Mobile
-      BASIC = 'basic'
-      SMARTPHONE = 'smartphone'
-
-      def initialize api
-        @api = api
-      end
-
-      def get_canvas params = {}
-        GetRequest.new(@api, 'mobile.getCanvas', params, Request::Secure::No).get
-      end
-    end
-  end
-end

data/lib/mailru-api/notifications.rb

@@ -1,15 +0,0 @@
-#:encoding: utf-8
-
-module MailRU
-  class API
-    class Notifications
-      def initialize api
-        @api = api
-      end
-
-      def send params = {}
-        GetRequest.new(@api, 'notifications.send', params, Request::Secure::Yes).get
-      end
-    end
-  end
-end

data/lib/mailru-api/photos.rb

@@ -1,27 +0,0 @@
-#:encoding: utf-8
-
-module MailRU
-  class API
-    class Photos
-      def initialize api
-        @api = api
-      end
-
-      def create_album params = {}
-        GetRequest.new(@api, 'photos.createAlbum', params).get
-      end
-
-      def get params = {}
-        GetRequest.new(@api, 'photos.get', params).get
-      end
-
-      def get_albums params = {}
-        GetRequest.new(@api, 'photos.getAlbums', params).get
-      end
-
-      def upload params = {}
-        PostRequest.new(@api, 'photos.upload', params).post
-      end
-    end
-  end
-end

data/lib/mailru-api/stream.rb

@@ -1,39 +0,0 @@
-#:encoding: utf-8
-
-module MailRU
-  class API
-    class Stream
-      def initialize api
-        @api = api
-      end
-
-      def comment params = {}
-        GetRequest.new(@api, 'stream.comment', params).get
-      end
-
-      def get params = {}
-        GetRequest.new(@api, 'stream.get', params).get
-      end
-
-      def get_by_author params = {}
-        GetRequest.new(@api, 'stream.getByAuthor', params).get
-      end
-
-      def like params = {}
-        GetRequest.new(@api, 'stream.like', params).get
-      end
-
-      def post params = {}
-        PostRequest.new(@api, 'stream.post', params).post
-      end
-
-      def share params ={}
-        PostRequest.new(@api, 'stream.share', params).post
-      end
-
-      def unlike params = {}
-        GetRequest.new(@api, 'stream.unlike', params).get
-      end
-    end
-  end
-end

data/lib/mailru-api/users.rb

@@ -1,27 +0,0 @@
-#:encoding: utf-8
-
-module MailRU
-  class API
-    class Users
-      def initialize api
-        @api = api
-      end
-
-      def get_balance
-        GetRequest.new(@api, 'users.getBalance', params).get
-      end
-
-      def get_info params = {}
-        GetRequest.new(@api, 'users.getInfo', params).get
-      end
-
-      def has_app_permission params = {}
-        GetRequest.new(@api, 'users.hasAppPermission', params).get
-      end
-
-      def is_app_user
-        GetRequest.new(@api, 'users.isAppUser', params).get
-      end
-    end
-  end
-end