rubotnik 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 33af86f4563629621c9a60e41d8ed6e18b57a7bea3049771f1dc4a7d231f09af
-  data.tar.gz: f8231e56a6526c0f371360c5824a148db4c302e5c1b58436598ad4fb0d554b83
+  metadata.gz: dfec0763c4edd0680ea995ab6d4de3f8c18ab2bfb15f4e267068b546c9e39390
+  data.tar.gz: 06d5e0d7d702ccb63ba4a173f705da25f64c76e189ef35d1bc59994257005734
 SHA512:
-  metadata.gz: e5b74060181a95947438daca6a069e45d31f29bdda0e352ca51a1aa47b6003a4f4948bb7b5014511cc0fa50bbaa8c80a4a03458a0ef176f7f09c14bb1a01aa44
-  data.tar.gz: d86d3550536e110c6aa76c1fea981860c002b7b7e183a55e1dd68cd2c2872fd882518b81e98b78df2388af5038a67cc678dd3e5c5e173ef30aa508cdc3ca269f
+  metadata.gz: af0c8bad43c4a19c71ef3cffd0e9dd94f5bb07ae23245c3038738da56b3fede8bb98d8e642544265c6def6ec0760c86eca6216d31614188ee335094a0b6a9366
+  data.tar.gz: 8047dfa3db4aaf51a102cf29100b818030ef1a4c93cbe48f9126af83f601eaebcdee839bacd9beed0791e31c7ea55cd200b03c4e06b14a96312ee83594282f60

data/lib/rubotnik.rb

@@ -23,14 +23,17 @@ module Rubotnik
   end
 
   def self.route(event, &block)
-    Bot.on(event, &block) unless [: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)
+    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
   end
 

data/lib/rubotnik/helpers.rb

@@ -9,7 +9,7 @@ module Rubotnik
     GRAPH_URL = 'https://graph.facebook.com/v2.8/'.freeze
 
     # abstraction over Bot.deliver to send messages declaratively and directly
