Code refactoring

README.md

@@ -25,8 +25,14 @@
 ## События
 
     # Получение списка событий
-    Timepad.event.get_list :limit => 1, :order_by => :begin
+    events = Timepad.event.get_list :limit => 1, :order_by => :begin
 
+    # Альтернативный вариант
+    events = Timepad.events
+
+    # Получение события
+    event = Timepad.event.get 1
+    event = Timepad.event 1
 ## Списки рассылок
 
     # Создание списка рассылок

lib/timepad.rb

@@ -14,23 +14,25 @@ module Timepad
   extend Config
 
   def self.maillist
-    client
-    @client.maillist
+    client.maillist
   end
 
   def self.mail
-    client
-    @client.mail
+    client.mail
   end
 
   def self.category
-    client
-    @client.category
+    client.category
   end
 
-  def self.event
-    client
-    @client.event
+  def self.event(id = nil)
+    event = client.event
+    id.nil? ? event : event.get(id)
+  end
+
+  def self.events(attrs ={})
+    event = client.event
+    event.get_list attrs
   end
 
   def self.client(attrs = {})

lib/timepad/event.rb

@@ -9,31 +9,35 @@ def initialize(timepad_client)
     #
     # @param [Hash{cat_id => String, limit => String, order_by =>String}]
     # @return [Array]
-    def get_list params = {}
-      request 'getlist', params
+    def get_list(attrs = {})
+      request 'getlist', attrs
     end
 
     # Get event by event_id
     #
     # @param [String] event_id
     # @return [Array]
-    def get event_id
+    def get(event_id)
       request 'get', :e_id => event_id
     end
 
     # Get event subscribers
     #
     # @params [String] event_id
     # @return [Array]
-    def export event_id
+    def export(event_id)
       request 'export', :e_id => event_id
     end
 
-    def create attrs
+    # Create event
+    #
+    # @params [Hash]
+    # @return [Array]
+    def create(attrs)
       request 'create', attrs
     end
 
-    def register attrs
+    def register(attrs)
       request 'register', attrs
     end
 

test/timepad/event_test.rb

@@ -20,4 +20,15 @@ def test_should_get_events
     assert_equal result, ["test"]
   end
 
+  def test_should_get_events_too
+    request = stub_http_request(:get, "#{Timepad.endpoint}event_getlist")
+        .with(:query => {:code => Timepad.key, :id => Timepad.id, :limit => 1, :order_by => 'begin'})
+        .to_return(:body => '["test"]')
+
+    result = Timepad.events :limit => 1, :order_by => :begin
+
+    assert_requested(request)
+    assert_equal result, ["test"]
+  end
+
 end