telegram_meetup_bot 0.1.5 → 0.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2cb81754b8ece1419aa6058ecabd7e8a4462d88a
-  data.tar.gz: 24f686b8db1e4768a1361f8ac52551166d44b4fe
+  metadata.gz: ae8241da7158681a6a6be60b126372aa00f3b895
+  data.tar.gz: fda9664f80b483f967a41e33a7be66cbb9cf8a66
 SHA512:
-  metadata.gz: e93de5d8f13463d74a26c3084af467c9973e168a4616a60e1e9ed49f921efb0e875fe216f0b279192ab9f44a0eb042f1d8497998313f8a821ddcbbd6ed9eb94c
-  data.tar.gz: 2d06f6fe0d08cd2ea9b87f7009636ea71bac05d0e83452706507b699c9dd70a14f524df6132c02ee824a612a91e81daa1ccec0099cc6e5bb1b2a4759cf74503b
+  metadata.gz: 52101c58e82e849dbd27f7af9512f65fca7b55c616d8c0fe1271ffa069cc3101fa8d7bee5632c25e451a687740cb3c60f237bcaa2094b2ee1ac0b6111784629e
+  data.tar.gz: e3ea5104324d11e57d24137cb3881f434ab8652cdf754de2c36731d963737d843fddbd2716f99dc8b32db8d867bf7914eb52d62dfb5815b809d642289270733b

data/README.md

@@ -4,9 +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/10962172/1461e79a-83a7-11e5-94b4-78c6d53f648c.png)
+![chat example](https://cloud.githubusercontent.com/assets/854386/11559969/0081da72-99ce-11e5-8950-7375a12e2faf.png)
 
-Available commands: ```/date, /list, /cancel, /cal, /help```
+Available commands: ```/date, /list, /cancel, /cal, /help, /user```
 
 ## Installation
 

data/config_samples/responses.yml

@@ -7,6 +7,8 @@ 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 (number of people) in %date%:"
+user: "@%username% has reserved these days in %date%:"
+user_without_reservation: "@%username% hasn't reserved any days 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

@@ -41,7 +41,7 @@ module TelegramMeetupBot
     def self.submited_days_of_month(month)
       storage = Initializers::ConfigLoader.storage
       dates = storage.get_all_available_dates
-      min, max = build_date_window(month)
+      min, max = build_dates_window(month)
 
       dates = dates.keep_if { |date, _| date >= min && date <= max }.sort
       dates.map do |date, users_yml|
@@ -49,6 +49,20 @@ module TelegramMeetupBot
       end.join(', ')
     end
 
+    def self.submited_days_by_user(username)
+      storage = Initializers::ConfigLoader.storage
+      dates = storage.get_all_available_dates
+      min, max = build_dates_window(Date.today.month)
+      username.downcase!
+
+      dates = dates.keep_if do |date, users_yml|
+        date >= min && date <= max &&
+          YAML.load(users_yml).any? { |u| u[:username].downcase == username }
+      end
+
+      dates.sort.map { |date, _| date.match(/\d\d$/) }.join(', ')
+    end
+
     private
 
     def process_user(&block)
@@ -74,7 +88,7 @@ module TelegramMeetupBot
       end
     end
 
-    def self.build_date_window(month)
+    def self.build_dates_window(month)
       today = Date.today
       year = month < today.month ? today.next_year.year : today.year
       max = Date.new(year, month, -1).to_s

data/lib/telegram_meetup_bot/commands_handler.rb

@@ -1,6 +1,6 @@
 module TelegramMeetupBot
   class CommandsHandler
-    COMMANDS = %w(date list cancel help cal)
+    COMMANDS = %w(date list cancel help cal user)
     BLACK_LIST = %w(me)
     attr_reader :command, :params, :helper, :botan
 
@@ -65,6 +65,10 @@ module TelegramMeetupBot
       helper.handle_cal month
     end
 
+    def user(params)
+      helper.handle_user params.first
+    end
+
     def help
       helper.handle_default_command
     end

data/lib/telegram_meetup_bot/handler_helper.rb

@@ -51,6 +51,15 @@ module TelegramMeetupBot
       messenger.send_text list_response(list: dates, month: month)
     end
 
+    def handle_user(username)
+      username ||= author.username
+      dates = Calendar.submited_days_by_user(username)
+      month = Date.today
+      response = list_response(list: dates, month: month, username: username,
+        empty_key: 'user_without_reservation')
+      messenger.send_text response
+    end
+
     private
 
     def handle(date, &block)
@@ -70,8 +79,10 @@ module TelegramMeetupBot
     end
 
     def list_response(args)
+      empty_key = args.fetch(:empty_key) { 'nobody' }
+
       if args.fetch(:list).empty?
-        build_response(args.merge(key: 'nobody'))
+        build_response(args.merge(key: empty_key))
       else
         build_response(args) { |response| "#{response}\n#{args.fetch(:list)}" }
       end
@@ -83,6 +94,7 @@ module TelegramMeetupBot
       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]
