telegram_meetup_bot 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e0f006330cda4dcc1f556f33824fe35b02021336
-  data.tar.gz: c57bfd3e78002113e820946dc5a1353d55421bba
+  metadata.gz: 98d69941024a79b6b13a609d1043f7041625284f
+  data.tar.gz: 14411958ac147a0d5a7d01edc9f6e500f4afd085
 SHA512:
-  metadata.gz: fa2ba469c84317ae87940a4cd697f13662377566403768fc1066addc2825bc657da3374831554d4cd9a66fefe3f347a3f7ab96c95501237f7a84025d8c1df071
-  data.tar.gz: 76e08f87c49e62f44808a8dd01b0f44d737eabced30190825a987f283726cd80defde6b2ed4be30a84338d49cf8a9235c8734aac3da29553661fb0e02666d6a1
+  metadata.gz: b09a53761a76d37699959a4f74e32a658672d4f49f5835043b232816b5d430aba78844ca796ff61310d8c8b6d9fd0ebd4a04f48a63e6134e29597eb948654fe7
+  data.tar.gz: 3f541bb8be59ea76fb2afac89b1719686acca0807310b74f16b22c964a45f471e2d4f6a50927f61087fdf9f07a3811a5819d6cdf44c66a09da460f2a158f85a0

data/.gitignore

@@ -12,3 +12,5 @@
 *.o
 *.a
 mkmf.log
+dump.rdb
+

data/config_samples/responses.yml

@@ -1,10 +1,7 @@
-today: "We are waiting for you today, %first_name%."
-today_list: "Today visitors:"
-today_cancel: "We are waiting for you next time, %first_name%."
 date: "We are waiting for you on %date%, %first_name%."
-date_list: "%date% visitors:"
-date_cancel: "We are waiting for you next time, %first_name%."
-wrong_date_format: "Error: wrong date format. Correct formats are dd, dd.mm or dd.mm.yy."
+list: "%date% visitors:"
+cancel: "We are waiting for you next time, %first_name%."
+wrong_date_format: "Error: wrong date format. Correct formats are dd, dd.mm or dd.mm.yy"
 old_date: "This date is too old."
 nobody: "No one planned to come on %date%."
 not_subscribed: "You wasn't subscribed on %date%."
@@ -12,11 +9,11 @@ no_username: "%first_name%, please set a username in the Telegram settings."
 cal: "Reserved days in %date%:"
 help: |
   Hi, %first_name%. Use this commands list:
-  /today 14:00 - add yourself to the today list (time is optional);
-  /today_list - display the today list;
-  /today_cancel - remove yourself from the today list;
+  /date 14:00 - add yourself to the today list (time is optional);
   /date 23 14:00 - add yourself to the list on 23rd of the current month (time is optional);
-  /date_list 23.04 - display the list for April 23 of the current year;
-  /date_cancel 23.04.16 - remove yourself from the list on 23.04.16;
+  /list - display the today list;
+  /list 23.04 - display the list for April 23 of the current year;
+  /cancel - remove yourself from the today list;
+  /cancel 23.04.16 - remove yourself from the list on 23.04.16;
   /cal 1 - display reserved days in January (it uses current month by default)
   There are 3 formats for date available: 14 - day, 14.09 - day and month, 14.09.15 - day, month and year;

data/lib/telegram_meetup_bot/calendar.rb

@@ -22,7 +22,7 @@ module TelegramMeetupBot
       process_user do |users, saved_user|
         if saved_user
           users.delete(saved_user)
-          storage.set_users_to_date(users, date)
+          update_or_clean_date(users)
           true
         end
       end
@@ -44,7 +44,7 @@ module TelegramMeetupBot
       min, max = build_date_window(month)
 
       dates.keep_if { |date| date >= min && date <= max }.sort.
-        map { |date| date.match(/\d\d$/) }.join(' ')
+        map { |date| date.match(/\d\d$/) }.join(', ')
     end
 
     private
@@ -64,6 +64,14 @@ module TelegramMeetupBot
       end
     end
 
+    def update_or_clean_date(users)
+      if users.any?
+        storage.set_users_to_date(users, date)
+      else
+        storage.delete_date(date)
+      end
+    end
+
     def self.build_date_window(month)
       today = Date.today
       year = month < today.month ? today.next_year.year : today.year

data/lib/telegram_meetup_bot/commands_handler.rb

@@ -1,12 +1,12 @@
 module TelegramMeetupBot
   class CommandsHandler
