telegram_meetup_bot 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 98d69941024a79b6b13a609d1043f7041625284f
-  data.tar.gz: 14411958ac147a0d5a7d01edc9f6e500f4afd085
+  metadata.gz: fa77cbf78edf0afa2a74a9a4015d1dbae0702832
+  data.tar.gz: ba451d51306d62957fa318a2df2aa83a48cb5d35
 SHA512:
-  metadata.gz: b09a53761a76d37699959a4f74e32a658672d4f49f5835043b232816b5d430aba78844ca796ff61310d8c8b6d9fd0ebd4a04f48a63e6134e29597eb948654fe7
-  data.tar.gz: 3f541bb8be59ea76fb2afac89b1719686acca0807310b74f16b22c964a45f471e2d4f6a50927f61087fdf9f07a3811a5819d6cdf44c66a09da460f2a158f85a0
+  metadata.gz: b40f6356caea3ac1d4957fcef3a3b20fe5ef2b4ba94f4c9391012aaead9e9d9ec1f4cc229996a64e8a30422c1fa5b7532b860f1f6ad84e349be5ed6291bc4fd0
+  data.tar.gz: 9fc15195641a17358ad72c32b038abfd12f23dbeed335a4bcf0dd0f961f5914620f70e20d547cab78bfd7edd975038b2d68ec2b45a24a3f973cb42e4bfa8b724

data/README.md

@@ -4,7 +4,9 @@
 
 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.
 
-![chat example](https://cloud.githubusercontent.com/assets/854386/9875843/23b37e8a-5bba-11e5-8c6f-c4777c8a1eff.png)
+![chat example](https://cloud.githubusercontent.com/assets/854386/10962172/1461e79a-83a7-11e5-94b4-78c6d53f648c.png)
+
+Available commands: ```/date, /list, /cancel, /cal, /help```
 
 ## Installation
 

data/config_samples/responses.yml

@@ -6,7 +6,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%:"
+cal: "Reserved days (number of people) in %date%:"
 help: |
   Hi, %first_name%. Use this commands list:
   /date 14:00 - add yourself to the today list (time is optional);

data/lib/telegram_meetup_bot/calendar.rb

@@ -43,8 +43,10 @@ module TelegramMeetupBot
       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(', ')
+      dates = dates.keep_if { |date, _| date >= min && date <= max }.sort
+      dates.map do |date, users_yml|
+        "#{date.match(/\d\d$/)}(#{YAML.load(users_yml).count})"
+      end.join(', ')
     end
 
     private

data/lib/telegram_meetup_bot/messenger.rb

@@ -8,7 +8,17 @@ module TelegramMeetupBot
     end
 
     def send_text(text)
-      api.send_message(chat_id: chat_id, text: text)
+      api.send_message(chat_id: chat_id, text: text, reply_markup: keyboard)
+    end
+
+    private
+
+    def keyboard
+      Telegram::Bot::Types::ReplyKeyboardMarkup.new(
+        keyboard: [%w(/date /list /cal /cancel)],
+        one_time_keyboard: false,
+        resize_keyboard: true
+      )
     end
   end
 end

data/lib/telegram_meetup_bot/storage.rb

@@ -17,7 +17,7 @@ module TelegramMeetupBot
     end
 
     def get_all_available_dates
-      dates = redis.hkeys(key)
+      dates = redis.hgetall(key)
     end
 
     def delete_date(date)

data/lib/telegram_meetup_bot/version.rb

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

data/spec/telegram_meetup_bot/calendar_spec.rb

@@ -80,28 +80,43 @@ RSpec.describe TelegramMeetupBot::Calendar do
     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) }
+      let(:dates) {
+        {"2015-07-30"=>"---\n- :id: 65208698\n  :username: timur\n  :first_name: Timur\n",
+         "2015-07-15"=>"---\n- :id: 65208698\n  :username: timur\n  :first_name: Timur\n",
+         "2015-07-16"=>"---\n- :id: 65208698\n  :username: timur\n  :first_name: Timur\n  :time: '10:10'\n",
+         "2015-06-14"=>"---\n- :id: 65208698\n  :username: timur\n  :first_name: Timur\n",
+         "2015-08-17"=>"---\n- :id: 65208698\n  :username: timur\n  :first_name: Timur\n"}
+      }
       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(1), 16(1), 30(1)")
         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) }
+      let(:dates) {
+        {"2015-07-30"=>"---\n- :id: 65208698\n  :username: timur\n  :first_name: Timur\n",
+         "2015-07-15"=>"---\n- :id: 65208698\n  :username: timur\n  :first_name: Timur\n",
+         "2015-07-16"=>"---\n- :id: 65208698\n  :username: timur\n  :first_name: Timur\n  :time: '10:10'\n",
+         "2015-06-14"=>"---\n- :id: 65208698\n  :username: timur\n  :first_name: Timur\n",
+         "2015-08-17"=>"---\n- :id: 65208698\n  :username: timur\n  :first_name: Timur\n"}
+      }
       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(1), 30(1)")
         end
       end
     end
 
     context "when month < current_month" do
-      let(:dates) { %w(2015-06-30 2016-06-15) }
+      let(:dates) {
+        {"2015-06-30"=>"---\n- :id: 65208698\n  :username: timur\n  :first_name: Timur\n",
+         "2016-06-15"=>"---\n- :id: 65208698\n  :username: timur\n  :first_name: Timur\n"}
+      }
       it "starts from today" do
         Timecop.freeze(Date.new(2015, month, 16)) do
-          expect(subject.submited_days_of_month(month - 1)).to eq("15")
+          expect(subject.submited_days_of_month(month - 1)).to eq("15(1)")
         end
       end
     end

metadata

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