rbender 0.7.3 → 0.7.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a793668dab825c522287f029506745b94cd5cf86d5aba5af6a5ca8bc59525389
-  data.tar.gz: fcacdcb1c9990bf38b6089546dacd78a7ca57c95856bb8799a6396ed104ffb2f
+  metadata.gz: '021865fb9c70360011b3cac07f982b46610f277470ec018ae4a793777b2a3335'
+  data.tar.gz: 8aa45317a11732e21aa132ee59a3961ea7a82b7874a5366f303e2d2a414796a9
 SHA512:
-  metadata.gz: 21fef267a733b01635afe9ba9cdf1bbba98eae94d64d7ffd53989a73901658223fee1b13db35b31d8dbbd91c4092524ece637e425a40d199968b2095f94da95c
-  data.tar.gz: 1d014f730e8eaec9b504d9751d4bc332b4ab54e0d1133244675e6bbea94ad47ffad3cc1c278499ec02e70074d8366082467895fc422cdab3d1176e248fb1e3da
+  metadata.gz: 70df08329bac34d8c78fa13ddffe600ec8dc8addece55c24b41487d5cab4f40fecd4454d82919d0c5e4dc65c9363dfdf0ccdc721d47cba57e5350af54740d2bb
+  data.tar.gz: ecd66d14f238e66c8bb4fde3672d0ae41b8019b57baaca71d14d0dfd6dd4de67ed60b75fb50fca1815db1c790b9d4f9d124aa271b5b156d37d45bf6f9c416aac

data/lib/rbender/base.rb

@@ -15,6 +15,10 @@ class RBender::Base
 
   public
 
+  def self.api
+    @@api
+  end
+
   def initialize
     @states       = {}
     @global_state = nil
@@ -31,6 +35,7 @@ class RBender::Base
     puts "Bot is running...".green
     Telegram::Bot::Client.run(@token) do |bot|
       @api = bot.api
+      @@api = bot.api
 
       unless @modules_block.nil?
         instance_exec(@api, @mongo_client, &@modules_block)
@@ -78,6 +83,7 @@ class RBender::Base
     end
   end
 
+  alias screen state
 
   def global(&block)
     if @global_state
@@ -175,7 +181,7 @@ class RBender::Base
       }
     end
 
-    session[:user].freeze # User's data must be immutable!
+    session[:chat].freeze # User's data must be immutable!
 
     if is_start_message? message
       session[:state]       = :start

data/lib/rbender/keyboard.rb

@@ -8,9 +8,11 @@ class RBender::Keyboard
                 :markup_tg,
                 :markup_final,
                 :switch_groups,
-                :session
+                :session,
+                :message
 
-  def initialize
+  def initialize(message)
+    @message             = message
     @actions             = {}
     @markup              = []
     @localizations       = {}

data/lib/rbender/keyboard_inline.rb

@@ -1,8 +1,11 @@
 class RBender::KeyboardInline
   attr_accessor :markup_tg,
-                :buttons_actions
+                :buttons_actions,
+                :message,
+                :session
 
-  def initialize(name, session, block)
+  def initialize(name, message, session, block)
+    @message          = message
     @name             = name
     @buttons_callback = {}
     @buttons_inline   = {}

data/lib/rbender/state.rb

@@ -14,6 +14,7 @@ class RBender::State
     @before_block            = nil
     @text_block              = nil
     @helpers_block           = nil
+    @helpers_global_block    = nil
     @pre_checkout_block      = nil
     @checkout_block          = nil
     @shipping_block          = nil
@@ -99,6 +100,7 @@ class RBender::State
   def process_text_message
     unless @keyboard.nil? # if state has keyboard
       @keyboard.instance_eval(&@helpers_block) unless @helpers_block.nil?
+      @keyboard.instance_eval(&@helpers_global_block) unless @helpers_global_block.nil?
       build_keyboard
 
       @keyboard.markup_final.each do |btn, final_btn|
@@ -122,13 +124,13 @@ class RBender::State
     keyboard.invoke unless keyboard.nil?
 
     unless keyboard.nil?
-      unless keyboard.buttons_actions[action].nil?
+      if keyboard.buttons_actions[action]
         instance_eval(&keyboard.buttons_actions[action])
       else
         raise "There is no action called '#{action}'"
       end
     else
-      edit_message_text text: "deleted"
+      edit_message_text text: ":)"
     end
   end
 
@@ -171,6 +173,7 @@ class RBender::State
   # adds inline keyboard
   def keyboard_inline(inline_keyboard_name, &inline_keyboard_block)
     @inline_keyboards_blocks[inline_keyboard_name] = RBender::KeyboardInline.new(inline_keyboard_name,
+                                                                                 @message,
                                                                                  @session,
                                                                                  inline_keyboard_block)
   end
@@ -206,14 +209,19 @@ class RBender::State
     if @is_global
       raise 'Global state doesn\'t support :keyboard method'
     end
-    @keyboard         = RBender::Keyboard.new
+    @keyboard         = RBender::Keyboard.new(@message)
     @keyboard.session = @session
     @keyboard.instance_eval(&keyboard_block)
   end
 
   #initialize helper methods
   def helpers(&helpers_block)
-    @helpers_block = helpers_block
+    if @helpers_block
+      @helpers_global_block = helpers_block
+    else
+      @helpers_block = helpers_block
+    end
+
     instance_eval(&helpers_block)
   end
 
@@ -274,10 +282,11 @@ class RBender::State
   # Returns Inline keyboard object by name
   def inline_markup(name)
     raise "Keyboard #{name} doesn't exists!" unless @inline_keyboards_blocks.member? name
-    keyboard = @inline_keyboards_blocks[name]
-    keyboard.instance_eval(&@helpers_block) unless @helpers_block.nil?
-    keyboard.build
-    keyboard.markup_tg
+    kb = @inline_keyboards_blocks[name]
+    kb.instance_eval(&@helpers_block) unless @helpers_block.nil?
+    kb.instance_eval(&@helpers_global_block) unless @helpers_global_block.nil?
+    kb.build
+    kb.markup_tg
   end
 
   def pre_checkout(&block)

data/templates/sample.rb

@@ -1,62 +1,10 @@
 require 'rbender'
-Dir["/lib/*.rb"].each {|file| require_relative file}
 
-state :start do
+screen :start do
 	before do
 		# - - - - - -
 		# Before hook
 		# - - - - - -
 	end
-
-
-	keyboard do
-		set_response("Sample response") #response are required
-		button :btn_1, "Btn1" do
-			# do something
-		end
-
-		button :btn_2, "Btn2" do
-			# do something
-		end
-
-		line :btn_1, :btn_2
-		# - - - - - - -
-		# Init keyboard
-		# - - - - - - -
-	end
-
-
-	keyboard_inline :kb_inline do
-		# - - - - - -
-		# Init inline keyboard
-		# - - - - - -
-	end
-
-	after do
-		# - - - - - -
-		# After hook
-		# - - - - - -
-	end
-
-	text do |text|
-		# - - - - - - - - - - - -
-		# Process user's message
-		# - - - - - - - - - - - -
-	end
 end
 
-global do
-	command '/command' do
-		# command without params
-	end
-
-	command '/command2' do |params|
-		# command with params
-	end
-
-	helpers do
-		# - - - - - - - - - - -
-		# Define global helpers
-		# - - - -  - - - - - - -
-	end
-end

data/templates/screens/global_screen.rb

@@ -0,0 +1,15 @@
+global do
+  command '/command' do
+    # command without params
+  end
+
+  command '/command2' do |params|
+    # command with params
+  end
+
+  helpers do
+    # - - - - - - - - - - -
+    # Define global helpers
+    # - - - -  - - - - - - -
+  end
+end

data/templates/screens/main_screen.rb

@@ -0,0 +1,37 @@
+screen :main_screen do
+  keyboard do
+    set_response("Sample response") #response are required
+    button :btn_1, "Btn1" do
+      # do something
+    end
+
+    button :btn_2, "Btn2" do
+      # do something
+    end
+
+    line :btn_1, :btn_2
+    # - - - - - - -
+    # Init keyboard
+    # - - - - - - -
+  end
+
+
+  keyboard_inline :kb_inline do
+    # - - - - - -
+    # Init inline keyboard
+    # - - - - - -
+  end
+
+
+  text do |text|
+    # - - - - - - - - - - - -
+    # Process user's message
+    # - - - - - - - - - - - -
+  end
+
+  after do
+    # - - - - - -
+    # After hook
+    # - - - - - -
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rbender
 version: !ruby/object:Gem::Version
-  version: 0.7.3
+  version: 0.7.5
 platform: ruby
 authors:
 - Arthur
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-03-09 00:00:00.000000000 Z
+date: 2019-03-27 00:00:00.000000000 Z
 dependencies: []
 description: Gem provides domain specific language for messengers bot creation.
 email: art2rik.desperado@gmail.com
@@ -33,6 +33,8 @@ files:
 - templates/config.yaml
 - templates/locales/en.yaml
 - templates/sample.rb
+- templates/screens/global_screen.rb
+- templates/screens/main_screen.rb
 homepage: https://github.com/art2rik/RBender
 licenses: []
 metadata:
@@ -45,7 +47,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.0.0
+      version: 2.4.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="