-    COMMANDS = %w(today today_list today_cancel
-      date date_list date_cancel help cal)
+    COMMANDS = %w(date list cancel help cal)
+    BLACK_LIST = %w(me)
     attr_reader :command, :params, :helper
 
     def initialize(args)
       parser = MessageParser.new(args.fetch(:message))
-      @command = COMMANDS.include?(parser.command) ? parser.command : 'help'
+      @command = commands.include?(parser.command) ? parser.command : 'help'
       @params = parser.params
       @helper = HandlerHelper.new(
         author: parser.author,
@@ -16,43 +16,44 @@ module TelegramMeetupBot
     end
 
     def process
-      if self.class.instance_method(command).arity == 0
-        send command
-      else
-        send command, params
-      end
+      return if BLACK_LIST.include?(command)
 
+      call_command(command)
       helper.send_empty_username_notification unless helper.author_has_username?
     end
 
     private
 
-    def today(params)
-      time = ParamsParser.new(params.first).parse_time if params.any?
-      helper.handle_date(Date.today, time)
+    def commands
+      COMMANDS + BLACK_LIST
     end
 
+    def call_command(command)
+      if self.class.instance_method(command).arity == 0
+        send command
+      else
+        send command, params
+      end
+    end
+
+    # bot commands
+
     def date(params)
       date = ParamsParser.new(params.first).parse_date
-      time = ParamsParser.new(params[1]).parse_time if params[1]
+      time = ParamsParser.new(params[1] || params[0]).parse_time
+      date ||= Date.today if params.empty? || (time && params.size == 1)
       helper.handle_date(date, time)
     end
 
-    def today_list
-      helper.handle_date_list Date.today
-    end
-
-    def date_list(params)
+    def list(params)
       date = ParamsParser.new(params.first).parse_date
+      date ||= Date.today if params.empty?
       helper.handle_date_list date
     end
 
-    def today_cancel
-      helper.handle_date_cancel Date.today
-    end
-
-    def date_cancel(params)
+    def cancel(params)
       date = ParamsParser.new(params.first).parse_date
+      date ||= Date.today if params.empty?
       helper.handle_date_cancel date
     end
 

data/lib/telegram_meetup_bot/initializers/responses_loader.rb

@@ -2,9 +2,8 @@ module TelegramMeetupBot
   module Initializers
     class ResponsesLoader < Base
       FILE_NAME = 'responses.yml'
-      AVAILABLE_KEYS = %w(today today_list today_cancel date date_list
-        date_cancel wrong_date_format old_date nobody not_subscribed
-        no_username help cal)
+      AVAILABLE_KEYS = %w(date list cancel wrong_date_format old_date nobody
+        not_subscribed no_username help cal)
 
       def self.responses
         @configurations

data/lib/telegram_meetup_bot/params_parser.rb

@@ -11,11 +11,11 @@ module TelegramMeetupBot
 
     def parse_date
       format = case arg
-      when /^[0-9]{,2}\.[0-9]{,2}\.[0-9][0-9]$/
+      when /\A[0-9]{1,2}\.[0-9]{1,2}\.[0-9]{2}\Z/
         "%d.%m.%y"
-      when /^[0-9]{,2}\.[0-9]{,2}$/
+      when /\A[0-9]{1,2}\.[0-9]{1,2}\Z/
         "%d.%m"
-      when /^[0-9]{,2}$/
+      when /\A[0-9]{1,2}\Z/
         "%d"
       end
 
@@ -23,7 +23,9 @@ module TelegramMeetupBot
     end
 
     def parse_time
-      Time.parse(arg).strftime('%R') rescue nil
+      if arg =~ /\A[0-2][0-9]:[0-5][0-9]\Z/
+        Time.parse(arg).strftime('%R') rescue nil
+      end
     end
 
     def parse_month

data/lib/telegram_meetup_bot/storage.rb

@@ -19,5 +19,9 @@ module TelegramMeetupBot
     def get_all_available_dates
       dates = redis.hkeys(key)
     end
+
+    def delete_date(date)
+      redis.hdel(key, date)
+    end
   end
 end

data/lib/telegram_meetup_bot/version.rb

@@ -1,3 +1,3 @@
 module TelegramMeetupBot
-  VERSION = "0.1.0"
+  VERSION = "0.1.1"
 end

data/spec/telegram_meetup_bot/calendar_spec.rb

@@ -2,19 +2,31 @@ require 'spec_helper'
 
 RSpec.describe TelegramMeetupBot::Calendar do
   let(:storage) { double('storage') }
-  let(:user) { TelegramMeetupBot::MessageParser::User.new(1, 'Ikari01', 'Shinji') }
+  let(:user) { TelegramMeetupBot::MessageParser::User.new(1, 'Unit01', 'Shinji') }
+  let(:user2) { TelegramMeetupBot::MessageParser::User.new(2, 'Unit02', 'Asuka') }
   before { allow(TelegramMeetupBot::Initializers::ConfigLoader).to receive(:storage).and_return(storage)}
   subject { described_class.new(user: user, date: Date.today, time: '10:00') }
 
   describe '#delete_user_from_date' do
     before { allow(storage).to receive(:set_users_to_date) }
+    before { allow(storage).to receive(:delete_date) }
 
-    context "when user exists in storage on selected date" do
-      before { allow(storage).to receive(:get_users_for_date).and_return([user.to_h]) }
+    context "when more than one users exist in storage on selected date" do
+      before { allow(storage).to receive(:get_users_for_date).and_return([user.to_h, user2.to_h]) }
 
       it { expect(subject.delete_user_from_date).to eq(true) }
       it 'set array without user to storage' do
-        expect(storage).to receive(:set_users_to_date).with([], Date.today)
+        expect(storage).to receive(:set_users_to_date).with([user2.to_h], Date.today)
+        subject.delete_user_from_date
+      end
+    end
+
+    context "when one user exists in storage on selected date" do
+      before { allow(storage).to receive(:get_users_for_date).and_return([user.to_h]) }
+
+      it { expect(subject.delete_user_from_date).to eq(true) }
+      it 'delete date key from storage' do
+        expect(storage).to receive(:delete_date).with(Date.today)
         subject.delete_user_from_date
       end
     end
@@ -71,7 +83,7 @@ RSpec.describe TelegramMeetupBot::Calendar do
       let(:dates) { %w(2015-07-30 2015-07-15 2015-07-16 2015-06-14 2015-08-17) }
       it "works" do
         Timecop.freeze(Date.new(2015, month - 1, 1)) do
-          expect(subject.submited_days_of_month(month)).to eq("15 16 30")
+          expect(subject.submited_days_of_month(month)).to eq("15, 16, 30")
         end
       end
     end
@@ -80,7 +92,7 @@ RSpec.describe TelegramMeetupBot::Calendar do
       let(:dates) { %w(2015-07-30 2015-07-15 2015-07-16 2015-06-14 2015-08-17) }
       it "starts from today" do
         Timecop.freeze(Date.new(2015, month, 16)) do
-          expect(subject.submited_days_of_month(month)).to eq("16 30")
+          expect(subject.submited_days_of_month(month)).to eq("16, 30")
         end
       end
     end

data/spec/telegram_meetup_bot/commands_handler_spec.rb

@@ -19,11 +19,11 @@ RSpec.describe TelegramMeetupBot::CommandsHandler do
     end
 
     context "when command without args" do
-      let(:command) { '/today_list' }
+      let(:command) { '/help' }
 
       it "works" do
-        allow_any_instance_of(TelegramMeetupBot::HandlerHelper).to receive(:handle_date_list)
-        expect(subject).to receive(:today_list).with(no_args)
+        allow_any_instance_of(TelegramMeetupBot::HandlerHelper).to receive(:handle_default_command)
+        expect(subject).to receive(:help).with(no_args)
         subject.process
       end
     end

data/spec/telegram_meetup_bot/params_parser_spec.rb

@@ -35,7 +35,7 @@ RSpec.describe TelegramMeetupBot::ParamsParser do
     end
 
     context 'wrong format' do
-      let(:dates) { %w(abc 3.02.2007 3.02.7 2007.02.03 3-02-07 32.03.07 32) }
+      let(:dates) { %w(abc 3.02.2007 3.02.7 2007.02.03 3-02-07 32.03.07 32 3..07 .02.07 3.02.) }
 
       it 'returns nil' do
         dates.each do |date|
@@ -47,20 +47,20 @@ RSpec.describe TelegramMeetupBot::ParamsParser do
 
   describe '#parse_time' do
     context 'correct' do
-      let(:dates) { %w(01:05 1:05 1:5) }
+      let(:time) { %w(01:05) }
 
       it 'works' do
-        dates.each do |date|
+        time.each do |date|
           expect(described_class.new(date).parse_time).to eq('01:05')
         end
       end
     end
 
     context 'wrong_format' do
-      let(:dates) { %w(abc 25:05 01:61 -3) }
+      let(:time) { %w(abc 25:05 01:61 -3) }
 
       it 'works' do
-        dates.each do |date|
+        time.each do |date|
           expect(described_class.new(date).parse_time).to eq(nil)
         end
       end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: telegram_meetup_bot
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Timur Yanberdin
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-30 00:00:00.000000000 Z
+date: 2015-11-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler