mailru-api 0.6.0 → 0.7.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 65a98b4ade3ffc3528f7febafa33a1e43bfab58a
+  data.tar.gz: 4a5a918b8c7716d7c52e1dd7a10e7e461921fc40
+SHA512:
+  metadata.gz: c15ec67f786d7400521495557ab602011b08431cdbe642bc10e1b53d7616d3c0cea7ab8f05114726c081269561044eb270df9088e8fc541ce715c18ae1da16e1
+  data.tar.gz: 147d1a8a458707e0dd47fc0249163d98c611ef55de28336e7143e9a4f63aadb6a6b94625bb10cdae449dda4bbf147c0c27d9f7781fc1b1e6fc0ccd9bd561dc92

data/lib/mailru-api.rb

@@ -1,170 +1,7 @@
 #:encoding: utf-8
 
+require 'mailru-api/api'
+require 'mailru-api/dsl'
 require 'mailru-api/error'
 require 'mailru-api/request'
-require 'mailru-api/dsl'
-
-module MailRU
-  class APIConfiguration
-    attr_accessor :app_id, :secret_key, :private_key, :session_key, :uid, :format
-  end
-
-  class APIConfigurationBuilder
-    attr_reader :configuration
-
-    def initialize(&block)
-      if block_given?
-        @configuration = APIConfiguration.new
-        instance_eval(&block)
-      end
-    end
-
-    def app_id value
-      @configuration.app_id = value
-    end
-
-    def secret_key value
-      @configuration.secret_key = value
-    end
-
-    def private_key value
-      @configuration.private_key = value
-    end
-
-    def session_key value
-      @configuration.session_key = value
-    end
-
-    def uid value
-      @configuration.uid = value
-    end
-
-    def format value
-      @configuration.format = value
-    end
-  end
-
-  class API
-    module Format
-      XML = 'xml'
-      JSON = 'json'
-    end
-
-    PATH = 'http://www.appsmail.ru/platform/api'
-
-    attr_accessor :app_id, :secret_key, :private_key, :session_key, :uid, :format
-
-    def initialize options = {}, &block
-      @app_id = options[:app_id]
-      @secret_key = options[:secret_key]
-      @private_key = options[:private_key]
-      @session_key = options[:session_key]
-      @uid = options[:uid]
-      @format = options[:format]
-
-      if block_given?
-        if block.arity == 1
-          yield self
-        else
-          configuration = APIConfigurationBuilder.new(&block).configuration
-
-          unless configuration.nil?
-            @app_id = configuration.app_id || @app_id
-            @secret_key = configuration.secret_key || @secret_key
-            @private_key = configuration.private_key || @private_key
-            @session_key = configuration.session_key || @session_key
-            @uid = configuration.uid || @uid
-            @format = configuration.format || @format
-          end
-        end
-      end
-    end
-
-    def audio
-      DSL.new(self, 'audio') do
-        api 'get'
-        api 'link'
-        api 'search'
-      end
-    end
-
-    def events
-      DSL.new(self, 'events') do
-        api 'getNewCount'
-      end
-    end
-
-    def friends
-      DSL.new(self, 'friends') do
-        api 'get'
-        api 'getAppUsers'
-        api 'getInvitationsCount'
-        api 'getOnline'
-      end
-    end
-
-    def guestbook
-      DSL.new(self, 'guestbook') do
-        api 'get'
-        api 'post', :post
-      end
-    end
-
-    def mail
-      DSL.new(self, 'mail') do
-        api 'getUnreadCount'
-      end
-    end
-
-    def messages
-      DSL.new(self, 'messages') do
-        api 'getThread'
-        api 'getThreadsList'
-        api 'getUnreadCount'
-        api 'post', :post
-      end
-    end
-
-    def mobile
-      DSL.new(self, 'mobile') do
-        api 'getCanvas', :get, Request::Secure::No
-      end
-    end
-
-    def notifications
-      DSL.new(self, 'notifications') do
-        api 'send', :get, Request::Secure::Yes
-      end
-    end
-
-    def photos
-      DSL.new(self, 'photos')  do
-        api 'createAlbum'
-        api 'get'
-        api 'getAlbums'
-        api 'upload', :post
-      end
-    end
-
-    def stream
-      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
-      DSL.new(self, 'users') do
-        api 'getBalance'
-        api 'getInfo'
-        api 'hasAppPermission'
-        api 'isAppUser'
-      end
-    end
-  end
-end

data/lib/mailru-api/api.rb

