rubotnik 0.2.1 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: dfec0763c4edd0680ea995ab6d4de3f8c18ab2bfb15f4e267068b546c9e39390
-  data.tar.gz: 06d5e0d7d702ccb63ba4a173f705da25f64c76e189ef35d1bc59994257005734
+  metadata.gz: 3475118db8de10d630af79b5d676766f8a13b1a51ac858495a5ca605960c8bcf
+  data.tar.gz: 52bd2b44ae5c5c781f65498418b99d5b49b50e4d3e7ae3661cf99daaf113792c
 SHA512:
-  metadata.gz: af0c8bad43c4a19c71ef3cffd0e9dd94f5bb07ae23245c3038738da56b3fede8bb98d8e642544265c6def6ec0760c86eca6216d31614188ee335094a0b6a9366
-  data.tar.gz: 8047dfa3db4aaf51a102cf29100b818030ef1a4c93cbe48f9126af83f601eaebcdee839bacd9beed0791e31c7ea55cd200b03c4e06b14a96312ee83594282f60
+  metadata.gz: 770c79520f2bb61efce31f3c3f8666e6ce49d98cd6918d07ef166141b9615ada1e75bb6b6080b55b581bd5f81c73f7fc1e496e5d39230281980076480433b8e5
+  data.tar.gz: c8ce2a56f8ce8d4e5ea187fc96d0aaccdd720034da437cdd32bfc0626fa61f02ee2123733f5285fd48989f3ce51a960ea13e760a2fc5bf688332d28f55731d0f

data/.gitignore

@@ -10,3 +10,4 @@
 
 # rspec failure tracking
 .rspec_status
+.ruby-version

data/README.md

@@ -408,9 +408,7 @@ Now don't forget to go back to your Facebook developer console and change the ad
 
 ## Coming next
 
-* Proper implementation of logging (for now it's just `p` and `puts` statements sprinkled around the code) with ability to choose a logging level.
-
-* More powerful DSL for parsing user input and binding it to commands.   
+* More powerful DSL for parsing user input and binding it to commands.
 
 * NLP integration with Wit.AI (that allow for more things then the built-in NLP capabilities of Messenger platform, including a wrapper around Wit's interactive learning methods) is in the works and will be added to the gem some time in 2018...
 

data/lib/rubotnik.rb

@@ -15,31 +15,43 @@ require 'ui/image_attachment'
 require 'ui/quick_replies'
 require 'sinatra'
 require 'facebook/messenger'
+require 'logger'
+
 include Facebook::Messenger
 
 module Rubotnik
-  def self.subscribe(token)
-    Facebook::Messenger::Subscriptions.subscribe(access_token: token)
-  end
+  class << self
+    attr_writer :logger
+
+    def logger
+      @logger ||= Logger.new($stdout).tap do |log|
+        log.progname = self.name
+      end
+    end
 
-  def self.route(event, &block)
-    if [:message, :postback].include?(event)
-      Bot.on event do |e|
-        case e
-        when Facebook::Messenger::Incoming::Message
-          Rubotnik::MessageDispatch.new(e).route(&block)
-        when Facebook::Messenger::Incoming::Postback
-          Rubotnik::PostbackDispatch.new(e).route(&block)
+    def route(event, &block)
+      if [:message, :postback].include?(event)
+        Bot.on event do |e|
+          case e
+          when Facebook::Messenger::Incoming::Message
+            Rubotnik::MessageDispatch.new(e).route(&block)
+          when Facebook::Messenger::Incoming::Postback
+            Rubotnik::PostbackDispatch.new(e).route(&block)
+          end
         end
+      else
+        Bot.on(event, &block)
       end
-    else
-      Bot.on(event, &block)
     end
-  end
 
-  def self.set_profile(*payloads)
-    payloads.each do |payload|
-      Facebook::Messenger::Profile.set(payload, access_token: ENV['ACCESS_TOKEN'])
+    def subscribe(token)
+      Facebook::Messenger::Subscriptions.subscribe(access_token: token)
+    end
+
+    def set_profile(*payloads)
+      payloads.each do |payload|
+        Facebook::Messenger::Profile.set(payload, access_token: ENV['ACCESS_TOKEN'])
+      end
     end
   end
 end

data/lib/rubotnik/helpers.rb

@@ -63,10 +63,10 @@ module Rubotnik
       @message.typing_off
       case response.code
       when 200
-        puts "Data received from Graph API: #{response.body}" # logging
+        Rubotnik.logger.info "Data received from Graph API: #{response.body}" # logging
         return JSON.parse(response.body, symbolize_names: true)
       else
-        puts "Request failed: #{response.body}"
+        Rubotnik.logger.info "Request failed: #{response.body}"
         return false
       end
     end

data/lib/rubotnik/message_dispatch.rb

@@ -20,7 +20,7 @@ module Rubotnik
       if @user.current_command
         command = @user.current_command
         execute(command)
-        puts "Command #{command} is executed for user #{@user.id}"
+        Rubotnik.logger.info "Command #{command} is executed for user #{@user.id}"
       else
         bind_commands(&block)
       end
@@ -54,20 +54,20 @@ module Rubotnik
 
     def handle_command(to, reply_with)
       if reply_with.empty?
-        puts "Command #{to} is executed for user #{@user.id}"
+        Rubotnik.logger.info "Command #{to} is executed for user #{@user.id}"
         execute(to)
         @user.reset_command
-        puts "Command is reset for user #{@user.id}"
+        Rubotnik.logger.info "Command is reset for user #{@user.id}"
       else
         say(reply_with[:text], quick_replies: reply_with[:quick_replies])
         @user.assign_command(to)
-        puts "Command #{to} is set for user #{@user.id}"
+        Rubotnik.logger.info "Command #{to} is set for user #{@user.id}"
       end
     end
 
     def default
       return if @matched
-      puts 'None of the commands were recognized' # log
+      Rubotnik.logger.info 'None of the commands were recognized'
       yield
       @user.reset_command
     end

data/lib/rubotnik/postback_dispatch.rb

@@ -31,7 +31,7 @@ module Rubotnik
       return unless @postback.payload == regex_string.upcase
       clear_user_state
       @matched = true
-      puts "Matched #{regex_string} to #{to.nil? ? 'block' : to}"
+      Rubotnik.logger.info "Matched #{regex_string} to #{to.nil? ? 'block' : to}"
       if block_given?
         yield
         return
@@ -42,13 +42,13 @@ module Rubotnik
     def handle_command(to, reply_with)
       if reply_with.empty?
         execute(to)
-        puts "Command #{to} is executed for user #{@user.id}"
+        Rubotnik.logger.info "Command #{to} is executed for user #{@user.id}"
         @user.reset_command
-        puts "Command is reset for user #{@user.id}"
+        Rubotnik.logger.info "Command is reset for user #{@user.id}"
       else
         say(reply_with[:message], quick_replies: reply_with[:quick_replies])
         @user.assign_command(to)
-        puts "Command #{to} is set for user #{@user.id}"
+        Rubotnik.logger.info "Command #{to} is set for user #{@user.id}"
       end
     end
 

data/lib/rubotnik/user_store.rb

@@ -17,18 +17,18 @@ class Rubotnik::UserStore
     @users << user
     user = @users.last
     if user
-      p "user #{user.inspect} added to store"
-      p "we got #{@users.count} users: #{@users}"
+      Rubotnik.logger.info "user #{user.inspect} added to store"
+      Rubotnik.logger.info "we got #{@users.count} users: #{@users}"
     else
-      p 'user not found in store yet'
+      Rubotnik.logger.info 'user not found in store yet'
     end
     user
   end
 
   def find(id)
     user = @users.find { |u| u.id == id }
-    p "user #{user} found in store" if user
-    p "we got #{@users.count} users: #{@users}" if user
+    Rubotnik.logger.info "user #{user} found in store" if user
+    Rubotnik.logger.info "we got #{@users.count} users: #{@users}" if user
     user
   end
 end

data/lib/rubotnik/version.rb

@@ -1,3 +1,3 @@
 module Rubotnik
-  VERSION = "0.2.1"
+  VERSION = "0.2.2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rubotnik
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors:
 - Andy Barnov
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-06-07 00:00:00.000000000 Z
+date: 2018-07-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: facebook-messenger