+      response.gsub!('%username%', args[:username]) if args[:username]
 
       block_given? ? yield(response) : response
     end

data/lib/telegram_meetup_bot/initializers/responses_loader.rb

@@ -3,7 +3,7 @@ module TelegramMeetupBot
     class ResponsesLoader < Base
       FILE_NAME = 'responses.yml'
       AVAILABLE_KEYS = %w(date list cancel wrong_date_format old_date nobody
-        not_subscribed no_username help cal)
+        not_subscribed no_username help cal user user_without_reservation)
 
       def self.responses
         @configurations

data/lib/telegram_meetup_bot/storage.rb

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

data/lib/telegram_meetup_bot/version.rb

@@ -1,3 +1,3 @@
 module TelegramMeetupBot
-  VERSION = "0.1.5"
+  VERSION = "0.1.6"
 end

data/spec/telegram_meetup_bot/calendar_spec.rb

@@ -121,4 +121,61 @@ RSpec.describe TelegramMeetupBot::Calendar do
       end
     end
   end
+
+  describe 'Calendar#submited_days_by_user' do
+    let(:storage) { double('storage') }
+    let(:month) { 7 }
+    let(:username) { 'timur' }
+    subject { described_class }
+    before { allow(storage).to receive(:get_all_available_dates).and_return(dates) }
+
+    context "user has reserved days in current month" do
+      let(:dates) {
+        {"2015-07-30"=>"---\n- :id: 65208698\n  :username: #{username}\n  :first_name: Timur\n",
+         "2015-07-15"=>"---\n- :id: 65208698\n  :username: #{username}\n  :first_name: Timur\n",
+         "2015-07-16"=>"---\n- :id: 65208698\n  :username: #{username}\n  :first_name: Timur\n  :time: '10:10'\n",
+         "2015-06-14"=>"---\n- :id: 65208698\n  :username: #{username}\n  :first_name: Timur\n",
+         "2015-08-17"=>"---\n- :id: 65208698\n  :username: #{username}\n  :first_name: Timur\n"}
+      }
+
+      context "today is first day of month" do
+        it "works" do
+          Timecop.freeze(Date.new(2015, month, 1)) do
+            expect(subject.submited_days_by_user(username)).to eq("15, 16, 30")
+          end
+        end
+      end
+
+      context "today is end of month" do
+        it "works" do
+          Timecop.freeze(Date.new(2015, month, 20)) do
+            expect(subject.submited_days_by_user(username)).to eq("30")
+          end
+        end
+      end
+
+      context "case insensitive" do
+        it "works" do
+          Timecop.freeze(Date.new(2015, month, 1)) do
+            expect(subject.submited_days_by_user(username.upcase)).to eq("15, 16, 30")
+          end
+        end
+      end
+    end
+
+    context "user hasn't reserved any days in current month" do
+      let(:dates) {
+        {"2015-07-30"=>"---\n- :id: 65208692\n  :username: asuka\n  :first_name: Asuka\n",
+         "2015-07-15"=>"---\n- :id: 65208692\n  :username: asuka\n  :first_name: Asuka\n",
+         "2015-07-16"=>"---\n- :id: 65208692\n  :username: asuka\n  :first_name: Asuka\n  :time: '10:10'\n",
+         "2015-06-14"=>"---\n- :id: 65208698\n  :username: #{username}\n  :first_name: Timur\n",
+         "2015-08-17"=>"---\n- :id: 65208698\n  :username: #{username}\n  :first_name: Timur\n"}
+      }
+      it "starts from today" do
+        Timecop.freeze(Date.new(2015, month, 1)) do
+          expect(subject.submited_days_by_user(username)).to eq("")
+        end
+      end
+    end
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: telegram_meetup_bot
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.1.6
 platform: ruby
 authors:
 - Timur Yanberdin