@@ -0,0 +1,149 @@
+#:encoding: utf-8
+
+module MailRU
+  class API
+    PATH = 'http://www.appsmail.ru/platform/api'
+    PARAMS = [:app_id, :secret_key, :private_key, :session_key, :uid, :format]
+
+    module Format
+      XML = 'xml'
+      JSON = 'json'
+    end
+
+    class ConfigurationBuilder
+      attr_reader :configuration
+
+      def initialize(&block)
+        @configuration = {}
+        instance_eval(&block) if block_given?
+      end
+
+      PARAMS.each do |param|
+        class_eval <<-EOV, __FILE__, __LINE__ + 1
+          def #{param}(value)                  # def app_id(value)
+            @configuration[:#{param}] = value  #   @configuration[:app_id] = value
+          end                                  # end
+        EOV
+      end
+    end
+
+    def initialize options = {}, &block
+      @configuration = options
+
+      if block_given?
+        if block.arity == 1
+          yield self
+        else
+          @configuration.merge! ConfigurationBuilder.new(&block).configuration
+        end
+      end
+    end
+
+    PARAMS.each do |param|
+      class_eval <<-EOV, __FILE__, __LINE__ + 1
+        def #{param}=(value)                 # def app_id=(value)
+          @configuration[:#{param}] = value  #   @configuration[:app_id] = value
+        end                                  # end
+
+        def #{param}                         # def app_id
+          @configuration[:#{param}]          #   @configuration[:app_id]
+        end                                  # end
+      EOV
+    end
+
+    def get name, params = {}, secure = Request::Secure::Any
+      GetRequest.new(self, name, params, secure).get
+    end
+
+    def post name, params = {}, secure = Request::Secure::Any
+      PostRequest.new(self, name, params, secure).post
+    end
+
+    def audio
+      DSL.new(self, 'audio') do
+        api 'get'
+        api 'link'
+        api 'search'
+      end
+    end
+
+    def events
+      DSL.new(self, 'events') do
+        api 'getNewCount'
+      end
+    end
+
+    def friends
+      DSL.new(self, 'friends') do
+        api 'get'
+        api 'getAppUsers'
+        api 'getInvitationsCount'
+        api 'getOnline'
+      end
+    end
+
+    def guestbook
+      DSL.new(self, 'guestbook') do
+        api 'get'
+        api 'post', :post
+      end
+    end
+
+    def mail
+      DSL.new(self, 'mail') do
+        api 'getUnreadCount'
+      end
+    end
+
+    def messages
+      DSL.new(self, 'messages') do
+        api 'getThread'
+        api 'getThreadsList'
+        api 'getUnreadCount'
+        api 'post', :post
+      end
+    end
+
+    def mobile
+      DSL.new(self, 'mobile') do
+        api 'getCanvas', :get, Request::Secure::No
+      end
+    end
+
+    def notifications
+      DSL.new(self, 'notifications') do
+        api 'send', :get, Request::Secure::Yes
+      end
+    end
+
+    def photos
+      DSL.new(self, 'photos')  do
+        api 'createAlbum'
+        api 'get'
+        api 'getAlbums'
+        api 'upload', :post
+      end
+    end
+
+    def stream
+      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
+      DSL.new(self, 'users') do
+        api 'getBalance'
+        api 'getInfo'
+        api 'hasAppPermission'
+        api 'isAppUser'
+      end
+    end
+  end
+end

data/lib/mailru-api/dsl.rb

@@ -6,21 +6,23 @@ module MailRU
       def initialize api, group,  &block
         @api = api
         @group = group
-        if block_given?
-          instance_eval(&block)
-        end
+        instance_eval(&block) if block_given?
       end
 
       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, 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!')
+        raise Error.create(0, 'HTTP method must be GET or POST!') unless [:get, :post].include?(method)
+
+        method(SEND).call(:define_singleton_method, underscore(name)) do |params = {}|
+          return @api.get("#{@group}.#{name}", params, secure) if method == :get
+          return @api.post("#{@group}.#{name}", params, secure) if method == :post
         end
       end
 
       private
 
+      SEND = (0...6).map{ (65 + rand(26)).chr }.join
+      alias_method(SEND, :send)
+
       def underscore s
         s.gsub(/([A-Z]+)([A-Z][a-z])/,'\1_\2').
           gsub(/([a-z\d])([A-Z])/,'\1_\2').

data/lib/mailru-api/request.rb

@@ -16,7 +16,7 @@ module MailRU
         Any = 2
       end
 
-      def initialize api, method, method_params, secure = Secure::Any
+      def initialize api, method, method_params = {}, secure = Secure::Any
         @api = api
         @method = method
         @method_params = method_params

metadata

@@ -1,15 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mailru-api
 version: !ruby/object:Gem::Version
-  version: 0.6.0
-  prerelease: 
+  version: 0.7.0
 platform: ruby
 authors:
 - Alexey Demin
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-24 00:00:00.000000000 Z
+date: 2013-10-13 00:00:00.000000000 Z
 dependencies: []
 description: Ruby @Mail.RU API
 email: demin.alexey@inbox.ru
@@ -18,33 +17,32 @@ extensions: []
 extra_rdoc_files: []
 files:
 - lib/mailru-api.rb
+- lib/mailru-api/api.rb
 - lib/mailru-api/error.rb
 - lib/mailru-api/request.rb
 - lib/mailru-api/dsl.rb
 homepage: https://github.com/ademin/mailru-api
 licenses:
 - MIT
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: 1.9.3
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 2.0.3
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Ruby @Mail.RU API
 test_files: []
-has_rdoc: