telegram_meetup_bot 0.0.2 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e496544d412e4ded058528c0ce1c62bb97976f29
-  data.tar.gz: 09d7b861bf4b309629e8ae37784883659366f2bb
+  metadata.gz: e0f006330cda4dcc1f556f33824fe35b02021336
+  data.tar.gz: c57bfd3e78002113e820946dc5a1353d55421bba
 SHA512:
-  metadata.gz: c6d95c65a742dd485d7e5ab208cad2dd02df26722d001a0f933b06271d948fbc76734b3ad19fdbe8895a31261a8606ca98d68293d39b07895e8bc70c33b2b40d
-  data.tar.gz: fcfd3a73e91218d3fb5a74ed5330f623cb667c99ccb5621e02ce4d58d4cae876992bef309ef3b7826109ada4bc4b27d51f3799c253a402771184d93f0d1bc45a
+  metadata.gz: fa2ba469c84317ae87940a4cd697f13662377566403768fc1066addc2825bc657da3374831554d4cd9a66fefe3f347a3f7ab96c95501237f7a84025d8c1df071
+  data.tar.gz: 76e08f87c49e62f44808a8dd01b0f44d737eabced30190825a987f283726cd80defde6b2ed4be30a84338d49cf8a9235c8734aac3da29553661fb0e02666d6a1

data/README.md

@@ -1,6 +1,6 @@
 # TelegramMeetupBot
 
-[![Build Status](https://travis-ci.org/mendab1e/telegram_meetup_bot.svg)](https://travis-ci.org/mendab1e/telegram_meetup_bot)
+[![Gem Version](https://badge.fury.io/rb/telegram_meetup_bot.svg)](http://badge.fury.io/rb/telegram_meetup_bot) [![Build Status](https://travis-ci.org/mendab1e/telegram_meetup_bot.svg)](https://travis-ci.org/mendab1e/telegram_meetup_bot)
 
 Telegram bot for meetups organisation. It suits really well for small communities, where people want to attend a place together, but not on regular basis.
 
@@ -44,7 +44,7 @@ Run your bot:
 
 ## Contributing
 
-1. Fork it ( https://github.com/[my-github-username]/telegram_meetup_bot/fork )
+1. Fork it ( https://github.com/mendab1e/telegram_meetup_bot/fork )
 2. Create your feature branch (`git checkout -b my-new-feature`)
 3. Commit your changes (`git commit -am 'add some feature'`)
 4. Push to the branch (`git push origin my-new-feature`)

data/bin/telegram_meetup_bot

@@ -8,6 +8,7 @@ config_path = File.join(ENV['HOME'], '.telegram_meetup_bot')
 if ARGV.first == '--generate'
   FileUtils.mkdir(config_path) unless Dir.exist?(config_path)
   samples_dir = File.expand_path('../../config_samples', __FILE__)
+
   %w(config.yml responses.yml).each do |sample|
     file = File.join(samples_dir, sample)
     FileUtils.cp(file, config_path)

data/config_samples/responses.yml

@@ -9,6 +9,7 @@ old_date: "This date is too old."
 nobody: "No one planned to come on %date%."
 not_subscribed: "You wasn't subscribed on %date%."
 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);
@@ -17,4 +18,5 @@ help: |
   /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;
+  /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

@@ -9,16 +9,6 @@ module TelegramMeetupBot
       @time = args[:time]
     end
 
-    def self.formated_users_for_date(date)
-      storage = Initializers::ConfigLoader.storage
-      users = storage.get_users_for_date(date)
-      users.map! do |user|
-        username = user[:username] ? " @#{user[:username]}" : ''
-        "#{user[:first_name]}#{username} #{user[:time]}"
-      end
-      users.join("\n")
-    end
-
     def add_user_to_date
       process_user do |users, saved_user|
         return if saved_user == user_hash
@@ -38,6 +28,25 @@ module TelegramMeetupBot
       end
     end
 
+    def self.formated_users_for_date(date)
+      storage = Initializers::ConfigLoader.storage
+      users = storage.get_users_for_date(date)
+      users.map! do |user|
+        username = user[:username] ? " @#{user[:username]}" : ''
+        "#{user[:first_name]}#{username} #{user[:time]}"
+      end
+      users.join("\n")
+    end
+
+    def self.submited_days_of_month(month)
+      storage = Initializers::ConfigLoader.storage
+      dates = storage.get_all_available_dates
+      min, max = build_date_window(month)
+
+      dates.keep_if { |date| date >= min && date <= max }.sort.
+        map { |date| date.match(/\d\d$/) }.join(' ')
+    end
+
     private
 
     def process_user(&block)
@@ -54,5 +63,14 @@ module TelegramMeetupBot
         user.to_h
       end
     end
+
+    def self.build_date_window(month)
+      today = Date.today
+      year = month < today.month ? today.next_year.year : today.year
+      max = Date.new(year, month, -1).to_s
+      min = today.month == month ? today.to_s : Date.new(year, month, 1).to_s
+
+      [min, max]
+    end
   end
 end

data/lib/telegram_meetup_bot/client.rb

@@ -19,7 +19,7 @@ module TelegramMeetupBot
       rescue Telegram::Bot::Exceptions::ResponseError => e
         puts e
         sleep 1
-        run # run again on telegram server error
+        retry # run again on telegram server error
       end
     end
   end

data/lib/telegram_meetup_bot/commands_handler.rb

@@ -1,108 +1,69 @@
 module TelegramMeetupBot
   class CommandsHandler
-    COMMANDS = %w(today today_list today_cancel date date_list date_cancel help)
-    attr_reader :command, :params, :author, :messenger
+    COMMANDS = %w(today today_list today_cancel
+      date date_list date_cancel help cal)
+    attr_reader :command, :params, :helper
 
     def initialize(args)
       parser = MessageParser.new(args.fetch(:message))
-      @messenger = args.fetch(:messenger)
       @command = COMMANDS.include?(parser.command) ? parser.command : 'help'
       @params = parser.params
-      @author = parser.author
+      @helper = HandlerHelper.new(
+        author: parser.author,
+        command: @command,
+        messenger: args.fetch(:messenger)
+      )
     end
 
     def process
-      if method(command).arity == 0
+      if self.class.instance_method(command).arity == 0
         send command
       else
         send command, params
       end
 
-      no_username_notification unless author.username
+      helper.send_empty_username_notification unless helper.author_has_username?
     end
 
     private
 
     def today(params)
-      time = ParamsParser.new(params.first).parse_time if params.first
-      handle_date(Date.today, time)
+      time = ParamsParser.new(params.first).parse_time if params.any?
+      helper.handle_date(Date.today, time)
     end
 
     def date(params)
       date = ParamsParser.new(params.first).parse_date
       time = ParamsParser.new(params[1]).parse_time if params[1]
-      handle_date(date, time) if date_is_valid?(date)
-    end
-
-    def handle_date(date, time)
-      Calendar.new(date: date, user: author, time: time).add_user_to_date
-      messenger.send build_response(date: date)
+      helper.handle_date(date, time)
     end
 
     def today_list
-      handle_date_list Date.today
+      helper.handle_date_list Date.today
     end
 
     def date_list(params)
       date = ParamsParser.new(params.first).parse_date
-      handle_date_list(date) if date_is_valid?(date)
-    end
-
-    def handle_date_list(date)
-      users = Calendar.formated_users_for_date(date)
-      messenger.send list_response(date, users)
+      helper.handle_date_list date
     end
 
     def today_cancel
-      handle_date_cancel Date.today
+      helper.handle_date_cancel Date.today
     end
 
     def date_cancel(params)
       date = ParamsParser.new(params.first).parse_date
-      handle_date_cancel(date) if date_is_valid?(date)
+      helper.handle_date_cancel date
     end
 
-    def handle_date_cancel(date)
-      calendar = Calendar.new(date: date, user: author)
-      deleted = calendar.delete_user_from_date
-      args = deleted ? {} : {key: 'not_subscribed', date: date}
-      messenger.send build_response(args)
+    def cal(params)
+      month = ParamsParser.new(params.first).parse_month if params.any?
+      month ||= Date.today.month
+      helper.handle_cal month
     end
 
     def help
-      messenger.send build_response
-    end
-
-    def no_username_notification
-      messenger.send build_response(key: 'no_username')
-    end
-
-    def date_is_valid?(date)
-      if date.nil?
-        messenger.send build_response(key: 'wrong_date_format')
-        return false
-      elsif date < Date.today
-        messenger.send build_response(key: 'old_date')
-        return false
-      end
-      true
-    end
-
-    def list_response(date, list)
-      if list.empty?
-        build_response(key: 'nobody', date: date)
-      else
-        build_response(date: date) { |response| "#{response}\n#{list}" }
-      end
-    end
-
-    def build_response(args = {})
-      response_key = args.fetch(:key) { command }
-      response = Initializers::ResponsesLoader.responses[response_key].dup
-      response.gsub!('%first_name%', author.first_name)
-      response.gsub!('%date%', args[:date].strftime('%d %h %Y')) if args[:date]
-
-      block_given? ? yield(response) : response
+      helper.handle_default_command
     end
   end
 end

data/lib/telegram_meetup_bot/handler_helper.rb

@@ -0,0 +1,90 @@
+module TelegramMeetupBot
+  class HandlerHelper
+    attr_reader :command, :author, :messenger, :error
+
+    def initialize(args)
+      @command = args.fetch(:command)
+      @author = args.fetch(:author)
+      @messenger = args.fetch(:messenger)
+    end
+
+    def handle_date(date, time)
+      handle(date) do
+        Calendar.new(date: date, user: author, time: time).add_user_to_date
+        messenger.send_text build_response(date: date)
+      end
+    end
+
+    def handle_date_list(date)
+      handle(date) do
+        users = Calendar.formated_users_for_date(date)
+        messenger.send_text list_response(list: users, date: date)
+      end
+    end
+
+    def handle_date_cancel(date)
+      handle(date) do
+        calendar = Calendar.new(date: date, user: author)
+        deleted_user = calendar.delete_user_from_date
+        args = deleted_user ? {} : {key: 'not_subscribed', date: date}
+        messenger.send_text build_response(args)
+      end
+    end
+
+    def handle_default_command
+      messenger.send_text build_response
+    end
+
+    def send_empty_username_notification
+      messenger.send_text build_response(key: 'no_username')
+    end
+
+    def author_has_username?
+      author.username
+    end
+
+    def handle_cal(month)
+      dates = Calendar.submited_days_of_month(month)
+      today = Date.today
+      year = month < today.month ? today.next_year.year : today.year
+      month = Date.new(year, month)
+      messenger.send_text list_response(list: dates, month: month)
+    end
+
+    private
+
+    def handle(date, &block)
+      if date_has_error?(date)
+        messenger.send_text error
+      else
+        yield
+      end
+    end
+
+    def date_has_error?(date)
+      if date.nil?
+        @error = build_response(key: 'wrong_date_format')
+      elsif date < Date.today
+        @error = build_response(key: 'old_date')
+      end
+    end
+
+    def list_response(args)
+      if args.fetch(:list).empty?
+        build_response(args.merge(key: 'nobody'))
+      else
+        build_response(args) { |response| "#{response}\n#{args.fetch(:list)}" }
+      end
+    end
+
+    def build_response(args = {})
+      response_key = args.fetch(:key) { command }
+      response = Initializers::ResponsesLoader.responses[response_key].dup
+      response.gsub!('%first_name%', author.first_name)
+      response.gsub!('%date%', args[:date].strftime('%d %h %Y')) if args[:date]
+      response.gsub!('%date%', args[:month].strftime('%h %Y')) if args[:month]
+
+      block_given? ? yield(response) : response
+    end
+  end
+end

data/lib/telegram_meetup_bot/initializers/base.rb

@@ -7,7 +7,7 @@ module TelegramMeetupBot
         def preload(config_path)
           @configurations ||= begin
             file = File.join(config_path, self::FILE_NAME)
-            check_if_exist(file)
+            exit_if_file_not_exist(file)
             config = YAML.load(File.open(file).read)
             validate(config.keys, file)
             config.map { |_,v| v.freeze }
@@ -15,7 +15,7 @@ module TelegramMeetupBot
           end
         end
 
-        def check_if_exist(file)
+        def exit_if_file_not_exist(file)
           unless File.exist? file
             puts "Error: file not found #{file}"
             exit
@@ -31,7 +31,6 @@ module TelegramMeetupBot
           end
         end
       end
-
     end
   end
 end

data/lib/telegram_meetup_bot/initializers/config_loader.rb

@@ -1,5 +1,3 @@
-require 'redis'
-
 module TelegramMeetupBot
   module Initializers
     class ConfigLoader < Base
@@ -32,7 +30,6 @@ module TelegramMeetupBot
           )
         end
       end
-
     end
   end
 end

data/lib/telegram_meetup_bot/initializers/responses_loader.rb

@@ -3,7 +3,8 @@ module TelegramMeetupBot
     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 help)
+        date_cancel wrong_date_format old_date nobody not_subscribed
+        no_username help cal)
 
       def self.responses
         @configurations

data/lib/telegram_meetup_bot/messenger.rb

@@ -7,7 +7,7 @@ module TelegramMeetupBot
       @chat_id = args.fetch(:chat_id)
     end
 
-    def send(text)
+    def send_text(text)
       api.send_message(chat_id: chat_id, text: text)
     end
   end

data/lib/telegram_meetup_bot/params_parser.rb

@@ -25,5 +25,13 @@ module TelegramMeetupBot
     def parse_time
       Time.parse(arg).strftime('%R') rescue nil
     end
+
+    def parse_month
+      month = arg.to_i
+
+      if month >= 1 && month <= 12
+        month
+      end
+    end
   end
 end

data/lib/telegram_meetup_bot/storage.rb

@@ -15,5 +15,9 @@ module TelegramMeetupBot
     def set_users_to_date(users, date)
       redis.hset(key, date, users.to_yaml)
     end
+
+    def get_all_available_dates
+      dates = redis.hkeys(key)
+    end
   end
 end

data/lib/telegram_meetup_bot/version.rb

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

data/lib/telegram_meetup_bot.rb

@@ -1,15 +1,16 @@
 require 'telegram/bot'
+require 'redis'
 
-require "telegram_meetup_bot/version"
-require "telegram_meetup_bot/initializers"
-require "telegram_meetup_bot/client"
-require "telegram_meetup_bot/messenger"
-require "telegram_meetup_bot/message_parser"
-require "telegram_meetup_bot/storage"
-require "telegram_meetup_bot/calendar"
-require "telegram_meetup_bot/commands_handler"
-require "telegram_meetup_bot/params_parser"
-# require 'pry'
+require 'telegram_meetup_bot/version'
+require 'telegram_meetup_bot/initializers'
+require 'telegram_meetup_bot/client'
+require 'telegram_meetup_bot/messenger'
+require 'telegram_meetup_bot/message_parser'
+require 'telegram_meetup_bot/storage'
+require 'telegram_meetup_bot/calendar'
+require 'telegram_meetup_bot/commands_handler'
+require 'telegram_meetup_bot/params_parser'
+require 'telegram_meetup_bot/handler_helper'
 
 module TelegramMeetupBot
   def self.run(config_path)

data/spec/spec_helper.rb

@@ -2,6 +2,7 @@ require 'bundler/setup'
 Bundler.setup
 
 require 'telegram_meetup_bot'
+require 'timecop'
 require File.expand_path('../../lib/telegram_meetup_bot.rb', __FILE__)
 
 RSpec.configure do |config|

data/spec/telegram_meetup_bot/calendar_spec.rb

@@ -60,4 +60,38 @@ RSpec.describe TelegramMeetupBot::Calendar do
       end
     end
   end
+
+  describe 'Calendar#submited_days_of_month' do
+    let(:storage) { double('storage') }
+    let(:month) { 7 }
+    subject { described_class }
+    before { allow(storage).to receive(:get_all_available_dates).and_return(dates) }
+
+    context "when month isn't current" 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")
+        end
+      end
+    end
+
+    context "when month is current" 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")
+        end
+      end
+    end
+
+    context "when month < current_month" do
+      let(:dates) { %w(2015-06-30 2016-06-15) }
+      it "starts from today" do
+        Timecop.freeze(Date.new(2015, month, 16)) do
+          expect(subject.submited_days_of_month(month - 1)).to eq("15")
+        end
+      end
+    end
+  end
 end

data/spec/telegram_meetup_bot/commands_handler_spec.rb

@@ -0,0 +1,41 @@
+require 'spec_helper'
+
+RSpec.describe TelegramMeetupBot::CommandsHandler do
+  let(:messenger) { instance_double('message') }
+  let(:from) { instance_double('from', id: 1, username: 'Ikari01', first_name: 'Shinji') }
+  let(:message) { instance_double('message', text: command, from: from) }
+
+  subject { described_class.new(message: message, messenger: messenger) }
+
+  describe '#process' do
+    context "when command isn't in whitelist" do
+      let(:command) { '/unknow_command' }
+
+      it "calls help command" do
+        allow_any_instance_of(TelegramMeetupBot::HandlerHelper).to receive(:handle_default_command)
+        expect(subject).to receive(:help).with(no_args)
+        subject.process
+      end
+    end
+
+    context "when command without args" do
+      let(:command) { '/today_list' }
+
+      it "works" do
+        allow_any_instance_of(TelegramMeetupBot::HandlerHelper).to receive(:handle_date_list)
+        expect(subject).to receive(:today_list).with(no_args)
+        subject.process
+      end
+    end
+
+    context "when command with args" do
+      let(:command) { '/date 08.11.07' }
+
+      it "works" do
+        allow_any_instance_of(TelegramMeetupBot::HandlerHelper).to receive(:handle_date)
+        expect(subject).to receive(:date).with(['08.11.07'])
+        subject.process
+      end
+    end
+  end
+end

data/spec/telegram_meetup_bot/params_parser_spec.rb

@@ -66,4 +66,26 @@ RSpec.describe TelegramMeetupBot::ParamsParser do
       end
     end
   end
+
+  describe '#parse_month' do
+    context 'correct' do
+      let(:months) { %w(01 1) }
+
+      it 'works' do
+        months.each do |date|
+          expect(described_class.new(date).parse_month).to eq(1)
+        end
+      end
+    end
+
+    context 'wrong_format' do
+      let(:months) { %w(abc 13 0) }
+
+      it 'works' do
+        months.each do |date|
+          expect(described_class.new(date).parse_month).to eq(nil)
+        end
+      end
+    end
+  end
 end

data/telegram_meetup_bot.gemspec

@@ -9,7 +9,7 @@ Gem::Specification.new do |spec|
   spec.authors       = ["Timur Yanberdin"]
   spec.email         = ["yanberdint@gmail.com"]
   spec.summary       = "Telegram bot for meetups organisation"
-  spec.homepage      = ""
+  spec.homepage      = "https://github.com/mendab1e/telegram_meetup_bot"
   spec.license       = "MIT"
 
   spec.files         = `git ls-files -z`.split("\x0")
@@ -21,7 +21,8 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "rake", "~> 10.0"
   spec.add_development_dependency "rspec"
   spec.add_development_dependency "pry"
+  spec.add_development_dependency "timecop"
 
   spec.add_dependency 'redis'
-  spec.add_dependency 'telegram-bot-ruby'
+  spec.add_dependency 'telegram-bot-ruby', ">= 0.3.5"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: telegram_meetup_bot
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.1.0
 platform: ruby
 authors:
 - Timur Yanberdin
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-15 00:00:00.000000000 Z
+date: 2015-09-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -66,6 +66,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: timecop
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: redis
   requirement: !ruby/object:Gem::Requirement
@@ -86,14 +100,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.3.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.3.5
 description: 
 email:
 - yanberdint@gmail.com
@@ -115,6 +129,7 @@ files:
 - lib/telegram_meetup_bot/calendar.rb
 - lib/telegram_meetup_bot/client.rb
 - lib/telegram_meetup_bot/commands_handler.rb
+- lib/telegram_meetup_bot/handler_helper.rb
 - lib/telegram_meetup_bot/initializers.rb
 - lib/telegram_meetup_bot/initializers/base.rb
 - lib/telegram_meetup_bot/initializers/config_loader.rb
@@ -126,10 +141,11 @@ files:
 - lib/telegram_meetup_bot/version.rb
 - spec/spec_helper.rb
 - spec/telegram_meetup_bot/calendar_spec.rb
+- spec/telegram_meetup_bot/commands_handler_spec.rb
 - spec/telegram_meetup_bot/message_parser_spec.rb
 - spec/telegram_meetup_bot/params_parser_spec.rb
 - telegram_meetup_bot.gemspec
-homepage: ''
+homepage: https://github.com/mendab1e/telegram_meetup_bot
 licenses:
 - MIT
 metadata: {}
@@ -156,5 +172,6 @@ summary: Telegram bot for meetups organisation
 test_files:
 - spec/spec_helper.rb
 - spec/telegram_meetup_bot/calendar_spec.rb
+- spec/telegram_meetup_bot/commands_handler_spec.rb
 - spec/telegram_meetup_bot/message_parser_spec.rb
 - spec/telegram_meetup_bot/params_parser_spec.rb