-    def say(text = 'What was I talking about?', quick_replies: [], user: @user)
+    def say(text, quick_replies: [], user: @user)
       message_options = {
         recipient: { id: user.id },
         message: { text: text }
@@ -18,11 +18,14 @@ module Rubotnik
         message_options[:message][:quick_replies] = UI::QuickReplies
                                                       .build(*quick_replies)
       end
-      Bot.deliver(message_options, access_token: ENV['ACCESS_TOKEN'])
+
+      send_message(message_options)
     end
 
     def show(ui_element, user: @user)
-      ui_element.send(user)
+      payload = ui_element.build(user)
+
+      send_message(payload)
     end
 
     def next_command(command)
@@ -38,7 +41,7 @@ module Rubotnik
     end
 
     def message_contains_location?
-      @message.attachments && @message.attachments.first['type'] == 'location'
+      !@message.attachments.nil? && @message.attachments.first['type'] == 'location'
     end
 
     # Get user info from Graph API. Takes names of required fields as symbols
@@ -49,8 +52,7 @@ module Rubotnik
             ENV['ACCESS_TOKEN']
       begin
         return call_graph_api(url)
-      rescue
-        puts "Couldn't access URL" # logging
+      rescue => e
         return false
       end
     end
@@ -61,11 +63,16 @@ module Rubotnik
       @message.typing_off
       case response.code
       when 200
-        puts "User data received from Graph API: #{response.body}" # logging
+        puts "Data received from Graph API: #{response.body}" # logging
         return JSON.parse(response.body, symbolize_names: true)
       else
+        puts "Request failed: #{response.body}"
         return false
       end
     end
+
+    def send_message(payload)
+      Bot.deliver(payload, access_token: ENV['ACCESS_TOKEN'])
+    end
   end
 end

data/lib/rubotnik/message_dispatch.rb

@@ -13,14 +13,14 @@ module Rubotnik
       @message = message
       p @message.class
       p @message
-      @user = UserStore.instance.find_or_create_user(@message.sender['id'])
+      @user = Rubotnik::UserStore.instance.find_or_create_user(@message.sender['id'])
     end
 
     def route(&block)
       if @user.current_command
         command = @user.current_command
         execute(command)
-        puts "Command #{command} is executed for user #{@user.id}" # log
+        puts "Command #{command} is executed for user #{@user.id}"
       else
         bind_commands(&block)
       end

data/lib/rubotnik/postback_dispatch.rb

@@ -13,7 +13,7 @@ module Rubotnik
       @postback = postback
       p @postback.class
       p @postback
-      @user = UserStore.instance.find_or_create_user(@postback.sender['id'])
+      @user = Rubotnik::UserStore.instance.find_or_create_user(@postback.sender['id'])
     end
 
     def route(&block)
@@ -36,10 +36,10 @@ module Rubotnik
         yield
         return
       end
-      handle_commands(to, reply_with)
+      handle_command(to, reply_with)
     end
 
-    def handle_commands(to, reply_with)
+    def handle_command(to, reply_with)
       if reply_with.empty?
         execute(to)
         puts "Command #{to} is executed for user #{@user.id}"

data/lib/rubotnik/user.rb

@@ -1,4 +1,4 @@
-class User
+class Rubotnik::User
   attr_reader :id
   attr_accessor :session
 

data/lib/rubotnik/user_store.rb

@@ -1,7 +1,7 @@
 require 'singleton'
 require_relative 'user'
 # In-memory storage for users
-class UserStore
+class Rubotnik::UserStore
   include Singleton
   attr_reader :users
 
@@ -10,7 +10,7 @@ class UserStore
   end
 
   def find_or_create_user(id)
-    find(id) || add(User.new(id))
+    find(id) || add(Rubotnik::User.new(id))
   end
 
   def add(user)

data/lib/rubotnik/version.rb

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

data/lib/ui/base_ui_element.rb

@@ -4,12 +4,6 @@
 
 module UI
   class BaseUiElement
-    # Sends the valid JSON to Messenger API
-    def send(user)
-      formed = build(user)
-      Bot.deliver(formed, access_token: ENV['ACCESS_TOKEN'])
-    end
-
     # Use this method to return a valid hash and save it for later
     def build(user)
       @template[:recipient][:id] = user.id

data/lib/ui/fb_button_template.rb

@@ -4,6 +4,8 @@ module UI
   ########################### BUTTON TEMPLATE #############################
   # https://developers.facebook.com/docs/messenger-platform/send-api-reference/button-template
   class FBButtonTemplate < UI::BaseUiElement
+    include UI::Common::HasButtons
+
     def initialize(text, buttons)
       @template = {
         recipient: {

data/lib/ui/fb_carousel.rb

@@ -23,19 +23,22 @@ module UI
 
     # set image aspect ratio to 'square'
     def square_images
-      @template[:message][:attachment][:payload][:image_aspect_ratio] = 'square'
+      self.image_aspect_ratio = 'square'
       self
     end
 
-    # set image aspect ratio to 'square'
+    # set image aspect ratio to 'horizontal'
     def horizontal_images
-      hrz = 'horizontal'
-      @template[:message][:attachment][:payload][:image_aspect_ratio] = hrz
+      self.image_aspect_ratio = 'horizontal'
       self
     end
 
     private
 
+    def image_aspect_ratio=(type)
+      @template[:message][:attachment][:payload][:image_aspect_ratio] = type
+    end
+
     def parse_elements(elements)
       elements = [elements] if elements.class == Hash
       elements.map do |elt|

data/lib/ui/quick_replies.rb

@@ -20,8 +20,7 @@ module UI
     private_class_method def self.build_from_hash(reply)
       unless reply.key?(:content_type)
         reply[:content_type] = 'text'
-        error_msg = "type 'text' should have a payload"
-        raise ArgumentError, error_msg unless reply.key?(:payload)
+        raise ArgumentError, "type 'text' should have a payload" unless reply.key?(:payload)
       end
       reply
     end

data/rubotnik.gemspec

@@ -20,7 +20,6 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   spec.add_dependency 'facebook-messenger'
-  spec.add_dependency 'addressable'
   spec.add_dependency 'dotenv'
   spec.add_dependency 'httparty'
   spec.add_dependency 'puma'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rubotnik
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - Andy Barnov
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-05-14 00:00:00.000000000 Z
+date: 2018-06-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: facebook-messenger
@@ -24,20 +24,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: addressable
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: dotenv
   requirement: !ruby/object:Gem::Requirement